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/VermilionTradeHouse.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/objects/VermilionTradeHouse.asm') diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index ec60415f..2f4b2b00 100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -1,13 +1,13 @@ VermilionTradeHouse_Object: db $a ; border block - def_warps - warp 2, 7, 7, LAST_MAP - warp 3, 7, 7, LAST_MAP + def_warp_events + warp_event 2, 7, LAST_MAP, 7 + warp_event 3, 7, LAST_MAP, 7 - def_signs + def_bg_events - def_objects - object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person + def_object_events + object_event 3, 5, SPRITE_LITTLE_GIRL, STAY, UP, 1 ; person def_warps_to VERMILION_TRADE_HOUSE -- cgit v1.3.1-sl0p