Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
322 changed files with 12564 additions and 12748 deletions
@@ -12,8 +12,7 @@ VermilionCity_PokemonFanClub_EventScript_Chairman::
faceplayer
goto_if_set FLAG_GOT_BIKE_VOUCHER, VermilionCity_PokemonFanClub_EventScript_AlreadyHeardStory
msgbox VermilionCity_PokemonFanClub_Text_DidYouComeToHearAboutMyMons, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq VermilionCity_PokemonFanClub_EventScript_ChairmanStory
goto_if_eq VAR_RESULT, YES, VermilionCity_PokemonFanClub_EventScript_ChairmanStory
msgbox VermilionCity_PokemonFanClub_Text_ComeBackToHearStory
release
end
@@ -25,9 +24,8 @@ VermilionCity_PokemonFanClub_EventScript_AlreadyHeardStory::
VermilionCity_PokemonFanClub_EventScript_ChairmanStory::
msgbox VermilionCity_PokemonFanClub_Text_ChairmansStory
checkitemspace ITEM_BIKE_VOUCHER, 1
compare VAR_RESULT, FALSE
goto_if_eq VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher
checkitemspace ITEM_BIKE_VOUCHER
goto_if_eq VAR_RESULT, FALSE, VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher
setflag FLAG_GOT_BIKE_VOUCHER
giveitem_msg VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman, ITEM_BIKE_VOUCHER, 1, MUS_OBTAIN_KEY_ITEM
msgbox VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher