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/Route20.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route20.asm') diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index c2a26861..25ec9218 100755 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -1,15 +1,15 @@ Route20_Object: db $43 ; border block - db 2 ; warps + def_warps warp 48, 5, 0, SEAFOAM_ISLANDS_1F warp 58, 9, 2, SEAFOAM_ISLANDS_1F - db 2 ; signs + def_signs sign 51, 7, 11 ; Route20Text11 sign 57, 11, 12 ; Route20Text12 - db 10 ; objects + def_objects object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 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/Route20.asm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'data/maps/objects/Route20.asm') diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index 25ec9218..2d9d20f7 100755 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -21,6 +21,4 @@ Route20_Object: object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 - ; warp-to - warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F - warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F + def_warps_to ROUTE_20 -- cgit v1.2.3