Decompile func0f000f94

This commit is contained in:
Ryan Dwyer 2020-09-02 08:25:45 +10:00
parent 661c735c59
commit 02c26de5dc
3 changed files with 9 additions and 14 deletions

View File

@ -494,19 +494,12 @@ glabel func0f000f50
/* f000f90: 00000000 */ nop
);
GLOBAL_ASM(
glabel func0f000f94
/* f000f94: 27bdffe8 */ addiu $sp,$sp,-24
/* f000f98: afbf0014 */ sw $ra,0x14($sp)
/* f000f9c: 0fc0025f */ jal roomGetLight
/* f000fa0: 00000000 */ nop
/* f000fa4: 94420004 */ lhu $v0,0x4($v0)
/* f000fa8: 8fbf0014 */ lw $ra,0x14($sp)
/* f000fac: 27bd0018 */ addiu $sp,$sp,0x18
/* f000fb0: 00027700 */ sll $t6,$v0,0x1c
/* f000fb4: 03e00008 */ jr $ra
/* f000fb8: 000e17c2 */ srl $v0,$t6,0x1f
);
bool func0f000f94(s32 roomnum, s32 lightnum)
{
struct light *light = roomGetLight(roomnum, lightnum);
return light->unk05_04;
}
GLOBAL_ASM(
glabel func0f000fbc

View File

@ -14,7 +14,7 @@ u32 func0f000cc4(void);
f32 func0f000dbc(s32 roomnum);
u32 func0f000dfc(void);
u32 func0f000f50(void);
u32 func0f000f94(void);
bool func0f000f94(s32 roomnum, s32 lightnum);
u32 func0f000fbc(void);
u32 func0f001000(void);
u32 func0f0010d8(void);

View File

@ -6367,6 +6367,8 @@ struct light {
/*0x05*/ u8 unk05_00 : 1;
/*0x05*/ u8 healthy : 1; // just a guess based on context
/*0x05*/ u8 on : 1;
/*0x05*/ u8 unk05_03 : 1;
/*0x05*/ u8 unk05_04 : 1;
/*0x06*/ u16 unk06;
/*0x08*/ u16 unk08;
/*0x0a*/ s16 x1;