summaryrefslogtreecommitdiff
path: root/data/mapObjects/rocktunnelpokecenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/rocktunnelpokecenter.asm')
-rwxr-xr-xdata/mapObjects/rocktunnelpokecenter.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm
index 06a2e39d..f2d429b7 100755
--- a/data/mapObjects/rocktunnelpokecenter.asm
+++ b/data/mapObjects/rocktunnelpokecenter.asm
@@ -1,19 +1,19 @@
RockTunnelPokecenterObject:
db $0 ; border block
- db $2 ; warps
- db $7, $3, $0, $ff
- db $7, $4, $0, $ff
+ db 2 ; warps
+ warp 3, 7, 0, -1
+ warp 4, 7, 0, -1
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_GENTLEMAN, $7, $3, STAY, DOWN, $2 ; person
- object SPRITE_FISHER2, $2, $5, STAY, NONE, $3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
- object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
+ db 5 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_GENTLEMAN, 7, 3, STAY, DOWN, 2 ; person
+ object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person
; warp-to
- EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3
- EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $4
+ warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH
+ warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH