summaryrefslogtreecommitdiff
path: root/data/maps/Route106
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route106')
-rw-r--r--data/maps/Route106/connections.inc6
-rw-r--r--data/maps/Route106/events.inc8
-rw-r--r--data/maps/Route106/header.inc4
3 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc
index 18f181d2b..f48a08bd8 100644
--- a/data/maps/Route106/connections.inc
+++ b/data/maps/Route106/connections.inc
@@ -1,8 +1,8 @@
-Route106_MapConnectionsList: @ 84868C4
+Route106_MapConnectionsList:
connection up, 0, MAP_ROUTE105
connection down, 60, MAP_DEWFORD_TOWN
-Route106_MapConnections: @ 84868DC
- .4byte 0x2
+Route106_MapConnections:
+ .4byte 2
.4byte Route106_MapConnectionsList
diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc
index 9ff0f41dd..6454fc188 100644
--- a/data/maps/Route106/events.inc
+++ b/data/maps/Route106/events.inc
@@ -1,19 +1,19 @@
-Route106_EventObjects: @ 85287E4
+Route106_EventObjects:
object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0
object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0
object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0
object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN
-Route106_MapWarps: @ 852885C
+Route106_MapWarps:
warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
-Route106_MapBGEvents: @ 8528864
+Route106_MapBGEvents:
bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL
bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST
bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE
bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A
-Route106_MapEvents:: @ 8528894
+Route106_MapEvents::
map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
index f0f032b8b..01c7b9ae6 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -1,10 +1,10 @@
-Route106: @ 8482704
+Route106:
.4byte Route106_Layout
.4byte Route106_MapEvents
.4byte Route106_MapScripts
.4byte Route106_MapConnections
.2byte MUS_NEXTROAD
- .2byte 22
+ .2byte LAYOUT_ROUTE106
.byte MAPSEC_ROUTE_106
.byte 0
.byte WEATHER_SUNNY