diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-10 12:48:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 12:48:58 -0400 |
| commit | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (patch) | |
| tree | 331837d61614da6f73e983a7230796ace13c9ea6 /src/battle_setup.c | |
| parent | a81edaba1d5e0f84336fd8a57a48b2a970171ba4 (diff) | |
| parent | 5f7ed93363db01da8667aadf47d78cb6515bb450 (diff) | |
Merge pull request #323 from PikalaxALT/various_documentation
Document various parts of the source tree
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index ee923d6c7..b54696247 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -417,7 +417,7 @@ static void CB2_EndWildBattle(void) else { SetMainCallback2(CB2_ReturnToField); - gFieldCallback = sub_807E3EC; + gFieldCallback = FieldCB_SafariZoneRanOutOfBalls; } } @@ -794,13 +794,13 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) SetMapVarsToTrainer(); return EventScript_TryDoDoubleTrainerBattle; case TRAINER_BATTLE_REMATCH_DOUBLE: - sub_811231C(); + FinishRecordingQuestLogScene(); TrainerBattleLoadArgs(sDoubleBattleParams, data); SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); return EventScript_TryDoDoubleRematchBattle; case TRAINER_BATTLE_REMATCH: - sub_811231C(); + FinishRecordingQuestLogScene(); TrainerBattleLoadArgs(sOrdinaryBattleParams, data); SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); @@ -951,8 +951,8 @@ static void CB2_EndRematchBattle(void) { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); SetBattledTrainerFlag(); - sub_810CDE8(); - sub_81138F8(); + ClearRematchStateOfLastTalked(); + ResetDeferredLinkEvent(); } } @@ -994,8 +994,7 @@ void PlayTrainerEncounterMusic(void) { u16 music; - if (gQuestLogState != 2 - && gQuestLogState != 3 + if (!QL_IS_PLAYBACK_STATE && sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC && sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC) { |