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
@@ -6,9 +6,8 @@ LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji::
faceplayer
goto_if_set FLAG_GOT_POKE_FLUTE, LavenderTown_VolunteerPokemonHouse_EventScript_AlreadyHavePokeFlute
msgbox LavenderTown_VolunteerPokemonHouse_Text_IdLikeYouToHaveThis
checkitemspace ITEM_POKE_FLUTE, 1
compare VAR_RESULT, FALSE
goto_if_eq LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute
checkitemspace ITEM_POKE_FLUTE
goto_if_eq VAR_RESULT, FALSE, LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute
setflag FLAG_GOT_POKE_FLUTE
giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_OBTAIN_KEY_ITEM
msgbox LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute