summaryrefslogtreecommitdiff
path: root/data/mapObjects/route10.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route10.asm')
-rwxr-xr-xdata/mapObjects/route10.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm
index a1590ded..90abb47d 100755
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/route10.asm
@@ -1,28 +1,28 @@
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
+ db 4 ; warps
+ warp 11, 19, 0, ROCK_TUNNEL_POKECENTER
+ warp 8, 17, 0, ROCK_TUNNEL_1
+ warp 8, 53, 2, ROCK_TUNNEL_1
+ warp 6, 39, 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
+ db 4 ; signs
+ sign 7, 19, 7 ; Route10Text7
+ sign 12, 19, 8 ; PokeCenterSignText
+ sign 9, 55, 9 ; Route10Text9
+ sign 5, 41, 10 ; Route10Text10
- db $6 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1
- object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7
- object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2
- object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR_TRAINER_F, $7
- object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8
- object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8
+ db 6 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1
+ object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7
+ object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2
+ object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
+ object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8
+ object SPRITE_LASS, 7, 54, 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 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER
+ warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1
+ warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1
+ warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT