summaryrefslogtreecommitdiff
path: root/data/mapObjects/mansion4.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/mansion4.asm')
-rwxr-xr-xdata/mapObjects/mansion4.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm
index 9a333258..ec1c19fb 100755
--- a/data/mapObjects/mansion4.asm
+++ b/data/mapObjects/mansion4.asm
@@ -1,20 +1,20 @@
Mansion4Object:
- db $1 ; border block
+ db 1 ; border block
- db $1 ; warps
- warp $17, $16, $5, MANSION_1
+ db 1 ; warps
+ warp 23, 22, 5, MANSION_1
- db $0 ; signs
+ db 0 ; signs
- db $8 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, OPP_BURGLAR, $9
- object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, OPP_SCIENTIST, $d
- object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY
- object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE
- object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14
- object SPRITE_BALL, $5, $4, STAY, NONE, $6, TM_22
- object SPRITE_BOOK_MAP_DEX, $10, $14, STAY, NONE, $7 ; person
- object SPRITE_BALL, $5, $d, STAY, NONE, $8, SECRET_KEY
+ db 8 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
+ object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
+ object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
+ object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
+ object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14
+ object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22
+ object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person
+ object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
; warp-to
- warp_to $17, $16, MANSION_4_WIDTH ; MANSION_1
+ warp_to 23, 22, MANSION_4_WIDTH ; MANSION_1