diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c
index b33020c93..320d360fb 100644
--- a/src/battle/btl_states_actions.c
+++ b/src/battle/btl_states_actions.c
@@ -6,6 +6,7 @@
 #include "battle/battle.h"
 #include "model.h"
 #include "game_modes.h"
+#include "dx/debug_menu.h"
 
 #if VERSION_JP
 extern Addr btl_states_menus_ROM_START;
diff --git a/src/dx/debug_menu.c b/src/dx/debug_menu.c
index d57df200f..7d788c002 100644
--- a/src/dx/debug_menu.c
+++ b/src/dx/debug_menu.c
@@ -1919,7 +1919,7 @@ void dx_debug_update_banner() {
     char fmtBuf[128];
     s32 effect;
 
-    if (gGameStatus.context == CONTEXT_BATTLE) {
+    if (gGameStatus.context == CONTEXT_WORLD) {
         sprintf(fmtBuf, "Map: %7s (%X)", LastMapName, LastMapEntry);
         dx_debug_draw_ascii(fmtBuf, DefaultColor, 220, BottomRowY);
 
@@ -1939,7 +1939,7 @@ void dx_debug_update_banner() {
         if (dx_debug_is_cheat_enabled(DEBUG_CHEAT_GOD_MODE)) {
             dx_debug_draw_ascii("(GOD MODE)", MSG_PAL_YELLOW, 151, BottomRowY);
         }
-    } else {
+    } else if (gGameStatus.context == CONTEXT_BATTLE) {
         s32 areaID = (LastBattleID >> 24) & 0xFF;
         s32 battleID = (LastBattleID >> 16) & 0xFF;
         s32 stageID = LastBattleID & 0xFFFF;