From 2c4f35848b786864822a3f211df91de30a2857c9 Mon Sep 17 00:00:00 2001 From: Yoann Fievez Date: Mon, 27 Sep 2021 04:56:09 +0200 Subject: Unify map event gen1 gen2 (#335) * Update sign to bg_event #289 * Rename warp to warp_event * Replace object to object_event * Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id --- data/maps/objects/PokemonTower2F.asm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/objects/PokemonTower2F.asm') diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index 27bd2f1b..c569e4d7 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -1,14 +1,14 @@ PokemonTower2F_Object: db $1 ; border block - def_warps - warp 3, 9, 0, POKEMON_TOWER_3F - warp 18, 9, 2, POKEMON_TOWER_1F + def_warp_events + warp_event 3, 9, POKEMON_TOWER_3F, 0 + warp_event 18, 9, POKEMON_TOWER_1F, 2 - def_signs + def_bg_events - def_objects - object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person - object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person + def_object_events + object_event 14, 5, SPRITE_BLUE, STAY, NONE, 1 ; person + object_event 3, 7, SPRITE_CHANNELER, STAY, RIGHT, 2 ; person def_warps_to POKEMON_TOWER_2F -- cgit v1.3.1-sl0p