From a0159e10e8e84babb2561258d085b608dff625f6 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 13 Aug 2020 19:30:54 +1000
Subject: [PATCH] Decompile htMenuTextName

---
 src/game/data/data_02e820.c    |  2 +-
 src/game/game_1a3340.c         | 19 ++++---------------
 src/include/game/game_1a3340.h |  2 +-
 src/include/game/training.h    |  1 +
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/game/data/data_02e820.c b/src/game/data/data_02e820.c
index 772099abe..cbf6037b5 100644
--- a/src/game/data/data_02e820.c
+++ b/src/game/data/data_02e820.c
@@ -382,7 +382,7 @@ struct menuitem menuitems_2f614[] = {
 // 2f68c
 struct menudialog g_HoloTrainingDetailsMenuDialog = {
 	MENUDIALOGTYPE_DEFAULT,
-	(u32)&func0f1a6a04,
+	(u32)&htMenuTextName,
 	menuitems_2f614,
 	menudialog001a6aa4,
 	0x00000206,
diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c
index 2a6889c92..3da4fadc7 100644
--- a/src/game/game_1a3340.c
+++ b/src/game/game_1a3340.c
@@ -3433,21 +3433,10 @@ glabel var7f1b99b4
 /*  f1a6a00:	00000000 */ 	nop
 );
 
-GLOBAL_ASM(
-glabel func0f1a6a04
-/*  f1a6a04:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f1a6a08:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f1a6a0c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f1a6a10:	3c048009 */ 	lui	$a0,%hi(var80088bb4)
-/*  f1a6a14:	0fc68937 */ 	jal	htGetIndexBySlot
-/*  f1a6a18:	90848bb4 */ 	lbu	$a0,%lo(var80088bb4)($a0)
-/*  f1a6a1c:	0fc68955 */ 	jal	htGetName
-/*  f1a6a20:	00402025 */ 	or	$a0,$v0,$zero
-/*  f1a6a24:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f1a6a28:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f1a6a2c:	03e00008 */ 	jr	$ra
-/*  f1a6a30:	00000000 */ 	nop
-);
+char *htMenuTextName(struct menuitem *item)
+{
+	return htGetName(htGetIndexBySlot(var80088bb4));
+}
 
 s32 menuhandler001a6a34(u32 operation, struct menuitem *item, s32 *value)
 {
diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h
index 5bf421848..58f44c0cf 100644
--- a/src/include/game/game_1a3340.h
+++ b/src/include/game/game_1a3340.h
@@ -26,7 +26,7 @@ u32 func0f1a64a0(void);
 char *dtMenuTextOkOrResume(struct menuitem *item);
 char *dtMenuTextCancelOrAbort(struct menuitem *item);
 char *dtMenuTextTimeTakenValue(struct menuitem *item);
-u32 func0f1a6a04(void);
+char *htMenuTextName(struct menuitem *item);
 char *htMenuTextOkOrResume(struct menuitem *item);
 char *htMenuTextCancelOrAbort(struct menuitem *item);
 char *htMenuTextTimeTakenValue(struct menuitem *item);
diff --git a/src/include/game/training.h b/src/include/game/training.h
index 63c572d5e..d399f24fb 100644
--- a/src/include/game/training.h
+++ b/src/include/game/training.h
@@ -6,6 +6,7 @@
 extern u8 g_FrIsValidWeapon;
 extern s32 g_FrWeaponNum;
 extern u8 var800888a0;
+extern u8 var80088bb4;
 
 bool ciIsTourDone(void);
 u8 ciGetFiringRangeScore(s32 weaponindex);