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/Route118/events.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/maps/Route118') diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 19d36d602..accb854a3 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -3,22 +3,22 @@ Route118_EventObjects: @ 852AAB4 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, 797 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, 797 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_0x31D + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_0x31D object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, 901 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, 904 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, 904 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, 17 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_0x385 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_0x385 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_0x388 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_0x388 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_0x011 object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 966 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_0x3C6 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_0x461 object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 Route118_MapWarps: @ 852ACAC @@ -38,8 +38,8 @@ Route118_MapBGEvents: @ 852ACEC bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 - bg_hidden_item_event 31, 13, 3, ITEM_IRON, 67 - bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, 66 + bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_0x043 + bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_0x042 Route118_MapEvents:: @ 852AD58 map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_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/Route118/events.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route118') diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index accb854a3..70a1b6bf1 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -10,7 +10,7 @@ Route118_EventObjects: @ 852AAB4 object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_0x385 object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_0x388 object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_0x388 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_0x011 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11 object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 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/Route118/events.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/Route118') diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 70a1b6bf1..18bbbda02 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -3,13 +3,13 @@ Route118_EventObjects: @ 852AAB4 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_0x31D - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_0x31D + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_0x385 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_0x385 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_0x388 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_0x388 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11 object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 @@ -17,8 +17,8 @@ Route118_EventObjects: @ 852AAB4 object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_0x3C6 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_0x461 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_118_STEVEN + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 Route118_MapWarps: @ 852ACAC @@ -38,8 +38,8 @@ Route118_MapBGEvents: @ 852ACEC bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 - bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_0x043 - bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_0x042 + bg_hidden_item_event_new 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON + bg_hidden_item_event_new 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE Route118_MapEvents:: @ 852AD58 map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_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/Route118/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route118') diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index 18bbbda02..fe131549f 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -38,8 +38,8 @@ Route118_MapBGEvents: @ 852ACEC bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 - bg_hidden_item_event_new 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON - bg_hidden_item_event_new 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE + bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON + bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE Route118_MapEvents:: @ 852AD58 map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_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/Route118/scripts.inc | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'data/maps/Route118') diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 09fad07e7..8448504a1 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -30,7 +30,7 @@ Route118_EventScript_1F3E14:: @ 81F3E14 faceplayer checkflag FLAG_0x0E3 goto_eq Route118_EventScript_1F3E69 - msgbox Route118_Text_1F427B, 5 + msgbox Route118_Text_1F427B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3E3E compare VAR_RESULT, 0 @@ -38,33 +38,33 @@ Route118_EventScript_1F3E14:: @ 81F3E14 end Route118_EventScript_1F3E3E:: @ 81F3E3E - msgbox Route118_Text_1F42AF, 4 + msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT giveitem_std ITEM_GOOD_ROD setflag FLAG_0x0E3 - msgbox Route118_Text_1F42E7, 4 + msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT release end Route118_EventScript_1F3E5F:: @ 81F3E5F - msgbox Route118_Text_1F4319, 4 + msgbox Route118_Text_1F4319, MSGBOX_DEFAULT release end Route118_EventScript_1F3E69:: @ 81F3E69 - msgbox Route118_Text_1F4331, 4 + msgbox Route118_Text_1F4331, MSGBOX_DEFAULT release end Route118_EventScript_1F3E73:: @ 81F3E73 - msgbox Route118_Text_1F4367, 2 + msgbox Route118_Text_1F4367, MSGBOX_NPC end Route118_EventScript_1F3E7C:: @ 81F3E7C - msgbox Route118_Text_1F43F4, 3 + msgbox Route118_Text_1F43F4, MSGBOX_SIGN end Route118_EventScript_1F3E85:: @ 81F3E85 - msgbox Route118_Text_1F440E, 3 + msgbox Route118_Text_1F440E, MSGBOX_SIGN end Route118_EventScript_1F3E8E:: @ 81F3E8E @@ -100,7 +100,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 applymovement 19, Route118_Movement_1F3F65 waitmovement 0 delay 30 - msgbox Route118_Text_1F40BE, 4 + msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, Route118_EventScript_1F3F28 @@ -191,34 +191,34 @@ Route118_EventScript_1F3F87:: @ 81F3F87 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 - msgbox Route118_Text_29D2FA, 4 + msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT release end Route118_EventScript_1F3FB3:: @ 81F3FB3 special sub_80B4808 waitmovement 0 - msgbox Route118_Text_29D343, 4 + msgbox Route118_Text_29D343, MSGBOX_DEFAULT setvar VAR_0x8004, 37 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 37 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route118_EventScript_1F3FD2:: @ 81F3FD2 trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA - msgbox Route118_Text_29D3D9, 6 + msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE end Route118_EventScript_1F3FE9:: @ 81F3FE9 trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C - msgbox Route118_Text_29D587, 6 + msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4000:: @ 81F4000 trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C - msgbox Route118_Text_29D663, 6 + msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4017:: @ 81F4017 @@ -226,39 +226,39 @@ Route118_EventScript_1F4017:: @ 81F4017 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 - msgbox Route118_Text_29D6D8, 4 + msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT release end Route118_EventScript_1F4043:: @ 81F4043 special sub_80B4808 waitmovement 0 - msgbox Route118_Text_29D74A, 4 + msgbox Route118_Text_29D74A, MSGBOX_DEFAULT setvar VAR_0x8004, 196 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 196 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route118_EventScript_1F4062:: @ 81F4062 trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA - msgbox Route118_Text_29D7D5, 6 + msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4079:: @ 81F4079 trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B - msgbox Route118_Text_29D46C, 6 + msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4090:: @ 81F4090 trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4 - msgbox Route118_Text_29D4DA, 6 + msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE end Route118_EventScript_1F40A7:: @ 81F40A7 trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C - msgbox Route118_Text_29D872, 6 + msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE end Route118_Text_1F40BE: @ 81F40BE -- 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/Route118/scripts.inc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'data/maps/Route118') diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 8448504a1..56ec024a1 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -199,10 +199,7 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3 special sub_80B4808 waitmovement 0 msgbox Route118_Text_29D343, MSGBOX_DEFAULT - setvar VAR_0x8004, 37 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 37 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ROSE_1 release end @@ -234,10 +231,7 @@ Route118_EventScript_1F4043:: @ 81F4043 special sub_80B4808 waitmovement 0 msgbox Route118_Text_29D74A, MSGBOX_DEFAULT - setvar VAR_0x8004, 196 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 196 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DALTON_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/Route118/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route118') diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 56ec024a1..f892b64aa 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -187,7 +187,7 @@ Route118_Movement_1F3F7E: @ 81F3F7E step_end Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 + trainerbattle_normal TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 @@ -204,22 +204,22 @@ Route118_EventScript_1F3FB3:: @ 81F3FB3 end Route118_EventScript_1F3FD2:: @ 81F3FD2 - trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA + trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE end Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C + trainerbattle_normal TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C + trainerbattle_normal TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 + trainerbattle_normal TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 @@ -236,22 +236,22 @@ Route118_EventScript_1F4043:: @ 81F4043 end Route118_EventScript_1F4062:: @ 81F4062 - trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA + trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B + trainerbattle_normal TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4 + trainerbattle_normal TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE end Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C + trainerbattle_normal TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C msgbox Route118_Text_29D872, 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/Route118/scripts.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/Route118') diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index f892b64aa..f88e0e9c3 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -187,7 +187,7 @@ Route118_Movement_1F3F7E: @ 81F3F7E step_end Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle_normal TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 + trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 @@ -209,17 +209,17 @@ Route118_EventScript_1F3FD2:: @ 81F3FD2 end Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle_normal TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C + trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle_normal TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C + trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle_normal TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 + trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 @@ -241,17 +241,17 @@ Route118_EventScript_1F4062:: @ 81F4062 end Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle_normal TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B + trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle_normal TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 + trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE end Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle_normal TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C + trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE end -- cgit v1.2.3