diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/PokemonTower6F.asm | |
| parent | Merge pull request #193 from luckytyphlosion/master (diff) | |
| download | pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip | |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/PokemonTower6F.asm (renamed from data/mapObjects/pokemontower6.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/PokemonTower6F.asm index 1dd66629..823fe78a 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/PokemonTower6F.asm @@ -1,9 +1,9 @@ -PokemonTower6Object: +PokemonTower6F_Object: db $1 ; border block db 2 ; warps - warp 18, 9, 1, POKEMONTOWER_5 - warp 9, 16, 0, POKEMONTOWER_7 + warp 18, 9, 1, POKEMON_TOWER_5F + warp 9, 16, 0, POKEMON_TOWER_7F db 0 ; signs @@ -15,5 +15,5 @@ PokemonTower6Object: object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY ; warp-to - warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 - warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 + warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F + warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F |