summaryrefslogtreecommitdiff
path: root/data/mapObjects/pewterpokecenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pewterpokecenter.asm')
-rwxr-xr-xdata/mapObjects/pewterpokecenter.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm
index 4c7444bb..9370cc16 100755
--- a/data/mapObjects/pewterpokecenter.asm
+++ b/data/mapObjects/pewterpokecenter.asm
@@ -1,20 +1,20 @@
PewterPokecenterObject:
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 $6 ; objects
- object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person
- object SPRITE_JIGGLYPUFF, $1, $3, STAY, DOWN, $3 ; person
- object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
- object SPRITE_LASS, $4, $3, STAY, UP, $5 ; person
- object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $6 ; person
+ db 6 ; objects
+ object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person
+ object SPRITE_JIGGLYPUFF, 1, 3, STAY, DOWN, 3 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person
+ object SPRITE_LASS, 4, 3, STAY, UP, 5 ; person
+ object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 6 ; person
; warp-to
- EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3
- EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $4
+ warp_to 3, 7, PEWTER_POKECENTER_WIDTH
+ warp_to 4, 7, PEWTER_POKECENTER_WIDTH