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/Route109_SeashoreHouse.inc | |
| parent | aed64560bc222e4ea5ccec266c0d77859a05eaac (diff) | |
Add friendly macros for checking trainer flags
Diffstat (limited to 'data/scripts/maps/Route109_SeashoreHouse.inc')
| -rw-r--r-- | data/scripts/maps/Route109_SeashoreHouse.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index e52958c50..13d37e7bd 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -91,12 +91,9 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - checktrainerflag OPPONENT_DWAYNE - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag OPPONENT_JOHANNA - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag OPPONENT_SIMON - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end |