diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 12:02:58 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-11 14:12:31 -0500 |
| commit | f2e7b1507e564ba3b6b027a17aeeec2f89fba8c8 (patch) | |
| tree | 3095eac19802846050824f93c8f81035f57f3f2f /data/maps/SSTidalCorridor/scripts.inc | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
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..667328725 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_undefeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_undefeated TRAINER_LEONARD, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_undefeated TRAINER_COLTON, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_undefeated TRAINER_MICAH, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_undefeated TRAINER_THOMAS, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_undefeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_undefeated TRAINER_GARRET, SSTidalCorridor_EventScript_TrainerNotDefeated + goto_if_undefeated TRAINER_NAOMI, SSTidalCorridor_EventScript_TrainerNotDefeated setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_EnjoyYourCruise return |