From 21880c4b082ffd8435186429e0d94fe551a4fcfe Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 19 Jan 2020 21:10:18 +1000
Subject: [PATCH] Decompile mpGetNumBeauHeads

---
 src/game/game_187770.c           | 9 ++++-----
 src/include/constants.h          | 1 +
 src/include/setup/setup_020df0.h | 2 +-
 src/setup/setup_020df0.c         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/game/game_187770.c b/src/game/game_187770.c
index a0f311716..8819c5064 100644
--- a/src/game/game_187770.c
+++ b/src/game/game_187770.c
@@ -5128,11 +5128,10 @@ s32 mpGetBeauHeadId(u8 headnum)
 	return g_MpBeauHeads[headnum].headid;
 }
 
-GLOBAL_ASM(
-glabel func0f18bb80
-/*  f18bb80:	03e00008 */ 	jr	$ra
-/*  f18bb84:	24020005 */ 	addiu	$v0,$zero,0x5
-);
+s32 mpGetNumBeauHeads(void)
+{
+	return NUM_MPBEAUHEADS;
+}
 
 u32 mpGetNumBodies(void)
 {
diff --git a/src/include/constants.h b/src/include/constants.h
index d81669bb0..3695d9822 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -556,6 +556,7 @@
 #define NUM_CHALLENGES       30
 #define NUM_CHEATS           42
 #define NUM_FIRESLOTS        20
+#define NUM_MPBEAUHEADS      5
 #define NUM_MPBOTCOMMANDS    14
 #define NUM_MPBODIES         61
 #define NUM_MPTRACKS         42
diff --git a/src/include/setup/setup_020df0.h b/src/include/setup/setup_020df0.h
index 175f2eca1..33b9d6c2e 100644
--- a/src/include/setup/setup_020df0.h
+++ b/src/include/setup/setup_020df0.h
@@ -298,7 +298,7 @@ extern struct mpweaponset mpweaponsetstable[];
 extern u32 var800874c8;
 extern u32 var800874cc;
 extern u32 var800874f0;
-extern struct mphead g_MpBeauHeads[];
+extern struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS];
 extern struct mphead g_MpHeads[];
 extern u32 table_0x2d678[];
 extern struct mpsimulant g_MpGeneralSimulants[];
diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c
index bda8cb83b..9c6d38f76 100644
--- a/src/setup/setup_020df0.c
+++ b/src/setup/setup_020df0.c
@@ -11928,7 +11928,7 @@ u32 var8008750c = 0x00000000;
 u32 var80087510 = 0x00000000;
 u32 var80087514 = 0x00000000;
 
-struct mphead g_MpBeauHeads[] = {
+struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS] = {
 	// head, unlock value
 	{ HEAD_BEAU2, 0x00 },
 	{ HEAD_BEAU3, 0x00 },