diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-18 22:22:51 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-18 22:22:51 -0500 |
| commit | 0e48333fb864b0c8b6914fe1b5e57929d5258080 (patch) | |
| tree | 02a69d268fd1234b0a3da2745065130f7193118c /data/mapObjects/route6.asm | |
| parent | Consolidate coord macros (diff) | |
| download | pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.tar.gz pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.tar.xz pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.zip | |
Map object macro
closes https://github.com/iimarckus/pokered/issues/89
Diffstat (limited to 'data/mapObjects/route6.asm')
| -rwxr-xr-x | data/mapObjects/route6.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index b804f0d5..119eb4ec 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -10,13 +10,13 @@ Route6Object: ; 0x58022 (size=87) db $1 ; signs db $f, $13, $7 ; Route6Text7 - db $6 ; people - db SPRITE_BLACK_HAIR_BOY_1, $15 + 4, $a + 4, $ff, $d3, TRAINER | $1, JR__TRAINER_M + $C8, $4 - db SPRITE_LASS, $15 + 4, $b + 4, $ff, $d2, TRAINER | $2, JR__TRAINER_F + $C8, $2 - db SPRITE_BUG_CATCHER, $f + 4, $0 + 4, $ff, $d3, TRAINER | $3, BUG_CATCHER + $C8, $a - db SPRITE_BLACK_HAIR_BOY_1, $1f + 4, $b + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_M + $C8, $5 - db SPRITE_LASS, $1e + 4, $b + 4, $ff, $d2, TRAINER | $5, JR__TRAINER_F + $C8, $3 - db SPRITE_BUG_CATCHER, $1a + 4, $13 + 4, $ff, $d2, TRAINER | $6, BUG_CATCHER + $C8, $b + db $6 ; objects + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, FACE, LEFT, $1, JR__TRAINER_M + $C8, $4 + object SPRITE_LASS, $b, $15, FACE, RIGHT, $2, JR__TRAINER_F + $C8, $2 + object SPRITE_BUG_CATCHER, $0, $f, FACE, LEFT, $3, BUG_CATCHER + $C8, $a + object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, FACE, RIGHT, $4, JR__TRAINER_M + $C8, $5 + object SPRITE_LASS, $b, $1e, FACE, RIGHT, $5, JR__TRAINER_F + $C8, $3 + object SPRITE_BUG_CATCHER, $13, $1a, FACE, RIGHT, $6, BUG_CATCHER + $C8, $b ; warp-to EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE |