summaryrefslogtreecommitdiff
path: root/data/mapObjects/mansion3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/mansion3.asm')
-rwxr-xr-xdata/mapObjects/mansion3.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm
index 72431402..f6ec7aee 100755
--- a/data/mapObjects/mansion3.asm
+++ b/data/mapObjects/mansion3.asm
@@ -1,21 +1,21 @@
Mansion3Object:
db $1 ; border block
- db $3 ; warps
- db $a, $7, $1, MANSION_2
- db $1, $6, $3, MANSION_2
- db $e, $19, $2, MANSION_2
+ db 3 ; warps
+ warp 7, 10, 1, MANSION_2
+ warp 6, 1, 3, MANSION_2
+ warp 25, 14, 2, MANSION_2
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, OPP_BURGLAR, $8
- object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, OPP_SCIENTIST, $c
- object SPRITE_BALL, $1, $10, STAY, NONE, $3, MAX_POTION
- object SPRITE_BALL, $19, $5, STAY, NONE, $4, IRON
- object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person
+ db 5 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8
+ object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
+ object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
+ object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON
+ object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person
; warp-to
- EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2
- EVENT_DISP MANSION_3_WIDTH, $1, $6 ; MANSION_2
- EVENT_DISP MANSION_3_WIDTH, $e, $19 ; MANSION_2
+ warp_to 7, 10, MANSION_3_WIDTH ; MANSION_2
+ warp_to 6, 1, MANSION_3_WIDTH ; MANSION_2
+ warp_to 25, 14, MANSION_3_WIDTH ; MANSION_2