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/Route133/events.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index b1cbb4bb1..f6bdb7dce 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -2,13 +2,13 @@ Route133_EventObjects: @ 852CC94 object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, 1037 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, 1038 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_0x40D + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_0x40E object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_0x485 Route133_MapEvents:: @ 852CD84 map_events Route133_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/Route133/events.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index f6bdb7dce..36f8b747d 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -2,13 +2,13 @@ Route133_EventObjects: @ 852CC94 object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_0x40D - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_0x40E + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_ITEM_ROUTE_133_BIG_PEARL + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_ITEM_ROUTE_133_STAR_PIECE object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_0x485 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE Route133_MapEvents:: @ 852CD84 map_events Route133_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/Route133/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index dc15a5d40..a6770b93c 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -3,36 +3,36 @@ Route133_MapScripts:: @ 81F75A2 Route133_EventScript_1F75A3:: @ 81F75A3 trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F - msgbox Route133_Text_2A4154, 6 + msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75BA:: @ 81F75BA trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 - msgbox Route133_Text_2A420E, 6 + msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75D1:: @ 81F75D1 trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 - msgbox Route133_Text_2A4264, 6 + msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75E8:: @ 81F75E8 trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 - msgbox Route133_Text_2A4304, 6 + msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75FF:: @ 81F75FF trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C - msgbox Route133_Text_2A43B9, 6 + msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE end Route133_EventScript_1F7616:: @ 81F7616 trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A - msgbox Route133_Text_2A4477, 6 + msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE end Route133_EventScript_1F762D:: @ 81F762D trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 - msgbox Route133_Text_2A4527, 6 + msgbox Route133_Text_2A4527, 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/Route133/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index a6770b93c..c42963d83 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,37 +2,37 @@ Route133_MapScripts:: @ 81F75A2 .byte 0 Route133_EventScript_1F75A3:: @ 81F75A3 - trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F + trainerbattle_normal TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75BA:: @ 81F75BA - trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 + trainerbattle_normal TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75D1:: @ 81F75D1 - trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 + trainerbattle_normal TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75E8:: @ 81F75E8 - trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 + trainerbattle_normal TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75FF:: @ 81F75FF - trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C + trainerbattle_normal TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE end Route133_EventScript_1F7616:: @ 81F7616 - trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A + trainerbattle_normal TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE end Route133_EventScript_1F762D:: @ 81F762D - trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 + trainerbattle_normal TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 msgbox Route133_Text_2A4527, 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/Route133/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route133') diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index c42963d83..a91eeead3 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,37 +2,37 @@ Route133_MapScripts:: @ 81F75A2 .byte 0 Route133_EventScript_1F75A3:: @ 81F75A3 - trainerbattle_normal TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F + trainerbattle_single TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75BA:: @ 81F75BA - trainerbattle_normal TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 + trainerbattle_single TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75D1:: @ 81F75D1 - trainerbattle_normal TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 + trainerbattle_single TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75E8:: @ 81F75E8 - trainerbattle_normal TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 + trainerbattle_single TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75FF:: @ 81F75FF - trainerbattle_normal TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C + trainerbattle_single TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE end Route133_EventScript_1F7616:: @ 81F7616 - trainerbattle_normal TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A + trainerbattle_single TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE end Route133_EventScript_1F762D:: @ 81F762D - trainerbattle_normal TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 + trainerbattle_single TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE end -- cgit v1.2.3