aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/PokemonTower5F.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/PokemonTower5F.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/PokemonTower5F.asm (renamed from data/mapObjects/pokemontower5.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/PokemonTower5F.asm
index ac0668b2..b482871f 100755
--- a/data/mapObjects/pokemontower5.asm
+++ b/data/mapObjects/PokemonTower5F.asm
@@ -1,9 +1,9 @@
-PokemonTower5Object:
+PokemonTower5F_Object:
db $1 ; border block
db 2 ; warps
- warp 3, 9, 0, POKEMONTOWER_4
- warp 18, 9, 0, POKEMONTOWER_6
+ warp 3, 9, 0, POKEMON_TOWER_4F
+ warp 18, 9, 0, POKEMON_TOWER_6F
db 0 ; signs
@@ -16,5 +16,5 @@ PokemonTower5Object:
object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET
; warp-to
- warp_to 3, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4
- warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6
+ warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
+ warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F