summaryrefslogtreecommitdiff
path: root/data/mapObjects/copycatshouse1f.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/copycatshouse1f.asm')
-rwxr-xr-xdata/mapObjects/copycatshouse1f.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm
index 7d842cad..e0e02a8d 100755
--- a/data/mapObjects/copycatshouse1f.asm
+++ b/data/mapObjects/copycatshouse1f.asm
@@ -1,19 +1,19 @@
CopycatsHouse1FObject:
db $a ; border block
- db $3 ; warps
- db $7, $2, $0, $ff
- db $7, $3, $0, $ff
- db $1, $7, $0, COPYCATS_HOUSE_2F
+ db 3 ; warps
+ warp 2, 7, 0, -1
+ warp 3, 7, 0, -1
+ warp 7, 1, 0, COPYCATS_HOUSE_2F
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_MOM_GEISHA, $2, $2, STAY, DOWN, $1 ; person
- object SPRITE_FAT_BALD_GUY, $5, $4, STAY, LEFT, $2 ; person
- object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person
+ db 3 ; objects
+ object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person
+ object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person
+ object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person
; warp-to
- EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2
- EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $3
- EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $1, $7 ; COPYCATS_HOUSE_2F
+ warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH
+ warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH
+ warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F