summaryrefslogtreecommitdiff
path: root/data/mapObjects/fuchsiahouse1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/fuchsiahouse1.asm')
-rwxr-xr-xdata/mapObjects/fuchsiahouse1.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm
index 4d3c3b6e..ca4638f9 100755
--- a/data/mapObjects/fuchsiahouse1.asm
+++ b/data/mapObjects/fuchsiahouse1.asm
@@ -1,17 +1,17 @@
FuchsiaHouse1Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $1, $ff
- db $7, $3, $1, $ff
+ db 2 ; warps
+ warp 2, 7, 1, -1
+ warp 3, 7, 1, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_MOM_GEISHA, $2, $3, STAY, RIGHT, $1 ; person
- object SPRITE_GAMBLER, $7, $2, STAY, UP, $2 ; person
- object SPRITE_BUG_CATCHER, $5, $5, STAY, NONE, $3 ; person
+ db 3 ; objects
+ object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person
+ object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person
; warp-to
- EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2
- EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $3
+ warp_to 2, 7, FUCHSIA_HOUSE_1_WIDTH
+ warp_to 3, 7, FUCHSIA_HOUSE_1_WIDTH