From ba7122128add336b1d9eee0239d14592b73c3eec Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 5 Jan 2020 10:30:30 +1000
Subject: [PATCH] Rename mpChallengeGetName to mpChallengeGetNameWithArg and
 decompile new mpChallengeGetName

---
 src/game/game_176d70.c         |  4 ++--
 src/game/game_1999b0.c         | 26 ++++++--------------------
 src/include/game/game_1999b0.h |  4 ++--
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c
index 2cc7520b4..f69ff5a13 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	mpChallengeGetName
+/*  f17a2d0:	0fc670df */ 	jal	mpChallengeGetNameWithArg
 /*  f17a2d4:	8fa500bc */ 	lw	$a1,0xbc($sp)
 /*  f17a2d8:	0c002f02 */ 	jal	func0000bc08
 /*  f17a2dc:	00408025 */ 	or	$s0,$v0,$zero
@@ -8745,7 +8745,7 @@ glabel func0f17eac8
 .L0f17eaf4:
 /*  f17eaf4:	0fc66dfd */ 	jal	mpGetCurrentChallengeIndex
 /*  f17eaf8:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f17eafc:	0fc66daf */ 	jal	func0f19b6bc
+/*  f17eafc:	0fc66daf */ 	jal	mpChallengeGetName
 /*  f17eb00:	00402025 */ 	or	$a0,$v0,$zero
 /*  f17eb04:	3c048007 */ 	lui	$a0,0x8007
 /*  f17eb08:	3c057f1c */ 	lui	$a1,0x7f1c
diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c
index 90189960f..c280f4f20 100644
--- a/src/game/game_1999b0.c
+++ b/src/game/game_1999b0.c
@@ -2183,24 +2183,10 @@ glabel func0f19b664
 /*  f19b6b8:	27bd0028 */ 	addiu	$sp,$sp,0x28
 );
 
-GLOBAL_ASM(
-glabel func0f19b6bc
-/*  f19b6bc:	00047080 */ 	sll	$t6,$a0,0x2
-/*  f19b6c0:	01c47023 */ 	subu	$t6,$t6,$a0
-/*  f19b6c4:	000e7080 */ 	sll	$t6,$t6,0x2
-/*  f19b6c8:	01c47021 */ 	addu	$t6,$t6,$a0
-/*  f19b6cc:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f19b6d0:	000e7040 */ 	sll	$t6,$t6,0x1
-/*  f19b6d4:	3c048009 */ 	lui	$a0,0x8009
-/*  f19b6d8:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f19b6dc:	008e2021 */ 	addu	$a0,$a0,$t6
-/*  f19b6e0:	0fc5b9f1 */ 	jal	textGet
-/*  f19b6e4:	948484b8 */ 	lhu	$a0,-0x7b48($a0)
-/*  f19b6e8:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f19b6ec:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f19b6f0:	03e00008 */ 	jr	$ra
-/*  f19b6f4:	00000000 */ 	sll	$zero,$zero,0x0
-);
+char *mpChallengeGetName(s32 challengeindex)
+{
+	return textGet(g_MpChallenges[challengeindex].name);
+}
 
 GLOBAL_ASM(
 glabel func0f19b6f8
@@ -2221,7 +2207,7 @@ glabel func0f19b6f8
 /*  f19b72c:	26100001 */ 	addiu	$s0,$s0,0x1
 /*  f19b730:	56330006 */ 	bnel	$s1,$s3,.L0f19b74c
 /*  f19b734:	26310001 */ 	addiu	$s1,$s1,0x1
-/*  f19b738:	0fc66daf */ 	jal	func0f19b6bc
+/*  f19b738:	0fc66daf */ 	jal	mpChallengeGetName
 /*  f19b73c:	02002025 */ 	or	$a0,$s0,$zero
 /*  f19b740:	10000008 */ 	beqz	$zero,.L0f19b764
 /*  f19b744:	8fbf0024 */ 	lw	$ra,0x24($sp)
@@ -3025,7 +3011,7 @@ s32 mpGetNumChallengesAvailable(s32 mpchrnum)
 	return numavail;
 }
 
-char *mpChallengeGetName(s32 arg0, s32 challengeindex)
+char *mpChallengeGetNameWithArg(s32 arg0, s32 challengeindex)
 {
 	return textGet(g_MpChallenges[challengeindex].name);
 }
diff --git a/src/include/game/game_1999b0.h b/src/include/game/game_1999b0.h
index 563ae47eb..d5ddb6987 100644
--- a/src/include/game/game_1999b0.h
+++ b/src/include/game/game_1999b0.h
@@ -29,7 +29,7 @@ bool mpIsChallengeAvailable(s32 challengeindex);
 void func0f19afdc(void);
 u32 func0f19b540(void);
 u32 func0f19b664(void);
-u32 func0f19b6bc(void);
+char *mpChallengeGetName(s32 challengeindex);
 u32 func0f19b6f8(void);
 void mpSetCurrentChallenge(s32 slotnum);
 s32 mpGetCurrentChallengeIndex(void);
@@ -51,7 +51,7 @@ bool mpIsVar800884b4NonZero(void);
 u32 func0f19c288(void);
 u32 func0f19c2b0(void);
 s32 mpGetNumChallengesAvailable(s32 mpchrnum);
-char *mpChallengeGetName(s32 arg0, s32 challengeindex);
+char *mpChallengeGetNameWithArg(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);