diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/PokemonTower6F.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/PokemonTower6F.asm (renamed from data/mapObjects/pokemontower6.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/PokemonTower6F.asm index 1d2ecdd3..823fe78a 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/PokemonTower6F.asm @@ -1,9 +1,9 @@ -PokemonTower6Object: +PokemonTower6F_Object: db $1 ; border block db 2 ; warps - warp 18, 9, 1, POKEMONTOWER_5 - warp 9, 16, 0, POKEMONTOWER_7 + warp 18, 9, 1, POKEMON_TOWER_5F + warp 9, 16, 0, POKEMON_TOWER_7F db 0 ; signs @@ -15,5 +15,5 @@ PokemonTower6Object: object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY ; warp-to - warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMON_TOWER_5F - warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMON_TOWER_7F + warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F + warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F |