aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route25.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Route25.asm')
-rwxr-xr-xdata/maps/objects/Route25.asm9
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm
index cafcccf5..956743fe 100755
--- a/data/maps/objects/Route25.asm
+++ b/data/maps/objects/Route25.asm
@@ -1,13 +1,13 @@
Route25_Object:
db $2c ; border block
- db 1 ; warps
+ def_warps
warp 45, 3, 0, BILLS_HOUSE
- db 1 ; signs
+ def_signs
sign 43, 3, 11 ; Route25Text11
- db 10 ; objects
+ def_objects
object SPRITE_YOUNGSTER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5
object SPRITE_YOUNGSTER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6
object SPRITE_COOLTRAINER_M, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
@@ -19,5 +19,4 @@ Route25_Object:
object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4
object SPRITE_POKE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS
- ; warp-to
- warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE
+ def_warps_to ROUTE_25