diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index f8139de39..83d892dad 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -8004,23 +8004,13 @@ bool aiShowCountdownTimer(void) /** * @cmd 00bf */ -GLOBAL_ASM( -glabel ai00bf -/* f05537c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f055380: afbf0014 */ sw $ra,0x14($sp) -/* f055384: 24040001 */ addiu $a0,$zero,0x1 -/* f055388: 0fc24202 */ jal countdownTimerSetVisible -/* f05538c: 00002825 */ or $a1,$zero,$zero -/* f055390: 3c03800a */ lui $v1,0x800a -/* f055394: 24639fc0 */ addiu $v1,$v1,-24640 -/* f055398: 8c6e0438 */ lw $t6,0x438($v1) -/* f05539c: 8fbf0014 */ lw $ra,0x14($sp) -/* f0553a0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0553a4: 25cf0002 */ addiu $t7,$t6,0x2 -/* f0553a8: ac6f0438 */ sw $t7,0x438($v1) -/* f0553ac: 03e00008 */ jr $ra -/* f0553b0: 00001025 */ or $v0,$zero,$zero -); +bool aiHideCountdownTimer(void) +{ + countdownTimerSetVisible(true, false); + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 00c0 diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index cb81586fa..236e2ebcc 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -193,7 +193,7 @@ /*0x00bc*/ bool ai00bc(void); /*0x00bd*/ bool ai00bd(void); /*0x00be*/ bool aiShowCountdownTimer(void); -/*0x00bf*/ bool ai00bf(void); +/*0x00bf*/ bool aiHideCountdownTimer(void); /*0x00c0*/ bool ai00c0(void); /*0x00c1*/ bool ai00c1(void); /*0x00c2*/ bool ai00c2(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 73cafb032..15f0ed4ea 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14140,7 +14140,7 @@ bool (*command_pointers[])(void) = { /*0x00bc*/ ai00bc, /*0x00bd*/ ai00bd, /*0x00be*/ aiShowCountdownTimer, - /*0x00bf*/ ai00bf, + /*0x00bf*/ aiHideCountdownTimer, /*0x00c0*/ ai00c0, /*0x00c1*/ ai00c1, /*0x00c2*/ ai00c2,