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/CinnabarPokecenter.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/objects/CinnabarPokecenter.asm') diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index b1d89678..3e5a1d30 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -1,16 +1,16 @@ CinnabarPokecenter_Object: db $0 ; border block - def_warps - warp 3, 7, 3, LAST_MAP - warp 4, 7, 3, LAST_MAP + def_warp_events + warp_event 3, 7, LAST_MAP, 3 + warp_event 4, 7, LAST_MAP, 3 - def_signs + def_bg_events - def_objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_COOLTRAINER_F, 9, 4, WALK, ANY_DIR, 2 ; person - object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person - object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + def_object_events + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person + object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 2 ; person + object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person def_warps_to CINNABAR_POKECENTER -- cgit v1.3.1-sl0p