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/pokemontower7.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/pokemontower7.asm')
| -rwxr-xr-x | data/mapObjects/pokemontower7.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index ca5aa669..1ad73bb8 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -7,16 +7,16 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs IF DEF(_YELLOW) - db 3 ; people - db SPRITE_JESSIE, 8 + 4, $a + 4, $ff, $d0, 1 - db SPRITE_JAMES, 8 + 4, $b + 4, $ff, $d0, 2 - db SPRITE_MR_FUJI, 3 + 4, $a + 4, $ff, $d0, 3 + db 3 ; objects + object SPRITE_JESSIE, $a 8, 8, FACE, DOWN, 1 + object SPRITE_JAMES, $b, 8, FACE, DOWN, 2 + object SPRITE_MR_FUJI, $a, 3, FACE, DOWN, 3 ELSE - db $4 ; people - db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $13 - db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $14 - db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, TRAINER | $3, ROCKET + $C8, $15 - db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_ROCKET, $9, $b, FACE, LEFT, $1, ROCKET + $C8, $13 + object SPRITE_ROCKET, $c, $9, FACE, RIGHT, $2, ROCKET + $C8, $14 + object SPRITE_ROCKET, $9, $7, FACE, LEFT, $3, ROCKET + $C8, $15 + object SPRITE_MR_FUJI, $a, $3, FACE, DOWN, $4 ; person ENDC ; warp-to |