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/Route102/events.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index 1c660cda4..a1fc3423b 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -4,7 +4,7 @@ Route102_EventObjects: @ 8527FD8 object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_0x3E8 object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 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/Route102/events.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index a1fc3423b..b2299feea 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -4,7 +4,7 @@ Route102_EventObjects: @ 8527FD8 object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_0x3E8 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_ITEM_ROUTE_102_POTION object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 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/Route102/scripts.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index d25794242..c38d40a7f 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -2,19 +2,19 @@ Route102_MapScripts:: @ 81EC0E0 .byte 0 Route102_EventScript_1EC0E1:: @ 81EC0E1 - msgbox Route102_Text_1EC2C0, 2 + msgbox Route102_Text_1EC2C0, MSGBOX_NPC end Route102_EventScript_1EC0EA:: @ 81EC0EA - msgbox Route102_Text_1EC35B, 3 + msgbox Route102_Text_1EC35B, MSGBOX_SIGN end Route102_EventScript_1EC0F3:: @ 81EC0F3 - msgbox Route102_Text_1EC373, 3 + msgbox Route102_Text_1EC373, MSGBOX_SIGN end Route102_EventScript_1EC0FC:: @ 81EC0FC - msgbox Route102_Text_1EC32E, 2 + msgbox Route102_Text_1EC32E, MSGBOX_NPC end Route102_EventScript_1EC105:: @ 81EC105 @@ -26,7 +26,7 @@ Route102_EventScript_1EC105:: @ 81EC105 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route102_EventScript_1EC170 - msgbox Route102_Text_2945AC, 4 + msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end @@ -39,48 +39,48 @@ Route102_EventScript_1EC146:: @ 81EC146 end Route102_EventScript_1EC157:: @ 81EC157 - msgbox Route102_Text_294668, 4 + msgbox Route102_Text_294668, MSGBOX_DEFAULT setvar VAR_0x8004, 318 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 318 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route102_EventScript_1EC170:: @ 81EC170 checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC183 - msgbox Route102_Text_2945AC, 4 + msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end Route102_EventScript_1EC183:: @ 81EC183 - msgbox Route102_Text_2945EB, 4 + msgbox Route102_Text_2945EB, MSGBOX_DEFAULT setvar VAR_0x8004, 318 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 318 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route102_EventScript_1EC19C:: @ 81EC19C trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C - msgbox Route102_Text_29473C, 6 + msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1B3:: @ 81EC1B3 trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 - msgbox Route102_Text_294859, 6 + msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 - msgbox Route102_Text_294916, 6 + msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA - msgbox Route102_Text_2947DB, 6 + msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE end PetalburgCity_Text_1EC1F8: @ 81EC1F8 -- 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/Route102/scripts.inc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index c38d40a7f..ca6de7d9c 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -40,10 +40,7 @@ Route102_EventScript_1EC146:: @ 81EC146 Route102_EventScript_1EC157:: @ 81EC157 msgbox Route102_Text_294668, MSGBOX_DEFAULT - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CALVIN_1 release end @@ -56,10 +53,7 @@ Route102_EventScript_1EC170:: @ 81EC170 Route102_EventScript_1EC183:: @ 81EC183 msgbox Route102_Text_2945EB, MSGBOX_DEFAULT - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_CALVIN_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/Route102/scripts.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index ca6de7d9c..3430c054b 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC end Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + trainerbattle_normal TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C @@ -58,22 +58,22 @@ Route102_EventScript_1EC183:: @ 81EC183 end Route102_EventScript_1EC19C:: @ 81EC19C - trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C + trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 + trainerbattle_normal TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 + trainerbattle_normal TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA + trainerbattle_normal TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA msgbox Route102_Text_2947DB, 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/Route102/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/maps/Route102') diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index 3430c054b..6eb35c32f 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC end Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle_normal TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C @@ -63,17 +63,17 @@ Route102_EventScript_1EC19C:: @ 81EC19C end Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle_normal TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 + trainerbattle_single TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle_normal TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 + trainerbattle_single TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle_normal TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA + trainerbattle_single TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE end -- cgit v1.2.3