summaryrefslogtreecommitdiff
path: root/data/mapObjects/lavenderhouse2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/lavenderhouse2.asm')
-rwxr-xr-xdata/mapObjects/lavenderhouse2.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm
index 7638ff66..6d900f45 100755
--- a/data/mapObjects/lavenderhouse2.asm
+++ b/data/mapObjects/lavenderhouse2.asm
@@ -1,16 +1,16 @@
LavenderHouse2Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $4, $ff
- db $7, $3, $4, $ff
+ db 2 ; warps
+ warp 2, 7, 4, -1
+ warp 3, 7, 4, -1
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_SLOWBRO, $3, $5, STAY, UP, $1 ; person
- object SPRITE_BRUNETTE_GIRL, $2, $4, STAY, RIGHT, $2 ; person
+ db 2 ; objects
+ object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person
+ object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person
; warp-to
- EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2
- EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $3
+ warp_to 2, 7, LAVENDER_HOUSE_2_WIDTH
+ warp_to 3, 7, LAVENDER_HOUSE_2_WIDTH