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/Route1.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route1.asm') diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index f51ece6a..349118dd 100755 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -1,12 +1,12 @@ Route1_Object: db $b ; border block - db 0 ; warps + def_warps - db 1 ; signs + def_signs sign 9, 27, 3 ; Route1Text3 - db 2 ; objects + def_objects object SPRITE_YOUNGSTER, 5, 24, WALK, UP_DOWN, 1 ; person object SPRITE_YOUNGSTER, 15, 13, WALK, LEFT_RIGHT, 2 ; 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/Route1.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'data/maps/objects/Route1.asm') diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index 349118dd..4b9b59b5 100755 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -10,5 +10,7 @@ Route1_Object: object SPRITE_YOUNGSTER, 5, 24, WALK, UP_DOWN, 1 ; person object SPRITE_YOUNGSTER, 15, 13, WALK, LEFT_RIGHT, 2 ; person - ; warp-to (unused) + def_warps_to ROUTE_1 + + ; unused warp_to 2, 7, 4 -- cgit v1.2.3