summaryrefslogtreecommitdiff
path: root/data/maps/Route113
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route113')
-rw-r--r--data/maps/Route113/connections.inc6
-rw-r--r--data/maps/Route113/events.inc10
-rw-r--r--data/maps/Route113/header.inc4
3 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc
index 3067ee23b..a4d583ce8 100644
--- a/data/maps/Route113/connections.inc
+++ b/data/maps/Route113/connections.inc
@@ -1,9 +1,9 @@
-Route113_MapConnectionsList: @ 84869C8
+Route113_MapConnectionsList:
connection down, 60, MAP_ROUTE112
connection left, 0, MAP_FALLARBOR_TOWN
connection right, 0, MAP_ROUTE111
-Route113_MapConnections: @ 84869EC
- .4byte 0x3
+Route113_MapConnections:
+ .4byte 3
.4byte Route113_MapConnectionsList
diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc
index b2481d6ed..bcf377e74 100644
--- a/data/maps/Route113/events.inc
+++ b/data/maps/Route113/events.inc
@@ -1,4 +1,4 @@
-Route113_EventObjects: @ 8529B2C
+Route113_EventObjects:
object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0
object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0
object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0
@@ -16,12 +16,12 @@ Route113_EventObjects: @ 8529B2C
object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0
object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0
-Route113_MapWarps: @ 8529CAC
+Route113_MapWarps:
warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP
warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE
warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE
-Route113_MapCoordEvents: @ 8529CC4
+Route113_MapCoordEvents:
coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH
coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH
coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH
@@ -42,7 +42,7 @@ Route113_MapCoordEvents: @ 8529CC4
coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH
coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH
-Route113_MapBGEvents: @ 8529DF4
+Route113_MapBGEvents:
bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C
bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5
bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7
@@ -52,6 +52,6 @@ Route113_MapBGEvents: @ 8529DF4
bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32
bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET
-Route113_MapEvents:: @ 8529E54
+Route113_MapEvents::
map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc
index deaacca36..aae60a100 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -1,10 +1,10 @@
-Route113: @ 84827C8
+Route113:
.4byte Route113_Layout
.4byte Route113_MapEvents
.4byte Route113_MapScripts
.4byte Route113_MapConnections
.2byte MUS_KAZANBAI
- .2byte 29
+ .2byte LAYOUT_ROUTE113
.byte MAPSEC_ROUTE_113
.byte 0
.byte WEATHER_SUNNY