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/Route17.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route17.asm') diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index f5bc4307..14abc7f0 100755 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm @@ -1,9 +1,9 @@ Route17_Object: db $43 ; border block - db 0 ; warps + def_warps - db 6 ; signs + def_signs sign 9, 51, 11 ; Route17Text11 sign 9, 63, 12 ; Route17Text12 sign 9, 75, 13 ; Route17Text13 @@ -11,7 +11,7 @@ Route17_Object: sign 9, 111, 15 ; Route17Text15 sign 9, 141, 16 ; Route17Text16 - db 10 ; objects + def_objects object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 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/Route17.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/maps/objects/Route17.asm') diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index 14abc7f0..8642b211 100755 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm @@ -22,3 +22,5 @@ Route17_Object: object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 + + def_warps_to ROUTE_17 -- cgit v1.2.3