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/SSAnne3F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/SSAnne3F.asm') diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index cd493a96..a969e9ea 100755 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -1,13 +1,13 @@ SSAnne3F_Object: db $c ; border block - db 2 ; warps + def_warps warp 0, 3, 0, SS_ANNE_BOW warp 19, 3, 7, SS_ANNE_2F - db 0 ; signs + def_signs - db 1 ; objects + def_objects object SPRITE_SAILOR, 9, 3, WALK, LEFT_RIGHT, 1 ; person ; warp-to -- 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/SSAnne3F.asm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'data/maps/objects/SSAnne3F.asm') diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index a969e9ea..af2760ad 100755 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -10,6 +10,4 @@ SSAnne3F_Object: def_objects object SPRITE_SAILOR, 9, 3, WALK, LEFT_RIGHT, 1 ; person - ; warp-to - warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW - warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F + def_warps_to SS_ANNE_3F -- cgit v1.2.3