summaryrefslogtreecommitdiff
path: root/data/mapObjects/route21.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route21.asm')
-rwxr-xr-xdata/mapObjects/route21.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm
index 6e9a044e..e98c8425 100755
--- a/data/mapObjects/route21.asm
+++ b/data/mapObjects/route21.asm
@@ -5,13 +5,13 @@ Route21Object: ; 0x55021 (size=76)
db $0 ; signs
- db $9 ; people
- db SPRITE_FISHER2, $18 + 4, $4 + 4, $ff, $d2, TRAINER | $1, FISHER + $C8, $7
- db SPRITE_FISHER2, $19 + 4, $6 + 4, $ff, $d0, TRAINER | $2, FISHER + $C8, $9
- db SPRITE_SWIMMER, $1f + 4, $a + 4, $ff, $d1, TRAINER | $3, SWIMMER + $C8, $c
- db SPRITE_SWIMMER, $1e + 4, $c + 4, $ff, $d3, TRAINER | $4, CUE_BALL + $C8, $9
- db SPRITE_SWIMMER, $3f + 4, $10 + 4, $ff, $d0, TRAINER | $5, SWIMMER + $C8, $d
- db SPRITE_SWIMMER, $47 + 4, $5 + 4, $ff, $d3, TRAINER | $6, SWIMMER + $C8, $e
- db SPRITE_SWIMMER, $47 + 4, $f + 4, $ff, $d2, TRAINER | $7, SWIMMER + $C8, $f
- db SPRITE_FISHER2, $38 + 4, $e + 4, $ff, $d2, TRAINER | $8, FISHER + $C8, $8
- db SPRITE_FISHER2, $39 + 4, $11 + 4, $ff, $d3, TRAINER | $9, FISHER + $C8, $a
+ db $9 ; objects
+ object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, OPP_FISHER, $7
+ object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, OPP_FISHER, $9
+ object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, OPP_SWIMMER, $c
+ object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, OPP_CUE_BALL, $9
+ object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, OPP_SWIMMER, $d
+ object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, OPP_SWIMMER, $e
+ object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, OPP_SWIMMER, $f
+ object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, OPP_FISHER, $8
+ object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, OPP_FISHER, $a