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/Route105/scripts.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/Route105') diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index a96c5c58f..a917bf5b6 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -32,37 +32,37 @@ Route105_MapScript2_1EE240: @ 81EE240 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62 + trainerbattle_normal TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66 + trainerbattle_normal TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA + trainerbattle_normal TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0 + trainerbattle_normal TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059 + trainerbattle_normal TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB + trainerbattle_normal TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 + trainerbattle_normal TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F @@ -79,7 +79,7 @@ Route105_EventScript_1EE300:: @ 81EE300 end Route105_EventScript_1EE31F:: @ 81EE31F - trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD + trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD msgbox Route105_Text_2961FE, 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/Route105/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route105') diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index a917bf5b6..18fe07cbe 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -32,37 +32,37 @@ Route105_MapScript2_1EE240: @ 81EE240 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle_normal TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 + trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle_normal TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 + trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle_normal TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA + trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle_normal TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 + trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle_normal TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 + trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle_normal TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB + trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle_normal TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 + trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F -- cgit v1.2.3