summaryrefslogtreecommitdiff
path: root/data/mapObjects/cinnabarpokecenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/cinnabarpokecenter.asm')
-rwxr-xr-xdata/mapObjects/cinnabarpokecenter.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm
index 7d15f050..d1707ec7 100755
--- a/data/mapObjects/cinnabarpokecenter.asm
+++ b/data/mapObjects/cinnabarpokecenter.asm
@@ -1,18 +1,18 @@
CinnabarPokecenterObject:
db $0 ; border block
- db $2 ; warps
- db $7, $3, $3, $ff
- db $7, $4, $3, $ff
+ db 2 ; warps
+ warp 3, 7, 3, -1
+ warp 4, 7, 3, -1
- db $0 ; signs
+ db 0 ; signs
- db $4 ; objects
- object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person
- object SPRITE_GENTLEMAN, $2, $6, STAY, NONE, $3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+ db 4 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person
+ object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
; warp-to
- EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3
- EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $4
+ warp_to 3, 7, CINNABAR_POKECENTER_WIDTH
+ warp_to 4, 7, CINNABAR_POKECENTER_WIDTH