diff --git a/src/game/dlights.c b/src/game/dlights.c index 72a58e82b..a3f1e64d3 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -2909,49 +2909,22 @@ glabel func0f002ef8 /* f0033ac: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f0033b0 -/* f0033b0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0033b4: afbf0014 */ sw $ra,0x14($sp) -/* f0033b8: 0fc00deb */ jal func0f0037ac -/* f0033bc: 00000000 */ nop -/* f0033c0: 3c07800a */ lui $a3,%hi(g_Vars) -/* f0033c4: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) -/* f0033c8: 90ee04e1 */ lbu $t6,0x4e1($a3) -/* f0033cc: 51c0001a */ beqzl $t6,.L0f003438 -/* f0033d0: 8fbf0014 */ lw $ra,0x14($sp) -/* f0033d4: 0fc5048d */ jal func0f141234 -/* f0033d8: 00000000 */ nop -/* f0033dc: 3c07800a */ lui $a3,%hi(g_Vars) -/* f0033e0: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) -/* f0033e4: 8cef02bc */ lw $t7,0x2bc($a3) -/* f0033e8: a0e004e1 */ sb $zero,0x4e1($a3) -/* f0033ec: 24030001 */ addiu $v1,$zero,0x1 -/* f0033f0: 29e10002 */ slti $at,$t7,0x2 -/* f0033f4: 1420000f */ bnez $at,.L0f003434 -/* f0033f8: 2404008c */ addiu $a0,$zero,0x8c -/* f0033fc: 3c05800a */ lui $a1,%hi(g_Rooms) -/* f003400: 24a54928 */ addiu $a1,$a1,%lo(g_Rooms) -/* f003404: 2406efff */ addiu $a2,$zero,-4097 -/* f003408: 8cb80000 */ lw $t8,0x0($a1) -.L0f00340c: -/* f00340c: 24630001 */ addiu $v1,$v1,0x1 -/* f003410: 03041021 */ addu $v0,$t8,$a0 -/* f003414: 94590000 */ lhu $t9,0x0($v0) -/* f003418: 2484008c */ addiu $a0,$a0,0x8c -/* f00341c: 03264024 */ and $t0,$t9,$a2 -/* f003420: a4480000 */ sh $t0,0x0($v0) -/* f003424: 8ce902bc */ lw $t1,0x2bc($a3) -/* f003428: 0069082a */ slt $at,$v1,$t1 -/* f00342c: 5420fff7 */ bnezl $at,.L0f00340c -/* f003430: 8cb80000 */ lw $t8,0x0($a1) -.L0f003434: -/* f003434: 8fbf0014 */ lw $ra,0x14($sp) -.L0f003438: -/* f003438: 27bd0018 */ addiu $sp,$sp,0x18 -/* f00343c: 03e00008 */ jr $ra -/* f003440: 00000000 */ nop -); +void func0f0033b0(void) +{ + s32 i; + + func0f0037ac(); + + if (g_Vars.unk0004e1) { + func0f141234(); + + g_Vars.unk0004e1 = 0; + + for (i = 1; i < g_Vars.roomcount; i++) { + g_Rooms[i].flags &= ~ROOMFLAG_1000; + } + } +} GLOBAL_ASM( glabel func0f003444 diff --git a/src/include/constants.h b/src/include/constants.h index 6ad41948a..e3b077719 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -2408,6 +2408,7 @@ #define ROOMFLAG_VISIBLEBYPLAYER 0x0004 #define ROOMFLAG_VISIBLEBYAIBOT 0x0008 #define ROOMFLAG_0100 0x0100 +#define ROOMFLAG_1000 0x1000 #define ROOMFLAG_LIGHTSOFF 0x2000 #define ROOMFLAG_PLAYAMBIENTTRACK 0x4000 #define ROOMFLAG_OUTDOORS 0x8000 diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h index ef7dc0b67..1bd4761ef 100644 --- a/src/include/game/dlights.h +++ b/src/include/game/dlights.h @@ -38,7 +38,7 @@ void func0f0033b0(void); u32 func0f003444(void); u32 func0f0035c0(void); u32 func0f00372c(void); -u32 func0f0037ac(void); +void func0f0037ac(void); u32 func0f004314(void); u32 func0f00438c(void); u32 func0f004558(void); diff --git a/src/include/game/wallhit.h b/src/include/game/wallhit.h index d17f2afee..0b0abb05a 100644 --- a/src/include/game/wallhit.h +++ b/src/include/game/wallhit.h @@ -19,7 +19,7 @@ u32 func0f1408a8(void); u32 func0f140b7c(void); u32 func0f140e20(void); u32 func0f1411b0(void); -u32 func0f141234(void); +void func0f141234(void); void func0f14159c(struct prop *prop); u32 func0f141704(void);