aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/PokemonTower7F.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/PokemonTower7F.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/PokemonTower7F.asm')
-rwxr-xr-xdata/mapObjects/PokemonTower7F.asm15
1 files changed, 15 insertions, 0 deletions
diff --git a/data/mapObjects/PokemonTower7F.asm b/data/mapObjects/PokemonTower7F.asm
new file mode 100755
index 00000000..ccd4f23c
--- /dev/null
+++ b/data/mapObjects/PokemonTower7F.asm
@@ -0,0 +1,15 @@
+PokemonTower7F_Object:
+ db $1 ; border block
+
+ db 1 ; warps
+ warp 9, 16, 1, POKEMON_TOWER_6F
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_JESSIE, 10, 8, STAY, DOWN, 1
+ object SPRITE_JAMES, 11, 8, STAY, DOWN, 2
+ object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 3
+
+ ; warp-to
+ warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F