aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/PokemonTower6F.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-04 16:19:15 -0400
committerGitHub <noreply@github.com>2020-07-04 16:19:15 -0400
commit2718c36065e7eb201a149938bcdd51987c4e56b6 (patch)
tree4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /data/mapObjects/PokemonTower6F.asm
parentMerge pull request #256 from Rangi42/master (diff)
parentUPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff)
downloadpokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'data/mapObjects/PokemonTower6F.asm')
-rwxr-xr-xdata/mapObjects/PokemonTower6F.asm19
1 files changed, 0 insertions, 19 deletions
diff --git a/data/mapObjects/PokemonTower6F.asm b/data/mapObjects/PokemonTower6F.asm
deleted file mode 100755
index 823fe78a..00000000
--- a/data/mapObjects/PokemonTower6F.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-PokemonTower6F_Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 18, 9, 1, POKEMON_TOWER_5F
- warp 9, 16, 0, POKEMON_TOWER_7F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
- object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
- object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
- object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
- object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
-
- ; warp-to
- warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
- warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F