From 68b975bba77c5f5d2f67e7744174b18a34df0cb3 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 26 Dec 2019 12:34:16 +1000
Subject: [PATCH] Decompile cheatGetName

---
 src/game/game_106d40.c         | 21 ++++-----------------
 src/game/game_10ccd0.c         |  4 ++--
 src/include/game/game_106d40.h |  2 +-
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/game/game_106d40.c b/src/game/game_106d40.c
index 186dc7463..f5dbb737e 100644
--- a/src/game/game_106d40.c
+++ b/src/game/game_106d40.c
@@ -1352,20 +1352,7 @@ s32 cheatGetTime(s32 cheat_id)
 	return g_CheatSpecs[cheat_id].time;
 }
 
-GLOBAL_ASM(
-glabel func0f107f78
-/*  f107f78:	000470c0 */ 	sll	$t6,$a0,0x3
-/*  f107f7c:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f107f80:	3c048007 */ 	lui	$a0,0x8007
-/*  f107f84:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f107f88:	008e2021 */ 	addu	$a0,$a0,$t6
-/*  f107f8c:	0fc5b9f1 */ 	jal	textGet
-/*  f107f90:	94843a90 */ 	lhu	$a0,0x3a90($a0)
-/*  f107f94:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f107f98:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f107f9c:	03e00008 */ 	jr	$ra
-/*  f107fa0:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f107fa4:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f107fa8:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f107fac:	00000000 */ 	sll	$zero,$zero,0x0
-);
+char *cheatGetName(s32 cheat_id)
+{
+	return textGet(g_CheatSpecs[cheat_id].nametextid);
+}
diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c
index 277ea318c..b8b903e37 100644
--- a/src/game/game_10ccd0.c
+++ b/src/game/game_10ccd0.c
@@ -1789,7 +1789,7 @@ glabel func0f10e3fc
 /*  f10e438:	30580300 */ 	andi	$t8,$v0,0x300
 /*  f10e43c:	53000006 */ 	beqzl	$t8,.L0f10e458
 /*  f10e440:	00001025 */ 	or	$v0,$zero,$zero
-/*  f10e444:	0fc41fde */ 	jal	func0f107f78
+/*  f10e444:	0fc41fde */ 	jal	cheatGetName
 /*  f10e448:	304400ff */ 	andi	$a0,$v0,0xff
 /*  f10e44c:	10000003 */ 	beqz	$zero,.L0f10e45c
 /*  f10e450:	8fbf0014 */ 	lw	$ra,0x14($sp)
@@ -1823,7 +1823,7 @@ glabel func0f10e468
 /*  f10e4a8:	13000006 */ 	beqz	$t8,.L0f10e4c4
 /*  f10e4ac:	00022402 */ 	srl	$a0,$v0,0x10
 /*  f10e4b0:	309900ff */ 	andi	$t9,$a0,0xff
-/*  f10e4b4:	0fc41fde */ 	jal	func0f107f78
+/*  f10e4b4:	0fc41fde */ 	jal	cheatGetName
 /*  f10e4b8:	03202025 */ 	or	$a0,$t9,$zero
 /*  f10e4bc:	10000003 */ 	beqz	$zero,.L0f10e4cc
 /*  f10e4c0:	8fbf0014 */ 	lw	$ra,0x14($sp)
diff --git a/src/include/game/game_106d40.h b/src/include/game/game_106d40.h
index 355b10380..5ffef7a12 100644
--- a/src/include/game/game_106d40.h
+++ b/src/include/game/game_106d40.h
@@ -14,7 +14,7 @@ u32 func0f107a78(void);
 u32 func0f107eb8(void);
 u32 func0f107f18(void);
 s32 cheatGetTime(s32 cheat_id);
-u32 func0f107f78(void);
+char *cheatGetName(s32 cheat_id);
 s32 menudialog00107990(u32, u32, u32 *);
 s32 menuhandlerCheat(u32, u32, u32 *);
 s32 menuhandlerCheatBuddy(u32, u32, u32 *);