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

@@ -14,7 +14,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle::
faceplayer
msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon
playse SE_PIN
applymovement LOCALID_LOSTELLE, Movement_ExclamationMark
applymovement LOCALID_LOSTELLE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_LOSTELLE, ThreeIsland_BerryForest_Movement_LostelleLookAround
waitmovement 0
@@ -26,7 +26,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle::
setwildbattle SPECIES_HYPNO, 30
dowildbattle
special QuestLog_CutRecording
applymovement LOCALID_LOSTELLE, Movement_FacePlayer
applymovement LOCALID_LOSTELLE, Common_Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis
giveitem ITEM_IAPAPA_BERRY