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/MtMoonB1F.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/maps/objects/MtMoonB1F.asm') diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm index 69fa3c17..831618e9 100644 --- a/data/maps/objects/MtMoonB1F.asm +++ b/data/maps/objects/MtMoonB1F.asm @@ -1,18 +1,18 @@ MtMoonB1F_Object: db $3 ; border block - def_warps - warp 5, 5, 2, MT_MOON_1F - warp 17, 11, 0, MT_MOON_B2F - warp 25, 9, 3, MT_MOON_1F - warp 25, 15, 4, MT_MOON_1F - warp 21, 17, 1, MT_MOON_B2F - warp 13, 27, 2, MT_MOON_B2F - warp 23, 3, 3, MT_MOON_B2F - warp 27, 3, 2, LAST_MAP + def_warp_events + warp_event 5, 5, MT_MOON_1F, 2 + warp_event 17, 11, MT_MOON_B2F, 0 + warp_event 25, 9, MT_MOON_1F, 3 + warp_event 25, 15, MT_MOON_1F, 4 + warp_event 21, 17, MT_MOON_B2F, 1 + warp_event 13, 27, MT_MOON_B2F, 2 + warp_event 23, 3, MT_MOON_B2F, 3 + warp_event 27, 3, LAST_MAP, 2 - def_signs + def_bg_events - def_objects + def_object_events def_warps_to MT_MOON_B1F -- cgit v1.3.1-sl0p