diff --git a/src/game/dlights.c b/src/game/dlights.c index e5f9835bc..fb3c02f88 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -289,18 +289,13 @@ bool lightIsOn(s32 roomnum, s32 lightnum) return on; } +void roomSetUnk52(s32 roomnum, s32 value) +{ + g_Rooms[roomnum].unk52 = value; +} + GLOBAL_ASM( -glabel func0f001000 -/* f001000: 000478c0 */ sll $t7,$a0,0x3 -/* f001004: 01e47821 */ addu $t7,$t7,$a0 -/* f001008: 3c0e800a */ lui $t6,%hi(g_Rooms) -/* f00100c: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) -/* f001010: 000f7880 */ sll $t7,$t7,0x2 -/* f001014: 01e47823 */ subu $t7,$t7,$a0 -/* f001018: 000f7880 */ sll $t7,$t7,0x2 -/* f00101c: 01cfc021 */ addu $t8,$t6,$t7 -/* f001020: 03e00008 */ jr $ra -/* f001024: a7050052 */ sh $a1,0x52($t8) +glabel func0f001028 /* f001028: 000478c0 */ sll $t7,$a0,0x3 /* f00102c: 01e47821 */ addu $t7,$t7,$a0 /* f001030: 3c0e800a */ lui $t6,%hi(g_Rooms) diff --git a/src/game/weather.c b/src/game/weather.c index 2eb6fa1e4..048d8b9ea 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -2554,7 +2554,7 @@ glabel var7f1b5780 /* f133540: 02002025 */ or $a0,$s0,$zero /* f133544: 14400003 */ bnez $v0,.L0f133554 /* f133548: 02002025 */ or $a0,$s0,$zero -/* f13354c: 0fc00400 */ jal func0f001000 +/* f13354c: 0fc00400 */ jal roomSetUnk52 /* f133550: 02202825 */ or $a1,$s1,$zero .L0f133554: /* f133554: 8e6d02bc */ lw $t5,0x2bc($s3) diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h index 0f49680d3..80f2b7d27 100644 --- a/src/include/game/dlights.h +++ b/src/include/game/dlights.h @@ -16,7 +16,7 @@ bool lightGetBboxCentre(s32 roomnum, u32 lightnum, struct coord *pos); bool lightIsHealthy(s32 roomnum, s32 lightnum); bool func0f000f94(s32 roomnum, s32 lightnum); bool lightIsOn(s32 roomnum, s32 lightnum); -u32 func0f001000(void); +void roomSetUnk52(s32 roomnum, s32 value); u32 func0f0010d8(void); u32 func0f001138(void); u32 func0f001300(void);