From 685f08500a0cc23b01a7298b675ef0e42350d4b0 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 3 Nov 2019 21:05:44 +1000 Subject: [PATCH] Decompile countdownTimerSetRunning --- src/game/game_0601b0.c | 10 ++++------ src/include/setup/setup_000000.h | 1 + src/setup/setup_000000.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 45b601d5e..0cbe605b8 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -54871,12 +54871,10 @@ glabel func0f090864 /* f09086c: c420990c */ lwc1 $f0,-0x66f4($at) ); -GLOBAL_ASM( -glabel countdownTimerSetRunning -/* f090870: 3c018007 */ lui $at,0x8007 -/* f090874: 03e00008 */ jr $ra -/* f090878: ac249908 */ sw $a0,-0x66f8($at) -); +void countdownTimerSetRunning(bool running) +{ + g_CountdownTimerRunning = running; +} GLOBAL_ASM( glabel func0f09087c diff --git a/src/include/setup/setup_000000.h b/src/include/setup/setup_000000.h index ac264e5ac..5da776e20 100644 --- a/src/include/setup/setup_000000.h +++ b/src/include/setup/setup_000000.h @@ -23,6 +23,7 @@ extern u32 var800663d8; extern u32 var80067b30; extern u32 var80067b78; extern u32 g_CountdownTimerVisible; +extern bool g_CountdownTimerRunning; extern u32 g_StageFlags; extern struct audiodefinition audiodefinitions[]; diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index c02f84866..e23550edb 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14959,8 +14959,8 @@ u32 var800698fc = 0x00000000; u32 var80069900 = 0x00000000; u32 g_CountdownTimerVisible = 1; // 80069904 +bool g_CountdownTimerRunning = false; // 80069908 -u32 var80069908 = 0x00000000; u32 var8006990c = 0x00000000; u32 var80069910 = 0x00000000; u32 var80069914 = 0x00000000;