summaryrefslogtreecommitdiff
path: root/data/mapObjects/rockethideout3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/rockethideout3.asm')
-rwxr-xr-xdata/mapObjects/rockethideout3.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm
index 0464c969..90bfbb57 100755
--- a/data/mapObjects/rockethideout3.asm
+++ b/data/mapObjects/rockethideout3.asm
@@ -1,4 +1,4 @@
-RocketHideout3Object: ; 0x4534d (size=50)
+RocketHideout3Object:
db $2e ; border block
db $2 ; warps
@@ -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, STAY, RIGHT, $1, OPP_ROCKET, $e
+ object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, OPP_ROCKET, $f
+ object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10
+ object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY
; warp-to
EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2