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
@@ -191,8 +191,8 @@ VermilionCity_EventScript_ExitedTicketCheck::
VermilionCity_EventScript_CheckTicket::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto_if_eq VAR_MAP_SCENE_VERMILION_CITY, 3, VermilionCity_EventScript_CheckSeagallopPresentTrigger
msgbox VermilionCity_Text_DoYouHaveATicket