summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2015-02-19 23:15:45 -0600
committerwushin <pasekei@gmail.com>2015-02-19 23:15:45 -0600
commit06ab0d4331daaa4c620cf405fdb6d3b3e53d8737 (patch)
tree4967c1a947153933530bd8a336d2f221c4fc6b8d /world/map
parent6b75d81034f0e017f4cec776f3ab00e3e08f7ac4 (diff)
downloadserverdata-06ab0d4331daaa4c620cf405fdb6d3b3e53d8737.tar.gz
serverdata-06ab0d4331daaa4c620cf405fdb6d3b3e53d8737.tar.bz2
serverdata-06ab0d4331daaa4c620cf405fdb6d3b3e53d8737.tar.xz
serverdata-06ab0d4331daaa4c620cf405fdb6d3b3e53d8737.zip
Make Warp Names Unique
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/001-1/_warps.txt28
-rw-r--r--world/map/npc/001-2/_warps.txt30
-rw-r--r--world/map/npc/001-3/_warps.txt2
-rw-r--r--world/map/npc/002-1/_warps.txt32
-rw-r--r--world/map/npc/002-2/_warps.txt38
-rw-r--r--world/map/npc/002-3/_warps.txt6
-rw-r--r--world/map/npc/002-4/_warps.txt2
-rw-r--r--world/map/npc/002-5/_warps.txt2
-rw-r--r--world/map/npc/004-3/_warps.txt14
-rw-r--r--world/map/npc/004-4/_warps.txt12
-rw-r--r--world/map/npc/004-5/_warps.txt2
-rw-r--r--world/map/npc/005-3/_warps.txt14
-rw-r--r--world/map/npc/006-1/_warps.txt58
-rw-r--r--world/map/npc/006-2/_warps.txt8
-rw-r--r--world/map/npc/006-3/_warps.txt40
-rw-r--r--world/map/npc/007-1/_warps.txt6
-rw-r--r--world/map/npc/008-1/_warps.txt16
-rw-r--r--world/map/npc/009-1/_warps.txt24
-rw-r--r--world/map/npc/009-2/_warps.txt42
-rw-r--r--world/map/npc/009-3/_warps.txt8
-rw-r--r--world/map/npc/009-4/_warps.txt12
-rw-r--r--world/map/npc/009-5/_warps.txt2
-rw-r--r--world/map/npc/009-6/_warps.txt2
-rw-r--r--world/map/npc/009-7/_warps.txt2
-rw-r--r--world/map/npc/010-1/_warps.txt10
-rw-r--r--world/map/npc/010-2/_warps.txt14
-rw-r--r--world/map/npc/011-1/_warps.txt12
-rw-r--r--world/map/npc/011-3/_warps.txt2
-rw-r--r--world/map/npc/011-4/_warps.txt22
-rw-r--r--world/map/npc/011-6/_warps.txt44
-rw-r--r--world/map/npc/012-1/_warps.txt22
-rw-r--r--world/map/npc/012-3/_warps.txt20
-rw-r--r--world/map/npc/012-4/_warps.txt6
-rw-r--r--world/map/npc/013-1/_warps.txt10
-rw-r--r--world/map/npc/013-2/_warps.txt6
-rw-r--r--world/map/npc/013-3/_warps.txt54
-rw-r--r--world/map/npc/014-1/_warps.txt6
-rw-r--r--world/map/npc/014-3/_warps.txt8
-rw-r--r--world/map/npc/015-1/_warps.txt6
-rw-r--r--world/map/npc/015-3/_warps.txt2
-rw-r--r--world/map/npc/016-1/_warps.txt4
-rw-r--r--world/map/npc/017-1/_warps.txt16
-rw-r--r--world/map/npc/017-2/_warps.txt4
-rw-r--r--world/map/npc/017-3/_warps.txt18
-rw-r--r--world/map/npc/017-4/_warps.txt14
-rw-r--r--world/map/npc/017-9/_warps.txt10
-rw-r--r--world/map/npc/018-1/_warps.txt34
-rw-r--r--world/map/npc/018-2/_warps.txt14
-rw-r--r--world/map/npc/018-3/_warps.txt44
-rw-r--r--world/map/npc/019-1/_warps.txt8
-rw-r--r--world/map/npc/019-3/_warps.txt6
-rw-r--r--world/map/npc/019-4/_warps.txt4
-rw-r--r--world/map/npc/020-1/_warps.txt20
-rw-r--r--world/map/npc/020-2/_warps.txt12
-rw-r--r--world/map/npc/020-3/_warps.txt14
-rw-r--r--world/map/npc/021-3/_warps.txt8
-rw-r--r--world/map/npc/025-1/_warps.txt6
-rw-r--r--world/map/npc/025-3/_warps.txt4
-rw-r--r--world/map/npc/025-4/_warps.txt2
-rw-r--r--world/map/npc/026-1/_warps.txt4
-rw-r--r--world/map/npc/027-1/_warps.txt4
-rw-r--r--world/map/npc/027-2/_warps.txt12
-rw-r--r--world/map/npc/027-3/_warps.txt4
-rw-r--r--world/map/npc/027-4/_warps.txt4
-rw-r--r--world/map/npc/027-5/_warps.txt2
-rw-r--r--world/map/npc/028-1/_warps.txt2
-rw-r--r--world/map/npc/028-3/_warps.txt2
-rw-r--r--world/map/npc/029-1/_warps.txt8
-rw-r--r--world/map/npc/029-2/_warps.txt10
-rw-r--r--world/map/npc/030-2/_warps.txt30
-rw-r--r--world/map/npc/030-3/_warps.txt2
-rw-r--r--world/map/npc/031-1/_warps.txt6
-rw-r--r--world/map/npc/031-2/_warps.txt4
-rw-r--r--world/map/npc/031-3/_warps.txt98
-rw-r--r--world/map/npc/032-3/_warps.txt4
-rw-r--r--world/map/npc/033-1/_warps.txt4
-rw-r--r--world/map/npc/034-1/_warps.txt12
-rw-r--r--world/map/npc/034-2/_warps.txt4
-rw-r--r--world/map/npc/043-3/_warps.txt8
-rw-r--r--world/map/npc/043-4/_warps.txt6
-rw-r--r--world/map/npc/045-1/_warps.txt6
-rw-r--r--world/map/npc/046-1/_warps.txt20
-rw-r--r--world/map/npc/046-3/_warps.txt12
-rw-r--r--world/map/npc/047-1/_warps.txt28
-rw-r--r--world/map/npc/047-3/_warps.txt18
-rw-r--r--world/map/npc/048-2/_warps.txt34
-rw-r--r--world/map/npc/055-1/_warps.txt14
-rw-r--r--world/map/npc/055-3/_warps.txt12
-rw-r--r--world/map/npc/056-2/_warps.txt4
-rw-r--r--world/map/npc/057-1/_warps.txt2
90 files changed, 634 insertions, 634 deletions
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index e19899e0..12bc4969 100644
--- a/world/map/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
@@ -1,17 +1,17 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Port warps
-001-1,63,119|warp|South Tulimshar|3,-1,002-1,63,21
-001-1,103,119|warp|South Tulimshar|3,-1,002-1,103,21
-001-1,55,71|warp|To Government Building|-1,-1,001-2,31,27
-001-1,52,71|warp|To Government Building|-1,-1,001-2,28,27
-001-1,49,71|warp|To Government Building|-1,-1,001-2,25,27
-001-1,114,99|warp|To Tulimshar Forge|-1,-1,001-2,25,64
-001-1,27,32|warp|To MIT|-1,-1,001-2,28,101
-001-1,37,32|warp|To MIT|-1,-1,001-2,71,101
-001-1,55,34|warp|To Tulimshar Castle|0,-1,001-2,104,101
-001-1,52,22|warp|Council Chambers|-1,-1,001-2,95,52
-001-1,57,22|warp|Council Chambers|-1,-1,001-2,114,52
-001-1,28,23|warp|To MIT|-1,-1,001-2,28,87
-001-1,28,44|warp|Sewers|-1,-1,021-3,29,61
-001-1,59,98|warp|To Bank|-1,-1,001-2,65,25
+001-1,63,119|warp|South Tulimshar#538|3,-1,002-1,63,21
+001-1,103,119|warp|South Tulimshar#539|3,-1,002-1,103,21
+001-1,55,71|warp|To Government Build#540|-1,-1,001-2,31,27
+001-1,52,71|warp|To Government Build#541|-1,-1,001-2,28,27
+001-1,49,71|warp|To Government Build#542|-1,-1,001-2,25,27
+001-1,114,99|warp|To Tulimshar Forge#543|-1,-1,001-2,25,64
+001-1,27,32|warp|To MIT#544|-1,-1,001-2,28,101
+001-1,37,32|warp|To MIT#545|-1,-1,001-2,71,101
+001-1,55,34|warp|To Tulimshar Castle#546|0,-1,001-2,104,101
+001-1,52,22|warp|Council Chambers#547|-1,-1,001-2,95,52
+001-1,57,22|warp|Council Chambers#548|-1,-1,001-2,114,52
+001-1,28,23|warp|To MIT#549|-1,-1,001-2,28,87
+001-1,28,44|warp|Sewers#550|-1,-1,021-3,29,61
+001-1,59,98|warp|To Bank#551|-1,-1,001-2,65,25
diff --git a/world/map/npc/001-2/_warps.txt b/world/map/npc/001-2/_warps.txt
index 3972182a..9ddb0fe4 100644
--- a/world/map/npc/001-2/_warps.txt
+++ b/world/map/npc/001-2/_warps.txt
@@ -1,18 +1,18 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// South Tulimshar Indoor warps
-001-2,25,65|warp|To Outside|-1,-1,001-1,114,100
-001-2,28,102|warp|To Outside|-1,-1,001-1,27,33
-001-2,28,86|warp|To Light|-1,-1,001-1,28,22
-001-2,105,102|warp|To Outside|0,-1,001-1,54,35
-001-2,25,28|warp|To Outside|-1,-1,001-1,49,72
-001-2,28,28|warp|To Outside|-1,-1,001-1,52,72
-001-2,31,28|warp|To Outside|-1,-1,001-1,55,72
-001-2,71,102|warp|To Outside|-1,-1,001-1,37,33
-001-2,105,73|warp|Council Chambers|2,-1,001-2,104,42
-001-2,105,43|warp|Main Floor|2,-1,001-2,104,74
-001-2,114,53|warp|Parapet|-1,-1,001-1,57,23
-001-2,95,53|warp|Parapet|-1,-1,001-1,52,23
-001-2,57,90|warp|Lighthouse|-1,-1,001-2,35,94
-001-2,36,95|warp|MainFloor|-1,0,001-2,58,90
-001-2,65,26|warp|Outside|-1,-1,001-1,59,99
+001-2,25,65|warp|To Outside#559|-1,-1,001-1,114,100
+001-2,28,102|warp|To Outside#560|-1,-1,001-1,27,33
+001-2,28,86|warp|To Light#561|-1,-1,001-1,28,22
+001-2,105,102|warp|To Outside#562|0,-1,001-1,54,35
+001-2,25,28|warp|To Outside#563|-1,-1,001-1,49,72
+001-2,28,28|warp|To Outside#564|-1,-1,001-1,52,72
+001-2,31,28|warp|To Outside#565|-1,-1,001-1,55,72
+001-2,71,102|warp|To Outside#566|-1,-1,001-1,37,33
+001-2,105,73|warp|Council Chambers#567|2,-1,001-2,104,42
+001-2,105,43|warp|Main Floor#568|2,-1,001-2,104,74
+001-2,114,53|warp|Parapet#569|-1,-1,001-1,57,23
+001-2,95,53|warp|Parapet#570|-1,-1,001-1,52,23
+001-2,57,90|warp|Lighthouse#571|-1,-1,001-2,35,94
+001-2,36,95|warp|MainFloor#572|-1,0,001-2,58,90
+001-2,65,26|warp|Outside#573|-1,-1,001-1,59,99
diff --git a/world/map/npc/001-3/_warps.txt b/world/map/npc/001-3/_warps.txt
index 1c626c4e..ab7d6f01 100644
--- a/world/map/npc/001-3/_warps.txt
+++ b/world/map/npc/001-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Arena warps
-001-3,73,28|warp|To Tulimshar Indoor|-1,-1,002-2,74,59
+001-3,73,28|warp|To Tulimshar Indoor#537|-1,-1,002-2,74,59
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index fa340f8b..2eb6f1ec 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -1,19 +1,19 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar South warps
-002-1,63,20|warp|North Tulimshar|3,-1,001-1,63,118
-002-1,103,20|warp|North Tulimshar|3,-1,001-1,103,118
-002-1,119,95|warp|To Snake Desert|-1,1,006-1,21,47
-002-1,92,114|warp|To Desert Mine Camp|-1,-1,002-3,85,49
-002-1,33,109|warp|To Desert Mine Camp|-1,-1,002-3,51,35
-002-1,109,45|warp|To Weavers Shop|-1,-1,002-2,75,100
-002-1,115,45|warp|To Weavers Shop|-1,-1,002-2,83,100
-002-1,99,43|warp|To Jeweler|-1,-1,002-2,120,66
-002-1,114,35|warp|To Trainer|-1,-1,002-2,78,131
-002-1,110,29|warp|To Trainer|-1,-1,002-2,68,122
-002-1,73,35|warp|To Tulimshar Indoor|-1,-1,002-2,44,33
-002-1,57,35|warp|To KPS|-1,-1,002-2,120,94
-002-1,67,29|warp|To Tulimshar Indoor|-1,-1,002-2,23,109
-002-1,113,107|warp|To Snake Cave|-1,-1,005-3,52,35
-002-1,49,20|warp|To Sea Cave|-1,-1,004-3,24,94
-002-1,57,26|warp|Omar's House|-1,-1,002-2,119,131
+002-1,63,20|warp|North Tulimshar#577|3,-1,001-1,63,118
+002-1,103,20|warp|North Tulimshar#578|3,-1,001-1,103,118
+002-1,119,95|warp|To Snake Desert#579|-1,1,006-1,21,47
+002-1,92,114|warp|To Desert Mine Camp#580|-1,-1,002-3,85,49
+002-1,33,109|warp|To Desert Mine Camp#581|-1,-1,002-3,51,35
+002-1,109,45|warp|To Weavers Shop#582|-1,-1,002-2,75,100
+002-1,115,45|warp|To Weavers Shop#583|-1,-1,002-2,83,100
+002-1,99,43|warp|To Jeweler#584|-1,-1,002-2,120,66
+002-1,114,35|warp|To Trainer#585|-1,-1,002-2,78,131
+002-1,110,29|warp|To Trainer#586|-1,-1,002-2,68,122
+002-1,73,35|warp|To Tulimshar Indoor#587|-1,-1,002-2,44,33
+002-1,57,35|warp|To KPS#588|-1,-1,002-2,120,94
+002-1,67,29|warp|To Tulimshar Indoor#589|-1,-1,002-2,23,109
+002-1,113,107|warp|To Snake Cave#590|-1,-1,005-3,52,35
+002-1,49,20|warp|To Sea Cave#591|-1,-1,004-3,24,94
+002-1,57,26|warp|Omar's House#592|-1,-1,002-2,119,131
diff --git a/world/map/npc/002-2/_warps.txt b/world/map/npc/002-2/_warps.txt
index dc02d56b..2b4e23b9 100644
--- a/world/map/npc/002-2/_warps.txt
+++ b/world/map/npc/002-2/_warps.txt
@@ -1,22 +1,22 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandstorm Desert Indoors warps
-002-2,44,34|warp|Outside|-1,-1,002-1,73,36
-002-2,44,20|warp|First Floor|0,-1,002-2,45,78
-002-2,46,79|warp|First Floor|0,-1,002-2,43,21
-002-2,46,55|warp|Penthouse|0,-1,002-2,44,109
-002-2,45,110|warp|Second Floor|0,-1,002-2,45,56
-002-2,23,110|warp|Outside|-1,-1,002-1,67,30
-002-2,34,20|warp|Casino|-1,-1,002-2,79,69
-002-2,37,20|warp|Theatre|-1,-1,002-2,72,31
-002-2,72,32|warp|First Floor|-1,-1,002-2,37,21
-002-2,79,70|warp|First Floor|-1,-1,002-2,34,21
-002-2,40,20|warp|Salon|-1,-1,002-2,126,35
-002-2,126,36|warp|First Floor|-1,-1,002-2,40,21
-002-2,75,101|warp|Outside|-1,-1,002-1,109,46
-002-2,83,101|warp|Outside|-1,-1,002-1,115,46
-002-2,78,132|warp|Outside|-1,-1,002-1,114,36
-002-2,68,121|warp|Outside|-1,-1,002-1,110,28
-002-2,120,67|warp|Outside|-1,-1,002-1,99,44
-002-2,120,95|warp|Outside|-1,-1,002-1,57,36
-002-2,119,132|warp|To Outside|-1,-1,002-1,57,27
+002-2,44,34|warp|Outside#422|-1,-1,002-1,73,36
+002-2,44,20|warp|First Floor#423|0,-1,002-2,45,78
+002-2,46,79|warp|First Floor#424|0,-1,002-2,43,21
+002-2,46,55|warp|Penthouse#425|0,-1,002-2,44,109
+002-2,45,110|warp|Second Floor#426|0,-1,002-2,45,56
+002-2,23,110|warp|Outside#427|-1,-1,002-1,67,30
+002-2,34,20|warp|Casino#428|-1,-1,002-2,79,69
+002-2,37,20|warp|Theatre#429|-1,-1,002-2,72,31
+002-2,72,32|warp|First Floor#430|-1,-1,002-2,37,21
+002-2,79,70|warp|First Floor#431|-1,-1,002-2,34,21
+002-2,40,20|warp|Salon#432|-1,-1,002-2,126,35
+002-2,126,36|warp|First Floor#433|-1,-1,002-2,40,21
+002-2,75,101|warp|Outside#434|-1,-1,002-1,109,46
+002-2,83,101|warp|Outside#435|-1,-1,002-1,115,46
+002-2,78,132|warp|Outside#436|-1,-1,002-1,114,36
+002-2,68,121|warp|Outside#437|-1,-1,002-1,110,28
+002-2,120,67|warp|Outside#438|-1,-1,002-1,99,44
+002-2,120,95|warp|Outside#439|-1,-1,002-1,57,36
+002-2,119,132|warp|To Outside#440|-1,-1,002-1,57,27
diff --git a/world/map/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt
index 385c07a2..116e576b 100644
--- a/world/map/npc/002-3/_warps.txt
+++ b/world/map/npc/002-3/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Mining Camp warps
-002-3,22,87|warp|Deep Caves|-1,-1,043-3,31,27
-002-3,85,51|warp|To Sand Storm Upper|-1,-1,002-1,92,115
-002-3,51,36|warp|To Sand Storm|-1,-1,002-1,33,110
+002-3,22,87|warp|Deep Caves#574|-1,-1,043-3,31,27
+002-3,85,51|warp|To Sand Storm Upper#575|-1,-1,002-1,92,115
+002-3,51,36|warp|To Sand Storm#576|-1,-1,002-1,33,110
diff --git a/world/map/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index e4afb1f2..93f96420 100644
--- a/world/map/npc/002-4/_warps.txt
+++ b/world/map/npc/002-4/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mines warps
-002-4,37,29|warp|To Mining Camp|-1,-1,002-3,82,30
+002-4,37,29|warp|To Mining Camp#417|-1,-1,002-3,82,30
diff --git a/world/map/npc/002-5/_warps.txt b/world/map/npc/002-5/_warps.txt
index 4195380c..0b4d278c 100644
--- a/world/map/npc/002-5/_warps.txt
+++ b/world/map/npc/002-5/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Deep Desert Mines warps
-002-5,34,98|warp|To Second Level|-1,-1,002-4,68,99
+002-5,34,98|warp|To Second Level#74|-1,-1,002-4,68,99
diff --git a/world/map/npc/004-3/_warps.txt b/world/map/npc/004-3/_warps.txt
index 76cd82d9..be583b03 100644
--- a/world/map/npc/004-3/_warps.txt
+++ b/world/map/npc/004-3/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Caves First Floor warps
-004-3,24,95|warp|To West Beach|-1,-1,002-1,49,21
-004-3,49,80|warp|To Pirate Caves|-1,-1,004-4,49,83
-004-3,31,73|warp|To Pirate Caves|-1,-1,004-4,31,70
-004-3,49,56|warp|To Pirate Caves|-1,-1,004-4,49,51
-004-3,90,64|warp|To Pirate Caves|-1,-1,004-4,90,68
-004-3,80,22|warp|To West Beach House|-1,-1,021-3,44,142
-004-3,77,40|warp|To Pirate Caves|-1,-1,004-4,78,34
+004-3,24,95|warp|To West Beach#13|-1,-1,002-1,49,21
+004-3,49,80|warp|To Pirate Caves#14|-1,-1,004-4,49,83
+004-3,31,73|warp|To Pirate Caves#15|-1,-1,004-4,31,70
+004-3,49,56|warp|To Pirate Caves#16|-1,-1,004-4,49,51
+004-3,90,64|warp|To Pirate Caves#17|-1,-1,004-4,90,68
+004-3,80,22|warp|To West Beach House#18|-1,-1,021-3,44,142
+004-3,77,40|warp|To Pirate Caves#19|-1,-1,004-4,78,34
diff --git a/world/map/npc/004-4/_warps.txt b/world/map/npc/004-4/_warps.txt
index d90f2939..21d07677 100644
--- a/world/map/npc/004-4/_warps.txt
+++ b/world/map/npc/004-4/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Caves Second Floor warps
-004-4,49,81|warp|To Pirate Caves|-1,-1,004-3,49,76
-004-4,31,72|warp|To Pirate Caves|-1,-1,004-3,31,74
-004-4,49,53|warp|To Pirate Caves|-1,-1,004-3,49,57
-004-4,90,70|warp|To Pirate Caves|-1,-1,004-3,90,66
-004-4,24,64|warp|To Pirates Den|-1,-1,004-5,24,67
-004-4,78,32|warp|To Pirate Caves|-1,-1,004-3,77,38
+004-4,49,81|warp|To Pirate Caves#54|-1,-1,004-3,49,76
+004-4,31,72|warp|To Pirate Caves#55|-1,-1,004-3,31,74
+004-4,49,53|warp|To Pirate Caves#56|-1,-1,004-3,49,57
+004-4,90,70|warp|To Pirate Caves#57|-1,-1,004-3,90,66
+004-4,24,64|warp|To Pirates Den#58|-1,-1,004-5,24,67
+004-4,78,32|warp|To Pirate Caves#59|-1,-1,004-3,77,38
diff --git a/world/map/npc/004-5/_warps.txt b/world/map/npc/004-5/_warps.txt
index 88c44fb9..4ce3c841 100644
--- a/world/map/npc/004-5/_warps.txt
+++ b/world/map/npc/004-5/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Den warps
-004-5,24,65|warp|To Pirates Den|-1,-1,004-4,24,62
+004-5,24,65|warp|To Pirates Den#596|-1,-1,004-4,24,62
diff --git a/world/map/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt
index 3b042e9f..b1ba5a5d 100644
--- a/world/map/npc/005-3/_warps.txt
+++ b/world/map/npc/005-3/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snake Pit warps
-005-3,52,33|warp|To Outside|-1,-1,002-1,113,109
-005-3,63,46|warp|Snake Mountain|-1,-1,006-3,89,45
-005-3,85,49|warp|Snake Mountain|-1,-1,006-3,125,65
-005-3,86,30|warp|To Outside|-1,-1,006-1,55,47
-005-3,73,60|warp|To Outside|-1,-1,006-1,51,69
-005-3,78,88|warp|Sandy Dungeon|-1,-1,043-3,116,37
-005-3,33,82|warp|Sandy Dungeon|-1,-1,043-3,31,35
+005-3,52,33|warp|To Outside#170|-1,-1,002-1,113,109
+005-3,63,46|warp|Snake Mountain#171|-1,-1,006-3,89,45
+005-3,85,49|warp|Snake Mountain#172|-1,-1,006-3,125,65
+005-3,86,30|warp|To Outside#173|-1,-1,006-1,55,47
+005-3,73,60|warp|To Outside#174|-1,-1,006-1,51,69
+005-3,78,88|warp|Sandy Dungeon#175|-1,-1,043-3,116,37
+005-3,33,82|warp|Sandy Dungeon#176|-1,-1,043-3,31,35
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index baf86c92..5788e3b8 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -1,32 +1,32 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mountains warps
-006-1,40,26|warp|To Desert Mountain Cave|-1,-1,006-3,40,28
-006-1,60,58|warp|To Desert Mountain Cave|-1,-1,006-3,60,70
-006-1,62,30|warp|To Desert Mountain Cave|-1,-1,006-3,62,32
-006-1,55,27|warp|To Desert Mountain Cave|-1,-1,006-3,55,29
-006-1,77,44|warp|To Desert Mountain Cave|-1,-1,006-3,77,46
-006-1,86,24|warp|To Desert Mountain Cave|-1,-1,006-3,86,26
-006-1,91,24|warp|To Desert Mountain Cave|-1,-1,006-3,91,26
-006-1,98,46|warp|To Desert Mountain Cave|-1,-1,006-3,104,46
-006-1,114,22|warp|To Desert Mountain Cave|-1,-1,006-3,122,26
-006-1,114,49|warp|To Desert Mountain Cave|-1,-1,006-3,114,51
-006-1,102,53|warp|To Desert Mountain Cave|-1,-1,006-3,110,58
-006-1,117,57|warp|To Desert Mountain Cave|-1,-1,006-3,125,61
-006-1,92,63|warp|To Desert Mountain Cave|-1,-1,006-3,92,65
-006-1,112,74|warp|To Desert Mountain Cave|-1,-1,006-3,112,76
-006-1,111,110|warp|To Desert Mountain Cave|-1,-1,032-3,56,60
-006-1,83,117|warp|To Desert Mountain Cave|-1,-1,006-3,79,121
-006-1,38,121|warp|To Desert Mountain Cave|-1,-1,006-3,38,123
-006-1,74,90|warp|To Desert Mountain Cave|-1,-1,006-3,74,92
-006-1,51,90|warp|To Desert Mountain Cave|-1,-1,006-3,51,92
-006-1,30,123|warp|To Outback Cave|-1,-1,032-3,128,33
-006-1,33,85|warp|To Pachua's Village|-1,-1,006-2,58,43
-006-1,23,85|warp|To Pachua's Village|-1,-1,006-2,48,43
-006-1,23,100|warp|To Pachua's Village|-1,-1,006-2,67,64
-006-1,21,108|warp|To Pachua's Village|-1,-1,006-2,65,72
-006-1,37,26|warp|To Desert Mountains|-1,-1,006-1,37,23
-006-1,37,24|warp|To Desert Mountains|-1,-1,006-1,37,27
-006-1,55,46|warp|Snake Cave|-1,-1,005-3,86,31
-006-1,20,48|warp|To Sandstorm Desert|-1,0,002-1,118,95
-006-1,51,68|warp|Snake Cave|-1,-1,005-3,73,59
+006-1,40,26|warp|To Desert Mountain #98|-1,-1,006-3,40,28
+006-1,60,58|warp|To Desert Mountain #99|-1,-1,006-3,60,70
+006-1,62,30|warp|To Desert Mountain #100|-1,-1,006-3,62,32
+006-1,55,27|warp|To Desert Mountain #101|-1,-1,006-3,55,29
+006-1,77,44|warp|To Desert Mountain #102|-1,-1,006-3,77,46
+006-1,86,24|warp|To Desert Mountain #103|-1,-1,006-3,86,26
+006-1,91,24|warp|To Desert Mountain #104|-1,-1,006-3,91,26
+006-1,98,46|warp|To Desert Mountain #105|-1,-1,006-3,104,46
+006-1,114,22|warp|To Desert Mountain #106|-1,-1,006-3,122,26
+006-1,114,49|warp|To Desert Mountain #107|-1,-1,006-3,114,51
+006-1,102,53|warp|To Desert Mountain #108|-1,-1,006-3,110,58
+006-1,117,57|warp|To Desert Mountain #109|-1,-1,006-3,125,61
+006-1,92,63|warp|To Desert Mountain #110|-1,-1,006-3,92,65
+006-1,112,74|warp|To Desert Mountain #111|-1,-1,006-3,112,76
+006-1,111,110|warp|To Desert Mountain #112|-1,-1,032-3,56,60
+006-1,83,117|warp|To Desert Mountain #113|-1,-1,006-3,79,121
+006-1,38,121|warp|To Desert Mountain #114|-1,-1,006-3,38,123
+006-1,74,90|warp|To Desert Mountain #115|-1,-1,006-3,74,92
+006-1,51,90|warp|To Desert Mountain #116|-1,-1,006-3,51,92
+006-1,30,123|warp|To Outback Cave#117|-1,-1,032-3,128,33
+006-1,33,85|warp|To Pachua's Village#118|-1,-1,006-2,58,43
+006-1,23,85|warp|To Pachua's Village#119|-1,-1,006-2,48,43
+006-1,23,100|warp|To Pachua's Village#120|-1,-1,006-2,67,64
+006-1,21,108|warp|To Pachua's Village#121|-1,-1,006-2,65,72
+006-1,37,26|warp|To Desert Mountains#122|-1,-1,006-1,37,23
+006-1,37,24|warp|To Desert Mountains#123|-1,-1,006-1,37,27
+006-1,55,46|warp|Snake Cave#124|-1,-1,005-3,86,31
+006-1,20,48|warp|To Sandstorm Desert#125|-1,0,002-1,118,95
+006-1,51,68|warp|Snake Cave#126|-1,-1,005-3,73,59
diff --git a/world/map/npc/006-2/_warps.txt b/world/map/npc/006-2/_warps.txt
index 5ea43dec..9d93efee 100644
--- a/world/map/npc/006-2/_warps.txt
+++ b/world/map/npc/006-2/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pachua's Village warps
-006-2,67,65|warp|To Desert Mountains|-1,-1,006-1,23,101
-006-2,65,73|warp|To Desert Mountains|-1,-1,006-1,21,109
-006-2,48,44|warp|To Desert Mountains|-1,-1,006-1,23,86
-006-2,58,44|warp|To Desert Mountains|-1,-1,006-1,33,86
+006-2,67,65|warp|To Desert Mountains#327|-1,-1,006-1,23,101
+006-2,65,73|warp|To Desert Mountains#328|-1,-1,006-1,21,109
+006-2,48,44|warp|To Desert Mountains#329|-1,-1,006-1,23,86
+006-2,58,44|warp|To Desert Mountains#330|-1,-1,006-1,33,86
diff --git a/world/map/npc/006-3/_warps.txt b/world/map/npc/006-3/_warps.txt
index 18c5e0a4..71b3c1a1 100644
--- a/world/map/npc/006-3/_warps.txt
+++ b/world/map/npc/006-3/_warps.txt
@@ -1,23 +1,23 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mountain Cave warps
-006-3,40,26|warp|To Desert Mountains|-1,-1,006-1,40,28
-006-3,55,27|warp|To Desert Mountains|-1,-1,006-1,55,29
-006-3,62,30|warp|To Desert Mountains|-1,-1,006-1,62,32
-006-3,86,24|warp|To Desert Mountains|-1,-1,006-1,86,26
-006-3,91,24|warp|To Desert Mountains|-1,-1,006-1,91,26
-006-3,122,24|warp|To Desert Mountains|-1,-1,006-1,114,24
-006-3,114,49|warp|To Desert Mountains|-1,-1,006-1,114,51
-006-3,104,44|warp|To Desert Mountains|-1,-1,006-1,98,48
-006-3,77,44|warp|To Desert Mountains|-1,-1,006-1,77,46
-006-3,60,68|warp|To Desert Mountains|-1,-1,006-1,60,60
-006-3,92,63|warp|To Desert Mountains|-1,-1,006-1,92,65
-006-3,112,74|warp|To Desert Mountains|-1,-1,006-1,112,76
-006-3,110,56|warp|To Desert Mountains|-1,-1,006-1,102,55
-006-3,125,59|warp|To Desert Mountains|-1,-1,006-1,117,59
-006-3,74,90|warp|To Desert Mountains|-1,-1,006-1,74,92
-006-3,51,90|warp|To Desert Mountains|-1,-1,006-1,51,92
-006-3,38,121|warp|To Desert Mountains|-1,-1,006-1,38,123
-006-3,79,120|warp|To Desert Mountains|-1,-1,006-1,83,119
-006-3,125,66|warp|Snake Cave|-1,-1,005-3,85,50
-006-3,89,46|warp|Snake Cave|-1,-1,005-3,63,47
+006-3,40,26|warp|To Desert Mountains#614|-1,-1,006-1,40,28
+006-3,55,27|warp|To Desert Mountains#615|-1,-1,006-1,55,29
+006-3,62,30|warp|To Desert Mountains#616|-1,-1,006-1,62,32
+006-3,86,24|warp|To Desert Mountains#617|-1,-1,006-1,86,26
+006-3,91,24|warp|To Desert Mountains#618|-1,-1,006-1,91,26
+006-3,122,24|warp|To Desert Mountains#619|-1,-1,006-1,114,24
+006-3,114,49|warp|To Desert Mountains#620|-1,-1,006-1,114,51
+006-3,104,44|warp|To Desert Mountains#621|-1,-1,006-1,98,48
+006-3,77,44|warp|To Desert Mountains#622|-1,-1,006-1,77,46
+006-3,60,68|warp|To Desert Mountains#623|-1,-1,006-1,60,60
+006-3,92,63|warp|To Desert Mountains#624|-1,-1,006-1,92,65
+006-3,112,74|warp|To Desert Mountains#625|-1,-1,006-1,112,76
+006-3,110,56|warp|To Desert Mountains#626|-1,-1,006-1,102,55
+006-3,125,59|warp|To Desert Mountains#627|-1,-1,006-1,117,59
+006-3,74,90|warp|To Desert Mountains#628|-1,-1,006-1,74,92
+006-3,51,90|warp|To Desert Mountains#629|-1,-1,006-1,51,92
+006-3,38,121|warp|To Desert Mountains#630|-1,-1,006-1,38,123
+006-3,79,120|warp|To Desert Mountains#631|-1,-1,006-1,83,119
+006-3,125,66|warp|Snake Cave#632|-1,-1,005-3,85,50
+006-3,89,46|warp|Snake Cave#633|-1,-1,005-3,63,47
diff --git a/world/map/npc/007-1/_warps.txt b/world/map/npc/007-1/_warps.txt
index 3773475b..17d9b689 100644
--- a/world/map/npc/007-1/_warps.txt
+++ b/world/map/npc/007-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-007-1,20,54|warp|To Woodland|-1,0,010-1,130,53
-007-1,69,21|warp|To Hurnscald Outskirts|2,-1,008-1,78,101
-007-1,122,20|warp|To Hurnscald|1,-1,008-1,132,98
+007-1,20,54|warp|To Woodland#381|-1,0,010-1,130,53
+007-1,69,21|warp|To Hurnscald Outski#382|2,-1,008-1,78,101
+007-1,122,20|warp|To Hurnscald#383|1,-1,008-1,132,98
diff --git a/world/map/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt
index b92d1e11..3c1e87c0 100644
--- a/world/map/npc/008-1/_warps.txt
+++ b/world/map/npc/008-1/_warps.txt
@@ -1,11 +1,11 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Outskirts warps
-008-1,54,61|warp|To Hurnscald West Entra|-1,1,009-1,25,36
-008-1,79,80|warp|To Hurnscald South Entr|2,-1,009-1,48,54
-008-1,127,61|warp|To Hurnscald East Entra|-1,0,009-1,96,36
-008-1,79,49|warp|To Hurnscald North Entr|2,-1,009-1,48,25
-008-1,24,62|warp|To Woodland|-1,2,011-1,123,61
-008-1,79,17|warp|To Woodland Mining Camp|2,-1,018-1,78,97
-008-1,79,102|warp|To Woodland|2,-1,007-1,68,22
-008-1,132,101|warp|To Woodland|1,-1,007-1,122,23
+008-1,54,61|warp|To Hurnscald West E#485|-1,1,009-1,25,36
+008-1,79,80|warp|To Hurnscald South #486|2,-1,009-1,48,54
+008-1,127,61|warp|To Hurnscald East E#487|-1,0,009-1,96,36
+008-1,79,49|warp|To Hurnscald North #488|2,-1,009-1,48,25
+008-1,24,62|warp|To Woodland#489|-1,2,011-1,123,61
+008-1,79,17|warp|To Woodland Mining #490|2,-1,018-1,78,97
+008-1,79,102|warp|To Woodland#491|2,-1,007-1,68,22
+008-1,132,101|warp|To Woodland#492|1,-1,007-1,122,23
diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt
index d636aa2a..05b13a80 100644
--- a/world/map/npc/009-1/_warps.txt
+++ b/world/map/npc/009-1/_warps.txt
@@ -1,15 +1,15 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald warps
-009-1,49,55|warp|To Hurnscald South Exit|2,-1,008-1,78,81
-009-1,97,36|warp|To Hurnscald East Exit|-1,0,008-1,128,61
-009-1,35,30|warp|To Hurnscald Inn|-1,-1,009-2,50,54
-009-1,58,46|warp|To Storage Room|-1,-1,009-2,27,106
-009-1,59,33|warp|To Archer Shop|-1,-1,009-2,95,29
-009-1,71,30|warp|To Hurnscald Potion Sho|-1,-1,009-2,130,25
-009-1,80,31|warp|To Hurnscald Hospital|-1,-1,009-2,149,66
-009-1,72,44|warp|To Hurnscald House|-1,-1,009-2,114,77
-009-1,91,46|warp|To Hurnscald Forge|0,-1,009-2,182,66
-009-1,24,36|warp|To Hurnscald West Exit|-1,1,008-1,53,61
-009-1,49,24|warp|To Hurnscald North Exit|2,-1,008-1,78,48
-009-1,60,41|warp|To Bedroom|-1,-1,009-2,32,91
+009-1,49,55|warp|To Hurnscald South #86|2,-1,008-1,78,81
+009-1,97,36|warp|To Hurnscald East E#87|-1,0,008-1,128,61
+009-1,35,30|warp|To Hurnscald Inn#88|-1,-1,009-2,50,54
+009-1,58,46|warp|To Storage Room#89|-1,-1,009-2,27,106
+009-1,59,33|warp|To Archer Shop#90|-1,-1,009-2,95,29
+009-1,71,30|warp|To Hurnscald Potion#91|-1,-1,009-2,130,25
+009-1,80,31|warp|To Hurnscald Hospit#92|-1,-1,009-2,149,66
+009-1,72,44|warp|To Hurnscald House#93|-1,-1,009-2,114,77
+009-1,91,46|warp|To Hurnscald Forge#94|0,-1,009-2,182,66
+009-1,24,36|warp|To Hurnscald West E#95|-1,1,008-1,53,61
+009-1,49,24|warp|To Hurnscald North #96|2,-1,008-1,78,48
+009-1,60,41|warp|To Bedroom#97|-1,-1,009-2,32,91
diff --git a/world/map/npc/009-2/_warps.txt b/world/map/npc/009-2/_warps.txt
index 673bfac7..c2a68f37 100644
--- a/world/map/npc/009-2/_warps.txt
+++ b/world/map/npc/009-2/_warps.txt
@@ -1,24 +1,24 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Indoor warps
-009-2,75,23|warp|To First Floor|0,-1,009-2,74,47
-009-2,95,30|warp|To Outside|-1,-1,009-1,59,34
-009-2,130,26|warp|To Outside|-1,-1,009-1,71,31
-009-2,144,26|warp|To Second Floor|0,-1,009-2,144,43
-009-2,144,42|warp|To Third Floor|0,-1,009-2,144,25
-009-2,155,48|warp|To First Floor|0,-1,009-2,155,63
-009-2,114,46|warp|To First Floor|0,-1,009-2,114,70
-009-2,50,55|warp|To Outside|-1,-1,009-1,35,31
-009-2,74,53|warp|To Cellar|-1,-1,009-2,143,78
-009-2,74,46|warp|To Second Floor|0,-1,009-2,75,22
-009-2,114,78|warp|To Outside|-1,-1,009-1,72,45
-009-2,114,69|warp|To Second Floor|0,-1,009-2,114,45
-009-2,149,67|warp|To Outside|-1,-1,009-1,80,32
-009-2,143,77|warp|To First Floor|-1,-1,009-2,74,52
-009-2,155,62|warp|To Second Floor|0,-1,009-2,155,46
-009-2,182,67|warp|To Outside|0,-1,009-1,91,47
-009-2,147,90|warp|To Hurnscald Cave|-1,-1,009-3,173,21
-009-2,27,107|warp|To Outside|-1,-1,009-1,58,47
-009-2,46,50|warp|To Inn Private Room|-1,-1,009-2,76,78
-009-2,77,78|warp|To Hurnscald Inn|-1,-1,009-2,47,50
-009-2,31,91|warp|To Outside|-1,-1,009-1,59,41
+009-2,75,23|warp|To First Floor#240|0,-1,009-2,74,47
+009-2,95,30|warp|To Outside#241|-1,-1,009-1,59,34
+009-2,130,26|warp|To Outside#242|-1,-1,009-1,71,31
+009-2,144,26|warp|To Second Floor#243|0,-1,009-2,144,43
+009-2,144,42|warp|To Third Floor#244|0,-1,009-2,144,25
+009-2,155,48|warp|To First Floor#245|0,-1,009-2,155,63
+009-2,114,46|warp|To First Floor#246|0,-1,009-2,114,70
+009-2,50,55|warp|To Outside#247|-1,-1,009-1,35,31
+009-2,74,53|warp|To Cellar#248|-1,-1,009-2,143,78
+009-2,74,46|warp|To Second Floor#249|0,-1,009-2,75,22
+009-2,114,78|warp|To Outside#250|-1,-1,009-1,72,45
+009-2,114,69|warp|To Second Floor#251|0,-1,009-2,114,45
+009-2,149,67|warp|To Outside#252|-1,-1,009-1,80,32
+009-2,143,77|warp|To First Floor#253|-1,-1,009-2,74,52
+009-2,155,62|warp|To Second Floor#254|0,-1,009-2,155,46
+009-2,182,67|warp|To Outside#255|0,-1,009-1,91,47
+009-2,147,90|warp|To Hurnscald Cave#256|-1,-1,009-3,173,21
+009-2,27,107|warp|To Outside#257|-1,-1,009-1,58,47
+009-2,46,50|warp|To Inn Private Room#258|-1,-1,009-2,76,78
+009-2,77,78|warp|To Hurnscald Inn#259|-1,-1,009-2,47,50
+009-2,31,91|warp|To Outside#260|-1,-1,009-1,59,41
diff --git a/world/map/npc/009-3/_warps.txt b/world/map/npc/009-3/_warps.txt
index f8d2a2ea..7897ad6a 100644
--- a/world/map/npc/009-3/_warps.txt
+++ b/world/map/npc/009-3/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Cave warps
-009-3,173,20|warp|To Cellar|-1,-1,009-2,147,89
-009-3,20,57|warp|To Lake Cave|-1,-1,011-4,129,87
-009-3,157,30|warp|To Northern Mines|-1,-1,018-3,179,180
-009-3,117,19|warp|To Woodland Hills Cave|-1,-1,013-3,160,102
+009-3,173,20|warp|To Cellar#20|-1,-1,009-2,147,89
+009-3,20,57|warp|To Lake Cave#21|-1,-1,011-4,129,87
+009-3,157,30|warp|To Northern Mines#22|-1,-1,018-3,179,180
+009-3,117,19|warp|To Woodland Hills C#23|-1,-1,013-3,160,102
diff --git a/world/map/npc/009-4/_warps.txt b/world/map/npc/009-4/_warps.txt
index ff172624..ed348dc0 100644
--- a/world/map/npc/009-4/_warps.txt
+++ b/world/map/npc/009-4/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Orum Caves warps
-009-4,37,112|warp|To Hurnscald Cave|-1,-1,009-3,163,114
-009-4,72,136|warp|To Torches Cave|-1,-1,009-4,36,27
-009-4,37,123|warp|To Torches Cave|-1,-1,009-4,36,27
-009-4,72,125|warp|To Hurnscald Cave|-1,-1,009-3,163,114
-009-4,103,22|warp|To Torches Cave|-1,-1,009-4,51,46
-009-4,103,76|warp|To Torches Cave|-1,-1,009-4,51,46
+009-4,37,112|warp|To Hurnscald Cave#598|-1,-1,009-3,163,114
+009-4,72,136|warp|To Torches Cave#599|-1,-1,009-4,36,27
+009-4,37,123|warp|To Torches Cave#600|-1,-1,009-4,36,27
+009-4,72,125|warp|To Hurnscald Cave#601|-1,-1,009-3,163,114
+009-4,103,22|warp|To Torches Cave#602|-1,-1,009-4,51,46
+009-4,103,76|warp|To Torches Cave#603|-1,-1,009-4,51,46
diff --git a/world/map/npc/009-5/_warps.txt b/world/map/npc/009-5/_warps.txt
index a2862a16..8f87c9d5 100644
--- a/world/map/npc/009-5/_warps.txt
+++ b/world/map/npc/009-5/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Last man standing warps
-009-5,53,74|warp|to Hurnscald|1,-1,009-3,162,81
+009-5,53,74|warp|to Hurnscald#393|1,-1,009-3,162,81
diff --git a/world/map/npc/009-6/_warps.txt b/world/map/npc/009-6/_warps.txt
index 05e14629..ec0008b5 100644
--- a/world/map/npc/009-6/_warps.txt
+++ b/world/map/npc/009-6/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cave warps
-009-6,36,48|warp|To Hurnscald Cave|-1,-1,009-3,162,82
+009-6,36,48|warp|To Hurnscald Cave#12|-1,-1,009-3,162,82
diff --git a/world/map/npc/009-7/_warps.txt b/world/map/npc/009-7/_warps.txt
index 26acecf5..5aa8b9cb 100644
--- a/world/map/npc/009-7/_warps.txt
+++ b/world/map/npc/009-7/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// The Sanguine Vault warps
-009-7,21,19|warp|To Hurnscald Storage|-1,-1,009-2,38,103
+009-7,21,19|warp|To Hurnscald Storag#146|-1,-1,009-2,38,103
diff --git a/world/map/npc/010-1/_warps.txt b/world/map/npc/010-1/_warps.txt
index 88acb354..d4687219 100644
--- a/world/map/npc/010-1/_warps.txt
+++ b/world/map/npc/010-1/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-010-1,49,24|warp|To Woodland|0,-1,011-1,48,103
-010-1,13,55|warp|To Woodland|-1,0,015-1,92,54
-010-1,36,94|warp|To Dimond's Cove|-1,-1,010-2,32,44
-010-1,56,105|warp|To Woodland|1,-1,016-1,56,19
-010-1,131,54|warp|To Woodland|-1,0,007-1,21,53
+010-1,49,24|warp|To Woodland#386|0,-1,011-1,48,103
+010-1,13,55|warp|To Woodland#387|-1,0,015-1,92,54
+010-1,36,94|warp|To Dimond's Cove#388|-1,-1,010-2,32,44
+010-1,56,105|warp|To Woodland#389|1,-1,016-1,56,19
+010-1,131,54|warp|To Woodland#390|-1,0,007-1,21,53
diff --git a/world/map/npc/010-2/_warps.txt b/world/map/npc/010-2/_warps.txt
index 9e737415..e006b366 100644
--- a/world/map/npc/010-2/_warps.txt
+++ b/world/map/npc/010-2/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Dimond's Cove warps
-010-2,27,24|warp|To Cellar|-1,-1,010-2,35,68
-010-2,32,45|warp|To Outside|-1,-1,010-1,36,95
-010-2,40,27|warp|To Second Floor|1,-1,010-2,83,28
-010-2,36,68|warp|To First Floor|-1,-1,010-2,28,24
-010-2,67,27|warp|To Third Floor|1,-1,010-2,67,72
-010-2,83,29|warp|To First Floor|1,-1,010-2,40,28
-010-2,67,73|warp|To Second Floor|1,-1,010-2,67,28
+010-2,27,24|warp|To Cellar#505|-1,-1,010-2,35,68
+010-2,32,45|warp|To Outside#506|-1,-1,010-1,36,95
+010-2,40,27|warp|To Second Floor#507|1,-1,010-2,83,28
+010-2,36,68|warp|To First Floor#508|-1,-1,010-2,28,24
+010-2,67,27|warp|To Third Floor#509|1,-1,010-2,67,72
+010-2,83,29|warp|To First Floor#510|1,-1,010-2,40,28
+010-2,67,73|warp|To Second Floor#511|1,-1,010-2,67,28
diff --git a/world/map/npc/011-1/_warps.txt b/world/map/npc/011-1/_warps.txt
index 9466fd96..cd3a3022 100644
--- a/world/map/npc/011-1/_warps.txt
+++ b/world/map/npc/011-1/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-011-1,58,92|warp|To Hermit's Cave|-1,-1,011-3,0,0
-011-1,30,61|warp|To Woodland|-1,1,014-1,108,91
-011-1,49,104|warp|To Woodland|0,-1,010-1,48,25
-011-1,124,62|warp|To Hurnscald Outskirts|-1,2,008-1,25,61
-011-1,73,9|warp|To Woodland Hills|0,-1,012-1,132,175
-011-1,38,36|warp|To Bandit Cave|-1,-1,011-6,49,100
+011-1,58,92|warp|To Hermit's Cave#375|-1,-1,011-3,0,0
+011-1,30,61|warp|To Woodland#376|-1,1,014-1,108,91
+011-1,49,104|warp|To Woodland#377|0,-1,010-1,48,25
+011-1,124,62|warp|To Hurnscald Outski#378|-1,2,008-1,25,61
+011-1,73,9|warp|To Woodland Hills#379|0,-1,012-1,132,175
+011-1,38,36|warp|To Bandit Cave#380|-1,-1,011-6,49,100
diff --git a/world/map/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt
index 73ba06f8..4f7e8ad2 100644
--- a/world/map/npc/011-3/_warps.txt
+++ b/world/map/npc/011-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hermit's Cave warps
-011-3,31,14|warp|To Lake Cave|-1,-1,011-4,73,10
+011-3,31,14|warp|To Lake Cave#326|-1,-1,011-4,73,10
diff --git a/world/map/npc/011-4/_warps.txt b/world/map/npc/011-4/_warps.txt
index c5539e85..46e36fcd 100644
--- a/world/map/npc/011-4/_warps.txt
+++ b/world/map/npc/011-4/_warps.txt
@@ -1,14 +1,14 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Lake Cave warps
-011-4,73,8|warp|To Hermit's Cave|-1,-1,011-3,31,16
-011-4,129,86|warp|To Hurnscald Cave|-1,-1,009-3,20,56
-011-4,39,35|warp|To Bandit Cave|-1,-1,011-6,47,184
-011-4,16,57|warp|To Bryant Cave|-1,-1,011-6,24,205
-011-4,89,20|warp|To Bandit Cave|-1,-1,011-6,97,168
-011-4,105,32|warp|To Bandit Cave|-1,-1,011-6,114,183
-011-4,114,61|warp|To Bandit Cave|-1,-1,011-6,123,212
-011-4,86,75|warp|To Bandit Cave|-1,-1,011-6,95,226
-011-4,62,86|warp|To Bandit Cave|-1,-1,011-6,68,234
-011-4,32,5|warp|To Small Cave|0,-1,011-6,186,181
-011-4,45,118|warp|To Small Cave|-1,-1,011-6,266,181
+011-4,73,8|warp|To Hermit's Cave#63|-1,-1,011-3,31,16
+011-4,129,86|warp|To Hurnscald Cave#64|-1,-1,009-3,20,56
+011-4,39,35|warp|To Bandit Cave#65|-1,-1,011-6,47,184
+011-4,16,57|warp|To Bryant Cave#66|-1,-1,011-6,24,205
+011-4,89,20|warp|To Bandit Cave#67|-1,-1,011-6,97,168
+011-4,105,32|warp|To Bandit Cave#68|-1,-1,011-6,114,183
+011-4,114,61|warp|To Bandit Cave#69|-1,-1,011-6,123,212
+011-4,86,75|warp|To Bandit Cave#70|-1,-1,011-6,95,226
+011-4,62,86|warp|To Bandit Cave#71|-1,-1,011-6,68,234
+011-4,32,5|warp|To Small Cave#72|0,-1,011-6,186,181
+011-4,45,118|warp|To Small Cave#73|-1,-1,011-6,266,181
diff --git a/world/map/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index 479892e5..676d16b2 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -1,25 +1,25 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Bandit Cave warps
-011-6,51,75|warp|To Small Bandit Cave|-1,-1,011-6,260,127
-011-6,61,71|warp|To Small Bandit Cave|-1,-1,011-6,270,124
-011-6,270,125|warp|To Bandit Cave|-1,-1,011-6,61,72
-011-6,260,128|warp|To Bandit Cave|-1,-1,011-6,51,76
-011-6,145,118|warp|To Bandit Cave|-1,-1,011-6,47,119
-011-6,196,26|warp|To Small Bandit Cave|-1,-1,011-6,261,46
-011-6,261,47|warp|To Second Bandit Cave|-1,-1,011-6,196,27
-011-6,271,52|warp|To Bandit Cave|-1,-1,011-6,98,31
-011-6,98,30|warp|To Small Bandit Cave|-1,-1,011-6,271,51
-011-6,47,120|warp|To Second Bandit Cave|-1,-1,011-6,145,117
-011-6,49,101|warp|To Woodland|-1,-1,011-1,38,37
-011-6,24,206|warp|To Lake Cave|-1,-1,011-4,16,58
-011-6,47,185|warp|To Lake Cave|-1,-1,011-4,39,36
-011-6,97,169|warp|To Lake Cave|-1,-1,011-4,89,21
-011-6,113,182|warp|To Lake Cave|-1,-1,011-4,106,33
-011-6,122,211|warp|To Lake Cave|-1,-1,011-4,115,62
-011-6,94,225|warp|To Lake Cave|-1,-1,011-4,87,76
-011-6,68,235|warp|To Lake Cave|-1,-1,011-4,62,87
-011-6,251,278|warp|To Lake Cave|-1,-1,011-4,111,122
-011-6,186,182|warp|To Lake Cave|0,-1,011-4,32,6
-011-6,266,182|warp|To Lake Cave|-1,-1,011-4,45,119
-011-6,174,256|warp|To Bandit Lord Cave|-1,-1,011-6,264,237
+011-6,51,75|warp|To Small Bandit Cav#452|-1,-1,011-6,260,127
+011-6,61,71|warp|To Small Bandit Cav#453|-1,-1,011-6,270,124
+011-6,270,125|warp|To Bandit Cave#454|-1,-1,011-6,61,72
+011-6,260,128|warp|To Bandit Cave#455|-1,-1,011-6,51,76
+011-6,145,118|warp|To Bandit Cave#456|-1,-1,011-6,47,119
+011-6,196,26|warp|To Small Bandit Cav#457|-1,-1,011-6,261,46
+011-6,261,47|warp|To Second Bandit Ca#458|-1,-1,011-6,196,27
+011-6,271,52|warp|To Bandit Cave#459|-1,-1,011-6,98,31
+011-6,98,30|warp|To Small Bandit Cav#460|-1,-1,011-6,271,51
+011-6,47,120|warp|To Second Bandit Ca#461|-1,-1,011-6,145,117
+011-6,49,101|warp|To Woodland#462|-1,-1,011-1,38,37
+011-6,24,206|warp|To Lake Cave#463|-1,-1,011-4,16,58
+011-6,47,185|warp|To Lake Cave#464|-1,-1,011-4,39,36
+011-6,97,169|warp|To Lake Cave#465|-1,-1,011-4,89,21
+011-6,113,182|warp|To Lake Cave#466|-1,-1,011-4,106,33
+011-6,122,211|warp|To Lake Cave#467|-1,-1,011-4,115,62
+011-6,94,225|warp|To Lake Cave#468|-1,-1,011-4,87,76
+011-6,68,235|warp|To Lake Cave#469|-1,-1,011-4,62,87
+011-6,251,278|warp|To Lake Cave#470|-1,-1,011-4,111,122
+011-6,186,182|warp|To Lake Cave#471|0,-1,011-4,32,6
+011-6,266,182|warp|To Lake Cave#472|-1,-1,011-4,45,119
+011-6,174,256|warp|To Bandit Lord Cave#473|-1,-1,011-6,264,237
diff --git a/world/map/npc/012-1/_warps.txt b/world/map/npc/012-1/_warps.txt
index c9a05a5f..1186b147 100644
--- a/world/map/npc/012-1/_warps.txt
+++ b/world/map/npc/012-1/_warps.txt
@@ -1,14 +1,14 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills warps
-012-1,51,39|warp|To Moggun Cave|-1,-1,012-3,370,43
-012-1,147,67|warp|To Moggun Cave|-1,-1,012-3,474,106
-012-1,41,48|warp|To Moggun Cave|-1,-1,012-3,353,78
-012-1,44,88|warp|To Moggun Cave|-1,-1,012-3,355,187
-012-1,92,104|warp|To Moggun Cave|-1,-1,012-3,270,111
-012-1,98,99|warp|To Small Cave|-1,-1,012-3,37,81
-012-1,109,92|warp|To Small Cave|-1,-1,012-3,80,73
-012-1,123,90|warp|To Mana Seed Cave|-1,-1,012-3,38,156
-012-1,150,61|warp|To Woodland Hills|-1,2,013-1,21,75
-012-1,132,176|warp|To Woodland|0,-1,011-1,73,10
-012-1,65,126|warp|To Moggun Cave|-1,-1,012-3,176,140
+012-1,51,39|warp|To Moggun Cave#474|-1,-1,012-3,370,43
+012-1,147,67|warp|To Moggun Cave#475|-1,-1,012-3,474,106
+012-1,41,48|warp|To Moggun Cave#476|-1,-1,012-3,353,78
+012-1,44,88|warp|To Moggun Cave#477|-1,-1,012-3,355,187
+012-1,92,104|warp|To Moggun Cave#478|-1,-1,012-3,270,111
+012-1,98,99|warp|To Small Cave#479|-1,-1,012-3,37,81
+012-1,109,92|warp|To Small Cave#480|-1,-1,012-3,80,73
+012-1,123,90|warp|To Mana Seed Cave#481|-1,-1,012-3,38,156
+012-1,150,61|warp|To Woodland Hills#482|-1,2,013-1,21,75
+012-1,132,176|warp|To Woodland#483|0,-1,011-1,73,10
+012-1,65,126|warp|To Moggun Cave#484|-1,-1,012-3,176,140
diff --git a/world/map/npc/012-3/_warps.txt b/world/map/npc/012-3/_warps.txt
index ec1138f0..c8f8cd8e 100644
--- a/world/map/npc/012-3/_warps.txt
+++ b/world/map/npc/012-3/_warps.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Moggun Cave warps
-012-3,37,82|warp|To Woodland Hills|-1,-1,012-1,98,100
-012-3,80,74|warp|To Woodland Hills|-1,-1,012-1,109,93
-012-3,38,157|warp|To Woodland Hills|-1,-1,012-1,123,91
-012-3,270,112|warp|To Woodland Hills|-1,-1,012-1,92,105
-012-3,176,138|warp|To Blossom Land|-1,-1,012-1,65,128
-012-3,355,188|warp|To Blossom Land|-1,-1,012-1,44,89
-012-3,370,44|warp|To Small Lost Land|-1,-1,012-1,51,40
-012-3,353,79|warp|To Lost Land|-1,-1,012-1,41,49
-012-3,473,106|warp|To Small Closed Hill|-1,-1,012-1,146,67
-012-3,448,61|warp|To Terranite Cave|-1,-1,012-4,193,57
+012-3,37,82|warp|To Woodland Hills#264|-1,-1,012-1,98,100
+012-3,80,74|warp|To Woodland Hills#265|-1,-1,012-1,109,93
+012-3,38,157|warp|To Woodland Hills#266|-1,-1,012-1,123,91
+012-3,270,112|warp|To Woodland Hills#267|-1,-1,012-1,92,105
+012-3,176,138|warp|To Blossom Land#268|-1,-1,012-1,65,128
+012-3,355,188|warp|To Blossom Land#269|-1,-1,012-1,44,89
+012-3,370,44|warp|To Small Lost Land#270|-1,-1,012-1,51,40
+012-3,353,79|warp|To Lost Land#271|-1,-1,012-1,41,49
+012-3,473,106|warp|To Small Closed Hil#272|-1,-1,012-1,146,67
+012-3,448,61|warp|To Terranite Cave#273|-1,-1,012-4,193,57
diff --git a/world/map/npc/012-4/_warps.txt b/world/map/npc/012-4/_warps.txt
index 4253093b..62564236 100644
--- a/world/map/npc/012-4/_warps.txt
+++ b/world/map/npc/012-4/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Terranite Cave warps
-012-4,193,58|warp|To Moggun Cave|-1,-1,012-3,448,62
-012-4,363,26|warp|To Small Cave|-1,-1,012-4,474,187
-012-4,474,188|warp|To Terranite Cave|-1,-1,012-4,363,27
+012-4,193,58|warp|To Moggun Cave#552|-1,-1,012-3,448,62
+012-4,363,26|warp|To Small Cave#553|-1,-1,012-4,474,187
+012-4,474,188|warp|To Terranite Cave#554|-1,-1,012-4,363,27
diff --git a/world/map/npc/013-1/_warps.txt b/world/map/npc/013-1/_warps.txt
index ec205807..8889e9a4 100644
--- a/world/map/npc/013-1/_warps.txt
+++ b/world/map/npc/013-1/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills warps
-013-1,125,104|warp|To Woodland Hills Cave|-1,-1,013-3,34,64
-013-1,20,76|warp|To Woodland Hills|-1,2,012-1,149,60
-013-1,46,20|warp|To Woodland Hills|2,-1,017-1,46,104
-013-1,42,90|warp|To Magic House|-1,-1,013-2,63,41
-013-1,136,52|warp|To Woodland Hills|-1,2,055-1,25,52
+013-1,125,104|warp|To Woodland Hills C#331|-1,-1,013-3,34,64
+013-1,20,76|warp|To Woodland Hills#332|-1,2,012-1,149,60
+013-1,46,20|warp|To Woodland Hills#333|2,-1,017-1,46,104
+013-1,42,90|warp|To Magic House#334|-1,-1,013-2,63,41
+013-1,136,52|warp|To Woodland Hills#335|-1,2,055-1,25,52
diff --git a/world/map/npc/013-2/_warps.txt b/world/map/npc/013-2/_warps.txt
index 21885404..9349f538 100644
--- a/world/map/npc/013-2/_warps.txt
+++ b/world/map/npc/013-2/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Magic House warps
-013-2,63,42|warp|To Outside|-1,-1,013-1,42,91
-013-2,67,36|warp|To Magic Room|-1,-1,013-2,21,40
-013-2,21,41|warp|To Magic House Entrance|-1,-1,013-2,67,37
+013-2,63,42|warp|To Outside#261|-1,-1,013-1,42,91
+013-2,67,36|warp|To Magic Room#262|-1,-1,013-2,21,40
+013-2,21,41|warp|To Magic House Entr#263|-1,-1,013-2,67,37
diff --git a/world/map/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt
index f092608a..aaa9dde1 100644
--- a/world/map/npc/013-3/_warps.txt
+++ b/world/map/npc/013-3/_warps.txt
@@ -1,30 +1,30 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills Cave warps
-013-3,28,20|warp|To Woodland Hills|-1,-1,013-1,0,0
-013-3,34,63|warp|To Woodland Hills|-1,-1,013-1,125,103
-013-3,36,96|warp|To Woodland Hills Cave|-1,-1,013-3,79,126
-013-3,79,125|warp|To Woodland Hills Cave|-1,-1,013-3,35,96
-013-3,22,115|warp|To Woodland Mining Camp|-1,-1,018-1,115,41
-013-3,139,45|warp|To Woodland Mining Camp|-1,-1,018-1,127,37
-013-3,61,179|warp|To Woodland Mining Camp|-1,-1,018-1,134,46
-013-3,69,143|warp|To Northern Mine|-1,-1,018-3,50,89
-013-3,81,103|warp|To Woodland Mining Camp|-1,-1,018-1,147,41
-013-3,177,91|warp|To Jack O Land|-1,-1,018-1,177,21
-013-3,178,44|warp|To Northern Mine|-1,-1,018-3,97,70
-013-3,169,45|warp|To Northern Mine|-1,-1,018-3,27,55
-013-3,152,28|warp|To Northern Mine|-1,-1,018-3,134,62
-013-3,123,104|warp|To Northern Mine|-1,-1,018-3,172,22
-013-3,147,104|warp|To Northern Mine|-1,-1,018-3,177,22
-013-3,158,66|warp|To Northern Mine|-1,-1,018-3,27,90
-013-3,75,51|warp|To Woodland Hills Cave|-1,-1,013-3,109,65
-013-3,109,64|warp|To Woodland Hills Cave|-1,-1,013-3,75,50
-013-3,67,51|warp|To Northern Mine|-1,-1,018-3,90,51
-013-3,71,20|warp|To Demon Mask Chest Cav|-1,-1,013-3,28,39
-013-3,28,41|warp|To Fight Cave|-1,-1,013-3,71,21
-013-3,71,42|warp|To Black Scorpion Cave|-1,-1,013-3,109,21
-013-3,109,20|warp|To Woodland Hills Cave|-1,-1,013-3,71,41
-013-3,111,42|warp|To Magic Bookshelf Cave|-1,-1,018-3,71,123
-013-3,62,100|warp|To Northern Mine|-1,-1,018-3,174,86
-013-3,68,97|warp|To Northern Mine|-1,-1,018-3,102,70
-013-3,160,103|warp|To Hurnscald Cave|-1,-1,009-3,117,20
+013-3,28,20|warp|To Woodland Hills#24|-1,-1,013-1,0,0
+013-3,34,63|warp|To Woodland Hills#25|-1,-1,013-1,125,103
+013-3,36,96|warp|To Woodland Hills C#26|-1,-1,013-3,79,126
+013-3,79,125|warp|To Woodland Hills C#27|-1,-1,013-3,35,96
+013-3,22,115|warp|To Woodland Mining #28|-1,-1,018-1,115,41
+013-3,139,45|warp|To Woodland Mining #29|-1,-1,018-1,127,37
+013-3,61,179|warp|To Woodland Mining #30|-1,-1,018-1,134,46
+013-3,69,143|warp|To Northern Mine#31|-1,-1,018-3,50,89
+013-3,81,103|warp|To Woodland Mining #32|-1,-1,018-1,147,41
+013-3,177,91|warp|To Jack O Land#33|-1,-1,018-1,177,21
+013-3,178,44|warp|To Northern Mine#34|-1,-1,018-3,97,70
+013-3,169,45|warp|To Northern Mine#35|-1,-1,018-3,27,55
+013-3,152,28|warp|To Northern Mine#36|-1,-1,018-3,134,62
+013-3,123,104|warp|To Northern Mine#37|-1,-1,018-3,172,22
+013-3,147,104|warp|To Northern Mine#38|-1,-1,018-3,177,22
+013-3,158,66|warp|To Northern Mine#39|-1,-1,018-3,27,90
+013-3,75,51|warp|To Woodland Hills C#40|-1,-1,013-3,109,65
+013-3,109,64|warp|To Woodland Hills C#41|-1,-1,013-3,75,50
+013-3,67,51|warp|To Northern Mine#42|-1,-1,018-3,90,51
+013-3,71,20|warp|To Demon Mask Chest#43|-1,-1,013-3,28,39
+013-3,28,41|warp|To Fight Cave#44|-1,-1,013-3,71,21
+013-3,71,42|warp|To Black Scorpion C#45|-1,-1,013-3,109,21
+013-3,109,20|warp|To Woodland Hills C#46|-1,-1,013-3,71,41
+013-3,111,42|warp|To Magic Bookshelf #47|-1,-1,018-3,71,123
+013-3,62,100|warp|To Northern Mine#48|-1,-1,018-3,174,86
+013-3,68,97|warp|To Northern Mine#49|-1,-1,018-3,102,70
+013-3,160,103|warp|To Hurnscald Cave#50|-1,-1,009-3,117,20
diff --git a/world/map/npc/014-1/_warps.txt b/world/map/npc/014-1/_warps.txt
index 8b987a73..ac9f04e8 100644
--- a/world/map/npc/014-1/_warps.txt
+++ b/world/map/npc/014-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-014-1,109,91|warp|To Woodland|-1,1,011-1,31,61
-014-1,93,58|warp|To Woodland Cave|-1,-1,014-3,57,172
-014-1,76,38|warp|To Woodland Cave|-1,-1,014-3,35,33
+014-1,109,91|warp|To Woodland#402|-1,1,011-1,31,61
+014-1,93,58|warp|To Woodland Cave#403|-1,-1,014-3,57,172
+014-1,76,38|warp|To Woodland Cave#404|-1,-1,014-3,35,33
diff --git a/world/map/npc/014-3/_warps.txt b/world/map/npc/014-3/_warps.txt
index 0ac1df1f..68cf4739 100644
--- a/world/map/npc/014-3/_warps.txt
+++ b/world/map/npc/014-3/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Cave warps
-014-3,35,32|warp|To Woodland|-1,-1,014-1,76,39
-014-3,57,173|warp|To Woodland|0,-1,014-1,93,59
-014-3,91,108|warp|To Second Cave|-1,-1,014-3,103,53
-014-3,103,54|warp|To First Cave|-1,-1,014-3,91,109
+014-3,35,32|warp|To Woodland#533|-1,-1,014-1,76,39
+014-3,57,173|warp|To Woodland#534|0,-1,014-1,93,59
+014-3,91,108|warp|To Second Cave#535|-1,-1,014-3,103,53
+014-3,103,54|warp|To First Cave#536|-1,-1,014-3,91,109
diff --git a/world/map/npc/015-1/_warps.txt b/world/map/npc/015-1/_warps.txt
index 679f1883..c4693f67 100644
--- a/world/map/npc/015-1/_warps.txt
+++ b/world/map/npc/015-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-015-1,93,55|warp|To Woodland|-1,0,010-1,14,54
-015-1,59,31|warp|To Cat's Cave|-1,-1,015-3,31,42
-015-1,59,101|warp|To Woodland Swamp|2,-1,025-1,89,20
+015-1,93,55|warp|To Woodland#593|-1,0,010-1,14,54
+015-1,59,31|warp|To Cat's Cave#594|-1,-1,015-3,31,42
+015-1,59,101|warp|To Woodland Swamp#595|2,-1,025-1,89,20
diff --git a/world/map/npc/015-3/_warps.txt b/world/map/npc/015-3/_warps.txt
index fea56f7e..9aac8fd6 100644
--- a/world/map/npc/015-3/_warps.txt
+++ b/world/map/npc/015-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cat's Cave warps
-015-3,31,43|warp|To Woodland|-1,-1,015-1,59,32
+015-3,31,43|warp|To Woodland#147|-1,-1,015-1,59,32
diff --git a/world/map/npc/016-1/_warps.txt b/world/map/npc/016-1/_warps.txt
index 7437c416..f20d120f 100644
--- a/world/map/npc/016-1/_warps.txt
+++ b/world/map/npc/016-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-016-1,56,18|warp|To Woodland|1,-1,010-1,56,104
-016-1,20,53|warp|To Woodland Swamp|-1,1,025-1,129,58
+016-1,56,18|warp|To Woodland#415|1,-1,010-1,56,104
+016-1,20,53|warp|To Woodland Swamp#416|-1,1,025-1,129,58
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index bddbb64d..a4f2ddf3 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -1,11 +1,11 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills warps
-017-1,46,105|warp|To Woodland Hills|2,-1,013-1,45,21
-017-1,43,32|warp|To Theater|-1,-1,017-2,26,30
-017-1,76,31|warp|To Woodland Hills Labyr|-1,-1,017-3,69,68
-017-1,98,20|warp|To Woodland Hills Labyr|-1,-1,017-3,83,52
-017-1,97,31|warp|To Woodland Hills Labyr|-1,-1,017-3,76,65
-017-1,168,90|warp|To Mirak's House|-1,-1,056-2,34,30
-017-1,188,104|warp|To Woodland Hills|-1,-1,055-1,74,21
-017-1,182,16|warp|To Deep Snow Forest|1,-1,045-1,25,178
+017-1,46,105|warp|To Woodland Hills#405|2,-1,013-1,45,21
+017-1,43,32|warp|To Theater#406|-1,-1,017-2,26,30
+017-1,76,31|warp|To Woodland Hills L#407|-1,-1,017-3,69,68
+017-1,98,20|warp|To Woodland Hills L#408|-1,-1,017-3,83,52
+017-1,97,31|warp|To Woodland Hills L#409|-1,-1,017-3,76,65
+017-1,168,90|warp|To Mirak's House#410|-1,-1,056-2,34,30
+017-1,188,104|warp|To Woodland Hills#411|-1,-1,055-1,74,21
+017-1,182,16|warp|To Deep Snow Forest#412|1,-1,045-1,25,178
diff --git a/world/map/npc/017-2/_warps.txt b/world/map/npc/017-2/_warps.txt
index 8f26141c..e8956775 100644
--- a/world/map/npc/017-2/_warps.txt
+++ b/world/map/npc/017-2/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Theater warps
-017-2,26,31|warp|To Outside|-1,-1,017-1,43,33
-017-2,26,21|warp|To Center Trapdoor Back|-1,-1,017-9,26,27
+017-2,26,31|warp|To Outside#384|-1,-1,017-1,43,33
+017-2,26,21|warp|To Center Trapdoor #385|-1,-1,017-9,26,27
diff --git a/world/map/npc/017-3/_warps.txt b/world/map/npc/017-3/_warps.txt
index 53bf76eb..0cbf1b52 100644
--- a/world/map/npc/017-3/_warps.txt
+++ b/world/map/npc/017-3/_warps.txt
@@ -1,12 +1,12 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Cave warps
-017-3,69,69|warp|To Woodland Hills|-1,-1,017-1,76,32
-017-3,83,53|warp|To Theater Hill|-1,-1,017-1,98,21
-017-3,76,64|warp|To Woodland Hills Labyr|-1,-1,017-1,98,30
-017-3,63,26|warp|To Deeper Labyrinth|-1,-1,017-4,52,24
-017-3,29,48|warp|To Deeper Labyrinth|-1,-1,017-4,30,48
-017-3,69,52|warp|To Deeper Labyrinth|-1,-1,017-4,91,27
-017-3,58,60|warp|To Deeper Labyrinth|-1,-1,017-4,83,40
-017-3,32,70|warp|To Deeper Labyrinth|0,-1,017-4,123,27
-017-3,82,77|warp|To Deeper Cave|1,-1,017-4,166,27
+017-3,69,69|warp|To Woodland Hills#283|-1,-1,017-1,76,32
+017-3,83,53|warp|To Theater Hill#284|-1,-1,017-1,98,21
+017-3,76,64|warp|To Woodland Hills L#285|-1,-1,017-1,98,30
+017-3,63,26|warp|To Deeper Labyrinth#286|-1,-1,017-4,52,24
+017-3,29,48|warp|To Deeper Labyrinth#287|-1,-1,017-4,30,48
+017-3,69,52|warp|To Deeper Labyrinth#288|-1,-1,017-4,91,27
+017-3,58,60|warp|To Deeper Labyrinth#289|-1,-1,017-4,83,40
+017-3,32,70|warp|To Deeper Labyrinth#290|0,-1,017-4,123,27
+017-3,82,77|warp|To Deeper Cave#291|1,-1,017-4,166,27
diff --git a/world/map/npc/017-4/_warps.txt b/world/map/npc/017-4/_warps.txt
index b06a8db2..d900da36 100644
--- a/world/map/npc/017-4/_warps.txt
+++ b/world/map/npc/017-4/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hideout warps
-017-4,201,25|warp|To Labyrinth|-1,-1,017-4,173,46
-017-4,91,26|warp|To Cave|-1,-1,017-3,69,51
-017-4,123,26|warp|To Cave|-1,-1,017-3,32,69
-017-4,166,26|warp|To Cave|-1,-1,017-3,82,76
-017-4,30,47|warp|To Cave|-1,-1,017-3,29,47
-017-4,52,25|warp|To Cave|-1,-1,017-3,63,27
-017-4,83,41|warp|To Cave|-1,-1,017-3,58,61
+017-4,201,25|warp|To Labyrinth#394|-1,-1,017-4,173,46
+017-4,91,26|warp|To Cave#395|-1,-1,017-3,69,51
+017-4,123,26|warp|To Cave#396|-1,-1,017-3,32,69
+017-4,166,26|warp|To Cave#397|-1,-1,017-3,82,76
+017-4,30,47|warp|To Cave#398|-1,-1,017-3,29,47
+017-4,52,25|warp|To Cave#399|-1,-1,017-3,63,27
+017-4,83,41|warp|To Cave#400|-1,-1,017-3,58,61
diff --git a/world/map/npc/017-9/_warps.txt b/world/map/npc/017-9/_warps.txt
index f092c954..3515d56f 100644
--- a/world/map/npc/017-9/_warps.txt
+++ b/world/map/npc/017-9/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Backstage warps
-017-9,22,20|warp|To Nivalis|-1,-1,020-1,60,75
-017-9,26,21|warp|To Hurnscald|-1,-1,009-1,43,45
-017-9,30,20|warp|To Tumlishar|-1,-1,001-1,55,118
-017-9,26,28|warp|To second warpzone|-1,-1,017-2,26,23
-017-9,31,28|warp|To Crypt|-1,-1,027-2,118,109
+017-9,22,20|warp|To Nivalis#7|-1,-1,020-1,60,75
+017-9,26,21|warp|To Hurnscald#8|-1,-1,009-1,43,45
+017-9,30,20|warp|To Tumlishar#9|-1,-1,001-1,55,118
+017-9,26,28|warp|To second warpzone#10|-1,-1,017-2,26,23
+017-9,31,28|warp|To Crypt#11|-1,-1,027-2,118,109
diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt
index 962433fb..f485e397 100644
--- a/world/map/npc/018-1/_warps.txt
+++ b/world/map/npc/018-1/_warps.txt
@@ -1,20 +1,20 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Mining Camp warps
-018-1,79,59|warp|To Northern Mine|0,-1,018-3,100,132
-018-1,112,61|warp|To Bat Cave|-1,-1,018-3,44,38
-018-1,115,40|warp|To Woodland Hills Cave|-1,-1,013-3,22,114
-018-1,128,56|warp|To Northern Mine|-1,-1,018-3,49,99
-018-1,90,42|warp|To Northern Mine|-1,-1,018-3,123,166
-018-1,69,54|warp|To Northern Mine|-1,-1,018-3,70,105
-018-1,127,36|warp|To Woodland Hills Cave|-1,-1,013-3,139,44
-018-1,134,45|warp|To Woodland Hills Cave|-1,-1,013-3,61,178
-018-1,147,40|warp|To Woodland Hills Cave|-1,-1,013-3,81,102
-018-1,153,46|warp|To Northern Mine|-1,-1,018-3,145,162
-018-1,158,34|warp|To Northern Mine|-1,-1,018-3,64,103
-018-1,162,44|warp|To Northern Mine|-1,-1,018-3,29,166
-018-1,177,20|warp|To Jack O Cave|-1,-1,013-3,177,90
-018-1,65,73|warp|To Woodland Mining Camp|-1,-1,018-2,50,28
-018-1,79,98|warp|To Hurnscald Outskirts|2,-1,008-1,78,18
-018-1,64,70|warp|To Woodland Mining Camp|-1,-1,018-2,41,21
-018-1,78,34|warp|To Northern Mine|-1,-1,018-3,107,147
+018-1,79,59|warp|To Northern Mine#309|0,-1,018-3,100,132
+018-1,112,61|warp|To Bat Cave#310|-1,-1,018-3,44,38
+018-1,115,40|warp|To Woodland Hills C#311|-1,-1,013-3,22,114
+018-1,128,56|warp|To Northern Mine#312|-1,-1,018-3,49,99
+018-1,90,42|warp|To Northern Mine#313|-1,-1,018-3,123,166
+018-1,69,54|warp|To Northern Mine#314|-1,-1,018-3,70,105
+018-1,127,36|warp|To Woodland Hills C#315|-1,-1,013-3,139,44
+018-1,134,45|warp|To Woodland Hills C#316|-1,-1,013-3,61,178
+018-1,147,40|warp|To Woodland Hills C#317|-1,-1,013-3,81,102
+018-1,153,46|warp|To Northern Mine#318|-1,-1,018-3,145,162
+018-1,158,34|warp|To Northern Mine#319|-1,-1,018-3,64,103
+018-1,162,44|warp|To Northern Mine#320|-1,-1,018-3,29,166
+018-1,177,20|warp|To Jack O Cave#321|-1,-1,013-3,177,90
+018-1,65,73|warp|To Woodland Mining #322|-1,-1,018-2,50,28
+018-1,79,98|warp|To Hurnscald Outski#323|2,-1,008-1,78,18
+018-1,64,70|warp|To Woodland Mining #324|-1,-1,018-2,41,21
+018-1,78,34|warp|To Northern Mine#325|-1,-1,018-3,107,147
diff --git a/world/map/npc/018-2/_warps.txt b/world/map/npc/018-2/_warps.txt
index d4b61798..bb4b31a2 100644
--- a/world/map/npc/018-2/_warps.txt
+++ b/world/map/npc/018-2/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Mining Camp Indoor warps
-018-2,50,29|warp|To Outside|-1,-1,018-1,65,74
-018-2,41,20|warp|To Outside|-1,-1,018-1,64,69
-018-2,20,24|warp|To Bottom Floor|-1,-1,018-2,112,26
-018-2,112,25|warp|To First Floor|-1,-1,018-2,20,23
-018-2,21,28|warp|To Second Floor|0,-1,018-2,79,25
-018-2,79,26|warp|To First Floor|0,-1,018-2,21,29
-018-2,114,19|warp|To Northern Mine|-1,-1,018-3,177,55
+018-2,50,29|warp|To Outside#0|-1,-1,018-1,65,74
+018-2,41,20|warp|To Outside#1|-1,-1,018-1,64,69
+018-2,20,24|warp|To Bottom Floor#2|-1,-1,018-2,112,26
+018-2,112,25|warp|To First Floor#3|-1,-1,018-2,20,23
+018-2,21,28|warp|To Second Floor#4|0,-1,018-2,79,25
+018-2,79,26|warp|To First Floor#5|0,-1,018-2,21,29
+018-2,114,19|warp|To Northern Mine#6|-1,-1,018-3,177,55
diff --git a/world/map/npc/018-3/_warps.txt b/world/map/npc/018-3/_warps.txt
index e090848b..249a3216 100644
--- a/world/map/npc/018-3/_warps.txt
+++ b/world/map/npc/018-3/_warps.txt
@@ -1,25 +1,25 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Northern Mines warps
-018-3,100,133|warp|To Woodland Hills|0,-1,018-1,79,60
-018-3,44,39|warp|To Woodland Mining Camp|-1,-1,018-1,112,62
-018-3,49,100|warp|To Woodland Hills|-1,-1,018-1,128,57
-018-3,123,167|warp|To Woodland Mining Camp|-1,-1,018-1,90,43
-018-3,70,106|warp|To Woodland Hills|-1,-1,018-1,69,55
-018-3,50,88|warp|To Woodland Hills Cave|-1,-1,013-3,69,142
-018-3,145,163|warp|To Woodland Mining Camp|-1,-1,018-1,153,47
-018-3,64,104|warp|To Woodland Hills|-1,-1,018-1,158,35
-018-3,29,167|warp|To Woodland Mining Camp|-1,-1,018-1,162,45
-018-3,97,69|warp|To Fight Cave|-1,-1,013-3,178,43
-018-3,27,54|warp|To Woodland Hills Cave|-1,-1,013-3,169,44
-018-3,134,63|warp|To Fight Cave|-1,-1,013-3,152,29
-018-3,177,56|warp|To Woodland Mining Camp|-1,-1,018-2,114,20
-018-3,172,21|warp|To Woodland Hills Cave|-1,-1,013-3,123,103
-018-3,177,21|warp|To Jack O Cave|-1,-1,013-3,147,103
-018-3,27,91|warp|To Jack O Cave|-1,-1,013-3,158,67
-018-3,90,50|warp|To Fight Cave|-1,-1,013-3,67,50
-018-3,71,122|warp|To Black Scorpion Cave|-1,-1,013-3,111,41
-018-3,174,85|warp|To Woodland Hills Cave|-1,-1,013-3,62,99
-018-3,102,69|warp|To Woodland Hills Cave|-1,-1,013-3,68,96
-018-3,179,181|warp|To Hurnscald Cave|-1,-1,009-3,157,31
-018-3,107,146|warp|To Woodland Mining Camp|-1,-1,018-1,78,33
+018-3,100,133|warp|To Woodland Hills#148|0,-1,018-1,79,60
+018-3,44,39|warp|To Woodland Mining #149|-1,-1,018-1,112,62
+018-3,49,100|warp|To Woodland Hills#150|-1,-1,018-1,128,57
+018-3,123,167|warp|To Woodland Mining #151|-1,-1,018-1,90,43
+018-3,70,106|warp|To Woodland Hills#152|-1,-1,018-1,69,55
+018-3,50,88|warp|To Woodland Hills C#153|-1,-1,013-3,69,142
+018-3,145,163|warp|To Woodland Mining #154|-1,-1,018-1,153,47
+018-3,64,104|warp|To Woodland Hills#155|-1,-1,018-1,158,35
+018-3,29,167|warp|To Woodland Mining #156|-1,-1,018-1,162,45
+018-3,97,69|warp|To Fight Cave#157|-1,-1,013-3,178,43
+018-3,27,54|warp|To Woodland Hills C#158|-1,-1,013-3,169,44
+018-3,134,63|warp|To Fight Cave#159|-1,-1,013-3,152,29
+018-3,177,56|warp|To Woodland Mining #160|-1,-1,018-2,114,20
+018-3,172,21|warp|To Woodland Hills C#161|-1,-1,013-3,123,103
+018-3,177,21|warp|To Jack O Cave#162|-1,-1,013-3,147,103
+018-3,27,91|warp|To Jack O Cave#163|-1,-1,013-3,158,67
+018-3,90,50|warp|To Fight Cave#164|-1,-1,013-3,67,50
+018-3,71,122|warp|To Black Scorpion C#165|-1,-1,013-3,111,41
+018-3,174,85|warp|To Woodland Hills C#166|-1,-1,013-3,62,99
+018-3,102,69|warp|To Woodland Hills C#167|-1,-1,013-3,68,96
+018-3,179,181|warp|To Hurnscald Cave#168|-1,-1,009-3,157,31
+018-3,107,146|warp|To Woodland Mining #169|-1,-1,018-1,78,33
diff --git a/world/map/npc/019-1/_warps.txt b/world/map/npc/019-1/_warps.txt
index bd8ef060..9c8951e3 100644
--- a/world/map/npc/019-1/_warps.txt
+++ b/world/map/npc/019-1/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Field warps
-019-1,70,21|warp|To Nivalis|2,-1,020-1,70,127
-019-1,96,40|warp|To Snow Cave|-1,-1,019-3,98,30
-019-1,38,75|warp|To Snow Cave|-1,-1,019-3,39,101
-019-1,21,70|warp|To Snow Path|-1,0,033-1,118,69
+019-1,70,21|warp|To Nivalis#139|2,-1,020-1,70,127
+019-1,96,40|warp|To Snow Cave#140|-1,-1,019-3,98,30
+019-1,38,75|warp|To Snow Cave#141|-1,-1,019-3,39,101
+019-1,21,70|warp|To Snow Path#142|-1,0,033-1,118,69
diff --git a/world/map/npc/019-3/_warps.txt b/world/map/npc/019-3/_warps.txt
index 6f5edb73..f5c6bf8f 100644
--- a/world/map/npc/019-3/_warps.txt
+++ b/world/map/npc/019-3/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Cave warps
-019-3,40,102|warp|To Snow Field|-1,-1,019-1,37,74
-019-3,98,29|warp|To Snow Field|-1,-1,019-1,96,39
-019-3,80,103|warp|To Frozen Lake|-1,-1,030-3,54,70
+019-3,40,102|warp|To Snow Field#82|-1,-1,019-1,37,74
+019-3,98,29|warp|To Snow Field#83|-1,-1,019-1,96,39
+019-3,80,103|warp|To Frozen Lake#84|-1,-1,030-3,54,70
diff --git a/world/map/npc/019-4/_warps.txt b/world/map/npc/019-4/_warps.txt
index 9a1fd50a..d32ca463 100644
--- a/world/map/npc/019-4/_warps.txt
+++ b/world/map/npc/019-4/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Cave warps
-019-4,74,28|warp|To Snow Hills|-1,-1,047-1,154,93
-019-4,25,124|warp|To Snow Hills|0,-1,046-1,62,27
+019-4,74,28|warp|To Snow Hills#60|-1,-1,047-1,154,93
+019-4,25,124|warp|To Snow Hills#61|0,-1,046-1,62,27
diff --git a/world/map/npc/020-1/_warps.txt b/world/map/npc/020-1/_warps.txt
index 2a52ade5..8bdf0acd 100644
--- a/world/map/npc/020-1/_warps.txt
+++ b/world/map/npc/020-1/_warps.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis warps
-020-1,76,38|warp|To Ice Cave|1,-1,020-3,31,26
-020-1,47,48|warp|To Nivalis Indoor|-1,-1,020-2,25,35
-020-1,66,52|warp|To Nivalis House|-1,-1,020-2,72,70
-020-1,64,82|warp|To Nivalis Inn|-1,-1,020-2,111,32
-020-1,86,46|warp|To Armory|-1,-1,020-2,32,73
-020-1,57,91|warp|To Nivalis Shop|-1,-1,020-2,65,23
-020-1,70,128|warp|To Snow Field|2,-1,019-1,70,22
-020-1,107,55|warp|To Nivalis Port|-1,-1,031-1,38,55
-020-1,59,45|warp|To Nivalis Storage|-1,-1,020-2,127,68
-020-1,33,93|warp|To Christmas Inn|-1,-1,030-2,88,50
+020-1,76,38|warp|To Ice Cave#604|1,-1,020-3,31,26
+020-1,47,48|warp|To Nivalis Indoor#605|-1,-1,020-2,25,35
+020-1,66,52|warp|To Nivalis House#606|-1,-1,020-2,72,70
+020-1,64,82|warp|To Nivalis Inn#607|-1,-1,020-2,111,32
+020-1,86,46|warp|To Armory#608|-1,-1,020-2,32,73
+020-1,57,91|warp|To Nivalis Shop#609|-1,-1,020-2,65,23
+020-1,70,128|warp|To Snow Field#610|2,-1,019-1,70,22
+020-1,107,55|warp|To Nivalis Port#611|-1,-1,031-1,38,55
+020-1,59,45|warp|To Nivalis Storage#612|-1,-1,020-2,127,68
+020-1,33,93|warp|To Christmas Inn#613|-1,-1,030-2,88,50
diff --git a/world/map/npc/020-2/_warps.txt b/world/map/npc/020-2/_warps.txt
index c4504a4f..34f8911b 100644
--- a/world/map/npc/020-2/_warps.txt
+++ b/world/map/npc/020-2/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis Indoor warps
-020-2,25,36|warp|To Outside|-1,-1,020-1,47,49
-020-2,64,23|warp|To Outside|-1,-1,020-1,56,91
-020-2,111,33|warp|To Outside|-1,-1,020-1,64,83
-020-2,32,74|warp|To Outside|-1,-1,020-1,86,47
-020-2,72,71|warp|To Outside|-1,-1,020-1,66,53
-020-2,127,69|warp|To Outside|-1,-1,020-1,59,46
+020-2,25,36|warp|To Outside#444|-1,-1,020-1,47,49
+020-2,64,23|warp|To Outside#445|-1,-1,020-1,56,91
+020-2,111,33|warp|To Outside#446|-1,-1,020-1,64,83
+020-2,32,74|warp|To Outside#447|-1,-1,020-1,86,47
+020-2,72,71|warp|To Outside#448|-1,-1,020-1,66,53
+020-2,127,69|warp|To Outside#449|-1,-1,020-1,59,46
diff --git a/world/map/npc/020-3/_warps.txt b/world/map/npc/020-3/_warps.txt
index d988159a..e7fb0106 100644
--- a/world/map/npc/020-3/_warps.txt
+++ b/world/map/npc/020-3/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Ice cave warps
-020-3,31,25|warp|To Nivalis|-1,-1,020-1,76,37
-020-3,25,22|warp|To Ice Cave|-1,-1,020-3,97,101
-020-3,97,99|warp|To Ice Entrance|-1,-1,020-3,25,24
-020-3,28,57|warp|To Ice Cave|-1,-1,020-3,33,99
-020-3,49,33|warp|To Ice Cave|-1,-1,020-3,110,56
-020-3,33,98|warp|To Ice Entrance|-1,-1,020-3,28,56
-020-3,110,57|warp|To Ice Entrance|-1,-1,020-3,49,34
+020-3,31,25|warp|To Nivalis#132|-1,-1,020-1,76,37
+020-3,25,22|warp|To Ice Cave#133|-1,-1,020-3,97,101
+020-3,97,99|warp|To Ice Entrance#134|-1,-1,020-3,25,24
+020-3,28,57|warp|To Ice Cave#135|-1,-1,020-3,33,99
+020-3,49,33|warp|To Ice Cave#136|-1,-1,020-3,110,56
+020-3,33,98|warp|To Ice Entrance#137|-1,-1,020-3,28,56
+020-3,110,57|warp|To Ice Entrance#138|-1,-1,020-3,49,34
diff --git a/world/map/npc/021-3/_warps.txt b/world/map/npc/021-3/_warps.txt
index 41d30dee..dbe2515b 100644
--- a/world/map/npc/021-3/_warps.txt
+++ b/world/map/npc/021-3/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Central Tulimshar Sewers warps
-021-3,143,127|warp|To Central Tulimshar|-1,-1,001-1,117,109
-021-3,57,99|warp|To Central Tulimshar|-1,-1,001-1,60,84
-021-3,29,62|warp|To Beach|-1,-1,001-1,28,45
-021-3,44,143|warp|To Sea Cave|-1,-1,004-3,80,23
+021-3,143,127|warp|To Central Tulimsha#555|-1,-1,001-1,117,109
+021-3,57,99|warp|To Central Tulimsha#556|-1,-1,001-1,60,84
+021-3,29,62|warp|To Beach#557|-1,-1,001-1,28,45
+021-3,44,143|warp|To Sea Cave#558|-1,-1,004-3,80,23
diff --git a/world/map/npc/025-1/_warps.txt b/world/map/npc/025-1/_warps.txt
index eaa15fe5..ba2eb607 100644
--- a/world/map/npc/025-1/_warps.txt
+++ b/world/map/npc/025-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Swamp warps
-025-1,19,66|warp|To Swamp|-1,-1,026-1,128,66
-025-1,90,19|warp|To Woodland|2,-1,015-1,59,100
-025-1,130,58|warp|To Woodland|-1,1,016-1,21,53
+025-1,19,66|warp|To Swamp#418|-1,-1,026-1,128,66
+025-1,90,19|warp|To Woodland#419|2,-1,015-1,59,100
+025-1,130,58|warp|To Woodland#420|-1,1,016-1,21,53
diff --git a/world/map/npc/025-3/_warps.txt b/world/map/npc/025-3/_warps.txt
index 1e6e605c..8794e7a3 100644
--- a/world/map/npc/025-3/_warps.txt
+++ b/world/map/npc/025-3/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rossy Main Hall warps
-025-3,112,98|warp|To Woodland Swamp|1,-1,025-1,42,81
-025-3,105,86|warp|To Clauquer's Cave|-1,-1,025-4,28,36
+025-3,112,98|warp|To Woodland Swamp#391|1,-1,025-1,42,81
+025-3,105,86|warp|To Clauquer's Cave#392|-1,-1,025-4,28,36
diff --git a/world/map/npc/025-4/_warps.txt b/world/map/npc/025-4/_warps.txt
index 04b6aa8c..bc60aa01 100644
--- a/world/map/npc/025-4/_warps.txt
+++ b/world/map/npc/025-4/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rossy Battle Caves warps
-025-4,28,37|warp|To Rossy Main Hall|-1,-1,025-3,105,87
+025-4,28,37|warp|To Rossy Main Hall#597|-1,-1,025-3,105,87
diff --git a/world/map/npc/026-1/_warps.txt b/world/map/npc/026-1/_warps.txt
index 34685699..0ff30a2c 100644
--- a/world/map/npc/026-1/_warps.txt
+++ b/world/map/npc/026-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Swamp warps
-026-1,63,16|warp|To Graveyard|-1,-1,027-1,63,105
-026-1,129,66|warp|To Woodland Swamp|-1,-1,025-1,20,66
+026-1,63,16|warp|To Graveyard#342|-1,-1,027-1,63,105
+026-1,129,66|warp|To Woodland Swamp#343|-1,-1,025-1,20,66
diff --git a/world/map/npc/027-1/_warps.txt b/world/map/npc/027-1/_warps.txt
index aa1fbf7b..36ff4c45 100644
--- a/world/map/npc/027-1/_warps.txt
+++ b/world/map/npc/027-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Graveyard warps
-027-1,88,84|warp|To Caretaker's House|-1,-1,027-2,26,33
-027-1,63,106|warp|To Swamp|-1,-1,026-1,63,17
+027-1,88,84|warp|To Caretaker's Hous#179|-1,-1,027-2,26,33
+027-1,63,106|warp|To Swamp#180|-1,-1,026-1,63,17
diff --git a/world/map/npc/027-2/_warps.txt b/world/map/npc/027-2/_warps.txt
index 1b0edb5b..5cd8fb0f 100644
--- a/world/map/npc/027-2/_warps.txt
+++ b/world/map/npc/027-2/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Graveyard Indoor warps
-027-2,26,34|warp|To Outside|-1,-1,027-1,88,85
-027-2,128,35|warp|To Second Floor|0,-1,027-2,75,93
-027-2,76,95|warp|To First Floor|0,-1,027-2,128,36
-027-2,106,46|warp|To Outside|0,-1,027-1,68,89
-027-2,113,111|warp|To Graveyard|4,-1,027-1,28,68
-027-2,113,78|warp|To Crypts Basement|4,-1,027-3,25,68
+027-2,26,34|warp|To Outside#499|-1,-1,027-1,88,85
+027-2,128,35|warp|To Second Floor#500|0,-1,027-2,75,93
+027-2,76,95|warp|To First Floor#501|0,-1,027-2,128,36
+027-2,106,46|warp|To Outside#502|0,-1,027-1,68,89
+027-2,113,111|warp|To Graveyard#503|4,-1,027-1,28,68
+027-2,113,78|warp|To Crypts Basement#504|4,-1,027-3,25,68
diff --git a/world/map/npc/027-3/_warps.txt b/world/map/npc/027-3/_warps.txt
index 6206e3ce..04c55f4d 100644
--- a/world/map/npc/027-3/_warps.txt
+++ b/world/map/npc/027-3/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Basement warps
-027-3,26,67|warp|To Crypts Entrance|2,-1,027-2,112,77
-027-3,126,98|warp|To Crypts Sub-Basement |1,-1,027-4,125,18
+027-3,26,67|warp|To Crypts Entrance#277|2,-1,027-2,112,77
+027-3,126,98|warp|To Crypts Sub-Basem#278|1,-1,027-4,125,18
diff --git a/world/map/npc/027-4/_warps.txt b/world/map/npc/027-4/_warps.txt
index 2c5fa785..e8a6af74 100644
--- a/world/map/npc/027-4/_warps.txt
+++ b/world/map/npc/027-4/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement One warps
-027-4,125,17|warp|To Crypts Basement|3,-1,027-3,125,98
-027-4,22,98|warp|To Crypts Sub-Basement |2,-1,027-5,124,18
+027-4,125,17|warp|To Crypts Basement#441|3,-1,027-3,125,98
+027-4,22,98|warp|To Crypts Sub-Basem#442|2,-1,027-5,124,18
diff --git a/world/map/npc/027-5/_warps.txt b/world/map/npc/027-5/_warps.txt
index 4f0309f7..7b6f34a0 100644
--- a/world/map/npc/027-5/_warps.txt
+++ b/world/map/npc/027-5/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two warps
-027-5,125,17|warp|To Crypts Sub-Basement |3,-1,027-4,21,97
+027-5,125,17|warp|To Crypts Sub-Basem#443|3,-1,027-4,21,97
diff --git a/world/map/npc/028-1/_warps.txt b/world/map/npc/028-1/_warps.txt
index 0b20b6f9..e0dae580 100644
--- a/world/map/npc/028-1/_warps.txt
+++ b/world/map/npc/028-1/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// GM Island warps
-028-1,120,125|warp|To Easter Island Cave|-1,-1,028-3,33,77
+028-1,120,125|warp|To Easter Island Ca#421|-1,-1,028-3,33,77
diff --git a/world/map/npc/028-3/_warps.txt b/world/map/npc/028-3/_warps.txt
index cc19bd75..ac5ea92d 100644
--- a/world/map/npc/028-3/_warps.txt
+++ b/world/map/npc/028-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// GM Island Cave warps
-028-3,33,78|warp|To Easter Island|-1,-1,028-1,120,126
+028-3,33,78|warp|To Easter Island#401|-1,-1,028-1,120,126
diff --git a/world/map/npc/029-1/_warps.txt b/world/map/npc/029-1/_warps.txt
index acaf85f1..ccd2a3a9 100644
--- a/world/map/npc/029-1/_warps.txt
+++ b/world/map/npc/029-1/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Candor Island warps
-029-1,40,88|warp|To Valon's House|-1,-1,029-2,29,61
-029-1,44,83|warp|To Storeroom|-1,-1,029-2,22,92
-029-1,52,84|warp|To The Magic Shack|-1,-1,029-2,103,61
-029-1,58,79|warp|To Two Arms|-1,-1,029-2,94,30
+029-1,40,88|warp|To Valon's House#279|-1,-1,029-2,29,61
+029-1,44,83|warp|To Storeroom#280|-1,-1,029-2,22,92
+029-1,52,84|warp|To The Magic Shack#281|-1,-1,029-2,103,61
+029-1,58,79|warp|To Two Arms#282|-1,-1,029-2,94,30
diff --git a/world/map/npc/029-2/_warps.txt b/world/map/npc/029-2/_warps.txt
index 77fee9b3..9650dd1a 100644
--- a/world/map/npc/029-2/_warps.txt
+++ b/world/map/npc/029-2/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Candor Island Indoor warps
-029-2,29,62|warp|To Outside|-1,-1,029-1,40,89
-029-2,22,93|warp|To Outside|-1,-1,029-1,44,84
-029-2,112,84|warp|To Bedroom|-1,-1,029-2,44,30
-029-2,103,62|warp|To Outside|-1,-1,029-1,52,85
-029-2,94,31|warp|To Outside|-1,-1,029-1,58,80
+029-2,29,62|warp|To Outside#127|-1,-1,029-1,40,89
+029-2,22,93|warp|To Outside#128|-1,-1,029-1,44,84
+029-2,112,84|warp|To Bedroom#129|-1,-1,029-2,44,30
+029-2,103,62|warp|To Outside#130|-1,-1,029-1,52,85
+029-2,94,31|warp|To Outside#131|-1,-1,029-1,58,80
diff --git a/world/map/npc/030-2/_warps.txt b/world/map/npc/030-2/_warps.txt
index a004a838..be4c8e39 100644
--- a/world/map/npc/030-2/_warps.txt
+++ b/world/map/npc/030-2/_warps.txt
@@ -1,18 +1,18 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Christmas Inn warps
-030-2,88,51|warp|To Outside|-1,-1,020-1,33,94
-030-2,72,31|warp|To Basement|-1,-1,030-2,51,31
-030-2,194,68|warp|To Fourth Floor|-1,-1,030-2,78,88
-030-2,52,31|warp|To First Floor|-1,-1,030-2,73,31
-030-2,75,19|warp|To Second Floor|0,-1,030-2,127,50
-030-2,102,19|warp|To Second Floor|0,-1,030-2,153,50
-030-2,127,51|warp|To First Floor|0,-1,030-2,75,20
-030-2,154,51|warp|To First Floor|0,-1,030-2,101,20
-030-2,156,24|warp|To Third Floor|-1,0,030-2,21,78
-030-2,20,78|warp|To Second Floor|-1,0,030-2,155,24
-030-2,42,105|warp|To Fourth Floor|0,-1,030-2,93,74
-030-2,94,73|warp|To Third Floor|0,-1,030-2,41,104
-030-2,102,73|warp|To Fifth Floor|0,-1,030-2,127,104
-030-2,127,105|warp|To Fourth Floor|0,-1,030-2,102,74
-030-2,78,87|warp|To Private Room|-1,-1,030-2,194,67
+030-2,88,51|warp|To Outside#292|-1,-1,020-1,33,94
+030-2,72,31|warp|To Basement#293|-1,-1,030-2,51,31
+030-2,194,68|warp|To Fourth Floor#294|-1,-1,030-2,78,88
+030-2,52,31|warp|To First Floor#295|-1,-1,030-2,73,31
+030-2,75,19|warp|To Second Floor#296|0,-1,030-2,127,50
+030-2,102,19|warp|To Second Floor#297|0,-1,030-2,153,50
+030-2,127,51|warp|To First Floor#298|0,-1,030-2,75,20
+030-2,154,51|warp|To First Floor#299|0,-1,030-2,101,20
+030-2,156,24|warp|To Third Floor#300|-1,0,030-2,21,78
+030-2,20,78|warp|To Second Floor#301|-1,0,030-2,155,24
+030-2,42,105|warp|To Fourth Floor#302|0,-1,030-2,93,74
+030-2,94,73|warp|To Third Floor#303|0,-1,030-2,41,104
+030-2,102,73|warp|To Fifth Floor#304|0,-1,030-2,127,104
+030-2,127,105|warp|To Fourth Floor#305|0,-1,030-2,102,74
+030-2,78,87|warp|To Private Room#306|-1,-1,030-2,194,67
diff --git a/world/map/npc/030-3/_warps.txt b/world/map/npc/030-3/_warps.txt
index 91ef9673..5b74ef04 100644
--- a/world/map/npc/030-3/_warps.txt
+++ b/world/map/npc/030-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// The Frozen Lake warps
-030-3,54,69|warp|To Snow Cave|-1,-1,019-3,80,102
+030-3,54,69|warp|To Snow Cave#62|-1,-1,019-3,80,102
diff --git a/world/map/npc/031-1/_warps.txt b/world/map/npc/031-1/_warps.txt
index 08eba8f1..f55dd69a 100644
--- a/world/map/npc/031-1/_warps.txt
+++ b/world/map/npc/031-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis Port warps
-031-1,37,55|warp|To Nivalis|-1,-1,020-1,106,55
-031-1,76,24|warp|To Ice Labyrinth|-1,-1,031-3,212,299
-031-1,90,115|warp|To Nivalis Storage|-1,-1,031-2,73,29
+031-1,37,55|warp|To Nivalis#143|-1,-1,020-1,106,55
+031-1,76,24|warp|To Ice Labyrinth#144|-1,-1,031-3,212,299
+031-1,90,115|warp|To Nivalis Storage#145|-1,-1,031-2,73,29
diff --git a/world/map/npc/031-2/_warps.txt b/world/map/npc/031-2/_warps.txt
index d7c00951..01ccb55d 100644
--- a/world/map/npc/031-2/_warps.txt
+++ b/world/map/npc/031-2/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Angela's House warps
-031-2,23,30|warp|To Outside|-1,-1,031-1,95,81
-031-2,73,30|warp|To Outside|-1,-1,031-1,90,116
+031-2,23,30|warp|To Outside#177|-1,-1,031-1,95,81
+031-2,73,30|warp|To Outside#178|-1,-1,031-1,90,116
diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt
index f99990e0..669af6fc 100644
--- a/world/map/npc/031-3/_warps.txt
+++ b/world/map/npc/031-3/_warps.txt
@@ -1,52 +1,52 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Ice Labyrinth warps
-031-3,212,300|warp|To Nivalis Port|-1,-1,031-1,76,25
-031-3,205,264|warp|To Ice Labyrinth|-1,-1,031-3,150,260
-031-3,149,259|warp|To Ice Labyrinth|-1,-1,031-3,206,265
-031-3,225,282|warp|To Ice Labyrinth|-1,-1,031-3,274,299
-031-3,274,300|warp|To Ice Labyrinth|-1,-1,031-3,225,283
-031-3,283,271|warp|To Ice Labyrinth|-1,-1,031-3,269,244
-031-3,269,245|warp|To Ice Labyrinth|-1,-1,031-3,283,272
-031-3,148,150|warp|To Ice Labyrinth|-1,-1,031-3,128,134
-031-3,139,258|warp|To Ice Labyrinth|-1,-1,031-3,156,196
-031-3,155,195|warp|To Ice Labyrinth|-1,-1,031-3,139,259
-031-3,142,301|warp|To Ice Labyrinth|-1,-1,031-3,98,300
-031-3,97,301|warp|To Ice Labyrinth|-1,-1,031-3,143,300
-031-3,135,196|warp|To Ice Labyrinth|-1,-1,031-3,106,231
-031-3,106,232|warp|To Ice Labyrinth|-1,-1,031-3,135,197
-031-3,286,190|warp|To Ice Labyrinth|-1,-1,031-3,227,241
-031-3,227,242|warp|To Ice Labyrinth|-1,-1,031-3,286,191
-031-3,236,211|warp|To Ice Labyrinth|-1,-1,031-3,187,227
-031-3,187,228|warp|To Ice Labyrinth|-1,-1,031-3,236,212
-031-3,94,254|warp|To Ice Labyrinth|-1,-1,031-3,54,251
-031-3,54,250|warp|To Ice Labyrinth|-1,-1,031-3,94,255
-031-3,103,199|warp|To Ice Labyrinth|-1,-1,031-3,52,176
-031-3,52,177|warp|To Ice Labyrinth|-1,-1,031-3,103,200
-031-3,212,193|warp|To Ice Labyrinth|-1,-1,031-3,207,167
-031-3,207,168|warp|To Ice Labyrinth|-1,-1,031-3,212,194
-031-3,235,167|warp|To Ice Labyrinth|-1,-1,031-3,195,123
-031-3,195,122|warp|To Ice Labyrinth|-1,-1,031-3,235,166
-031-3,296,97|warp|To Ice Labyrinth|-1,-1,031-3,292,124
-031-3,292,123|warp|To Ice Labyrinth|-1,-1,031-3,296,96
-031-3,289,164|warp|To Ice Labyrinth|-1,-1,031-3,228,122
-031-3,228,121|warp|To Ice Labyrinth|-1,-1,031-3,289,163
-031-3,24,157|warp|To Ice Labyrinth|-1,-1,031-3,31,143
-031-3,31,144|warp|To Ice Labyrinth|-1,-1,031-3,24,158
-031-3,36,249|warp|To Ice Labyrinth|-1,-1,031-3,35,225
-031-3,35,226|warp|To Ice Labyrinth|-1,-1,031-3,36,250
-031-3,34,25|warp|To Ice Labyrinth|-1,-1,031-3,281,24
-031-3,281,22|warp|To Ice Labyrinth|-1,-1,031-3,34,27
-031-3,283,48|warp|To Ice Labyrinth|-1,-1,031-3,275,74
-031-3,275,73|warp|To Ice Labyrinth|-1,-1,031-3,283,47
-031-3,26,178|warp|To Ice Labyrinth|-1,-1,031-3,36,201
-031-3,36,200|warp|To Ice Labyrinth|-1,-1,031-3,26,177
-031-3,91,125|warp|To Ice Labyrinth|-1,-1,031-3,36,79
-031-3,36,80|warp|To Ice Labyrinth|-1,-1,031-3,91,126
-031-3,52,78|warp|To Ice Labyrinth|-1,-1,031-3,192,71
-031-3,192,70|warp|To Ice Labyrinth|-1,-1,031-3,52,77
-031-3,128,135|warp|To Ice Labyrinth|-1,-1,031-3,148,151
-031-3,232,93|warp|To Ice Labyrinth|-1,-1,031-3,234,26
-031-3,234,25|warp|To Ice Labyrinth|-1,-1,031-3,232,92
-031-3,200,50|warp|To Ice Labyrinth|-1,-1,031-3,136,30
-031-3,136,29|warp|To Ice Labyrinth|-1,-1,031-3,200,49
+031-3,212,300|warp|To Nivalis Port#181|-1,-1,031-1,76,25
+031-3,205,264|warp|To Ice Labyrinth#182|-1,-1,031-3,150,260
+031-3,149,259|warp|To Ice Labyrinth#183|-1,-1,031-3,206,265
+031-3,225,282|warp|To Ice Labyrinth#184|-1,-1,031-3,274,299
+031-3,274,300|warp|To Ice Labyrinth#185|-1,-1,031-3,225,283
+031-3,283,271|warp|To Ice Labyrinth#186|-1,-1,031-3,269,244
+031-3,269,245|warp|To Ice Labyrinth#187|-1,-1,031-3,283,272
+031-3,148,150|warp|To Ice Labyrinth#188|-1,-1,031-3,128,134
+031-3,139,258|warp|To Ice Labyrinth#189|-1,-1,031-3,156,196
+031-3,155,195|warp|To Ice Labyrinth#190|-1,-1,031-3,139,259
+031-3,142,301|warp|To Ice Labyrinth#191|-1,-1,031-3,98,300
+031-3,97,301|warp|To Ice Labyrinth#192|-1,-1,031-3,143,300
+031-3,135,196|warp|To Ice Labyrinth#193|-1,-1,031-3,106,231
+031-3,106,232|warp|To Ice Labyrinth#194|-1,-1,031-3,135,197
+031-3,286,190|warp|To Ice Labyrinth#195|-1,-1,031-3,227,241
+031-3,227,242|warp|To Ice Labyrinth#196|-1,-1,031-3,286,191
+031-3,236,211|warp|To Ice Labyrinth#197|-1,-1,031-3,187,227
+031-3,187,228|warp|To Ice Labyrinth#198|-1,-1,031-3,236,212
+031-3,94,254|warp|To Ice Labyrinth#199|-1,-1,031-3,54,251
+031-3,54,250|warp|To Ice Labyrinth#200|-1,-1,031-3,94,255
+031-3,103,199|warp|To Ice Labyrinth#201|-1,-1,031-3,52,176
+031-3,52,177|warp|To Ice Labyrinth#202|-1,-1,031-3,103,200
+031-3,212,193|warp|To Ice Labyrinth#203|-1,-1,031-3,207,167
+031-3,207,168|warp|To Ice Labyrinth#204|-1,-1,031-3,212,194
+031-3,235,167|warp|To Ice Labyrinth#205|-1,-1,031-3,195,123
+031-3,195,122|warp|To Ice Labyrinth#206|-1,-1,031-3,235,166
+031-3,296,97|warp|To Ice Labyrinth#207|-1,-1,031-3,292,124
+031-3,292,123|warp|To Ice Labyrinth#208|-1,-1,031-3,296,96
+031-3,289,164|warp|To Ice Labyrinth#209|-1,-1,031-3,228,122
+031-3,228,121|warp|To Ice Labyrinth#210|-1,-1,031-3,289,163
+031-3,24,157|warp|To Ice Labyrinth#211|-1,-1,031-3,31,143
+031-3,31,144|warp|To Ice Labyrinth#212|-1,-1,031-3,24,158
+031-3,36,249|warp|To Ice Labyrinth#213|-1,-1,031-3,35,225
+031-3,35,226|warp|To Ice Labyrinth#214|-1,-1,031-3,36,250
+031-3,34,25|warp|To Ice Labyrinth#215|-1,-1,031-3,281,24
+031-3,281,22|warp|To Ice Labyrinth#216|-1,-1,031-3,34,27
+031-3,283,48|warp|To Ice Labyrinth#217|-1,-1,031-3,275,74
+031-3,275,73|warp|To Ice Labyrinth#218|-1,-1,031-3,283,47
+031-3,26,178|warp|To Ice Labyrinth#219|-1,-1,031-3,36,201
+031-3,36,200|warp|To Ice Labyrinth#220|-1,-1,031-3,26,177
+031-3,91,125|warp|To Ice Labyrinth#221|-1,-1,031-3,36,79
+031-3,36,80|warp|To Ice Labyrinth#222|-1,-1,031-3,91,126
+031-3,52,78|warp|To Ice Labyrinth#223|-1,-1,031-3,192,71
+031-3,192,70|warp|To Ice Labyrinth#224|-1,-1,031-3,52,77
+031-3,128,135|warp|To Ice Labyrinth#225|-1,-1,031-3,148,151
+031-3,232,93|warp|To Ice Labyrinth#226|-1,-1,031-3,234,26
+031-3,234,25|warp|To Ice Labyrinth#227|-1,-1,031-3,232,92
+031-3,200,50|warp|To Ice Labyrinth#228|-1,-1,031-3,136,30
+031-3,136,29|warp|To Ice Labyrinth#229|-1,-1,031-3,200,49
diff --git a/world/map/npc/032-3/_warps.txt b/world/map/npc/032-3/_warps.txt
index ce7bce36..4ecd2071 100644
--- a/world/map/npc/032-3/_warps.txt
+++ b/world/map/npc/032-3/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Outback Cave warps
-032-3,128,34|warp|To Desert Mountains|-1,-1,006-1,30,124
-032-3,56,61|warp|To Desert Mountains|-1,-1,006-1,111,111
+032-3,128,34|warp|To Desert Mountains#413|-1,-1,006-1,30,124
+032-3,56,61|warp|To Desert Mountains#414|-1,-1,006-1,111,111
diff --git a/world/map/npc/033-1/_warps.txt b/world/map/npc/033-1/_warps.txt
index 00baf864..b0818f04 100644
--- a/world/map/npc/033-1/_warps.txt
+++ b/world/map/npc/033-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Path warps
-033-1,22,20|warp|To Snow Forest|-1,0,034-1,159,19
-033-1,119,70|warp|To Snow Field|-1,0,019-1,22,69
+033-1,22,20|warp|To Snow Forest#512|-1,0,034-1,159,19
+033-1,119,70|warp|To Snow Field#513|-1,0,019-1,22,69
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index 892c7ed9..705065be 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Forest warps
-034-1,160,20|warp|To Snow Field|-1,0,033-1,23,19
-034-1,16,103|warp|To Deep Snow Forest|-1,1,045-1,176,133
-034-1,15,31|warp|To Deep Snow Forest|-1,0,045-1,174,59
-034-1,95,18|warp|To Highlands|0,-1,046-1,94,123
-034-1,31,68|warp|To Trapper|-1,-1,034-2,28,31
-034-1,64,99|warp|To Cabin|-1,-1,034-2,73,29
+034-1,160,20|warp|To Snow Field#493|-1,0,033-1,23,19
+034-1,16,103|warp|To Deep Snow Forest#494|-1,1,045-1,176,133
+034-1,15,31|warp|To Deep Snow Forest#495|-1,0,045-1,174,59
+034-1,95,18|warp|To Highlands#496|0,-1,046-1,94,123
+034-1,31,68|warp|To Trapper#497|-1,-1,034-2,28,31
+034-1,64,99|warp|To Cabin#498|-1,-1,034-2,73,29
diff --git a/world/map/npc/034-2/_warps.txt b/world/map/npc/034-2/_warps.txt
index 5c80fc0a..3542f57e 100644
--- a/world/map/npc/034-2/_warps.txt
+++ b/world/map/npc/034-2/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Trappers Huts warps
-034-2,28,32|warp|To Outside|-1,-1,034-1,31,69
-034-2,73,30|warp|To Outside|-1,-1,034-1,64,100
+034-2,28,32|warp|To Outside#307|-1,-1,034-1,31,69
+034-2,73,30|warp|To Outside#308|-1,-1,034-1,64,100
diff --git a/world/map/npc/043-3/_warps.txt b/world/map/npc/043-3/_warps.txt
index d4dbfc7e..732e0ed2 100644
--- a/world/map/npc/043-3/_warps.txt
+++ b/world/map/npc/043-3/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandy Dungeon Level 1 warps
-043-3,31,26|warp|Mine Camp|-1,-1,002-3,22,86
-043-3,77,30|warp|To Lower Level|-1,-1,043-4,47,67
-043-3,116,36|warp|To Snake Cave|-1,-1,005-3,78,87
-043-3,32,37|warp|To Snake Cave|0,-1,005-3,33,83
+043-3,31,26|warp|Mine Camp#529|-1,-1,002-3,22,86
+043-3,77,30|warp|To Lower Level#530|-1,-1,043-4,47,67
+043-3,116,36|warp|To Snake Cave#531|-1,-1,005-3,78,87
+043-3,32,37|warp|To Snake Cave#532|0,-1,005-3,33,83
diff --git a/world/map/npc/043-4/_warps.txt b/world/map/npc/043-4/_warps.txt
index 2818d051..a9c38be0 100644
--- a/world/map/npc/043-4/_warps.txt
+++ b/world/map/npc/043-4/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandy Dungeon Level 2 warps
-043-4,47,68|warp|To Upper Level|-1,-1,043-3,77,31
-043-4,153,27|warp|To Deeper Level|-1,-1,043-4,193,32
-043-4,193,33|warp|To Upper Level|-1,-1,043-4,153,28
+043-4,47,68|warp|To Upper Level#274|-1,-1,043-3,77,31
+043-4,153,27|warp|To Deeper Level#275|-1,-1,043-4,193,32
+043-4,193,33|warp|To Upper Level#276|-1,-1,043-4,153,28
diff --git a/world/map/npc/045-1/_warps.txt b/world/map/npc/045-1/_warps.txt
index b917e01c..4b48c1d5 100644
--- a/world/map/npc/045-1/_warps.txt
+++ b/world/map/npc/045-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Deep Snow Forest warps
-045-1,175,60|warp|To Snow Forest|-1,0,034-1,16,30
-045-1,177,132|warp|To Snow Forest|-1,1,034-1,17,102
-045-1,26,179|warp|To Woodland Hills|2,-1,017-1,182,17
+045-1,175,60|warp|To Snow Forest#51|-1,0,034-1,16,30
+045-1,177,132|warp|To Snow Forest#52|-1,1,034-1,17,102
+045-1,26,179|warp|To Woodland Hills#53|2,-1,017-1,182,17
diff --git a/world/map/npc/046-1/_warps.txt b/world/map/npc/046-1/_warps.txt
index 02bb62d1..4a078324 100644
--- a/world/map/npc/046-1/_warps.txt
+++ b/world/map/npc/046-1/_warps.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rock Plateau warps
-046-1,95,124|warp|To Snow Forest|0,-1,034-1,94,19
-046-1,29,20|warp|To Highlands|-1,-1,047-1,70,178
-046-1,31,20|warp|To Highlands|-1,-1,047-1,70,178
-046-1,78,37|warp|To Frosty Underground|-1,-1,046-3,78,29
-046-1,131,55|warp|To Frosty Underground|-1,-1,046-3,131,47
-046-1,131,62|warp|To Frosty Underground|-1,-1,046-3,131,54
-046-1,139,26|warp|To Frosty Underground|-1,-1,046-3,139,18
-046-1,83,50|warp|To Frosty Underground|-1,-1,046-3,83,42
-046-1,124,116|warp|To Frosty Underground|-1,-1,046-3,124,108
-046-1,62,26|warp|To Frosty Underground|-1,-1,019-4,24,123
+046-1,95,124|warp|To Snow Forest#230|0,-1,034-1,94,19
+046-1,29,20|warp|To Highlands#231|-1,-1,047-1,70,178
+046-1,31,20|warp|To Highlands#232|-1,-1,047-1,70,178
+046-1,78,37|warp|To Frosty Undergrou#233|-1,-1,046-3,78,29
+046-1,131,55|warp|To Frosty Undergrou#234|-1,-1,046-3,131,47
+046-1,131,62|warp|To Frosty Undergrou#235|-1,-1,046-3,131,54
+046-1,139,26|warp|To Frosty Undergrou#236|-1,-1,046-3,139,18
+046-1,83,50|warp|To Frosty Undergrou#237|-1,-1,046-3,83,42
+046-1,124,116|warp|To Frosty Undergrou#238|-1,-1,046-3,124,108
+046-1,62,26|warp|To Frosty Undergrou#239|-1,-1,019-4,24,123
diff --git a/world/map/npc/046-3/_warps.txt b/world/map/npc/046-3/_warps.txt
index 19981232..2d5d8482 100644
--- a/world/map/npc/046-3/_warps.txt
+++ b/world/map/npc/046-3/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Frosty Underground warps
-046-3,139,19|warp|To Outside|-1,-1,046-1,139,27
-046-3,78,30|warp|To Outside|-1,-1,046-1,78,38
-046-3,83,43|warp|To Outside|-1,-1,046-1,83,51
-046-3,131,48|warp|To Outside|-1,-1,046-1,131,56
-046-3,131,55|warp|To Outside|-1,-1,046-1,131,63
-046-3,124,109|warp|To Outside|-1,-1,046-1,124,117
+046-3,139,19|warp|To Outside#336|-1,-1,046-1,139,27
+046-3,78,30|warp|To Outside#337|-1,-1,046-1,78,38
+046-3,83,43|warp|To Outside#338|-1,-1,046-1,83,51
+046-3,131,48|warp|To Outside#339|-1,-1,046-1,131,56
+046-3,131,55|warp|To Outside#340|-1,-1,046-1,131,63
+046-3,124,109|warp|To Outside#341|-1,-1,046-1,124,117
diff --git a/world/map/npc/047-1/_warps.txt b/world/map/npc/047-1/_warps.txt
index 75a0f9a7..819eb937 100644
--- a/world/map/npc/047-1/_warps.txt
+++ b/world/map/npc/047-1/_warps.txt
@@ -1,17 +1,17 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Hills warps
-047-1,108,165|warp|To Small Cave|-1,-1,047-3,110,102
-047-1,108,156|warp|To Small Cave|-1,-1,047-3,119,94
-047-1,102,111|warp|To Small Cave|-1,-1,047-3,119,58
-047-1,102,107|warp|To Small Cave|-1,-1,047-3,128,45
-047-1,154,92|warp|To Deeper Snow Cave|-1,-1,019-4,74,27
-047-1,101,143|warp|To Snow Hills Cave|-1,-1,047-3,126,180
-047-1,37,173|warp|To Snow Hills Cave|-1,-1,047-3,33,175
-047-1,45,73|warp|To Snow Hills Cave|-1,-1,047-3,46,76
-047-1,78,109|warp|To Snow Hills Cave|-1,-1,047-3,35,41
-047-1,83,123|warp|To Snow Hills Cave|-1,-1,047-3,108,165
-047-1,71,179|warp|To Rock Plateau|1,-1,046-1,29,21
-047-1,130,50|warp|To Blue Sage Mansion|-1,-1,047-1,130,47
-047-1,130,48|warp|To Snow Hills|-1,-1,047-1,130,51
-047-1,128,39|warp|To Blue Sage|-1,-1,048-2,40,48
+047-1,108,165|warp|To Small Cave#344|-1,-1,047-3,110,102
+047-1,108,156|warp|To Small Cave#345|-1,-1,047-3,119,94
+047-1,102,111|warp|To Small Cave#346|-1,-1,047-3,119,58
+047-1,102,107|warp|To Small Cave#347|-1,-1,047-3,128,45
+047-1,154,92|warp|To Deeper Snow Cave#348|-1,-1,019-4,74,27
+047-1,101,143|warp|To Snow Hills Cave#349|-1,-1,047-3,126,180
+047-1,37,173|warp|To Snow Hills Cave#350|-1,-1,047-3,33,175
+047-1,45,73|warp|To Snow Hills Cave#351|-1,-1,047-3,46,76
+047-1,78,109|warp|To Snow Hills Cave#352|-1,-1,047-3,35,41
+047-1,83,123|warp|To Snow Hills Cave#353|-1,-1,047-3,108,165
+047-1,71,179|warp|To Rock Plateau#354|1,-1,046-1,29,21
+047-1,130,50|warp|To Blue Sage Mansio#355|-1,-1,047-1,130,47
+047-1,130,48|warp|To Snow Hills#356|-1,-1,047-1,130,51
+047-1,128,39|warp|To Blue Sage#357|-1,-1,048-2,40,48
diff --git a/world/map/npc/047-3/_warps.txt b/world/map/npc/047-3/_warps.txt
index b48b781f..a6ce2cdf 100644
--- a/world/map/npc/047-3/_warps.txt
+++ b/world/map/npc/047-3/_warps.txt
@@ -1,12 +1,12 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Hills Cave warps
-047-3,46,74|warp|To Snow Hills|-1,-1,047-1,45,75
-047-3,33,176|warp|To Snow Hills|-1,-1,047-1,37,174
-047-3,126,181|warp|To Snow Hills|-1,-1,047-1,101,144
-047-3,35,42|warp|To Snow Hills|-1,-1,047-1,78,110
-047-3,108,163|warp|To Snow Hills|-1,-1,047-1,83,125
-047-3,110,103|warp|To Snow Hills|-1,-1,047-1,108,166
-047-3,119,95|warp|To Snow Hills|-1,-1,047-1,108,157
-047-3,119,59|warp|To Snow Hills|-1,-1,047-1,102,112
-047-3,128,46|warp|To Snow Hills|-1,-1,047-1,102,108
+047-3,46,74|warp|To Snow Hills#520|-1,-1,047-1,45,75
+047-3,33,176|warp|To Snow Hills#521|-1,-1,047-1,37,174
+047-3,126,181|warp|To Snow Hills#522|-1,-1,047-1,101,144
+047-3,35,42|warp|To Snow Hills#523|-1,-1,047-1,78,110
+047-3,108,163|warp|To Snow Hills#524|-1,-1,047-1,83,125
+047-3,110,103|warp|To Snow Hills#525|-1,-1,047-1,108,166
+047-3,119,95|warp|To Snow Hills#526|-1,-1,047-1,108,157
+047-3,119,59|warp|To Snow Hills#527|-1,-1,047-1,102,112
+047-3,128,46|warp|To Snow Hills#528|-1,-1,047-1,102,108
diff --git a/world/map/npc/048-2/_warps.txt b/world/map/npc/048-2/_warps.txt
index 7b50efbd..cd627023 100644
--- a/world/map/npc/048-2/_warps.txt
+++ b/world/map/npc/048-2/_warps.txt
@@ -1,20 +1,20 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Blue Sages' Mansion warps
-048-2,22,78|warp|To Second Floor|0,-1,048-2,84,23
-048-2,60,21|warp|To Second Floor|0,-1,048-2,121,26
-048-2,40,50|warp|To Outside|-1,-1,047-1,128,40
-048-2,84,21|warp|To Third Floor|0,-1,048-2,22,76
-048-2,113,23|warp|To Office|-1,-1,048-2,147,35
-048-2,122,28|warp|To First Floor|0,-1,048-2,59,22
-048-2,95,23|warp|To Office|-1,-1,048-2,178,35
-048-2,147,36|warp|To Corridor|-1,-1,048-2,113,24
-048-2,178,36|warp|To Corridor|-1,-1,048-2,95,24
-048-2,27,141|warp|To Corridor|-1,-1,048-2,52,102
-048-2,60,71|warp|To Fourth Floor|0,-1,048-2,60,104
-048-2,23,73|warp|To Library|-1,-1,048-2,85,132
-048-2,55,73|warp|To Library|-1,-1,048-2,121,132
-048-2,61,106|warp|To Third Floor|0,-1,048-2,59,73
-048-2,52,101|warp|To Bedroom|-1,-1,048-2,27,140
-048-2,121,133|warp|To Corridor|-1,-1,048-2,55,74
-048-2,85,133|warp|To Corridor|-1,-1,048-2,23,74
+048-2,22,78|warp|To Second Floor#358|0,-1,048-2,84,23
+048-2,60,21|warp|To Second Floor#359|0,-1,048-2,121,26
+048-2,40,50|warp|To Outside#360|-1,-1,047-1,128,40
+048-2,84,21|warp|To Third Floor#361|0,-1,048-2,22,76
+048-2,113,23|warp|To Office#362|-1,-1,048-2,147,35
+048-2,122,28|warp|To First Floor#363|0,-1,048-2,59,22
+048-2,95,23|warp|To Office#364|-1,-1,048-2,178,35
+048-2,147,36|warp|To Corridor#365|-1,-1,048-2,113,24
+048-2,178,36|warp|To Corridor#366|-1,-1,048-2,95,24
+048-2,27,141|warp|To Corridor#367|-1,-1,048-2,52,102
+048-2,60,71|warp|To Fourth Floor#368|0,-1,048-2,60,104
+048-2,23,73|warp|To Library#369|-1,-1,048-2,85,132
+048-2,55,73|warp|To Library#370|-1,-1,048-2,121,132
+048-2,61,106|warp|To Third Floor#371|0,-1,048-2,59,73
+048-2,52,101|warp|To Bedroom#372|-1,-1,048-2,27,140
+048-2,121,133|warp|To Corridor#373|-1,-1,048-2,55,74
+048-2,85,133|warp|To Corridor#374|-1,-1,048-2,23,74
diff --git a/world/map/npc/055-1/_warps.txt b/world/map/npc/055-1/_warps.txt
index 0ad8aa39..e72cc541 100644
--- a/world/map/npc/055-1/_warps.txt
+++ b/world/map/npc/055-1/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills warps
-055-1,100,83|warp|To Cave|-1,-1,055-3,30,27
-055-1,100,89|warp|To Cave|-1,-1,055-3,50,42
-055-1,22,52|warp|To Woodland Hills|-1,2,013-1,135,51
-055-1,137,96|warp|To Cave|-1,-1,055-3,76,39
-055-1,60,93|warp|To Cave|-1,-1,055-3,96,70
-055-1,75,20|warp|To Woods|0,-1,017-1,188,103
-055-1,149,63|warp|To Woodland|-1,1,057-1,20,63
+055-1,100,83|warp|To Cave#75|-1,-1,055-3,30,27
+055-1,100,89|warp|To Cave#76|-1,-1,055-3,50,42
+055-1,22,52|warp|To Woodland Hills#77|-1,2,013-1,135,51
+055-1,137,96|warp|To Cave#78|-1,-1,055-3,76,39
+055-1,60,93|warp|To Cave#79|-1,-1,055-3,96,70
+055-1,75,20|warp|To Woods#80|0,-1,017-1,188,103
+055-1,149,63|warp|To Woodland#81|-1,1,057-1,20,63
diff --git a/world/map/npc/055-3/_warps.txt b/world/map/npc/055-3/_warps.txt
index 610db378..a5073d3c 100644
--- a/world/map/npc/055-3/_warps.txt
+++ b/world/map/npc/055-3/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cave warps
-055-3,77,40|warp|To Woodland Hills|0,-1,055-1,137,97
-055-3,30,26|warp|To Woodland Hills|-1,-1,055-1,100,82
-055-3,50,43|warp|To Outside|-1,-1,055-1,100,90
-055-3,96,71|warp|To Woodland Hills|0,-1,055-1,60,94
-055-3,58,96|warp|To Cave|0,-1,055-3,98,115
-055-3,98,114|warp|To Cave|-1,-1,055-3,57,95
+055-3,77,40|warp|To Woodland Hills#514|0,-1,055-1,137,97
+055-3,30,26|warp|To Woodland Hills#515|-1,-1,055-1,100,82
+055-3,50,43|warp|To Outside#516|-1,-1,055-1,100,90
+055-3,96,71|warp|To Woodland Hills#517|0,-1,055-1,60,94
+055-3,58,96|warp|To Cave#518|0,-1,055-3,98,115
+055-3,98,114|warp|To Cave#519|-1,-1,055-3,57,95
diff --git a/world/map/npc/056-2/_warps.txt b/world/map/npc/056-2/_warps.txt
index 951596f3..5356acf5 100644
--- a/world/map/npc/056-2/_warps.txt
+++ b/world/map/npc/056-2/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Mirak's House warps
-056-2,63,34|warp|To First Floor|-1,-1,056-2,23,32
-056-2,35,30|warp|To Woods|-1,-1,017-1,169,90
+056-2,63,34|warp|To First Floor#450|-1,-1,056-2,23,32
+056-2,35,30|warp|To Woods#451|-1,-1,017-1,169,90
diff --git a/world/map/npc/057-1/_warps.txt b/world/map/npc/057-1/_warps.txt
index 59fce137..6e4fbb94 100644
--- a/world/map/npc/057-1/_warps.txt
+++ b/world/map/npc/057-1/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-057-1,19,63|warp|To Woodland Hills|-1,1,055-1,148,63
+057-1,19,63|warp|To Woodland Hills#85|-1,1,055-1,148,63