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/Route11Gate1F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/Route11Gate1F.asm') diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index 45c49ad5..161eb8d7 100755 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -1,16 +1,16 @@ Route11Gate1F_Object: db $a ; border block - db 5 ; warps + def_warps warp 0, 4, 0, LAST_MAP warp 0, 5, 1, LAST_MAP warp 7, 4, 2, LAST_MAP warp 7, 5, 3, LAST_MAP warp 6, 8, 0, ROUTE_11_GATE_2F - db 0 ; signs + def_signs - db 1 ; objects + def_objects object SPRITE_GUARD, 4, 1, STAY, NONE, 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/Route11Gate1F.asm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'data/maps/objects/Route11Gate1F.asm') diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index 161eb8d7..45af716b 100755 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -13,9 +13,4 @@ Route11Gate1F_Object: def_objects object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person - ; warp-to - warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F + def_warps_to ROUTE_11_GATE_1F -- cgit v1.2.3