Decompile getKnockoutCount and getKillCount
This commit is contained in:
parent
47def23271
commit
0e6e163432
|
|
@ -24607,7 +24607,7 @@ glabel func0f0336a8
|
|||
/* f0336d0: 2401001f */ addiu $at,$zero,0x1f
|
||||
/* f0336d4: 50410011 */ beql $v0,$at,.L0f03371c
|
||||
/* f0336d8: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
/* f0336dc: 0fc2c163 */ jal getNumKnockedOutChrs
|
||||
/* f0336dc: 0fc2c163 */ jal getKnockoutCount
|
||||
/* f0336e0: afa40018 */ sw $a0,0x18($sp)
|
||||
/* f0336e4: 28410002 */ slti $at,$v0,0x2
|
||||
/* f0336e8: 10200005 */ beqz $at,.L0f033700
|
||||
|
|
|
|||
|
|
@ -8033,9 +8033,9 @@ bool aiIfNumKnockedOutChrs(void)
|
|||
{
|
||||
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
|
||||
|
||||
if (cmd[2] < getNumKnockedOutChrs() && cmd[3] == 0) {
|
||||
if (cmd[2] < getKnockoutCount() && cmd[3] == 0) {
|
||||
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
|
||||
} else if (getNumKnockedOutChrs() < cmd[2] && cmd[3] == 1) {
|
||||
} else if (getKnockoutCount() < cmd[2] && cmd[3] == 1) {
|
||||
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
|
||||
} else {
|
||||
g_Vars.aioffset += 5;
|
||||
|
|
|
|||
|
|
@ -218,15 +218,15 @@ glabel func0f0b0574
|
|||
/* f0b0588: ac4f02b4 */ sw $t7,0x2b4($v0)
|
||||
);
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel getNumKnockedOutChrs
|
||||
/* f0b058c: 3c02800a */ lui $v0,0x800a
|
||||
/* f0b0590: 03e00008 */ jr $ra
|
||||
/* f0b0594: 9042a277 */ lbu $v0,-0x5d89($v0)
|
||||
/* f0b0598: 3c02800a */ lui $v0,0x800a
|
||||
/* f0b059c: 03e00008 */ jr $ra
|
||||
/* f0b05a0: 8c42a270 */ lw $v0,-0x5d90($v0)
|
||||
);
|
||||
u8 getKnockoutCount(void)
|
||||
{
|
||||
return g_Vars.knockoutcount;
|
||||
}
|
||||
|
||||
u32 getKillCount(void)
|
||||
{
|
||||
return g_Vars.killcount;
|
||||
}
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel func0f0b05a4
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ u32 func0f0b052c(void);
|
|||
u32 func0f0b0544(void);
|
||||
u32 func0f0b055c(void);
|
||||
u32 func0f0b0574(void);
|
||||
u32 getNumKnockedOutChrs(void);
|
||||
u8 getKnockoutCount(void);
|
||||
u32 func0f0b05a4(void);
|
||||
u32 func0f0b073c(void);
|
||||
u32 func0f0b0764(void);
|
||||
|
|
|
|||
|
|
@ -57,7 +57,10 @@ struct g_vars {
|
|||
/*0002a8*/ struct player *anti; // Counter-op
|
||||
/*0002ac*/ u32 unk0002ac; // 7 if currentplayer has finished auto walking
|
||||
/*0002b0*/ s32 killcount;
|
||||
/*0002b4*/ u32 unk0002b4;
|
||||
/*0002b4*/ u8 unk0002b4;
|
||||
/*0002b5*/ u8 unk0002b5;
|
||||
/*0002b6*/ u8 unk0002b6;
|
||||
/*0002b7*/ u8 knockoutcount;
|
||||
/*0002b8*/ u32 unk0002b8;
|
||||
/*0002bc*/ s32 roomcount;
|
||||
/*0002c0*/ u32 unk0002c0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue