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/FuchsiaGoodRodHouse.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/objects/FuchsiaGoodRodHouse.asm') diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index 434cec8b..0a8dd12f 100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -1,14 +1,14 @@ FuchsiaGoodRodHouse_Object: db $c ; border block - def_warps - warp 2, 0, 8, LAST_MAP - warp 2, 7, 7, LAST_MAP - warp 3, 7, 7, LAST_MAP + def_warp_events + warp_event 2, 0, LAST_MAP, 8 + warp_event 2, 7, LAST_MAP, 7 + warp_event 3, 7, LAST_MAP, 7 - def_signs + def_bg_events - def_objects - object SPRITE_FISHING_GURU, 5, 3, STAY, RIGHT, 1 ; person + def_object_events + object_event 5, 3, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person def_warps_to FUCHSIA_GOOD_ROD_HOUSE -- cgit v1.3.1-sl0p