summaryrefslogtreecommitdiff
path: root/data/mapObjects/mansion4.asm
diff options
context:
space:
mode:
authorU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-21 15:49:59 -0400
committerU-Fish-PC\Daniel <corrnondacqb@yahoo.com>2014-05-21 15:49:59 -0400
commita02c3279102dca60deee70141c31af9fcfa1ff75 (patch)
tree66ee36f2019b9a862363f36346eb229ce9bfe54a /data/mapObjects/mansion4.asm
parenta9528fc870b585b6b4fac45e115061d8af979681 (diff)
Use more constants in object data
Diffstat (limited to 'data/mapObjects/mansion4.asm')
-rwxr-xr-xdata/mapObjects/mansion4.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm
index 03f226d0..5432f676 100755
--- a/data/mapObjects/mansion4.asm
+++ b/data/mapObjects/mansion4.asm
@@ -7,14 +7,14 @@ Mansion4Object: ; 0x52498 (size=69)
db $0 ; signs
db $8 ; people
- db SPRITE_BLACK_HAIR_BOY_2, $17 + 4, $10 + 4, $ff, $ff, $41, BURGLAR + $C8, $9 ; trainer
- db SPRITE_OAK_AIDE, $b + 4, $1b + 4, $ff, $d0, $42, SCIENTIST + $C8, $d ; trainer
- db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, $83, RARE_CANDY ; item
- db SPRITE_BALL, $16 + 4, $1 + 4, $ff, $ff, $84, FULL_RESTORE ; item
- db SPRITE_BALL, $19 + 4, $13 + 4, $ff, $ff, $85, TM_14 ; item
- db SPRITE_BALL, $4 + 4, $5 + 4, $ff, $ff, $86, TM_22 ; item
+ 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, $88, SECRET_KEY ; item
+ db SPRITE_BALL, $d + 4, $5 + 4, $ff, $ff, ITEM | $8, SECRET_KEY
; warp-to
EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1