7 files changed, 11 insertions, 22 deletions
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 35a39efef..07b38bbfc 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -12,9 +12,9 @@
 003-1,112,146,0	warp	#003-1_112_146	0,0,003-6,40,38
 003-1,111,136,0	warp	#003-1_111_136	0,0,003-7,39,40
 003-1,107,132,0	warp	#003-1_107_132	0,0,003-7,29,31
-003-1,112,100,0	warp	#003-1_112_100	0,0,003-8,31,43
+003-1,110,100,0	warp	#003-1_110_100	0,0,003-8,31,43
 003-1,51,65,0	warp	#003-1_51_65	0,0,003-2,42,34
-003-1,115,93,0	warp	#003-1_115_93	0,0,003-8,41,28
+003-1,115,88,0	warp	#003-1_115_88	0,0,003-8,41,28
 003-1,60,157,0	warp	#003-1_60_157	4,0,004-1,63,57
 003-1,116,120,0	warp	#003-1_116_120	0,0,003-1-2,48,35
 003-1,58,54,0	warp	#003-1_58_54	0,0,003-1-3,82,82
diff --git a/npc/003-8/_warps.txt b/npc/003-8/_warps.txt
index 595a65d6b..7df19cbc7 100644
--- a/npc/003-8/_warps.txt
+++ b/npc/003-8/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 003-8: Terranite Forge warps
-003-8,31,44,0	warp	#003-8_31_44	0,0,003-1,112,101
-003-8,41,27,0	warp	#003-8_41_27	0,0,003-1,115,94
+003-8,31,44,0	warp	#003-8_31_44	0,0,003-1,110,101
+003-8,41,27,0	warp	#003-8_41_27	0,0,003-1,115,89
diff --git a/npc/004-1/_warps.txt b/npc/004-1/_warps.txt
index 936dd3589..1c64ab80e 100644
--- a/npc/004-1/_warps.txt
+++ b/npc/004-1/_warps.txt
@@ -3,3 +3,4 @@
 004-1,63,56,0	warp	#004-1_63_56	4,0,003-1,60,156
 004-1,92,114,0	warp	#004-1_92_114	0,0,007-1,85,51
 004-1,33,109,0	warp	#004-1_33_109	0,0,007-1,51,36
+004-1,120,95,0	warp	#004-1_120_95	0,2,004-2,21,48
diff --git a/npc/004-2-1/_import.txt b/npc/004-2-1/_import.txt
new file mode 100644
index 000000000..5ec83f1d9
--- /dev/null
+++ b/npc/004-2-1/_import.txt
@@ -0,0 +1,2 @@
+// Map 004-2-1: Desert cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/004-2/_mobs.txt b/npc/004-2/_mobs.txt
index ed9825ccd..cf8f1493d 100644
--- a/npc/004-2/_mobs.txt
+++ b/npc/004-2/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains mobs
-004-2,36,20,3,3	monster	Fallen Guard	1082,2,35000,150000
+004-2,56,20,3,3	monster	Fallen Guard	1082,2,35000,150000
diff --git a/npc/004-2/_warps.txt b/npc/004-2/_warps.txt
index b52d7ca76..9e1b2b99d 100644
--- a/npc/004-2/_warps.txt
+++ b/npc/004-2/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains warps
-004-2,19,47,0	warp	#004-2_19_47	0,0,004-1,119,94
+004-2,20,48,0	warp	#004-2_20_48	0,2,004-1,119,95
+004-2,84,77,0	warp	#004-2_84_77	0,0,004-2-1,119,95
diff --git a/npc/_import.txt b/npc/_import.txt
index 76e248ae0..8556a07a8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -25,6 +25,7 @@
 @include "npc/003-7/_import.txt"
 @include "npc/003-8/_import.txt"
 @include "npc/004-1/_import.txt"
+@include "npc/004-2-1/_import.txt"
 @include "npc/004-2/_import.txt"
 @include "npc/005-1/_import.txt"
 @include "npc/005-2/_import.txt"
@@ -34,22 +35,6 @@
 @include "npc/005-6/_import.txt"
 @include "npc/005-7/_import.txt"
 @include "npc/007-1/_import.txt"
-@include "npc/008-1/_import.txt"
-@include "npc/008-2-0/_import.txt"
-@include "npc/008-2-1/_import.txt"
-@include "npc/008-2-10/_import.txt"
-@include "npc/008-2-11/_import.txt"
-@include "npc/008-2-12/_import.txt"
-@include "npc/008-2-13/_import.txt"
-@include "npc/008-2-14/_import.txt"
-@include "npc/008-2-2/_import.txt"
-@include "npc/008-2-3/_import.txt"
-@include "npc/008-2-4/_import.txt"
-@include "npc/008-2-5/_import.txt"
-@include "npc/008-2-6/_import.txt"
-@include "npc/008-2-7/_import.txt"
-@include "npc/008-2-8/_import.txt"
-@include "npc/008-2-9/_import.txt"
 @include "npc/009-1/_import.txt"
 @include "npc/009-2/_import.txt"
 @include "npc/009-5/_import.txt"