aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route4.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/route4.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/route4.asm')
-rwxr-xr-xdata/mapObjects/route4.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm
index 57b81ee2..fe00f5d1 100755
--- a/data/mapObjects/route4.asm
+++ b/data/mapObjects/route4.asm
@@ -11,10 +11,10 @@ Route4Object: ; 0x543b2 (size=58)
db $7, $11, $5 ; Route4Text5
db $7, $1b, $6 ; Route4Text6
- db $3 ; people
- db SPRITE_LASS, $8 + 4, $9 + 4, $fe, $0, $1 ; person
- db SPRITE_LASS, $3 + 4, $3f + 4, $ff, $d3, TRAINER | $2, LASS + $C8, $4
- db SPRITE_BALL, $3 + 4, $39 + 4, $ff, $ff, ITEM | $3, TM_04
+ db $3 ; objects
+ object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person
+ object SPRITE_LASS, $3f, $3, FACE, LEFT, $2, LASS + $C8, $4
+ object SPRITE_BALL, $39, $3, FACE, STAY, $3, TM_04
; warp-to
EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER