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/CinnabarLabFossilRoom.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/objects/CinnabarLabFossilRoom.asm') diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 8269eaeb..0c61cf88 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -1,14 +1,14 @@ CinnabarLabFossilRoom_Object: db $17 ; border block - def_warps - warp 2, 7, 4, CINNABAR_LAB - warp 3, 7, 4, CINNABAR_LAB + def_warp_events + warp_event 2, 7, CINNABAR_LAB, 4 + warp_event 3, 7, CINNABAR_LAB, 4 - def_signs + def_bg_events - def_objects - object SPRITE_SCIENTIST, 5, 2, WALK, LEFT_RIGHT, 1 ; person - object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person + def_object_events + object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person + object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person def_warps_to CINNABAR_LAB_FOSSIL_ROOM -- cgit v1.3.1-sl0p