From 6f25277cc72157f60685cab4e0cb20b9a546c5f3 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 5 Feb 2020 23:12:46 +1000
Subject: [PATCH] Decompile func0f111ab0

---
 src/game/game_111600.c         | 16 ++++------------
 src/include/game/game_111600.h |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/game/game_111600.c b/src/game/game_111600.c
index 5f0b5533c..f9330c299 100644
--- a/src/game/game_111600.c
+++ b/src/game/game_111600.c
@@ -336,18 +336,10 @@ glabel func0f111a4c
 /*  f111aac:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f111ab0
-/*  f111ab0:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f111ab4:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f111ab8:	0fc44693 */ 	jal	func0f111a4c
-/*  f111abc:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f111ac0:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f111ac4:	0002702b */ 	sltu	$t6,$zero,$v0
-/*  f111ac8:	01c01025 */ 	or	$v0,$t6,$zero
-/*  f111acc:	03e00008 */ 	jr	$ra
-/*  f111ad0:	27bd0018 */ 	addiu	$sp,$sp,0x18
-);
+bool func0f111ab0(s32 weapon1, s32 weapon2)
+{
+	return func0f111a4c(weapon1, weapon2) != NULL;
+}
 
 GLOBAL_ASM(
 glabel func0f111ad4
diff --git a/src/include/game/game_111600.h b/src/include/game/game_111600.h
index 83f982fa5..d302a2fb2 100644
--- a/src/include/game/game_111600.h
+++ b/src/include/game/game_111600.h
@@ -11,7 +11,7 @@ struct invitem *currentPlayerGetUnusedInvItem(void);
 void currentPlayerSetAllGuns(bool enable);
 void *func0f1119d0(s32 weaponnum);
 bool func0f111a28(s32 weaponnum);
-u32 func0f111a4c(void);
+void *func0f111a4c(s32 weapon1, s32 weapon2);
 bool func0f111ab0(s32 weapon1, s32 weapon2);
 u32 func0f111ad4(void);
 u32 func0f111b88(void);