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/cable_club.inc | |
parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) |
Add friendly macros for goto_if and call_if variants
Diffstat (limited to 'data/scripts/cable_club.inc')
-rw-r--r-- | data/scripts/cable_club.inc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 334a52382..0e2012de9 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -174,8 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4342 copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -282,7 +281,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 + goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_1A4056 setvar VAR_SPECIAL_4, 2 return @@ -346,8 +345,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4339 copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -407,7 +405,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB specialvar RESULT, CalculatePlayerPartyCount compare RESULT, 2 - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 + goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_1A41E1 specialvar RESULT, GetNameOfEnigmaBerryInPlayerParty compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE @@ -443,8 +441,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B + goto_if_unset FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_1A434B copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -691,7 +688,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A442D:: @ 81A442D @@ -699,7 +696,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4442:: @ 81A4442 @@ -707,7 +704,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4457:: @ 81A4457 @@ -715,7 +712,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A446C:: @ 81A446C @@ -771,7 +768,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD RecordCorner_EventScript_1A44BC:: @ 81A44BC compare VAR_TEMP_0, 0 - goto_if 5, RecordCorner_EventScript_1A44D6 + goto_if_ne RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 waitmessage |