summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco3.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/silphco3.asm
parenta9528fc870b585b6b4fac45e115061d8af979681 (diff)
Use more constants in object data
Diffstat (limited to 'data/mapObjects/silphco3.asm')
-rwxr-xr-xdata/mapObjects/silphco3.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm
index af7d0aa2..e50bf7cb 100755
--- a/data/mapObjects/silphco3.asm
+++ b/data/mapObjects/silphco3.asm
@@ -17,9 +17,9 @@ SilphCo3Object: ; 0x5a035 (size=113)
db $4 ; people
db SPRITE_LAPRAS_GIVER, $8 + 4, $18 + 4, $ff, $ff, $1 ; person
- db SPRITE_ROCKET, $7 + 4, $14 + 4, $ff, $d2, $42, ROCKET + $C8, $19 ; trainer
- db SPRITE_OAK_AIDE, $9 + 4, $7 + 4, $ff, $d0, $43, SCIENTIST + $C8, $4 ; trainer
- db SPRITE_BALL, $5 + 4, $8 + 4, $ff, $ff, $84, HYPER_POTION ; item
+ db SPRITE_ROCKET, $7 + 4, $14 + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $19
+ db SPRITE_OAK_AIDE, $9 + 4, $7 + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $4
+ db SPRITE_BALL, $5 + 4, $8 + 4, $ff, $ff, ITEM | $4, HYPER_POTION
; warp-to
EVENT_DISP SILPH_CO_3F_WIDTH, $0, $1a ; SILPH_CO_2F