diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-04-07 13:45:40 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-04-07 13:45:40 -0400 |
commit | a538befd555600c76cd4cd111348181c551b647c (patch) | |
tree | 646ac6f04e6de6afa747f8b5aef968d580e2b5ac /src/battle_setup.c | |
parent | 6451143b3b738a2a749b83487bcb8e3fd980403e (diff) | |
parent | 31ecdcdd0a71cd0230bfa1d80b3355a60db1e93d (diff) |
Merge branch 'various_documentation' of github.com:PikalaxALT/pokefirered into various_documentation
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r-- | src/battle_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 0b4c93868..0f9ffd655 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -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); @@ -952,7 +952,7 @@ static void CB2_EndRematchBattle(void) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); SetBattledTrainerFlag(); sub_810CDE8(); - sub_81138F8(); + ResetDeferredLinkEvent(); } } |