aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pokemontower2.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-20 20:17:30 -0500
committerGitHub <noreply@github.com>2020-05-20 20:17:30 -0500
commit500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/pokemontower2.asm
parentMerge pull request #39 from TiKevin83/master (diff)
parentMerge remote-tracking branch 'pokered/master' (diff)
downloadpokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'data/mapObjects/pokemontower2.asm')
-rwxr-xr-xdata/mapObjects/pokemontower2.asm16
1 files changed, 0 insertions, 16 deletions
diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm
deleted file mode 100755
index 96223a26..00000000
--- a/data/mapObjects/pokemontower2.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-PokemonTower2Object:
- db $1 ; border block
-
- db 2 ; warps
- warp 3, 9, 0, POKEMONTOWER_3
- warp 18, 9, 2, POKEMONTOWER_1
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
- object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
-
- ; warp-to
- warp_to 3, 9, POKEMONTOWER_2_WIDTH ; POKEMON_TOWER_3F
- warp_to 18, 9, POKEMONTOWER_2_WIDTH ; POKEMON_TOWER_1F