diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:24:20 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:24:20 -0500 |
| commit | 4e5fae008625d236d98d4958594c938bc17f83da (patch) | |
| tree | 38d9d2e8215684ff90f8e50c7dd2efd40a2cbc71 /data/maps/JaggedPass | |
| parent | 87859a655b810aeaad7e7e1f5b066731f7e79ece (diff) | |
| parent | a589d4a630a130e78bdf0819b807a133562d4449 (diff) | |
Merge branch 'master' into event-vars
Diffstat (limited to 'data/maps/JaggedPass')
| -rw-r--r-- | data/maps/JaggedPass/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 630b04b33..348707c18 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -71,27 +71,27 @@ JaggedPass_EventScript_230718:: @ 8230718 goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 waitse playse SE_PIN - applymovement 5, JaggedPass_Movement_272598 + applymovement 5, Common_Movement_ExclamationMark waitmovement 0 - applymovement 5, JaggedPass_Movement_27259A + applymovement 5, Common_Movement_Delay48 waitmovement 0 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end JaggedPass_EventScript_230766:: @ 8230766 - applymovement 5, JaggedPass_Movement_27259E + applymovement 5, Common_Movement_FacePlayer waitmovement 0 msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage - applymovement 5, JaggedPass_Movement_2725A2 + applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end |