Fix merge conflicts

2019-01-02 21:25:14 +00:00
parent 1e3da62d24 a0ff38d0be
commit a3ebca4d81
773 changed files with 11252 additions and 23425 deletions
--- 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();