aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/PokemonTower7F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 15:06:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 23:33:10 -0500
commitc7796024590fec48ac79756793c1a6e3b54daf8f (patch)
tree0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/PokemonTower7F.asm
parentMerge pull request #193 from luckytyphlosion/master (diff)
downloadpokeyellow-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-xdata/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