diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 144be13e1f..cf0bab18f5 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -11,7 +11,11 @@
 
 void MapSelect_LoadTitle(MapSelectState* this) {
     this->state.running = false;
-    SET_NEXT_GAMESTATE(&this->state, ConsoleLogo_Init, ConsoleLogoState);
+    {
+        GameState* state = &this->state;
+
+        SET_NEXT_GAMESTATE(state, ConsoleLogo_Init, ConsoleLogoState);
+    }
 }
 
 void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
@@ -39,8 +43,13 @@ void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
     gSaveContext.natureAmbienceId = 0xFF;
     gSaveContext.showTitleCard = true;
     gWeatherMode = WEATHER_MODE_CLEAR;
+
     this->state.running = false;
-    SET_NEXT_GAMESTATE(&this->state, Play_Init, PlayState);
+    {
+        GameState* state = &this->state;
+
+        SET_NEXT_GAMESTATE(state, Play_Init, PlayState);
+    }
 }
 
 // "Translation" (Actual name)
@@ -263,6 +272,7 @@ static SceneSelectEntry sScenes[] = {
     { "114:" GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 13", MapSelect_LoadGame, ENTR_GROTTOS_13 },
     // "115: Hyrule Cutscenes"
     { "115:" GFXP_KATAKANA "ﾊｲﾗﾙ ﾃﾞﾓ", MapSelect_LoadGame, ENTR_CUTSCENE_MAP_0 },
+#if OOT_DEBUG
     // "116: Special Room (Treasure Chest Warp)" (Ganondorf Test Room)
     { "116:" GFXP_HIRAGANA "ﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ" GFXP_KATAKANA "ﾜｰﾌﾟ)", MapSelect_LoadGame, ENTR_BESITU_0 },
     // "117: Sasaki Test" (Sasa Test)
@@ -283,6 +293,7 @@ static SceneSelectEntry sScenes[] = {
     { "124:depth" GFXP_KATAKANA "ﾃｽﾄ", MapSelect_LoadGame, ENTR_DEPTH_TEST_0 },
     // "125: Hyrule Garden Game 2" (Early Hyrule Garden Game)
     { "125:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ2", MapSelect_LoadGame, ENTR_HAIRAL_NIWA2_0 },
+#endif
     // "title" (Title Screen)
     { "title", (void*)MapSelect_LoadTitle, 0 },
 };
@@ -711,8 +722,6 @@ void MapSelect_Destroy(GameState* thisx) {
 
 void MapSelect_Init(GameState* thisx) {
     MapSelectState* this = (MapSelectState*)thisx;
-    u32 size;
-    s32 pad;
 
     this->state.main = MapSelect_Main;
     this->state.destroy = MapSelect_Destroy;
@@ -739,17 +748,21 @@ void MapSelect_Init(GameState* thisx) {
     this->lockDown = 0;
     this->unk_234 = 0;
 
-    size = (uintptr_t)_z_select_staticSegmentRomEnd - (uintptr_t)_z_select_staticSegmentRomStart;
-
     if ((dREG(80) >= 0) && (dREG(80) < this->count)) {
         this->currentScene = dREG(80);
         this->topDisplayedScene = dREG(81);
         this->pageDownIndex = dREG(82);
     }
+
     R_UPDATE_RATE = 1;
 
-    this->staticSegment = GAME_STATE_ALLOC(&this->state, size, "../z_select.c", 1114);
-    DMA_REQUEST_SYNC(this->staticSegment, (uintptr_t)_z_select_staticSegmentRomStart, size, "../z_select.c", 1115);
+    {
+        u32 size = (uintptr_t)_z_select_staticSegmentRomEnd - (uintptr_t)_z_select_staticSegmentRomStart;
+
+        this->staticSegment = GAME_STATE_ALLOC(&this->state, size, "../z_select.c", 1114);
+        DMA_REQUEST_SYNC(this->staticSegment, (uintptr_t)_z_select_staticSegmentRomStart, size, "../z_select.c", 1115);
+    }
+
     gSaveContext.save.cutsceneIndex = 0x8000;
     gSaveContext.save.linkAge = LINK_AGE_CHILD;
 }