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/route12.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/route12.asm')
| -rwxr-xr-x | data/mapObjects/route12.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 82c36313..8ed43ff4 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -13,13 +13,13 @@ Route12Object: ; 0x5869a (size=118) db $a ; objects object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person - object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, FISHER + $C8, $3 - object SPRITE_FISHER2, $5, $27, STAY, UP, $3, FISHER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, JR__TRAINER_M + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, ROCKER + $C8, $2 - object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, FISHER + $C8, $5 - object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, FISHER + $C8, $6 - object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, FISHER + $C8, $b + object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3 + object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4 + object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR_TRAINER_M, $9 + object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2 + object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5 + object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6 + object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, OPP_FISHER, $b object SPRITE_BALL, $e, $23, STAY, NONE, $9, TM_16 object SPRITE_BALL, $5, $59, STAY, NONE, $a, IRON |