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/PokemonTower7F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/PokemonTower7F.asm') diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 79cb5b0d..af8cff29 100755 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -1,12 +1,12 @@ PokemonTower7F_Object: db $1 ; border block - db 1 ; warps + def_warps warp 9, 16, 1, POKEMON_TOWER_6F - db 0 ; signs + def_signs - db 4 ; objects + def_objects object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 -- 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/PokemonTower7F.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data/maps/objects/PokemonTower7F.asm') diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index af8cff29..427cb39d 100755 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -12,5 +12,4 @@ PokemonTower7F_Object: object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person - ; warp-to - warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F + def_warps_to POKEMON_TOWER_7F -- cgit v1.2.3