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/SilphCo1F.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/objects/SilphCo1F.asm') diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 7a9bdb61..23323e27 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -1,16 +1,16 @@ SilphCo1F_Object: db $2e ; border block - def_warps - warp 10, 17, 5, LAST_MAP - warp 11, 17, 5, LAST_MAP - warp 26, 0, 0, SILPH_CO_2F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 16, 10, 6, SILPH_CO_3F + def_warp_events + warp_event 10, 17, LAST_MAP, 5 + warp_event 11, 17, LAST_MAP, 5 + warp_event 26, 0, SILPH_CO_2F, 0 + warp_event 20, 0, SILPH_CO_ELEVATOR, 0 + warp_event 16, 10, SILPH_CO_3F, 6 - def_signs + def_bg_events - def_objects - object SPRITE_LINK_RECEPTIONIST, 4, 2, STAY, DOWN, 1 ; person + def_object_events + object_event 4, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person def_warps_to SILPH_CO_1F -- cgit v1.3.1-sl0p