From 19bca193c5b5cf777fa07ecb665d167795cc1314 Mon Sep 17 00:00:00 2001 From: Greenphx9 <55181320+Greenphx9@users.noreply.github.com> Date: Sun, 7 Aug 2022 20:55:31 +1000 Subject: [PATCH] Disable rematches if FREE_MATCH_CALL is enabled --- src/battle_setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/battle_setup.c b/src/battle_setup.c index 2326a8ab98..89ae52b679 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1132,6 +1132,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data); SetMapVarsToTrainer(); return EventScript_TryDoDoubleTrainerBattle; +#ifndef FREE_MATCH_CALL case TRAINER_BATTLE_REMATCH_DOUBLE: TrainerBattleLoadArgs(sDoubleBattleParams, data); SetMapVarsToTrainer(); @@ -1142,6 +1143,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) SetMapVarsToTrainer(); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); return EventScript_TryDoRematchBattle; +#endif case TRAINER_BATTLE_PYRAMID: if (gApproachingTrainerId == 0) {