summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Route2.asm')
-rwxr-xr-xdata/maps/objects/Route2.asm14
1 files changed, 4 insertions, 10 deletions
diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm
index 8645f9c0..f9955c2a 100755
--- a/data/maps/objects/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -1,7 +1,7 @@
Route2_Object:
db $f ; border block
- db 6 ; warps
+ def_warps
warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2
warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE
warp 15, 19, 0, ROUTE_2_TRADE_HOUSE
@@ -9,21 +9,15 @@ Route2_Object:
warp 15, 39, 2, ROUTE_2_GATE
warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE
- db 2 ; signs
+ def_signs
sign 5, 65, 3 ; Route2Text3
sign 11, 11, 4 ; Route2Text4
- db 2 ; objects
+ def_objects
object SPRITE_POKE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE
object SPRITE_POKE_BALL, 13, 45, STAY, NONE, 2, HP_UP
- ; warp-to
- 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_SOUTH_GATE
+ def_warps_to ROUTE_2
; unused
warp_to 2, 7, 4