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/Route113/events.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/Route113') diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 21bae5dc6..5ba6d757a 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -4,13 +4,13 @@ Route113_EventObjects: @ 8529B2C object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_0x3F4 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_0x3F5 object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, 1143 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_0x477 object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 @@ -48,9 +48,9 @@ Route113_MapBGEvents: @ 8529DF4 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event 66, 3, 3, ITEM_ETHER, 3 - bg_hidden_item_event 22, 5, 3, ITEM_TM32, 30 - bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, 98 + bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_0x003 + bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_0x01E + bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_0x062 Route113_MapEvents:: @ 8529E54 map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_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/Route113/events.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route113') diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 5ba6d757a..baa0fb390 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -48,8 +48,8 @@ Route113_MapBGEvents: @ 8529DF4 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_0x003 - bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_0x01E + bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_TEMP_3 + bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_TEMP_1E bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_0x062 Route113_MapEvents:: @ 8529E54 -- 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/Route113/events.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/Route113') diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index baa0fb390..9d38010f9 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -4,13 +4,13 @@ Route113_EventObjects: @ 8529B2C object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_0x3F4 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_0x3F5 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_ITEM_ROUTE_113_MAX_ETHER + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_ITEM_ROUTE_113_SUPER_REPEL object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_0x477 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_ITEM_ROUTE_113_HYPER_POTION object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 @@ -48,9 +48,9 @@ Route113_MapBGEvents: @ 8529DF4 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_TEMP_3 - bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_TEMP_1E - bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_0x062 + bg_hidden_item_event_new 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER + bg_hidden_item_event_new 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 + bg_hidden_item_event_new 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET Route113_MapEvents:: @ 8529E54 map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_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/Route113/events.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route113') diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 9d38010f9..b2481d6ed 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -48,9 +48,9 @@ Route113_MapBGEvents: @ 8529DF4 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event_new 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER - bg_hidden_item_event_new 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 - bg_hidden_item_event_new 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET + bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER + bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 + bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET Route113_MapEvents:: @ 8529E54 map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_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/Route113/scripts.inc | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'data/maps/Route113') diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index ce2c4b47d..76d4b7f1c 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -25,37 +25,37 @@ Route113_EventScript_1F2189:: @ 81F2189 return Route113_EventScript_1F218A:: @ 81F218A - msgbox Route113_Text_1F235B, 2 + msgbox Route113_Text_1F235B, MSGBOX_NPC end Route113_EventScript_1F2193:: @ 81F2193 - msgbox Route113_Text_1F23CA, 2 + msgbox Route113_Text_1F23CA, MSGBOX_NPC end Route113_EventScript_1F219C:: @ 81F219C - msgbox Route113_Text_1F2440, 3 + msgbox Route113_Text_1F2440, MSGBOX_SIGN end Route113_EventScript_1F21A5:: @ 81F21A5 - msgbox Route113_Text_1F2456, 3 + msgbox Route113_Text_1F2456, MSGBOX_SIGN end Route113_EventScript_1F21AE:: @ 81F21AE - msgbox Route113_Text_1F24F8, 3 + msgbox Route113_Text_1F24F8, MSGBOX_SIGN end Route113_EventScript_1F21B7:: @ 81F21B7 - msgbox Route113_Text_1F2471, 3 + msgbox Route113_Text_1F2471, MSGBOX_SIGN end Route113_EventScript_1F21C0:: @ 81F21C0 trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68 - msgbox Route113_Text_299D7D, 6 + msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21D7:: @ 81F21D7 trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C - msgbox Route113_Text_299E38, 6 + msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21EE:: @ 81F21EE @@ -63,24 +63,24 @@ Route113_EventScript_1F21EE:: @ 81F21EE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 - msgbox Route113_Text_299F15, 4 + msgbox Route113_Text_299F15, MSGBOX_DEFAULT release end Route113_EventScript_1F221A:: @ 81F221A special sub_80B4808 waitmovement 0 - msgbox Route113_Text_299F49, 4 + msgbox Route113_Text_299F49, MSGBOX_DEFAULT setvar VAR_0x8004, 434 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 434 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route113_EventScript_1F2239:: @ 81F2239 trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9 - msgbox Route113_Text_299FD8, 6 + msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2250:: @ 81F2250 @@ -88,59 +88,59 @@ Route113_EventScript_1F2250:: @ 81F2250 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B - msgbox Route113_Text_29A067, 4 + msgbox Route113_Text_29A067, MSGBOX_DEFAULT release end Route113_EventScript_1F227C:: @ 81F227C special sub_80B4808 waitmovement 0 - msgbox Route113_Text_29A0A2, 4 + msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT setvar VAR_0x8004, 419 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 419 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route113_EventScript_1F229B:: @ 81F229B trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F - msgbox Route113_Text_29A13A, 6 + msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22B2:: @ 81F22B2 trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6 - msgbox Route113_Text_29A219, 6 + msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22C9:: @ 81F22C9 trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F - msgbox Route113_Text_29A2DE, 6 + msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22E4:: @ 81F22E4 trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 - msgbox Route113_Text_29A3DA, 6 + msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22FF:: @ 81F22FF trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508 - msgbox Route113_Text_29A529, 6 + msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2316:: @ 81F2316 trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480 - msgbox Route113_Text_29A489, 6 + msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE end Route113_EventScript_1F232D:: @ 81F232D trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0 - msgbox Route113_Text_29A5BE, 6 + msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2344:: @ 81F2344 trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628 - msgbox Route113_Text_29A65D, 6 + msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE end Route113_Text_1F235B: @ 81F235B -- 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/Route113/scripts.inc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'data/maps/Route113') diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 76d4b7f1c..35611fd6a 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -71,10 +71,7 @@ Route113_EventScript_1F221A:: @ 81F221A special sub_80B4808 waitmovement 0 msgbox Route113_Text_299F49, MSGBOX_DEFAULT - setvar VAR_0x8004, 434 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 434 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_MADELINE_1 release end @@ -96,10 +93,7 @@ Route113_EventScript_1F227C:: @ 81F227C special sub_80B4808 waitmovement 0 msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT - setvar VAR_0x8004, 419 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 419 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LAO_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/Route113/scripts.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/maps/Route113') diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 35611fd6a..42a619cd2 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_1F21B7:: @ 81F21B7 end Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68 + trainerbattle_normal TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C + trainerbattle_normal TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A + trainerbattle_normal TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 @@ -76,12 +76,12 @@ Route113_EventScript_1F221A:: @ 81F221A end Route113_EventScript_1F2239:: @ 81F2239 - trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9 + trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9 msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C + trainerbattle_normal TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B @@ -98,42 +98,42 @@ Route113_EventScript_1F227C:: @ 81F227C end Route113_EventScript_1F229B:: @ 81F229B - trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F + trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6 + trainerbattle_normal TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22C9:: @ 81F22C9 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22E4:: @ 81F22E4 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508 + trainerbattle_normal TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480 + trainerbattle_normal TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE end Route113_EventScript_1F232D:: @ 81F232D - trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0 + trainerbattle_normal TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628 + trainerbattle_normal TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 msgbox Route113_Text_29A65D, 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/Route113/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/Route113') diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 42a619cd2..550029289 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_1F21B7:: @ 81F21B7 end Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle_normal TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 + trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle_normal TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C + trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle_normal TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A + trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 @@ -81,7 +81,7 @@ Route113_EventScript_1F2239:: @ 81F2239 end Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle_normal TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C + trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B @@ -103,7 +103,7 @@ Route113_EventScript_1F229B:: @ 81F229B end Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle_normal TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 + trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE end @@ -118,22 +118,22 @@ Route113_EventScript_1F22E4:: @ 81F22E4 end Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle_normal TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 + trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle_normal TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 + trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE end Route113_EventScript_1F232D:: @ 81F232D - trainerbattle_normal TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 + trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle_normal TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 + trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE end -- cgit v1.2.3