From e2c99f19103856426966e30cf1910d07995bb936 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 17 Aug 2020 16:54:59 -0400 Subject: Use def_* macros for automatic map event counts --- data/maps/objects/Route5.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route5.asm') diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index df2c8c03..34e4cd44 100755 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -1,17 +1,17 @@ Route5_Object: db $a ; border block - db 5 ; warps + 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 - db 1 ; signs + def_signs sign 17, 29, 1 ; Route5Text1 - db 0 ; objects + def_objects ; warp-to warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE -- cgit v1.2.3 From 4373aafac152f64621bf3d8c6b8d037cd9c76f7b Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 17 Aug 2020 17:47:28 -0400 Subject: Use def_warps_to macro for automatic warp_to entries --- data/maps/objects/Route5.asm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'data/maps/objects/Route5.asm') diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm index 34e4cd44..e7eadee8 100755 --- a/data/maps/objects/Route5.asm +++ b/data/maps/objects/Route5.asm @@ -13,9 +13,4 @@ Route5_Object: def_objects - ; warp-to - warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5 - warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE + def_warps_to ROUTE_5 -- cgit v1.2.3