Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
322 changed files with 12564 additions and 12748 deletions
+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