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/Route2.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route2.asm') diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 8645f9c0..cbd8be8c 100755 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -1,7 +1,7 @@ Route2_Object: db $f ; border block - db 6 ; warps + def_warps warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE warp 15, 19, 0, ROUTE_2_TRADE_HOUSE @@ -9,11 +9,11 @@ Route2_Object: warp 15, 39, 2, ROUTE_2_GATE warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE - db 2 ; signs + def_signs sign 5, 65, 3 ; Route2Text3 sign 11, 11, 4 ; Route2Text4 - db 2 ; objects + def_objects object SPRITE_POKE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE object SPRITE_POKE_BALL, 13, 45, STAY, NONE, 2, HP_UP -- 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/Route2.asm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'data/maps/objects/Route2.asm') diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index cbd8be8c..f9955c2a 100755 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -17,13 +17,7 @@ Route2_Object: object SPRITE_POKE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE object SPRITE_POKE_BALL, 13, 45, STAY, NONE, 2, HP_UP - ; warp-to - warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2 - warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE - warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + def_warps_to ROUTE_2 ; unused warp_to 2, 7, 4 -- cgit v1.2.3