mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-18 21:18:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile func0f162128

Browse Source
This commit is contained in:
Ryan Dwyer
2020-11-29 23:39:18 +10:00
parent 220c1c09ec
commit 1e5a1234c4
3 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_157db0.c
+8 -32
View File
@@ -12340,38 +12340,14 @@ glabel func0f161d30
/* f162124: 27bd00a0 */ addiu $sp,$sp,0xa0
);
GLOBAL_ASM(
glabel func0f162128
/* f162128: 27bdffe8 */ addiu $sp,$sp,-24
/* f16212c: afa5001c */ sw $a1,0x1c($sp)
/* f162130: 00057400 */ sll $t6,$a1,0x10
/* f162134: 000e2c03 */ sra $a1,$t6,0x10
/* f162138: 0005c8c0 */ sll $t9,$a1,0x3
/* f16213c: 0325c821 */ addu $t9,$t9,$a1
/* f162140: 3c18800a */ lui $t8,%hi(g_Rooms)
/* f162144: 8f184928 */ lw $t8,%lo(g_Rooms)($t8)
/* f162148: 0019c880 */ sll $t9,$t9,0x2
/* f16214c: 0325c823 */ subu $t9,$t9,$a1
/* f162150: 0019c880 */ sll $t9,$t9,0x2
/* f162154: afbf0014 */ sw $ra,0x14($sp)
/* f162158: 03194021 */ addu $t0,$t8,$t9
/* f16215c: 95090000 */ lhu $t1,0x0($t0)
/* f162160: 312a0010 */ andi $t2,$t1,0x10
/* f162164: 11400005 */ beqz $t2,.L0f16217c
/* f162168: 00000000 */ nop
/* f16216c: 0fc5874c */ jal func0f161d30
/* f162170: 00000000 */ nop
/* f162174: 10000004 */ b .L0f162188
/* f162178: 8fbf0014 */ lw $ra,0x14($sp)
.L0f16217c:
/* f16217c: 0fc58702 */ jal func0f161c08
/* f162180: 00000000 */ nop
/* f162184: 8fbf0014 */ lw $ra,0x14($sp)
.L0f162188:
/* f162188: 27bd0018 */ addiu $sp,$sp,0x18
/* f16218c: 03e00008 */ jr $ra
/* f162190: 00000000 */ nop
);
void func0f162128(f32 *arg0, s16 roomnum)
{
if (g_Rooms[roomnum].flags & ROOMFLAG_0010) {
func0f161d30(arg0, roomnum);
} else {
func0f161c08(arg0, roomnum);
}
}
GLOBAL_ASM(
glabel func0f162194
src/include/constants.h
+1
View File
@@ -2580,6 +2580,7 @@
#define ROOMFLAG_DISABLED 0x0001
#define ROOMFLAG_VISIBLEBYPLAYER 0x0004
#define ROOMFLAG_VISIBLEBYAIBOT 0x0008
#define ROOMFLAG_0010 0x0010
#define ROOMFLAG_0040 0x0040
#define ROOMFLAG_RENDERALWAYS 0x0080
#define ROOMFLAG_DIRTY 0x0100
src/include/game/game_157db0.h
+3 -3
View File
@@ -72,9 +72,9 @@ u32 func0f1612e4(void);
u32 func0f161520(void);
s32 func0f161ab4(s32 room);
u32 func0f161adc(void);
u32 func0f161c08(void);
u32 func0f161d30(void);
u32 func0f162128(void);
void func0f161c08(f32 *arg0, s16 roomnum);
void func0f161d30(f32 *arg0, s16 roomnum);
void func0f162128(f32 *arg0, s16 roomnum);
void func0f162194(struct coord *arg0, s16 *rooms, s16 *arg2, s32 arg3, s16 *arg4);
bool portalPushValue(bool value);
bool portalPopValue(void);