From c78101535b72b39cb58295e019c36d2de6b2c1da Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 6 Apr 2020 17:58:24 -0400 Subject: Split quest_log.c --- src/battle_setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_setup.c') diff --git a/src/battle_setup.c b/src/battle_setup.c index 0b4c93868..171f9d794 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); -- cgit v1.2.3 From a7d74b177999510dfd2dc1e3abf146b95180020c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 6 Apr 2020 20:43:53 -0400 Subject: More quest log doccing --- src/battle_setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_setup.c') diff --git a/src/battle_setup.c b/src/battle_setup.c index 171f9d794..0f9ffd655 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -952,7 +952,7 @@ static void CB2_EndRematchBattle(void) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); SetBattledTrainerFlag(); sub_810CDE8(); - sub_81138F8(); + ResetDeferredLinkEvent(); } } -- cgit v1.2.3