Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-08-17 15:41:50 -04:00
commit ab56ac41a1
322 files changed
+12564 -12748

No files matched your search

+2 -2
View File
@@ -17,11 +17,11 @@ OneIsland_Harbor_OnFrame::
OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime::
lockall
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor
waitmovement 0
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2
warp MAP_ONE_ISLAND, 255, 12, 18
warp MAP_ONE_ISLAND, 12, 18
waitstate
releaseall
end