From 7b3b174f11f4212ae79d5dc27cc1eaae50f6fae6 Mon Sep 17 00:00:00 2001
From: Emerald Lockdown <86802223+EmeraldLoc@users.noreply.github.com>
Date: Sun, 18 Sep 2022 19:28:09 -0500
Subject: [PATCH] Removed gChangeAreaIndex as it is unused (and does nothing),
 and fixed thi and crashes (#187)

* Removed gChangeAreaIndex as it is unused, and fixed thi and crashes

* Fixes

* undo formatting

* Undid stones
---
 src/game/level_update.c | 12 +++++++-----
 src/game/level_update.h |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/game/level_update.c b/src/game/level_update.c
index 27b0f5109..b7fba3f4e 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -60,7 +60,6 @@ u8 gRejectInstantWarp = 0;
 
 s16 gChangeLevel = -1;
 s16 gChangeLevelTransition = -1;
-s16 gChangeAreaIndex = -1;
 s16 gChangeActNum = -1;
 
 static bool sFirstCastleGroundsMenu = true;
@@ -1338,15 +1337,19 @@ void update_menu_level(void) {
             gChangeLevel = curLevel;
             gChangeActNum = 2;
         } else if (curLevel == LEVEL_THI) {
-            gChangeLevel = curLevel;
-            gChangeAreaIndex = 2;
-            gChangeActNum = 6;
+            gChangeLevel = LEVEL_THI;
         } else {
             gChangeLevel = curLevel;
             gChangeActNum = 6;
         }
     }
 
+    if (gCurrAreaIndex != 2 && gCurrLevelNum == LEVEL_THI) {
+        sWarpDest.type = WARP_TYPE_CHANGE_AREA;
+        sWarpDest.areaIdx = 2;
+        sWarpDest.nodeId = 0x0A;
+    }
+
     // set sFirstCastleGroundsMenu to false to prevent wall hugging bug
     if (curLevel != LEVEL_CASTLE_GROUNDS) {
          sFirstCastleGroundsMenu = false;
@@ -1455,7 +1458,6 @@ void update_menu_level(void) {
                 gChangeActNum = 2;
             } else if (curLevel == LEVEL_THI) {
                 gChangeLevel = curLevel;
-                gChangeAreaIndex = 2;
                 gChangeActNum = 6;
             } else {
                 gChangeLevel = curLevel;
diff --git a/src/game/level_update.h b/src/game/level_update.h
index b746a2e71..53c03c601 100644
--- a/src/game/level_update.h
+++ b/src/game/level_update.h
@@ -78,7 +78,6 @@ extern void (*sTransitionUpdate)(s16 *);
 extern u8 unused3[4];
 
 extern s16 gChangeLevel;
-extern s16 gChangeAreaIndex;
 extern s16 gChangeActNum;
 
 struct WarpDest {