summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco10.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/silphco10.asm')
-rwxr-xr-xdata/mapObjects/silphco10.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm
index 5d253d98..cc608e64 100755
--- a/data/mapObjects/silphco10.asm
+++ b/data/mapObjects/silphco10.asm
@@ -11,13 +11,13 @@ SilphCo10Object: ; 0x5a1fb (size=95)
db $0 ; signs
- db $6 ; people
- db SPRITE_ROCKET, $9 + 4, $1 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $27
- db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d2, TRAINER | $2, SCIENTIST + $C8, $b
- db SPRITE_ERIKA, $f + 4, $9 + 4, $fe, $0, $3 ; person
- db SPRITE_BALL, $c + 4, $2 + 4, $ff, $ff, ITEM | $4, TM_26
- db SPRITE_BALL, $e + 4, $4 + 4, $ff, $ff, ITEM | $5, RARE_CANDY
- db SPRITE_BALL, $b + 4, $5 + 4, $ff, $ff, ITEM | $6, CARBOS
+ db $6 ; objects
+ object SPRITE_ROCKET, $1, $9, STAY, RIGHT, $1, OPP_ROCKET, $27
+ object SPRITE_OAK_AIDE, $a, $2, STAY, LEFT, $2, OPP_SCIENTIST, $b
+ object SPRITE_ERIKA, $9, $f, WALK, $0, $3 ; person
+ object SPRITE_BALL, $2, $c, STAY, NONE, $4, TM_26
+ object SPRITE_BALL, $4, $e, STAY, NONE, $5, RARE_CANDY
+ object SPRITE_BALL, $5, $b, STAY, NONE, $6, CARBOS
; warp-to
EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F