diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-02 19:38:05 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-02 19:38:05 +0100 |
| commit | 9828e0e97b8403a7614f4bec127af9233ae923cb (patch) | |
| tree | 7a2b5d14e654e6f8171548692dc5f241de8cb748 /data/maps/MtPyre_3F | |
| parent | a42bfd7a0eeff5bd0cf0014ab133ef5ff4b5becf (diff) | |
| parent | c123b8d6f1787abce2d1e3920d40192811b5fa39 (diff) | |
Merge with master
Diffstat (limited to 'data/maps/MtPyre_3F')
| -rw-r--r-- | data/maps/MtPyre_3F/scripts.inc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ec5373509..7c84290de 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -3,12 +3,12 @@ MtPyre_3F_MapScripts:: @ 8231752 MtPyre_3F_EventScript_231753:: @ 8231753 trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 - msgbox MtPyre_3F_Text_231869, 6 + 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 + msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_231781:: @ 8231781 @@ -16,24 +16,21 @@ MtPyre_3F_EventScript_231781:: @ 8231781 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 + msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE end MtPyre_3F_Text_2317E3: @ 82317E3 |