From de96ae691c9d41c26b21eb879534e86d53fcbda8 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 16 Mar 2020 21:02:29 +1000
Subject: [PATCH] Decompile currentPlayerGetPerspAspect

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

diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c
index 50c8e3a17..d442eef4b 100644
--- a/src/game/game_097ba0.c
+++ b/src/game/game_097ba0.c
@@ -11333,7 +11333,7 @@ glabel func0f0a0cb0
 /*  f0a0e64:	e7a20034 */ 	swc1	$f2,0x34($sp)
 /*  f0a0e68:	0c002f06 */ 	jal	func0000bc18
 /*  f0a0e6c:	e7a0001c */ 	swc1	$f0,0x1c($sp)
-/*  f0a0e70:	0fc2d60a */ 	jal	func0f0b5828
+/*  f0a0e70:	0fc2d60a */ 	jal	currentPlayerGetPerspAspect
 /*  f0a0e74:	a7a20022 */ 	sh	$v0,0x22($sp)
 /*  f0a0e78:	c7a20034 */ 	lwc1	$f2,0x34($sp)
 /*  f0a0e7c:	c7a40038 */ 	lwc1	$f4,0x38($sp)
diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c
index 90209d331..ee23a8573 100644
--- a/src/game/game_0b3350.c
+++ b/src/game/game_0b3350.c
@@ -2471,13 +2471,10 @@ f32 currentPlayerGetPerspFovY(void)
 	return g_Vars.currentplayer->c_perspfovy;
 }
 
-GLOBAL_ASM(
-glabel func0f0b5828
-/*  f0b5828:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x284)
-/*  f0b582c:	8dcea244 */ 	lw	$t6,%lo(g_Vars+0x284)($t6)
-/*  f0b5830:	03e00008 */ 	jr	$ra
-/*  f0b5834:	c5c0171c */ 	lwc1	$f0,0x171c($t6)
-);
+f32 currentPlayerGetPerspAspect(void)
+{
+	return g_Vars.currentplayer->c_perspaspect;
+}
 
 GLOBAL_ASM(
 glabel func0f0b5838
diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c
index 8d98fb5c7..4b5904c4e 100644
--- a/src/game/game_13c510.c
+++ b/src/game/game_13c510.c
@@ -1708,7 +1708,7 @@ glabel func0f13d568
 /*  f13dcd8:	3c017f1b */ 	lui	$at,%hi(var7f1b5a00)
 /*  f13dcdc:	c4245a00 */ 	lwc1	$f4,%lo(var7f1b5a00)($at)
 /*  f13dce0:	46045682 */ 	mul.s	$f26,$f10,$f4
-/*  f13dce4:	0fc2d60a */ 	jal	func0f0b5828
+/*  f13dce4:	0fc2d60a */ 	jal	currentPlayerGetPerspAspect
 /*  f13dce8:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f13dcec:	0c002f22 */ 	jal	func0000bc88
 /*  f13dcf0:	46000506 */ 	mov.s	$f20,$f0
diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h
index 993ec9628..262fac8f4 100644
--- a/src/include/game/game_0b3350.h
+++ b/src/include/game/game_0b3350.h
@@ -46,7 +46,7 @@ f32 currentPlayerGetScreenWidth(void);
 f32 currentPlayerGetScreenHeight(void);
 f32 currentPlayerGetScreenLeft(void);
 f32 currentPlayerGetScreenTop(void);
-u32 func0f0b5828(void);
+f32 currentPlayerGetPerspAspect(void);
 u32 func0f0b5838(void);
 u32 func0f0b5b9c(void);
 u32 func0f0b5d38(void);