From 41f502c2e7a4c6402076152da94a5cd51ab842cc Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 9 Apr 2020 19:04:58 +1000
Subject: [PATCH] Decompile func0f18e558

---
 src/game/mplayer.c        | 21 ++++++++-------------
 src/gvars/gvars.c         | 19 +------------------
 src/include/gvars/gvars.h |  2 +-
 3 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/src/game/mplayer.c b/src/game/mplayer.c
index 947339455..2080e5312 100644
--- a/src/game/mplayer.c
+++ b/src/game/mplayer.c
@@ -7754,19 +7754,14 @@ glabel func0f18e4c8
 /*  f18e554:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f18e558
-/*  f18e558:	3c03800b */ 	lui	$v1,%hi(var800acc28)
-/*  f18e55c:	3c02800b */ 	lui	$v0,%hi(var800acc70)
-/*  f18e560:	2442cc70 */ 	addiu	$v0,$v0,%lo(var800acc70)
-/*  f18e564:	2463cc28 */ 	addiu	$v1,$v1,%lo(var800acc28)
-.L0f18e568:
-/*  f18e568:	24630004 */ 	addiu	$v1,$v1,0x4
-/*  f18e56c:	1462fffe */ 	bne	$v1,$v0,.L0f18e568
-/*  f18e570:	ac60fffc */ 	sw	$zero,-0x4($v1)
-/*  f18e574:	03e00008 */ 	jr	$ra
-/*  f18e578:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void func0f18e558(void)
+{
+	s32 i;
+
+	for (i = 0; i < ARRAYCOUNT(var800acc28); i++) {
+		var800acc28[i] = 0;
+	}
+}
 
 GLOBAL_ASM(
 glabel func0f18e57c
diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c
index a9a94a93d..6d06081fc 100644
--- a/src/gvars/gvars.c
+++ b/src/gvars/gvars.c
@@ -21396,24 +21396,7 @@ struct savefile_setup g_MpSetupSaveFile = {0};
 u32 var800acc1c = 0;
 s8 g_MpLockPlayerNum = 0;
 u32 var800acc24 = 0;
-u32 var800acc28 = 0;
-u32 var800acc2c = 0;
-u32 var800acc30 = 0;
-u32 var800acc34 = 0;
-u32 var800acc38 = 0;
-u32 var800acc3c = 0;
-u32 var800acc40 = 0;
-u32 var800acc44 = 0;
-u32 var800acc48 = 0;
-u32 var800acc4c = 0;
-u32 var800acc50 = 0;
-u32 var800acc54 = 0;
-u32 var800acc58 = 0;
-u32 var800acc5c = 0;
-u32 var800acc60 = 0;
-u32 var800acc64 = 0;
-u32 var800acc68 = 0;
-u32 var800acc6c = 0;
+u32 var800acc28[18] = {0};
 u32 var800acc70 = 0;
 u32 var800acc74 = 0;
 u32 var800acc78 = 0;
diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h
index a9ce915aa..57418e586 100644
--- a/src/include/gvars/gvars.h
+++ b/src/include/gvars/gvars.h
@@ -821,7 +821,7 @@ extern u8 g_ActiveMenuMpBotCommands[16];
 extern struct mpsetup g_MpSetup;
 extern struct savefile_setup g_MpSetupSaveFile;
 extern s8 g_MpLockPlayerNum;
-extern u32 var800acc28;
+extern u32 var800acc28[18];
 extern u32 var800acc70;
 extern u32 var800acc74;
 extern struct chrdata *g_MpSimulantChrs[MAX_SIMULANTS];