From 01c4784ace03db713b8929df99da7af2ca75d02c Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 4 Mar 2021 08:23:20 +1000
Subject: [PATCH] Decompile func0f09ebbc

---
 src/game/game_097ba0.c         | 11 ++++-------
 src/include/game/game_097ba0.h |  2 +-
 src/include/types.h            |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c
index 263eb4d47..a57b4134d 100644
--- a/src/game/game_097ba0.c
+++ b/src/game/game_097ba0.c
@@ -8766,13 +8766,10 @@ bool func0f09eae4(void)
 	return false;
 }
 
-GLOBAL_ASM(
-glabel func0f09ebbc
-/*  f09ebbc:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x284)
-/*  f09ebc0:	8dcea244 */ 	lw	$t6,%lo(g_Vars+0x284)($t6)
-/*  f09ebc4:	03e00008 */ 	jr	$ra
-/*  f09ebc8:	8dc21598 */ 	lw	$v0,0x1598($t6)
-);
+s32 func0f09ebbc(void)
+{
+	return g_Vars.currentplayer->gunctrl.unk1598;
+}
 
 GLOBAL_ASM(
 glabel func0f09ebcc
diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h
index 8e99a44d5..433c26166 100644
--- a/src/include/game/game_097ba0.h
+++ b/src/include/game/game_097ba0.h
@@ -68,7 +68,7 @@ u32 func0f09e144(void);
 void func0f09e4e0(void);
 u32 func0f09ea90(void);
 bool func0f09eae4(void);
-u32 func0f09ebbc(void);
+s32 func0f09ebbc(void);
 void func0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, Mtxf *matrix1, f32 *arg4, Mtxf *matrix2, struct prop *prop, struct coord *pos);
 u32 func0f09ed2c(void);
 void func0f09ee18(struct chrdata *chr, u8 *arg1, struct coord *pos, s16 *rooms, Mtxf *arg4, struct coord *arg5);
diff --git a/src/include/types.h b/src/include/types.h
index 710d094d3..9fb841468 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -2132,7 +2132,7 @@ struct gunctrl {
 	/*0x158c*/ void *unk158c;
 	/*0x1590*/ u32 unk1590;
 	/*0x1594*/ s32 unk1594;
-	/*0x1598*/ u32 unk1598;
+	/*0x1598*/ s32 unk1598;
 	/*0x159c*/ u16 unk159c;
 	/*0x15a0*/ s32 unk15a0;
 	/*0x15a4*/ s32 unk15a4;