14 files changed, 45 insertions, 7 deletions
diff --git a/npc/006-2-2/_warps.txt b/npc/006-2-2/_warps.txt
index 13697d056..4c7ce1358 100644
--- a/npc/006-2-2/_warps.txt
+++ b/npc/006-2-2/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 006-2-2: Secret Cave warps
-006-2-2,36,52,0	warp	#006-2-2_36_52	0,0,006-2,71,87
+006-2-2,35,48,0	warp	#006-2-2_35_48	1,0,006-2,71,87
diff --git a/npc/006-2-3/_mobs.txt b/npc/006-2-3/_mobs.txt
index 54f7b9dcb..29db02808 100644
--- a/npc/006-2-3/_mobs.txt
+++ b/npc/006-2-3/_mobs.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 006-2-3: Mushroom Cavern mobs
-006-2-3,41,42,15,13	monster	Piou	1002,6,30000,30000
-006-2-3,40,40,8,7	monster	Silk Worm	1034,6,30000,30000
-006-2-3,46,42,6,10	monster	Red Butterfly	1025,2,30000,30000
-006-2-3,36,42,6,10	monster	Cyan Butterfly	1172,2,30000,30000
+006-2-3,44,34,14,13	monster	Piou	1002,6,30000,30000
+006-2-3,43,32,8,7	monster	Silk Worm	1034,6,30000,30000
+006-2-3,49,34,6,10	monster	Red Butterfly	1025,2,30000,30000
+006-2-3,39,34,6,10	monster	Cyan Butterfly	1172,2,30000,30000
diff --git a/npc/006-2-3/_warps.txt b/npc/006-2-3/_warps.txt
index 198934da4..e0052f70f 100644
--- a/npc/006-2-3/_warps.txt
+++ b/npc/006-2-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 006-2-3: Mushroom Cavern warps
-006-2-3,41,28,0	warp	#006-2-3_41_28	0,0,006-2,62,109
-006-2-3,41,56,0	warp	#006-2-3_41_56	0,0,006-2,68,114
+006-2-3,44,20,0	warp	#006-2-3_44_20	0,0,006-2,62,109
+006-2-3,44,48,0	warp	#006-2-3_44_48	0,0,006-2,68,114
diff --git a/npc/006-2-4/_import.txt b/npc/006-2-4/_import.txt
new file mode 100644
index 000000000..516cd26f3
--- /dev/null
+++ b/npc/006-2-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-2-4: Training Room
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-2-4/_mobs.txt",
+"npc/006-2-4/_warps.txt",
diff --git a/npc/006-2-4/_mobs.txt b/npc/006-2-4/_mobs.txt
new file mode 100644
index 000000000..760f2ad3a
--- /dev/null
+++ b/npc/006-2-4/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-4: Training Room mobs
+006-2-4,35,27,3,2	monster	Piou Knight	1434,2,30000,30000
diff --git a/npc/006-2-4/_warps.txt b/npc/006-2-4/_warps.txt
new file mode 100644
index 000000000..dac54f44e
--- /dev/null
+++ b/npc/006-2-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-4: Training Room warps
+006-2-4,39,22,0	warp	#006-2-4_39_22	0,0,006-2-5,43,24
diff --git a/npc/006-2-5/_import.txt b/npc/006-2-5/_import.txt
new file mode 100644
index 000000000..7a07b21fb
--- /dev/null
+++ b/npc/006-2-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-2-5: Throne Room
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-2-5/_mobs.txt",
+"npc/006-2-5/_warps.txt",
diff --git a/npc/006-2-5/_mobs.txt b/npc/006-2-5/_mobs.txt
new file mode 100644
index 000000000..86c6e3550
--- /dev/null
+++ b/npc/006-2-5/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-5: Throne Room mobs
+006-2-5,34,28,1,1	monster	Forest Piou	1202,2,30000,30000
+006-2-5,42,28,1,1	monster	Mana Piou	1155,2,30000,30000
diff --git a/npc/006-2-5/_warps.txt b/npc/006-2-5/_warps.txt
new file mode 100644
index 000000000..6f2842d15
--- /dev/null
+++ b/npc/006-2-5/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-5: Throne Room warps
+006-2-5,38,35,0	warp	#006-2-5_38_35	0,0,006-2,68,75
+006-2-5,34,21,0	warp	#006-2-5_34_21	0,0,006-2-4,33,23
+006-2-5,43,23,0	warp	#006-2-5_43_23	0,0,006-2-4,39,23
diff --git a/npc/006-2-6/_import.txt b/npc/006-2-6/_import.txt
new file mode 100644
index 000000000..2b82b5a30
--- /dev/null
+++ b/npc/006-2-6/_import.txt
@@ -0,0 +1,4 @@
+// Map 006-2-6: Upper Level
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/006-2-6/_mobs.txt",
+"npc/006-2-6/_warps.txt",
diff --git a/npc/006-2-6/_mobs.txt b/npc/006-2-6/_mobs.txt
new file mode 100644
index 000000000..6eeca13f0
--- /dev/null
+++ b/npc/006-2-6/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-6: Upper Level mobs
+006-2-6,35,31,1,1	monster	Piou	1002,3,30000,30000
+006-2-6,41,31,1,1	monster	Piousse	1003,3,30000,30000
diff --git a/npc/006-2-6/_warps.txt b/npc/006-2-6/_warps.txt
new file mode 100644
index 000000000..fecd7ad81
--- /dev/null
+++ b/npc/006-2-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 006-2-6: Upper Level warps
+006-2-6,34,23,0	warp	#006-2-6_34_23	0,0,006-2-4,34,22
diff --git a/npc/006-2/_warps.txt b/npc/006-2/_warps.txt
index 90b67fa68..41770a969 100644
--- a/npc/006-2/_warps.txt
+++ b/npc/006-2/_warps.txt
@@ -7,3 +7,4 @@
 006-2,61,109,0	warp	#006-2_61_109	0,0,006-2-3,42,29
 006-2,68,113,0	warp	#006-2_68_113	0,0,006-2-3,41,55
 006-2,68,118,0	warp	#006-2_68_118	0,0,006-0,40,36
+006-2,68,74,0	warp	#006-2_68_74	0,0,006-2-4,38,34
diff --git a/npc/_import.txt b/npc/_import.txt
index 24bbad735..15d640822 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -60,6 +60,9 @@
 @include "npc/006-2-1/_import.txt"
 @include "npc/006-2-2/_import.txt"
 @include "npc/006-2-3/_import.txt"
+@include "npc/006-2-4/_import.txt"
+@include "npc/006-2-5/_import.txt"
+@include "npc/006-2-6/_import.txt"
 @include "npc/006-2/_import.txt"
 @include "npc/006-3/_import.txt"
 @include "npc/006-4-1/_import.txt"