summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonhotel.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonhotel.asm')
-rwxr-xr-xdata/mapObjects/celadonhotel.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm
index 8d7dcb03..09b4d99c 100755
--- a/data/mapObjects/celadonhotel.asm
+++ b/data/mapObjects/celadonhotel.asm
@@ -1,17 +1,17 @@
CeladonHotelObject:
db $0 ; border block
- db $2 ; warps
- db $7, $3, $c, $ff
- db $7, $4, $c, $ff
+ db 2 ; warps
+ warp 3, 7, 12, -1
+ warp 4, 7, 12, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_OLD_MEDIUM_WOMAN, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_FOULARD_WOMAN, $2, $4, STAY, NONE, $2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, $8, $4, WALK, $2, $3 ; person
+ db 3 ; objects
+ object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person
; warp-to
- EVENT_DISP CELADON_HOTEL_WIDTH, $7, $3
- EVENT_DISP CELADON_HOTEL_WIDTH, $7, $4
+ warp_to 3, 7, CELADON_HOTEL_WIDTH
+ warp_to 4, 7, CELADON_HOTEL_WIDTH