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/SSAnneB1F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/SSAnneB1F.asm') diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm index fe54ea24..667dc4dd 100755 --- a/data/maps/objects/SSAnneB1F.asm +++ b/data/maps/objects/SSAnneB1F.asm @@ -1,7 +1,7 @@ SSAnneB1F_Object: db $c ; border block - db 6 ; warps + def_warps warp 23, 3, 8, SS_ANNE_B1F_ROOMS warp 19, 3, 6, SS_ANNE_B1F_ROOMS warp 15, 3, 4, SS_ANNE_B1F_ROOMS @@ -9,9 +9,9 @@ SSAnneB1F_Object: warp 7, 3, 0, SS_ANNE_B1F_ROOMS warp 27, 5, 9, SS_ANNE_1F - db 0 ; signs + def_signs - db 0 ; objects + def_objects ; warp-to warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS -- 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/SSAnneB1F.asm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'data/maps/objects/SSAnneB1F.asm') diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm index 667dc4dd..f3c6e0b9 100755 --- a/data/maps/objects/SSAnneB1F.asm +++ b/data/maps/objects/SSAnneB1F.asm @@ -13,10 +13,4 @@ SSAnneB1F_Object: def_objects - ; warp-to - warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F + def_warps_to SS_ANNE_B1F -- cgit v1.2.3