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/Route115/scripts.inc | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'data/maps/Route115') diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 967f2f9ce..7921b09ee 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -25,15 +25,15 @@ Route115_MapScript2_1F2969: @ 81F2969 .2byte 0 Route115_EventScript_1F2973:: @ 81F2973 - msgbox Route115_Text_1F2B55, 2 + msgbox Route115_Text_1F2B55, MSGBOX_NPC end Route115_EventScript_1F297C:: @ 81F297C - msgbox Route115_Text_1F2BC9, 3 + msgbox Route115_Text_1F2BC9, MSGBOX_SIGN end Route115_EventScript_1F2985:: @ 81F2985 - msgbox Route115_Text_1F2BE3, 3 + msgbox Route115_Text_1F2BE3, MSGBOX_SIGN end Route115_EventScript_1F298E:: @ 81F298E @@ -41,29 +41,29 @@ Route115_EventScript_1F298E:: @ 81F298E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 - msgbox Route115_Text_29B258, 4 + msgbox Route115_Text_29B258, MSGBOX_DEFAULT release end Route115_EventScript_1F29BA:: @ 81F29BA special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B2B3, 4 + msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT setvar VAR_0x8004, 307 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 307 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route115_EventScript_1F29D9:: @ 81F29D9 trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372 - msgbox Route115_Text_29B385, 6 + msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE end Route115_EventScript_1F29F0:: @ 81F29F0 trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED - msgbox Route115_Text_29B3FF, 6 + msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A07:: @ 81F2A07 @@ -71,24 +71,24 @@ Route115_EventScript_1F2A07:: @ 81F2A07 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 - msgbox Route115_Text_29B49D, 4 + msgbox Route115_Text_29B49D, MSGBOX_DEFAULT release end Route115_EventScript_1F2A33:: @ 81F2A33 special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B50B, 4 + msgbox Route115_Text_29B50B, MSGBOX_DEFAULT setvar VAR_0x8004, 183 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 183 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route115_EventScript_1F2A52:: @ 81F2A52 trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D - msgbox Route115_Text_29B5B5, 6 + msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A69:: @ 81F2A69 @@ -96,54 +96,54 @@ Route115_EventScript_1F2A69:: @ 81F2A69 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 - msgbox Route115_Text_29B647, 4 + msgbox Route115_Text_29B647, MSGBOX_DEFAULT release end Route115_EventScript_1F2A95:: @ 81F2A95 special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B6AB, 4 + msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT setvar VAR_0x8004, 427 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 427 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route115_EventScript_1F2AB4:: @ 81F2AB4 trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A - msgbox Route115_Text_29B737, 6 + msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2ACB:: @ 81F2ACB trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5 - msgbox Route115_Text_29B7EA, 6 + msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AE2:: @ 81F2AE2 trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D - msgbox Route115_Text_29B869, 6 + msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AF9:: @ 81F2AF9 trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8 - msgbox Route115_Text_29B904, 6 + msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B10:: @ 81F2B10 trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6 - msgbox Route115_Text_29BA04, 6 + msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B27:: @ 81F2B27 trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958 - msgbox Route115_Text_29B971, 6 + msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B3E:: @ 81F2B3E trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67 - msgbox Route115_Text_29BA87, 6 + msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE end Route115_Text_1F2B55: @ 81F2B55 -- 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/Route115/scripts.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'data/maps/Route115') diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 7921b09ee..37763c1e1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -49,10 +49,7 @@ Route115_EventScript_1F29BA:: @ 81F29BA special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT - setvar VAR_0x8004, 307 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 307 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_TIMOTHY_1 release end @@ -79,10 +76,7 @@ Route115_EventScript_1F2A33:: @ 81F2A33 special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B50B, MSGBOX_DEFAULT - setvar VAR_0x8004, 183 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 183 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_NOB_1 release end @@ -104,10 +98,7 @@ Route115_EventScript_1F2A95:: @ 81F2A95 special sub_80B4808 waitmovement 0 msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT - setvar VAR_0x8004, 427 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 427 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CYNDY_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/Route115/scripts.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/maps/Route115') diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 37763c1e1..66e5e3fb1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -37,7 +37,7 @@ Route115_EventScript_1F2985:: @ 81F2985 end Route115_EventScript_1F298E:: @ 81F298E - trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA + trainerbattle_normal TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 @@ -54,17 +54,17 @@ Route115_EventScript_1F29BA:: @ 81F29BA end Route115_EventScript_1F29D9:: @ 81F29D9 - trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372 + trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372 msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE end Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED + trainerbattle_normal TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 + trainerbattle_normal TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 @@ -81,12 +81,12 @@ Route115_EventScript_1F2A33:: @ 81F2A33 end Route115_EventScript_1F2A52:: @ 81F2A52 - trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D + trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 + trainerbattle_normal TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 @@ -103,37 +103,37 @@ Route115_EventScript_1F2A95:: @ 81F2A95 end Route115_EventScript_1F2AB4:: @ 81F2AB4 - trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A + trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5 + trainerbattle_normal TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D + trainerbattle_normal TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8 + trainerbattle_normal TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6 + trainerbattle_normal TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958 + trainerbattle_normal TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67 + trainerbattle_normal TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 msgbox Route115_Text_29BA87, 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/Route115/scripts.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/Route115') diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 66e5e3fb1..3dcf7adee 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -37,7 +37,7 @@ Route115_EventScript_1F2985:: @ 81F2985 end Route115_EventScript_1F298E:: @ 81F298E - trainerbattle_normal TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA + trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 @@ -59,12 +59,12 @@ Route115_EventScript_1F29D9:: @ 81F29D9 end Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle_normal TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED + trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle_normal TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 + trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 @@ -86,7 +86,7 @@ Route115_EventScript_1F2A52:: @ 81F2A52 end Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle_normal TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 + trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 @@ -108,32 +108,32 @@ Route115_EventScript_1F2AB4:: @ 81F2AB4 end Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle_normal TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 + trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle_normal TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D + trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle_normal TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 + trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle_normal TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 + trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle_normal TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 + trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle_normal TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 + trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 msgbox Route115_Text_29BA87, 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/Route115/scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route115') diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 3dcf7adee..6c74a0d5a 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -138,10 +138,10 @@ Route115_EventScript_1F2B3E:: @ 81F2B3E end Route115_Text_1F2B55: @ 81F2B55 - .string "Exploring a cave isn’t like walking\n" + .string "Exploring a cave isn't like walking\n" .string "on a road.\p" .string "You never know when wild POKéMON will\n" - .string "appear. It’s full of suspense.$" + .string "appear. It's full of suspense.$" Route115_Text_1F2BC9: @ 81F2BC9 .string "ROUTE 115\n" -- cgit v1.2.3