diff --git a/src/game/game_015470.c b/src/game/game_015470.c index b504e6fa7..f62c38024 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -21,7 +21,7 @@ const u32 var7f1a83b8[] = {0x00000000}; const u32 var7f1a83bc[] = {0x00000000}; u32 var80062410 = 0x00000000; -u32 var80062414 = 0x03000000; +u8 var80062414 = 3; u32 var80062418 = 0x00dc0000; u32 var8006241c = 0x00dc0000; u32 var80062420 = 0x00ff0000; @@ -801,10 +801,9 @@ glabel func0f0155f0 /* f0160dc: 8fb00020 */ lw $s0,0x20($sp) /* f0160e0: 03e00008 */ jr $ra /* f0160e4: 27bd0038 */ addiu $sp,$sp,0x38 -/* f0160e8: 3c028006 */ lui $v0,%hi(var80062414) -/* f0160ec: 90422414 */ lbu $v0,%lo(var80062414)($v0) -/* f0160f0: 384e0002 */ xori $t6,$v0,0x2 -/* f0160f4: 03e00008 */ jr $ra -/* f0160f8: 2dc20001 */ sltiu $v0,$t6,0x1 -/* f0160fc: 00000000 */ nop ); + +bool func0f0160e8(void) +{ + return (var80062414 ^ 2) == 0; +} diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h index 9aaa5dcfb..bff570139 100644 --- a/src/include/game/data/data_0083d0.h +++ b/src/include/game/data/data_0083d0.h @@ -7,7 +7,6 @@ extern u32 var800623b0; extern s32 g_WeatherActive; extern u32 var80062400; extern u32 var80062410; -extern u32 var80062414; extern u32 var80062448; extern u32 var80062450; extern u32 var80062460;