Decompile add87654321

This commit is contained in:
Ryan Dwyer 2020-02-20 18:10:32 +10:00
parent 81463e145e
commit 7de45b85ce
9 changed files with 24 additions and 27 deletions

View File

@ -12313,7 +12313,7 @@ u16 var80087ce4[] = {
0x0000, 0x0000,
};
u8 var80087d10 = 0;
u8 g_NumMpSimulantChrs = 0;
u32 var80087d14[] = {
0x5a000000, 0x3e86051b, 0x3f06051b, 0x02580000, 0x41200000, 0x3f32b179, 0x3eb2b179, 0x000003e8,

View File

@ -49,10 +49,10 @@ glabel func0f0147f8
GLOBAL_ASM(
glabel func0f014820
/* f014820: 3c03800b */ lui $v1,%hi(var800acc80)
/* f014820: 3c03800b */ lui $v1,%hi(g_MpSimulantChrs)
/* f014824: 3c02800b */ lui $v0,%hi(var800acca0)
/* f014828: 2442cca0 */ addiu $v0,$v0,%lo(var800acca0)
/* f01482c: 2463cc80 */ addiu $v1,$v1,%lo(var800acc80)
/* f01482c: 2463cc80 */ addiu $v1,$v1,%lo(g_MpSimulantChrs)
.L0f014830:
/* f014830: 24630004 */ addiu $v1,$v1,0x4
/* f014834: 1462fffe */ bne $v1,$v0,.L0f014830
@ -154,9 +154,9 @@ glabel func0f014848
/* f0149a0: ae000118 */ sw $zero,0x118($s0)
/* f0149a4: 8fae003c */ lw $t6,0x3c($sp)
/* f0149a8: 240d0001 */ addiu $t5,$zero,0x1
/* f0149ac: 3c088008 */ lui $t0,%hi(var80087d10)
/* f0149ac: 3c088008 */ lui $t0,%hi(g_NumMpSimulantChrs)
/* f0149b0: 91cc0011 */ lbu $t4,0x11($t6)
/* f0149b4: 25087d10 */ addiu $t0,$t0,%lo(var80087d10)
/* f0149b4: 25087d10 */ addiu $t0,$t0,%lo(g_NumMpSimulantChrs)
/* f0149b8: a20002a2 */ sb $zero,0x2a2($s0)
/* f0149bc: 018d7804 */ sllv $t7,$t5,$t4
/* f0149c0: a20f0125 */ sb $t7,0x125($s0)
@ -172,8 +172,8 @@ glabel func0f014848
/* f0149e8: 24790001 */ addiu $t9,$v1,0x1
/* f0149ec: 0c0048f2 */ jal malloc
/* f0149f0: a1190000 */ sb $t9,0x0($t0)
/* f0149f4: 3c088008 */ lui $t0,%hi(var80087d10)
/* f0149f8: 25087d10 */ addiu $t0,$t0,%lo(var80087d10)
/* f0149f4: 3c088008 */ lui $t0,%hi(g_NumMpSimulantChrs)
/* f0149f8: 25087d10 */ addiu $t0,$t0,%lo(g_NumMpSimulantChrs)
/* f0149fc: 10400113 */ beqz $v0,.L0f014e4c
/* f014a00: ae0202d4 */ sw $v0,0x2d4($s0)
/* f014a04: a20002b0 */ sb $zero,0x2b0($s0)

View File

@ -677,8 +677,8 @@ glabel func0f0b69d0
/* f0b6bf4: 93397d10 */ lbu $t9,0x7d10($t9)
/* f0b6bf8: 5b20003e */ blezl $t9,.L0f0b6cf4
/* f0b6bfc: e6d40000 */ swc1 $f20,0x0($s6)
/* f0b6c00: 3c10800b */ lui $s0,%hi(var800acc80)
/* f0b6c04: 2610cc80 */ addiu $s0,$s0,%lo(var800acc80)
/* f0b6c00: 3c10800b */ lui $s0,%hi(g_MpSimulantChrs)
/* f0b6c04: 2610cc80 */ addiu $s0,$s0,%lo(g_MpSimulantChrs)
/* f0b6c08: 8e050000 */ lw $a1,0x0($s0)
.L0f0b6c0c:
/* f0b6c0c: 8ca2001c */ lw $v0,0x1c($a1)

View File

@ -9775,8 +9775,8 @@ glabel func0f18f874
/* f18fe44: 11c00046 */ beqz $t6,.L0f18ff60
/* f18fe48: 00000000 */ sll $zero,$zero,0x0
/* f18fe4c: 93187d10 */ lbu $t8,0x7d10($t8)
/* f18fe50: 3c10800b */ lui $s0,%hi(var800acc80)
/* f18fe54: 2610cc80 */ addiu $s0,$s0,%lo(var800acc80)
/* f18fe50: 3c10800b */ lui $s0,%hi(g_MpSimulantChrs)
/* f18fe54: 2610cc80 */ addiu $s0,$s0,%lo(g_MpSimulantChrs)
/* f18fe58: 1b000041 */ blez $t8,.L0f18ff60
/* f18fe5c: 00008825 */ or $s1,$zero,$zero
.L0f18fe60:

View File

@ -461,18 +461,15 @@ void mpInitSimulants(void)
{
s32 i;
for (i = 0; i < var80087d10; i++) {
mpInitSimulant(var800acc80[i], false);
for (i = 0; i < g_NumMpSimulantChrs; i++) {
mpInitSimulant(g_MpSimulantChrs[i], false);
}
}
GLOBAL_ASM(
glabel func0f190774
/* f190774: 3c018765 */ lui $at,0x8765
/* f190778: 34214321 */ ori $at,$at,0x4321
/* f19077c: 03e00008 */ jr $ra
/* f190780: 00811021 */ addu $v0,$a0,$at
);
u32 add87654321(u32 value)
{
return value + 0x87654321;
}
GLOBAL_ASM(
glabel func0f190784
@ -578,17 +575,17 @@ glabel func0f190784
/* f1908f8: 34211e60 */ ori $at,$at,0x1e60
/* f1908fc: 1041000e */ beq $v0,$at,.L0f190938
/* f190900: 3c049c9c */ lui $a0,0x9c9c
/* f190904: 0fc641dd */ jal func0f190774
/* f190904: 0fc641dd */ jal add87654321
/* f190908: 3484bce0 */ ori $a0,$a0,0xbce0
/* f19090c: 3c107f04 */ lui $s0,0x7f04
/* f190910: 2610978c */ addiu $s0,$s0,-26740
/* f190914: 3c047c7a */ lui $a0,0x7c7a
/* f190918: ae020000 */ sw $v0,0x0($s0)
/* f19091c: 0fc641dd */ jal func0f190774
/* f19091c: 0fc641dd */ jal add87654321
/* f190920: 3484bce7 */ ori $a0,$a0,0xbce7
/* f190924: 3c04789a */ lui $a0,0x789a
/* f190928: ae020004 */ sw $v0,0x4($s0)
/* f19092c: 0fc641dd */ jal func0f190774
/* f19092c: 0fc641dd */ jal add87654321
/* f190930: 3484bcdf */ ori $a0,$a0,0xbcdf
/* f190934: ae020008 */ sw $v0,0x8($s0)
.L0f190938:

View File

@ -29747,7 +29747,7 @@ u32 var800acc70 = 0;
u32 var800acc74 = 0;
u32 var800acc78 = 0;
u32 var800acc7c = 0;
struct chrdata *var800acc80[MAX_SIMULANTS] = {NULL};
struct chrdata *g_MpSimulantChrs[MAX_SIMULANTS] = {NULL};
u8 var800acca0[40] = {0};
u8 g_MpChallengesCompleted[4] = {0}; // This is one *byte* per option, and length is unknown
u32 var800acccc = 0;

View File

@ -307,7 +307,7 @@ extern struct mpbody g_MpBodies[NUM_MPBODIES];
extern struct mptrack g_MpTracks[NUM_MPTRACKS];
extern struct mppreset g_MpPresets[NUM_MPPRESETS];
extern u32 g_TeamColours[MAX_TEAMS];
extern u8 var80087d10;
extern u8 g_NumMpSimulantChrs;
extern u32 var80087d14[];
extern u32 g_MpBotCommands[NUM_MPBOTCOMMANDS];
extern u32 var80087e2c;

View File

@ -7,7 +7,7 @@ u32 func0f190260(void);
void mpChrReset(struct chrdata *chr, u8 full);
void mpInitSimulant(struct chrdata *chr, u8 full);
void mpInitSimulants(void);
u32 func0f190774(void);
u32 add87654321(u32 value);
u32 func0f190784(void);
u32 func0f190be4(void);
u32 func0f19124c(void);

View File

@ -868,7 +868,7 @@ extern s8 g_MpLockPlayerNum;
extern u32 var800acc28;
extern u32 var800acc70;
extern u32 var800acc74;
extern struct chrdata *var800acc80[MAX_SIMULANTS];
extern struct chrdata *g_MpSimulantChrs[MAX_SIMULANTS];
extern u8 var800acca0[40];
extern u8 g_MpChallengesCompleted[];
extern u32 var800acd20;