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/Route5.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/objects/Route5.asm') diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index 75f4a629..d0309e6e 100644 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -1,16 +1,16 @@ Route5_Object: db $a ; border block - def_warps - warp 10, 29, 3, ROUTE_5_GATE - warp 9, 29, 2, ROUTE_5_GATE - warp 10, 33, 0, ROUTE_5_GATE - warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5 - warp 10, 21, 0, DAYCARE + def_warp_events + warp_event 10, 29, ROUTE_5_GATE, 3 + warp_event 9, 29, ROUTE_5_GATE, 2 + warp_event 10, 33, ROUTE_5_GATE, 0 + warp_event 17, 27, UNDERGROUND_PATH_ROUTE_5, 0 + warp_event 10, 21, DAYCARE, 0 - def_signs - sign 17, 29, 1 ; Route5Text1 + def_bg_events + bg_event 17, 29, 1 ; Route5Text1 - def_objects + def_object_events def_warps_to ROUTE_5 -- cgit v1.3.1-sl0p