aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route16.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/route16.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/route16.asm')
-rwxr-xr-xdata/mapObjects/route16.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm
index 3023124e..e3fd619e 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -16,14 +16,14 @@ Route16Object: ; 0x58afc (size=136)
db $b, $1b, $8 ; Route16Text8
db $11, $5, $9 ; Route16Text9
- db $7 ; people
- db SPRITE_BIKER, $c + 4, $11 + 4, $ff, $d2, TRAINER | $1, BIKER + $C8, $5
- db SPRITE_BIKER, $d + 4, $e + 4, $ff, $d3, TRAINER | $2, CUE_BALL + $C8, $1
- db SPRITE_BIKER, $c + 4, $b + 4, $ff, $d1, TRAINER | $3, CUE_BALL + $C8, $2
- db SPRITE_BIKER, $b + 4, $9 + 4, $ff, $d2, TRAINER | $4, BIKER + $C8, $6
- db SPRITE_BIKER, $a + 4, $6 + 4, $ff, $d3, TRAINER | $5, CUE_BALL + $C8, $3
- db SPRITE_BIKER, $c + 4, $3 + 4, $ff, $d3, TRAINER | $6, BIKER + $C8, $7
- db SPRITE_SNORLAX, $a + 4, $1a + 4, $ff, $d0, $7 ; person
+ db $7 ; objects
+ object SPRITE_BIKER, $11, $c, FACE, RIGHT, $1, BIKER + $C8, $5
+ object SPRITE_BIKER, $e, $d, FACE, LEFT, $2, CUE_BALL + $C8, $1
+ object SPRITE_BIKER, $b, $c, FACE, UP, $3, CUE_BALL + $C8, $2
+ object SPRITE_BIKER, $9, $b, FACE, RIGHT, $4, BIKER + $C8, $6
+ object SPRITE_BIKER, $6, $a, FACE, LEFT, $5, CUE_BALL + $C8, $3
+ object SPRITE_BIKER, $3, $c, FACE, LEFT, $6, BIKER + $C8, $7
+ object SPRITE_SNORLAX, $1a, $a, FACE, DOWN, $7 ; person
; warp-to
EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F