summaryrefslogtreecommitdiff
path: root/data/maps/Route130
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-07 14:47:20 -0500
commit53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch)
tree07e69072826569c7c31230cb4671a5d321e5f972 /data/maps/Route130
parent18124740a4d75ae95948f95ca6f63c320e51501c (diff)
parent6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff)
fixing merge conflicts
Diffstat (limited to 'data/maps/Route130')
-rw-r--r--data/maps/Route130/events.inc2
-rw-r--r--data/maps/Route130/scripts.inc42
2 files changed, 22 insertions, 22 deletions
diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc
index 227e359b6..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, 17
+ 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..6698837d2 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
@@ -36,17 +36,17 @@ Route130_EventScript_1F73B5:: @ 81F73B5
return
Route130_EventScript_1F73BF:: @ 81F73BF
- trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6
- msgbox Route130_Text_2A3300, 6
+ trainerbattle_single 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
- msgbox Route130_Text_2A33F5, 6
+ trainerbattle_single 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
- msgbox Route130_Text_2A3494, 6
+ trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D
+ msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE
end