diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index d2a4e469f..8a46d1018 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -65,7 +65,7 @@ u32 var8006295c = 0x00000000; void *var80062960 = NULL; u32 var80062964 = 0x00000000; f32 var80062968 = 0; -u32 var8006296c = 0x00000000; +bool var8006296c = false; u32 var80062970 = 0x00000000; u32 var80062974 = 0x00000000; u32 var80062978 = 0x00000000; @@ -9605,13 +9605,14 @@ void func0f028490(f32 arg1) // empty } +void func0f028498(bool value) +{ + var8006296c = value; + var8005efbc = value; +} + GLOBAL_ASM( -glabel func0f028498 -/* f028498: 3c018006 */ lui $at,%hi(var8006296c) -/* f02849c: ac24296c */ sw $a0,%lo(var8006296c)($at) -/* f0284a0: 3c018006 */ lui $at,%hi(var8005efbc) -/* f0284a4: 03e00008 */ jr $ra -/* f0284a8: ac24efbc */ sw $a0,%lo(var8005efbc)($at) +glabel func0f0284ac /* f0284ac: 3c038006 */ lui $v1,%hi(var80062970) /* f0284b0: 24632970 */ addiu $v1,$v1,%lo(var80062970) /* f0284b4: 8c6e0000 */ lw $t6,0x0($v1) diff --git a/src/game/data/data_003dc0.c b/src/game/data/data_003dc0.c index 9a7f2de93..6adcef0c1 100644 --- a/src/game/data/data_003dc0.c +++ b/src/game/data/data_003dc0.c @@ -56,7 +56,7 @@ u32 var8005efac = 0x00000000; u32 var8005efb0 = 0x00000000; u32 var8005efb4 = 0x00000000; u32 var8005efb8 = 0x3f800000; -u32 var8005efbc = 0x00000000; +bool var8005efbc = false; u32 var8005efc0 = 0x00000000; void *var8005efc4 = NULL; // pointer to a function void *var8005efc8 = NULL; // pointer to a function diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index e95192199..a3f7ad58e 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -42,7 +42,7 @@ u32 func0f0270f4(void); f32 func0f0278a4(struct chrdata *chr); u32 func0f027994(void); u32 func0f027e1c(void); -void func0f028498(bool arg0); +void func0f028498(bool value); void func0f028590(f32 arg0); u32 func0f028a50(void); u32 func0f028d50(void); diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h index 28c477245..05d7848ab 100644 --- a/src/include/game/data/data_000000.h +++ b/src/include/game/data/data_000000.h @@ -145,6 +145,7 @@ extern u32 var8005ef7c; extern u32 var8005ef90; extern u32 var8005efb4; extern u32 var8005efb8; +extern bool var8005efbc; extern void *var8005efc8; extern u32 var8005efcc; extern u32 var8005efd0; diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h index f4d96ba47..e34eea37e 100644 --- a/src/include/game/data/data_0083d0.h +++ b/src/include/game/data/data_0083d0.h @@ -82,7 +82,7 @@ extern bool g_WeatherTickEnabled; extern void *var80062960; extern u32 var80062964; extern f32 var80062968; -extern u32 var8006296c; +extern bool var8006296c; extern u32 var80062970; extern u32 var80062974; extern u32 var80062978;