diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
| commit | 65bd2faf9460d4e5986c30e54b283d7674d77c55 (patch) | |
| tree | 250c345d17b8d8f910d327d98f577afddfb3a64a /data/maps/MeteorFalls_StevensCave | |
| parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
| parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'data/maps/MeteorFalls_StevensCave')
| -rw-r--r-- | data/maps/MeteorFalls_StevensCave/scripts.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 71313be67..9ccc2ca68 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_STEVEN, 1 + MeteorFalls_StevensCave_MapScripts:: @ 823B181 .byte 0 @@ -6,11 +8,11 @@ MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182 goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated waitse playse SE_PIN - applymovement 1, Common_Movement_ExclamationMark + applymovement LOCALID_STEVEN, Common_Movement_ExclamationMark waitmovement 0 - applymovement 1, Common_Movement_Delay48 + applymovement LOCALID_STEVEN, Common_Movement_Delay48 waitmovement 0 - applymovement 1, Common_Movement_FacePlayer + applymovement LOCALID_STEVEN, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_StevenDefeat @@ -20,7 +22,7 @@ MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182 end MeteorFalls_StevensCave_EventScript_Defeated:: @ 823B1CD - applymovement 1, Common_Movement_FacePlayer + applymovement LOCALID_STEVEN, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT release |