From 431eddfca080f80153d538ccd8509aa9a426abde Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 23 Dec 2019 22:08:06 +1000
Subject: [PATCH] Decompile freeFireslotWrapper

---
 src/game/chr/chr.c             |  4 ++--
 src/game/game_097a50.c         | 15 ++++-----------
 src/include/game/game_097a50.h |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index e14e14070..b09a34de5 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -4026,10 +4026,10 @@ glabel func0f020d44
 /*  f020d68:	8c4e0020 */ 	lw	$t6,0x20($v0)
 /*  f020d6c:	afae0048 */ 	sw	$t6,0x48($sp)
 /*  f020d70:	8044017c */ 	lb	$a0,0x17c($v0)
-/*  f020d74:	0fc29c2a */ 	jal	func0f0a70a8
+/*  f020d74:	0fc29c2a */ 	jal	freeFireslotWrapper
 /*  f020d78:	afa2004c */ 	sw	$v0,0x4c($sp)
 /*  f020d7c:	8faf004c */ 	lw	$t7,0x4c($sp)
-/*  f020d80:	0fc29c2a */ 	jal	func0f0a70a8
+/*  f020d80:	0fc29c2a */ 	jal	freeFireslotWrapper
 /*  f020d84:	81e4017d */ 	lb	$a0,0x17d($t7)
 /*  f020d88:	8fb8004c */ 	lw	$t8,0x4c($sp)
 /*  f020d8c:	3c08800a */ 	lui	$t0,0x800a
diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c
index 4d6d2678c..15a5d2d7f 100644
--- a/src/game/game_097a50.c
+++ b/src/game/game_097a50.c
@@ -18212,17 +18212,10 @@ glabel func0f0a6c30
 /*  f0a70a4:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f0a70a8
-/*  f0a70a8:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f0a70ac:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f0a70b0:	0fc29c32 */ 	jal	freeFireslot
-/*  f0a70b4:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f0a70b8:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f0a70bc:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f0a70c0:	03e00008 */ 	jr	$ra
-/*  f0a70c4:	00000000 */ 	sll	$zero,$zero,0x0
-);
+s8 freeFireslotWrapper(s32 fireslot_id)
+{
+	return freeFireslot(fireslot_id);
+}
 
 s8 freeFireslot(s32 fireslot_id)
 {
diff --git a/src/include/game/game_097a50.h b/src/include/game/game_097a50.h
index 6880d360a..610ca3cec 100644
--- a/src/include/game/game_097a50.h
+++ b/src/include/game/game_097a50.h
@@ -138,7 +138,7 @@ u32 func0f0a5300(void);
 u32 func0f0a5550(void);
 u32 func0f0a695c(void);
 u32 func0f0a6c30(void);
-u32 func0f0a70a8(void);
+s8 freeFireslotWrapper(s32 fireslot);
 s8 freeFireslot(s32 fireslot);
 u32 func0f0a70f8(void);
 u32 func0f0a7138(void);