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/PokemonTower4F.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/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 a6723d5f..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 ; POKEMON_TOWER_5F - warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMON_TOWER_3F + warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F + warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F |