summaryrefslogtreecommitdiff
path: root/data/maps/SSTidalCorridor/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SSTidalCorridor/scripts.inc')
-rw-r--r--data/maps/SSTidalCorridor/scripts.inc24
1 files changed, 8 insertions, 16 deletions
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index 731b31f1f..fae6efc1a 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