From be89d9c370d5fc9ff94764c57d98f20f8b8720f6 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 14 Jun 2021 22:27:57 +1000 Subject: [PATCH] Decompile func0f16692c --- src/game/game_1668e0.c | 26 ++++++-------------------- src/include/game/game_1668e0.h | 2 +- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 6db4ab079..31f7ad053 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -7,7 +7,7 @@ #include "types.h" u8 *var800a6660; -s16 *var800a6664; +s16 *var800a6664; // room numbers s16 *var800a6668; f32 *var800a666c; void *var800a6670; @@ -38,25 +38,11 @@ glabel func0f1668f0 /* f166928: a5250000 */ sh $a1,0x0($t1) ); -GLOBAL_ASM( -glabel func0f16692c -/* f16692c: 000578c0 */ sll $t7,$a1,0x3 -/* f166930: 01e57821 */ addu $t7,$t7,$a1 -/* f166934: 3c0e800a */ lui $t6,%hi(g_Rooms) -/* f166938: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) -/* f16693c: 000f7880 */ sll $t7,$t7,0x2 -/* f166940: 01e57823 */ subu $t7,$t7,$a1 -/* f166944: 000f7880 */ sll $t7,$t7,0x2 -/* f166948: 2402ffff */ addiu $v0,$zero,-1 -/* f16694c: 01cfc021 */ addu $t8,$t6,$t7 -/* f166950: a7020010 */ sh $v0,0x10($t8) -/* f166954: 3c19800a */ lui $t9,%hi(var800a6664) -/* f166958: 8f396664 */ lw $t9,%lo(var800a6664)($t9) -/* f16695c: 00044040 */ sll $t0,$a0,0x1 -/* f166960: 03284821 */ addu $t1,$t9,$t0 -/* f166964: 03e00008 */ jr $ra -/* f166968: a5220000 */ sh $v0,0x0($t1) -); +void func0f16692c(s32 index, s32 roomnum) +{ + g_Rooms[roomnum].unk10 = -1; + var800a6664[index] = -1; +} void func0f16696c(s32 index) { diff --git a/src/include/game/game_1668e0.h b/src/include/game/game_1668e0.h index 1e17a3c5d..105e78d14 100644 --- a/src/include/game/game_1668e0.h +++ b/src/include/game/game_1668e0.h @@ -6,7 +6,7 @@ void currentPlayerSetLastRoomForOffset(s32 room); u32 func0f1668f0(void); -void func0f16692c(s32 index, s32 arg1); +void func0f16692c(s32 index, s32 roomnum); void func0f16696c(s32 index); u32 func0f1669fc(void); u32 func0f166a6c(void);