summaryrefslogtreecommitdiff
path: root/data/mapObjects/route10.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route10.asm')
-rwxr-xr-xdata/mapObjects/route10.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm
index a1590ded..3f052bf8 100755
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/route10.asm
@@ -2,16 +2,16 @@ Route10Object:
db $2c ; border block
db $4 ; warps
- db $13, $b, $0, ROCK_TUNNEL_POKECENTER
- db $11, $8, $0, ROCK_TUNNEL_1
- db $35, $8, $2, ROCK_TUNNEL_1
- db $27, $6, $0, POWER_PLANT
+ warp $b, $13, $0, ROCK_TUNNEL_POKECENTER
+ warp $8, $11, $0, ROCK_TUNNEL_1
+ warp $8, $35, $2, ROCK_TUNNEL_1
+ warp $6, $27, $0, POWER_PLANT
db $4 ; signs
- db $13, $7, $7 ; Route10Text7
- db $13, $c, $8 ; PokeCenterSignText
- db $37, $9, $9 ; Route10Text9
- db $29, $5, $a ; Route10Text10
+ sign $7, $13, $7 ; Route10Text7
+ sign $c, $13, $8 ; PokeCenterSignText
+ sign $9, $37, $9 ; Route10Text9
+ sign $5, $29, $a ; Route10Text10
db $6 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1
@@ -22,7 +22,7 @@ Route10Object:
object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8
; warp-to
- EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER
- EVENT_DISP ROUTE_10_WIDTH, $11, $8 ; ROCK_TUNNEL_1
- EVENT_DISP ROUTE_10_WIDTH, $35, $8 ; ROCK_TUNNEL_1
- EVENT_DISP ROUTE_10_WIDTH, $27, $6 ; POWER_PLANT
+ warp_to $b, $13, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER
+ warp_to $8, $11, ROUTE_10_WIDTH ; ROCK_TUNNEL_1
+ warp_to $8, $35, ROUTE_10_WIDTH ; ROCK_TUNNEL_1
+ warp_to $6, $27, ROUTE_10_WIDTH ; POWER_PLANT