summaryrefslogtreecommitdiff
path: root/data/maps/Route131
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route131')
-rw-r--r--data/maps/Route131/connections.inc6
-rw-r--r--data/maps/Route131/events.inc6
-rw-r--r--data/maps/Route131/header.inc4
3 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc
index 150ea7023..9697ba1e0 100644
--- a/data/maps/Route131/connections.inc
+++ b/data/maps/Route131/connections.inc
@@ -1,8 +1,8 @@
-Route131_MapConnectionsList: @ 8486CA4
+Route131_MapConnectionsList:
connection left, 0, MAP_PACIFIDLOG_TOWN
connection right, 0, MAP_ROUTE130
-Route131_MapConnections: @ 8486CBC
- .4byte 0x2
+Route131_MapConnections:
+ .4byte 2
.4byte Route131_MapConnectionsList
diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc
index 1c321a6cb..4f57f7b1c 100644
--- a/data/maps/Route131/events.inc
+++ b/data/maps/Route131/events.inc
@@ -1,4 +1,4 @@
-Route131_EventObjects: @ 852CAB4
+Route131_EventObjects:
object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0
object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0
object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0
@@ -8,9 +8,9 @@ Route131_EventObjects: @ 852CAB4
object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0
object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0
-Route131_MapWarps: @ 852CB74
+Route131_MapWarps:
warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE
-Route131_MapEvents:: @ 852CB7C
+Route131_MapEvents::
map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
index e84799fd4..177dba5ab 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -1,10 +1,10 @@
-Route131: @ 84829C0
+Route131:
.4byte Route131_Layout
.4byte Route131_MapEvents
.4byte Route131_MapScripts
.4byte Route131_MapConnections
.2byte MUS_GRANROAD
- .2byte 47
+ .2byte LAYOUT_ROUTE131
.byte MAPSEC_ROUTE_131
.byte 0
.byte WEATHER_SUNNY