1 files changed, 7 insertions, 6 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 83ced1b7c..21386016f 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -24,6 +24,7 @@
 #include "window.h"
 #include "event_object_movement.h"
 #include "event_scripts.h"
+#include "tv.h"
 #include "trainer_see.h"
 #include "field_message_box.h"
 #include "sound.h"
@@ -36,6 +37,10 @@
 #include "gym_leader_rematch.h"
 #include "battle_pike.h"
 #include "battle_pyramid.h"
+#include "fldeff.h"
+#include "fldeff_misc.h"
+#include "field_control_avatar.h"
+#include "mirage_tower.h"
 #include "constants/map_types.h"
 #include "constants/battle_frontier.h"
 
@@ -57,12 +62,8 @@ struct TrainerBattleParameter
 };
 
 extern bool32 InTrainerHill(void);
-extern bool32 FldEffPoison_IsActive(void);
-extern void RestartWildEncounterImmunitySteps(void);
 extern void ClearPoisonStepCounter(void);
-extern void sub_81BE72C(void);
 extern void sub_808BCF4(void);
-extern void sub_80EECC8(void);
 extern void sub_80AF6F0(void);
 extern u16 sub_81D6180(u8 localId);
 extern bool8 GetTrainerHillTrainerFlag(u8 eventObjId);
@@ -341,14 +342,14 @@ static void Task_BattleStart(u8 taskId)
         if (!FldEffPoison_IsActive()) // is poison not active?
         {
             BattleTransition_StartOnField(tTransition);
-            sub_81BE72C();
+            ClearMirageTowerPulseBlendEffect();
             tState++; // go to case 1.
         }
         break;
     case 1:
         if (IsBattleTransitionDone() == TRUE)
         {
-            overworld_free_bg_tilemaps();
+            CleanupOverworldWindowsAndTilemaps();
             SetMainCallback2(CB2_InitBattle);
             RestartWildEncounterImmunitySteps();
             ClearPoisonStepCounter();