From 0ec7eb2db92205a3589e0740f4a3d9fa02f46646 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 5 Jan 2020 08:17:51 +1000
Subject: [PATCH] Decompile mpChallengeGetName

---
 src/game/game_176d70.c         |  2 +-
 src/game/game_1999b0.c         | 23 ++++-------------------
 src/include/game/game_1999b0.h |  2 +-
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c
index 356708c7a..6bb691a98 100644
--- a/src/game/game_176d70.c
+++ b/src/game/game_176d70.c
@@ -4038,7 +4038,7 @@ glabel menuhandler0017a20c
 /*  f17a2c4:	3c048007 */ 	lui	$a0,0x8007
 /*  f17a2c8:	afa200c4 */ 	sw	$v0,0xc4($sp)
 /*  f17a2cc:	8c841448 */ 	lw	$a0,0x1448($a0)
-/*  f17a2d0:	0fc670df */ 	jal	func0f19c37c
+/*  f17a2d0:	0fc670df */ 	jal	mpChallengeGetName
 /*  f17a2d4:	8fa500bc */ 	lw	$a1,0xbc($sp)
 /*  f17a2d8:	0c002f02 */ 	jal	func0000bc08
 /*  f17a2dc:	00408025 */ 	or	$s0,$v0,$zero
diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c
index 36821e12c..67b1f10c6 100644
--- a/src/game/game_1999b0.c
+++ b/src/game/game_1999b0.c
@@ -3159,25 +3159,10 @@ glabel func0f19c2cc
 /*  f19c378:	27bd0028 */ 	addiu	$sp,$sp,0x28
 );
 
-GLOBAL_ASM(
-glabel func0f19c37c
-/*  f19c37c:	00057080 */ 	sll	$t6,$a1,0x2
-/*  f19c380:	01c57023 */ 	subu	$t6,$t6,$a1
-/*  f19c384:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f19c388:	000e7080 */ 	sll	$t6,$t6,0x2
-/*  f19c38c:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f19c390:	01c57021 */ 	addu	$t6,$t6,$a1
-/*  f19c394:	000e7040 */ 	sll	$t6,$t6,0x1
-/*  f19c398:	3c048009 */ 	lui	$a0,0x8009
-/*  f19c39c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f19c3a0:	008e2021 */ 	addu	$a0,$a0,$t6
-/*  f19c3a4:	0fc5b9f1 */ 	jal	textGet
-/*  f19c3a8:	948484b8 */ 	lhu	$a0,-0x7b48($a0)
-/*  f19c3ac:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f19c3b0:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f19c3b4:	03e00008 */ 	jr	$ra
-/*  f19c3b8:	00000000 */ 	sll	$zero,$zero,0x0
-);
+char *mpChallengeGetName(s32 arg0, s32 challengeindex)
+{
+	return textGet(g_MpChallenges[challengeindex].name);
+}
 
 bool func0f19c3bc(s32 mpchrnum, s32 index, s32 numplayers)
 {
diff --git a/src/include/game/game_1999b0.h b/src/include/game/game_1999b0.h
index e0e7f1286..ba1695860 100644
--- a/src/include/game/game_1999b0.h
+++ b/src/include/game/game_1999b0.h
@@ -51,7 +51,7 @@ u32 func0f19c274(void);
 u32 func0f19c288(void);
 u32 func0f19c2b0(void);
 u32 func0f19c2cc(void);
-u32 func0f19c37c(void);
+char *mpChallengeGetName(s32 arg0, s32 challengeindex);
 bool func0f19c3bc(s32 mpchrnum, s32 index, s32 numplayers);
 bool mpIsChallengeCompletedByAnyChrWithNumPlayers(s32 index, s32 numplayers);
 void mpSetChallengeCompletedByAnyChrWithNumPlayers(s32 index, s32 numplayers, bool completed);