diff options
Diffstat (limited to 'data/maps/MeteorFalls_1F_2R/scripts.inc')
| -rw-r--r-- | data/maps/MeteorFalls_1F_2R/scripts.inc | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 4f4ab7c6b..df62fe313 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -6,24 +6,21 @@ MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 - msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 + msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A special sub_80B4808 waitmovement 0 - msgbox MeteorFalls_1F_2R_Text_22C6F6, 4 - setvar VAR_0x8004, 392 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 392 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT + register_matchcall TRAINER_NICOLAS_1 release end MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD - msgbox MeteorFalls_1F_2R_Text_22C7D8, 6 + msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 @@ -31,22 +28,19 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C589 - msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 + msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT + register_matchcall TRAINER_JOHN_AND_JAY_1 release end MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 - msgbox MeteorFalls_1F_2R_Text_22CBC5, 6 + msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 @@ -54,22 +48,19 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C5ED - msgbox MeteorFalls_1F_2R_Text_22CA70, 4 + msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT + register_matchcall TRAINER_JOHN_AND_JAY_1 release end MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB - msgbox MeteorFalls_1F_2R_Text_22CD34, 6 + msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_Text_22C608: @ 822C608 |