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/Route23.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route23.asm') diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index b510c285..f80b6832 100755 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -1,16 +1,16 @@ Route23_Object: db $f ; border block - db 4 ; warps + def_warps warp 7, 139, 2, ROUTE_22_GATE warp 8, 139, 3, ROUTE_22_GATE warp 4, 31, 0, VICTORY_ROAD_1F warp 14, 31, 1, VICTORY_ROAD_2F - db 1 ; signs + def_signs sign 3, 33, 8 ; Route23Text8 - db 7 ; objects + def_objects object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person -- 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/Route23.asm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'data/maps/objects/Route23.asm') diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index f80b6832..33c6611b 100755 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -19,8 +19,4 @@ Route23_Object: object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person - ; warp-to - warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F - warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F + def_warps_to ROUTE_23 -- cgit v1.2.3