aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/unknowndungeon2.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/unknowndungeon2.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/unknowndungeon2.asm')
-rwxr-xr-xdata/mapObjects/unknowndungeon2.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm
index 997198b5..9ce00fbc 100755
--- a/data/mapObjects/unknowndungeon2.asm
+++ b/data/mapObjects/unknowndungeon2.asm
@@ -11,10 +11,10 @@ UnknownDungeon2Object: ; 0x45e14 (size=73)
db $0 ; signs
- db $3 ; people
- db SPRITE_BALL, $9 + 4, $1d + 4, $ff, $ff, ITEM | $1, PP_UP
- db SPRITE_BALL, $f + 4, $4 + 4, $ff, $ff, ITEM | $2, ULTRA_BALL
- db SPRITE_BALL, $6 + 4, $d + 4, $ff, $ff, ITEM | $3, FULL_RESTORE
+ db $3 ; objects
+ object SPRITE_BALL, $1d, $9, FACE, STAY, $1, PP_UP
+ object SPRITE_BALL, $4, $f, FACE, STAY, $2, ULTRA_BALL
+ object SPRITE_BALL, $d, $6, FACE, STAY, $3, FULL_RESTORE
; warp-to
EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1