diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 16:55:58 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 00:47:47 -0500 |
| commit | 0bb7f18b8e609f76a9021420470737bbd16cc2bd (patch) | |
| tree | a7c9d6efbc2588c3b73b59d55012386958373ae5 /data/scripts/trainer_battle.inc | |
| parent | a5375776714b126dbe478a4f535392373f3ba9f0 (diff) | |
Sync Cable Club scripts
Diffstat (limited to 'data/scripts/trainer_battle.inc')
| -rw-r--r-- | data/scripts/trainer_battle.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 320776ae7..f16e30ada 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -27,8 +27,8 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare VAR_RESULT, 0 goto_if_ne EventScript_1A4F20 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_1A4F19 special PlayTrainerEncounterMusic special SetUpTrainerMovement @@ -79,8 +79,8 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare VAR_RESULT, 0 goto_if_eq EventScript_1A4FB0 - special CheckForAlivePartyMons - compare VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne EventScript_1A4FB1 special PlayTrainerEncounterMusic special SetUpTrainerMovement |