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
@@ -51,7 +51,7 @@ SaffronCity_EventScript_DoorGuardGrunt::
 	end

 SaffronCity_EventScript_DoorGuardAsleep::
-	textcolor 3
+	textcolor NPC_TEXT_COLOR_NEUTRAL
 	msgbox SaffronCity_Text_HesTakingASnooze
 	release
 	end