From 4fc36d7d3fd2835ceba5ea9c9c7d13a917cd0356 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 10 Nov 2022 20:53:38 +1000
Subject: [PATCH] Remove pointless idle-checking code from lvTick

---
 src/game/lv.c      | 33 ++-------------------------------
 src/game/title.c   |  1 -
 src/include/data.h |  1 -
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/src/game/lv.c b/src/game/lv.c
index 3ac7bb4db..cd81faf37 100644
--- a/src/game/lv.c
+++ b/src/game/lv.c
@@ -2291,7 +2291,7 @@ void lvTick(void)
 	bgunTickBoost();
 	PROFILE(PROFILEMARKER_LVT_HUDMSGS, hudmsgsTick());
 
-	if ((joyGetButtonsPressedThisFrame(0, 0xffff) != 0
+	if (g_IsTitleDemo && (joyGetButtonsPressedThisFrame(0, 0xffff) != 0
 				|| joyGetStickX(0) > 10
 				|| joyGetStickX(0) < -10
 				|| joyGetStickY(0) > 10
@@ -2310,7 +2310,7 @@ void lvTick(void)
 				|| joyGetStickX(3) > 10
 				|| joyGetStickX(3) < -10
 				|| joyGetStickY(3) > 10
-				|| joyGetStickY(3) < -10) && g_IsTitleDemo) {
+				|| joyGetStickY(3) < -10)) {
 		if (g_Vars.stagenum != STAGE_TITLE) {
 			titleSetNextMode(TITLEMODE_SKIP);
 			mainChangeToStage(STAGE_TITLE);
@@ -2319,35 +2319,6 @@ void lvTick(void)
 		g_IsTitleDemo = false;
 	}
 
-	if (g_Vars.stagenum < STAGE_TITLE && !g_IsTitleDemo && !g_Vars.in_cutscene) {
-		if (joyGetButtons(0, 0xffff) == 0
-				&& joyGetStickX(0) < 10
-				&& joyGetStickX(0) > -10
-				&& joyGetStickY(0) < 10
-				&& joyGetStickY(0) > -10
-				&& joyGetButtons(1, 0xffff) == 0
-				&& joyGetStickX(1) < 10
-				&& joyGetStickX(1) > -10
-				&& joyGetStickY(1) < 10
-				&& joyGetStickY(1) > -10
-				&& joyGetButtons(2, 0xffff) == 0
-				&& joyGetStickX(2) < 10
-				&& joyGetStickX(2) > -10
-				&& joyGetStickY(2) < 10
-				&& joyGetStickY(2) > -10
-				&& joyGetButtons(3, 0xffff) == 0
-				&& joyGetStickX(3) < 10
-				&& joyGetStickX(3) > -10
-				&& joyGetStickY(3) < 10
-				&& joyGetStickY(3) > -10) {
-			g_TitleIdleTime60 += g_Vars.diffframe60;
-		} else {
-			g_TitleIdleTime60 = 0;
-		}
-	} else {
-		g_TitleIdleTime60 = 0;
-	}
-
 	g_NumReasonsToEndMpMatch = 0;
 
 	// Handle MP match ending
diff --git a/src/game/title.c b/src/game/title.c
index deb78f2ea..744a16ad6 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -47,7 +47,6 @@ s16 g_TitleViewHeight = 480;
 bool g_IsTitleDemo = false;
 bool g_TitleButtonPressed = false;
 bool g_TitleFastForward = false;
-u32 g_TitleIdleTime60 = 0;
 s32 g_TitleMode = -1;
 s32 g_TitleNextMode = -1;
 u32 g_TitleDelayedTimer = 2;
diff --git a/src/include/data.h b/src/include/data.h
index d6627667f..0f68b8b34 100644
--- a/src/include/data.h
+++ b/src/include/data.h
@@ -158,7 +158,6 @@ extern bool g_NbombsActive;
 extern s32 g_WeatherActive;
 extern u32 var80062410;
 extern bool g_IsTitleDemo;
-extern u32 g_TitleIdleTime60;
 extern s32 g_TitleMode;
 extern s32 g_TitleNextMode;
 extern u32 g_TitleDelayedTimer;