summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco11.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/silphco11.asm')
-rwxr-xr-xdata/mapObjects/silphco11.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm
index 93b9e339..8cba618e 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/silphco11.asm
@@ -9,12 +9,12 @@ SilphCo11Object: ; 0x62380 (size=72)
db $0 ; signs
- db $5 ; people
- db SPRITE_MR_MASTERBALL, $5 + 4, $7 + 4, $ff, $d0, $1 ; person
- db SPRITE_FOULARD_WOMAN, $5 + 4, $a + 4, $ff, $d0, $2 ; person
- db SPRITE_GIOVANNI, $9 + 4, $6 + 4, $ff, $d0, TRAINER | $3, GIOVANNI + $C8, $2
- db SPRITE_ROCKET, $10 + 4, $3 + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $29
- db SPRITE_ROCKET, $9 + 4, $f + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $28
+ db $5 ; objects
+ object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person
+ object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person
+ object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2
+ object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29
+ object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28
; warp-to
EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F