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

+2 -2
View File
@@ -36,7 +36,7 @@ CeladonCity_EventScript_FatMan::
faceplayer
msgbox CeladonCity_Text_MyTrustedPalPoliwrath
closemessage
applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -49,7 +49,7 @@ CeladonCity_EventScript_Poliwrath::
msgbox CeladonCity_Text_Poliwrath
closemessage
waitmoncry
applymovement LOCALID_POLIWRATH, Movement_FaceOriginalDirection
applymovement LOCALID_POLIWRATH, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end