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/PokemonTower7F.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/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 67adcd69..ccd4f23c 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 @@ -12,4 +12,4 @@ PokemonTower7Object: object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 3 ; warp-to - warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 + warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F |