diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/PokemonTower7F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/PokemonTower7F.asm (renamed from data/mapObjects/pokemontower7.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/PokemonTower7F.asm index 9609253f..79cb5b0d 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/PokemonTower7F.asm @@ -1,8 +1,8 @@ -PokemonTower7Object: +PokemonTower7F_Object: db $1 ; border block db 1 ; warps - warp 9, 16, 1, POKEMONTOWER_6 + warp 9, 16, 1, POKEMON_TOWER_6F db 0 ; signs @@ -13,4 +13,4 @@ PokemonTower7Object: object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person ; warp-to - warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 + warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F |