From 4e7bf7fd56190fcbd9eaebf1d5eb7cdcef6704f0 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 16 Mar 2020 20:37:32 +1000
Subject: [PATCH] Decompile currentPlayerGetUnk1754

---
 src/game/game_0b3350.c         | 11 ++++++-----
 src/game/game_0b63b0.c         |  2 +-
 src/game/game_11f000.c         |  8 ++++----
 src/include/game/game_0b3350.h |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c
index a69d342da..96f255736 100644
--- a/src/game/game_0b3350.c
+++ b/src/game/game_0b3350.c
@@ -2387,12 +2387,13 @@ void currentPlayerSetUnk1754(u32 value)
 	g_Vars.currentplayer->unk1754 = value;
 }
 
+u32 currentPlayerGetUnk1754(void)
+{
+	return g_Vars.currentplayer->unk1754;
+}
+
 GLOBAL_ASM(
-glabel func0f0b5718
-/*  f0b5718:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x284)
-/*  f0b571c:	8dcea244 */ 	lw	$t6,%lo(g_Vars+0x284)($t6)
-/*  f0b5720:	03e00008 */ 	jr	$ra
-/*  f0b5724:	8dc21754 */ 	lw	$v0,0x1754($t6)
+glabel func0f0b5728
 /*  f0b5728:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x284)
 /*  f0b572c:	8dcea244 */ 	lw	$t6,%lo(g_Vars+0x284)($t6)
 /*  f0b5730:	03e00008 */ 	jr	$ra
diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c
index 120886b21..a72bcb914 100644
--- a/src/game/game_0b63b0.c
+++ b/src/game/game_0b63b0.c
@@ -10767,7 +10767,7 @@ glabel func0f0bfc7c
 /*  f0bfe90:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0bfe94:	0fc59e66 */ 	jal	func0f167998
 /*  f0bfe98:	00408825 */ 	or	$s1,$v0,$zero
-/*  f0bfe9c:	0fc2d5c6 */ 	jal	func0f0b5718
+/*  f0bfe9c:	0fc2d5c6 */ 	jal	currentPlayerGetUnk1754
 /*  f0bfea0:	00408025 */ 	or	$s0,$v0,$zero
 /*  f0bfea4:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0bfea8:	27a5008c */ 	addiu	$a1,$sp,0x8c
diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c
index 41a6e0e9a..52dfc0b6f 100644
--- a/src/game/game_11f000.c
+++ b/src/game/game_11f000.c
@@ -2155,7 +2155,7 @@ glabel var7f1b50c8
 .L0f120df0:
 /*  f120df0:	5a200153 */ 	blezl	$s1,.L0f121340
 /*  f120df4:	8fae0068 */ 	lw	$t6,0x68($sp)
-/*  f120df8:	0fc2d5c6 */ 	jal	func0f0b5718
+/*  f120df8:	0fc2d5c6 */ 	jal	currentPlayerGetUnk1754
 /*  f120dfc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f120e00:	0fc2d5be */ 	jal	currentPlayerGetUnk1740
 /*  f120e04:	00408025 */ 	or	$s0,$v0,$zero
@@ -3597,7 +3597,7 @@ glabel var7f1b50c8
 /*  f122430:	27090008 */ 	addiu	$t1,$t8,0x8
 /*  f122434:	afa906b0 */ 	sw	$t1,0x6b0($sp)
 /*  f122438:	af0b0004 */ 	sw	$t3,0x4($t8)
-/*  f12243c:	0fc2d5c6 */ 	jal	func0f0b5718
+/*  f12243c:	0fc2d5c6 */ 	jal	currentPlayerGetUnk1754
 /*  f122440:	af190000 */ 	sw	$t9,0x0($t8)
 /*  f122444:	0fc2d5be */ 	jal	currentPlayerGetUnk1740
 /*  f122448:	00408025 */ 	or	$s0,$v0,$zero
@@ -7286,7 +7286,7 @@ glabel var7f1b5108
 /*  f125ab0:	afa40170 */ 	sw	$a0,0x170($sp)
 /*  f125ab4:	0fc2d5be */ 	jal	currentPlayerGetUnk1740
 /*  f125ab8:	afa50174 */ 	sw	$a1,0x174($sp)
-/*  f125abc:	0fc2d5c6 */ 	jal	func0f0b5718
+/*  f125abc:	0fc2d5c6 */ 	jal	currentPlayerGetUnk1754
 /*  f125ac0:	afa2016c */ 	sw	$v0,0x16c($sp)
 /*  f125ac4:	0fc595f3 */ 	jal	func0f1657cc
 /*  f125ac8:	afa20168 */ 	sw	$v0,0x168($sp)
@@ -8471,7 +8471,7 @@ glabel func0f126c3c
 /*  f126c68:	00402025 */ 	or	$a0,$v0,$zero
 /*  f126c6c:	0c0056d9 */ 	jal	func00015b64
 /*  f126c70:	27a50064 */ 	addiu	$a1,$sp,0x64
-/*  f126c74:	0fc2d5c6 */ 	jal	func0f0b5718
+/*  f126c74:	0fc2d5c6 */ 	jal	currentPlayerGetUnk1754
 /*  f126c78:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f126c7c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f126c80:	0c0056d9 */ 	jal	func00015b64
diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h
index 26ba961b0..f37ea87b0 100644
--- a/src/include/game/game_0b3350.h
+++ b/src/include/game/game_0b3350.h
@@ -36,7 +36,7 @@ u32 func0f0b5050(void);
 u32 func0f0b53a4(void);
 f32 *currentPlayerGetUnk1740(void);
 void currentPlayerSetUnk1754(u32 value);
-u32 func0f0b5718(void);
+u32 currentPlayerGetUnk1754(void);
 u32 func0f0b5758(void);
 u32 func0f0b5778(void);
 u32 func0f0b5798(void);