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/rocktunnel1.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/rocktunnel1.asm')
| -rwxr-xr-x | data/mapObjects/rocktunnel1.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 348e9e50..b4001df9 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -15,13 +15,13 @@ RockTunnel1Object: ; 0x445f6 (size=127) db $1d, $b, $8 ; RockTunnel1Text8 db $7 ; objects - object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, HIKER + $C8, $c - object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, HIKER + $C8, $d - object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, HIKER + $C8, $e - object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, POKEMANIAC + $C8, $7 - object SPRITE_LASS, $25, $15, STAY, LEFT, $5, JR__TRAINER_F + $C8, $11 - object SPRITE_LASS, $16, $18, STAY, DOWN, $6, JR__TRAINER_F + $C8, $12 - object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, JR__TRAINER_F + $C8, $13 + object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c + object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d + object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e + object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7 + object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR__TRAINER_F, $11 + object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR__TRAINER_F, $12 + object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR__TRAINER_F, $13 ; warp-to EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f |