From 8369eb14a4023ced08544009dd6156579b7b1d8e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 25 Dec 2019 21:47:05 +1000 Subject: [PATCH] Decompile getUptime --- src/game/game_1668e0.c | 10 ++++------ src/include/setup/setup_020df0.h | 1 + src/setup/setup_020df0.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 39c6a0f98..0b483ba6a 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -7341,12 +7341,10 @@ glabel func0f16cde0 /* f16cde8: ac244030 */ sw $a0,0x4030($at) ); -GLOBAL_ASM( -glabel getUptime -/* f16cdec: 3c018008 */ lui $at,0x8008 -/* f16cdf0: 03e00008 */ jr $ra -/* f16cdf4: c420403c */ lwc1 $f0,0x403c($at) -); +f32 getUptime(void) +{ + return g_Uptime; +} GLOBAL_ASM( glabel func0f16cdf8 diff --git a/src/include/setup/setup_020df0.h b/src/include/setup/setup_020df0.h index 7dccbf3ae..b99faddbc 100644 --- a/src/include/setup/setup_020df0.h +++ b/src/include/setup/setup_020df0.h @@ -208,6 +208,7 @@ extern void *filetable[]; extern u32 var80084008; extern s32 var80084034; extern u32 var80084038; +extern f32 g_Uptime; extern u32 var80084068; extern u32 var80084078; extern u32 var80084088; diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index e6b41c2a8..ab7a4c430 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -9584,7 +9584,7 @@ u32 var8008402c = 0x0000000a; u32 var80084030 = 0x00000014; s32 var80084034 = 0; u32 var80084038 = 0x00000000; -u32 var8008403c = 0x00000000; +f32 g_Uptime = 0; u32 var80084040 = 0x00000001; u32 var80084044 = 0x000005c8; u32 var80084048 = 0x00008068;