From c557ac61aef788f1630d3960dd2366bf000db8e0 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 03:37:46 -0500 Subject: adds constants, cleans up callstd and msgbox code * adds some constants for standard script names and messagebox types * replaces some callstd calls with msgbox calls where equivalent * replaces msgbox and callstd calls using raw digits with versions that use the constants --- data/maps/MtPyre_6F/scripts.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/MtPyre_6F') diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 8d5d912c2..943e0f31f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -6,29 +6,29 @@ 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 + msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT setvar VAR_0x8004, 108 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 108 - callstd 8 + callstd STD_REGISTER_MATCH_CALL 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 -- cgit v1.2.3 From 862265b73a6eab7d070e628d3cb77663543bc368 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 06:04:59 -0500 Subject: defines `register_matchcall` macro --- data/maps/MtPyre_6F/scripts.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'data/maps/MtPyre_6F') diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 943e0f31f..c82827d4f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -14,10 +14,7 @@ MtPyre_6F_EventScript_231D67:: @ 8231D67 special sub_80B4808 waitmovement 0 msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT - setvar VAR_0x8004, 108 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 108 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_VALERIE_1 release end -- cgit v1.2.3