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-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+9 -11
View File
@@ -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
@@ -36,7 +34,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan::
end
SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -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
@@ -62,13 +60,13 @@ SevenIsland_SevaultCanyon_House_Movement_ChanseyDance::
delay_16
walk_in_place_down
delay_16
walk_in_place_fastest_right
walk_in_place_faster_right
delay_4
walk_in_place_fastest_up
walk_in_place_faster_up
delay_4
walk_in_place_fastest_left
walk_in_place_faster_left
delay_4
walk_in_place_fastest_down
walk_in_place_faster_down
delay_4
step_end