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/Route15.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route15.asm') diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 095e9743..4a46268d 100755 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -1,16 +1,16 @@ Route15_Object: db $43 ; border block - db 4 ; warps + def_warps warp 7, 8, 0, ROUTE_15_GATE_1F warp 7, 9, 1, ROUTE_15_GATE_1F warp 14, 8, 2, ROUTE_15_GATE_1F warp 14, 9, 3, ROUTE_15_GATE_1F - db 1 ; signs + def_signs sign 39, 9, 12 ; Route15Text12 - db 11 ; objects + def_objects object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 object SPRITE_COOLTRAINER_F, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 object SPRITE_COOLTRAINER_M, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 -- 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/Route15.asm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'data/maps/objects/Route15.asm') diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 4a46268d..76e3ae7c 100755 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -23,8 +23,4 @@ Route15_Object: object SPRITE_COOLTRAINER_F, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 object SPRITE_POKE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE - ; warp-to - warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + def_warps_to ROUTE_15 -- cgit v1.2.3