summaryrefslogtreecommitdiff
path: root/data/maps/Route130
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2019-01-29 16:55:25 -0600
committerMarcus Huderle <huderlem@gmail.com>2019-01-29 16:55:25 -0600
commit5c1667b41a7d31df6d405d272833895bf8472cf6 (patch)
treedcee557154cc86398b9815838fc61fbe01837ddc /data/maps/Route130
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/Route130')
-rw-r--r--data/maps/Route130/connections.inc6
-rw-r--r--data/maps/Route130/events.inc4
-rw-r--r--data/maps/Route130/header.inc4
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc
index b977d43bc..4300eaae4 100644
--- a/data/maps/Route130/connections.inc
+++ b/data/maps/Route130/connections.inc
@@ -1,8 +1,8 @@
-Route130_MapConnectionsList: @ 8486C84
+Route130_MapConnectionsList:
connection left, 0, MAP_ROUTE131
connection right, 0, MAP_ROUTE129
-Route130_MapConnections: @ 8486C9C
- .4byte 0x2
+Route130_MapConnections:
+ .4byte 2
.4byte Route130_MapConnectionsList
diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc
index 97532e576..b07cc1001 100644
--- a/data/maps/Route130/events.inc
+++ b/data/maps/Route130/events.inc
@@ -1,9 +1,9 @@
-Route130_EventObjects: @ 852CA40
+Route130_EventObjects:
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_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
+Route130_MapEvents::
map_events Route130_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
index 4c03656ac..5afd25eda 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -1,10 +1,10 @@
-Route130: @ 84829A4
+Route130:
.4byte Route130_Layout
.4byte Route130_MapEvents
.4byte Route130_MapScripts
.4byte Route130_MapConnections
.2byte MUS_GRANROAD
- .2byte 263
+ .2byte LAYOUT_ROUTE130
.byte MAPSEC_ROUTE_130
.byte 0
.byte WEATHER_SUNNY