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/powerplant.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/powerplant.asm')
| -rwxr-xr-x | data/mapObjects/powerplant.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index 98e80ff9..822192b6 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -8,21 +8,21 @@ PowerPlantObject: ; 0x1e3bf (size=135) db $0 ; signs - db $e ; people - db SPRITE_BALL, $14 + 4, $9 + 4, $ff, $ff, TRAINER | $1, VOLTORB, 40 - db SPRITE_BALL, $12 + 4, $20 + 4, $ff, $ff, TRAINER | $2, VOLTORB, 40 - db SPRITE_BALL, $19 + 4, $15 + 4, $ff, $ff, TRAINER | $3, VOLTORB, 40 - db SPRITE_BALL, $12 + 4, $19 + 4, $ff, $ff, TRAINER | $4, ELECTRODE, 43 - db SPRITE_BALL, $22 + 4, $17 + 4, $ff, $ff, TRAINER | $5, VOLTORB, 40 - db SPRITE_BALL, $1c + 4, $1a + 4, $ff, $ff, TRAINER | $6, VOLTORB, 40 - db SPRITE_BALL, $e + 4, $15 + 4, $ff, $ff, TRAINER | $7, ELECTRODE, 43 - db SPRITE_BALL, $20 + 4, $25 + 4, $ff, $ff, TRAINER | $8, VOLTORB, 40 - db SPRITE_BIRD, $9 + 4, $4 + 4, $ff, $d1, TRAINER | $9, ZAPDOS, 50 - db SPRITE_BALL, $19 + 4, $7 + 4, $ff, $ff, ITEM | $a, CARBOS - db SPRITE_BALL, $3 + 4, $1c + 4, $ff, $ff, ITEM | $b, HP_UP - db SPRITE_BALL, $3 + 4, $22 + 4, $ff, $ff, ITEM | $c, RARE_CANDY - db SPRITE_BALL, $20 + 4, $1a + 4, $ff, $ff, ITEM | $d, TM_25 - db SPRITE_BALL, $20 + 4, $14 + 4, $ff, $ff, ITEM | $e, TM_33 + db $e ; objects + object SPRITE_BALL, $9, $14, FACE, STAY, $1, VOLTORB, 40 + object SPRITE_BALL, $20, $12, FACE, STAY, $2, VOLTORB, 40 + object SPRITE_BALL, $15, $19, FACE, STAY, $3, VOLTORB, 40 + object SPRITE_BALL, $19, $12, FACE, STAY, $4, ELECTRODE, 43 + object SPRITE_BALL, $17, $22, FACE, STAY, $5, VOLTORB, 40 + object SPRITE_BALL, $1a, $1c, FACE, STAY, $6, VOLTORB, 40 + object SPRITE_BALL, $15, $e, FACE, STAY, $7, ELECTRODE, 43 + object SPRITE_BALL, $25, $20, FACE, STAY, $8, VOLTORB, 40 + object SPRITE_BIRD, $4, $9, FACE, UP, $9, ZAPDOS, 50 + object SPRITE_BALL, $7, $19, FACE, STAY, $a, CARBOS + object SPRITE_BALL, $1c, $3, FACE, STAY, $b, HP_UP + object SPRITE_BALL, $22, $3, FACE, STAY, $c, RARE_CANDY + object SPRITE_BALL, $1a, $20, FACE, STAY, $d, TM_25 + object SPRITE_BALL, $14, $20, FACE, STAY, $e, TM_33 ; warp-to EVENT_DISP POWER_PLANT_WIDTH, $23, $4 |