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/Route121/events.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/maps/Route121') diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index b252be7a0..e9de0b92f 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -10,24 +10,24 @@ Route121_EventObjects: @ 852BA14 object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0 object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 914 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 914 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 914 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 17 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, 18 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_0x392 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_0x392 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_0x392 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_0x011 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_0x012 object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, 1103 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, 19 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_0x44F + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_0x013 object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, 1149 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, 1150 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_0x47D + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_0x47E Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE @@ -45,10 +45,10 @@ Route121_MapBGEvents: @ 852BD14 bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F - bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, 39 - bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, 40 - bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, 73 - bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, 100 + bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_0x027 + bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_0x028 + bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_0x049 + bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_0x064 Route121_MapEvents:: @ 852BD8C map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents -- cgit v1.2.3 From ff97873c309e28beec91efe11393c093a08b19d3 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 17 Oct 2018 12:25:12 -0400 Subject: label temp flags, test replace script --- data/maps/Route121/events.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route121') diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index e9de0b92f..9867d3d8a 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -13,14 +13,14 @@ Route121_EventObjects: @ 852BA14 object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_0x392 object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_0x392 object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_0x392 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_0x011 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_0x012 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_12 object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_0x44F - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_0x013 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_13 object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 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/Route121/events.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route121') diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 9867d3d8a..b74ac78e6 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -19,15 +19,15 @@ Route121_EventObjects: @ 852BA14 object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_0x44F + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_ITEM_ROUTE_121_CARBOS object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_13 object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_0x47D - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_0x47E + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE @@ -45,10 +45,10 @@ Route121_MapBGEvents: @ 852BD14 bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F - bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_0x027 - bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_0x028 - bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_0x049 - bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_0x064 + bg_hidden_item_event_new 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP + bg_hidden_item_event_new 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET + bg_hidden_item_event_new 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL + bg_hidden_item_event_new 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE Route121_MapEvents:: @ 852BD8C map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents -- cgit v1.2.3 From 113a8d1efd45ed387a0ede7b7aa8744b622c662f Mon Sep 17 00:00:00 2001 From: garak Date: Fri, 19 Oct 2018 14:59:18 -0400 Subject: clean flags and remove temp macro --- data/maps/Route121/events.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/Route121') diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index b74ac78e6..4f27079a6 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -45,10 +45,10 @@ Route121_MapBGEvents: @ 852BD14 bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F - bg_hidden_item_event_new 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP - bg_hidden_item_event_new 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET - bg_hidden_item_event_new 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL - bg_hidden_item_event_new 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE + bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP + bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET + bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL + bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE Route121_MapEvents:: @ 852BD8C map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents -- 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/Route121/scripts.inc | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'data/maps/Route121') diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index f133ffe56..1bd917450 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -2,15 +2,15 @@ Route121_MapScripts:: @ 81F5DFC .byte 0 Route121_EventScript_1F5DFD:: @ 81F5DFD - msgbox Route121_Text_1F607F, 2 + msgbox Route121_Text_1F607F, MSGBOX_NPC end Route121_EventScript_1F5E06:: @ 81F5E06 - msgbox Route121_Text_1F60D3, 3 + msgbox Route121_Text_1F60D3, MSGBOX_SIGN end Route121_EventScript_1F5E0F:: @ 81F5E0F - msgbox Route121_Text_1F611E, 3 + msgbox Route121_Text_1F611E, MSGBOX_SIGN end Route121_EventScript_1F5E18:: @ 81F5E18 @@ -18,7 +18,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18 playbgm MUS_AQA_0, 0 applymovement 13, Route121_Movement_2725B8 waitmovement 0 - msgbox Route121_Text_1F605A, 4 + msgbox Route121_Text_1F605A, MSGBOX_DEFAULT closemessage applymovement 12, Route121_Movement_1F5E59 applymovement 13, Route121_Movement_1F5E62 @@ -67,7 +67,7 @@ Route121_Movement_1F5E6B: @ 81F5E6B Route121_EventScript_1F5E74:: @ 81F5E74 trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F - msgbox Route121_Text_29F138, 6 + msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5E8B:: @ 81F5E8B @@ -75,39 +75,39 @@ Route121_EventScript_1F5E8B:: @ 81F5E8B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 - msgbox Route121_Text_29F21E, 4 + msgbox Route121_Text_29F21E, MSGBOX_DEFAULT release end Route121_EventScript_1F5EB7:: @ 81F5EB7 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F25B, 4 + msgbox Route121_Text_29F25B, MSGBOX_DEFAULT setvar VAR_0x8004, 254 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 254 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route121_EventScript_1F5ED6:: @ 81F5ED6 trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A - msgbox Route121_Text_29F32B, 6 + msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5EED:: @ 81F5EED trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9 - msgbox Route121_Text_29F3C6, 6 + msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F04:: @ 81F5F04 trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 - msgbox Route121_Text_29F476, 6 + msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F1F:: @ 81F5F1F trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE - msgbox Route121_Text_29F582, 6 + msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F3A:: @ 81F5F3A @@ -115,44 +115,44 @@ Route121_EventScript_1F5F3A:: @ 81F5F3A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 - msgbox Route121_Text_29F66F, 4 + msgbox Route121_Text_29F66F, MSGBOX_DEFAULT release end Route121_EventScript_1F5F66:: @ 81F5F66 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F69F, 4 + msgbox Route121_Text_29F69F, MSGBOX_DEFAULT setvar VAR_0x8004, 127 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 127 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route121_EventScript_1F5F85:: @ 81F5F85 trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710 - msgbox Route121_Text_29F740, 6 + msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F9C:: @ 81F5F9C trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B - msgbox Route121_Text_29F9AE, 6 + msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FB3:: @ 81F5FB3 trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64 - msgbox Route121_Text_29FA73, 6 + msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FCA:: @ 81F5FCA trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8 - msgbox Route121_Text_29FAEA, 6 + msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FE1:: @ 81F5FE1 trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C - msgbox Route121_Text_29FBA8, 6 + msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FF8:: @ 81F5FF8 @@ -160,24 +160,24 @@ Route121_EventScript_1F5FF8:: @ 81F5FF8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 - msgbox Route121_Text_29F7D4, 4 + msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT release end Route121_EventScript_1F6024:: @ 81F6024 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F80D, 4 + msgbox Route121_Text_29F80D, MSGBOX_DEFAULT setvar VAR_0x8004, 767 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 767 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route121_EventScript_1F6043:: @ 81F6043 trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8 - msgbox Route121_Text_29F8D0, 6 + msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE end Route121_Text_1F605A: @ 81F605A -- 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/Route121/scripts.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'data/maps/Route121') diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 1bd917450..9c683c70d 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -83,10 +83,7 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F25B, MSGBOX_DEFAULT - setvar VAR_0x8004, 254 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 254 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_WALTER_1 release end @@ -123,10 +120,7 @@ Route121_EventScript_1F5F66:: @ 81F5F66 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F69F, MSGBOX_DEFAULT - setvar VAR_0x8004, 127 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 127 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_JESSICA_1 release end @@ -168,10 +162,7 @@ Route121_EventScript_1F6024:: @ 81F6024 special sub_80B4808 waitmovement 0 msgbox Route121_Text_29F80D, MSGBOX_DEFAULT - setvar VAR_0x8004, 767 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 767 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CRISTIN_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/Route121/scripts.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/maps/Route121') diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 9c683c70d..efaf46f5a 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -66,12 +66,12 @@ Route121_Movement_1F5E6B: @ 81F5E6B step_end Route121_EventScript_1F5E74:: @ 81F5E74 - trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F + trainerbattle_normal TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5E8B:: @ 81F5E8B - trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 + trainerbattle_normal TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 @@ -88,27 +88,27 @@ Route121_EventScript_1F5EB7:: @ 81F5EB7 end Route121_EventScript_1F5ED6:: @ 81F5ED6 - trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A + trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_29F2A6, Route121_Text_29F31A msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5EED:: @ 81F5EED - trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9 + trainerbattle_normal TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F04:: @ 81F5F04 - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F1F:: @ 81F5F1F - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F3A:: @ 81F5F3A - trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 + trainerbattle_normal TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 @@ -125,32 +125,32 @@ Route121_EventScript_1F5F66:: @ 81F5F66 end Route121_EventScript_1F5F85:: @ 81F5F85 - trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710 + trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_29F6E4, Route121_Text_29F710 msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F9C:: @ 81F5F9C - trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B + trainerbattle_normal TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FB3:: @ 81F5FB3 - trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64 + trainerbattle_normal TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FCA:: @ 81F5FCA - trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8 + trainerbattle_normal TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FE1:: @ 81F5FE1 - trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C + trainerbattle_normal TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FF8:: @ 81F5FF8 - trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 + trainerbattle_normal TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 @@ -167,7 +167,7 @@ Route121_EventScript_1F6024:: @ 81F6024 end Route121_EventScript_1F6043:: @ 81F6043 - trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8 + trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_29F855, Route121_Text_29F8A8 msgbox Route121_Text_29F8D0, 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/Route121/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route121') diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index efaf46f5a..84c7473e9 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -66,12 +66,12 @@ Route121_Movement_1F5E6B: @ 81F5E6B step_end Route121_EventScript_1F5E74:: @ 81F5E74 - trainerbattle_normal TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F + trainerbattle_single TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5E8B:: @ 81F5E8B - trainerbattle_normal TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 + trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 @@ -93,7 +93,7 @@ Route121_EventScript_1F5ED6:: @ 81F5ED6 end Route121_EventScript_1F5EED:: @ 81F5EED - trainerbattle_normal TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 + trainerbattle_single TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE end @@ -108,7 +108,7 @@ Route121_EventScript_1F5F1F:: @ 81F5F1F end Route121_EventScript_1F5F3A:: @ 81F5F3A - trainerbattle_normal TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 + trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 @@ -130,27 +130,27 @@ Route121_EventScript_1F5F85:: @ 81F5F85 end Route121_EventScript_1F5F9C:: @ 81F5F9C - trainerbattle_normal TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B + trainerbattle_single TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FB3:: @ 81F5FB3 - trainerbattle_normal TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 + trainerbattle_single TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FCA:: @ 81F5FCA - trainerbattle_normal TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 + trainerbattle_single TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FE1:: @ 81F5FE1 - trainerbattle_normal TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C + trainerbattle_single TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FF8:: @ 81F5FF8 - trainerbattle_normal TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 + trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 -- cgit v1.2.3