summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------tools0
-rw-r--r--world/map/data/029-1.wlkbin19604 -> 19604 bytes
-rw-r--r--world/map/data/029-2.wlkbin15404 -> 19884 bytes
-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-2/alan.txt2
-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/009-7/shops.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-1/auldsbel.txt6
-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.txt9
-rw-r--r--world/map/npc/029-2/_import.txt3
-rw-r--r--world/map/npc/029-2/_warps.txt11
-rw-r--r--world/map/npc/029-2/bankroom.txt9
-rw-r--r--world/map/npc/029-2/cynric.txt9
-rw-r--r--world/map/npc/029-2/nyle.txt51
-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
100 files changed, 713 insertions, 639 deletions
diff --git a/tools b/tools
-Subproject 1e5f884636e4f96ab39dd38866544f9cd9668d7
+Subproject a49ce96049a70e35336e93814282287039b9fa3
diff --git a/world/map/data/029-1.wlk b/world/map/data/029-1.wlk
index bebe118d..1d95aa58 100644
--- a/world/map/data/029-1.wlk
+++ b/world/map/data/029-1.wlk
Binary files differ
diff --git a/world/map/data/029-2.wlk b/world/map/data/029-2.wlk
index 7cd78d7b..9c97a4e0 100644
--- a/world/map/data/029-2.wlk
+++ b/world/map/data/029-2.wlk
Binary files differ
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index 12bc4969..a560f26c 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#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
+001-1,63,119|warp|South Tulimshar#001-10|3,-1,002-1,63,21
+001-1,103,119|warp|South Tulimshar#001-11|3,-1,002-1,103,21
+001-1,55,71|warp|To Government B#001-12|-1,-1,001-2,31,27
+001-1,52,71|warp|To Government B#001-13|-1,-1,001-2,28,27
+001-1,49,71|warp|To Government B#001-14|-1,-1,001-2,25,27
+001-1,114,99|warp|To Tulimshar Fo#001-15|-1,-1,001-2,25,64
+001-1,27,32|warp|To MIT#001-16|-1,-1,001-2,28,101
+001-1,37,32|warp|To MIT#001-17|-1,-1,001-2,71,101
+001-1,55,34|warp|To Tulimshar Ca#001-18|0,-1,001-2,104,101
+001-1,52,22|warp|Council Chamber#001-19|-1,-1,001-2,95,52
+001-1,57,22|warp|Council Chamber#001-110|-1,-1,001-2,114,52
+001-1,28,23|warp|To MIT#001-111|-1,-1,001-2,28,87
+001-1,28,44|warp|Sewers#001-112|-1,-1,021-3,29,61
+001-1,59,98|warp|To Bank#001-113|-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 9ddb0fe4..f193d192 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#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
+001-2,25,65|warp|To Outside#001-20|-1,-1,001-1,114,100
+001-2,28,102|warp|To Outside#001-21|-1,-1,001-1,27,33
+001-2,28,86|warp|To Light#001-22|-1,-1,001-1,28,22
+001-2,105,102|warp|To Outside#001-23|0,-1,001-1,54,35
+001-2,25,28|warp|To Outside#001-24|-1,-1,001-1,49,72
+001-2,28,28|warp|To Outside#001-25|-1,-1,001-1,52,72
+001-2,31,28|warp|To Outside#001-26|-1,-1,001-1,55,72
+001-2,71,102|warp|To Outside#001-27|-1,-1,001-1,37,33
+001-2,105,73|warp|Council Chamber#001-28|2,-1,001-2,104,42
+001-2,105,43|warp|Main Floor#001-29|2,-1,001-2,104,74
+001-2,114,53|warp|Parapet#001-210|-1,-1,001-1,57,23
+001-2,95,53|warp|Parapet#001-211|-1,-1,001-1,52,23
+001-2,57,90|warp|Lighthouse#001-212|-1,-1,001-2,35,94
+001-2,36,95|warp|MainFloor#001-213|-1,0,001-2,58,90
+001-2,65,26|warp|Outside#001-214|-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 ab7d6f01..10c24a87 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#537|-1,-1,002-2,74,59
+001-3,73,28|warp|To Tulimshar In#001-30|-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 2eb6f1ec..5aef5813 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#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
+002-1,63,20|warp|North Tulimshar#002-10|3,-1,001-1,63,118
+002-1,103,20|warp|North Tulimshar#002-11|3,-1,001-1,103,118
+002-1,119,95|warp|To Snake Desert#002-12|-1,1,006-1,21,47
+002-1,92,114|warp|To Desert Mine #002-13|-1,-1,002-3,85,49
+002-1,33,109|warp|To Desert Mine #002-14|-1,-1,002-3,51,35
+002-1,109,45|warp|To Weavers Shop#002-15|-1,-1,002-2,75,100
+002-1,115,45|warp|To Weavers Shop#002-16|-1,-1,002-2,83,100
+002-1,99,43|warp|To Jeweler#002-17|-1,-1,002-2,120,66
+002-1,114,35|warp|To Trainer#002-18|-1,-1,002-2,78,131
+002-1,110,29|warp|To Trainer#002-19|-1,-1,002-2,68,122
+002-1,73,35|warp|To Tulimshar In#002-110|-1,-1,002-2,44,33
+002-1,57,35|warp|To KPS#002-111|-1,-1,002-2,120,94
+002-1,67,29|warp|To Tulimshar In#002-112|-1,-1,002-2,23,109
+002-1,113,107|warp|To Snake Cave#002-113|-1,-1,005-3,52,35
+002-1,49,20|warp|To Sea Cave#002-114|-1,-1,004-3,24,94
+002-1,57,26|warp|Omar's House#002-115|-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 2b4e23b9..9a56fe52 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#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
+002-2,44,34|warp|Outside#002-20|-1,-1,002-1,73,36
+002-2,44,20|warp|First Floor#002-21|0,-1,002-2,45,78
+002-2,46,79|warp|First Floor#002-22|0,-1,002-2,43,21
+002-2,46,55|warp|Penthouse#002-23|0,-1,002-2,44,109
+002-2,45,110|warp|Second Floor#002-24|0,-1,002-2,45,56
+002-2,23,110|warp|Outside#002-25|-1,-1,002-1,67,30
+002-2,34,20|warp|Casino#002-26|-1,-1,002-2,79,69
+002-2,37,20|warp|Theatre#002-27|-1,-1,002-2,72,31
+002-2,72,32|warp|First Floor#002-28|-1,-1,002-2,37,21
+002-2,79,70|warp|First Floor#002-29|-1,-1,002-2,34,21
+002-2,40,20|warp|Salon#002-210|-1,-1,002-2,126,35
+002-2,126,36|warp|First Floor#002-211|-1,-1,002-2,40,21
+002-2,75,101|warp|Outside#002-212|-1,-1,002-1,109,46
+002-2,83,101|warp|Outside#002-213|-1,-1,002-1,115,46
+002-2,78,132|warp|Outside#002-214|-1,-1,002-1,114,36
+002-2,68,121|warp|Outside#002-215|-1,-1,002-1,110,28
+002-2,120,67|warp|Outside#002-216|-1,-1,002-1,99,44
+002-2,120,95|warp|Outside#002-217|-1,-1,002-1,57,36
+002-2,119,132|warp|To Outside#002-218|-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 116e576b..19bc2835 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#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
+002-3,22,87|warp|Deep Caves#002-30|-1,-1,043-3,31,27
+002-3,85,51|warp|To Sand Storm U#002-31|-1,-1,002-1,92,115
+002-3,51,36|warp|To Sand Storm#002-32|-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 93f96420..dc3df4b4 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#417|-1,-1,002-3,82,30
+002-4,37,29|warp|To Mining Camp#002-40|-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 0b4d278c..85886913 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#74|-1,-1,002-4,68,99
+002-5,34,98|warp|To Second Level#002-50|-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 be583b03..6ed5d042 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#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
+004-3,24,95|warp|To West Beach#004-30|-1,-1,002-1,49,21
+004-3,49,80|warp|To Pirate Caves#004-31|-1,-1,004-4,49,83
+004-3,31,73|warp|To Pirate Caves#004-32|-1,-1,004-4,31,70
+004-3,49,56|warp|To Pirate Caves#004-33|-1,-1,004-4,49,51
+004-3,90,64|warp|To Pirate Caves#004-34|-1,-1,004-4,90,68
+004-3,80,22|warp|To West Beach H#004-35|-1,-1,021-3,44,142
+004-3,77,40|warp|To Pirate Caves#004-36|-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 21d07677..79c6d665 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#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
+004-4,49,81|warp|To Pirate Caves#004-40|-1,-1,004-3,49,76
+004-4,31,72|warp|To Pirate Caves#004-41|-1,-1,004-3,31,74
+004-4,49,53|warp|To Pirate Caves#004-42|-1,-1,004-3,49,57
+004-4,90,70|warp|To Pirate Caves#004-43|-1,-1,004-3,90,66
+004-4,24,64|warp|To Pirates Den#004-44|-1,-1,004-5,24,67
+004-4,78,32|warp|To Pirate Caves#004-45|-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 4ce3c841..2f90c488 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#596|-1,-1,004-4,24,62
+004-5,24,65|warp|To Pirates Den#004-50|-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 b1ba5a5d..380fd7f4 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#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
+005-3,52,33|warp|To Outside#005-30|-1,-1,002-1,113,109
+005-3,63,46|warp|Snake Mountain#005-31|-1,-1,006-3,89,45
+005-3,85,49|warp|Snake Mountain#005-32|-1,-1,006-3,125,65
+005-3,86,30|warp|To Outside#005-33|-1,-1,006-1,55,47
+005-3,73,60|warp|To Outside#005-34|-1,-1,006-1,51,69
+005-3,78,88|warp|Sandy Dungeon#005-35|-1,-1,043-3,116,37
+005-3,33,82|warp|Sandy Dungeon#005-36|-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 5788e3b8..d5f73519 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 #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
+006-1,40,26|warp|To Desert Mount#006-10|-1,-1,006-3,40,28
+006-1,60,58|warp|To Desert Mount#006-11|-1,-1,006-3,60,70
+006-1,62,30|warp|To Desert Mount#006-12|-1,-1,006-3,62,32
+006-1,55,27|warp|To Desert Mount#006-13|-1,-1,006-3,55,29
+006-1,77,44|warp|To Desert Mount#006-14|-1,-1,006-3,77,46
+006-1,86,24|warp|To Desert Mount#006-15|-1,-1,006-3,86,26
+006-1,91,24|warp|To Desert Mount#006-16|-1,-1,006-3,91,26
+006-1,98,46|warp|To Desert Mount#006-17|-1,-1,006-3,104,46
+006-1,114,22|warp|To Desert Mount#006-18|-1,-1,006-3,122,26
+006-1,114,49|warp|To Desert Mount#006-19|-1,-1,006-3,114,51
+006-1,102,53|warp|To Desert Mount#006-110|-1,-1,006-3,110,58
+006-1,117,57|warp|To Desert Mount#006-111|-1,-1,006-3,125,61
+006-1,92,63|warp|To Desert Mount#006-112|-1,-1,006-3,92,65
+006-1,112,74|warp|To Desert Mount#006-113|-1,-1,006-3,112,76
+006-1,111,110|warp|To Desert Mount#006-114|-1,-1,032-3,56,60
+006-1,83,117|warp|To Desert Mount#006-115|-1,-1,006-3,79,121
+006-1,38,121|warp|To Desert Mount#006-116|-1,-1,006-3,38,123
+006-1,74,90|warp|To Desert Mount#006-117|-1,-1,006-3,74,92
+006-1,51,90|warp|To Desert Mount#006-118|-1,-1,006-3,51,92
+006-1,30,123|warp|To Outback Cave#006-119|-1,-1,032-3,128,33
+006-1,33,85|warp|To Pachua's Vil#006-120|-1,-1,006-2,58,43
+006-1,23,85|warp|To Pachua's Vil#006-121|-1,-1,006-2,48,43
+006-1,23,100|warp|To Pachua's Vil#006-122|-1,-1,006-2,67,64
+006-1,21,108|warp|To Pachua's Vil#006-123|-1,-1,006-2,65,72
+006-1,37,26|warp|To Desert Mount#006-124|-1,-1,006-1,37,23
+006-1,37,24|warp|To Desert Mount#006-125|-1,-1,006-1,37,27
+006-1,55,46|warp|Snake Cave#006-126|-1,-1,005-3,86,31
+006-1,20,48|warp|To Sandstorm De#006-127|-1,0,002-1,118,95
+006-1,51,68|warp|Snake Cave#006-128|-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 9d93efee..25db8727 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#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
+006-2,67,65|warp|To Desert Mount#006-20|-1,-1,006-1,23,101
+006-2,65,73|warp|To Desert Mount#006-21|-1,-1,006-1,21,109
+006-2,48,44|warp|To Desert Mount#006-22|-1,-1,006-1,23,86
+006-2,58,44|warp|To Desert Mount#006-23|-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 71b3c1a1..f7abd778 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#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
+006-3,40,26|warp|To Desert Mount#006-30|-1,-1,006-1,40,28
+006-3,55,27|warp|To Desert Mount#006-31|-1,-1,006-1,55,29
+006-3,62,30|warp|To Desert Mount#006-32|-1,-1,006-1,62,32
+006-3,86,24|warp|To Desert Mount#006-33|-1,-1,006-1,86,26
+006-3,91,24|warp|To Desert Mount#006-34|-1,-1,006-1,91,26
+006-3,122,24|warp|To Desert Mount#006-35|-1,-1,006-1,114,24
+006-3,114,49|warp|To Desert Mount#006-36|-1,-1,006-1,114,51
+006-3,104,44|warp|To Desert Mount#006-37|-1,-1,006-1,98,48
+006-3,77,44|warp|To Desert Mount#006-38|-1,-1,006-1,77,46
+006-3,60,68|warp|To Desert Mount#006-39|-1,-1,006-1,60,60
+006-3,92,63|warp|To Desert Mount#006-310|-1,-1,006-1,92,65
+006-3,112,74|warp|To Desert Mount#006-311|-1,-1,006-1,112,76
+006-3,110,56|warp|To Desert Mount#006-312|-1,-1,006-1,102,55
+006-3,125,59|warp|To Desert Mount#006-313|-1,-1,006-1,117,59
+006-3,74,90|warp|To Desert Mount#006-314|-1,-1,006-1,74,92
+006-3,51,90|warp|To Desert Mount#006-315|-1,-1,006-1,51,92
+006-3,38,121|warp|To Desert Mount#006-316|-1,-1,006-1,38,123
+006-3,79,120|warp|To Desert Mount#006-317|-1,-1,006-1,83,119
+006-3,125,66|warp|Snake Cave#006-318|-1,-1,005-3,85,50
+006-3,89,46|warp|Snake Cave#006-319|-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 17d9b689..c865845a 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#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
+007-1,20,54|warp|To Woodland#007-10|-1,0,010-1,130,53
+007-1,69,21|warp|To Hurnscald Ou#007-11|2,-1,008-1,78,101
+007-1,122,20|warp|To Hurnscald#007-12|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 3c1e87c0..346b733c 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 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
+008-1,54,61|warp|To Hurnscald We#008-10|-1,1,009-1,25,36
+008-1,79,80|warp|To Hurnscald So#008-11|2,-1,009-1,48,54
+008-1,127,61|warp|To Hurnscald Ea#008-12|-1,0,009-1,96,36
+008-1,79,49|warp|To Hurnscald No#008-13|2,-1,009-1,48,25
+008-1,24,62|warp|To Woodland#008-14|-1,2,011-1,123,61
+008-1,79,17|warp|To Woodland Min#008-15|2,-1,018-1,78,97
+008-1,79,102|warp|To Woodland#008-16|2,-1,007-1,68,22
+008-1,132,101|warp|To Woodland#008-17|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 05b13a80..d03fd7a4 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 #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
+009-1,49,55|warp|To Hurnscald So#009-10|2,-1,008-1,78,81
+009-1,97,36|warp|To Hurnscald Ea#009-11|-1,0,008-1,128,61
+009-1,35,30|warp|To Hurnscald In#009-12|-1,-1,009-2,50,54
+009-1,58,46|warp|To Storage Room#009-13|-1,-1,009-2,27,106
+009-1,59,33|warp|To Archer Shop#009-14|-1,-1,009-2,95,29
+009-1,71,30|warp|To Hurnscald Po#009-15|-1,-1,009-2,130,25
+009-1,80,31|warp|To Hurnscald Ho#009-16|-1,-1,009-2,149,66
+009-1,72,44|warp|To Hurnscald Ho#009-17|-1,-1,009-2,114,77
+009-1,91,46|warp|To Hurnscald Fo#009-18|0,-1,009-2,182,66
+009-1,24,36|warp|To Hurnscald We#009-19|-1,1,008-1,53,61
+009-1,49,24|warp|To Hurnscald No#009-110|2,-1,008-1,78,48
+009-1,60,41|warp|To Bedroom#009-111|-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 c2a68f37..ca2f04f2 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#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
+009-2,75,23|warp|To First Floor#009-20|0,-1,009-2,74,47
+009-2,95,30|warp|To Outside#009-21|-1,-1,009-1,59,34
+009-2,130,26|warp|To Outside#009-22|-1,-1,009-1,71,31
+009-2,144,26|warp|To Second Floor#009-23|0,-1,009-2,144,43
+009-2,144,42|warp|To Third Floor#009-24|0,-1,009-2,144,25
+009-2,155,48|warp|To First Floor#009-25|0,-1,009-2,155,63
+009-2,114,46|warp|To First Floor#009-26|0,-1,009-2,114,70
+009-2,50,55|warp|To Outside#009-27|-1,-1,009-1,35,31
+009-2,74,53|warp|To Cellar#009-28|-1,-1,009-2,143,78
+009-2,74,46|warp|To Second Floor#009-29|0,-1,009-2,75,22
+009-2,114,78|warp|To Outside#009-210|-1,-1,009-1,72,45
+009-2,114,69|warp|To Second Floor#009-211|0,-1,009-2,114,45
+009-2,149,67|warp|To Outside#009-212|-1,-1,009-1,80,32
+009-2,143,77|warp|To First Floor#009-213|-1,-1,009-2,74,52
+009-2,155,62|warp|To Second Floor#009-214|0,-1,009-2,155,46
+009-2,182,67|warp|To Outside#009-215|0,-1,009-1,91,47
+009-2,147,90|warp|To Hurnscald Ca#009-216|-1,-1,009-3,173,21
+009-2,27,107|warp|To Outside#009-217|-1,-1,009-1,58,47
+009-2,46,50|warp|To Inn Private #009-218|-1,-1,009-2,76,78
+009-2,77,78|warp|To Hurnscald In#009-219|-1,-1,009-2,47,50
+009-2,31,91|warp|To Outside#009-220|-1,-1,009-1,59,41
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index 12f5cde8..412b5823 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -98,7 +98,7 @@ L_State_2:
next;
if (@inspector == 1)
menu
- "Yes, I did. He said that the trees turned into dangerous monsters.", L_Next,
+ "Yes, I did. He said that the trees turned into dangerous monsters.", L_Next1,
"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
if (@inspector != 1)
menu
diff --git a/world/map/npc/009-3/_warps.txt b/world/map/npc/009-3/_warps.txt
index 7897ad6a..ad620156 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#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
+009-3,173,20|warp|To Cellar#009-30|-1,-1,009-2,147,89
+009-3,20,57|warp|To Lake Cave#009-31|-1,-1,011-4,129,87
+009-3,157,30|warp|To Northern Min#009-32|-1,-1,018-3,179,180
+009-3,117,19|warp|To Woodland Hil#009-33|-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 ed348dc0..0eefbe26 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#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
+009-4,37,112|warp|To Hurnscald Ca#009-40|-1,-1,009-3,163,114
+009-4,72,136|warp|To Torches Cave#009-41|-1,-1,009-4,36,27
+009-4,37,123|warp|To Torches Cave#009-42|-1,-1,009-4,36,27
+009-4,72,125|warp|To Hurnscald Ca#009-43|-1,-1,009-3,163,114
+009-4,103,22|warp|To Torches Cave#009-44|-1,-1,009-4,51,46
+009-4,103,76|warp|To Torches Cave#009-45|-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 8f87c9d5..00224f0f 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#393|1,-1,009-3,162,81
+009-5,53,74|warp|to Hurnscald#009-50|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 ec0008b5..23c2abe3 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#12|-1,-1,009-3,162,82
+009-6,36,48|warp|To Hurnscald Ca#009-60|-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 5aa8b9cb..6977d948 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 Storag#146|-1,-1,009-2,38,103
+009-7,21,19|warp|To Hurnscald St#009-70|-1,-1,009-2,38,103
diff --git a/world/map/npc/009-7/shops.txt b/world/map/npc/009-7/shops.txt
index aca61234..c112d60c 100644
--- a/world/map/npc/009-7/shops.txt
+++ b/world/map/npc/009-7/shops.txt
@@ -1,3 +1,3 @@
009-7,34,23,0|shop|Bartender#Duels|177,Beer:*1,IronPotion:*1,ConcentrationPotion:*1,SmallManaElixir:*9,BottleOfWater:*1,Milk:*1
-009-7,27,26,0|shop|Garçon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1
+009-7,27,26,0|shop|Garcon#Duels|180,RoastedMaggot:*1,PickledBeets:*30,ChickenLeg:*1,Steak:*1,Beer:*1
diff --git a/world/map/npc/010-1/_warps.txt b/world/map/npc/010-1/_warps.txt
index d4687219..debab9af 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#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
+010-1,49,24|warp|To Woodland#010-10|0,-1,011-1,48,103
+010-1,13,55|warp|To Woodland#010-11|-1,0,015-1,92,54
+010-1,36,94|warp|To Dimond's Cov#010-12|-1,-1,010-2,32,44
+010-1,56,105|warp|To Woodland#010-13|1,-1,016-1,56,19
+010-1,131,54|warp|To Woodland#010-14|-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 e006b366..81b6ade2 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#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
+010-2,27,24|warp|To Cellar#010-20|-1,-1,010-2,35,68
+010-2,32,45|warp|To Outside#010-21|-1,-1,010-1,36,95
+010-2,40,27|warp|To Second Floor#010-22|1,-1,010-2,83,28
+010-2,36,68|warp|To First Floor#010-23|-1,-1,010-2,28,24
+010-2,67,27|warp|To Third Floor#010-24|1,-1,010-2,67,72
+010-2,83,29|warp|To First Floor#010-25|1,-1,010-2,40,28
+010-2,67,73|warp|To Second Floor#010-26|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 cd3a3022..fe83fdde 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#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
+011-1,58,92|warp|To Hermit's Cav#011-10|-1,-1,011-3,0,0
+011-1,30,61|warp|To Woodland#011-11|-1,1,014-1,108,91
+011-1,49,104|warp|To Woodland#011-12|0,-1,010-1,48,25
+011-1,124,62|warp|To Hurnscald Ou#011-13|-1,2,008-1,25,61
+011-1,73,9|warp|To Woodland Hil#011-14|0,-1,012-1,132,175
+011-1,38,36|warp|To Bandit Cave#011-15|-1,-1,011-6,49,100
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index f8315c18..23e3f84a 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -993,7 +993,7 @@ L_learn_spell:
mes "\"You can turn the log into a wooden figurine by imagining the creature whose shape you want in your head and saying `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape it into.\"";
next;
mes "[Auldsbel the Wizard]";
- mes "\"So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skrytlurk figurine, for example. If you know what a Skrytlurk is, I mean, otherwise you will have a hard time imagining it. You may want to try some others instead, though.\"";
+ mes "\"So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skytlurk figurine, for example. If you know what a Skytlurk is, I mean, otherwise you will have a hard time imagining it. You may want to try some others instead, though.\"";
next;
mes "[Auldsbel the Wizard]";
mes "\"Oh... and it has to be the old Tritan name. Most creatures nowadays have very different names, but some old Tritan names have survived. Just try some, until you find one that fits.\"";
@@ -1007,10 +1007,10 @@ L_learn_spell:
L_repeat_spell:
mes "[Auldsbel the Wizard]";
- mes "\"The invocation is `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape the log into. So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skrytlurk figurine.\"";
+ mes "\"The invocation is `" + getspellinvocation("transmute-wood-to-figurine") + ",' followed by the last syllable of the name of the creature you want to shape the log into. So `" + getspellinvocation("transmute-wood-to-figurine") + " lurk' for a Skytlurk figurine.\"";
next;
mes "[Auldsbel the Wizard]";
- mes "\"But keep two things in mind: First, you must KNOW what the creature looks like – so a Skrytlurk probably won't work – and second, you must use the old Tritan name of it. `Fluffy' and `Scorpion' are modern names, so those won't work, you should try some others.\"";
+ mes "\"But keep two things in mind: First, you must KNOW what the creature looks like – so a Skytlurk probably won't work – and second, you must use the old Tritan name of it. `Fluffy' and `Scorpion' are modern names, so those won't work, you should try some others.\"";
next;
mes "[Auldsbel the Wizard]";
mes "\"And make sure to keep notes of your spells! In the future, I will only tell you once.\"";
diff --git a/world/map/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt
index 4f7e8ad2..67ddbd57 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#326|-1,-1,011-4,73,10
+011-3,31,14|warp|To Lake Cave#011-30|-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 46e36fcd..663476d7 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#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
+011-4,73,8|warp|To Hermit's Cav#011-40|-1,-1,011-3,31,16
+011-4,129,86|warp|To Hurnscald Ca#011-41|-1,-1,009-3,20,56
+011-4,39,35|warp|To Bandit Cave#011-42|-1,-1,011-6,47,184
+011-4,16,57|warp|To Bryant Cave#011-43|-1,-1,011-6,24,205
+011-4,89,20|warp|To Bandit Cave#011-44|-1,-1,011-6,97,168
+011-4,105,32|warp|To Bandit Cave#011-45|-1,-1,011-6,114,183
+011-4,114,61|warp|To Bandit Cave#011-46|-1,-1,011-6,123,212
+011-4,86,75|warp|To Bandit Cave#011-47|-1,-1,011-6,95,226
+011-4,62,86|warp|To Bandit Cave#011-48|-1,-1,011-6,68,234
+011-4,32,5|warp|To Small Cave#011-49|0,-1,011-6,186,181
+011-4,45,118|warp|To Small Cave#011-410|-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 676d16b2..18d95347 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 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
+011-6,51,75|warp|To Small Bandit#011-60|-1,-1,011-6,260,127
+011-6,61,71|warp|To Small Bandit#011-61|-1,-1,011-6,270,124
+011-6,270,125|warp|To Bandit Cave#011-62|-1,-1,011-6,61,72
+011-6,260,128|warp|To Bandit Cave#011-63|-1,-1,011-6,51,76
+011-6,145,118|warp|To Bandit Cave#011-64|-1,-1,011-6,47,119
+011-6,196,26|warp|To Small Bandit#011-65|-1,-1,011-6,261,46
+011-6,261,47|warp|To Second Bandi#011-66|-1,-1,011-6,196,27
+011-6,271,52|warp|To Bandit Cave#011-67|-1,-1,011-6,98,31
+011-6,98,30|warp|To Small Bandit#011-68|-1,-1,011-6,271,51
+011-6,47,120|warp|To Second Bandi#011-69|-1,-1,011-6,145,117
+011-6,49,101|warp|To Woodland#011-610|-1,-1,011-1,38,37
+011-6,24,206|warp|To Lake Cave#011-611|-1,-1,011-4,16,58
+011-6,47,185|warp|To Lake Cave#011-612|-1,-1,011-4,39,36
+011-6,97,169|warp|To Lake Cave#011-613|-1,-1,011-4,89,21
+011-6,113,182|warp|To Lake Cave#011-614|-1,-1,011-4,106,33
+011-6,122,211|warp|To Lake Cave#011-615|-1,-1,011-4,115,62
+011-6,94,225|warp|To Lake Cave#011-616|-1,-1,011-4,87,76
+011-6,68,235|warp|To Lake Cave#011-617|-1,-1,011-4,62,87
+011-6,251,278|warp|To Lake Cave#011-618|-1,-1,011-4,111,122
+011-6,186,182|warp|To Lake Cave#011-619|0,-1,011-4,32,6
+011-6,266,182|warp|To Lake Cave#011-620|-1,-1,011-4,45,119
+011-6,174,256|warp|To Bandit Lord #011-621|-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 1186b147..245900b4 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#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
+012-1,51,39|warp|To Moggun Cave#012-10|-1,-1,012-3,370,43
+012-1,147,67|warp|To Moggun Cave#012-11|-1,-1,012-3,474,106
+012-1,41,48|warp|To Moggun Cave#012-12|-1,-1,012-3,353,78
+012-1,44,88|warp|To Moggun Cave#012-13|-1,-1,012-3,355,187
+012-1,92,104|warp|To Moggun Cave#012-14|-1,-1,012-3,270,111
+012-1,98,99|warp|To Small Cave#012-15|-1,-1,012-3,37,81
+012-1,109,92|warp|To Small Cave#012-16|-1,-1,012-3,80,73
+012-1,123,90|warp|To Mana Seed Ca#012-17|-1,-1,012-3,38,156
+012-1,150,61|warp|To Woodland Hil#012-18|-1,2,013-1,21,75
+012-1,132,176|warp|To Woodland#012-19|0,-1,011-1,73,10
+012-1,65,126|warp|To Moggun Cave#012-110|-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 c8f8cd8e..83fe7005 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#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
+012-3,37,82|warp|To Woodland Hil#012-30|-1,-1,012-1,98,100
+012-3,80,74|warp|To Woodland Hil#012-31|-1,-1,012-1,109,93
+012-3,38,157|warp|To Woodland Hil#012-32|-1,-1,012-1,123,91
+012-3,270,112|warp|To Woodland Hil#012-33|-1,-1,012-1,92,105
+012-3,176,138|warp|To Blossom Land#012-34|-1,-1,012-1,65,128
+012-3,355,188|warp|To Blossom Land#012-35|-1,-1,012-1,44,89
+012-3,370,44|warp|To Small Lost L#012-36|-1,-1,012-1,51,40
+012-3,353,79|warp|To Lost Land#012-37|-1,-1,012-1,41,49
+012-3,473,106|warp|To Small Closed#012-38|-1,-1,012-1,146,67
+012-3,448,61|warp|To Terranite Ca#012-39|-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 62564236..a492edcf 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#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
+012-4,193,58|warp|To Moggun Cave#012-40|-1,-1,012-3,448,62
+012-4,363,26|warp|To Small Cave#012-41|-1,-1,012-4,474,187
+012-4,474,188|warp|To Terranite Ca#012-42|-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 8889e9a4..d00af258 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 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
+013-1,125,104|warp|To Woodland Hil#013-10|-1,-1,013-3,34,64
+013-1,20,76|warp|To Woodland Hil#013-11|-1,2,012-1,149,60
+013-1,46,20|warp|To Woodland Hil#013-12|2,-1,017-1,46,104
+013-1,42,90|warp|To Magic House#013-13|-1,-1,013-2,63,41
+013-1,136,52|warp|To Woodland Hil#013-14|-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 9349f538..18e78c93 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#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
+013-2,63,42|warp|To Outside#013-20|-1,-1,013-1,42,91
+013-2,67,36|warp|To Magic Room#013-21|-1,-1,013-2,21,40
+013-2,21,41|warp|To Magic House #013-22|-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 aaa9dde1..7cb0c542 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#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
+013-3,28,20|warp|To Woodland Hil#013-30|-1,-1,013-1,0,0
+013-3,34,63|warp|To Woodland Hil#013-31|-1,-1,013-1,125,103
+013-3,36,96|warp|To Woodland Hil#013-32|-1,-1,013-3,79,126
+013-3,79,125|warp|To Woodland Hil#013-33|-1,-1,013-3,35,96
+013-3,22,115|warp|To Woodland Min#013-34|-1,-1,018-1,115,41
+013-3,139,45|warp|To Woodland Min#013-35|-1,-1,018-1,127,37
+013-3,61,179|warp|To Woodland Min#013-36|-1,-1,018-1,134,46
+013-3,69,143|warp|To Northern Min#013-37|-1,-1,018-3,50,89
+013-3,81,103|warp|To Woodland Min#013-38|-1,-1,018-1,147,41
+013-3,177,91|warp|To Jack O Land#013-39|-1,-1,018-1,177,21
+013-3,178,44|warp|To Northern Min#013-310|-1,-1,018-3,97,70
+013-3,169,45|warp|To Northern Min#013-311|-1,-1,018-3,27,55
+013-3,152,28|warp|To Northern Min#013-312|-1,-1,018-3,134,62
+013-3,123,104|warp|To Northern Min#013-313|-1,-1,018-3,172,22
+013-3,147,104|warp|To Northern Min#013-314|-1,-1,018-3,177,22
+013-3,158,66|warp|To Northern Min#013-315|-1,-1,018-3,27,90
+013-3,75,51|warp|To Woodland Hil#013-316|-1,-1,013-3,109,65
+013-3,109,64|warp|To Woodland Hil#013-317|-1,-1,013-3,75,50
+013-3,67,51|warp|To Northern Min#013-318|-1,-1,018-3,90,51
+013-3,71,20|warp|To Demon Mask C#013-319|-1,-1,013-3,28,39
+013-3,28,41|warp|To Fight Cave#013-320|-1,-1,013-3,71,21
+013-3,71,42|warp|To Black Scorpi#013-321|-1,-1,013-3,109,21
+013-3,109,20|warp|To Woodland Hil#013-322|-1,-1,013-3,71,41
+013-3,111,42|warp|To Magic Booksh#013-323|-1,-1,018-3,71,123
+013-3,62,100|warp|To Northern Min#013-324|-1,-1,018-3,174,86
+013-3,68,97|warp|To Northern Min#013-325|-1,-1,018-3,102,70
+013-3,160,103|warp|To Hurnscald Ca#013-326|-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 ac9f04e8..b0d9c488 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#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
+014-1,109,91|warp|To Woodland#014-10|-1,1,011-1,31,61
+014-1,93,58|warp|To Woodland Cav#014-11|-1,-1,014-3,57,172
+014-1,76,38|warp|To Woodland Cav#014-12|-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 68cf4739..c85fb564 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#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
+014-3,35,32|warp|To Woodland#014-30|-1,-1,014-1,76,39
+014-3,57,173|warp|To Woodland#014-31|0,-1,014-1,93,59
+014-3,91,108|warp|To Second Cave#014-32|-1,-1,014-3,103,53
+014-3,103,54|warp|To First Cave#014-33|-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 c4693f67..ba04bfa4 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#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
+015-1,93,55|warp|To Woodland#015-10|-1,0,010-1,14,54
+015-1,59,31|warp|To Cat's Cave#015-11|-1,-1,015-3,31,42
+015-1,59,101|warp|To Woodland Swa#015-12|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 9aac8fd6..7a815f5c 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#147|-1,-1,015-1,59,32
+015-3,31,43|warp|To Woodland#015-30|-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 f20d120f..190b684e 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#415|1,-1,010-1,56,104
-016-1,20,53|warp|To Woodland Swamp#416|-1,1,025-1,129,58
+016-1,56,18|warp|To Woodland#016-10|1,-1,010-1,56,104
+016-1,20,53|warp|To Woodland Swa#016-11|-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 a4f2ddf3..5ccd8e45 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#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
+017-1,46,105|warp|To Woodland Hil#017-10|2,-1,013-1,45,21
+017-1,43,32|warp|To Theater#017-11|-1,-1,017-2,26,30
+017-1,76,31|warp|To Woodland Hil#017-12|-1,-1,017-3,69,68
+017-1,98,20|warp|To Woodland Hil#017-13|-1,-1,017-3,83,52
+017-1,97,31|warp|To Woodland Hil#017-14|-1,-1,017-3,76,65
+017-1,168,90|warp|To Mirak's Hous#017-15|-1,-1,056-2,34,30
+017-1,188,104|warp|To Woodland Hil#017-16|-1,-1,055-1,74,21
+017-1,182,16|warp|To Deep Snow Fo#017-17|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 e8956775..5fc095e5 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#384|-1,-1,017-1,43,33
-017-2,26,21|warp|To Center Trapdoor #385|-1,-1,017-9,26,27
+017-2,26,31|warp|To Outside#017-20|-1,-1,017-1,43,33
+017-2,26,21|warp|To Center Trapd#017-21|-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 0cbf1b52..6ed5ec7b 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#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
+017-3,69,69|warp|To Woodland Hil#017-30|-1,-1,017-1,76,32
+017-3,83,53|warp|To Theater Hill#017-31|-1,-1,017-1,98,21
+017-3,76,64|warp|To Woodland Hil#017-32|-1,-1,017-1,98,30
+017-3,63,26|warp|To Deeper Labyr#017-33|-1,-1,017-4,52,24
+017-3,29,48|warp|To Deeper Labyr#017-34|-1,-1,017-4,30,48
+017-3,69,52|warp|To Deeper Labyr#017-35|-1,-1,017-4,91,27
+017-3,58,60|warp|To Deeper Labyr#017-36|-1,-1,017-4,83,40
+017-3,32,70|warp|To Deeper Labyr#017-37|0,-1,017-4,123,27
+017-3,82,77|warp|To Deeper Cave#017-38|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 d900da36..baa3e6db 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#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
+017-4,201,25|warp|To Labyrinth#017-40|-1,-1,017-4,173,46
+017-4,91,26|warp|To Cave#017-41|-1,-1,017-3,69,51
+017-4,123,26|warp|To Cave#017-42|-1,-1,017-3,32,69
+017-4,166,26|warp|To Cave#017-43|-1,-1,017-3,82,76
+017-4,30,47|warp|To Cave#017-44|-1,-1,017-3,29,47
+017-4,52,25|warp|To Cave#017-45|-1,-1,017-3,63,27
+017-4,83,41|warp|To Cave#017-46|-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 3515d56f..439dea5e 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#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
+017-9,22,20|warp|To Nivalis#017-90|-1,-1,020-1,60,75
+017-9,26,21|warp|To Hurnscald#017-91|-1,-1,009-1,43,45
+017-9,30,20|warp|To Tumlishar#017-92|-1,-1,001-1,55,118
+017-9,26,28|warp|To second warpz#017-93|-1,-1,017-2,26,23
+017-9,31,28|warp|To Crypt#017-94|-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 f485e397..d429039e 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#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
+018-1,79,59|warp|To Northern Min#018-10|0,-1,018-3,100,132
+018-1,112,61|warp|To Bat Cave#018-11|-1,-1,018-3,44,38
+018-1,115,40|warp|To Woodland Hil#018-12|-1,-1,013-3,22,114
+018-1,128,56|warp|To Northern Min#018-13|-1,-1,018-3,49,99
+018-1,90,42|warp|To Northern Min#018-14|-1,-1,018-3,123,166
+018-1,69,54|warp|To Northern Min#018-15|-1,-1,018-3,70,105
+018-1,127,36|warp|To Woodland Hil#018-16|-1,-1,013-3,139,44
+018-1,134,45|warp|To Woodland Hil#018-17|-1,-1,013-3,61,178
+018-1,147,40|warp|To Woodland Hil#018-18|-1,-1,013-3,81,102
+018-1,153,46|warp|To Northern Min#018-19|-1,-1,018-3,145,162
+018-1,158,34|warp|To Northern Min#018-110|-1,-1,018-3,64,103
+018-1,162,44|warp|To Northern Min#018-111|-1,-1,018-3,29,166
+018-1,177,20|warp|To Jack O Cave#018-112|-1,-1,013-3,177,90
+018-1,65,73|warp|To Woodland Min#018-113|-1,-1,018-2,50,28
+018-1,79,98|warp|To Hurnscald Ou#018-114|2,-1,008-1,78,18
+018-1,64,70|warp|To Woodland Min#018-115|-1,-1,018-2,41,21
+018-1,78,34|warp|To Northern Min#018-116|-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 bb4b31a2..ab989a93 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#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
+018-2,50,29|warp|To Outside#018-20|-1,-1,018-1,65,74
+018-2,41,20|warp|To Outside#018-21|-1,-1,018-1,64,69
+018-2,20,24|warp|To Bottom Floor#018-22|-1,-1,018-2,112,26
+018-2,112,25|warp|To First Floor#018-23|-1,-1,018-2,20,23
+018-2,21,28|warp|To Second Floor#018-24|0,-1,018-2,79,25
+018-2,79,26|warp|To First Floor#018-25|0,-1,018-2,21,29
+018-2,114,19|warp|To Northern Min#018-26|-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 249a3216..de023db1 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#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
+018-3,100,133|warp|To Woodland Hil#018-30|0,-1,018-1,79,60
+018-3,44,39|warp|To Woodland Min#018-31|-1,-1,018-1,112,62
+018-3,49,100|warp|To Woodland Hil#018-32|-1,-1,018-1,128,57
+018-3,123,167|warp|To Woodland Min#018-33|-1,-1,018-1,90,43
+018-3,70,106|warp|To Woodland Hil#018-34|-1,-1,018-1,69,55
+018-3,50,88|warp|To Woodland Hil#018-35|-1,-1,013-3,69,142
+018-3,145,163|warp|To Woodland Min#018-36|-1,-1,018-1,153,47
+018-3,64,104|warp|To Woodland Hil#018-37|-1,-1,018-1,158,35
+018-3,29,167|warp|To Woodland Min#018-38|-1,-1,018-1,162,45
+018-3,97,69|warp|To Fight Cave#018-39|-1,-1,013-3,178,43
+018-3,27,54|warp|To Woodland Hil#018-310|-1,-1,013-3,169,44
+018-3,134,63|warp|To Fight Cave#018-311|-1,-1,013-3,152,29
+018-3,177,56|warp|To Woodland Min#018-312|-1,-1,018-2,114,20
+018-3,172,21|warp|To Woodland Hil#018-313|-1,-1,013-3,123,103
+018-3,177,21|warp|To Jack O Cave#018-314|-1,-1,013-3,147,103
+018-3,27,91|warp|To Jack O Cave#018-315|-1,-1,013-3,158,67
+018-3,90,50|warp|To Fight Cave#018-316|-1,-1,013-3,67,50
+018-3,71,122|warp|To Black Scorpi#018-317|-1,-1,013-3,111,41
+018-3,174,85|warp|To Woodland Hil#018-318|-1,-1,013-3,62,99
+018-3,102,69|warp|To Woodland Hil#018-319|-1,-1,013-3,68,96
+018-3,179,181|warp|To Hurnscald Ca#018-320|-1,-1,009-3,157,31
+018-3,107,146|warp|To Woodland Min#018-321|-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 9c8951e3..d0c2db28 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#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
+019-1,70,21|warp|To Nivalis#019-10|2,-1,020-1,70,127
+019-1,96,40|warp|To Snow Cave#019-11|-1,-1,019-3,98,30
+019-1,38,75|warp|To Snow Cave#019-12|-1,-1,019-3,39,101
+019-1,21,70|warp|To Snow Path#019-13|-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 f5c6bf8f..358f9cac 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#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
+019-3,40,102|warp|To Snow Field#019-30|-1,-1,019-1,37,74
+019-3,98,29|warp|To Snow Field#019-31|-1,-1,019-1,96,39
+019-3,80,103|warp|To Frozen Lake#019-32|-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 d32ca463..52660871 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#60|-1,-1,047-1,154,93
-019-4,25,124|warp|To Snow Hills#61|0,-1,046-1,62,27
+019-4,74,28|warp|To Snow Hills#019-40|-1,-1,047-1,154,93
+019-4,25,124|warp|To Snow Hills#019-41|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 8bdf0acd..74681fed 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#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
+020-1,76,38|warp|To Ice Cave#020-10|1,-1,020-3,31,26
+020-1,47,48|warp|To Nivalis Indo#020-11|-1,-1,020-2,25,35
+020-1,66,52|warp|To Nivalis Hous#020-12|-1,-1,020-2,72,70
+020-1,64,82|warp|To Nivalis Inn#020-13|-1,-1,020-2,111,32
+020-1,86,46|warp|To Armory#020-14|-1,-1,020-2,32,73
+020-1,57,91|warp|To Nivalis Shop#020-15|-1,-1,020-2,65,23
+020-1,70,128|warp|To Snow Field#020-16|2,-1,019-1,70,22
+020-1,107,55|warp|To Nivalis Port#020-17|-1,-1,031-1,38,55
+020-1,59,45|warp|To Nivalis Stor#020-18|-1,-1,020-2,127,68
+020-1,33,93|warp|To Christmas In#020-19|-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 34f8911b..c3daeac4 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#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
+020-2,25,36|warp|To Outside#020-20|-1,-1,020-1,47,49
+020-2,64,23|warp|To Outside#020-21|-1,-1,020-1,56,91
+020-2,111,33|warp|To Outside#020-22|-1,-1,020-1,64,83
+020-2,32,74|warp|To Outside#020-23|-1,-1,020-1,86,47
+020-2,72,71|warp|To Outside#020-24|-1,-1,020-1,66,53
+020-2,127,69|warp|To Outside#020-25|-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 e7fb0106..8d08abd8 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#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
+020-3,31,25|warp|To Nivalis#020-30|-1,-1,020-1,76,37
+020-3,25,22|warp|To Ice Cave#020-31|-1,-1,020-3,97,101
+020-3,97,99|warp|To Ice Entrance#020-32|-1,-1,020-3,25,24
+020-3,28,57|warp|To Ice Cave#020-33|-1,-1,020-3,33,99
+020-3,49,33|warp|To Ice Cave#020-34|-1,-1,020-3,110,56
+020-3,33,98|warp|To Ice Entrance#020-35|-1,-1,020-3,28,56
+020-3,110,57|warp|To Ice Entrance#020-36|-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 dbe2515b..36db813f 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 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
+021-3,143,127|warp|To Central Tuli#021-30|-1,-1,001-1,117,109
+021-3,57,99|warp|To Central Tuli#021-31|-1,-1,001-1,60,84
+021-3,29,62|warp|To Beach#021-32|-1,-1,001-1,28,45
+021-3,44,143|warp|To Sea Cave#021-33|-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 ba2eb607..0b34cf75 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#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
+025-1,19,66|warp|To Swamp#025-10|-1,-1,026-1,128,66
+025-1,90,19|warp|To Woodland#025-11|2,-1,015-1,59,100
+025-1,130,58|warp|To Woodland#025-12|-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 8794e7a3..305ad2ce 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#391|1,-1,025-1,42,81
-025-3,105,86|warp|To Clauquer's Cave#392|-1,-1,025-4,28,36
+025-3,112,98|warp|To Woodland Swa#025-30|1,-1,025-1,42,81
+025-3,105,86|warp|To Clauquer's C#025-31|-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 bc60aa01..dc4bcf29 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#597|-1,-1,025-3,105,87
+025-4,28,37|warp|To Rossy Main H#025-40|-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 0ff30a2c..f95d2eff 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#342|-1,-1,027-1,63,105
-026-1,129,66|warp|To Woodland Swamp#343|-1,-1,025-1,20,66
+026-1,63,16|warp|To Graveyard#026-10|-1,-1,027-1,63,105
+026-1,129,66|warp|To Woodland Swa#026-11|-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 36ff4c45..a75d6f4e 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 Hous#179|-1,-1,027-2,26,33
-027-1,63,106|warp|To Swamp#180|-1,-1,026-1,63,17
+027-1,88,84|warp|To Caretaker's #027-10|-1,-1,027-2,26,33
+027-1,63,106|warp|To Swamp#027-11|-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 5cd8fb0f..aa7c0cb1 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#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
+027-2,26,34|warp|To Outside#027-20|-1,-1,027-1,88,85
+027-2,128,35|warp|To Second Floor#027-21|0,-1,027-2,75,93
+027-2,76,95|warp|To First Floor#027-22|0,-1,027-2,128,36
+027-2,106,46|warp|To Outside#027-23|0,-1,027-1,68,89
+027-2,113,111|warp|To Graveyard#027-24|4,-1,027-1,28,68
+027-2,113,78|warp|To Crypts Basem#027-25|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 04c55f4d..b2b2d52a 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#277|2,-1,027-2,112,77
-027-3,126,98|warp|To Crypts Sub-Basem#278|1,-1,027-4,125,18
+027-3,26,67|warp|To Crypts Entra#027-30|2,-1,027-2,112,77
+027-3,126,98|warp|To Crypts Sub-B#027-31|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 e8a6af74..0478a64c 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#441|3,-1,027-3,125,98
-027-4,22,98|warp|To Crypts Sub-Basem#442|2,-1,027-5,124,18
+027-4,125,17|warp|To Crypts Basem#027-40|3,-1,027-3,125,98
+027-4,22,98|warp|To Crypts Sub-B#027-41|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 7b6f34a0..35c91f7e 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-Basem#443|3,-1,027-4,21,97
+027-5,125,17|warp|To Crypts Sub-B#027-50|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 e0dae580..8f2ffd4a 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 Ca#421|-1,-1,028-3,33,77
+028-1,120,125|warp|To Easter Islan#028-10|-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 ac5ea92d..393f8340 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#401|-1,-1,028-1,120,126
+028-3,33,78|warp|To Easter Islan#028-30|-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 ccd2a3a9..0cd326bb 100644
--- a/world/map/npc/029-1/_warps.txt
+++ b/world/map/npc/029-1/_warps.txt
@@ -1,7 +1,8 @@
// 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#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
+029-1,40,88|warp|To Valon's Hous#029-10|-1,-1,029-2,29,61
+029-1,44,83|warp|To Storeroom#029-11|-1,-1,029-2,22,92
+029-1,52,84|warp|To The Magic Sh#029-12|-1,-1,029-2,103,61
+029-1,58,79|warp|To Two Arms#029-13|-1,-1,029-2,94,30
+029-1,49,77|warp|To The Bank#029-14|-1,-1,029-2,24,123
diff --git a/world/map/npc/029-2/_import.txt b/world/map/npc/029-2/_import.txt
index 086ac850..29e2607a 100644
--- a/world/map/npc/029-2/_import.txt
+++ b/world/map/npc/029-2/_import.txt
@@ -3,10 +3,13 @@
map: 029-2
npc: npc/029-2/_mobs.txt
npc: npc/029-2/_warps.txt
+npc: npc/029-2/bankroom.txt
npc: npc/029-2/barrels.txt
npc: npc/029-2/barrels_config.txt
+npc: npc/029-2/cynric.txt
npc: npc/029-2/mapflags.txt
npc: npc/029-2/morgan.txt
+npc: npc/029-2/nyle.txt
npc: npc/029-2/sorfina.txt
npc: npc/029-2/stat_reset.txt
npc: npc/029-2/tanisha.txt
diff --git a/world/map/npc/029-2/_warps.txt b/world/map/npc/029-2/_warps.txt
index 9650dd1a..9b3d0e52 100644
--- a/world/map/npc/029-2/_warps.txt
+++ b/world/map/npc/029-2/_warps.txt
@@ -1,8 +1,9 @@
// 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#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
+029-2,29,62|warp|To Outside#029-20|-1,-1,029-1,40,89
+029-2,22,93|warp|To Outside#029-21|-1,-1,029-1,44,84
+029-2,112,84|warp|To Bedroom#029-22|-1,-1,029-2,44,30
+029-2,103,62|warp|To Outside#029-23|-1,-1,029-1,52,85
+029-2,94,31|warp|To Outside#029-24|-1,-1,029-1,58,80
+029-2,24,124|warp|To Outside#029-25|-1,-1,029-1,49,78
diff --git a/world/map/npc/029-2/bankroom.txt b/world/map/npc/029-2/bankroom.txt
new file mode 100644
index 00000000..dea5a428
--- /dev/null
+++ b/world/map/npc/029-2/bankroom.txt
@@ -0,0 +1,9 @@
+// Nyle is part of the Tutorial.
+// He explains how to use the bank.
+// Author: Cassy
+
+029-2,36,122,0|script|#BankRoom|45,1,0
+{
+ message strcharinfo(0), "The door is locked. This must be where Cynric saves the people's money and items.";
+ end;
+}
diff --git a/world/map/npc/029-2/cynric.txt b/world/map/npc/029-2/cynric.txt
new file mode 100644
index 00000000..d9f46d85
--- /dev/null
+++ b/world/map/npc/029-2/cynric.txt
@@ -0,0 +1,9 @@
+//
+
+029-2,30,118,0|script|Cynric|161
+{
+ callfunc "ClearVariables";
+ set @npcname$, "Cynric";
+ callfunc "Banker";
+ close;
+}
diff --git a/world/map/npc/029-2/nyle.txt b/world/map/npc/029-2/nyle.txt
new file mode 100644
index 00000000..3e15d6cb
--- /dev/null
+++ b/world/map/npc/029-2/nyle.txt
@@ -0,0 +1,51 @@
+// Nyle is part of the Tutorial.
+// He explains how to use the bank.
+// Author: Cassy
+
+029-2,26,120,6|script|Nyle|101
+{
+ mes "[Nyle]";
+ mes "\"Visiting the bank too right? We're only a small village but Cynric is the best bank guy I know.\"";
+ menu
+ "Yeah, your right.", L_Close,
+ "What is banking?", L_Explain;
+
+L_Explain:
+ mes "[Nyle]";
+ mes "\"There are banks all over the world. Usually every important village or city has one.";
+ mes "You can save both items and money at a bank.\"";
+ menu
+ "How do I save items?", L_Items,
+ "How do I save money?", L_Money,
+ "Thanks!", L_Thanks;
+
+L_Items:
+ mes "[Nyle]";
+ mes "\"Let Cynric open your storage. You might also want to open your inventory.";
+ mes "Pick an item from either storage or inventory and choose what you want to do with it by clicking the right button.";
+ mes "You can also pick and drag items from one window into the other but this will move all items of this kind.";
+ next;
+ mes "Items in your storage are totally safe. Banking itself is totally safe.\"";
+ menu
+ "And how do I save money?", L_Money,
+ "Thanks!", L_Thanks;
+
+L_Money:
+ mes "[Nyle]";
+ mes "\"That's easy. Cynric will save your money when you ask him to deposit. Or you pick up your money by asking to withdraw.";
+ mes "You only have to tell him how much you want to deposit or withdraw.";
+ mes "Also you can ask how much he already save for you by checking your balance.";
+ next;
+ mes "Money in your storage is totally safe. Banking itself is totally safe.\"";
+ menu
+ "And how do I save items?", L_Items,
+ "Thanks!", L_Thanks;
+
+L_Thanks:
+ mes "[Nyle]";
+ mes "\"You are very welcome.\"";
+ goto L_Close;
+
+L_Close:
+ close;
+}
diff --git a/world/map/npc/030-2/_warps.txt b/world/map/npc/030-2/_warps.txt
index be4c8e39..1bfc17a2 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#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
+030-2,88,51|warp|To Outside#030-20|-1,-1,020-1,33,94
+030-2,72,31|warp|To Basement#030-21|-1,-1,030-2,51,31
+030-2,194,68|warp|To Fourth Floor#030-22|-1,-1,030-2,78,88
+030-2,52,31|warp|To First Floor#030-23|-1,-1,030-2,73,31
+030-2,75,19|warp|To Second Floor#030-24|0,-1,030-2,127,50
+030-2,102,19|warp|To Second Floor#030-25|0,-1,030-2,153,50
+030-2,127,51|warp|To First Floor#030-26|0,-1,030-2,75,20
+030-2,154,51|warp|To First Floor#030-27|0,-1,030-2,101,20
+030-2,156,24|warp|To Third Floor#030-28|-1,0,030-2,21,78
+030-2,20,78|warp|To Second Floor#030-29|-1,0,030-2,155,24
+030-2,42,105|warp|To Fourth Floor#030-210|0,-1,030-2,93,74
+030-2,94,73|warp|To Third Floor#030-211|0,-1,030-2,41,104
+030-2,102,73|warp|To Fifth Floor#030-212|0,-1,030-2,127,104
+030-2,127,105|warp|To Fourth Floor#030-213|0,-1,030-2,102,74
+030-2,78,87|warp|To Private Room#030-214|-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 5b74ef04..2927632e 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#62|-1,-1,019-3,80,102
+030-3,54,69|warp|To Snow Cave#030-30|-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 f55dd69a..7c281c2a 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#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
+031-1,37,55|warp|To Nivalis#031-10|-1,-1,020-1,106,55
+031-1,76,24|warp|To Ice Labyrint#031-11|-1,-1,031-3,212,299
+031-1,90,115|warp|To Nivalis Stor#031-12|-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 01ccb55d..0365ad8d 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#177|-1,-1,031-1,95,81
-031-2,73,30|warp|To Outside#178|-1,-1,031-1,90,116
+031-2,23,30|warp|To Outside#031-20|-1,-1,031-1,95,81
+031-2,73,30|warp|To Outside#031-21|-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 669af6fc..e6599a37 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#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
+031-3,212,300|warp|To Nivalis Port#031-30|-1,-1,031-1,76,25
+031-3,205,264|warp|To Ice Labyrint#031-31|-1,-1,031-3,150,260
+031-3,149,259|warp|To Ice Labyrint#031-32|-1,-1,031-3,206,265
+031-3,225,282|warp|To Ice Labyrint#031-33|-1,-1,031-3,274,299
+031-3,274,300|warp|To Ice Labyrint#031-34|-1,-1,031-3,225,283
+031-3,283,271|warp|To Ice Labyrint#031-35|-1,-1,031-3,269,244
+031-3,269,245|warp|To Ice Labyrint#031-36|-1,-1,031-3,283,272
+031-3,148,150|warp|To Ice Labyrint#031-37|-1,-1,031-3,128,134
+031-3,139,258|warp|To Ice Labyrint#031-38|-1,-1,031-3,156,196
+031-3,155,195|warp|To Ice Labyrint#031-39|-1,-1,031-3,139,259
+031-3,142,301|warp|To Ice Labyrint#031-310|-1,-1,031-3,98,300
+031-3,97,301|warp|To Ice Labyrint#031-311|-1,-1,031-3,143,300
+031-3,135,196|warp|To Ice Labyrint#031-312|-1,-1,031-3,106,231
+031-3,106,232|warp|To Ice Labyrint#031-313|-1,-1,031-3,135,197
+031-3,286,190|warp|To Ice Labyrint#031-314|-1,-1,031-3,227,241
+031-3,227,242|warp|To Ice Labyrint#031-315|-1,-1,031-3,286,191
+031-3,236,211|warp|To Ice Labyrint#031-316|-1,-1,031-3,187,227
+031-3,187,228|warp|To Ice Labyrint#031-317|-1,-1,031-3,236,212
+031-3,94,254|warp|To Ice Labyrint#031-318|-1,-1,031-3,54,251
+031-3,54,250|warp|To Ice Labyrint#031-319|-1,-1,031-3,94,255
+031-3,103,199|warp|To Ice Labyrint#031-320|-1,-1,031-3,52,176
+031-3,52,177|warp|To Ice Labyrint#031-321|-1,-1,031-3,103,200
+031-3,212,193|warp|To Ice Labyrint#031-322|-1,-1,031-3,207,167
+031-3,207,168|warp|To Ice Labyrint#031-323|-1,-1,031-3,212,194
+031-3,235,167|warp|To Ice Labyrint#031-324|-1,-1,031-3,195,123
+031-3,195,122|warp|To Ice Labyrint#031-325|-1,-1,031-3,235,166
+031-3,296,97|warp|To Ice Labyrint#031-326|-1,-1,031-3,292,124
+031-3,292,123|warp|To Ice Labyrint#031-327|-1,-1,031-3,296,96
+031-3,289,164|warp|To Ice Labyrint#031-328|-1,-1,031-3,228,122
+031-3,228,121|warp|To Ice Labyrint#031-329|-1,-1,031-3,289,163
+031-3,24,157|warp|To Ice Labyrint#031-330|-1,-1,031-3,31,143
+031-3,31,144|warp|To Ice Labyrint#031-331|-1,-1,031-3,24,158
+031-3,36,249|warp|To Ice Labyrint#031-332|-1,-1,031-3,35,225
+031-3,35,226|warp|To Ice Labyrint#031-333|-1,-1,031-3,36,250
+031-3,34,25|warp|To Ice Labyrint#031-334|-1,-1,031-3,281,24
+031-3,281,22|warp|To Ice Labyrint#031-335|-1,-1,031-3,34,27
+031-3,283,48|warp|To Ice Labyrint#031-336|-1,-1,031-3,275,74
+031-3,275,73|warp|To Ice Labyrint#031-337|-1,-1,031-3,283,47
+031-3,26,178|warp|To Ice Labyrint#031-338|-1,-1,031-3,36,201
+031-3,36,200|warp|To Ice Labyrint#031-339|-1,-1,031-3,26,177
+031-3,91,125|warp|To Ice Labyrint#031-340|-1,-1,031-3,36,79
+031-3,36,80|warp|To Ice Labyrint#031-341|-1,-1,031-3,91,126
+031-3,52,78|warp|To Ice Labyrint#031-342|-1,-1,031-3,192,71
+031-3,192,70|warp|To Ice Labyrint#031-343|-1,-1,031-3,52,77
+031-3,128,135|warp|To Ice Labyrint#031-344|-1,-1,031-3,148,151
+031-3,232,93|warp|To Ice Labyrint#031-345|-1,-1,031-3,234,26
+031-3,234,25|warp|To Ice Labyrint#031-346|-1,-1,031-3,232,92
+031-3,200,50|warp|To Ice Labyrint#031-347|-1,-1,031-3,136,30
+031-3,136,29|warp|To Ice Labyrint#031-348|-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 4ecd2071..a4348c6d 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#413|-1,-1,006-1,30,124
-032-3,56,61|warp|To Desert Mountains#414|-1,-1,006-1,111,111
+032-3,128,34|warp|To Desert Mount#032-30|-1,-1,006-1,30,124
+032-3,56,61|warp|To Desert Mount#032-31|-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 b0818f04..daca389c 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#512|-1,0,034-1,159,19
-033-1,119,70|warp|To Snow Field#513|-1,0,019-1,22,69
+033-1,22,20|warp|To Snow Forest#033-10|-1,0,034-1,159,19
+033-1,119,70|warp|To Snow Field#033-11|-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 705065be..714852f0 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#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
+034-1,160,20|warp|To Snow Field#034-10|-1,0,033-1,23,19
+034-1,16,103|warp|To Deep Snow Fo#034-11|-1,1,045-1,176,133
+034-1,15,31|warp|To Deep Snow Fo#034-12|-1,0,045-1,174,59
+034-1,95,18|warp|To Highlands#034-13|0,-1,046-1,94,123
+034-1,31,68|warp|To Trapper#034-14|-1,-1,034-2,28,31
+034-1,64,99|warp|To Cabin#034-15|-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 3542f57e..b1d27c28 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#307|-1,-1,034-1,31,69
-034-2,73,30|warp|To Outside#308|-1,-1,034-1,64,100
+034-2,28,32|warp|To Outside#034-20|-1,-1,034-1,31,69
+034-2,73,30|warp|To Outside#034-21|-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 732e0ed2..5d2b158c 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#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
+043-3,31,26|warp|Mine Camp#043-30|-1,-1,002-3,22,86
+043-3,77,30|warp|To Lower Level#043-31|-1,-1,043-4,47,67
+043-3,116,36|warp|To Snake Cave#043-32|-1,-1,005-3,78,87
+043-3,32,37|warp|To Snake Cave#043-33|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 a9c38be0..2147820d 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#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
+043-4,47,68|warp|To Upper Level#043-40|-1,-1,043-3,77,31
+043-4,153,27|warp|To Deeper Level#043-41|-1,-1,043-4,193,32
+043-4,193,33|warp|To Upper Level#043-42|-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 4b48c1d5..feffd6aa 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#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
+045-1,175,60|warp|To Snow Forest#045-10|-1,0,034-1,16,30
+045-1,177,132|warp|To Snow Forest#045-11|-1,1,034-1,17,102
+045-1,26,179|warp|To Woodland Hil#045-12|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 4a078324..1c599849 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#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
+046-1,95,124|warp|To Snow Forest#046-10|0,-1,034-1,94,19
+046-1,29,20|warp|To Highlands#046-11|-1,-1,047-1,70,178
+046-1,31,20|warp|To Highlands#046-12|-1,-1,047-1,70,178
+046-1,78,37|warp|To Frosty Under#046-13|-1,-1,046-3,78,29
+046-1,131,55|warp|To Frosty Under#046-14|-1,-1,046-3,131,47
+046-1,131,62|warp|To Frosty Under#046-15|-1,-1,046-3,131,54
+046-1,139,26|warp|To Frosty Under#046-16|-1,-1,046-3,139,18
+046-1,83,50|warp|To Frosty Under#046-17|-1,-1,046-3,83,42
+046-1,124,116|warp|To Frosty Under#046-18|-1,-1,046-3,124,108
+046-1,62,26|warp|To Frosty Under#046-19|-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 2d5d8482..b9c90ea3 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#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
+046-3,139,19|warp|To Outside#046-30|-1,-1,046-1,139,27
+046-3,78,30|warp|To Outside#046-31|-1,-1,046-1,78,38
+046-3,83,43|warp|To Outside#046-32|-1,-1,046-1,83,51
+046-3,131,48|warp|To Outside#046-33|-1,-1,046-1,131,56
+046-3,131,55|warp|To Outside#046-34|-1,-1,046-1,131,63
+046-3,124,109|warp|To Outside#046-35|-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 819eb937..c0e9eb60 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#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
+047-1,108,165|warp|To Small Cave#047-10|-1,-1,047-3,110,102
+047-1,108,156|warp|To Small Cave#047-11|-1,-1,047-3,119,94
+047-1,102,111|warp|To Small Cave#047-12|-1,-1,047-3,119,58
+047-1,102,107|warp|To Small Cave#047-13|-1,-1,047-3,128,45
+047-1,154,92|warp|To Deeper Snow #047-14|-1,-1,019-4,74,27
+047-1,101,143|warp|To Snow Hills C#047-15|-1,-1,047-3,126,180
+047-1,37,173|warp|To Snow Hills C#047-16|-1,-1,047-3,33,175
+047-1,45,73|warp|To Snow Hills C#047-17|-1,-1,047-3,46,76
+047-1,78,109|warp|To Snow Hills C#047-18|-1,-1,047-3,35,41
+047-1,83,123|warp|To Snow Hills C#047-19|-1,-1,047-3,108,165
+047-1,71,179|warp|To Rock Plateau#047-110|1,-1,046-1,29,21
+047-1,130,50|warp|To Blue Sage Ma#047-111|-1,-1,047-1,130,47
+047-1,130,48|warp|To Snow Hills#047-112|-1,-1,047-1,130,51
+047-1,128,39|warp|To Blue Sage#047-113|-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 a6ce2cdf..31dcdd0c 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#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
+047-3,46,74|warp|To Snow Hills#047-30|-1,-1,047-1,45,75
+047-3,33,176|warp|To Snow Hills#047-31|-1,-1,047-1,37,174
+047-3,126,181|warp|To Snow Hills#047-32|-1,-1,047-1,101,144
+047-3,35,42|warp|To Snow Hills#047-33|-1,-1,047-1,78,110
+047-3,108,163|warp|To Snow Hills#047-34|-1,-1,047-1,83,125
+047-3,110,103|warp|To Snow Hills#047-35|-1,-1,047-1,108,166
+047-3,119,95|warp|To Snow Hills#047-36|-1,-1,047-1,108,157
+047-3,119,59|warp|To Snow Hills#047-37|-1,-1,047-1,102,112
+047-3,128,46|warp|To Snow Hills#047-38|-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 cd627023..2e3b8ab7 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#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
+048-2,22,78|warp|To Second Floor#048-20|0,-1,048-2,84,23
+048-2,60,21|warp|To Second Floor#048-21|0,-1,048-2,121,26
+048-2,40,50|warp|To Outside#048-22|-1,-1,047-1,128,40
+048-2,84,21|warp|To Third Floor#048-23|0,-1,048-2,22,76
+048-2,113,23|warp|To Office#048-24|-1,-1,048-2,147,35
+048-2,122,28|warp|To First Floor#048-25|0,-1,048-2,59,22
+048-2,95,23|warp|To Office#048-26|-1,-1,048-2,178,35
+048-2,147,36|warp|To Corridor#048-27|-1,-1,048-2,113,24
+048-2,178,36|warp|To Corridor#048-28|-1,-1,048-2,95,24
+048-2,27,141|warp|To Corridor#048-29|-1,-1,048-2,52,102
+048-2,60,71|warp|To Fourth Floor#048-210|0,-1,048-2,60,104
+048-2,23,73|warp|To Library#048-211|-1,-1,048-2,85,132
+048-2,55,73|warp|To Library#048-212|-1,-1,048-2,121,132
+048-2,61,106|warp|To Third Floor#048-213|0,-1,048-2,59,73
+048-2,52,101|warp|To Bedroom#048-214|-1,-1,048-2,27,140
+048-2,121,133|warp|To Corridor#048-215|-1,-1,048-2,55,74
+048-2,85,133|warp|To Corridor#048-216|-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 e72cc541..f42bd6e2 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#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
+055-1,100,83|warp|To Cave#055-10|-1,-1,055-3,30,27
+055-1,100,89|warp|To Cave#055-11|-1,-1,055-3,50,42
+055-1,22,52|warp|To Woodland Hil#055-12|-1,2,013-1,135,51
+055-1,137,96|warp|To Cave#055-13|-1,-1,055-3,76,39
+055-1,60,93|warp|To Cave#055-14|-1,-1,055-3,96,70
+055-1,75,20|warp|To Woods#055-15|0,-1,017-1,188,103
+055-1,149,63|warp|To Woodland#055-16|-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 a5073d3c..7a72b4cb 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#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
+055-3,77,40|warp|To Woodland Hil#055-30|0,-1,055-1,137,97
+055-3,30,26|warp|To Woodland Hil#055-31|-1,-1,055-1,100,82
+055-3,50,43|warp|To Outside#055-32|-1,-1,055-1,100,90
+055-3,96,71|warp|To Woodland Hil#055-33|0,-1,055-1,60,94
+055-3,58,96|warp|To Cave#055-34|0,-1,055-3,98,115
+055-3,98,114|warp|To Cave#055-35|-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 5356acf5..0c0d660f 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#450|-1,-1,056-2,23,32
-056-2,35,30|warp|To Woods#451|-1,-1,017-1,169,90
+056-2,63,34|warp|To First Floor#056-20|-1,-1,056-2,23,32
+056-2,35,30|warp|To Woods#056-21|-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 6e4fbb94..8a16eb4f 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#85|-1,1,055-1,148,63
+057-1,19,63|warp|To Woodland Hil#057-10|-1,1,055-1,148,63