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/MrFujisHouse.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/maps/objects/MrFujisHouse.asm') diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index 6ec762f6..054ac845 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -1,18 +1,18 @@ MrFujisHouse_Object: db $a ; border block - def_warps - warp 2, 7, 2, LAST_MAP - warp 3, 7, 2, LAST_MAP + def_warp_events + warp_event 2, 7, LAST_MAP, 2 + warp_event 3, 7, LAST_MAP, 2 - def_signs + def_bg_events - def_objects - object SPRITE_SUPER_NERD, 3, 5, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_MONSTER, 6, 4, STAY, UP, 3 ; person - object SPRITE_MONSTER, 1, 3, STAY, NONE, 4 ; person - object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person - object SPRITE_POKEDEX, 3, 3, STAY, NONE, 6 ; person + def_object_events + object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person + object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person + object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person + object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person + object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person + object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person def_warps_to MR_FUJIS_HOUSE -- cgit v1.3.1-sl0p