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/Route130/events.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route130') diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index 227e359b6..e3fc262b0 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,7 +1,7 @@ Route130_EventObjects: @ 852CA40 object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, 17 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_0x011 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 Route130_MapEvents:: @ 852CAA0 -- 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/Route130/events.inc | 2 +- data/maps/Route130/scripts.inc | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'data/maps/Route130') diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index e3fc262b0..97532e576 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,7 +1,7 @@ Route130_EventObjects: @ 852CA40 object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_0x011 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 Route130_MapEvents:: @ 852CAA0 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 26278cf50..2d860050b 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -8,21 +8,21 @@ Route130_MapScript1_1F7365: @ 81F7365 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 - setflag FLAG_0x011 - setflag FLAG_0x012 - setflag FLAG_0x013 - setflag FLAG_0x014 - setflag FLAG_0x015 - setflag FLAG_0x016 - setflag FLAG_0x017 - setflag FLAG_0x018 - setflag FLAG_0x019 - setflag FLAG_0x01A - setflag FLAG_0x01B - setflag FLAG_0x01C - setflag FLAG_0x01D - setflag FLAG_0x01E - setflag FLAG_0x01F + setflag FLAG_TEMP_11 + setflag FLAG_TEMP_12 + setflag FLAG_TEMP_13 + setflag FLAG_TEMP_14 + setflag FLAG_TEMP_15 + setflag FLAG_TEMP_16 + setflag FLAG_TEMP_17 + setflag FLAG_TEMP_18 + setflag FLAG_TEMP_19 + setflag FLAG_TEMP_1A + setflag FLAG_TEMP_1B + setflag FLAG_TEMP_1C + setflag FLAG_TEMP_1D + setflag FLAG_TEMP_1E + setflag FLAG_TEMP_1F setmaplayoutindex 263 end -- 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/Route130/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route130') diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 2d860050b..badd68dc0 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -37,16 +37,16 @@ Route130_EventScript_1F73B5:: @ 81F73B5 Route130_EventScript_1F73BF:: @ 81F73BF trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 - msgbox Route130_Text_2A3300, 6 + msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73D6:: @ 81F73D6 trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC - msgbox Route130_Text_2A33F5, 6 + msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73ED:: @ 81F73ED trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D - msgbox Route130_Text_2A3494, 6 + msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE 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/Route130/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route130') diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index badd68dc0..91c3dde49 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -36,17 +36,17 @@ Route130_EventScript_1F73B5:: @ 81F73B5 return Route130_EventScript_1F73BF:: @ 81F73BF - trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 + trainerbattle_normal TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73D6:: @ 81F73D6 - trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC + trainerbattle_normal TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73ED:: @ 81F73ED - trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D + trainerbattle_normal TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D msgbox Route130_Text_2A3494, 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/Route130/scripts.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/Route130') diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 91c3dde49..6698837d2 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -36,17 +36,17 @@ Route130_EventScript_1F73B5:: @ 81F73B5 return Route130_EventScript_1F73BF:: @ 81F73BF - trainerbattle_normal TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 + trainerbattle_single TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73D6:: @ 81F73D6 - trainerbattle_normal TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC + trainerbattle_single TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73ED:: @ 81F73ED - trainerbattle_normal TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D + trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE end -- cgit v1.2.3