From 1fa6f764d325523d7a1557b8be6adda04735388b Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 18 Mar 2020 22:19:33 +1000
Subject: [PATCH] Decompile mpMenuTextWeaponDescription

---
 src/game/data/data_020df0.c    |  2 +-
 src/game/game_177e00.c         | 44 ++++++++--------------------------
 src/include/game/game_177e00.h |  2 +-
 src/include/types.h            |  2 +-
 4 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c
index 48d4e0cda..5278798d7 100644
--- a/src/game/data/data_020df0.c
+++ b/src/game/data/data_020df0.c
@@ -10095,7 +10095,7 @@ struct menu_dialog menudialog_2a794 = {
 // 2a7ac
 struct menu_item menuitems_2a7ac[] = {
 	{ MENUITEMTYPE_CUSTOM,      0, 0x00000000, 0x00000078, 0x00000042, menuhandler00106178 },
-	{ MENUITEMTYPE_MARQUEE,     0, 0x00000a00, (u32)&func0f178330, 0x00000000, NULL },
+	{ MENUITEMTYPE_MARQUEE,     0, 0x00000a00, (u32)&mpMenuTextWeaponDescription, 0x00000000, NULL },
 	{ MENUITEMTYPE_END,         0, 0x00000000, 0x00000000, 0x00000000, NULL },
 };
 
diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c
index 6702ecf38..67906116f 100644
--- a/src/game/game_177e00.c
+++ b/src/game/game_177e00.c
@@ -25,7 +25,6 @@
 #include "types.h"
 
 const char var7f1b7e80[] = "";
-const char var7f1b7e84[] = "\n";
 
 GLOBAL_ASM(
 glabel menuhandler00177e00
@@ -261,39 +260,16 @@ char *menutextMatchTime(s32 arg0)
 	return g_StringPointer;
 }
 
-GLOBAL_ASM(
-glabel func0f178330
-/*  f178330:	3c0e8007 */ 	lui	$t6,%hi(g_MpPlayerNum)
-/*  f178334:	8dce1448 */ 	lw	$t6,%lo(g_MpPlayerNum)($t6)
-/*  f178338:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f17833c:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f178340:	000e78c0 */ 	sll	$t7,$t6,0x3
-/*  f178344:	01ee7823 */ 	subu	$t7,$t7,$t6
-/*  f178348:	000f7880 */ 	sll	$t7,$t7,0x2
-/*  f17834c:	01ee7821 */ 	addu	$t7,$t7,$t6
-/*  f178350:	000f78c0 */ 	sll	$t7,$t7,0x3
-/*  f178354:	01ee7823 */ 	subu	$t7,$t7,$t6
-/*  f178358:	000f7900 */ 	sll	$t7,$t7,0x4
-/*  f17835c:	3c04800a */ 	lui	$a0,%hi(g_MenuStack+0xe28)
-/*  f178360:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f178364:	008f2021 */ 	addu	$a0,$a0,$t7
-/*  f178368:	0fc2c3f4 */ 	jal	weaponFindById
-/*  f17836c:	8c84ee28 */ 	lw	$a0,%lo(g_MenuStack+0xe28)($a0)
-/*  f178370:	10400005 */ 	beqz	$v0,.L0f178388
-/*  f178374:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f178378:	0fc5b9f1 */ 	jal	langGet
-/*  f17837c:	9444004a */ 	lhu	$a0,0x4a($v0)
-/*  f178380:	10000004 */ 	beqz	$zero,.L0f178394
-/*  f178384:	8fbf0014 */ 	lw	$ra,0x14($sp)
-.L0f178388:
-/*  f178388:	3c027f1b */ 	lui	$v0,%hi(var7f1b7e84)
-/*  f17838c:	24427e84 */ 	addiu	$v0,$v0,%lo(var7f1b7e84)
-/*  f178390:	8fbf0014 */ 	lw	$ra,0x14($sp)
-.L0f178394:
-/*  f178394:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f178398:	03e00008 */ 	jr	$ra
-/*  f17839c:	00000000 */ 	sll	$zero,$zero,0x0
-);
+char *mpMenuTextWeaponDescription(struct menu_item *item)
+{
+	struct weapon *weapon = weaponFindById(g_MenuStack[g_MpPlayerNum].weaponnum);
+
+	if (weapon) {
+		return langGet(weapon->description);
+	}
+
+	return "\n";
+}
 
 GLOBAL_ASM(
 glabel func0f1783a0
diff --git a/src/include/game/game_177e00.h b/src/include/game/game_177e00.h
index 7bc56a8f6..764630165 100644
--- a/src/include/game/game_177e00.h
+++ b/src/include/game/game_177e00.h
@@ -7,7 +7,7 @@ s32 menuhandler00177e00(u32, u32, u32 *);
 char *mpMenuTextInGameLimit(struct menu_item *item);
 char *menutextPauseOrUnpause(s32 arg0);
 char *menutextMatchTime(s32 arg0);
-u32 func0f178330(void);
+char *mpMenuTextWeaponDescription(struct menu_item *item);
 u32 func0f1783a0(void);
 u32 func0f178450(void);
 u32 func0f1784a4(void);
diff --git a/src/include/types.h b/src/include/types.h
index 9999a1f25..8b14a6bae 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -4277,7 +4277,7 @@ struct menustackitem {
 	/*0xe1c*/ s32 slotindex;
 	/*0xe20*/ u32 slotcount;
 	/*0xe24*/ u32 unke24;
-	/*0xe28*/ u32 unke28;
+	/*0xe28*/ u32 weaponnum;
 	/*0xe2c*/ u32 unke2c;
 	/*0xe30*/ u32 unke30;
 	/*0xe34*/ u32 unke34;