summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonhouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/celadonhouse.asm')
-rwxr-xr-xdata/mapObjects/celadonhouse.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm
index 6bd847a4..d24354a6 100755
--- a/data/mapObjects/celadonhouse.asm
+++ b/data/mapObjects/celadonhouse.asm
@@ -1,17 +1,17 @@
CeladonHouseObject:
db $f ; border block
- db $2 ; warps
- db $7, $2, $b, $ff
- db $7, $3, $b, $ff
+ db 2 ; warps
+ warp 2, 7, 11, -1
+ warp 3, 7, 11, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_OLD_PERSON, $4, $2, STAY, DOWN, $1 ; person
- object SPRITE_ROCKET, $1, $4, WALK, $0, $2 ; person
- object SPRITE_SAILOR, $5, $6, STAY, LEFT, $3 ; person
+ db 3 ; objects
+ object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person
+ object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person
+ object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
; warp-to
- EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2
- EVENT_DISP CELADON_HOUSE_WIDTH, $7, $3
+ warp_to 2, 7, CELADON_HOUSE_WIDTH
+ warp_to 3, 7, CELADON_HOUSE_WIDTH