diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /data/maps/MeteorFalls_StevensCave/scripts.inc | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'data/maps/MeteorFalls_StevensCave/scripts.inc')
| -rw-r--r-- | data/maps/MeteorFalls_StevensCave/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 9ccc2ca68..a1c9e74ec 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -1,9 +1,9 @@ .set LOCALID_STEVEN, 1 -MeteorFalls_StevensCave_MapScripts:: @ 823B181 +MeteorFalls_StevensCave_MapScripts:: .byte 0 -MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182 +MeteorFalls_StevensCave_EventScript_Steven:: lock goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated waitse @@ -21,14 +21,14 @@ MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182 release end -MeteorFalls_StevensCave_EventScript_Defeated:: @ 823B1CD +MeteorFalls_StevensCave_EventScript_Defeated:: applymovement LOCALID_STEVEN, Common_Movement_FacePlayer waitmovement 0 msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT release end -MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: @ 823B1E1 +MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: .string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n" .string "I'm amazed you knew where to find me.\p" .string "Do you, uh…maybe think of me as\n" @@ -41,11 +41,11 @@ MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: @ 823B1E1 .string "Okay, {PLAYER}{KUN}, if you're going to mount\n" .string "a serious challenge, expect the worst!$" -MeteorFalls_StevensCave_Text_StevenDefeat: @ 823B32D +MeteorFalls_StevensCave_Text_StevenDefeat: .string "You…\n" .string "I had no idea you'd become so strong…$" -MeteorFalls_StevensCave_Text_MyPredictionCameTrue: @ 823B358 +MeteorFalls_StevensCave_Text_MyPredictionCameTrue: .string "STEVEN: Come to think of it, ever since\n" .string "our paths first crossed in GRANITE\l" .string "CAVE in DEWFORD, I had this feeling.\p" |