summaryrefslogtreecommitdiff
path: root/data/mapObjects/lorelei.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2019-01-13 22:38:16 -0600
committerGitHub <noreply@github.com>2019-01-13 22:38:16 -0600
commit725b86ebbec23bd1f53fd60bf0201c904fee951d (patch)
treea37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/lorelei.asm
parent108245cb21abb3abac051b7db84ed6c694192a61 (diff)
parentc7796024590fec48ac79756793c1a6e3b54daf8f (diff)
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'data/mapObjects/lorelei.asm')
-rwxr-xr-xdata/mapObjects/lorelei.asm19
1 files changed, 0 insertions, 19 deletions
diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm
deleted file mode 100755
index e5f0f9f2..00000000
--- a/data/mapObjects/lorelei.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-LoreleiObject:
- 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