From f8a5fd99620903c83fbd56a36aeb51a98bc16c58 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 14 Aug 2020 19:15:58 +1000
Subject: [PATCH] Decompile func0f01bea0

---
 src/game/data/data_0083d0.c         |  2 +-
 src/game/game_01bea0.c              | 29 +++++++++--------------------
 src/include/game/data/data_0083d0.h |  2 +-
 src/include/game/gamefile.h         |  2 +-
 src/include/lib/lib_13900.h         |  2 +-
 5 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/game/data/data_0083d0.c b/src/game/data/data_0083d0.c
index 9f976f696..b73049de6 100644
--- a/src/game/data/data_0083d0.c
+++ b/src/game/data/data_0083d0.c
@@ -11,7 +11,7 @@
 
 u8 var80062940 = 0;
 u8 var80062944 = 0;
-u32 var80062948 = 0x00000000;
+u8 var80062948 = 0;
 u32 var8006294c = 0x00000000;
 u32 var80062950 = 0x00000064;
 bool g_WeatherTickEnabled = true;
diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c
index 6bf6fc0c5..8a6f1e38a 100644
--- a/src/game/game_01bea0.c
+++ b/src/game/game_01bea0.c
@@ -42,26 +42,15 @@ const char var7f1a85e0[] = "Live: %d\n";
 const char var7f1a85ec[] = "current:";
 const char var7f1a85f8[] = " numactive %d ";
 
-GLOBAL_ASM(
-glabel func0f01bea0
-/*  f01bea0:	3c028006 */ 	lui	$v0,%hi(var80062944)
-/*  f01bea4:	24422944 */ 	addiu	$v0,$v0,%lo(var80062944)
-/*  f01bea8:	904e0000 */ 	lbu	$t6,0x0($v0)
-/*  f01beac:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f01beb0:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f01beb4:	11c00006 */ 	beqz	$t6,.L0f01bed0
-/*  f01beb8:	3c018006 */ 	lui	$at,%hi(var80062948)
-/*  f01bebc:	a0400000 */ 	sb	$zero,0x0($v0)
-/*  f01bec0:	0c004e72 */ 	jal	func000139c8
-/*  f01bec4:	a0202948 */ 	sb	$zero,%lo(var80062948)($at)
-/*  f01bec8:	0fc442fe */ 	jal	func0f110bf8
-/*  f01becc:	00000000 */ 	nop
-.L0f01bed0:
-/*  f01bed0:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f01bed4:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f01bed8:	03e00008 */ 	jr	$ra
-/*  f01bedc:	00000000 */ 	nop
-);
+void func0f01bea0(void)
+{
+	if (var80062944) {
+		var80062944 = 0;
+		var80062948 = 0;
+		func000139c8();
+		func0f110bf8();
+	}
+}
 
 void menuCountDialogs(void)
 {
diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h
index 66d49b303..72f09dcf8 100644
--- a/src/include/game/data/data_0083d0.h
+++ b/src/include/game/data/data_0083d0.h
@@ -84,7 +84,7 @@ extern u32 var80062914;
 extern s32 g_NumPlayers;
 extern u8 var80062940;
 extern u8 var80062944;
-extern u32 var80062948;
+extern u8 var80062948;
 extern u32 var80062950;
 extern bool g_WeatherTickEnabled;
 extern u32 var80062960;
diff --git a/src/include/game/gamefile.h b/src/include/game/gamefile.h
index 9fbed9775..5c2e23ad3 100644
--- a/src/include/game/gamefile.h
+++ b/src/include/game/gamefile.h
@@ -18,7 +18,7 @@ u32 func0f11080c(void);
 void func0f1109c0(void);
 void func0f110b68(void);
 void func0f110bf0(void);
-u32 func0f110bf8(void);
+void func0f110bf8(void);
 void func0f110c5c(s32 locationindex, u8 filetype);
 u32 func0f110cf8(void);
 u32 func0f110d90(void);
diff --git a/src/include/lib/lib_13900.h b/src/include/lib/lib_13900.h
index e33e59874..18d70c078 100644
--- a/src/include/lib/lib_13900.h
+++ b/src/include/lib/lib_13900.h
@@ -8,7 +8,7 @@ void func00013938(void);
 u32 func00013974(void);
 u32 func00013980(void);
 void func0001398c(u32 arg0);
-u32 func000139c8(void);
+void func000139c8(void);
 u32 func000139e8(void);
 u32 func00013a40(void);
 u32 func00013ab8(void);