summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/silphco2.asm')
-rwxr-xr-xdata/mapObjects/silphco2.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm
index 5da4ccc5..44271d70 100755
--- a/data/mapObjects/silphco2.asm
+++ b/data/mapObjects/silphco2.asm
@@ -12,12 +12,12 @@ SilphCo2Object: ; 0x59e66 (size=98)
db $0 ; signs
- db $5 ; people
- db SPRITE_ERIKA, $1 + 4, $a + 4, $ff, $d1, $1 ; person
- db SPRITE_OAK_AIDE, $c + 4, $5 + 4, $ff, $d0, TRAINER | $2, SCIENTIST + $C8, $2
- db SPRITE_OAK_AIDE, $d + 4, $18 + 4, $ff, $d2, TRAINER | $3, SCIENTIST + $C8, $3
- db SPRITE_ROCKET, $b + 4, $10 + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $17
- db SPRITE_ROCKET, $7 + 4, $18 + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $18
+ db $5 ; objects
+ object SPRITE_ERIKA, $a, $1, STAY, UP, $1 ; person
+ object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, OPP_SCIENTIST, $2
+ object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, OPP_SCIENTIST, $3
+ object SPRITE_ROCKET, $10, $b, STAY, UP, $4, OPP_ROCKET, $17
+ object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18
; warp-to
EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F