diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/PokemonTower6F.asm | |
| parent | f1285f8584ce7ff50ceb5e3134c0efc867209096 (diff) | |
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
Diffstat (limited to 'data/maps/objects/PokemonTower6F.asm')
| -rw-r--r-- | data/maps/objects/PokemonTower6F.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index 8e7b276c..c9c362c8 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -1,17 +1,17 @@ PokemonTower6F_Object: db $1 ; border block - def_warps - warp 18, 9, 1, POKEMON_TOWER_5F - warp 9, 16, 0, POKEMON_TOWER_7F + def_warp_events + warp_event 18, 9, POKEMON_TOWER_5F, 1 + warp_event 9, 16, POKEMON_TOWER_7F, 0 - def_signs + def_bg_events - def_objects - object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 - object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 - object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 - object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY - object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY + def_object_events + object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19 + object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20 + object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21 + object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY + object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY def_warps_to POKEMON_TOWER_6F |