From 97fde54de6bc8d327ec2974be005965abe07afb6 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 23 Jan 2021 21:05:45 +1000
Subject: [PATCH] Decompile sightHasTargetWhileAiming

---
 src/game/game_0d7070.c         | 23 +++++++++--------------
 src/include/game/game_0d7070.h |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c
index ed9cf4b30..868133c0b 100644
--- a/src/game/game_0d7070.c
+++ b/src/game/game_0d7070.c
@@ -6155,19 +6155,14 @@ glabel sightRenderTarget
 /*  f0dca24:	00000000 */ 	nop
 );
 
-GLOBAL_ASM(
-glabel func0f0dca28
-/*  f0dca28:	10800003 */ 	beqz	$a0,.L0f0dca38
-/*  f0dca2c:	24010005 */ 	addiu	$at,$zero,0x5
-/*  f0dca30:	14810003 */ 	bne	$a0,$at,.L0f0dca40
-/*  f0dca34:	00001025 */ 	or	$v0,$zero,$zero
-.L0f0dca38:
-/*  f0dca38:	03e00008 */ 	jr	$ra
-/*  f0dca3c:	24020001 */ 	addiu	$v0,$zero,0x1
-.L0f0dca40:
-/*  f0dca40:	03e00008 */ 	jr	$ra
-/*  f0dca44:	00000000 */ 	nop
-);
+bool sightHasTargetWhileAiming(s32 sight)
+{
+	if (sight == SIGHT_DEFAULT || sight == SIGHT_ZOOM) {
+		return true;
+	}
+
+	return false;
+}
 
 Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight)
 {
@@ -6224,7 +6219,7 @@ Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight)
 
 	if (sight != SIGHT_NONE && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)) {
 		if ((optionsGetAlwaysShowTarget(g_Vars.currentplayerstats->mpindex) && !arg1)
-				|| (arg1 && func0f0dca28(sight))) {
+				|| (arg1 && sightHasTargetWhileAiming(sight))) {
 			gdl = sightRenderTarget(gdl);
 		}
 	}
diff --git a/src/include/game/game_0d7070.h b/src/include/game/game_0d7070.h
index a92bcb167..be925f266 100644
--- a/src/include/game/game_0d7070.h
+++ b/src/include/game/game_0d7070.h
@@ -21,7 +21,7 @@ Gfx *sightRenderSkedar(Gfx *gdl, bool arg1);
 Gfx *sightRenderZoom(Gfx *gdl, bool arg1);
 Gfx *sightRenderMaian(Gfx *gdl, bool arg1);
 Gfx *sightRenderTarget(Gfx *gdl);
-bool func0f0dca28(s32 sight);
+bool sightHasTargetWhileAiming(s32 sight);
 Gfx *sightRender(Gfx *gdl, bool arg1, s32 sight);
 
 #endif