diff options
author | camthesaxman <camthesaxman@users.noreply.github.com> | 2019-07-31 18:29:13 -0500 |
---|---|---|
committer | camthesaxman <camthesaxman@users.noreply.github.com> | 2019-07-31 18:29:13 -0500 |
commit | bbd177fa20a3f53a4815061c524a14e959de6783 (patch) | |
tree | ac166c12c8555af4672049cb5702a0bbf7ea3aa1 /src/battle_setup.c | |
parent | b74a0c3122113b5ebef469739745e2b8fd420c50 (diff) |
fix more emerald differences
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r-- | src/battle_setup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 7f0e852cd..fb76a2ed2 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -558,7 +558,7 @@ void ScrSpecial_StartWallyTutorialBattle(void) { CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5); ScriptContext2_Enable(); - gMain.savedCallback = c2_exit_to_overworld_1_continue_scripts_restart_music; + gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic; gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL; CreateBattleStartTask(B_TRANSITION_SLICE, 0); } @@ -640,7 +640,7 @@ void CB2_EndScriptedWildBattle(void) if (IsPlayerDefeated(gBattleOutcome) == TRUE) SetMainCallback2(CB2_WhiteOut); else - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } s8 BattleSetup_GetTerrain(void) @@ -898,7 +898,7 @@ static void CB2_StartFirstBattle(void) static void CB2_EndFirstBattle(void) { Overworld_ClearSavedMusic(); - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } // why not just use the macros? maybe its because they didnt want to uncast const every time? @@ -1107,7 +1107,7 @@ void CB2_EndTrainerBattle(void) { if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) { @@ -1115,7 +1115,7 @@ void CB2_EndTrainerBattle(void) } else { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); SetCurrentTrainerBattledFlag(); } } @@ -1124,7 +1124,7 @@ void CB2_EndTrainerEyeRematchBattle(void) { if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) { @@ -1132,7 +1132,7 @@ void CB2_EndTrainerEyeRematchBattle(void) } else { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); SetCurrentTrainerBattledFlag(); SetTrainerFlagsAfterTrainerEyeRematch(); } |