From db4af549fdf13cdaca6654f7bb9ef54ecef14359 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Mon, 29 Jul 2019 20:44:18 -0500
Subject: resolve some Emerald differences

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

(limited to 'src/battle_setup.c')

diff --git a/src/battle_setup.c b/src/battle_setup.c
index c457cc8ec..2ad57e961 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -484,7 +484,7 @@ static void Task_BattleStart(u8 taskId)
     case 1:
         if (IsBattleTransitionDone() == TRUE)
         {
-            SetMainCallback2(sub_800E7C4);
+            SetMainCallback2(CB2_InitBattle);
             RestartWildEncounterImmunitySteps();
             ClearPoisonStepCounter();
             DestroyTask(taskId);
@@ -887,7 +887,7 @@ static void CB2_StartFirstBattle(void)
     {
         gBattleTypeFlags = BATTLE_TYPE_FIRST_BATTLE;
         gMain.savedCallback = CB2_EndFirstBattle;
-        SetMainCallback2(sub_800E7C4);
+        SetMainCallback2(CB2_InitBattle);
         RestartWildEncounterImmunitySteps();
         ClearPoisonStepCounter();
         IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
-- 
cgit v1.2.3