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/route19.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/route19.asm')
| -rwxr-xr-x | data/mapObjects/route19.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index f86a114a..ee55a069 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -17,24 +17,24 @@ ENDC db $a ; objects IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, SWIMMER + $C8, 2 - object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3 ELSE - object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, SWIMMER + $C8, 2 - object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2 + object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3 ENDC - object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, SWIMMER + $C8, $4 - object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, SWIMMER + $C8, $5 - object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, SWIMMER + $C8, $6 + object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 + object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 + object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7 ELSE - object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, OPP_SWIMMER, $7 ENDC - object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, BEAUTY + $C8, $c - object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, BEAUTY + $C8, $d - object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, SWIMMER + $C8, $8 - object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, BEAUTY + $C8, $e + object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c + object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d + object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 + object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e ; warp-to IF DEF(_OPTION_BEACH_HOUSE) |