Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-09-03 14:31:04 -04:00
commit 0400ee2124
353 files changed
+20156 -19152

No files matched your search

@@ -57,7 +57,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman::
goto_if_set SPOKE_TO_FAT_MAN_LAST, VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan
msgbox VermilionCity_PokemonFanClub_Text_AdoreMySeel
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
setflag SPOKE_TO_WOMAN_LAST
release
@@ -66,7 +66,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman::
VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan::
msgbox VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
clearflag SPOKE_TO_FAT_MAN_LAST
release
@@ -78,7 +78,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan::
goto_if_set SPOKE_TO_WOMAN_LAST, VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman
msgbox VermilionCity_PokemonFanClub_Text_AdmirePikachusTail
closemessage
applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
setflag SPOKE_TO_FAT_MAN_LAST
release
@@ -87,7 +87,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan::
VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman::
msgbox VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute
closemessage
applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
clearflag SPOKE_TO_WOMAN_LAST
release