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/FuchsiaMart.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/FuchsiaMart.asm') diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index 901a1b49..5ce7ddc5 100755 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -1,13 +1,13 @@ FuchsiaMart_Object: db $0 ; border block - db 2 ; warps + def_warps warp 3, 7, 0, LAST_MAP warp 4, 7, 0, LAST_MAP - db 0 ; signs + def_signs - db 3 ; objects + def_objects object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person object SPRITE_COOLTRAINER_F, 6, 5, WALK, UP_DOWN, 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/FuchsiaMart.asm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'data/maps/objects/FuchsiaMart.asm') diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index 5ce7ddc5..02b07d46 100755 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -12,6 +12,4 @@ FuchsiaMart_Object: object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person object SPRITE_COOLTRAINER_F, 6, 5, WALK, UP_DOWN, 3 ; person - ; warp-to - warp_to 3, 7, FUCHSIA_MART_WIDTH - warp_to 4, 7, FUCHSIA_MART_WIDTH + def_warps_to FUCHSIA_MART -- cgit v1.2.3