diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-05 12:39:57 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-01-05 12:39:57 -0800 |
| commit | 43b4ba34dc05dc6be31b58f0b18df1b3d57f608d (patch) | |
| tree | 1aa40ba6cbff402282fb90374d71fd9ea7acb546 /data/scripts/maps/SSTidalCorridor.inc | |
| parent | aed64560bc222e4ea5ccec266c0d77859a05eaac (diff) | |
Add friendly macros for checking trainer flags
Diffstat (limited to 'data/scripts/maps/SSTidalCorridor.inc')
| -rw-r--r-- | data/scripts/maps/SSTidalCorridor.inc | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index cd830f2b0..7bc5a7fdd 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -173,22 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - checktrainerflag OPPONENT_PHILLIP - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEONARD - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_COLTON - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_TUCKER - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_THOMAS - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEA_AND_JED - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_GARRET - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_ANETTE - goto_if_lt SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return |