From 168a8988ddbb9c159f1f43e9f042f952a6bacb32 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 15 Jun 2020 20:12:49 +1000
Subject: [PATCH] Decompile viSetZRange

---
 src/game/game_165670.c      |  4 ++--
 src/game/title.c            | 14 +++++++-------
 src/include/lib/lib_09660.h |  2 +-
 src/lib/lib_09660.c         | 34 ++++++++--------------------------
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/game/game_165670.c b/src/game/game_165670.c
index fb06e2e0e..e364567c5 100644
--- a/src/game/game_165670.c
+++ b/src/game/game_165670.c
@@ -266,7 +266,7 @@ glabel func0f16598c
 /*  f1659b4:	44983000 */ 	mtc1	$t8,$f6
 /*  f1659b8:	448f2000 */ 	mtc1	$t7,$f4
 /*  f1659bc:	468033a0 */ 	cvt.s.w	$f14,$f6
-/*  f1659c0:	0c002fa1 */ 	jal	func0000be84
+/*  f1659c0:	0c002fa1 */ 	jal	viSetZRange
 /*  f1659c4:	46802320 */ 	cvt.s.w	$f12,$f4
 /*  f1659c8:	8fa40018 */ 	lw	$a0,0x18($sp)
 /*  f1659cc:	3c028008 */ 	lui	$v0,%hi(var80081058)
@@ -453,7 +453,7 @@ glabel func0f165c4c
 /*  f165c60:	448f3000 */ 	mtc1	$t7,$f6
 /*  f165c64:	448e2000 */ 	mtc1	$t6,$f4
 /*  f165c68:	468033a0 */ 	cvt.s.w	$f14,$f6
-/*  f165c6c:	0c002fa1 */ 	jal	func0000be84
+/*  f165c6c:	0c002fa1 */ 	jal	viSetZRange
 /*  f165c70:	46802320 */ 	cvt.s.w	$f12,$f4
 /*  f165c74:	8fa40018 */ 	lw	$a0,0x18($sp)
 /*  f165c78:	3c028008 */ 	lui	$v0,%hi(var80081058)
diff --git a/src/game/title.c b/src/game/title.c
index 6737e8707..234d1094f 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -424,7 +424,7 @@ void titleTickLegal(void)
 {
 	viSetFovY(60);
 	viSetAspect(1.33333333f);
-	func0000be84(100, 10000);
+	viSetZRange(100, 10000);
 	viSetUseZBuf(false);
 
 	g_TitleTimer += g_Vars.lvupdate240_60;
@@ -451,7 +451,7 @@ void titleExitCheckControllers(void)
 void titleTickCheckControllers(void)
 {
 	g_TitleTimer++;
-	func0000be84(100, 10000);
+	viSetZRange(100, 10000);
 	viSetUseZBuf(false);
 
 	if (g_TitleTimer > 6) {
@@ -1309,7 +1309,7 @@ void titleTickPdLogo(void)
 {
 	viSetFovY(46);
 	viSetAspect(1.33333333f);
-	func0000be84(100, 10000);
+	viSetZRange(100, 10000);
 	viSetUseZBuf(false);
 
 	g_TitleTimer += g_Vars.lvupdate240_60;
@@ -3303,7 +3303,7 @@ void titleTickRarePresents(void)
 {
 	viSetFovY(60);
 	viSetAspect(1.33333333f);
-	func0000be84(100, 10000);
+	viSetZRange(100, 10000);
 	viSetUseZBuf(false);
 
 	g_TitleTimer += g_Vars.lvupdate240_60;
@@ -3559,7 +3559,7 @@ void titleTickNintendoLogo(void)
 {
 	viSetFovY(60);
 	viSetAspect(1.33333333f);
-	func0000be84(100, 10000);
+	viSetZRange(100, 10000);
 	viSetUseZBuf(false);
 
 	g_TitleTimer += g_Vars.lvupdate240_60;
@@ -3953,7 +3953,7 @@ void titleTickRareLogo(void)
 {
 	viSetFovY(60);
 	viSetAspect(1.33333333f);
-	func0000be84(100, 10000);
+	viSetZRange(100, 10000);
 	viSetUseZBuf(false);
 
 	if (g_TitleTimer < 0) {
@@ -4476,7 +4476,7 @@ void titleTickNoController(void)
 {
 	viSetFovY(60);
 	viSetAspect(1.33333333f);
-	func0000be84(100, 10000);
+	viSetZRange(100, 10000);
 	viSetUseZBuf(false);
 
 	g_TitleTimer += g_Vars.lvupdate240_60;
diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h
index b6585fc13..82ed078cd 100644
--- a/src/include/lib/lib_09660.h
+++ b/src/include/lib/lib_09660.h
@@ -53,7 +53,7 @@ void viSetAspect(f32 aspect);
 f32 viGetAspect(void);
 void viSetFovAspectAndSize(f32 fovy, f32 aspect, s16 width, s16 height);
 f32 viGetFovY(void);
-void func0000be84(f32 arg0, f32 arg1);
+void viSetZRange(f32 arg0, f32 arg1);
 void viGetZRange(struct zrange *zrange);
 u32 func0000bf04(void);
 
diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c
index 0a23ad2a9..a53dc2d18 100644
--- a/src/lib/lib_09660.c
+++ b/src/lib/lib_09660.c
@@ -2827,32 +2827,14 @@ f32 viGetFovY(void)
 	return g_ViData->fovy;
 }
 
-GLOBAL_ASM(
-glabel func0000be84
-/*     be84:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*     be88:	3c038006 */ 	lui	$v1,%hi(g_ViData)
-/*     be8c:	2463d594 */ 	addiu	$v1,$v1,%lo(g_ViData)
-/*     be90:	e7ac0018 */ 	swc1	$f12,0x18($sp)
-/*     be94:	c7a40018 */ 	lwc1	$f4,0x18($sp)
-/*     be98:	8c6e0000 */ 	lw	$t6,0x0($v1)
-/*     be9c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*     bea0:	e7ae001c */ 	swc1	$f14,0x1c($sp)
-/*     bea4:	e5c40010 */ 	swc1	$f4,0x10($t6)
-/*     bea8:	8c6f0000 */ 	lw	$t7,0x0($v1)
-/*     beac:	c7a6001c */ 	lwc1	$f6,0x1c($sp)
-/*     beb0:	e5e60014 */ 	swc1	$f6,0x14($t7)
-/*     beb4:	8c620000 */ 	lw	$v0,0x0($v1)
-/*     beb8:	c44c0010 */ 	lwc1	$f12,0x10($v0)
-/*     bebc:	c44e0008 */ 	lwc1	$f14,0x8($v0)
-/*     bec0:	0fc2d266 */ 	jal	currentPlayerSetPerspective
-/*     bec4:	8c46000c */ 	lw	$a2,0xc($v0)
-/*     bec8:	0fc2d289 */ 	jal	currentPlayerSetCameraScale
-/*     becc:	00000000 */ 	sll	$zero,$zero,0x0
-/*     bed0:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*     bed4:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*     bed8:	03e00008 */ 	jr	$ra
-/*     bedc:	00000000 */ 	sll	$zero,$zero,0x0
-);
+void viSetZRange(f32 near, f32 far)
+{
+	g_ViData->znear = near;
+	g_ViData->zfar = far;
+
+	currentPlayerSetPerspective(g_ViData->znear, g_ViData->fovy, g_ViData->aspect);
+	currentPlayerSetCameraScale();
+}
 
 void viGetZRange(struct zrange *zrange)
 {