diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 8d859db91..cbfe75d79 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -909,7 +909,7 @@ glabel func0f00ce3c ); GLOBAL_ASM( -glabel func0f00ce60 +glabel setupCountCommandType /* f00ce60: 27bdffd8 */ addiu $sp,$sp,-40 /* f00ce64: afb00014 */ sw $s0,0x14($sp) /* f00ce68: 3c10800a */ lui $s0,0x800a @@ -3201,7 +3201,7 @@ glabel func0f00eb64 /* f00ef20: 54a0ffec */ bnezl $a1,.L0f00eed4 /* f00ef24: 00a97821 */ addu $t7,$a1,$t1 .L0f00ef28: -/* f00ef28: 0fc03398 */ jal func0f00ce60 +/* f00ef28: 0fc03398 */ jal setupCountCommandType /* f00ef2c: 24040009 */ addiu $a0,$zero,0x9 /* f00ef30: 3c05800a */ lui $a1,%hi(g_Vars) /* f00ef34: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) @@ -3219,94 +3219,94 @@ glabel func0f00eb64 /* f00ef64: 00621821 */ addu $v1,$v1,$v0 /* f00ef68: 00408025 */ or $s0,$v0,$zero .L0f00ef6c: -/* f00ef6c: 0fc03398 */ jal func0f00ce60 +/* f00ef6c: 0fc03398 */ jal setupCountCommandType /* f00ef70: afa3004c */ sw $v1,0x4c($sp) /* f00ef74: 02028021 */ addu $s0,$s0,$v0 -/* f00ef78: 0fc03398 */ jal func0f00ce60 +/* f00ef78: 0fc03398 */ jal setupCountCommandType /* f00ef7c: 24040004 */ addiu $a0,$zero,0x4 /* f00ef80: 02028021 */ addu $s0,$s0,$v0 -/* f00ef84: 0fc03398 */ jal func0f00ce60 +/* f00ef84: 0fc03398 */ jal setupCountCommandType /* f00ef88: 24040011 */ addiu $a0,$zero,0x11 /* f00ef8c: 02028021 */ addu $s0,$s0,$v0 -/* f00ef90: 0fc03398 */ jal func0f00ce60 +/* f00ef90: 0fc03398 */ jal setupCountCommandType /* f00ef94: 24040001 */ addiu $a0,$zero,0x1 /* f00ef98: 02028021 */ addu $s0,$s0,$v0 -/* f00ef9c: 0fc03398 */ jal func0f00ce60 +/* f00ef9c: 0fc03398 */ jal setupCountCommandType /* f00efa0: 24040006 */ addiu $a0,$zero,0x6 /* f00efa4: 02028021 */ addu $s0,$s0,$v0 -/* f00efa8: 0fc03398 */ jal func0f00ce60 +/* f00efa8: 0fc03398 */ jal setupCountCommandType /* f00efac: 2404000d */ addiu $a0,$zero,0xd /* f00efb0: 02028021 */ addu $s0,$s0,$v0 -/* f00efb4: 0fc03398 */ jal func0f00ce60 +/* f00efb4: 0fc03398 */ jal setupCountCommandType /* f00efb8: 2404000c */ addiu $a0,$zero,0xc /* f00efbc: 02028021 */ addu $s0,$s0,$v0 -/* f00efc0: 0fc03398 */ jal func0f00ce60 +/* f00efc0: 0fc03398 */ jal setupCountCommandType /* f00efc4: 2404000a */ addiu $a0,$zero,0xa /* f00efc8: 02028021 */ addu $s0,$s0,$v0 -/* f00efcc: 0fc03398 */ jal func0f00ce60 +/* f00efcc: 0fc03398 */ jal setupCountCommandType /* f00efd0: 2404000b */ addiu $a0,$zero,0xb /* f00efd4: 02028021 */ addu $s0,$s0,$v0 -/* f00efd8: 0fc03398 */ jal func0f00ce60 +/* f00efd8: 0fc03398 */ jal setupCountCommandType /* f00efdc: 24040015 */ addiu $a0,$zero,0x15 /* f00efe0: 02028021 */ addu $s0,$s0,$v0 -/* f00efe4: 0fc03398 */ jal func0f00ce60 +/* f00efe4: 0fc03398 */ jal setupCountCommandType /* f00efe8: 24040003 */ addiu $a0,$zero,0x3 /* f00efec: 02028021 */ addu $s0,$s0,$v0 -/* f00eff0: 0fc03398 */ jal func0f00ce60 +/* f00eff0: 0fc03398 */ jal setupCountCommandType /* f00eff4: 2404000f */ addiu $a0,$zero,0xf /* f00eff8: 02028021 */ addu $s0,$s0,$v0 -/* f00effc: 0fc03398 */ jal func0f00ce60 +/* f00effc: 0fc03398 */ jal setupCountCommandType /* f00f000: 2404002a */ addiu $a0,$zero,0x2a /* f00f004: 02028021 */ addu $s0,$s0,$v0 -/* f00f008: 0fc03398 */ jal func0f00ce60 +/* f00f008: 0fc03398 */ jal setupCountCommandType /* f00f00c: 2404002f */ addiu $a0,$zero,0x2f /* f00f010: 02028021 */ addu $s0,$s0,$v0 -/* f00f014: 0fc03398 */ jal func0f00ce60 +/* f00f014: 0fc03398 */ jal setupCountCommandType /* f00f018: 2404002b */ addiu $a0,$zero,0x2b /* f00f01c: 02028021 */ addu $s0,$s0,$v0 -/* f00f020: 0fc03398 */ jal func0f00ce60 +/* f00f020: 0fc03398 */ jal setupCountCommandType /* f00f024: 24040029 */ addiu $a0,$zero,0x29 /* f00f028: 02028021 */ addu $s0,$s0,$v0 -/* f00f02c: 0fc03398 */ jal func0f00ce60 +/* f00f02c: 0fc03398 */ jal setupCountCommandType /* f00f030: 24040024 */ addiu $a0,$zero,0x24 /* f00f034: 02028021 */ addu $s0,$s0,$v0 -/* f00f038: 0fc03398 */ jal func0f00ce60 +/* f00f038: 0fc03398 */ jal setupCountCommandType /* f00f03c: 24040005 */ addiu $a0,$zero,0x5 /* f00f040: 02028021 */ addu $s0,$s0,$v0 -/* f00f044: 0fc03398 */ jal func0f00ce60 +/* f00f044: 0fc03398 */ jal setupCountCommandType /* f00f048: 24040007 */ addiu $a0,$zero,0x7 /* f00f04c: 02028021 */ addu $s0,$s0,$v0 -/* f00f050: 0fc03398 */ jal func0f00ce60 +/* f00f050: 0fc03398 */ jal setupCountCommandType /* f00f054: 24040014 */ addiu $a0,$zero,0x14 /* f00f058: 02028021 */ addu $s0,$s0,$v0 -/* f00f05c: 0fc03398 */ jal func0f00ce60 +/* f00f05c: 0fc03398 */ jal setupCountCommandType /* f00f060: 24040027 */ addiu $a0,$zero,0x27 /* f00f064: 02028021 */ addu $s0,$s0,$v0 -/* f00f068: 0fc03398 */ jal func0f00ce60 +/* f00f068: 0fc03398 */ jal setupCountCommandType /* f00f06c: 2404002d */ addiu $a0,$zero,0x2d /* f00f070: 02028021 */ addu $s0,$s0,$v0 -/* f00f074: 0fc03398 */ jal func0f00ce60 +/* f00f074: 0fc03398 */ jal setupCountCommandType /* f00f078: 24040030 */ addiu $a0,$zero,0x30 /* f00f07c: 02028021 */ addu $s0,$s0,$v0 -/* f00f080: 0fc03398 */ jal func0f00ce60 +/* f00f080: 0fc03398 */ jal setupCountCommandType /* f00f084: 24040033 */ addiu $a0,$zero,0x33 /* f00f088: 02028021 */ addu $s0,$s0,$v0 -/* f00f08c: 0fc03398 */ jal func0f00ce60 +/* f00f08c: 0fc03398 */ jal setupCountCommandType /* f00f090: 24040035 */ addiu $a0,$zero,0x35 /* f00f094: 02028021 */ addu $s0,$s0,$v0 -/* f00f098: 0fc03398 */ jal func0f00ce60 +/* f00f098: 0fc03398 */ jal setupCountCommandType /* f00f09c: 24040036 */ addiu $a0,$zero,0x36 /* f00f0a0: 02028021 */ addu $s0,$s0,$v0 -/* f00f0a4: 0fc03398 */ jal func0f00ce60 +/* f00f0a4: 0fc03398 */ jal setupCountCommandType /* f00f0a8: 24040037 */ addiu $a0,$zero,0x37 /* f00f0ac: 02028021 */ addu $s0,$s0,$v0 -/* f00f0b0: 0fc03398 */ jal func0f00ce60 +/* f00f0b0: 0fc03398 */ jal setupCountCommandType /* f00f0b4: 24040039 */ addiu $a0,$zero,0x39 /* f00f0b8: 02028021 */ addu $s0,$s0,$v0 -/* f00f0bc: 0fc03398 */ jal func0f00ce60 +/* f00f0bc: 0fc03398 */ jal setupCountCommandType /* f00f0c0: 24040028 */ addiu $a0,$zero,0x28 /* f00f0c4: 02028021 */ addu $s0,$s0,$v0 -/* f00f0c8: 0fc03398 */ jal func0f00ce60 +/* f00f0c8: 0fc03398 */ jal setupCountCommandType /* f00f0cc: 2404003b */ addiu $a0,$zero,0x3b /* f00f0d0: 3c0f800a */ lui $t7,0x800a /* f00f0d4: 8defa2d8 */ lw $t7,-0x5d28($t7) @@ -3451,7 +3451,7 @@ glabel func0f00f174 /* f00f2c4: 8fab0244 */ lw $t3,0x244($sp) /* f00f2c8: 11600015 */ beqz $t3,.L0f00f320 /* f00f2cc: 00000000 */ sll $zero,$zero,0x0 -/* f00f2d0: 0fc03398 */ jal func0f00ce60 +/* f00f2d0: 0fc03398 */ jal setupCountCommandType /* f00f2d4: 24040009 */ addiu $a0,$zero,0x9 /* f00f2d8: 3c03800a */ lui $v1,%hi(g_Vars) /* f00f2dc: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) @@ -3514,7 +3514,7 @@ glabel func0f00f174 .L0f00f3a4: /* f00f3a4: 0fc4a24b */ jal setCurrentPlayerNum /* f00f3a8: 02002025 */ or $a0,$s0,$zero -/* f00f3ac: 0fc03398 */ jal func0f00ce60 +/* f00f3ac: 0fc03398 */ jal setupCountCommandType /* f00f3b0: 2404000e */ addiu $a0,$zero,0xe /* f00f3b4: 0fc0494c */ jal func0f012530 /* f00f3b8: 00402025 */ or $a0,$v0,$zero diff --git a/src/include/game/game_00c490.h b/src/include/game/game_00c490.h index 7f9c0d242..29de12f51 100644 --- a/src/include/game/game_00c490.h +++ b/src/include/game/game_00c490.h @@ -11,7 +11,7 @@ u32 func0f00cc5c(void); u32 func0f00cc74(void); u32 func0f00cc8c(void); u32 func0f00ce3c(void); -u32 func0f00ce60(void); +u32 setupCountCommandType(u8 type); u32 func0f00cee4(void); u32 func0f00d670(void); u32 func0f00d904(void);