summaryrefslogtreecommitdiff
path: root/data/mapObjects/saffronpokecenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/saffronpokecenter.asm')
-rwxr-xr-xdata/mapObjects/saffronpokecenter.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm
index b82be083..19e939a6 100755
--- a/data/mapObjects/saffronpokecenter.asm
+++ b/data/mapObjects/saffronpokecenter.asm
@@ -1,19 +1,19 @@
SaffronPokecenterObject:
db $0 ; border block
- db $2 ; warps
- db $7, $3, $6, $ff
- db $7, $4, $6, $ff
+ db 2 ; warps
+ warp 3, 7, 6, -1
+ warp 4, 7, 6, -1
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_FOULARD_WOMAN, $5, $5, STAY, NONE, $2 ; person
- object SPRITE_GENTLEMAN, $8, $3, STAY, DOWN, $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_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person
+ object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 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 SAFFRON_POKECENTER_WIDTH, $7, $3
- EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $4
+ warp_to 3, 7, SAFFRON_POKECENTER_WIDTH
+ warp_to 4, 7, SAFFRON_POKECENTER_WIDTH