diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-05 11:36:47 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-01-05 11:36:47 -0800 |
| commit | aed64560bc222e4ea5ccec266c0d77859a05eaac (patch) | |
| tree | ecdbc1f85cf112f24207adb27b63b93d1e503edf /data/scripts/mystery_event_club.inc | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
Add friendly macros for goto_if and call_if variants
Diffstat (limited to 'data/scripts/mystery_event_club.inc')
| -rw-r--r-- | data/scripts/mystery_event_club.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index b02ab4faa..4813caa68 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,8 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer - checkflag FLAG_SYS_CHAT_USED - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB + goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D end @@ -30,7 +29,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A lock faceplayer compare VAR_SPECIAL_4, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 compare RESULT, 1 @@ -84,7 +83,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 lock faceplayer compare VAR_SPECIAL_4, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 compare RESULT, 1 @@ -97,10 +96,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D end PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 - checkflag FLAG_BADGE05_GET - goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - checkflag FLAG_SYS_EXDATA_ENABLE - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 + goto_if_unset FLAG_BADGE05_GET, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 + goto_if_set FLAG_SYS_EXDATA_ENABLE, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 setflag FLAG_SYS_EXDATA_ENABLE msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 release |