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/LoreleisRoom.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/objects/LoreleisRoom.asm') diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 91a306b8..84f5f6c8 100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -1,15 +1,15 @@ LoreleisRoom_Object: db $3 ; border block - def_warps - warp 4, 11, 2, INDIGO_PLATEAU_LOBBY - warp 5, 11, 2, INDIGO_PLATEAU_LOBBY - warp 4, 0, 0, BRUNOS_ROOM - warp 5, 0, 1, BRUNOS_ROOM + def_warp_events + warp_event 4, 11, INDIGO_PLATEAU_LOBBY, 2 + warp_event 5, 11, INDIGO_PLATEAU_LOBBY, 2 + warp_event 4, 0, BRUNOS_ROOM, 0 + warp_event 5, 0, BRUNOS_ROOM, 1 - def_signs + def_bg_events - def_objects - object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 + def_object_events + object_event 5, 2, SPRITE_LORELEI, STAY, DOWN, 1, OPP_LORELEI, 1 def_warps_to LORELEIS_ROOM -- cgit v1.3.1-sl0p