diff options
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r-- | src/battle_setup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 46fc7349c..e478af936 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -467,7 +467,7 @@ void StartWallyTutorialBattle(void) { CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5); ScriptContext2_Enable(); - gMain.savedCallback = CB2_ReturnToFieldContinueScript; + gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic; gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL; CreateBattleStartTask(B_TRANSITION_SLICE, 0); } @@ -609,13 +609,13 @@ static void CB2_EndScriptedWildBattle(void) if (IsPlayerDefeated(gBattleOutcome) == TRUE) { if (InBattlePyramid()) - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); else SetMainCallback2(CB2_WhiteOut); } else { - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } } @@ -932,7 +932,7 @@ static void CB2_StartFirstBattle(void) static void CB2_EndFirstBattle(void) { Overworld_ClearSavedMusic(); - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } static void sub_80B1218(void) @@ -1308,18 +1308,18 @@ static void CB2_EndTrainerBattle(void) { if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) { if (InBattlePyramid() || sub_81D5C18()) - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); else SetMainCallback2(CB2_WhiteOut); } else { - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); if (!InBattlePyramid() && !sub_81D5C18()) { RegisterTrainerInMatchCall(); @@ -1332,7 +1332,7 @@ static void CB2_EndRematchBattle(void) { if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) { @@ -1340,7 +1340,7 @@ static void CB2_EndRematchBattle(void) } else { - SetMainCallback2(CB2_ReturnToFieldContinueScript); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); RegisterTrainerInMatchCall(); SetBattledTrainersFlags(); HandleRematchVarsOnBattleEnd(); |