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/PokemonTower4F.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/PokemonTower4F.asm (renamed from data/mapObjects/pokemontower4.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/PokemonTower4F.asm index 9acea43e..db86c02c 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/PokemonTower4F.asm @@ -1,9 +1,9 @@ -PokemonTower4Object: +PokemonTower4F_Object: db $1 ; border block db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_5 - warp 18, 9, 1, POKEMONTOWER_3 + warp 3, 9, 0, POKEMON_TOWER_5F + warp 18, 9, 1, POKEMON_TOWER_3F db 0 ; signs @@ -16,5 +16,5 @@ PokemonTower4Object: object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP ; warp-to - warp_to 3, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5 - warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3 + warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F + warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F |