From 624a7552b6e2c07543dfac7276206912970cee15 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 09:05:22 -0400 Subject: use event flags in event scripts --- data/maps/Route134/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 4201b8068..87fb1ad08 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -8,8 +8,8 @@ Route134_EventObjects: @ 852CD98 object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, 1158 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, 1159 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_0x486 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_0x487 Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 -- cgit v1.2.3 From 1441ee6bc3731387f7a3cb31f0058d81a38a8db5 Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 13:04:47 -0400 Subject: finish event object flags --- data/maps/Route134/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 87fb1ad08..8caf4da1e 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -8,8 +8,8 @@ Route134_EventObjects: @ 852CD98 object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_0x486 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_0x487 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE Route134_MapEvents:: @ 852CEA0 map_events Route134_EventObjects, 0x0, 0x0, 0x0 -- cgit v1.2.3 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/Route134/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index bdec88c42..1be55dadd 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -8,46 +8,46 @@ Route134_MapScript1_1F764A: @ 81F764A Route134_EventScript_1F7653:: @ 81F7653 trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB - msgbox Route134_Text_2A45C5, 6 + msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 - msgbox Route134_Text_2A464B, 6 + msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE - msgbox Route134_Text_2A46D2, 6 + msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 - msgbox Route134_Text_2A47FD, 6 + msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 - msgbox Route134_Text_2A475D, 6 + msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 - msgbox Route134_Text_2A4AD8, 6 + msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 - msgbox Route134_Text_2A4A34, 6 + msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B - msgbox Route134_Text_2A49B1, 6 + msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B - msgbox Route134_Text_2A48BD, 6 + msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE 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/Route134/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 1be55dadd..862026bf6 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A end Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB + trainerbattle_normal TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A - trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 + trainerbattle_normal TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE + trainerbattle_normal TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 + trainerbattle_normal TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 + trainerbattle_normal TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + trainerbattle_normal TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 + trainerbattle_normal TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B + trainerbattle_normal TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B - trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B + trainerbattle_normal TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B msgbox Route134_Text_2A48BD, 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/Route134/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route134') diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 862026bf6..f6f4feee3 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A end Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle_normal TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB + trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A - trainerbattle_normal TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 + trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle_normal TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE + trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle_normal TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 + trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle_normal TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 + trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle_normal TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle_normal TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 + trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle_normal TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B + trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B - trainerbattle_normal TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B + trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE end -- cgit v1.2.3