Merge branch 'master' into event-vars

This commit is contained in:
Phlosioneer
2019-02-25 02:24:20 -05:00
201 changed files with 4075 additions and 7997 deletions
@@ -211,14 +211,14 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E
SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3
playse SE_PIN
applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_272598
applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
waitmovement 0
applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A
applymovement VAR_LAST_TALKED, Common_Movement_Delay48
waitmovement 0
msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT
giveitem_std ITEM_SOOTHE_BELL
compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_SOOTHE_BELL
release
end