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/Route124/scripts.inc | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'data/maps/Route124/scripts.inc') diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index b21e55417..013171cbd 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -8,17 +8,17 @@ Route124_MapScript1_1F6572: @ 81F6572 end Route124_EventScript_1F657C:: @ 81F657C - msgbox Route124_Text_1F6739, 3 + msgbox Route124_Text_1F6739, MSGBOX_SIGN end Route124_EventScript_1F6585:: @ 81F6585 trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 - msgbox Route124_Text_2A0A20, 6 + msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE end Route124_EventScript_1F659C:: @ 81F659C trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC - msgbox Route124_Text_2A0AD9, 6 + msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE end Route124_EventScript_1F65B3:: @ 81F65B3 @@ -26,34 +26,34 @@ Route124_EventScript_1F65B3:: @ 81F65B3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE - msgbox Route124_Text_2A0B9A, 4 + msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT release end Route124_EventScript_1F65DF:: @ 81F65DF special sub_80B4808 waitmovement 0 - msgbox Route124_Text_2A0C14, 4 + msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT setvar VAR_0x8004, 449 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 449 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route124_EventScript_1F65FE:: @ 81F65FE trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 - msgbox Route124_Text_2A0CBE, 6 + msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6615:: @ 81F6615 trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D - msgbox Route124_Text_2A0D66, 6 + msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE end Route124_EventScript_1F662C:: @ 81F662C trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF - msgbox Route124_Text_2A0E1E, 6 + msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6643:: @ 81F6643 @@ -61,22 +61,22 @@ Route124_EventScript_1F6643:: @ 81F6643 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C - msgbox Route124_Text_2A0F3A, 4 + msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT release end Route124_EventScript_1F6673:: @ 81F6673 - msgbox Route124_Text_2A109F, 4 + msgbox Route124_Text_2A109F, MSGBOX_DEFAULT setvar VAR_0x8004, 687 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 687 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route124_EventScript_1F668C:: @ 81F668C trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 - msgbox Route124_Text_2A1203, 6 + msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE end Route124_EventScript_1F66A7:: @ 81F66A7 @@ -84,32 +84,32 @@ Route124_EventScript_1F66A7:: @ 81F66A7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 - msgbox Route124_Text_2A103E, 4 + msgbox Route124_Text_2A103E, MSGBOX_DEFAULT release end Route124_EventScript_1F66D7:: @ 81F66D7 - msgbox Route124_Text_2A109F, 4 + msgbox Route124_Text_2A109F, MSGBOX_DEFAULT setvar VAR_0x8004, 687 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 687 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route124_EventScript_1F66F0:: @ 81F66F0 trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 - msgbox Route124_Text_2A130F, 6 + msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F670B:: @ 81F670B trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C - msgbox Route124_Text_2A144F, 6 + msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6722:: @ 81F6722 trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC - msgbox Route124_Text_2A14ED, 6 + msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE end Route124_Text_1F6739: @ 81F6739 -- 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/Route124/scripts.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'data/maps/Route124/scripts.inc') diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 013171cbd..530e0703a 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -34,10 +34,7 @@ Route124_EventScript_1F65DF:: @ 81F65DF special sub_80B4808 waitmovement 0 msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT - setvar VAR_0x8004, 449 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 449 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JENNY_1 release end @@ -67,10 +64,7 @@ Route124_EventScript_1F6643:: @ 81F6643 Route124_EventScript_1F6673:: @ 81F6673 msgbox Route124_Text_2A109F, MSGBOX_DEFAULT - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LILA_AND_ROY_1 release end @@ -90,10 +84,7 @@ Route124_EventScript_1F66A7:: @ 81F66A7 Route124_EventScript_1F66D7:: @ 81F66D7 msgbox Route124_Text_2A109F, MSGBOX_DEFAULT - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LILA_AND_ROY_1 release end -- cgit v1.2.3 From bad5323642a0db0875ca6213370b1947c1fc105a Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 07:17:54 -0500 Subject: cleans up trainer battle scripts * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro --- data/maps/Route124/scripts.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'data/maps/Route124/scripts.inc') diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 530e0703a..914189ca0 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -12,17 +12,17 @@ Route124_EventScript_1F657C:: @ 81F657C end Route124_EventScript_1F6585:: @ 81F6585 - trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 + trainerbattle_normal TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE end Route124_EventScript_1F659C:: @ 81F659C - trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC + trainerbattle_normal TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE end Route124_EventScript_1F65B3:: @ 81F65B3 - trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF + trainerbattle_normal TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE @@ -39,22 +39,22 @@ Route124_EventScript_1F65DF:: @ 81F65DF end Route124_EventScript_1F65FE:: @ 81F65FE - trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 + trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0 msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6615:: @ 81F6615 - trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D + trainerbattle_normal TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE end Route124_EventScript_1F662C:: @ 81F662C - trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF + trainerbattle_normal TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6643:: @ 81F6643 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C @@ -69,12 +69,12 @@ Route124_EventScript_1F6673:: @ 81F6673 end Route124_EventScript_1F668C:: @ 81F668C - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE end Route124_EventScript_1F66A7:: @ 81F66A7 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 @@ -89,17 +89,17 @@ Route124_EventScript_1F66D7:: @ 81F66D7 end Route124_EventScript_1F66F0:: @ 81F66F0 - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F670B:: @ 81F670B - trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C + trainerbattle_normal TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6722:: @ 81F6722 - trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC + trainerbattle_normal TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE end -- cgit v1.2.3 From 10725def8e356a6ea9346b1ea3170e1429314db3 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 13:54:48 -0500 Subject: =?UTF-8?q?trainerbattle=5Fnormal=20=E2=86=92=20trainerbattle=5Fsi?= =?UTF-8?q?ngle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little --- data/maps/Route124/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route124/scripts.inc') diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 914189ca0..d9d43b531 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -12,17 +12,17 @@ Route124_EventScript_1F657C:: @ 81F657C end Route124_EventScript_1F6585:: @ 81F6585 - trainerbattle_normal TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 + trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE end Route124_EventScript_1F659C:: @ 81F659C - trainerbattle_normal TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC + trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE end Route124_EventScript_1F65B3:: @ 81F65B3 - trainerbattle_normal TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF + trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE @@ -44,12 +44,12 @@ Route124_EventScript_1F65FE:: @ 81F65FE end Route124_EventScript_1F6615:: @ 81F6615 - trainerbattle_normal TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D + trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE end Route124_EventScript_1F662C:: @ 81F662C - trainerbattle_normal TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF + trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE end @@ -94,12 +94,12 @@ Route124_EventScript_1F66F0:: @ 81F66F0 end Route124_EventScript_1F670B:: @ 81F670B - trainerbattle_normal TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C + trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6722:: @ 81F6722 - trainerbattle_normal TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC + trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE end -- cgit v1.2.3 From 2615ece23bd9463f3e43fca40eac1adcabeb2813 Mon Sep 17 00:00:00 2001 From: Melody Date: Fri, 7 Dec 2018 10:41:08 -0500 Subject: Use normal apostrophes like adults --- data/maps/Route124/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route124/scripts.inc') diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index d9d43b531..b7c40b034 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -104,5 +104,5 @@ Route124_EventScript_1F6722:: @ 81F6722 end Route124_Text_1F6739: @ 81F6739 - .string "HUNTER’S HOUSE$" + .string "HUNTER'S HOUSE$" -- cgit v1.2.3