aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route18.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/route18.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/route18.asm')
-rwxr-xr-xdata/mapObjects/route18.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm
index f4dd26f3..ff51f080 100755
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/route18.asm
@@ -11,10 +11,10 @@ Route18Object: ; 0x58c5a (size=66)
db $7, $2b, $4 ; Route18Text4
db $5, $21, $5 ; Route18Text5
- db $3 ; people
- db SPRITE_BLACK_HAIR_BOY_1, $b + 4, $24 + 4, $ff, $d3, TRAINER | $1, BIRD_KEEPER + $C8, $8
- db SPRITE_BLACK_HAIR_BOY_1, $f + 4, $28 + 4, $ff, $d2, TRAINER | $2, BIRD_KEEPER + $C8, $9
- db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $2a + 4, $ff, $d2, TRAINER | $3, BIRD_KEEPER + $C8, $a
+ db $3 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, $24, $b, FACE, LEFT, $1, BIRD_KEEPER + $C8, $8
+ object SPRITE_BLACK_HAIR_BOY_1, $28, $f, FACE, RIGHT, $2, BIRD_KEEPER + $C8, $9
+ object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, FACE, RIGHT, $3, BIRD_KEEPER + $C8, $a
; warp-to
EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F