aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/victoryroad1.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/victoryroad1.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/victoryroad1.asm')
-rwxr-xr-xdata/mapObjects/victoryroad1.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm
index 96cb23bb..bdd6369a 100755
--- a/data/mapObjects/victoryroad1.asm
+++ b/data/mapObjects/victoryroad1.asm
@@ -8,14 +8,14 @@ VictoryRoad1Object: ; 0x5dab8 (size=76)
db $0 ; signs
- db $7 ; people
- db SPRITE_LASS, $5 + 4, $7 + 4, $ff, $d3, TRAINER | $1, COOLTRAINER_F + $C8, $5
- db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $3 + 4, $ff, $d0, TRAINER | $2, COOLTRAINER_M + $C8, $5
- db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $3, TM_43
- db SPRITE_BALL, $2 + 4, $9 + 4, $ff, $ff, ITEM | $4, RARE_CANDY
- db SPRITE_BOULDER, $f + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $5 ; person
- db SPRITE_BOULDER, $2 + 4, $e + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $6 ; person
- db SPRITE_BOULDER, $a + 4, $2 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $7 ; person
+ db $7 ; objects
+ object SPRITE_LASS, $7, $5, FACE, LEFT, $1, COOLTRAINER_F + $C8, $5
+ object SPRITE_BLACK_HAIR_BOY_1, $3, $2, FACE, DOWN, $2, COOLTRAINER_M + $C8, $5
+ object SPRITE_BALL, $b, $0, FACE, STAY, $3, TM_43
+ object SPRITE_BALL, $9, $2, FACE, STAY, $4, RARE_CANDY
+ object SPRITE_BOULDER, $5, $f, FACE, BOULDER_MOVEMENT_BYTE_2, $5 ; person
+ object SPRITE_BOULDER, $e, $2, FACE, BOULDER_MOVEMENT_BYTE_2, $6 ; person
+ object SPRITE_BOULDER, $2, $a, FACE, BOULDER_MOVEMENT_BYTE_2, $7 ; person
; warp-to
EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8