diff options
| author | huderlem <huderlem@gmail.com> | 2020-01-13 19:33:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 19:33:47 -0600 |
| commit | 6d6c57f3832c14aadd07b9d39c658c838fcd42cf (patch) | |
| tree | eb87fc3634991f5ce401b25dfca9968ee5c36f69 /data/maps/SSTidalCorridor/scripts.inc | |
| parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) | |
| parent | 96720db08319d8f69d7864e186722d13dc9ceb05 (diff) | |
Merge pull request #953 from GriffinRichards/sync-script
Port some macro/script fixes from pokefirered
Diffstat (limited to 'data/maps/SSTidalCorridor/scripts.inc')
| -rw-r--r-- | data/maps/SSTidalCorridor/scripts.inc | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 6b88b7ae1..a276be20f 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -174,22 +174,14 @@ SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD end SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7 - checktrainerflag TRAINER_PHILLIP - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_LEONARD - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_COLTON - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_MICAH - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_THOMAS - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_LEA_AND_JED - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_GARRET - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated - checktrainerflag TRAINER_NAOMI - goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_MICAH, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_not_defeated TRAINER_NAOMI, SSTidalCorridor_EventScript_TrainerNotDefeated setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_EnjoyYourCruise return |