diff options
author | camthesaxman <cameronghall@cox.net> | 2019-07-29 20:44:18 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2019-07-29 20:44:18 -0500 |
commit | db4af549fdf13cdaca6654f7bb9ef54ecef14359 (patch) | |
tree | c06f2d86efac079db46a3e9767faee1207f7f7e7 /src/battle_setup.c | |
parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) |
resolve some Emerald differences
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r-- | src/battle_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |