diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /data/mapObjects/route24.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/route24.asm')
| -rwxr-xr-x | data/mapObjects/route24.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index 95ee726c..f8173c9d 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -6,11 +6,11 @@ Route24Object: ; 0x506a4 (size=67) db $0 ; signs db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, ROCKET + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, JR__TRAINER_M + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, JR__TRAINER_M + $C8, $3 - object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, LASS + $C8, $7 - object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, YOUNGSTER + $C8, $4 - object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, LASS + $C8, $8 - object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, BUG_CATCHER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6 + object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2 + object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3 + object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7 + object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4 + object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8 + object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9 object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45 |