summaryrefslogtreecommitdiff
path: root/data/mapObjects/saffronhouse1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/saffronhouse1.asm')
-rwxr-xr-xdata/mapObjects/saffronhouse1.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm
index f7691f78..3c800d38 100755
--- a/data/mapObjects/saffronhouse1.asm
+++ b/data/mapObjects/saffronhouse1.asm
@@ -1,18 +1,18 @@
SaffronHouse1Object:
- db $a ; border block
+ db 10 ; border block
- db $2 ; warps
- warp $2, $7, $3, $ff
- warp $3, $7, $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_BRUNETTE_GIRL, $2, $3, STAY, RIGHT, $1 ; person
- object SPRITE_BIRD, $0, $4, WALK, $1, $2 ; person
- object SPRITE_BUG_CATCHER, $4, $1, STAY, DOWN, $3 ; person
- object SPRITE_PAPER_SHEET, $3, $3, STAY, NONE, $4 ; person
+ db 4 ; objects
+ object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person
+ object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person
+ object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person
+ object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person
; warp-to
- warp_to $2, $7, SAFFRON_HOUSE_1_WIDTH
- warp_to $3, $7, SAFFRON_HOUSE_1_WIDTH
+ warp_to 2, 7, SAFFRON_HOUSE_1_WIDTH
+ warp_to 3, 7, SAFFRON_HOUSE_1_WIDTH