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/Route128/scripts.inc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 8e2742ff5..2a686a865 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -17,29 +17,29 @@ Route128_EventScript_1F6B57:: @ 81F6B57 delay 20 applymovement 4, Route128_Movement_1F6C89 waitmovement 0 - msgbox Route128_Text_1F6DF5, 4 + msgbox Route128_Text_1F6DF5, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C91 waitmovement 0 - msgbox Route128_Text_1F6E48, 4 + msgbox Route128_Text_1F6E48, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 applymovement 4, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F6E5A, 4 + msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 applymovement 255, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F6F1E, 4 + msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 applymovement 255, Route128_Movement_2725A4 applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 - msgbox Route128_Text_1F704F, 4 + msgbox Route128_Text_1F704F, MSGBOX_DEFAULT closemessage delay 40 applymovement 5, Route128_Movement_1F6CB0 @@ -56,15 +56,15 @@ Route128_EventScript_1F6B57:: @ 81F6B57 waitmovement 0 applymovement 255, Route128_Movement_2725A8 waitmovement 0 - msgbox Route128_Text_1F70C9, 4 + msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 applymovement 255, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F70EA, 4 + msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT applymovement 3, Route128_Movement_2725AA waitmovement 0 - msgbox Route128_Text_1F721B, 4 + msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_2725AA waitmovement 0 @@ -180,24 +180,24 @@ Route128_EventScript_1F6CBE:: @ 81F6CBE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 - msgbox Route128_Text_2A28D7, 4 + msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT release end Route128_EventScript_1F6CEA:: @ 81F6CEA special sub_80B4808 waitmovement 0 - msgbox Route128_Text_2A2916, 4 + msgbox Route128_Text_2A2916, MSGBOX_DEFAULT setvar VAR_0x8004, 376 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 376 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route128_EventScript_1F6D09:: @ 81F6D09 trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8 - msgbox Route128_Text_2A29DC, 6 + msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D20:: @ 81F6D20 @@ -205,49 +205,49 @@ Route128_EventScript_1F6D20:: @ 81F6D20 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B - msgbox Route128_Text_2A2AB7, 4 + msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT release end Route128_EventScript_1F6D4C:: @ 81F6D4C special sub_80B4808 waitmovement 0 - msgbox Route128_Text_2A2AF9, 4 + msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT setvar VAR_0x8004, 386 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 386 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route128_EventScript_1F6D6B:: @ 81F6D6B trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB - msgbox Route128_Text_2A2BDD, 6 + msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D82:: @ 81F6D82 trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79 - msgbox Route128_Text_2A2C95, 6 + msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D99:: @ 81F6D99 trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE - msgbox Route128_Text_2A2D0D, 6 + msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DB0:: @ 81F6DB0 trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9 - msgbox Route128_Text_2A2DBA, 6 + msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DC7:: @ 81F6DC7 trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44 - msgbox Route128_Text_2A2E6C, 6 + msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DDE:: @ 81F6DDE trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA - msgbox Route128_Text_2A2F2F, 6 + msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE end Route128_Text_1F6DF5: @ 81F6DF5 -- 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/Route128/scripts.inc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 2a686a865..0d7a8587c 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -188,10 +188,7 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA special sub_80B4808 waitmovement 0 msgbox Route128_Text_2A2916, MSGBOX_DEFAULT - setvar VAR_0x8004, 376 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 376 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ISAIAH_1 release end @@ -213,10 +210,7 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C special sub_80B4808 waitmovement 0 msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT - setvar VAR_0x8004, 386 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 386 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_KATELYN_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/Route128/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 0d7a8587c..72fc41e03 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -176,7 +176,7 @@ Route128_Movement_1F6CBB: @ 81F6CBB step_end Route128_EventScript_1F6CBE:: @ 81F6CBE - trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA + trainerbattle_normal TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 @@ -193,12 +193,12 @@ Route128_EventScript_1F6CEA:: @ 81F6CEA end Route128_EventScript_1F6D09:: @ 81F6D09 - trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8 + trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8 msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D20:: @ 81F6D20 - trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C + trainerbattle_normal TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B @@ -215,32 +215,32 @@ Route128_EventScript_1F6D4C:: @ 81F6D4C end Route128_EventScript_1F6D6B:: @ 81F6D6B - trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB + trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D82:: @ 81F6D82 - trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79 + trainerbattle_normal TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D99:: @ 81F6D99 - trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE + trainerbattle_normal TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DB0:: @ 81F6DB0 - trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9 + trainerbattle_normal TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DC7:: @ 81F6DC7 - trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44 + trainerbattle_normal TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DDE:: @ 81F6DDE - trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA + trainerbattle_normal TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA msgbox Route128_Text_2A2F2F, 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/Route128/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 72fc41e03..ec47bf39c 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -176,7 +176,7 @@ Route128_Movement_1F6CBB: @ 81F6CBB step_end Route128_EventScript_1F6CBE:: @ 81F6CBE - trainerbattle_normal TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA + trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 @@ -198,7 +198,7 @@ Route128_EventScript_1F6D09:: @ 81F6D09 end Route128_EventScript_1F6D20:: @ 81F6D20 - trainerbattle_normal TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C + trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B @@ -220,27 +220,27 @@ Route128_EventScript_1F6D6B:: @ 81F6D6B end Route128_EventScript_1F6D82:: @ 81F6D82 - trainerbattle_normal TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 + trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D99:: @ 81F6D99 - trainerbattle_normal TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE + trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DB0:: @ 81F6DB0 - trainerbattle_normal TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 + trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DC7:: @ 81F6DC7 - trainerbattle_normal TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 + trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DDE:: @ 81F6DDE - trainerbattle_normal TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA + trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA msgbox Route128_Text_2A2F2F, 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/Route128/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route128') diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index ec47bf39c..2443051f5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -263,7 +263,7 @@ Route128_Text_1F6E5A: @ 81F6E5A .string "completely out of control!$" Route128_Text_1F6F1E: @ 81F6F1E - .string "MAXIE: {PLAYER}, don’t say anything.\p" + .string "MAXIE: {PLAYER}, don't say anything.\p" .string "I know that I have no right to be\n" .string "critical of ARCHIE…\p" .string "But the way things are now, I doubt\n" @@ -278,7 +278,7 @@ Route128_Text_1F704F: @ 81F704F .string "MAXIE: This defies belief…\p" .string "Those super-ancient POKéMON…\p" .string "Their power is unbelievable.\n" - .string "They’ve upset the balance of nature…$" + .string "They've upset the balance of nature…$" Route128_Text_1F70C9: @ 81F70C9 .string "STEVEN: {PLAYER}{KUN}!\n" @@ -288,18 +288,18 @@ Route128_Text_1F70EA: @ 81F70EA .string "This is terrible…\p" .string "After the scorching heat wave ended,\n" .string "this deluge began.\p" - .string "If this doesn’t stop, all of HOENN…\n" + .string "If this doesn't stop, all of HOENN…\n" .string "No, the whole world will drown.\p" .string "This huge rain cloud is spreading\n" .string "from above SOOTOPOLIS…\p" .string "What in the world is taking place there?\p" - .string "There’s no point arguing here…\n" + .string "There's no point arguing here…\n" .string "SOOTOPOLIS might provide answers…$" Route128_Text_1F721B: @ 81F721B .string "{PLAYER}{KUN}…\n" - .string "I don’t know what you intend to do,\l" - .string "but don’t do anything reckless.\p" + .string "I don't know what you intend to do,\l" + .string "but don't do anything reckless.\p" .string "Okay.\n" - .string "I’m going to SOOTOPOLIS.$" + .string "I'm going to SOOTOPOLIS.$" -- cgit v1.2.3