From 8a0d43a1791f3e853e0b43432edc5681e83a6509 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 17 Jan 2020 22:59:20 +1000
Subject: [PATCH] Decompile resetSomeStageThings

---
 src/game/game_00b200.c           |  2 +-
 src/game/game_00b820.c           | 43 +++++++++++++-------------------
 src/include/game/game_00b820.h   |  2 +-
 src/include/setup/setup_000000.h |  4 +++
 src/setup/setup_000000.c         | 10 ++++----
 5 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/game/game_00b200.c b/src/game/game_00b200.c
index cebf4cf04..8563c1c49 100644
--- a/src/game/game_00b200.c
+++ b/src/game/game_00b200.c
@@ -302,7 +302,7 @@ glabel func0f00b510
 /*  f00b604:	3909003f */ 	xori	$t1,$t0,0x3f
 /*  f00b608:	1611fff8 */ 	bne	$s0,$s1,.L0f00b5ec
 /*  f00b60c:	ae09fffc */ 	sw	$t1,-0x4($s0)
-/*  f00b610:	0fc02edc */ 	jal	func0f00bb70
+/*  f00b610:	0fc02edc */ 	jal	resetSomeStageThings
 /*  f00b614:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f00b618:	8fbf001c */ 	lw	$ra,0x1c($sp)
 /*  f00b61c:	8fb00014 */ 	lw	$s0,0x14($sp)
diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c
index 0f70aa4b5..64fe154df 100644
--- a/src/game/game_00b820.c
+++ b/src/game/game_00b820.c
@@ -258,32 +258,23 @@ glabel func0f00b820
 /*  f00bb6c:	27bd0030 */ 	addiu	$sp,$sp,0x30
 );
 
-GLOBAL_ASM(
-glabel func0f00bb70
-/*  f00bb70:	3c03800a */ 	lui	$v1,%hi(g_DangerousProps)
-/*  f00bb74:	3c02800a */ 	lui	$v0,%hi(var8009cc30)
-/*  f00bb78:	2442cc30 */ 	addiu	$v0,$v0,%lo(var8009cc30)
-/*  f00bb7c:	2463cc00 */ 	addiu	$v1,$v1,%lo(g_DangerousProps)
-.L0f00bb80:
-/*  f00bb80:	24630004 */ 	addiu	$v1,$v1,0x4
-/*  f00bb84:	1462fffe */ 	bne	$v1,$v0,.L0f00bb80
-/*  f00bb88:	ac60fffc */ 	sw	$zero,-0x4($v1)
-/*  f00bb8c:	3c013f80 */ 	lui	$at,0x3f80
-/*  f00bb90:	44810000 */ 	mtc1	$at,$f0
-/*  f00bb94:	3c018006 */ 	lui	$at,0x8006
-/*  f00bb98:	ac207e54 */ 	sw	$zero,0x7e54($at)
-/*  f00bb9c:	3c018006 */ 	lui	$at,0x8006
-/*  f00bba0:	e4202ca0 */ 	swc1	$f0,0x2ca0($at)
-/*  f00bba4:	3c018006 */ 	lui	$at,0x8006
-/*  f00bba8:	e4202ca4 */ 	swc1	$f0,0x2ca4($at)
-/*  f00bbac:	3c018006 */ 	lui	$at,0x8006
-/*  f00bbb0:	e4202ca8 */ 	swc1	$f0,0x2ca8($at)
-/*  f00bbb4:	3c018006 */ 	lui	$at,0x8006
-/*  f00bbb8:	e4202cac */ 	swc1	$f0,0x2cac($at)
-/*  f00bbbc:	3c018006 */ 	lui	$at,0x8006
-/*  f00bbc0:	03e00008 */ 	jr	$ra
-/*  f00bbc4:	ac202cbc */ 	sw	$zero,0x2cbc($at)
-);
+void resetSomeStageThings(void)
+{
+	s32 i;
+
+	for (i = 0; i != 12; i++) {
+		g_DangerousProps[i] = NULL;
+	}
+
+	g_StageFlags = 0;
+
+	var80062ca0 = 1;
+	var80062ca4 = 1;
+	var80062ca8 = 1;
+	var80062cac = 1;
+
+	var80062cbc = 0;
+}
 
 GLOBAL_ASM(
 glabel func0f00bbc8
diff --git a/src/include/game/game_00b820.h b/src/include/game/game_00b820.h
index c74a122a8..b4900cd06 100644
--- a/src/include/game/game_00b820.h
+++ b/src/include/game/game_00b820.h
@@ -4,7 +4,7 @@
 #include "types.h"
 
 u32 func0f00b820(void);
-u32 func0f00bb70(void);
+void resetSomeStageThings(void);
 u32 func0f00bbc8(void);
 
 #endif
diff --git a/src/include/setup/setup_000000.h b/src/include/setup/setup_000000.h
index 9112ccdd7..b3951b507 100644
--- a/src/include/setup/setup_000000.h
+++ b/src/include/setup/setup_000000.h
@@ -317,6 +317,10 @@ extern u32 var80062c58;
 extern u32 var80062c6c;
 extern u32 var80062c84;
 extern u32 var80062c88;
+extern f32 var80062ca0;
+extern f32 var80062ca4;
+extern f32 var80062ca8;
+extern f32 var80062cac;
 extern u32 var80062cb0;
 extern u32 var80062cb4;
 extern u32 var80062cb8;
diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c
index ead73d77f..da37d931e 100644
--- a/src/setup/setup_000000.c
+++ b/src/setup/setup_000000.c
@@ -8500,14 +8500,14 @@ u32 var80062c90 = 0x00000046;
 u32 var80062c94 = 0x00000047;
 u32 var80062c98 = 0x00000000;
 u32 var80062c9c = 0x00000000;
-u32 var80062ca0 = 0x3f800000;
-u32 var80062ca4 = 0x3f800000;
-u32 var80062ca8 = 0x3f800000;
-u32 var80062cac = 0x3f800000;
+f32 var80062ca0 = 1;
+f32 var80062ca4 = 1;
+f32 var80062ca8 = 1;
+f32 var80062cac = 1;
 u32 var80062cb0 = 0x00000000;
 u32 var80062cb4 = 0x00000000;
 u32 var80062cb8 = 0x00000000;
-s32 var80062cbc = 0x00000000;
+s32 var80062cbc = 0;
 u32 var80062cc0 = 0x00200000;
 u32 var80062cc4 = 0x00000000;
 u32 var80062cc8 = 0xbf800000;