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/SilphCo10F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/SilphCo10F.asm') diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index d13b10cd..c7ea4f03 100755 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -1,7 +1,7 @@ SilphCo10F_Object: db $2e ; border block - db 6 ; warps + def_warps warp 8, 0, 0, SILPH_CO_9F warp 10, 0, 0, SILPH_CO_11F warp 12, 0, 0, SILPH_CO_ELEVATOR @@ -9,9 +9,9 @@ SilphCo10F_Object: warp 13, 15, 5, SILPH_CO_4F warp 13, 7, 6, SILPH_CO_4F - db 0 ; signs + def_signs - db 6 ; objects + def_objects object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 object SPRITE_SCIENTIST, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 object SPRITE_ERIKA, 9, 15, WALK, ANY_DIR, 3 ; person -- 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/SilphCo10F.asm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'data/maps/objects/SilphCo10F.asm') diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index c7ea4f03..d496a014 100755 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -19,10 +19,4 @@ SilphCo10F_Object: object SPRITE_POKE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY object SPRITE_POKE_BALL, 5, 11, STAY, NONE, 6, CARBOS - ; warp-to - warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F - warp_to 10, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F - warp_to 12, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 9, 11, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to 13, 15, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to 13, 7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + def_warps_to SILPH_CO_10F -- cgit v1.2.3