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/Route112/events.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index 123385208..afa2b9048 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,16 +1,16 @@ Route112_EventObjects: @ 8529974 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_0x333 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_0x333 object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0 object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0 object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_0x3F3 object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 -- 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/Route112/events.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index afa2b9048..cfa145e97 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,16 +1,16 @@ Route112_EventObjects: @ 8529974 - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_0x333 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_0x333 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0 object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0 object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_0x3F3 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_ITEM_ROUTE_112_NUGGET object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 -- 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/Route112/scripts.inc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 4f7e20b94..d23efddd8 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -13,7 +13,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Route112_Movement_2725A8 waitmovement 0 delay 20 - msgbox Route112_Text_1F1F3F, 4 + msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage applymovement 1, Route112_Movement_2725A2 waitmovement 0 @@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Route112_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route112_Text_1F1F7A, 4 + msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage applymovement 6, Route112_Movement_2725A2 waitmovement 0 @@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Route112_Movement_2725A8 waitmovement 0 delay 20 - msgbox Route112_Text_1F1FBA, 4 + msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage applymovement 1, Route112_Movement_2725A2 waitmovement 0 @@ -37,7 +37,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Route112_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route112_Text_1F2003, 4 + msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage applymovement 6, Route112_Movement_2725A2 waitmovement 0 @@ -45,24 +45,24 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 end Route112_EventScript_1F1E46:: @ 81F1E46 - msgbox Route112_Text_1F20C1, 3 + msgbox Route112_Text_1F20C1, MSGBOX_SIGN end Route112_EventScript_1F1E4F:: @ 81F1E4F - msgbox Route112_Text_1F20ED, 3 + msgbox Route112_Text_1F20ED, MSGBOX_SIGN end Route112_EventScript_1F1E58:: @ 81F1E58 - msgbox Route112_Text_1F2138, 3 + msgbox Route112_Text_1F2138, MSGBOX_SIGN end Route112_EventScript_1F1E61:: @ 81F1E61 - msgbox Route112_Text_1F204E, 2 + msgbox Route112_Text_1F204E, MSGBOX_NPC end Route112_EventScript_1F1E6A:: @ 81F1E6A trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA - msgbox Route112_Text_2997DC, 6 + msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 @@ -70,44 +70,44 @@ Route112_EventScript_1F1E81:: @ 81F1E81 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC - msgbox Route112_Text_299896, 4 + msgbox Route112_Text_299896, MSGBOX_DEFAULT release end Route112_EventScript_1F1EAD:: @ 81F1EAD special sub_80B4808 waitmovement 0 - msgbox Route112_Text_29993C, 4 + msgbox Route112_Text_29993C, MSGBOX_DEFAULT setvar VAR_0x8004, 627 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 627 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route112_EventScript_1F1ECC:: @ 81F1ECC trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 - msgbox Route112_Text_299A0F, 6 + msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EE3:: @ 81F1EE3 trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC - msgbox Route112_Text_299AB4, 6 + msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 - msgbox Route112_Text_299B4C, 6 + msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF - msgbox Route112_Text_299BFB, 6 + msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F - msgbox Route112_Text_299CC6, 6 + msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE end Route112_Text_1F1F3F: @ 81F1F3F -- 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/Route112/scripts.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index d23efddd8..ec18e56da 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -78,10 +78,7 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD special sub_80B4808 waitmovement 0 msgbox Route112_Text_29993C, MSGBOX_DEFAULT - setvar VAR_0x8004, 627 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 627 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_TRENT_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/Route112/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index ec18e56da..4d4ac58cc 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -61,12 +61,12 @@ Route112_EventScript_1F1E61:: @ 81F1E61 end Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA + trainerbattle_normal TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD + trainerbattle_normal TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC @@ -83,27 +83,27 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD end Route112_EventScript_1F1ECC:: @ 81F1ECC - trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 + trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7 msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC + trainerbattle_normal TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 + trainerbattle_normal TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF + trainerbattle_normal TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F + trainerbattle_normal TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F msgbox Route112_Text_299CC6, 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/Route112/scripts.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/Route112') diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 4d4ac58cc..cb6a48dce 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -61,12 +61,12 @@ Route112_EventScript_1F1E61:: @ 81F1E61 end Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle_normal TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA + trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle_normal TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD + trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC @@ -88,22 +88,22 @@ Route112_EventScript_1F1ECC:: @ 81F1ECC end Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle_normal TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC + trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle_normal TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 + trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle_normal TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF + trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle_normal TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F + trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE end -- cgit v1.2.3