diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-06 10:03:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 10:03:30 -0800 |
| commit | 7bf330e9f2b048a9b3d7882c80c9aa413c55484a (patch) | |
| tree | d04ef83bc1ef18ceea4177fd7444b454291a81bc /data/scripts/maps/SSTidalCorridor.inc | |
| parent | b396c6038cec6eba5eed46ed8f70f6a465acc2a6 (diff) | |
| parent | 43b4ba34dc05dc6be31b58f0b18df1b3d57f608d (diff) | |
Merge pull request #508 from huderlem/friendly_macros
call_if and goto_if macros
Diffstat (limited to 'data/scripts/maps/SSTidalCorridor.inc')
| -rw-r--r-- | data/scripts/maps/SSTidalCorridor.inc | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index dd5aee95c..7bc5a7fdd 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -124,8 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 setrespawn 8 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag FLAG_RECEIVED_TM49 - call_if 1, SSTidalCorridor_EventScript_15FE36 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release @@ -134,8 +133,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 SSTidalCorridor_EventScript_15FE17:: @ 815FE17 setrespawn 4 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag FLAG_RECEIVED_TM49 - call_if 1, SSTidalCorridor_EventScript_15FE36 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release @@ -163,8 +161,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer - checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS - goto_if_eq SSTidalCorridor_EventScript_15FE7A + goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 release @@ -176,22 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - checktrainerflag OPPONENT_PHILLIP - goto_if 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEONARD - goto_if 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_COLTON - goto_if 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_TUCKER - goto_if 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_THOMAS - goto_if 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEA_AND_JED - goto_if 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_GARRET - goto_if 0, SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_ANETTE - goto_if 0, 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 |