Merge branch 'master' into movement-action

This commit is contained in:
cbt6
2022-08-15 12:54:47 +08:00
committed by GitHub
286 changed files with 8970 additions and 9432 deletions
@@ -19,7 +19,7 @@ FiveIsland_LostCave_Room10_OnFrame::
FiveIsland_LostCave_Room10_EventScript_FindSelphyScene::
lockall
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander
waitmovement 0
delay 100
@@ -31,7 +31,7 @@ FiveIsland_LostCave_Room10_EventScript_FindSelphyScene::
msgbox FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome
closemessage
call FiveIsland_LostCave_Room10_EventScript_SetSelphyFound
warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10
warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 39, 10
waitstate
releaseall
end