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_6F | |
| parent | a42bfd7a0eeff5bd0cf0014ab133ef5ff4b5becf (diff) | |
| parent | c123b8d6f1787abce2d1e3920d40192811b5fa39 (diff) | |
Merge with master
Diffstat (limited to 'data/maps/MtPyre_6F')
| -rw-r--r-- | data/maps/MtPyre_6F/scripts.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 8d5d912c2..c82827d4f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -6,29 +6,26 @@ MtPyre_6F_EventScript_231D3B:: @ 8231D3B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 - msgbox MtPyre_6F_Text_231DFC, 4 + msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT release end MtPyre_6F_EventScript_231D67:: @ 8231D67 special sub_80B4808 waitmovement 0 - msgbox MtPyre_6F_Text_231E43, 4 - setvar VAR_0x8004, 108 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 108 - callstd 8 + msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT + register_matchcall TRAINER_VALERIE_1 release end MtPyre_6F_EventScript_231D86:: @ 8231D86 trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB - msgbox MtPyre_6F_Text_231EE1, 6 + msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE end MtPyre_6F_EventScript_231D9D:: @ 8231D9D trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A - msgbox MtPyre_6F_Text_231F5C, 6 + msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE end MtPyre_6F_Text_231DB4: @ 8231DB4 |