aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route24.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/route24.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/route24.asm')
-rwxr-xr-xdata/mapObjects/route24.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm
index e17709ff..f7218515 100755
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/route24.asm
@@ -5,12 +5,12 @@ Route24Object: ; 0x506a4 (size=67)
db $0 ; signs
- db $8 ; people
- db SPRITE_BLACK_HAIR_BOY_1, $f + 4, $b + 4, $ff, $d2, TRAINER | $1, ROCKET + $C8, $6
- db SPRITE_BLACK_HAIR_BOY_1, $14 + 4, $5 + 4, $ff, $d1, TRAINER | $2, JR__TRAINER_M + $C8, $2
- db SPRITE_BLACK_HAIR_BOY_1, $13 + 4, $b + 4, $ff, $d2, TRAINER | $3, JR__TRAINER_M + $C8, $3
- db SPRITE_LASS, $16 + 4, $a + 4, $ff, $d3, TRAINER | $4, LASS + $C8, $7
- db SPRITE_BUG_CATCHER, $19 + 4, $b + 4, $ff, $d2, TRAINER | $5, YOUNGSTER + $C8, $4
- db SPRITE_LASS, $1c + 4, $a + 4, $ff, $d3, TRAINER | $6, LASS + $C8, $8
- db SPRITE_BUG_CATCHER, $1f + 4, $b + 4, $ff, $d2, TRAINER | $7, BUG_CATCHER + $C8, $9
- db SPRITE_BALL, $5 + 4, $a + 4, $ff, $ff, ITEM | $8, TM_45
+ db $8 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, $b, $f, FACE, RIGHT, $1, ROCKET + $C8, $6
+ object SPRITE_BLACK_HAIR_BOY_1, $5, $14, FACE, UP, $2, JR__TRAINER_M + $C8, $2
+ object SPRITE_BLACK_HAIR_BOY_1, $b, $13, FACE, RIGHT, $3, JR__TRAINER_M + $C8, $3
+ object SPRITE_LASS, $a, $16, FACE, LEFT, $4, LASS + $C8, $7
+ object SPRITE_BUG_CATCHER, $b, $19, FACE, RIGHT, $5, YOUNGSTER + $C8, $4
+ object SPRITE_LASS, $a, $1c, FACE, LEFT, $6, LASS + $C8, $8
+ object SPRITE_BUG_CATCHER, $b, $1f, FACE, RIGHT, $7, BUG_CATCHER + $C8, $9
+ object SPRITE_BALL, $a, $5, FACE, STAY, $8, TM_45