Merge branch 'master' into clone-union

2022-08-17 15:41:50 -04:00
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
@@ -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