aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/LoreleisRoom.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/LoreleisRoom.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/LoreleisRoom.asm')
-rwxr-xr-xdata/mapObjects/LoreleisRoom.asm19
1 files changed, 19 insertions, 0 deletions
diff --git a/data/mapObjects/LoreleisRoom.asm b/data/mapObjects/LoreleisRoom.asm
new file mode 100755
index 00000000..06450bb4
--- /dev/null
+++ b/data/mapObjects/LoreleisRoom.asm
@@ -0,0 +1,19 @@
+LoreleisRoom_Object:
+ db $3 ; border block
+
+ db 4 ; warps
+ warp 4, 11, 2, INDIGO_PLATEAU_LOBBY
+ warp 5, 11, 2, INDIGO_PLATEAU_LOBBY
+ warp 4, 0, 0, BRUNOS_ROOM
+ warp 5, 0, 1, BRUNOS_ROOM
+
+ db 0 ; signs
+
+ db 1 ; objects
+ object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1
+
+ ; warp-to
+ warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
+ warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
+ warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM
+ warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM