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/Route127/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route127') diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 399e7a428..c6c560010 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -27,42 +27,42 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 - trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294 + trainerbattle_normal TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A4C:: @ 81F6A4C - trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315 + trainerbattle_normal TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A63:: @ 81F6A63 - trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1 + trainerbattle_normal TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A7A:: @ 81F6A7A - trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483 + trainerbattle_normal TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A91:: @ 81F6A91 - trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B + trainerbattle_normal TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AA8:: @ 81F6AA8 - trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1 + trainerbattle_normal TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6ABF:: @ 81F6ABF - trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC + trainerbattle_normal TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AD6:: @ 81F6AD6 - trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 + trainerbattle_normal TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 @@ -79,7 +79,7 @@ Route127_EventScript_1F6B02:: @ 81F6B02 end Route127_EventScript_1F6B21:: @ 81F6B21 - trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B + trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B msgbox Route127_Text_2A278E, 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/Route127/scripts.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/Route127') diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index c6c560010..f9c3290b9 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -27,42 +27,42 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 - trainerbattle_normal TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 + trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A4C:: @ 81F6A4C - trainerbattle_normal TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 + trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A63:: @ 81F6A63 - trainerbattle_normal TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 + trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A7A:: @ 81F6A7A - trainerbattle_normal TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 + trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A91:: @ 81F6A91 - trainerbattle_normal TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B + trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AA8:: @ 81F6AA8 - trainerbattle_normal TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 + trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6ABF:: @ 81F6ABF - trainerbattle_normal TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC + trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AD6:: @ 81F6AD6 - trainerbattle_normal TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 + trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 -- cgit v1.2.3