summaryrefslogtreecommitdiff
path: root/data/maps/Route107
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/Route107
parent14641e916e94cfce9f70f9a16843a8e4a31b065f (diff)
Define layout constants
Diffstat (limited to 'data/maps/Route107')
-rw-r--r--data/maps/Route107/connections.inc6
-rw-r--r--data/maps/Route107/events.inc4
-rw-r--r--data/maps/Route107/header.inc4
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc
index 04ad13b07..d1bb18b87 100644
--- a/data/maps/Route107/connections.inc
+++ b/data/maps/Route107/connections.inc
@@ -1,8 +1,8 @@
-Route107_MapConnectionsList: @ 84868E4
+Route107_MapConnectionsList:
connection left, 0, MAP_DEWFORD_TOWN
connection right, 0, MAP_ROUTE108
-Route107_MapConnections: @ 84868FC
- .4byte 0x2
+Route107_MapConnections:
+ .4byte 2
.4byte Route107_MapConnectionsList
diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc
index b67e98384..461d8cd86 100644
--- a/data/maps/Route107/events.inc
+++ b/data/maps/Route107/events.inc
@@ -1,4 +1,4 @@
-Route107_EventObjects: @ 85288A8
+Route107_EventObjects:
object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0
object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0
object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0
@@ -7,6 +7,6 @@ Route107_EventObjects: @ 85288A8
object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0
object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0
-Route107_MapEvents:: @ 8528950
+Route107_MapEvents::
map_events Route107_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
index a4ec264ea..db53b811d 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -1,10 +1,10 @@
-Route107: @ 8482720
+Route107:
.4byte Route107_Layout
.4byte Route107_MapEvents
.4byte Route107_MapScripts
.4byte Route107_MapConnections
.2byte MUS_NEXTROAD
- .2byte 23
+ .2byte LAYOUT_ROUTE107
.byte MAPSEC_ROUTE_107
.byte 0
.byte WEATHER_SUNNY