aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route17.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-18 22:22:51 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-18 22:22:51 -0500
commit0e48333fb864b0c8b6914fe1b5e57929d5258080 (patch)
tree02a69d268fd1234b0a3da2745065130f7193118c /data/mapObjects/route17.asm
parentConsolidate coord macros (diff)
downloadpokeyellow-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/route17.asm')
-rwxr-xr-xdata/mapObjects/route17.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm
index 06123998..d6d30921 100755
--- a/data/mapObjects/route17.asm
+++ b/data/mapObjects/route17.asm
@@ -11,14 +11,14 @@ Route17Object: ; 0x54b42 (size=102)
db $6f, $9, $f ; Route17Text15
db $8d, $9, $10 ; Route17Text16
- db $a ; people
- db SPRITE_BIKER, $13 + 4, $c + 4, $ff, $d2, TRAINER | $1, CUE_BALL + $C8, $4
- db SPRITE_BIKER, $10 + 4, $b + 4, $ff, $d3, TRAINER | $2, CUE_BALL + $C8, $5
- db SPRITE_BIKER, $12 + 4, $4 + 4, $ff, $d1, TRAINER | $3, BIKER + $C8, $8
- db SPRITE_BIKER, $20 + 4, $7 + 4, $ff, $d2, TRAINER | $4, BIKER + $C8, $9
- db SPRITE_BIKER, $22 + 4, $e + 4, $ff, $d3, TRAINER | $5, BIKER + $C8, $a
- db SPRITE_BIKER, $3a + 4, $11 + 4, $ff, $d2, TRAINER | $6, CUE_BALL + $C8, $6
- db SPRITE_BIKER, $44 + 4, $2 + 4, $ff, $d3, TRAINER | $7, CUE_BALL + $C8, $7
- db SPRITE_BIKER, $62 + 4, $e + 4, $ff, $d3, TRAINER | $8, CUE_BALL + $C8, $8
- db SPRITE_BIKER, $62 + 4, $5 + 4, $ff, $d2, TRAINER | $9, BIKER + $C8, $b
- db SPRITE_BIKER, $76 + 4, $a + 4, $ff, $d0, TRAINER | $a, BIKER + $C8, $c
+ db $a ; objects
+ object SPRITE_BIKER, $c, $13, FACE, RIGHT, $1, CUE_BALL + $C8, $4
+ object SPRITE_BIKER, $b, $10, FACE, LEFT, $2, CUE_BALL + $C8, $5
+ object SPRITE_BIKER, $4, $12, FACE, UP, $3, BIKER + $C8, $8
+ object SPRITE_BIKER, $7, $20, FACE, RIGHT, $4, BIKER + $C8, $9
+ object SPRITE_BIKER, $e, $22, FACE, LEFT, $5, BIKER + $C8, $a
+ object SPRITE_BIKER, $11, $3a, FACE, RIGHT, $6, CUE_BALL + $C8, $6
+ object SPRITE_BIKER, $2, $44, FACE, LEFT, $7, CUE_BALL + $C8, $7
+ object SPRITE_BIKER, $e, $62, FACE, LEFT, $8, CUE_BALL + $C8, $8
+ object SPRITE_BIKER, $5, $62, FACE, RIGHT, $9, BIKER + $C8, $b
+ object SPRITE_BIKER, $a, $76, FACE, DOWN, $a, BIKER + $C8, $c