summaryrefslogtreecommitdiff
path: root/data/maps/Route103
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route103')
-rw-r--r--data/maps/Route103/connections.inc6
-rw-r--r--data/maps/Route103/events.inc8
-rw-r--r--data/maps/Route103/header.inc4
3 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc
index 0759d872f..cff488cf2 100644
--- a/data/maps/Route103/connections.inc
+++ b/data/maps/Route103/connections.inc
@@ -1,8 +1,8 @@
-Route103_MapConnectionsList: @ 848684C
+Route103_MapConnectionsList:
connection down, 0, MAP_OLDALE_TOWN
connection right, -60, MAP_ROUTE110
-Route103_MapConnections: @ 8486864
- .4byte 0x2
+Route103_MapConnections:
+ .4byte 2
.4byte Route103_MapConnectionsList
diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
index 5a6cc8866..879412157 100644
--- a/data/maps/Route103/events.inc
+++ b/data/maps/Route103/events.inc
@@ -1,4 +1,4 @@
-Route103_EventObjects: @ 85280DC
+Route103_EventObjects:
object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL
object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0
@@ -20,12 +20,12 @@ Route103_EventObjects: @ 85280DC
object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0
object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP
-Route103_MapWarps: @ 85282BC
+Route103_MapWarps:
warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE
-Route103_MapBGEvents: @ 85282C4
+Route103_MapBGEvents:
bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB
-Route103_MapEvents:: @ 85282D0
+Route103_MapEvents::
map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index b614f32eb..942ec632c 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -1,10 +1,10 @@
-Route103: @ 84826B0
+Route103:
.4byte Route103_Layout
.4byte Route103_MapEvents
.4byte Route103_MapScripts
.4byte Route103_MapConnections
.2byte MUS_DOORO1
- .2byte 19
+ .2byte LAYOUT_ROUTE103
.byte MAPSEC_ROUTE_103
.byte 0
.byte WEATHER_SUNNY