diff --git a/include/config/config_debug.h b/include/config/config_debug.h
index f2d38ab7f..2bc5d0c4f 100644
--- a/include/config/config_debug.h
+++ b/include/config/config_debug.h
@@ -52,9 +52,9 @@
 #define DISABLE_EVENT_EDITOR
 
 /**
- * Disable map select
+ * Enable map select
  */
-#define DISABLE_MAP_SELECT
+// #define ENABLE_MAP_SELECT
 
 /**
  * Enable in-game input display
@@ -66,7 +66,7 @@
  */
 // #define FILE_1_NORMAL
 
-#if (defined BOOT_TO_SCENE && defined BOOT_TO_FILE_SELECT) || (defined DISABLE_MAP_SELECT)
+#if (defined BOOT_TO_SCENE && defined BOOT_TO_FILE_SELECT) || (!defined ENABLE_MAP_SELECT)
 #define FILE_1_NORMAL
 #endif
 
diff --git a/include/functions.h b/include/functions.h
index 7c51a00de..811a45cd2 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1572,7 +1572,9 @@ void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, Schedule
 void GameState_FaultPrint(void);
 void GameState_SetFBFilter(Gfx** gfx);
 // ? func_800C4344(?);
+#ifdef ENABLE_INPUT_DISPLAY
 void GameState_DrawInputDisplay(u16 input, Gfx** gfx);
+#endif
 void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx);
 void GameState_SetFrameBuffer(GraphicsContext* gfxCtx);
 // ? func_800C49F4(?);
@@ -2269,7 +2271,7 @@ void Setup_Destroy(GameState* thisx);
 void ConsoleLogo_Init(GameState* thisx);
 void ConsoleLogo_Destroy(GameState* thisx);
 
-#ifndef DISABLE_MAP_SELECT
+#ifdef ENABLE_MAP_SELECT
 void MapSelect_Init(GameState* thisx);
 void MapSelect_Destroy(GameState* thisx);
 #endif
diff --git a/include/z64.h b/include/z64.h
index adbac99a6..10ef7d656 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -1087,7 +1087,7 @@ typedef struct {
     /* 0x01E2 */ char unk_1E2[0x06];
 } ConsoleLogoState; // size = 0x1E8
 
-#ifndef DISABLE_MAP_SELECT
+#ifdef ENABLE_MAP_SELECT
 
 struct MapSelectState;
 
diff --git a/spec b/spec
index 362c6c149..5b9d1f541 100644
--- a/spec
+++ b/spec
@@ -543,7 +543,7 @@ beginseg
     include "build/src/overlays/gamestates/ovl_title/ovl_title_reloc.o"
 endseg
 
-#ifndef DISABLE_MAP_SELECT
+#ifdef ENABLE_MAP_SELECT
 beginseg
     name "ovl_select"
     include "build/src/overlays/gamestates/ovl_select/z_select.o"
diff --git a/src/code/graph.c b/src/code/graph.c
index 8e62ee581..3ce91f8c3 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -107,7 +107,7 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) {
         return &gGameStateOverlayTable[0];
     }
 
-#ifndef DISABLE_MAP_SELECT
+#ifdef ENABLE_MAP_SELECT
     if (gameStateInitFunc == MapSelect_Init) {
         return &gGameStateOverlayTable[1];
     }
@@ -387,7 +387,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
         sGraphUpdateTime = time;
     }
 
-#ifndef DISABLE_MAP_SELECT
+#ifdef ENABLE_MAP_SELECT
     if (gIsCtrlr2Valid && CHECK_BTN_ALL(gameState->input[0].press.button, BTN_Z) &&
         CHECK_BTN_ALL(gameState->input[0].cur.button, BTN_L | BTN_R)) {
         gSaveContext.gameMode = GAMEMODE_NORMAL;
diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c
index b1b71416e..1a6c61413 100644
--- a/src/code/z_game_dlftbls.c
+++ b/src/code/z_game_dlftbls.c
@@ -14,7 +14,7 @@
 GameStateOverlay gGameStateOverlayTable[] = {
     GAMESTATE_OVERLAY_INTERNAL(Setup_Init, Setup_Destroy, sizeof(SetupState)),
 
-#ifndef DISABLE_MAP_SELECT
+#ifdef ENABLE_MAP_SELECT
     GAMESTATE_OVERLAY(select, MapSelect_Init, MapSelect_Destroy, sizeof(MapSelectState)),
 #else
     GAMESTATE_NONE,
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 818a665ce..53513ff5f 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -6,7 +6,7 @@
 
 #include "config.h"
 
-#ifndef DISABLE_MAP_SELECT
+#ifdef ENABLE_MAP_SELECT
 
 #include "ultra64.h"
 #include "global.h"