aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/rockethideout3.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/rockethideout3.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/rockethideout3.asm')
-rwxr-xr-xdata/mapObjects/rockethideout3.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm
index 0464c969..8ffdcdda 100755
--- a/data/mapObjects/rockethideout3.asm
+++ b/data/mapObjects/rockethideout3.asm
@@ -7,11 +7,11 @@ RocketHideout3Object: ; 0x4534d (size=50)
db $0 ; signs
- db $4 ; people
- db SPRITE_ROCKET, $16 + 4, $a + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $e
- db SPRITE_ROCKET, $c + 4, $1a + 4, $ff, $d1, TRAINER | $2, ROCKET + $C8, $f
- db SPRITE_BALL, $11 + 4, $1a + 4, $ff, $ff, ITEM | $3, TM_10
- db SPRITE_BALL, $e + 4, $14 + 4, $ff, $ff, ITEM | $4, RARE_CANDY
+ db $4 ; objects
+ object SPRITE_ROCKET, $a, $16, FACE, LEFT, $1, ROCKET + $C8, $e
+ object SPRITE_ROCKET, $1a, $c, FACE, UP, $2, ROCKET + $C8, $f
+ object SPRITE_BALL, $1a, $11, FACE, STAY, $3, TM_10
+ object SPRITE_BALL, $14, $e, FACE, STAY, $4, RARE_CANDY
; warp-to
EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2