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

+1 -1
View File
@@ -7,7 +7,7 @@ SSAnne_CaptainsOffice_EventScript_Captain::
lock
goto_if_set FLAG_GOT_HM01, SSAnne_CaptainsOffice_EventScript_AlreadyGotCut
msgbox SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
message SSAnne_CaptainsOffice_Text_RubbedCaptainsBack
waitmessage
playfanfare MUS_HEAL