From e96ad19fb6f1529841f2f3e61e8e641e6a3be6a0 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 14 Apr 2020 19:56:14 +1000 Subject: [PATCH] Decompile func0f02124c --- src/game/chr/chr.c | 10 ++++------ src/game/data/data_0083d0.c | 2 +- src/include/game/data/data_0083d0.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index e884d1937..42f6e3a33 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -3146,12 +3146,10 @@ glabel func0f0211a8 /* f021248: 27bd0030 */ addiu $sp,$sp,0x30 ); -GLOBAL_ASM( -glabel func0f02124c -/* f02124c: 3c018006 */ lui $at,0x8006 -/* f021250: 03e00008 */ jr $ra -/* f021254: c4202968 */ lwc1 $f0,0x2968($at) -); +f32 func0f02124c(void) +{ + return var80062968; +} GLOBAL_ASM( glabel func0f021258 diff --git a/src/game/data/data_0083d0.c b/src/game/data/data_0083d0.c index b8b46ef15..9088bb9fc 100644 --- a/src/game/data/data_0083d0.c +++ b/src/game/data/data_0083d0.c @@ -375,7 +375,7 @@ u32 var80062958 = 0x00000000; u32 var8006295c = 0x00000000; u32 var80062960 = 0x00000000; u32 var80062964 = 0x00000000; -u32 var80062968 = 0x00000000; +f32 var80062968 = 0; u32 var8006296c = 0x00000000; u32 var80062970 = 0x00000000; u32 var80062974 = 0x00000000; diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h index 81bd686a6..1d816aaf3 100644 --- a/src/include/game/data/data_0083d0.h +++ b/src/include/game/data/data_0083d0.h @@ -87,7 +87,7 @@ extern u32 var80062950; extern bool g_WeatherTickEnabled; extern u32 var80062960; extern u32 var80062964; -extern u32 var80062968; +extern f32 var80062968; extern u32 var80062970; extern u32 var80062974; extern u32 var8006297c;