From f20e6bb0493fd40239c1230078fa275417ef4c51 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 2 Sep 2020 08:08:59 +1000
Subject: [PATCH] Decompile func0f000c54

---
 src/game/dlights.c         | 46 ++++++++++----------------------------
 src/include/constants.h    |  1 +
 src/include/game/dlights.h |  2 +-
 3 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/game/dlights.c b/src/game/dlights.c
index ec2c511c3..91bf2b9ac 100644
--- a/src/game/dlights.c
+++ b/src/game/dlights.c
@@ -289,40 +289,18 @@ u8 roomGetBrightness(s32 room)
 	return g_Rooms[room].brightness & 0xff;
 }
 
-GLOBAL_ASM(
-glabel func0f000c54
-/*  f000c54:	000478c0 */ 	sll	$t7,$a0,0x3
-/*  f000c58:	01e47821 */ 	addu	$t7,$t7,$a0
-/*  f000c5c:	3c0e800a */ 	lui	$t6,%hi(g_Rooms)
-/*  f000c60:	8dce4928 */ 	lw	$t6,%lo(g_Rooms)($t6)
-/*  f000c64:	000f7880 */ 	sll	$t7,$t7,0x2
-/*  f000c68:	01e47823 */ 	subu	$t7,$t7,$a0
-/*  f000c6c:	000f7880 */ 	sll	$t7,$t7,0x2
-/*  f000c70:	01cf1021 */ 	addu	$v0,$t6,$t7
-/*  f000c74:	84430052 */ 	lh	$v1,0x52($v0)
-/*  f000c78:	28610100 */ 	slti	$at,$v1,0x100
-/*  f000c7c:	14200003 */ 	bnez	$at,.L0f000c8c
-/*  f000c80:	00000000 */ 	nop
-/*  f000c84:	03e00008 */ 	jr	$ra
-/*  f000c88:	240200ff */ 	addiu	$v0,$zero,0xff
-.L0f000c8c:
-/*  f000c8c:	04630004 */ 	bgezl	$v1,.L0f000ca0
-/*  f000c90:	94580000 */ 	lhu	$t8,0x0($v0)
-/*  f000c94:	03e00008 */ 	jr	$ra
-/*  f000c98:	00001025 */ 	or	$v0,$zero,$zero
-/*  f000c9c:	94580000 */ 	lhu	$t8,0x0($v0)
-.L0f000ca0:
-/*  f000ca0:	00002025 */ 	or	$a0,$zero,$zero
-/*  f000ca4:	33190040 */ 	andi	$t9,$t8,0x40
-/*  f000ca8:	13200003 */ 	beqz	$t9,.L0f000cb8
-/*  f000cac:	00000000 */ 	nop
-/*  f000cb0:	10000001 */ 	b	.L0f000cb8
-/*  f000cb4:	00602025 */ 	or	$a0,$v1,$zero
-.L0f000cb8:
-/*  f000cb8:	00801025 */ 	or	$v0,$a0,$zero
-/*  f000cbc:	03e00008 */ 	jr	$ra
-/*  f000cc0:	00000000 */ 	nop
-);
+s32 func0f000c54(s32 roomnum)
+{
+	if (g_Rooms[roomnum].unk52 > 255) {
+		return 255;
+	}
+
+	if (g_Rooms[roomnum].unk52 < 0) {
+		return 0;
+	}
+
+	return (g_Rooms[roomnum].flags & ROOMFLAG_0040) ? g_Rooms[roomnum].unk52 : 0;
+}
 
 GLOBAL_ASM(
 glabel func0f000cc4
diff --git a/src/include/constants.h b/src/include/constants.h
index d29ae4ded..09ea2282c 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -2407,6 +2407,7 @@
 #define ROOMFLAG_DISABLED         0x0001
 #define ROOMFLAG_VISIBLEBYPLAYER  0x0004
 #define ROOMFLAG_VISIBLEBYAIBOT   0x0008
+#define ROOMFLAG_0040             0x0040
 #define ROOMFLAG_DIRTY            0x0100
 #define ROOMFLAG_1000             0x1000
 #define ROOMFLAG_LIGHTSOFF        0x2000
diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h
index f00f38b67..30678bb36 100644
--- a/src/include/game/dlights.h
+++ b/src/include/game/dlights.h
@@ -9,7 +9,7 @@ u8 func0f0009c0(s32 roomnum);
 u32 func0f000a10(void);
 u32 func0f000b24(void);
 u8 roomGetBrightness(s32 room);
-u32 func0f000c54(void);
+s32 func0f000c54(s32 roomnum);
 u32 func0f000cc4(void);
 u32 func0f000dbc(void);
 u32 func0f000dfc(void);