summaryrefslogtreecommitdiff
path: root/data/mapObjects/rockethideout2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/rockethideout2.asm')
-rwxr-xr-xdata/mapObjects/rockethideout2.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm
index 5842e5bc..6689110c 100755
--- a/data/mapObjects/rockethideout2.asm
+++ b/data/mapObjects/rockethideout2.asm
@@ -1,4 +1,4 @@
-RocketHideout2Object: ; 0x450f7 (size=80)
+RocketHideout2Object:
db $2e ; border block
db $5 ; warps
@@ -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, STAY, DOWN, $1, OPP_ROCKET, $d
+ object SPRITE_BALL, $1, $b, STAY, NONE, $2, MOON_STONE
+ object SPRITE_BALL, $10, $8, STAY, NONE, $3, NUGGET
+ object SPRITE_BALL, $6, $c, STAY, NONE, $4, TM_07
+ object SPRITE_BALL, $3, $15, STAY, NONE, $5, SUPER_POTION
; warp-to
EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1