From 43d2f40d8c813940965a979d61272f2497e36dbb Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 5 Apr 2020 23:33:15 +1000
Subject: [PATCH] Decompile ciGetFrWeaponListMenuDialog

---
 src/game/game_19c990.c         |  2 +-
 src/game/game_1a3340.c         | 10 ++++------
 src/include/game/game_1a3340.h |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c
index 003d1b20a..49f92b24c 100644
--- a/src/game/game_19c990.c
+++ b/src/game/game_19c990.c
@@ -3729,7 +3729,7 @@ glabel var7f1b94e4
 /*  f19fafc:	1000037d */ 	beqz	$zero,.L0f1a08f4
 /*  f19fb00:	8fbf007c */ 	lw	$ra,0x7c($sp)
 .L0f19fb04:
-/*  f19fb04:	0fc69d55 */ 	jal	func0f1a7554
+/*  f19fb04:	0fc69d55 */ 	jal	ciGetFrWeaponListMenuDialog
 /*  f19fb08:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f19fb0c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f19fb10:	0fc3e178 */ 	jal	func0f0f85e0
diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c
index a822051eb..1973a69b2 100644
--- a/src/game/game_1a3340.c
+++ b/src/game/game_1a3340.c
@@ -4193,12 +4193,10 @@ glabel var7f1b99d8
 /*  f1a7550:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f1a7554
-/*  f1a7554:	3c028009 */ 	lui	$v0,%hi(g_FrWeaponListMenuDialog)
-/*  f1a7558:	03e00008 */ 	jr	$ra
-/*  f1a755c:	24428d78 */ 	addiu	$v0,$v0,%lo(g_FrWeaponListMenuDialog)
-);
+struct menu_dialog *ciGetFrWeaponListMenuDialog(void)
+{
+	return &g_FrWeaponListMenuDialog;
+}
 
 GLOBAL_ASM(
 glabel func0f1a7560
diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h
index 3f25b1bf7..21c71a795 100644
--- a/src/include/game/game_1a3340.h
+++ b/src/include/game/game_1a3340.h
@@ -32,7 +32,7 @@ char *htMenuTextCancelOrAbort(struct menu_item *item);
 char *htMenuTextTimeTakenValue(struct menu_item *item);
 u32 func0f1a6c8c(void);
 u32 func0f1a6cc4(void);
-u32 func0f1a7554(void);
+struct menu_dialog *ciGetFrWeaponListMenuDialog(void);
 void func0f1a7560(void *ptr, u16 fileid, u32 arg2, void *arg3, s32 arg4, bool arg5);
 void func0f1a7730(void *ptr);
 void *func0f1a7794(u16 fileid, u32 arg1, s32 arg2, s32 arg3);