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/PokemonTower1F.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/PokemonTower1F.asm (renamed from data/mapObjects/pokemontower1.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/PokemonTower1F.asm index e29867ac..cf62836b 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/PokemonTower1F.asm @@ -1,10 +1,10 @@ -PokemonTower1Object: +PokemonTower1F_Object: db $1 ; border block db 3 ; warps warp 10, 17, 1, -1 warp 11, 17, 1, -1 - warp 18, 9, 1, POKEMONTOWER_2 + warp 18, 9, 1, POKEMON_TOWER_2F db 0 ; signs @@ -16,6 +16,6 @@ PokemonTower1Object: object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person ; warp-to - warp_to 10, 17, POKEMONTOWER_1_WIDTH - warp_to 11, 17, POKEMONTOWER_1_WIDTH - warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMON_TOWER_2F + warp_to 10, 17, POKEMON_TOWER_1F_WIDTH + warp_to 11, 17, POKEMON_TOWER_1F_WIDTH + warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F |