diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 8e31c8673..529927f8c 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -6389,11 +6389,11 @@ bool aiStartCountdownTimer(void) /** * @cmd 00c3 */ -bool ai00c3(void) +bool aiIfCountdownTimerStopped(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (!func0f09087c()) { + if (!countdownTimerIsRunning()) { g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 0cbe605b8..ee44af449 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -54876,12 +54876,10 @@ void countdownTimerSetRunning(bool running) g_CountdownTimerRunning = running; } -GLOBAL_ASM( -glabel func0f09087c -/* f09087c: 3c028007 */ lui $v0,0x8007 -/* f090880: 03e00008 */ jr $ra -/* f090884: 8c429908 */ lw $v0,-0x66f8($v0) -); +bool countdownTimerIsRunning(void) +{ + return g_CountdownTimerRunning; +} GLOBAL_ASM( glabel func0f090888 diff --git a/src/include/commands.h b/src/include/commands.h index 1fba95893..8d3182708 100644 --- a/src/include/commands.h +++ b/src/include/commands.h @@ -835,6 +835,10 @@ #define start_countdown_timer \ mkshort(0x00c2), +#define if_countdown_timer_stopped(label) \ + mkshort(0x00c3), \ + label, + #define if_countdown_timer_lt(value, label) \ mkshort(0x00c4), \ mkshort(value), \ diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index fe483daae..d5153845a 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -197,7 +197,7 @@ /*0x00c0*/ bool ai00c0(void); /*0x00c1*/ bool aiStopCountdownTimer(void); /*0x00c2*/ bool aiStartCountdownTimer(void); -/*0x00c3*/ bool ai00c3(void); +/*0x00c3*/ bool aiIfCountdownTimerStopped(void); /*0x00c4*/ bool ai00c4(void); /*0x00c5*/ bool ai00c5(void); /*0x00c6*/ bool ai00c6(void); diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index e23550edb..5e5cee394 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14148,7 +14148,7 @@ bool (*g_CommandPointers[])(void) = { /*0x00c0*/ ai00c0, /*0x00c1*/ aiStopCountdownTimer, /*0x00c2*/ aiStartCountdownTimer, - /*0x00c3*/ ai00c3, + /*0x00c3*/ aiIfCountdownTimerStopped, /*0x00c4*/ ai00c4, /*0x00c5*/ ai00c5, /*0x00c6*/ ai00c6,