summaryrefslogtreecommitdiff
path: root/data/mapObjects/rockethideout2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/rockethideout2.asm')
-rwxr-xr-xdata/mapObjects/rockethideout2.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm
index 6689110c..328a4fb5 100755
--- a/data/mapObjects/rockethideout2.asm
+++ b/data/mapObjects/rockethideout2.asm
@@ -1,25 +1,25 @@
RocketHideout2Object:
db $2e ; border block
- db $5 ; warps
- db $8, $1b, $0, ROCKET_HIDEOUT_1
- db $8, $15, $0, ROCKET_HIDEOUT_3
- db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR
- db $16, $15, $3, ROCKET_HIDEOUT_1
- db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR
+ db 5 ; warps
+ warp 27, 8, 0, ROCKET_HIDEOUT_1
+ warp 21, 8, 0, ROCKET_HIDEOUT_3
+ warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
+ warp 21, 22, 3, ROCKET_HIDEOUT_1
+ warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
- db $0 ; signs
+ db 0 ; signs
- 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
+ db 5 ; objects
+ object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
+ object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
+ object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
+ object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07
+ object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
; warp-to
- EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1
- EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $15 ; ROCKET_HIDEOUT_3
- EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
- EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $16, $15 ; ROCKET_HIDEOUT_1
- EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
+ warp_to 27, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1
+ warp_to 21, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3
+ warp_to 24, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+ warp_to 21, 22, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1
+ warp_to 25, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR