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/SafariZoneSecretHouse.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/objects/SafariZoneSecretHouse.asm') diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 1431d711..439f4a95 100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -1,13 +1,13 @@ SafariZoneSecretHouse_Object: db $17 ; border block - def_warps - warp 2, 7, 6, SAFARI_ZONE_WEST - warp 3, 7, 6, SAFARI_ZONE_WEST + def_warp_events + warp_event 2, 7, SAFARI_ZONE_WEST, 6 + warp_event 3, 7, SAFARI_ZONE_WEST, 6 - def_signs + def_bg_events - def_objects - object SPRITE_FISHING_GURU, 3, 3, STAY, DOWN, 1 ; person + def_object_events + object_event 3, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person def_warps_to SAFARI_ZONE_SECRET_HOUSE -- cgit v1.3.1-sl0p