summaryrefslogtreecommitdiff
path: root/data/mapObjects/lavenderhouse1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/lavenderhouse1.asm')
-rwxr-xr-xdata/mapObjects/lavenderhouse1.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm
index 54f57270..d9b61302 100755
--- a/data/mapObjects/lavenderhouse1.asm
+++ b/data/mapObjects/lavenderhouse1.asm
@@ -1,20 +1,20 @@
LavenderHouse1Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $2, $ff
- db $7, $3, $2, $ff
+ db 2 ; warps
+ warp 2, 7, 2, -1
+ warp 3, 7, 2, -1
- db $0 ; signs
+ db 0 ; signs
- db $6 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, NONE, $1 ; person
- object SPRITE_LITTLE_GIRL, $6, $3, STAY, DOWN, $2 ; person
- object SPRITE_SLOWBRO, $6, $4, STAY, UP, $3 ; person
- object SPRITE_SLOWBRO, $1, $3, STAY, NONE, $4 ; person
- object SPRITE_MR_FUJI, $3, $1, STAY, NONE, $5 ; person
- object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $6 ; person
+ db 6 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person
+ object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person
+ object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person
+ object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person
+ object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person
+ object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person
; warp-to
- EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2
- EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $3
+ warp_to 2, 7, LAVENDER_HOUSE_1_WIDTH
+ warp_to 3, 7, LAVENDER_HOUSE_1_WIDTH