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/CinnabarLabMetronomeRoom.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/objects/CinnabarLabMetronomeRoom.asm') diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index b5969dfa..dbfe0578 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -1,17 +1,17 @@ CinnabarLabMetronomeRoom_Object: db $17 ; border block - def_warps - warp 2, 7, 3, CINNABAR_LAB - warp 3, 7, 3, CINNABAR_LAB + def_warp_events + warp_event 2, 7, CINNABAR_LAB, 3 + warp_event 3, 7, CINNABAR_LAB, 3 - def_signs - sign 0, 4, 3 ; Lab3Text3 - sign 1, 4, 4 ; Lab3Text4 - sign 2, 1, 5 ; Lab3Text5 + def_bg_events + bg_event 0, 4, 3 ; Lab3Text3 + bg_event 1, 4, 4 ; Lab3Text4 + bg_event 2, 1, 5 ; Lab3Text5 - def_objects - object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person - object SPRITE_SCIENTIST, 2, 3, WALK, LEFT_RIGHT, 2 ; person + def_object_events + object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 ; person + object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 2 ; person def_warps_to CINNABAR_LAB_METRONOME_ROOM -- cgit v1.3.1-sl0p