From dba20b3b7ebe3281b8c6c62df4203583c4c1502f Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 16 Mar 2020 20:16:30 +1000
Subject: [PATCH] Decompile currentPlayerGetUnk173c

---
 src/game/game_0b3350.c         | 11 ++++-------
 src/game/game_150820.c         |  4 ++--
 src/include/game/game_0b3350.h |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c
index f9bd742d2..5777eb4ab 100644
--- a/src/game/game_0b3350.c
+++ b/src/game/game_0b3350.c
@@ -1845,13 +1845,10 @@ void currentPlayerSetUnk173c(u32 value)
 	g_Vars.currentplayer->unk173c = value;
 }
 
-GLOBAL_ASM(
-glabel func0f0b4fa8
-/*  f0b4fa8:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x284)
-/*  f0b4fac:	8dcea244 */ 	lw	$t6,%lo(g_Vars+0x284)($t6)
-/*  f0b4fb0:	03e00008 */ 	jr	$ra
-/*  f0b4fb4:	8dc2173c */ 	lw	$v0,0x173c($t6)
-);
+u32 currentPlayerGetUnk173c(void)
+{
+	return g_Vars.currentplayer->unk173c;
+}
 
 GLOBAL_ASM(
 glabel func0f0b4fb8
diff --git a/src/game/game_150820.c b/src/game/game_150820.c
index 1ba26df68..77d342a71 100644
--- a/src/game/game_150820.c
+++ b/src/game/game_150820.c
@@ -1529,7 +1529,7 @@ glabel func0f151780
 /*  f151e6c:	35290040 */ 	ori	$t1,$t1,0x40
 /*  f151e70:	02608825 */ 	or	$s1,$s3,$zero
 /*  f151e74:	ae290000 */ 	sw	$t1,0x0($s1)
-/*  f151e78:	0fc2d3ea */ 	jal	func0f0b4fa8
+/*  f151e78:	0fc2d3ea */ 	jal	currentPlayerGetUnk173c
 /*  f151e7c:	26730008 */ 	addiu	$s3,$s3,0x8
 /*  f151e80:	ae220004 */ 	sw	$v0,0x4($s1)
 .L0f151e84:
@@ -2077,7 +2077,7 @@ glabel func0f151ed0
 /*  f152680:	35080040 */ 	ori	$t0,$t0,0x40
 /*  f152684:	26380008 */ 	addiu	$t8,$s1,0x8
 /*  f152688:	afb80140 */ 	sw	$t8,0x140($sp)
-/*  f15268c:	0fc2d3ea */ 	jal	func0f0b4fa8
+/*  f15268c:	0fc2d3ea */ 	jal	currentPlayerGetUnk173c
 /*  f152690:	ae280000 */ 	sw	$t0,0x0($s1)
 /*  f152694:	ae220004 */ 	sw	$v0,0x4($s1)
 .L0f152698:
diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h
index 797612df8..20265d47e 100644
--- a/src/include/game/game_0b3350.h
+++ b/src/include/game/game_0b3350.h
@@ -24,7 +24,7 @@ void func0f0b4e68(struct coord *in, f32 divisor, struct coord *out);
 u32 func0f0b4eb8(void);
 void currentPlayerSetUnk1738(u32 value);
 void currentPlayerSetUnk173c(u32 value);
-u32 func0f0b4fa8(void);
+u32 currentPlayerGetUnk173c(void);
 u32 func0f0b4fb8(void);
 u32 func0f0b4fc8(void);
 u32 func0f0b4fd8(void);