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/RocketHideoutB3F.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/objects/RocketHideoutB3F.asm') diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index 4cba5422..5d5f8320 100644 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -1,16 +1,16 @@ RocketHideoutB3F_Object: db $2e ; border block - def_warps - warp 25, 6, 1, ROCKET_HIDEOUT_B2F - warp 19, 18, 0, ROCKET_HIDEOUT_B4F + def_warp_events + warp_event 25, 6, ROCKET_HIDEOUT_B2F, 1 + warp_event 19, 18, ROCKET_HIDEOUT_B4F, 0 - def_signs + def_bg_events - def_objects - object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 - object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 - object SPRITE_POKE_BALL, 26, 17, STAY, NONE, 3, TM_DOUBLE_EDGE - object SPRITE_POKE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY + def_object_events + object_event 10, 22, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 14 + object_event 26, 12, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 15 + object_event 26, 17, SPRITE_POKE_BALL, STAY, NONE, 3, TM_DOUBLE_EDGE + object_event 20, 14, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY def_warps_to ROCKET_HIDEOUT_B3F -- cgit v1.3.1-sl0p