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/RedsHouse1F.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/objects/RedsHouse1F.asm') diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index f7cd0819..6099eb5d 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -1,15 +1,15 @@ RedsHouse1F_Object: db $a ; border block - def_warps - warp 2, 7, 0, LAST_MAP ; exit1 - warp 3, 7, 0, LAST_MAP ; exit2 - warp 7, 1, 0, REDS_HOUSE_2F ; staircase + def_warp_events + warp_event 2, 7, LAST_MAP, 0 ; exit1 + warp_event 3, 7, LAST_MAP, 0 ; exit2 + warp_event 7, 1, REDS_HOUSE_2F, 0 ; staircase - def_signs - sign 3, 1, 2 ; TV + def_bg_events + bg_event 3, 1, 2 ; TV - def_objects - object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom + def_object_events + object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom def_warps_to REDS_HOUSE_1F -- cgit v1.3.1-sl0p