diff --git a/src/game/dlights.c b/src/game/dlights.c index aa0b3bb37..40b24f92b 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -311,20 +311,10 @@ glabel func0f000b24 /* f000c24: 00000000 */ nop ); -GLOBAL_ASM( -glabel roomGetBrightness -/* f000c28: 000478c0 */ sll $t7,$a0,0x3 -/* f000c2c: 01e47821 */ addu $t7,$t7,$a0 -/* f000c30: 3c0e800a */ lui $t6,%hi(g_Rooms) -/* f000c34: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) -/* f000c38: 000f7880 */ sll $t7,$t7,0x2 -/* f000c3c: 01e47823 */ subu $t7,$t7,$a0 -/* f000c40: 000f7880 */ sll $t7,$t7,0x2 -/* f000c44: 01cfc021 */ addu $t8,$t6,$t7 -/* f000c48: 87190050 */ lh $t9,0x50($t8) -/* f000c4c: 03e00008 */ jr $ra -/* f000c50: 332200ff */ andi $v0,$t9,0xff -); +u8 roomGetBrightness(s32 room) +{ + return g_Rooms[room].brightness & 0xff; +} GLOBAL_ASM( glabel func0f000c54 diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h index 6f153a090..9d0e3d552 100644 --- a/src/include/game/dlights.h +++ b/src/include/game/dlights.h @@ -8,7 +8,7 @@ u32 func0f00097c(void); u32 func0f0009c0(void); u32 func0f000a10(void); u32 func0f000b24(void); -s32 roomGetBrightness(s16 room); +u8 roomGetBrightness(s32 room); u32 func0f000c54(void); u32 func0f000cc4(void); u32 func0f000dbc(void); diff --git a/src/include/types.h b/src/include/types.h index f12ec39d4..3a1622ae2 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3377,7 +3377,7 @@ struct room { /*0x4c*/ u8 unk4c; /*0x4d*/ u8 unk4d; /*0x4e*/ struct roombitfield bitfield; - /*0x50*/ u32 unk50; + /*0x50*/ s16 brightness; /*0x54*/ u32 unk54; /*0x58*/ u32 unk58; /*0x5c*/ u32 unk5c;