summaryrefslogtreecommitdiff
path: root/data/mapObjects/viridianhouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/viridianhouse.asm')
-rwxr-xr-xdata/mapObjects/viridianhouse.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm
index c06bb9c8..932542a6 100755
--- a/data/mapObjects/viridianhouse.asm
+++ b/data/mapObjects/viridianhouse.asm
@@ -1,18 +1,18 @@
ViridianHouseObject:
db $a ; border block
- db $2 ; warps
- db $7, $2, $3, $ff
- db $7, $3, $3, $ff
+ db 2 ; warps
+ warp 2, 7, 3, -1
+ warp 3, 7, 3, -1
- db $0 ; signs
+ db 0 ; signs
- db $4 ; objects
- object SPRITE_BALDING_GUY, $5, $3, STAY, NONE, $1 ; person
- object SPRITE_LITTLE_GIRL, $1, $4, WALK, $1, $2 ; person
- object SPRITE_BIRD, $5, $5, WALK, $2, $3 ; person
- object SPRITE_CLIPBOARD, $4, $0, STAY, NONE, $4 ; person
+ db 4 ; objects
+ object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person
+ object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person
+ object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person
+ object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person
; warp-to
- EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2
- EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $3
+ warp_to 2, 7, VIRIDIAN_HOUSE_WIDTH
+ warp_to 3, 7, VIRIDIAN_HOUSE_WIDTH