From dcbc8db6a32e70651163a132950d486d93a58254 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Tue, 25 Dec 2018 11:02:41 -0600
Subject: Document mirage_tower.c. (Combine fldeff_groundshake.c and
 fossil_specials.c)

---
 src/battle_setup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/battle_setup.c')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 56bed77c8..55ee331cd 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -40,6 +40,7 @@
 #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"
 
@@ -341,7 +342,7 @@ 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;
-- 
cgit v1.2.3


From d59f5a8e5649ad09a41b65edcc68f701320ca52e Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Thu, 27 Dec 2018 16:30:47 -0600
Subject: Misc overworld documentation

---
 src/battle_setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle_setup.c')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 55ee331cd..21386016f 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -349,7 +349,7 @@ static void Task_BattleStart(u8 taskId)
     case 1:
         if (IsBattleTransitionDone() == TRUE)
         {
-            overworld_free_bg_tilemaps();
+            CleanupOverworldWindowsAndTilemaps();
             SetMainCallback2(CB2_InitBattle);
             RestartWildEncounterImmunitySteps();
             ClearPoisonStepCounter();
-- 
cgit v1.2.3