summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadondiner.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadondiner.asm')
-rwxr-xr-xdata/mapObjects/celadondiner.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm
index fd202a96..b976a045 100755
--- a/data/mapObjects/celadondiner.asm
+++ b/data/mapObjects/celadondiner.asm
@@ -1,19 +1,19 @@
CeladonDinerObject:
db $f ; border block
- db $2 ; warps
- db $7, $3, $a, $ff
- db $7, $4, $a, $ff
+ db 2 ; warps
+ warp 3, 7, 10, -1
+ warp 4, 7, 10, -1
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_COOK, $8, $5, WALK, $2, $1 ; person
- object SPRITE_MOM_GEISHA, $7, $2, STAY, NONE, $2 ; person
- object SPRITE_FAT_BALD_GUY, $1, $4, STAY, DOWN, $3 ; person
- object SPRITE_FISHER2, $5, $3, STAY, RIGHT, $4 ; person
- object SPRITE_GYM_HELPER, $0, $1, STAY, DOWN, $5 ; person
+ db 5 ; objects
+ object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person
+ object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person
+ object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person
+ object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person
+ object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person
; warp-to
- EVENT_DISP CELADON_DINER_WIDTH, $7, $3
- EVENT_DISP CELADON_DINER_WIDTH, $7, $4
+ warp_to 3, 7, CELADON_DINER_WIDTH
+ warp_to 4, 7, CELADON_DINER_WIDTH