aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route2.asm
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/Route2.asm (renamed from data/mapObjects/route2.asm)18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/Route2.asm
index b62f9fdb..b27ad199 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/Route2.asm
@@ -1,13 +1,13 @@
-Route2Object:
+Route2_Object:
db $f ; border block
db 6 ; warps
- warp 12, 9, 0, DIGLETTS_CAVE_EXIT
- warp 3, 11, 1, VIRIDIAN_FOREST_EXIT
- warp 15, 19, 0, ROUTE_2_HOUSE
+ warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2
+ warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE
+ warp 15, 19, 0, ROUTE_2_TRADE_HOUSE
warp 16, 35, 1, ROUTE_2_GATE
warp 15, 39, 2, ROUTE_2_GATE
- warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE
+ warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE
db 2 ; signs
sign 5, 65, 3 ; Route2Text3
@@ -18,12 +18,12 @@ Route2Object:
object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP
; warp-to
- warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT
- warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT
- warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_HOUSE
+ warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2
+ warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
+ warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE
warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE
warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE
- warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
+ warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
; unused
warp_to 2, 7, 4