diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-10 11:09:16 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-10 11:09:16 -0500 |
| commit | dfc152d667e3695f83eb0fbabb839b0fad275ceb (patch) | |
| tree | 37255b78ab19c520a651ec68ca10a9f43ebe07d7 /data/mapObjects/route9.asm | |
| parent | 31d267d4ad87042dbdd30be645ad4b43e4e3ceb1 (diff) | |
No more $C8
Use OPP_ constants separate from trainer constants since
valid opponents can be all Pokemon and trainers
Diffstat (limited to 'data/mapObjects/route9.asm')
| -rwxr-xr-x | data/mapObjects/route9.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 6871c73a..a70b208f 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -7,13 +7,13 @@ Route9Object: ; 0x546a8 (size=86) db $7, $19, $b ; Route9Text11 db $a ; objects - object SPRITE_LASS, $d, $a, STAY, LEFT, $1, JR__TRAINER_F + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, JR__TRAINER_M + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, JR__TRAINER_M + $C8, $8 - object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, JR__TRAINER_F + $C8, $6 - object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, HIKER + $C8, $b - object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, HIKER + $C8, $6 - object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, BUG_CATCHER + $C8, $d - object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, HIKER + $C8, $5 - object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, BUG_CATCHER + $C8, $e + object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR__TRAINER_F, $5 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR__TRAINER_M, $7 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR__TRAINER_M, $8 + object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $6 + object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b + object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6 + object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d + object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, OPP_HIKER, $5 + object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, OPP_BUG_CATCHER, $e object SPRITE_BALL, $a, $f, STAY, NONE, $a, TM_30 |