diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc
index 7385101c1e..b9028177d9 100644
--- a/data/scripts/debug.inc
+++ b/data/scripts/debug.inc
@@ -155,28 +155,28 @@ DebugScript_HatchAnEgg_Text_EmptyParty::
 
 DebugScript_HatchAnEgg_Text_NotAnEgg::
 	.string "That's not a Pokémon Egg.$"
-	
+
 DebugScript_ZeroDaycareMons::
 	msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT
 	releaseall
 	end
-	
+
 DebugScript_OneDaycareMons::
 	msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT
 	releaseall
 	end
-	
+
 DebugScript_DaycareMonsNotCompatible::
 	msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT
 	releaseall
 	end
-	
+
 DebugText_DaycareNoPokemon:
 	.string "You have no Pokémon at Daycare.$"
-	
+
 DebugText_DaycareOnePokemon:
 	.string "You have only one Pokémon at Daycare.$"
-	
+
 DebugText_DaycarePokemonNotCompatible:
 	.string "Your Pokémon at Daycare can't\nhave babies together!$"
 
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 1da5d5c65e..2e92658343 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -777,6 +777,11 @@ void DrawMainBattleBackground(void)
             LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(26)));
             LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60);
             break;
+        default:
+            LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2)));
+            LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26)));
+            LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
+            break;
         }
     }
     else
@@ -1174,6 +1179,10 @@ void DrawBattleEntryBackground(void)
             LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(BG_CHAR_ADDR(1)));
             LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(28)));
             break;
+        default:
+            LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTileset, (void *)(BG_CHAR_ADDR(1)));
+            LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTilemap, (void *)(BG_SCREEN_ADDR(28)));
+            break;
         }
     }
     else