aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route9.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/route9.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/route9.asm')
-rwxr-xr-xdata/mapObjects/route9.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm
index 32b89db4..a18ee9c7 100755
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/route9.asm
@@ -6,14 +6,14 @@ Route9Object: ; 0x546a8 (size=86)
db $1 ; signs
db $7, $19, $b ; Route9Text11
- db $a ; people
- db SPRITE_LASS, $a + 4, $d + 4, $ff, $d2, TRAINER | $1, JR__TRAINER_F + $C8, $5
- db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $18 + 4, $ff, $d2, TRAINER | $2, JR__TRAINER_M + $C8, $7
- db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $1f + 4, $ff, $d3, TRAINER | $3, JR__TRAINER_M + $C8, $8
- db SPRITE_LASS, $8 + 4, $30 + 4, $ff, $d3, TRAINER | $4, JR__TRAINER_F + $C8, $6
- db SPRITE_HIKER, $f + 4, $10 + 4, $ff, $d2, TRAINER | $5, HIKER + $C8, $b
- db SPRITE_HIKER, $3 + 4, $2b + 4, $ff, $d2, TRAINER | $6, HIKER + $C8, $6
- db SPRITE_BUG_CATCHER, $2 + 4, $16 + 4, $ff, $d0, TRAINER | $7, BUG_CATCHER + $C8, $d
- db SPRITE_HIKER, $f + 4, $2d + 4, $ff, $d3, TRAINER | $8, HIKER + $C8, $5
- db SPRITE_BUG_CATCHER, $8 + 4, $28 + 4, $ff, $d3, TRAINER | $9, BUG_CATCHER + $C8, $e
- db SPRITE_BALL, $f + 4, $a + 4, $ff, $ff, ITEM | $a, TM_30
+ db $a ; objects
+ object SPRITE_LASS, $d, $a, FACE, RIGHT, $1, JR__TRAINER_F + $C8, $5
+ object SPRITE_BLACK_HAIR_BOY_1, $18, $7, FACE, RIGHT, $2, JR__TRAINER_M + $C8, $7
+ object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, FACE, LEFT, $3, JR__TRAINER_M + $C8, $8
+ object SPRITE_LASS, $30, $8, FACE, LEFT, $4, JR__TRAINER_F + $C8, $6
+ object SPRITE_HIKER, $10, $f, FACE, RIGHT, $5, HIKER + $C8, $b
+ object SPRITE_HIKER, $2b, $3, FACE, RIGHT, $6, HIKER + $C8, $6
+ object SPRITE_BUG_CATCHER, $16, $2, FACE, DOWN, $7, BUG_CATCHER + $C8, $d
+ object SPRITE_HIKER, $2d, $f, FACE, LEFT, $8, HIKER + $C8, $5
+ object SPRITE_BUG_CATCHER, $28, $8, FACE, LEFT, $9, BUG_CATCHER + $C8, $e
+ object SPRITE_BALL, $a, $f, FACE, STAY, $a, TM_30