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/PokemonTower2F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps/objects/PokemonTower2F.asm') diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index 2b52c1ba..a3f84a52 100755 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -1,13 +1,13 @@ PokemonTower2F_Object: db $1 ; border block - db 2 ; warps + def_warps warp 3, 9, 0, POKEMON_TOWER_3F warp 18, 9, 2, POKEMON_TOWER_1F - db 0 ; signs + def_signs - db 2 ; objects + def_objects object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person object SPRITE_CHANNELER, 3, 7, STAY, 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/PokemonTower2F.asm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'data/maps/objects/PokemonTower2F.asm') diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index a3f84a52..9c0770e9 100755 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -11,6 +11,4 @@ PokemonTower2F_Object: object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person - ; warp-to - warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F - warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F + def_warps_to POKEMON_TOWER_2F -- cgit v1.2.3