summaryrefslogtreecommitdiff
path: root/data/mapObjects/mansion4.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/mansion4.asm')
-rwxr-xr-xdata/mapObjects/mansion4.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm
index 5432f676..67e81064 100755
--- a/data/mapObjects/mansion4.asm
+++ b/data/mapObjects/mansion4.asm
@@ -6,15 +6,15 @@ Mansion4Object: ; 0x52498 (size=69)
db $0 ; signs
- db $8 ; people
- db SPRITE_BLACK_HAIR_BOY_2, $17 + 4, $10 + 4, $ff, $ff, TRAINER | $1, BURGLAR + $C8, $9
- db SPRITE_OAK_AIDE, $b + 4, $1b + 4, $ff, $d0, TRAINER | $2, SCIENTIST + $C8, $d
- db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, ITEM | $3, RARE_CANDY
- db SPRITE_BALL, $16 + 4, $1 + 4, $ff, $ff, ITEM | $4, FULL_RESTORE
- db SPRITE_BALL, $19 + 4, $13 + 4, $ff, $ff, ITEM | $5, TM_14
- db SPRITE_BALL, $4 + 4, $5 + 4, $ff, $ff, ITEM | $6, TM_22
- db SPRITE_BOOK_MAP_DEX, $14 + 4, $10 + 4, $ff, $ff, $7 ; person
- db SPRITE_BALL, $d + 4, $5 + 4, $ff, $ff, ITEM | $8, SECRET_KEY
+ db $8 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, $10, $17, FACE, STAY, $1, BURGLAR + $C8, $9
+ object SPRITE_OAK_AIDE, $1b, $b, FACE, DOWN, $2, SCIENTIST + $C8, $d
+ object SPRITE_BALL, $a, $2, FACE, STAY, $3, RARE_CANDY
+ object SPRITE_BALL, $1, $16, FACE, STAY, $4, FULL_RESTORE
+ object SPRITE_BALL, $13, $19, FACE, STAY, $5, TM_14
+ object SPRITE_BALL, $5, $4, FACE, STAY, $6, TM_22
+ object SPRITE_BOOK_MAP_DEX, $10, $14, FACE, STAY, $7 ; person
+ object SPRITE_BALL, $5, $d, FACE, STAY, $8, SECRET_KEY
; warp-to
EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1