diff options
Diffstat (limited to 'data/maps/objects/RocketHideoutB1F.asm')
| -rwxr-xr-x | data/maps/objects/RocketHideoutB1F.asm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 9de04769..197e821f 100755 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -1,16 +1,16 @@ RocketHideoutB1F_Object: db $2e ; border block - db 5 ; warps + def_warps warp 23, 2, 0, ROCKET_HIDEOUT_B2F warp 21, 2, 2, GAME_CORNER warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR warp 21, 24, 3, ROCKET_HIDEOUT_B2F warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - db 0 ; signs + def_signs - db 7 ; objects + def_objects object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8 object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9 object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 @@ -19,9 +19,4 @@ RocketHideoutB1F_Object: object SPRITE_POKE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE object SPRITE_POKE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION - ; warp-to - warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER - warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + def_warps_to ROCKET_HIDEOUT_B1F |