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/Route9.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route9.asm') diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index 756fc8ad..80c4626a 100755 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -1,12 +1,12 @@ Route9_Object: db $2c ; border block - db 0 ; warps + def_warps - db 1 ; signs + def_signs sign 25, 7, 11 ; Route9Text11 - db 10 ; objects + def_objects object SPRITE_COOLTRAINER_F, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 object SPRITE_COOLTRAINER_M, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 object SPRITE_COOLTRAINER_M, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 -- 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/Route9.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/maps/objects/Route9.asm') diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index 80c4626a..07724323 100755 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -17,3 +17,5 @@ Route9_Object: object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 object SPRITE_YOUNGSTER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 object SPRITE_POKE_BALL, 10, 15, STAY, NONE, 10, TM_TELEPORT + + def_warps_to ROUTE_9 -- cgit v1.2.3