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/CeladonMart4F.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/objects/CeladonMart4F.asm') diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 72ed0338..0dcb3e21 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -1,17 +1,17 @@ CeladonMart4F_Object: db $f ; border block - def_warps - warp 12, 1, 0, CELADON_MART_3F - warp 16, 1, 1, CELADON_MART_5F - warp 1, 1, 0, CELADON_MART_ELEVATOR + def_warp_events + warp_event 12, 1, CELADON_MART_3F, 0 + warp_event 16, 1, CELADON_MART_5F, 1 + warp_event 1, 1, CELADON_MART_ELEVATOR, 0 - def_signs - sign 14, 1, 4 ; CeladonMart4Text4 + def_bg_events + bg_event 14, 1, 4 ; CeladonMart4Text4 - def_objects - object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person - object SPRITE_SUPER_NERD, 15, 5, WALK, LEFT_RIGHT, 2 ; person - object SPRITE_YOUNGSTER, 5, 2, WALK, LEFT_RIGHT, 3 ; person + def_object_events + object_event 5, 7, SPRITE_CLERK, STAY, NONE, 1 ; person + object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 2 ; person + object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person def_warps_to CELADON_MART_4F -- cgit v1.3.1-sl0p