From 139010e226d2ae7d9a1ba58ba512aef3ba81085e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 18 Jan 2020 22:47:36 +1000
Subject: [PATCH] Decompile func0f18c200

---
 src/game/game_187770.c           | 15 ++++-----------
 src/include/game/game_187770.h   |  4 ++--
 src/include/setup/setup_020df0.h |  2 +-
 src/setup/setup_020df0.c         |  2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/game/game_187770.c b/src/game/game_187770.c
index 0dbc28ff9..da563d5cb 100644
--- a/src/game/game_187770.c
+++ b/src/game/game_187770.c
@@ -5648,17 +5648,10 @@ glabel mpGetUnlockedTrackNum
 /*  f18c1fc:	27bd0028 */ 	addiu	$sp,$sp,0x28
 );
 
-GLOBAL_ASM(
-glabel func0f18c200
-/*  f18c200:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f18c204:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f18c208:	0fc6304e */ 	jal	func0f18c138
-/*  f18c20c:	2404002a */ 	addiu	$a0,$zero,0x2a
-/*  f18c210:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f18c214:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f18c218:	03e00008 */ 	jr	$ra
-/*  f18c21c:	00000000 */ 	sll	$zero,$zero,0x0
-);
+s32 func0f18c200(void)
+{
+	return func0f18c138(sizeof(g_MpTracks) / sizeof(g_MpTracks[0]));
+}
 
 s32 mpGetTrackAudioId(s32 tracknum)
 {
diff --git a/src/include/game/game_187770.h b/src/include/game/game_187770.h
index 0ced9831b..cd99c2da3 100644
--- a/src/include/game/game_187770.h
+++ b/src/include/game/game_187770.h
@@ -63,9 +63,9 @@ u32 mpGetLockPlayerNum(void);
 u32 func0f18bfd8(void);
 u32 func0f18c014(void);
 u32 func0f18c0c0(void);
-u32 func0f18c138(void);
+s32 func0f18c138(s32 arg0);
 s32 mpGetUnlockedTrackNum(s32 tracknum);
-u32 func0f18c200(void);
+s32 func0f18c200(void);
 s32 mpGetTrackAudioId(s32 tracknum);
 char *mpGetTrackName(s32 tracknum);
 void mpSetUsingMultipleTunes(bool enable);
diff --git a/src/include/setup/setup_020df0.h b/src/include/setup/setup_020df0.h
index c181e4178..0c428667d 100644
--- a/src/include/setup/setup_020df0.h
+++ b/src/include/setup/setup_020df0.h
@@ -303,7 +303,7 @@ extern u32 table_0x2d678[];
 extern struct mpsimulant g_MpGeneralSimulants[];
 extern struct mpsimulant mpspecialsimulants[];
 extern struct bodynum mpbodytable[];
-extern struct mptrack g_MpTracks[];
+extern struct mptrack g_MpTracks[42];
 extern u32 mppresets[];
 extern u32 g_TeamColours[];
 extern u32 var80087d10;
diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c
index c27b172ff..8cd0d58c4 100644
--- a/src/setup/setup_020df0.c
+++ b/src/setup/setup_020df0.c
@@ -12169,7 +12169,7 @@ u32 var80087a68 = 0x00000024;
 u32 var80087a6c = 0x0000002c;
 
 // 2da90
-struct mptrack g_MpTracks[] = {
+struct mptrack g_MpTracks[42] = {
 	// Audio ID, duration, name, unlock category
 	/*0x00*/ { 0x3a, 160, 0x587c, -1 },
 	/*0x01*/ { 0x3b, 170, 0x587d, -1 },