diff --git a/graphics/battle_frontier/multi_battle_intro_bg_opponent.bin b/graphics/battle_frontier/multi_battle_intro_bg_opponent.bin
index c38b76d4a..3793cef43 100644
Binary files a/graphics/battle_frontier/multi_battle_intro_bg_opponent.bin and b/graphics/battle_frontier/multi_battle_intro_bg_opponent.bin differ
diff --git a/graphics/battle_frontier/multi_battle_intro_bg_player.bin b/graphics/battle_frontier/multi_battle_intro_bg_player.bin
index 7cc984cff..8ec9100f2 100644
Binary files a/graphics/battle_frontier/multi_battle_intro_bg_player.bin and b/graphics/battle_frontier/multi_battle_intro_bg_player.bin differ
diff --git a/src/battle_bg.c b/src/battle_bg.c
index b59a5069b..4643320ac 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -916,7 +916,7 @@ static u8 GetBattleEnvironmentOverride(void)
         return gBattleEnvironment;
     }
 
-    if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK))
+    if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
     {
         return BATTLE_ENVIRONMENT_LINK;
     }
@@ -1308,11 +1308,7 @@ void DrawBattleEntryBackground(void)
     {
         LoadBattleEnvironmentEntryGfx(BATTLE_ENVIRONMENT_GRASS);
     }
-    else if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK))
-    {
-        LoadBattleEnvironmentEntryGfx(BATTLE_ENVIRONMENT_BUILDING);
-    }
-    else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
+    else if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
     {
         if (TestRunner_Battle_GetForcedEnvironment()
          && gBattleEnvironmentInfo[gBattleEnvironment].background.tilemap