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/PokemonTower1F.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/PokemonTower1F.asm (renamed from data/mapObjects/pokemontower1.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/PokemonTower1F.asm index f15299da..cf62836b 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/PokemonTower1F.asm @@ -1,10 +1,10 @@ -PokemonTower1Object: +PokemonTower1F_Object: db $1 ; border block db 3 ; warps warp 10, 17, 1, -1 warp 11, 17, 1, -1 - warp 18, 9, 1, POKEMONTOWER_2 + warp 18, 9, 1, POKEMON_TOWER_2F db 0 ; signs @@ -16,6 +16,6 @@ PokemonTower1Object: object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person ; warp-to - warp_to 10, 17, POKEMONTOWER_1_WIDTH - warp_to 11, 17, POKEMONTOWER_1_WIDTH - warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 + warp_to 10, 17, POKEMON_TOWER_1F_WIDTH + warp_to 11, 17, POKEMON_TOWER_1F_WIDTH + warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F |