From 9bf2c35e5363295836eca312bef1f0ceed1945c2 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 14 Jun 2021 22:38:15 +1000
Subject: [PATCH] Decompile func0f166d7c

---
 src/game/game_013ee0.c         |  2 +-
 src/game/game_1668e0.c         | 34 +++++++++-------------------------
 src/include/bss.h              |  2 +-
 src/include/game/game_1668e0.h |  2 +-
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/game/game_013ee0.c b/src/game/game_013ee0.c
index eaf814930..7c2612411 100644
--- a/src/game/game_013ee0.c
+++ b/src/game/game_013ee0.c
@@ -19,7 +19,7 @@ void func0f013ee0(void)
 	var800a6664 = malloc(ALIGN16(var80082050 * sizeof(s16)), MEMPOOL_STAGE);
 	var800a6668 = malloc(ALIGN16(var80082050 * sizeof(s16)), MEMPOOL_STAGE);
 	var800a666c = malloc(ALIGN16(var80082050 * sizeof(f32)), MEMPOOL_STAGE);
-	var800a6670 = malloc(ALIGN16(var80082050 * 0x40), MEMPOOL_STAGE);
+	var800a6670 = malloc(ALIGN16(var80082050 * sizeof(Mtxf)), MEMPOOL_STAGE);
 
 	for (i = 0; i < PLAYERCOUNT(); i++) {
 		g_Vars.players[i]->lastroomforoffset = -1;
diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c
index ae991aa7a..063274d52 100644
--- a/src/game/game_1668e0.c
+++ b/src/game/game_1668e0.c
@@ -10,7 +10,7 @@ u8 *var800a6660;
 s16 *var800a6664; // room numbers
 s16 *var800a6668;
 f32 *var800a666c;
-void *var800a6670;
+Mtxf *var800a6670;
 
 s32 var80082050 = 0;
 
@@ -274,30 +274,14 @@ glabel func0f166c20
 /*  f166d78:	00000000 */ 	nop
 );
 
-GLOBAL_ASM(
-glabel func0f166d7c
-/*  f166d7c:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f166d80:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f166d84:	00803025 */ 	or	$a2,$a0,$zero
-/*  f166d88:	afa60018 */ 	sw	$a2,0x18($sp)
-/*  f166d8c:	0fc59b08 */ 	jal	func0f166c20
-/*  f166d90:	00a02025 */ 	or	$a0,$a1,$zero
-/*  f166d94:	8fa30018 */ 	lw	$v1,0x18($sp)
-/*  f166d98:	3c0e0102 */ 	lui	$t6,0x102
-/*  f166d9c:	35ce0040 */ 	ori	$t6,$t6,0x40
-/*  f166da0:	3c18800a */ 	lui	$t8,%hi(var800a6670)
-/*  f166da4:	ac6e0000 */ 	sw	$t6,0x0($v1)
-/*  f166da8:	8f186670 */ 	lw	$t8,%lo(var800a6670)($t8)
-/*  f166dac:	00027980 */ 	sll	$t7,$v0,0x6
-/*  f166db0:	24660008 */ 	addiu	$a2,$v1,0x8
-/*  f166db4:	01f8c821 */ 	addu	$t9,$t7,$t8
-/*  f166db8:	ac790004 */ 	sw	$t9,0x4($v1)
-/*  f166dbc:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f166dc0:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f166dc4:	00c01025 */ 	or	$v0,$a2,$zero
-/*  f166dc8:	03e00008 */ 	jr	$ra
-/*  f166dcc:	00000000 */ 	nop
-);
+Gfx *func0f166d7c(Gfx *gdl, s32 roomnum)
+{
+	s32 index = func0f166c20(roomnum);
+
+	gSPMatrix(gdl++, &var800a6670[index], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+	return gdl;
+}
 
 struct coord *func0f166dd0(s32 room)
 {
diff --git a/src/include/bss.h b/src/include/bss.h
index c458df5a3..9a99445ba 100644
--- a/src/include/bss.h
+++ b/src/include/bss.h
@@ -252,7 +252,7 @@ extern u8 *var800a6660;
 extern s16 *var800a6664;
 extern s16 *var800a6668;
 extern f32 *var800a666c;
-extern void *var800a6670;
+extern Mtxf *var800a6670;
 extern struct fileinfo g_FileInfo[NUM_FILES];
 extern u8 *g_VtxBuffers[3];
 extern u8 *g_GfxMemPos;
diff --git a/src/include/game/game_1668e0.h b/src/include/game/game_1668e0.h
index 7b8ba2fb5..f92d594f8 100644
--- a/src/include/game/game_1668e0.h
+++ b/src/include/game/game_1668e0.h
@@ -10,7 +10,7 @@ void func0f16692c(s32 index, s32 roomnum);
 void func0f16696c(s32 index);
 s32 func0f1669fc(void);
 u32 func0f166a6c(void);
-u32 func0f166c20(void);
+s32 func0f166c20(s32 roomnum);
 Gfx *func0f166d7c(Gfx *gdl, s32 roomnum);
 struct coord *func0f166dd0(s32 room);
 void func0f166df0(s32 room, struct coord *globaldrawworldoffset);