diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-22 12:18:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-22 12:18:48 -0400 |
| commit | a180d2af49250b9cf005ce1635e5e59c7e6848c4 (patch) | |
| tree | a457673d0bbfe61da83b59a08b256dadaa4b4821 /data/scripts/trainer_battle.inc | |
| parent | 58b8d7c297576846aeef4173bbe8a6a71608ad98 (diff) | |
| parent | 9d4fc9234be10ccad76987e08512373bb097d8e0 (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'data/scripts/trainer_battle.inc')
| -rw-r--r-- | data/scripts/trainer_battle.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index c205a9d22..21ba0d6d3 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -26,7 +26,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A compare VAR_RESULT, 0 goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement @@ -69,7 +69,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8 compare VAR_RESULT, 0 goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle - compare VAR_RESULT, 0 + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement |