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/route15.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/route15.asm')
| -rwxr-xr-x | data/mapObjects/route15.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 32ec8d8a..e0d19e5c 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -11,16 +11,16 @@ Route15Object: ; 0x5894e (size=126) db $9, $27, $c ; Route15Text12 db $b ; objects - object SPRITE_LASS, $29, $b, STAY, DOWN, $1, JR__TRAINER_F + $C8, $14 - object SPRITE_LASS, $35, $a, STAY, LEFT, $2, JR__TRAINER_F + $C8, $15 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, BIRD_KEEPER + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, BIRD_KEEPER + $C8, $7 - object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, BEAUTY + $C8, $9 - object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, BEAUTY + $C8, $a - object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, BIKER + $C8, $3 - object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, BIKER + $C8, $4 - object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, JR__TRAINER_F + $C8, $16 - object SPRITE_LASS, $12, $d, STAY, UP, $a, JR__TRAINER_F + $C8, $17 + object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14 + object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6 + object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7 + object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9 + object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a + object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3 + object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4 + object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16 + object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17 object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to |