summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco8.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/silphco8.asm
parenta9528fc870b585b6b4fac45e115061d8af979681 (diff)
Use more constants in object data
Diffstat (limited to 'data/mapObjects/silphco8.asm')
-rwxr-xr-xdata/mapObjects/silphco8.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm
index 92d9d061..be802791 100755
--- a/data/mapObjects/silphco8.asm
+++ b/data/mapObjects/silphco8.asm
@@ -14,9 +14,9 @@ SilphCo8Object: ; 0x56613 (size=90)
db $4 ; people
db SPRITE_LAPRAS_GIVER, $2 + 4, $4 + 4, $ff, $ff, $1 ; person
- db SPRITE_ROCKET, $2 + 4, $13 + 4, $ff, $d2, $42, ROCKET + $C8, $23 ; trainer
- db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d0, $43, SCIENTIST + $C8, $9 ; trainer
- db SPRITE_ROCKET, $f + 4, $c + 4, $ff, $d3, $44, ROCKET + $C8, $24 ; trainer
+ db SPRITE_ROCKET, $2 + 4, $13 + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $23
+ db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $9
+ db SPRITE_ROCKET, $f + 4, $c + 4, $ff, $d3, TRAINER | $4, ROCKET + $C8, $24
; warp-to
EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F