diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /data/maps/MtPyre_3F | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'data/maps/MtPyre_3F')
| -rw-r--r-- | data/maps/MtPyre_3F/scripts.inc | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ec5373509..42c39705c 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,38 +2,35 @@ MtPyre_3F_MapScripts:: @ 8231752 .byte 0 MtPyre_3F_EventScript_231753:: @ 8231753 - trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 - msgbox MtPyre_3F_Text_231869, 6 + trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 + msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_23176A:: @ 823176A - trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD - msgbox MtPyre_3F_Text_2318F2, 6 + trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD + msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_231781:: @ 8231781 - trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD + trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC - msgbox MtPyre_3F_Text_23199B, 4 + msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT release end MtPyre_3F_EventScript_2317AD:: @ 82317AD special sub_80B4808 waitmovement 0 - msgbox MtPyre_3F_Text_231A49, 4 - setvar VAR_0x8004, 9 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 9 - callstd 8 + msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT + register_matchcall TRAINER_GABRIELLE_1 release end MtPyre_3F_EventScript_2317CC:: @ 82317CC - trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 - msgbox MtPyre_3F_Text_231B0D, 6 + trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 + msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE end MtPyre_3F_Text_2317E3: @ 82317E3 @@ -60,7 +57,7 @@ MtPyre_3F_Text_2318DD: @ 82318DD MtPyre_3F_Text_2318F2: @ 82318F2 .string "This means my training is still not\n" .string "enough…\p" - .string "I’ve got to keep working toward the\n" + .string "I've got to keep working toward the\n" .string "summit…\p" .string "Go, me!$" @@ -69,7 +66,7 @@ MtPyre_3F_Text_231952: @ 8231952 MtPyre_3F_Text_23196A: @ 823196A .string "That was amazing!\n" - .string "You’re a very special TRAINER.$" + .string "You're a very special TRAINER.$" MtPyre_3F_Text_23199B: @ 823199B .string "POKéMON no longer of this world.\n" @@ -85,7 +82,7 @@ MtPyre_3F_Text_231A49: @ 8231A49 .string "Please, I need to see your POKéNAV.$" MtPyre_3F_Text_231AAB: @ 8231AAB - .string "Oh, it’s you…\p" + .string "Oh, it's you…\p" .string "Have you come to show me your grown\n" .string "POKéMON?$" @@ -99,5 +96,5 @@ MtPyre_3F_Text_231B0D: @ 8231B0D .string "And the POKéMON that you will meet\n" .string "in the future…\p" .string "They are all to be equally cherished.\n" - .string "I see that you’ve remembered that.$" + .string "I see that you've remembered that.$" |