summaryrefslogtreecommitdiff
path: root/data/mapObjects/route25.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route25.asm')
-rwxr-xr-xdata/mapObjects/route25.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm
index 6b3ef029..62fa8e77 100755
--- a/data/mapObjects/route25.asm
+++ b/data/mapObjects/route25.asm
@@ -7,17 +7,17 @@ Route25Object: ; 0x507b2 (size=94)
db $1 ; signs
db $3, $2b, $b ; Route25Text11
- db $a ; people
- db SPRITE_BUG_CATCHER, $2 + 4, $e + 4, $ff, $d0, TRAINER | $1, YOUNGSTER + $C8, $5
- db SPRITE_BUG_CATCHER, $5 + 4, $12 + 4, $ff, $d1, TRAINER | $2, YOUNGSTER + $C8, $6
- db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $18 + 4, $ff, $d0, TRAINER | $3, JR__TRAINER_M + $C8, $2
- db SPRITE_LASS, $8 + 4, $12 + 4, $ff, $d3, TRAINER | $4, LASS + $C8, $9
- db SPRITE_BUG_CATCHER, $3 + 4, $20 + 4, $ff, $d2, TRAINER | $5, YOUNGSTER + $C8, $7
- db SPRITE_LASS, $4 + 4, $25 + 4, $ff, $d0, TRAINER | $6, LASS + $C8, $a
- db SPRITE_HIKER, $4 + 4, $8 + 4, $ff, $d3, TRAINER | $7, HIKER + $C8, $2
- db SPRITE_HIKER, $9 + 4, $17 + 4, $ff, $d1, TRAINER | $8, HIKER + $C8, $3
- db SPRITE_HIKER, $7 + 4, $d + 4, $ff, $d3, TRAINER | $9, HIKER + $C8, $4
- db SPRITE_BALL, $2 + 4, $16 + 4, $ff, $ff, ITEM | $a, TM_19
+ db $a ; objects
+ object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5
+ object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6
+ object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR__TRAINER_M, $2
+ object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9
+ object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7
+ object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a
+ object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, OPP_HIKER, $2
+ object SPRITE_HIKER, $17, $9, STAY, UP, $8, OPP_HIKER, $3
+ object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, OPP_HIKER, $4
+ object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19
; warp-to
EVENT_DISP ROUTE_25_WIDTH, $3, $2d ; BILLS_HOUSE