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/FightingDojo.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/FightingDojo.asm') diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index ecd00bfb..3e74aa91 100755 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -1,13 +1,13 @@ FightingDojo_Object: db $3 ; border block - db 2 ; warps + def_warps warp 4, 11, 1, LAST_MAP warp 5, 11, 1, LAST_MAP - db 0 ; signs + def_signs - db 7 ; objects + def_objects object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1 object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2 object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 -- 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/FightingDojo.asm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'data/maps/objects/FightingDojo.asm') diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 3e74aa91..e9f4d7d4 100755 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -16,6 +16,4 @@ FightingDojo_Object: object SPRITE_POKE_BALL, 4, 1, STAY, NONE, 6 ; person object SPRITE_POKE_BALL, 5, 1, STAY, NONE, 7 ; person - ; warp-to - warp_to 4, 11, FIGHTING_DOJO_WIDTH - warp_to 5, 11, FIGHTING_DOJO_WIDTH + def_warps_to FIGHTING_DOJO -- cgit v1.2.3