aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route20.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/route20.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/route20.asm')
-rwxr-xr-xdata/mapObjects/route20.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm
index 78256699..6b622467 100755
--- a/data/mapObjects/route20.asm
+++ b/data/mapObjects/route20.asm
@@ -9,17 +9,17 @@ Route20Object: ; 0x50113 (size=106)
db $7, $33, $b ; Route20Text11
db $b, $39, $c ; Route20Text12
- db $a ; people
- db SPRITE_SWIMMER, $8 + 4, $57 + 4, $ff, $d1, TRAINER | $1, SWIMMER + $C8, $9
- db SPRITE_SWIMMER, $b + 4, $44 + 4, $ff, $d1, TRAINER | $2, BEAUTY + $C8, $f
- db SPRITE_SWIMMER, $a + 4, $2d + 4, $ff, $d0, TRAINER | $3, BEAUTY + $C8, $6
- db SPRITE_SWIMMER, $e + 4, $37 + 4, $ff, $d3, TRAINER | $4, JR__TRAINER_F + $C8, $18
- db SPRITE_SWIMMER, $d + 4, $26 + 4, $ff, $d0, TRAINER | $5, SWIMMER + $C8, $a
- db SPRITE_SWIMMER, $d + 4, $57 + 4, $ff, $d1, TRAINER | $6, SWIMMER + $C8, $b
- db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $22 + 4, $ff, $d1, TRAINER | $7, BIRD_KEEPER + $C8, $b
- db SPRITE_SWIMMER, $7 + 4, $19 + 4, $ff, $d1, TRAINER | $8, BEAUTY + $C8, $7
- db SPRITE_SWIMMER, $c + 4, $18 + 4, $ff, $d0, TRAINER | $9, JR__TRAINER_F + $C8, $10
- db SPRITE_SWIMMER, $8 + 4, $f + 4, $ff, $d1, TRAINER | $a, BEAUTY + $C8, $8
+ db $a ; objects
+ object SPRITE_SWIMMER, $57, $8, FACE, UP, $1, SWIMMER + $C8, $9
+ object SPRITE_SWIMMER, $44, $b, FACE, UP, $2, BEAUTY + $C8, $f
+ object SPRITE_SWIMMER, $2d, $a, FACE, DOWN, $3, BEAUTY + $C8, $6
+ object SPRITE_SWIMMER, $37, $e, FACE, LEFT, $4, JR__TRAINER_F + $C8, $18
+ object SPRITE_SWIMMER, $26, $d, FACE, DOWN, $5, SWIMMER + $C8, $a
+ object SPRITE_SWIMMER, $57, $d, FACE, UP, $6, SWIMMER + $C8, $b
+ object SPRITE_BLACK_HAIR_BOY_1, $22, $9, FACE, UP, $7, BIRD_KEEPER + $C8, $b
+ object SPRITE_SWIMMER, $19, $7, FACE, UP, $8, BEAUTY + $C8, $7
+ object SPRITE_SWIMMER, $18, $c, FACE, DOWN, $9, JR__TRAINER_F + $C8, $10
+ object SPRITE_SWIMMER, $f, $8, FACE, UP, $a, BEAUTY + $C8, $8
; warp-to
EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1