dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-09-03 14:31:04 -04:00
committed by GitHub
parent ab56ac41a1 ccd527b782
commit 0400ee2124
353 changed files with 20156 additions and 19152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SSAnne_CaptainsOffice/scripts.inc
+3 -3
View File
@@ -14,7 +14,7 @@ SSAnne_CaptainsOffice_EventScript_Captain::
waitfanfare
call EventScript_RestorePrevTextColor
delay 50
applymovement LOCALID_CAPTAIN, Movement_FacePlayer
applymovement LOCALID_CAPTAIN, Common_Movement_FacePlayer
waitmovement 0
msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut
giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM
@@ -28,13 +28,13 @@ SSAnne_CaptainsOffice_EventScript_Captain::
SSAnne_CaptainsOffice_EventScript_NoRoomForCut::
msgbox SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis
closemessage
applymovement LOCALID_CAPTAIN, Movement_FaceOriginalDirection
applymovement LOCALID_CAPTAIN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
SSAnne_CaptainsOffice_EventScript_AlreadyGotCut::
applymovement LOCALID_CAPTAIN, Movement_FacePlayer
applymovement LOCALID_CAPTAIN, Common_Movement_FacePlayer
waitmovement 0
msgbox SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon
release