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
@@ -14,15 +14,13 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan::
applymovement LOCALID_BALDING_MAN, Movement_FacePlayer
waitmovement 0
msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
msgbox SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq SevenIsland_SevaultCanyon_House_EventScript_DeclineDance
goto_if_eq VAR_RESULT, NO, SevenIsland_SevaultCanyon_House_EventScript_DeclineDance
msgbox SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance
closemessage
call EventScript_RestorePrevTextColor
compare VAR_FACING, DIR_SOUTH
call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown
call_if_ne VAR_FACING, DIR_SOUTH, SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown
delay 30
playbgm MUS_SCHOOL, 0
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance
@@ -48,7 +46,7 @@ SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced::
end
SevenIsland_SevaultCanyon_House_EventScript_DeclineDance::
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox SevenIsland_SevaultCanyon_House_Text_ComeOnDance
release
end