diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 83d892dad..0708fb364 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -8049,22 +8049,13 @@ glabel ai00c0 /** * @cmd 00c1 */ -GLOBAL_ASM( -glabel ai00c1 -/* f055420: 27bdffe8 */ addiu $sp,$sp,-24 -/* f055424: afbf0014 */ sw $ra,0x14($sp) -/* f055428: 0fc2421c */ jal func0f090870 -/* f05542c: 00002025 */ or $a0,$zero,$zero -/* f055430: 3c03800a */ lui $v1,0x800a -/* f055434: 24639fc0 */ addiu $v1,$v1,-24640 -/* f055438: 8c6e0438 */ lw $t6,0x438($v1) -/* f05543c: 8fbf0014 */ lw $ra,0x14($sp) -/* f055440: 27bd0018 */ addiu $sp,$sp,0x18 -/* f055444: 25cf0002 */ addiu $t7,$t6,0x2 -/* f055448: ac6f0438 */ sw $t7,0x438($v1) -/* f05544c: 03e00008 */ jr $ra -/* f055450: 00001025 */ or $v0,$zero,$zero -); +bool aiStopCountdownTimer(void) +{ + countdownTimerSetRunning(false); + g_Vars.aioffset += 2; + + return false; +} /** * @cmd 00c2 @@ -8073,7 +8064,7 @@ GLOBAL_ASM( glabel ai00c2 /* f055454: 27bdffe8 */ addiu $sp,$sp,-24 /* f055458: afbf0014 */ sw $ra,0x14($sp) -/* f05545c: 0fc2421c */ jal func0f090870 +/* f05545c: 0fc2421c */ jal countdownTimerSetRunning /* f055460: 24040001 */ addiu $a0,$zero,0x1 /* f055464: 3c03800a */ lui $v1,0x800a /* f055468: 24639fc0 */ addiu $v1,$v1,-24640 diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 344cb3800..c536c7604 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -54888,7 +54888,7 @@ glabel func0f090864 ); GLOBAL_ASM( -glabel func0f090870 +glabel countdownTimerSetRunning /* f090870: 3c018007 */ lui $at,0x8007 /* f090874: 03e00008 */ jr $ra /* f090878: ac249908 */ sw $a0,-0x66f8($at) diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index 236e2ebcc..afd91ca5b 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -195,7 +195,7 @@ /*0x00be*/ bool aiShowCountdownTimer(void); /*0x00bf*/ bool aiHideCountdownTimer(void); /*0x00c0*/ bool ai00c0(void); -/*0x00c1*/ bool ai00c1(void); +/*0x00c1*/ bool aiStopCountdownTimer(void); /*0x00c2*/ bool ai00c2(void); /*0x00c3*/ bool ai00c3(void); /*0x00c4*/ bool ai00c4(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 15f0ed4ea..38536500a 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14142,7 +14142,7 @@ bool (*command_pointers[])(void) = { /*0x00be*/ aiShowCountdownTimer, /*0x00bf*/ aiHideCountdownTimer, /*0x00c0*/ ai00c0, - /*0x00c1*/ ai00c1, + /*0x00c1*/ aiStopCountdownTimer, /*0x00c2*/ ai00c2, /*0x00c3*/ ai00c3, /*0x00c4*/ ai00c4,