From c4a261aa0a20eb8c487495cf30d7253858c3bde0 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 13 Nov 2020 18:33:32 +1000
Subject: [PATCH] Decompile func0f116bdc

---
 src/game/pak/pak.c         | 32 +++++++++-----------------------
 src/include/game/pak/pak.h |  2 +-
 src/include/types.h        |  4 +++-
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c
index 52b40d130..d037f3bdb 100644
--- a/src/game/pak/pak.c
+++ b/src/game/pak/pak.c
@@ -309,9 +309,9 @@ glabel func0f11693c
 /*  f116960:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-s32 func0f116984(s8 arg0)
+void func0f116984(s8 arg0, u8 *arg1, u8 *arg2)
 {
-	return func0f116bdc(arg0);
+	func0f116bdc(arg0, arg1, arg2);
 }
 
 void func0f11698c(u32 arg0)
@@ -382,28 +382,14 @@ bool func0f116b5c(s8 device)
 	return false;
 }
 
+void func0f116bdc(s8 device, u8 *arg1, u8 *arg2)
+{
+	*arg1 = var800a2380[device].unk2ba;
+	*arg2 = var800a2380[device].unk2bb;
+}
+
 GLOBAL_ASM(
-glabel func0f116bdc
-/*  f116bdc:	00047600 */ 	sll	$t6,$a0,0x18
-/*  f116be0:	000e7e03 */ 	sra	$t7,$t6,0x18
-/*  f116be4:	000fc080 */ 	sll	$t8,$t7,0x2
-/*  f116be8:	030fc023 */ 	subu	$t8,$t8,$t7
-/*  f116bec:	0018c080 */ 	sll	$t8,$t8,0x2
-/*  f116bf0:	030fc023 */ 	subu	$t8,$t8,$t7
-/*  f116bf4:	0018c080 */ 	sll	$t8,$t8,0x2
-/*  f116bf8:	030fc021 */ 	addu	$t8,$t8,$t7
-/*  f116bfc:	0018c080 */ 	sll	$t8,$t8,0x2
-/*  f116c00:	030fc023 */ 	subu	$t8,$t8,$t7
-/*  f116c04:	3c19800a */ 	lui	$t9,%hi(var800a2380)
-/*  f116c08:	27392380 */ 	addiu	$t9,$t9,%lo(var800a2380)
-/*  f116c0c:	0018c080 */ 	sll	$t8,$t8,0x2
-/*  f116c10:	03191021 */ 	addu	$v0,$t8,$t9
-/*  f116c14:	904802ba */ 	lbu	$t0,0x2ba($v0)
-/*  f116c18:	afa40000 */ 	sw	$a0,0x0($sp)
-/*  f116c1c:	a0a80000 */ 	sb	$t0,0x0($a1)
-/*  f116c20:	904902bb */ 	lbu	$t1,0x2bb($v0)
-/*  f116c24:	03e00008 */ 	jr	$ra
-/*  f116c28:	a0c90000 */ 	sb	$t1,0x0($a2)
+glabel func0f116c2c
 /*  f116c2c:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f116c30:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f116c34:	afa40018 */ 	sw	$a0,0x18($sp)
diff --git a/src/include/game/pak/pak.h b/src/include/game/pak/pak.h
index 5b5782627..0b235ba9d 100644
--- a/src/include/game/pak/pak.h
+++ b/src/include/game/pak/pak.h
@@ -22,7 +22,7 @@ void func0f116994(void);
 void func0f1169c8(s8 device, s32 arg1);
 bool func0f116aec(s8 device);
 bool func0f116b5c(s8 device);
-s32 func0f116bdc(s8 arg0);
+void func0f116bdc(s8 device, u8 *arg1, u8 *arg2);
 u32 func0f116c54(void);
 u32 func0f116c94(void);
 void func0f116db0(s8 arg0, s32 arg1);
diff --git a/src/include/types.h b/src/include/types.h
index 0e5c45e0c..91d475da6 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -5277,7 +5277,9 @@ struct var800a2380 {
 	/*0x2ac*/ u32 unk2ac;
 	/*0x2b0*/ u32 unk2b0;
 	/*0x2b4*/ f32 unk2b4;
-	/*0x2b8*/ u32 unk2b8;
+	/*0x2b8*/ u16 unk2b8;
+	/*0x2ba*/ u8 unk2ba;
+	/*0x2bb*/ u8 unk2bb;
 	/*0x2bc*/ u32 unk2bc;
 	/*0x2c0*/ u32 unk2c0;
 	/*0x2c4*/ u32 unk2c4;