summaryrefslogtreecommitdiff
path: root/data/mapObjects/fightingdojo.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/fightingdojo.asm
parent148d3f3cf28f9c270e3d5043af0692d95bc731c5 (diff)
Map object macro
closes https://github.com/iimarckus/pokered/issues/89
Diffstat (limited to 'data/mapObjects/fightingdojo.asm')
-rwxr-xr-xdata/mapObjects/fightingdojo.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm
index f84f3ee7..ae8b89dc 100755
--- a/data/mapObjects/fightingdojo.asm
+++ b/data/mapObjects/fightingdojo.asm
@@ -7,14 +7,14 @@ FightingDojoObject: ; 0x5cf9b (size=72)
db $0 ; signs
- db $7 ; people
- db SPRITE_HIKER, $3 + 4, $5 + 4, $ff, $d0, TRAINER | $1, BLACKBELT + $C8, $1
- db SPRITE_HIKER, $4 + 4, $3 + 4, $ff, $d3, TRAINER | $2, BLACKBELT + $C8, $2
- db SPRITE_HIKER, $6 + 4, $3 + 4, $ff, $d3, TRAINER | $3, BLACKBELT + $C8, $3
- db SPRITE_HIKER, $5 + 4, $5 + 4, $ff, $d2, TRAINER | $4, BLACKBELT + $C8, $4
- db SPRITE_HIKER, $7 + 4, $5 + 4, $ff, $d2, TRAINER | $5, BLACKBELT + $C8, $5
- db SPRITE_BALL, $1 + 4, $4 + 4, $ff, $ff, $6 ; person
- db SPRITE_BALL, $1 + 4, $5 + 4, $ff, $ff, $7 ; person
+ db $7 ; objects
+ object SPRITE_HIKER, $5, $3, FACE, DOWN, $1, BLACKBELT + $C8, $1
+ object SPRITE_HIKER, $3, $4, FACE, LEFT, $2, BLACKBELT + $C8, $2
+ object SPRITE_HIKER, $3, $6, FACE, LEFT, $3, BLACKBELT + $C8, $3
+ object SPRITE_HIKER, $5, $5, FACE, RIGHT, $4, BLACKBELT + $C8, $4
+ object SPRITE_HIKER, $5, $7, FACE, RIGHT, $5, BLACKBELT + $C8, $5
+ object SPRITE_BALL, $4, $1, FACE, STAY, $6 ; person
+ object SPRITE_BALL, $5, $1, FACE, STAY, $7 ; person
; warp-to
EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4