From 57ca9b414a298ec3e92e560b27b6f90f48f7b61c Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 30 May 2020 17:04:32 +1000
Subject: [PATCH] Decompile func0f01adb8

---
 src/game/data/data_0083d0.c         |  2 +-
 src/game/game_016100.c              | 43 +++++++----------------------
 src/include/game/data/data_0083d0.h |  1 +
 src/include/lib/lib_09660.h         |  2 +-
 4 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/src/game/data/data_0083d0.c b/src/game/data/data_0083d0.c
index b824ae098..61d17c2ae 100644
--- a/src/game/data/data_0083d0.c
+++ b/src/game/data/data_0083d0.c
@@ -69,7 +69,7 @@ u32 var80062490 = 0x00000000;
 u32 var80062494 = 0x00000001;
 u32 var80062498 = 0x00000000;
 u32 var8006249c = 0x00000000;
-u32 var800624a0 = 0x01e00000;
+s16 var800624a0 = 480;
 u32 var800624a4 = 0x00000000;
 u32 var800624a8 = 0x00000000;
 u32 var800624ac = 0x00000000;
diff --git a/src/game/game_016100.c b/src/game/game_016100.c
index 881f1e267..4d36d2444 100644
--- a/src/game/game_016100.c
+++ b/src/game/game_016100.c
@@ -5500,39 +5500,16 @@ bool func0f01ad5c(void)
 	return true;
 }
 
-GLOBAL_ASM(
-glabel func0f01adb8
-/*  f01adb8:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f01adbc:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f01adc0:	0c002aac */ 	jal	func0000aab0
-/*  f01adc4:	24040002 */ 	addiu	$a0,$zero,0x2
-/*  f01adc8:	3c058006 */ 	lui	$a1,%hi(var800624a0)
-/*  f01adcc:	84a524a0 */ 	lh	$a1,%lo(var800624a0)($a1)
-/*  f01add0:	0c002ef9 */ 	jal	func0000bbe4
-/*  f01add4:	24040240 */ 	addiu	$a0,$zero,0x240
-/*  f01add8:	3c058006 */ 	lui	$a1,%hi(var800624a0)
-/*  f01addc:	84a524a0 */ 	lh	$a1,%lo(var800624a0)($a1)
-/*  f01ade0:	0c002ee8 */ 	jal	func0000bba0
-/*  f01ade4:	24040240 */ 	addiu	$a0,$zero,0x240
-/*  f01ade8:	3c058006 */ 	lui	$a1,%hi(var800624a0)
-/*  f01adec:	84a524a0 */ 	lh	$a1,%lo(var800624a0)($a1)
-/*  f01adf0:	0fc4a2a7 */ 	jal	currentPlayerSetViewSize
-/*  f01adf4:	24040240 */ 	addiu	$a0,$zero,0x240
-/*  f01adf8:	3c058006 */ 	lui	$a1,%hi(var800624a0)
-/*  f01adfc:	84a524a0 */ 	lh	$a1,%lo(var800624a0)($a1)
-/*  f01ae00:	0c002f0a */ 	jal	func0000bc28
-/*  f01ae04:	24040240 */ 	addiu	$a0,$zero,0x240
-/*  f01ae08:	00002025 */ 	or	$a0,$zero,$zero
-/*  f01ae0c:	0fc4a2ae */ 	jal	currentPlayerSetViewPosition
-/*  f01ae10:	00002825 */ 	or	$a1,$zero,$zero
-/*  f01ae14:	00002025 */ 	or	$a0,$zero,$zero
-/*  f01ae18:	0c002f2a */ 	jal	func0000bca8
-/*  f01ae1c:	00002825 */ 	or	$a1,$zero,$zero
-/*  f01ae20:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f01ae24:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f01ae28:	03e00008 */ 	jr	$ra
-/*  f01ae2c:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void func0f01adb8(void)
+{
+	func0000aab0(2);
+	func0000bbe4(576, var800624a0);
+	func0000bba0(576, var800624a0);
+	currentPlayerSetViewSize(576, var800624a0);
+	func0000bc28(576, var800624a0);
+	currentPlayerSetViewPosition(0, 0);
+	func0000bca8(0, 0);
+}
 
 GLOBAL_ASM(
 glabel func0f01ae30
diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h
index bfd5af986..c07218912 100644
--- a/src/include/game/data/data_0083d0.h
+++ b/src/include/game/data/data_0083d0.h
@@ -16,6 +16,7 @@ extern u32 var80062478;
 extern u32 var80062484;
 extern u32 var80062488;
 extern u32 var80062498;
+extern s16 var800624a0;
 extern u32 var800624a4;
 extern u32 var800624a8;
 extern u32 var800624ac;
diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h
index 3dbb99aaf..a7c3f5824 100644
--- a/src/include/lib/lib_09660.h
+++ b/src/include/lib/lib_09660.h
@@ -41,7 +41,7 @@ u32 func0000bbd4(void);
 void func0000bbe4(s16 arg0, s16 arg1);
 s32 func0000bc08(void);
 s32 func0000bc18(void);
-u32 func0000bc28(void);
+void func0000bc28(s16 arg0, s16 arg1);
 s16 func0000bc88(void);
 s16 func0000bc98(void);
 void func0000bca8(s16 arg0, s16 arg1);