summaryrefslogtreecommitdiff
path: root/data/maps/Route126
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route126')
-rw-r--r--data/maps/Route126/connections.inc6
-rw-r--r--data/maps/Route126/events.inc4
-rw-r--r--data/maps/Route126/header.inc4
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc
index b1f0f6d81..5784faa25 100644
--- a/data/maps/Route126/connections.inc
+++ b/data/maps/Route126/connections.inc
@@ -1,9 +1,9 @@
-Route126_MapConnectionsList: @ 8486BBC
+Route126_MapConnectionsList:
connection up, 0, MAP_ROUTE124
connection right, 0, MAP_ROUTE127
connection dive, 0, MAP_UNDERWATER2
-Route126_MapConnections: @ 8486BE0
- .4byte 0x3
+Route126_MapConnections:
+ .4byte 3
.4byte Route126_MapConnectionsList
diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc
index 8754a0006..04355d668 100644
--- a/data/maps/Route126/events.inc
+++ b/data/maps/Route126/events.inc
@@ -1,4 +1,4 @@
-Route126_EventObjects: @ 852C648
+Route126_EventObjects:
object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0
object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0
object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0
@@ -9,6 +9,6 @@ Route126_EventObjects: @ 852C648
object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0
object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0
-Route126_MapEvents:: @ 852C720
+Route126_MapEvents::
map_events Route126_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
index 86225727f..f0eabeeba 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -1,10 +1,10 @@
-Route126: @ 8482934
+Route126:
.4byte Route126_Layout
.4byte Route126_MapEvents
.4byte Route126_MapScripts
.4byte Route126_MapConnections
.2byte MUS_DOORO_X3
- .2byte 42
+ .2byte LAYOUT_ROUTE126
.byte MAPSEC_ROUTE_126
.byte 0
.byte WEATHER_SUNNY