diff --git a/src/game/data/data_000000.c b/src/game/data/data_000000.c index ff9c42a80..c7bbb0fef 100644 --- a/src/game/data/data_000000.c +++ b/src/game/data/data_000000.c @@ -6948,7 +6948,7 @@ u32 var80061434 = 0x00000000; u32 var80061438 = 0x00000000; u32 var8006143c = 0x42480000; u32 var80061440 = 0x00000000; -u32 var80061444 = 0x00000001; +u32 var80061444 = 1; u32 var80061448 = 0x00000000; u32 var8006144c = 0x00000000; u32 var80061450 = 0x00000000; diff --git a/src/game/dlights.c b/src/game/dlights.c index edfeea37a..2fcb5bed6 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -841,22 +841,12 @@ void roomSetLightBroken(s32 roomnum, s32 lightnum) g_Rooms[roomnum].flags |= ROOMFLAG_DIRTY; } -GLOBAL_ASM( -glabel func0f001bdc -/* f001bdc: 3c0e8006 */ lui $t6,%hi(var80061444) -/* f001be0: 8dce1444 */ lw $t6,%lo(var80061444)($t6) -/* f001be4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f001be8: afbf0014 */ sw $ra,0x14($sp) -/* f001bec: 51c00004 */ beqzl $t6,.L0f001c00 -/* f001bf0: 8fbf0014 */ lw $ra,0x14($sp) -/* f001bf4: 0fc0131b */ jal func0f004c6c -/* f001bf8: 00000000 */ nop -/* f001bfc: 8fbf0014 */ lw $ra,0x14($sp) -.L0f001c00: -/* f001c00: 27bd0018 */ addiu $sp,$sp,0x18 -/* f001c04: 03e00008 */ jr $ra -/* f001c08: 00000000 */ nop -); +void func0f001bdc(void) +{ + if (var80061444) { + func0f004c6c(); + } +} GLOBAL_ASM( glabel func0f001c0c diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h index 233336e3c..ca3d55520 100644 --- a/src/include/game/data/data_000000.h +++ b/src/include/game/data/data_000000.h @@ -192,6 +192,7 @@ extern u32 var80061430; extern u32 var80061434; extern u32 var80061438; extern u32 var80061440; +extern u32 var80061444; extern u32 var80061460; extern u32 var80061468; extern s32 g_FootstepSounds[]; diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h index 3cd46163d..e8fd4dfc1 100644 --- a/src/include/game/dlights.h +++ b/src/include/game/dlights.h @@ -43,7 +43,7 @@ u32 func0f004314(void); u32 func0f00438c(void); u32 func0f004558(void); u32 func0f004604(void); -u32 func0f004c6c(void); +void func0f004c6c(void); u32 func0f00505c(void); u32 func0f0053d0(void); void func0f0056f4(s32 room1, struct coord *coord1, s32 room2, struct coord *coord2, s32 arg4, f32 *arg5, s32 arg6);