aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/rockethideout2.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/rockethideout2.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/rockethideout2.asm')
-rwxr-xr-xdata/mapObjects/rockethideout2.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm
index 5842e5bc..f80fb22d 100755
--- a/data/mapObjects/rockethideout2.asm
+++ b/data/mapObjects/rockethideout2.asm
@@ -10,12 +10,12 @@ RocketHideout2Object: ; 0x450f7 (size=80)
db $0 ; signs
- db $5 ; people
- db SPRITE_ROCKET, $c + 4, $14 + 4, $ff, $d0, TRAINER | $1, ROCKET + $C8, $d
- db SPRITE_BALL, $b + 4, $1 + 4, $ff, $ff, ITEM | $2, MOON_STONE
- db SPRITE_BALL, $8 + 4, $10 + 4, $ff, $ff, ITEM | $3, NUGGET
- db SPRITE_BALL, $c + 4, $6 + 4, $ff, $ff, ITEM | $4, TM_07
- db SPRITE_BALL, $15 + 4, $3 + 4, $ff, $ff, ITEM | $5, SUPER_POTION
+ db $5 ; objects
+ object SPRITE_ROCKET, $14, $c, FACE, DOWN, $1, ROCKET + $C8, $d
+ object SPRITE_BALL, $1, $b, FACE, STAY, $2, MOON_STONE
+ object SPRITE_BALL, $10, $8, FACE, STAY, $3, NUGGET
+ object SPRITE_BALL, $6, $c, FACE, STAY, $4, TM_07
+ object SPRITE_BALL, $3, $15, FACE, STAY, $5, SUPER_POTION
; warp-to
EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1