diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 00:44:57 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-10 01:26:20 -0500 |
commit | 4a6f15ba24c159ad6cc1be1d7c8c636e416e80d6 (patch) | |
tree | 823b6f7b6fb71cbfe54add5696b831a9f78a6703 /data/maps/Route10_PokemonCenter_1F/scripts.inc | |
parent | 94fbc3ac489e529176533a1fad7deac7e1014b9d (diff) |
Sync event macros
Diffstat (limited to 'data/maps/Route10_PokemonCenter_1F/scripts.inc')
-rw-r--r-- | data/maps/Route10_PokemonCenter_1F/scripts.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7e04196d3..32864b8fb 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -31,23 +31,21 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 lock faceplayer call EventScript_16FCF1 - checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE - goto_if TRUE, EventScript_16FCE7 + goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AD1 + goto_if_eq EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare VAR_0x8006, 20 - goto_if lt, EventScript_1A7ABD + goto_if_lt EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare VAR_RESULT, 0 - goto_if eq, EventScript_1A7AC7 - additem ITEM_EVERSTONE, 1 - giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE + goto_if_eq EventScript_1A7AC7 + giveitem_msg gUnknown_819E786, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE msgbox gUnknown_819E7AF release |