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/Route6Gate.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/objects/Route6Gate.asm') diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index 2ef5a8b5..e4503913 100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm @@ -1,15 +1,15 @@ Route6Gate_Object: db $a ; border block - def_warps - warp 3, 5, 2, LAST_MAP - warp 4, 5, 2, LAST_MAP - warp 3, 0, 1, LAST_MAP - warp 4, 0, 1, LAST_MAP + def_warp_events + warp_event 3, 5, LAST_MAP, 2 + warp_event 4, 5, LAST_MAP, 2 + warp_event 3, 0, LAST_MAP, 1 + warp_event 4, 0, LAST_MAP, 1 - def_signs + def_bg_events - def_objects - object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person + def_object_events + object_event 6, 2, SPRITE_GUARD, STAY, LEFT, 1 ; person def_warps_to ROUTE_6_GATE -- cgit v1.3.1-sl0p