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/MtPyre_6F/scripts.inc | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'data/maps/MtPyre_6F/scripts.inc')
| -rw-r--r-- | data/maps/MtPyre_6F/scripts.inc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index e3bdd928e..4b7df8e7c 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -1,7 +1,7 @@ -MtPyre_6F_MapScripts:: @ 8231D3A +MtPyre_6F_MapScripts:: .byte 0 -MtPyre_6F_EventScript_Valerie:: @ 8231D3B +MtPyre_6F_EventScript_Valerie:: trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieIntro, MtPyre_6F_Text_ValerieDefeat, MtPyre_6F_EventScript_RegisterValerie specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -10,7 +10,7 @@ MtPyre_6F_EventScript_Valerie:: @ 8231D3B release end -MtPyre_6F_EventScript_RegisterValerie:: @ 8231D67 +MtPyre_6F_EventScript_RegisterValerie:: special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MtPyre_6F_Text_ValerieRegister, MSGBOX_DEFAULT @@ -18,52 +18,52 @@ MtPyre_6F_EventScript_RegisterValerie:: @ 8231D67 release end -MtPyre_6F_EventScript_RematchValerie:: @ 8231D86 +MtPyre_6F_EventScript_RematchValerie:: trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieRematchIntro, MtPyre_6F_Text_ValerieRematchDefeat msgbox MtPyre_6F_Text_ValeriePostRematch, MSGBOX_AUTOCLOSE end -MtPyre_6F_EventScript_Cedric:: @ 8231D9D +MtPyre_6F_EventScript_Cedric:: trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_CedricIntro, MtPyre_6F_Text_CedricDefeat msgbox MtPyre_6F_Text_CedricPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_6F_Text_ValerieIntro: @ 8231DB4 +MtPyre_6F_Text_ValerieIntro: .string "When I'm here…\n" .string "A curious power flows into me…$" -MtPyre_6F_Text_ValerieDefeat: @ 8231DE2 +MtPyre_6F_Text_ValerieDefeat: .string "The power is ebbing away…$" -MtPyre_6F_Text_ValeriePostBattle: @ 8231DFC +MtPyre_6F_Text_ValeriePostBattle: .string "Perhaps the power is from the spirits\n" .string "of POKéMON in fitful sleep here…$" -MtPyre_6F_Text_ValerieRegister: @ 8231E43 +MtPyre_6F_Text_ValerieRegister: .string "Fufufu… I lost the match, but…\n" .string "I have this little ability…\p" .string "Without ever laying my hands on\n" .string "your POKéNAV… Hiyah!$" -MtPyre_6F_Text_ValerieRematchIntro: @ 8231EB3 +MtPyre_6F_Text_ValerieRematchIntro: .string "Behind you…\n" .string "What is it…$" -MtPyre_6F_Text_ValerieRematchDefeat: @ 8231ECB +MtPyre_6F_Text_ValerieRematchDefeat: .string "Something faded away…$" -MtPyre_6F_Text_ValeriePostRematch: @ 8231EE1 +MtPyre_6F_Text_ValeriePostRematch: .string "The POKéMON at rest here…\n" .string "Sometimes, they play…$" -MtPyre_6F_Text_CedricIntro: @ 8231F11 +MtPyre_6F_Text_CedricIntro: .string "Have you lost your bearings?\n" .string "Have no fear for I am here!$" -MtPyre_6F_Text_CedricDefeat: @ 8231F4A +MtPyre_6F_Text_CedricDefeat: .string "Weren't you lost?$" -MtPyre_6F_Text_CedricPostBattle: @ 8231F5C +MtPyre_6F_Text_CedricPostBattle: .string "I had this feeling that a lost TRAINER\n" .string "would be panicked and easy to beat.\p" .string "It's dirty and I won't try it again…$" |