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/Route25.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route25.asm') diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index cafcccf5..ee5d5283 100755 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -1,13 +1,13 @@ Route25_Object: db $2c ; border block - db 1 ; warps + def_warps warp 45, 3, 0, BILLS_HOUSE - db 1 ; signs + def_signs sign 43, 3, 11 ; Route25Text11 - db 10 ; objects + def_objects object SPRITE_YOUNGSTER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 object SPRITE_YOUNGSTER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 object SPRITE_COOLTRAINER_M, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 -- 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/Route25.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data/maps/objects/Route25.asm') diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index ee5d5283..956743fe 100755 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -19,5 +19,4 @@ Route25_Object: object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 object SPRITE_POKE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS - ; warp-to - warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE + def_warps_to ROUTE_25 -- cgit v1.2.3