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/rocktunnel2.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/rocktunnel2.asm')
| -rwxr-xr-x | data/mapObjects/rocktunnel2.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index f75add5d..61014d31 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -9,15 +9,15 @@ RockTunnel2Object: ; 0x4613d (size=100) db $0 ; signs - db $8 ; people - db SPRITE_LASS, $d + 4, $b + 4, $ff, $d0, TRAINER | $1, JR__TRAINER_F + $C8, $9 - db SPRITE_HIKER, $a + 4, $6 + 4, $ff, $d0, TRAINER | $2, HIKER + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $3 + 4, $ff, $d0, TRAINER | $3, POKEMANIAC + $C8, $3 - db SPRITE_BLACK_HAIR_BOY_2, $15 + 4, $14 + 4, $ff, $d3, TRAINER | $4, POKEMANIAC + $C8, $4 - db SPRITE_HIKER, $a + 4, $1e + 4, $ff, $d0, TRAINER | $5, HIKER + $C8, $a - db SPRITE_LASS, $1c + 4, $e + 4, $ff, $d3, TRAINER | $6, JR__TRAINER_F + $C8, $a - db SPRITE_HIKER, $5 + 4, $21 + 4, $ff, $d3, TRAINER | $7, HIKER + $C8, $b - db SPRITE_BLACK_HAIR_BOY_2, $1e + 4, $1a + 4, $ff, $d0, TRAINER | $8, POKEMANIAC + $C8, $5 + db $8 ; objects + object SPRITE_LASS, $b, $d, FACE, DOWN, $1, JR__TRAINER_F + $C8, $9 + object SPRITE_HIKER, $6, $a, FACE, DOWN, $2, HIKER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, DOWN, $3, POKEMANIAC + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_2, $14, $15, FACE, LEFT, $4, POKEMANIAC + $C8, $4 + object SPRITE_HIKER, $1e, $a, FACE, DOWN, $5, HIKER + $C8, $a + object SPRITE_LASS, $e, $1c, FACE, LEFT, $6, JR__TRAINER_F + $C8, $a + object SPRITE_HIKER, $21, $5, FACE, LEFT, $7, HIKER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, FACE, DOWN, $8, POKEMANIAC + $C8, $5 ; warp-to EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 |