From 51a91966589c5ee4fd3b94bc7329f67108e9a460 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 30 Jan 2020 19:27:10 +1000
Subject: [PATCH] Decompile currentPlayerGet00fc

---
 src/game/game_0b28d0.c         | 17 ++++++-----------
 src/game/game_0dcdb0.c         |  2 +-
 src/include/game/game_0b28d0.h |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c
index 87f314567..fa35daeaa 100644
--- a/src/game/game_0b28d0.c
+++ b/src/game/game_0b28d0.c
@@ -10522,7 +10522,7 @@ glabel func0f0bb814
 /*  f0bba14:	0fc2af1d */ 	jal	func0f0abc74
 /*  f0bba18:	24050001 */ 	addiu	$a1,$zero,0x1
 .L0f0bba1c:
-/*  f0bba1c:	0fc305f3 */ 	jal	func0f0c17cc
+/*  f0bba1c:	0fc305f3 */ 	jal	currentPlayerGet00fc
 /*  f0bba20:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0bba24:	3c08800a */ 	lui	$t0,%hi(g_Vars)
 /*  f0bba28:	1040012a */ 	beqz	$v0,.L0f0bbed4
@@ -16170,7 +16170,7 @@ glabel func0f0c07c8
 .L0f0c0b84:
 /*  f0c0b84:	5081000d */ 	beql	$a0,$at,.L0f0c0bbc
 /*  f0c0b88:	8e0d0318 */ 	lw	$t5,0x318($s0)
-/*  f0c0b8c:	0fc305f3 */ 	jal	func0f0c17cc
+/*  f0c0b8c:	0fc305f3 */ 	jal	currentPlayerGet00fc
 /*  f0c0b90:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0c0b94:	50400009 */ 	beqzl	$v0,.L0f0c0bbc
 /*  f0c0b98:	8e0d0318 */ 	lw	$t5,0x318($s0)
@@ -17037,15 +17037,10 @@ glabel func0f0c16f4
 /*  f0c17c8:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel func0f0c17cc
-/*  f0c17cc:	3c0e800a */ 	lui	$t6,0x800a
-/*  f0c17d0:	8dcea244 */ 	lw	$t6,-0x5dbc($t6)
-/*  f0c17d4:	8dc200fc */ 	lw	$v0,0xfc($t6)
-/*  f0c17d8:	0002782b */ 	sltu	$t7,$zero,$v0
-/*  f0c17dc:	03e00008 */ 	jr	$ra
-/*  f0c17e0:	01e01025 */ 	or	$v0,$t7,$zero
-);
+bool currentPlayerGet00fc(void)
+{
+	return g_Vars.currentplayer->unk00fc != 0;
+}
 
 // Never called
 void setInvincible(bool enable)
diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c
index ccd5aa621..534284e11 100644
--- a/src/game/game_0dcdb0.c
+++ b/src/game/game_0dcdb0.c
@@ -7703,7 +7703,7 @@ glabel func0f0dfad0
 /*  f0dfd84:	8e0e01b4 */ 	lw	$t6,0x1b4($s0)
 /*  f0dfd88:	55c10011 */ 	bnel	$t6,$at,.L0f0dfdd0
 /*  f0dfd8c:	8e0901b4 */ 	lw	$t1,0x1b4($s0)
-/*  f0dfd90:	0fc305f3 */ 	jal	func0f0c17cc
+/*  f0dfd90:	0fc305f3 */ 	jal	currentPlayerGet00fc
 /*  f0dfd94:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0dfd98:	5040000d */ 	beqzl	$v0,.L0f0dfdd0
 /*  f0dfd9c:	8e0901b4 */ 	lw	$t1,0x1b4($s0)
diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h
index 2528c7ef1..7773d7e1b 100644
--- a/src/include/game/game_0b28d0.h
+++ b/src/include/game/game_0b28d0.h
@@ -145,7 +145,7 @@ u32 func0f0c13a8(void);
 u32 func0f0c1404(void);
 u32 func0f0c160c(void);
 u32 func0f0c16f4(void);
-u32 func0f0c17cc(void);
+bool currentPlayerGet00fc(void);
 void currentPlayerSetCameraMode(s32 mode);
 u32 func0f0c1840(void);
 u32 func0f0c1ba4(void);