summaryrefslogtreecommitdiff
path: root/data/mapObjects/fuchsiahouse2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/fuchsiahouse2.asm')
-rwxr-xr-xdata/mapObjects/fuchsiahouse2.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm
index 3a3d07c3..e3702594 100755
--- a/data/mapObjects/fuchsiahouse2.asm
+++ b/data/mapObjects/fuchsiahouse2.asm
@@ -1,19 +1,19 @@
FuchsiaHouse2Object:
db $17 ; border block
- db $2 ; warps
- db $7, $4, $3, $ff
- db $7, $5, $3, $ff
+ db 2 ; warps
+ warp 4, 7, 3, -1
+ warp 5, 7, 3, -1
- db $2 ; signs
- db $3, $4, $4 ; FuchsiaHouse2Text4
- db $3, $5, $5 ; FuchsiaHouse2Text5
+ db 2 ; signs
+ sign 4, 3, 4 ; FuchsiaHouse2Text4
+ sign 5, 3, 5 ; FuchsiaHouse2Text5
- db $3 ; objects
- object SPRITE_WARDEN, $2, $3, STAY, NONE, $1 ; person
- object SPRITE_BALL, $8, $3, STAY, NONE, $2, RARE_CANDY
- object SPRITE_BOULDER, $8, $4, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person
+ db 3 ; objects
+ object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person
+ object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY
+ object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
; warp-to
- EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4
- EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $5
+ warp_to 4, 7, FUCHSIA_HOUSE_2_WIDTH
+ warp_to 5, 7, FUCHSIA_HOUSE_2_WIDTH