From 2c4f35848b786864822a3f211df91de30a2857c9 Mon Sep 17 00:00:00 2001 From: Yoann Fievez Date: Mon, 27 Sep 2021 04:56:09 +0200 Subject: Unify map event gen1 gen2 (#335) * Update sign to bg_event #289 * Rename warp to warp_event * Replace object to object_event * Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id --- data/maps/objects/RocketHideoutB4F.asm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'data/maps/objects/RocketHideoutB4F.asm') diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index 5dcf107f..e882e364 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -1,22 +1,22 @@ RocketHideoutB4F_Object: db $2e ; border block - def_warps - warp 19, 10, 1, ROCKET_HIDEOUT_B3F - warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR - warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR + def_warp_events + warp_event 19, 10, ROCKET_HIDEOUT_B3F, 1 + warp_event 24, 15, ROCKET_HIDEOUT_ELEVATOR, 0 + warp_event 25, 15, ROCKET_HIDEOUT_ELEVATOR, 1 - def_signs + def_bg_events - def_objects - object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 - object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 - object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 - object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 - object SPRITE_POKE_BALL, 10, 12, STAY, NONE, 5, HP_UP - object SPRITE_POKE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND - object SPRITE_POKE_BALL, 12, 20, STAY, NONE, 7, IRON - object SPRITE_POKE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE - object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY + def_object_events + object_event 25, 3, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 1 + object_event 23, 12, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 16 + object_event 26, 12, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 17 + object_event 11, 2, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 18 + object_event 10, 12, SPRITE_POKE_BALL, STAY, NONE, 5, HP_UP + object_event 9, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_RAZOR_WIND + object_event 12, 20, SPRITE_POKE_BALL, STAY, NONE, 7, IRON + object_event 25, 2, SPRITE_POKE_BALL, STAY, NONE, 8, SILPH_SCOPE + object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 9, LIFT_KEY def_warps_to ROCKET_HIDEOUT_B4F -- cgit v1.3.1-sl0p