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/Route12.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route12.asm') diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 212b05c8..c5631130 100755 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -1,17 +1,17 @@ Route12_Object: db $43 ; border block - db 4 ; warps + def_warps warp 10, 15, 0, ROUTE_12_GATE_1F warp 11, 15, 1, ROUTE_12_GATE_1F warp 10, 21, 2, ROUTE_12_GATE_1F warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE - db 2 ; signs + def_signs sign 13, 13, 11 ; Route12Text11 sign 11, 63, 12 ; Route12Text12 - db 10 ; objects + def_objects object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person object SPRITE_FISHER, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 object SPRITE_FISHER, 5, 39, STAY, UP, 3, OPP_FISHER, 4 -- 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/Route12.asm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'data/maps/objects/Route12.asm') diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index c5631130..22ac15e8 100755 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -23,8 +23,4 @@ Route12_Object: object SPRITE_POKE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY object SPRITE_POKE_BALL, 5, 89, STAY, NONE, 10, IRON - ; warp-to - warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE + def_warps_to ROUTE_12 -- cgit v1.2.3