From f2e7b1507e564ba3b6b027a17aeeec2f89fba8c8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 11 Jan 2020 12:02:58 -0500 Subject: Port some macro/script fixes from pokefirered --- data/maps/SSTidalCorridor/scripts.inc | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'data/maps/SSTidalCorridor') 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 -- cgit v1.2.3