atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable rematches if FREE_MATCH_CALL is enabled

Browse source
This commit is contained in:
Greenphx9 2022-08-07 20:55:31 +10:00
parent 62be2e37fe
commit 19bca193c5
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/battle_setup.c
View file

@ -1132,6 +1132,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data); TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data);
SetMapVarsToTrainer(); SetMapVarsToTrainer();
return EventScript_TryDoDoubleTrainerBattle; return EventScript_TryDoDoubleTrainerBattle;
#ifndef FREE_MATCH_CALL
case TRAINER_BATTLE_REMATCH_DOUBLE: case TRAINER_BATTLE_REMATCH_DOUBLE:
TrainerBattleLoadArgs(sDoubleBattleParams, data); TrainerBattleLoadArgs(sDoubleBattleParams, data);
SetMapVarsToTrainer(); SetMapVarsToTrainer();
@ -1142,6 +1143,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
SetMapVarsToTrainer(); SetMapVarsToTrainer();
gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A);
return EventScript_TryDoRematchBattle; return EventScript_TryDoRematchBattle;
#endif
case TRAINER_BATTLE_PYRAMID: case TRAINER_BATTLE_PYRAMID:
if (gApproachingTrainerId == 0) if (gApproachingTrainerId == 0)
{ {