Tonori Canyon.

3 files changed, 34 insertions, 31 deletions

diff --git a/npc/010-1-1/_import.txt b/npc/010-1-1/_import.txt
index a86ab148e..0cf78106d 100644
--- a/npc/010-1-1/_import.txt
+++ b/npc/010-1-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 010-1-1: Canyon Great Caves
+// Map 010-1-1: Canyon Cave
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/010-1-1/_mobs.txt",
 "npc/010-1-1/_warps.txt",
diff --git a/npc/010-1-1/_mobs.txt b/npc/010-1-1/_mobs.txt
index c539ca2be..19c6ac513 100644
--- a/npc/010-1-1/_mobs.txt
+++ b/npc/010-1-1/_mobs.txt
@@ -1,11 +1,11 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 010-1-1: Canyon Great Caves mobs
-010-1-1,55,58,29,22	monster	Cave Snake	1035,8,35000,150000
-010-1-1,70,40,3,1	monster	Small Topaz Bif	1101,1,35000,150000
-010-1-1,79,54,59,54	monster	Cave Maggot	1027,55,40000,200000
-010-1-1,24,34,4,4	monster	Black Scorpion	1071,2,35000,150000
-010-1-1,112,34,4,4	monster	Black Scorpion	1071,2,35000,150000
-010-1-1,147,83,29,22	monster	Black Scorpion	1074,12,35000,150000
-010-1-1,124,43,29,22	monster	Bat	1039,3,35000,150000
-010-1-1,135,63,54,54	monster	Snake	1122,20,40000,200000
-010-1-1,92,90,54,48	monster	Small Topaz Bif	1101,4,40000,200000
+// Map 010-1-1: Canyon Cave mobs
+010-1-1,0,0,0,0	monster	Cave Maggot	1027,130,35000,150000
+010-1-1,124,52,4,3	monster	Desert Maggot	1083,2,35000,150000
+010-1-1,83,118,4,3	monster	Desert Maggot	1083,2,35000,150000
+010-1-1,109,95,26,24	monster	Scorpion	1071,8,35000,150000
+010-1-1,135,88,20,20	monster	Bat	1039,7,35000,150000
+010-1-1,165,49,17,19	monster	Bat	1122,12,35000,150000
+010-1-1,0,0,0,0	monster	Big Topaz Bif	1103,5,35000,150000
+010-1-1,109,38,78,14	monster	Small Topaz Bif	1101,3,35000,150000
+010-1-1,64,41,12,23	monster	Plushroom Field	1011,4,35000,150000
diff --git a/npc/010-1-1/_warps.txt b/npc/010-1-1/_warps.txt
index adcb84846..90e1599d5 100644
--- a/npc/010-1-1/_warps.txt
+++ b/npc/010-1-1/_warps.txt
@@ -1,21 +1,24 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 010-1-1: Canyon Great Caves warps
-010-1-1,78,73,0	warp	#010-1-1_78_73	0,0,010-1,76,69
-010-1-1,31,115,0	warp	#010-1-1_31_115	0,0,010-1,81,91
-010-1-1,27,71,0	warp	#010-1-1_27_71	0,0,010-1,52,53
-010-1-1,30,39,0	warp	#010-1-1_30_39	0,0,010-1,53,93
-010-1-1,41,37,0	warp	#010-1-1_41_37	0,0,010-2,88,114
-010-1-1,34,30,0	warp	#010-1-1_34_30	0,0,010-1,45,73
-010-1-1,32,24,0	warp	#010-1-1_32_24	0,0,010-2,36,104
-010-1-1,43,18,0	warp	#010-1-1_43_18	0,0,010-1,42,35
-010-1-1,47,83,0	warp	#010-1-1_47_83	0,0,010-2,162,69
-010-1-1,85,98,0	warp	#010-1-1_85_98	0,0,010-1,96,33
-010-1-1,163,105,0	warp	#010-1-1_163_105	0,0,010-1,110,84
-010-1-1,142,120,0	warp	#010-1-1_142_120	0,0,004-2,98,35
-010-1-1,170,49,0	warp	#010-1-1_170_49	0,0,010-2,108,128
-010-1-1,178,85,0	warp	#010-1-1_178_85	0,0,010-1,87,39
-010-1-1,112,44,0	warp	#010-1-1_112_44	0,0,010-2,114,104
-010-1-1,119,36,0	warp	#010-1-1_119_36	0,0,010-2,123,100
-010-1-1,112,42,0	warp	#010-1-1_112_42	0,0,010-1,105,30
-010-1-1,168,23,0	warp	#010-1-1_168_23	0,0,010-2,175,81
-010-1-1,176,50,0	warp	#010-1-1_176_50	0,0,010-2,136,116
+// Map 010-1-1: Canyon Cave warps
+010-1-1,124,56,0	warp	#010-1-1_124_56	0,0,010-2,86,112
+010-1-1,111,84,0	warp	#010-1-1_111_84	0,0,010-1,86,40
+010-1-1,183,51,0	warp	#010-1-1_183_51	0,0,010-2,131,113
+010-1-1,188,53,0	warp	#010-1-1_188_53	0,0,010-2,134,114
+010-1-1,181,25,0	warp	#010-1-1_181_25	0,0,010-2,121,98
+010-1-1,47,32,0	warp	#010-1-1_47_32	0,0,010-2,37,97
+010-1-1,40,75,0	warp	#010-1-1_40_75	0,0,010-1,46,52
+010-1-1,60,84,0	warp	#010-1-1_60_84	0,0,010-4-1,41,56
+010-1-1,71,116,0	warp	#010-1-1_71_116	0,0,010-1,77,84
+010-1-1,43,42,0	warp	#010-1-1_43_42	0,0,010-2,34,102
+010-1-1,43,26,0	warp	#010-1-1_43_26	0,0,010-1,45,30
+010-1-1,56,20,0	warp	#010-1-1_56_20	0,0,010-2,61,58
+010-1-1,102,70,0	warp	#010-1-1_102_70	0,0,010-1,104,67
+010-1-1,166,87,0	warp	#010-1-1_166_87	0,0,010-1,124,63
+010-1-1,107,31,0	warp	#010-1-1_107_31	0,0,010-1,95,34
+010-1-1,50,20,0	warp	#010-1-1_50_20	0,0,010-2-14,34,21
+010-1-1,167,43,0	warp	#010-1-1_167_43	0,0,010-2-6,60,58
+010-1-1,190,103,0	warp	#010-1-1_190_103	0,0,010-2-10,36,50
+010-1-1,146,74,0	warp	#010-1-1_146_74	0,0,010-1-6,86,40
+010-1-1,50,117,0	warp	#010-1-1_50_117	0,0,010-1-5,62,80
+010-1-1,116,122,0	warp	#010-1-1_116_122	0,0,004-2-4,103,22
+010-1-1,151,122,0	warp	#010-1-1_151_122	0,0,004-2-4,134,25