From eeeb6bf662bbc65556d9149ac73fb511b19b6acd Mon Sep 17 00:00:00 2001
From: The Kandiman <kandiman@kandiman.(none)>
Date: Sun, 28 Aug 2011 12:32:15 -0400
Subject: Second batch of tab conversion. Maps 001-2 through 002-4 complete.

---
 world/map/npc/001-3/guards.txt   | 40 +++++++++++++++++++---------------------
 world/map/npc/001-3/monsters.txt | 15 +++++++--------
 2 files changed, 26 insertions(+), 29 deletions(-)

(limited to 'world/map/npc/001-3')

diff --git a/world/map/npc/001-3/guards.txt b/world/map/npc/001-3/guards.txt
index 5b42ca4f..7ff899d0 100644
--- a/world/map/npc/001-3/guards.txt
+++ b/world/map/npc/001-3/guards.txt
@@ -1,28 +1,26 @@
 //
 
-001-3.gat,77,37,0	script	Phaet	125,{
-	mes "[Phaet the Royal Guard]";
-	mes "\"Do you want to go back?\"";
-	next;
-	
-	menu
-		"Yes", L_Sure,
-		"No", -;
-	mes "Have fun.";
-	close;
+001-3.gat,77,37,0|script|Phaet|125,{
+    mes "[Phaet the Royal Guard]";
+    mes "\"Do you want to go back?\"";
+    next;
+    menu
+        "Yes", L_Sure,
+        "No", -;
+    mes "Have fun.";
+    close;
 
 L_Sure:
-	mes "[Phaet the Royal Guard]";
-	mes "\"Ok.\"";
-	next;
-	
-	warp "001-2.gat", 25, 23;
-	close;
+    mes "[Phaet the Royal Guard]";
+    mes "\"Ok.\"";
+    next;
+    warp "001-2.gat", 25, 23;
+    close;
 }
 
-001-3.gat,69,37,0	script	Aradin	126,{
-	mes "[Aradin the Royal Guard]";
-	mes "\"Don't touch me...";
-	mes "You wouldn't enjoy the consequences.\"";
-	close;
+001-3.gat,69,37,0|script|Aradin|126,{
+    mes "[Aradin the Royal Guard]";
+    mes "\"Don't touch me...";
+    mes "You wouldn't enjoy the consequences.\"";
+    close;
 }
diff --git a/world/map/npc/001-3/monsters.txt b/world/map/npc/001-3/monsters.txt
index 04e6b11d..8f5e167c 100644
--- a/world/map/npc/001-3/monsters.txt
+++ b/world/map/npc/001-3/monsters.txt
@@ -2,13 +2,12 @@
 // This is the Tulimshar Arena -- below Tulimshar.
 //
 
-001-3.gat,0,0,0,0	monster	Maggot	1002,10,0,0,Mob6::OnMaggot
+001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob6::OnMaggot
 
-001-3.gat,0,0,0	script	Mob6	-1,{
+001-3.gat,0,0,0|script|Mob6|-1,{
 OnMaggot:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
\ No newline at end of file
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    break;
+    end;
+}
-- 
cgit v1.2.3-70-g09d2


From 66c29c2c8ac07e43cc2cb35df9ad1b2cd43d77cf Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Sun, 4 Sep 2011 21:46:40 +0200
Subject: Replacing spawns from monsters.txt with spawn objects in maps.

Converter ran.
Submodule pointer updated.
---
 client-data                      |   2 +-
 world/map/data/001-3.wlk         | Bin 22504 -> 22504 bytes
 world/map/npc/001-3/_import.txt  |   1 -
 world/map/npc/001-3/_mobs.txt    |   6 ++++
 world/map/npc/001-3/monsters.txt |  13 ---------
 world/map/npc/005-3/_import.txt  |   1 -
 world/map/npc/005-3/_mobs.txt    |   6 ++++
 world/map/npc/005-3/monsters.txt |  13 ---------
 world/map/npc/009-3/_import.txt  |   1 -
 world/map/npc/009-3/_mobs.txt    |  18 ++++++++++++
 world/map/npc/009-3/monsters.txt |  26 -----------------
 world/map/npc/011-3/_import.txt  |   1 -
 world/map/npc/011-3/_mobs.txt    |  12 ++++++++
 world/map/npc/011-3/monsters.txt |  21 --------------
 world/map/npc/011-4/_import.txt  |   1 -
 world/map/npc/011-4/_mobs.txt    |   4 ++-
 world/map/npc/011-4/monsters.txt |  20 -------------
 world/map/npc/012-3/_import.txt  |   1 -
 world/map/npc/012-3/_mobs.txt    |  12 ++++++++
 world/map/npc/012-3/monsters.txt |  20 -------------
 world/map/npc/014-3/_import.txt  |   1 -
 world/map/npc/014-3/_mobs.txt    |   6 ++++
 world/map/npc/014-3/monsters.txt |  14 ----------
 world/map/npc/015-1/_import.txt  |   1 -
 world/map/npc/015-1/_mobs.txt    |  48 +++++++++++++++++++++++++++++++
 world/map/npc/015-1/monsters.txt |  59 ---------------------------------------
 world/map/npc/016-1/_import.txt  |   1 -
 world/map/npc/016-1/_mobs.txt    |  38 +++++++++++++++++++++++++
 world/map/npc/016-1/monsters.txt |  48 -------------------------------
 world/map/npc/019-1/_import.txt  |   1 -
 world/map/npc/019-1/_mobs.txt    |  12 ++++++++
 world/map/npc/019-1/monsters.txt |  20 -------------
 world/map/npc/020-3/_import.txt  |   1 -
 world/map/npc/020-3/_mobs.txt    |   2 ++
 world/map/npc/020-3/monsters.txt |  18 ------------
 35 files changed, 164 insertions(+), 285 deletions(-)
 delete mode 100644 world/map/npc/001-3/monsters.txt
 delete mode 100644 world/map/npc/005-3/monsters.txt
 delete mode 100644 world/map/npc/009-3/monsters.txt
 delete mode 100644 world/map/npc/011-3/monsters.txt
 delete mode 100644 world/map/npc/011-4/monsters.txt
 delete mode 100644 world/map/npc/012-3/monsters.txt
 delete mode 100644 world/map/npc/014-3/monsters.txt
 delete mode 100644 world/map/npc/015-1/monsters.txt
 delete mode 100644 world/map/npc/016-1/monsters.txt
 delete mode 100644 world/map/npc/019-1/monsters.txt
 delete mode 100644 world/map/npc/020-3/monsters.txt

(limited to 'world/map/npc/001-3')

diff --git a/client-data b/client-data
index 92f3bac1..9990abb9 160000
--- a/client-data
+++ b/client-data
@@ -1 +1 @@
-Subproject commit 92f3bac1369d7001513e8772c68e771f585bbefc
+Subproject commit 9990abb9170cd06df902e5b0bd08dd709d95d9d6
diff --git a/world/map/data/001-3.wlk b/world/map/data/001-3.wlk
index 928abfc7..acde31d6 100644
Binary files a/world/map/data/001-3.wlk and b/world/map/data/001-3.wlk differ
diff --git a/world/map/npc/001-3/_import.txt b/world/map/npc/001-3/_import.txt
index a6b8b692..2af9b83e 100644
--- a/world/map/npc/001-3/_import.txt
+++ b/world/map/npc/001-3/_import.txt
@@ -4,5 +4,4 @@ map: 001-3.gat
 npc: npc/001-3/_mobs.txt
 npc: npc/001-3/_warps.txt
 npc: npc/001-3/guards.txt
-npc: npc/001-3/monsters.txt
 npc: npc/001-3/pvpflag.txt
diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt
index c49195bb..9a15211c 100644
--- a/world/map/npc/001-3/_mobs.txt
+++ b/world/map/npc/001-3/_mobs.txt
@@ -1,8 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar arena mobs
 
+001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob001-3::On1002
 
 
 001-3.gat,0,0,0|script|Mob001-3|-1,{
+On1002:
+    set @mobID, 1002;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/001-3/monsters.txt b/world/map/npc/001-3/monsters.txt
deleted file mode 100644
index 8f5e167c..00000000
--- a/world/map/npc/001-3/monsters.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Map: 001-3
-// This is the Tulimshar Arena -- below Tulimshar.
-//
-
-001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob6::OnMaggot
-
-001-3.gat,0,0,0|script|Mob6|-1,{
-OnMaggot:
-    set @mobID, 1002;
-    callfunc "MobPoints";
-    break;
-    end;
-}
diff --git a/world/map/npc/005-3/_import.txt b/world/map/npc/005-3/_import.txt
index 23982113..df5cc31b 100644
--- a/world/map/npc/005-3/_import.txt
+++ b/world/map/npc/005-3/_import.txt
@@ -3,4 +3,3 @@
 map: 005-3.gat
 npc: npc/005-3/_mobs.txt
 npc: npc/005-3/_warps.txt
-npc: npc/005-3/monsters.txt
diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt
index bc9ee2dc..cb22dbbc 100644
--- a/world/map/npc/005-3/_mobs.txt
+++ b/world/map/npc/005-3/_mobs.txt
@@ -1,8 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Snake pit mobs
 
+005-3.gat,0,0,0,0|monster|Snake|1010,175,0,0,Mob005-3::On1010
 
 
 005-3.gat,0,0,0|script|Mob005-3|-1,{
+On1010:
+    set @mobID, 1010;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/005-3/monsters.txt b/world/map/npc/005-3/monsters.txt
deleted file mode 100644
index a52d0dc3..00000000
--- a/world/map/npc/005-3/monsters.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Map: 05-3
-// This is the Snake Pit, a cave in the Snake Desert.
-//
-
-005-3.gat,0,0,0,0|monster|Snake|1010,175,0,0,Mob22::OnSnake
-
-005-3.gat,0,0,0|script|Mob22|-1,{
-OnSnake:
-    set @mobID, 1010;
-    callfunc "MobPoints";
-    break;
-    end;
-}
diff --git a/world/map/npc/009-3/_import.txt b/world/map/npc/009-3/_import.txt
index 12bf619c..23954c93 100644
--- a/world/map/npc/009-3/_import.txt
+++ b/world/map/npc/009-3/_import.txt
@@ -3,5 +3,4 @@
 map: 009-3.gat
 npc: npc/009-3/_mobs.txt
 npc: npc/009-3/_warps.txt
-npc: npc/009-3/monsters.txt
 npc: npc/009-3/sword.txt
diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index 94479055..582a462f 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -1,8 +1,26 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Cave beneath Hurnscald mobs
 
+009-3.gat,0,0,0,0|monster|YellowSlime|1007,20,0,0,Mob009-3::On1007
+009-3.gat,0,0,0,0|monster|BlackScorpion|1009,25,0,0,Mob009-3::On1009
+009-3.gat,0,0,0,0|monster|RedSlime|1008,35,0,0,Mob009-3::On1008
 
 
 009-3.gat,0,0,0|script|Mob009-3|-1,{
+On1007:
+    set @mobID, 1007;
+    callfunc "MobPoints";
+    end;
+
+On1008:
+    set @mobID, 1008;
+    callfunc "MobPoints";
+    end;
+
+On1009:
+    set @mobID, 1009;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/009-3/monsters.txt b/world/map/npc/009-3/monsters.txt
deleted file mode 100644
index b69bb3a1..00000000
--- a/world/map/npc/009-3/monsters.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Map: 009-3
-// This is the cave beneath Hurnscald.
-//
-
-009-3.gat,0,0,0,0	monster	YellowSlime	1007,20,0,0,Mob35::OnYellowSlime
-009-3.gat,0,0,0,0	monster	RedSlime	1008,35,0,0,Mob35::OnRedSlime
-009-3.gat,0,0,0,0	monster	BlackScorpion	1009,25,0,0,Mob35::OnBlackScorpion
-
-009-3.gat,0,0,0	script	Mob35	-1,{
-OnYellowSlime:
-	set @mobID, 1007;
-	callfunc "MobPoints";
-	break;
-
-OnRedSlime:
-	set @mobID, 1008;
-	callfunc "MobPoints";
-	break;
-
-OnBlackScorpion:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/011-3/_import.txt b/world/map/npc/011-3/_import.txt
index 799e5dd0..f58ba275 100644
--- a/world/map/npc/011-3/_import.txt
+++ b/world/map/npc/011-3/_import.txt
@@ -4,4 +4,3 @@ map: 011-3.gat
 npc: npc/011-3/_mobs.txt
 npc: npc/011-3/_warps.txt
 npc: npc/011-3/hermit.txt
-npc: npc/011-3/monsters.txt
diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt
index d17c348d..120a7da9 100644
--- a/world/map/npc/011-3/_mobs.txt
+++ b/world/map/npc/011-3/_mobs.txt
@@ -1,8 +1,20 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Hermit's cave mobs
 
+011-3.gat,0,0,0,0|monster|Bat|1017,10,0,0,Mob011-3::On1017
+011-3.gat,0,0,0,0|monster|Silkworm|1035,3,60000,30000,Mob011-3::On1035
 
 
 011-3.gat,0,0,0|script|Mob011-3|-1,{
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
+On1035:
+    set @mobID, 1035;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/011-3/monsters.txt b/world/map/npc/011-3/monsters.txt
deleted file mode 100644
index 37da9f40..00000000
--- a/world/map/npc/011-3/monsters.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-// Map: 011-3
-// This is the Hermit's Cave -- level 1.
-//
-
-011-3.gat,0,0,0,0	monster	Bat	1017,10,0,0,Mob4::OnBat
-
-011-3.gat,0,0,0,0	monster	SilkWorm	1035,3,60000,30000,Mob4::OnSilkWorm
-
-011-3.gat,0,0,0	script	Mob4	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/011-4/_import.txt b/world/map/npc/011-4/_import.txt
index f2e5264f..b40334b4 100644
--- a/world/map/npc/011-4/_import.txt
+++ b/world/map/npc/011-4/_import.txt
@@ -4,4 +4,3 @@ map: 011-4.gat
 npc: npc/011-4/_mobs.txt
 npc: npc/011-4/_warps.txt
 npc: npc/011-4/bl_barrier.txt
-npc: npc/011-4/monsters.txt
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index c4faef23..b3dd8813 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -1,8 +1,10 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Lake cave mobs
 
-011-4.gat,51,29,39,39|monster|Shroom|1019,1,100000,30000,Mob011-4::On1019
+011-4.gat,52,30,39,39|monster|SpkiyMushroom|1019,1,100000,30000,Mob011-4::On1019
 011-4.gat,93,114,39,39|monster|Lamp Snake|1021,1,100000,30000,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|CaveSnake|1021,40,0,0,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0,0,Mob011-4::On1019
 
 
 011-4.gat,0,0,0|script|Mob011-4|-1,{
diff --git a/world/map/npc/011-4/monsters.txt b/world/map/npc/011-4/monsters.txt
deleted file mode 100644
index d3b78249..00000000
--- a/world/map/npc/011-4/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 011-4
-// This is the Lake Cave, second level of the Hermit's Cave.
-//
-
-011-4.gat,0,0,0,0	monster	CaveSnake	1021,40,0,0,Mob17::OnCaveSnake
-011-4.gat,0,0,0,0	monster	SpikyMushroom	1019,15,0,0,Mob17::OnSpikyMushroom
-
-011-4.gat,0,0,0	script	Mob17	-1,{
-OnCaveSnake:
-	set @mobID, 1021;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/012-3/_import.txt b/world/map/npc/012-3/_import.txt
index 6e5ac13a..78b3bcca 100644
--- a/world/map/npc/012-3/_import.txt
+++ b/world/map/npc/012-3/_import.txt
@@ -4,5 +4,4 @@ map: 012-3.gat
 npc: npc/012-3/_mobs.txt
 npc: npc/012-3/_warps.txt
 npc: npc/012-3/mana-seed.txt
-npc: npc/012-3/monsters.txt
 npc: npc/012-3/warningsigns.txt
diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt
index 0a204e84..924e8ebb 100644
--- a/world/map/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
@@ -15,9 +15,21 @@
 012-3.gat,268,138,16,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
 012-3.gat,188,51,16,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
 012-3.gat,164,105,16,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,0,0,0,0|monster|Bat|1017,100,0,0,Mob012-3::On1017
+012-3.gat,0,0,0,0|monster|CaveSnake|1021,75,0,0,Mob012-3::On1021
 
 
 012-3.gat,0,0,0|script|Mob012-3|-1,{
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
+On1021:
+    set @mobID, 1021;
+    callfunc "MobPoints";
+    end;
+
 On1061:
     set @mobID, 1061;
     callfunc "MobPoints";
diff --git a/world/map/npc/012-3/monsters.txt b/world/map/npc/012-3/monsters.txt
deleted file mode 100644
index e6f4cf79..00000000
--- a/world/map/npc/012-3/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 012-3
-// This is the Caves beneath the North Woodland.
-//
-
-012-3.gat,0,0,0,0	monster	Bat		1017,100,0,0,Mob27::OnBat
-012-3.gat,0,0,0,0	monster	CaveSnake	1021,75,0,0,Mob27::OnCaveSnake
-
-012-3.gat,0,0,0	script	Mob27	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-OnCaveSnake:
-	set @mobID, 1021;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/014-3/_import.txt b/world/map/npc/014-3/_import.txt
index d2d03e67..581e3648 100644
--- a/world/map/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
@@ -3,4 +3,3 @@
 map: 014-3.gat
 npc: npc/014-3/_mobs.txt
 npc: npc/014-3/_warps.txt
-npc: npc/014-3/monsters.txt
diff --git a/world/map/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt
index bc868d9d..e805bd02 100644
--- a/world/map/npc/014-3/_mobs.txt
+++ b/world/map/npc/014-3/_mobs.txt
@@ -1,8 +1,14 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Cave mobs
 
+014-3.gat,0,0,0,0|monster|Bat|1017,50,0,0,Mob014-3::On1017
 
 
 014-3.gat,0,0,0|script|Mob014-3|-1,{
+On1017:
+    set @mobID, 1017;
+    callfunc "MobPoints";
+    end;
+
     end;
 }
diff --git a/world/map/npc/014-3/monsters.txt b/world/map/npc/014-3/monsters.txt
deleted file mode 100644
index 2237ea42..00000000
--- a/world/map/npc/014-3/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 014-3
-// This is the caves beneath West Woodland.
-//
-
-014-3.gat,0,0,0,0	monster	Bat	1017,50,0,0,Mob30::OnBat
-
-014-3.gat,0,0,0	script	Mob30	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/015-1/_import.txt b/world/map/npc/015-1/_import.txt
index 94963d0b..7e038c51 100644
--- a/world/map/npc/015-1/_import.txt
+++ b/world/map/npc/015-1/_import.txt
@@ -5,5 +5,4 @@ npc: npc/015-1/_mobs.txt
 npc: npc/015-1/_warps.txt
 npc: npc/015-1/alice.txt
 npc: npc/015-1/barrier.txt
-npc: npc/015-1/monsters.txt
 npc: npc/015-1/sword.txt
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index a398b22b..44544f23 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -3,14 +3,62 @@
 
 015-1.gat,0,0,0,0|monster|Clover|1037,2,100000,1000,Mob015-1::On1037
 015-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob015-1::On1055
+015-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob015-1::On1038
+015-1.gat,0,0,0,0|monster|LogHead|1025,40,0,0,Mob015-1::On1025
+015-1.gat,0,0,0,0|monster|SpikyMushroom|1019,20,0,0,Mob015-1::On1019
+015-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0,0,Mob015-1::On1014
+015-1.gat,0,0,0,0|monster|Gamboge|1031,5,0,0,Mob015-1::On1031
+015-1.gat,0,0,0,0|monster|Alizarin|1032,5,0,0,Mob015-1::On1032
+015-1.gat,0,0,0,0|monster|Silkworm|1035,7,15000,7000,Mob015-1::On1035
+015-1.gat,0,0,0,0|monster|Mauve|1029,4,270000,180000,Mob015-1::On1029
 
 
 015-1.gat,0,0,0|script|Mob015-1|-1,{
+On1014:
+    set @mobID, 1014;
+    callfunc "MobPoints";
+    end;
+
+On1019:
+    set @mobID, 1019;
+    callfunc "MobPoints";
+    end;
+
+On1025:
+    set @mobID, 1025;
+    callfunc "MobPoints";
+    end;
+
+On1029:
+    set @mobID, 1029;
+    callfunc "MobPoints";
+    end;
+
+On1031:
+    set @mobID, 1031;
+    callfunc "MobPoints";
+    end;
+
+On1032:
+    set @mobID, 1032;
+    callfunc "MobPoints";
+    end;
+
+On1035:
+    set @mobID, 1035;
+    callfunc "MobPoints";
+    end;
+
 On1037:
     set @mobID, 1037;
     callfunc "MobPoints";
     end;
 
+On1038:
+    set @mobID, 1038;
+    callfunc "MobPoints";
+    end;
+
 On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
diff --git a/world/map/npc/015-1/monsters.txt b/world/map/npc/015-1/monsters.txt
deleted file mode 100644
index b6ff0fd9..00000000
--- a/world/map/npc/015-1/monsters.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-// Map: 015-1
-// This is South-West Woodland.
-//
-
-015-1.gat,0,0,0,0	monster	LogHead		1025,40,0,0,Mob31::OnLogHead
-015-1.gat,0,0,0,0	monster	SpikyMushroom	1019,20,0,0,Mob31::OnSpikyMushroom
-015-1.gat,0,0,0,0	monster	PinkFlower		1014,20,0,0,Mob31::OnPinkFlower
-
-015-1.gat,0,0,0,0	monster	Gamboge		1031,5,0,0,Mob31::OnGamboge
-015-1.gat,0,0,0,0	monster	Alizarin	1032,5,0,0,Mob31::OnAlizarin
-015-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob31::OnMauve
-
-015-1.gat,0,0,0,0	monster	SilkWorm	1035,7,15000,7000,Mob31::onSilkWorm
-
-015-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob31::OnSquirrel
-
-015-1.gat,0,0,0	script	Mob31	-1,{
-OnLogHead:
-	set @mobID, 1025;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
-OnPinkFlower:
-	set @mobID, 1014;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnGamboge:
-	set @mobID, 1031;
-	callfunc "MobPoints";
-	break;
-
-OnAlizarin:
-	set @mobID, 1032;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/016-1/_import.txt b/world/map/npc/016-1/_import.txt
index 3ba02b95..333dc950 100644
--- a/world/map/npc/016-1/_import.txt
+++ b/world/map/npc/016-1/_import.txt
@@ -4,4 +4,3 @@ map: 016-1.gat
 npc: npc/016-1/_mobs.txt
 npc: npc/016-1/_warps.txt
 npc: npc/016-1/gwendolyn.txt
-npc: npc/016-1/monsters.txt
diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index fdd033fc..e9e8dcde 100644
--- a/world/map/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-1/_mobs.txt
@@ -3,14 +3,52 @@
 
 016-1.gat,0,0,0,0|monster|Clover|1037,2,100000,30000,Mob016-1::On1037
 016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob016-1::On1055
+016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob016-1::On1038
+016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob016-1::On1028
+016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0,0,Mob016-1::On1003
+016-1.gat,0,0,0,0|monster|Mauve|1029,3,0,0,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Mauve|1029,4,270000,180000,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Cobalt|1030,3,0,0,Mob016-1::On1030
+016-1.gat,0,0,0,0|monster|Butterfly|1029,4,270000,180000,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Silkworn|1035,7,150000,7000,Mob016-1::On1035
 
 
 016-1.gat,0,0,0|script|Mob016-1|-1,{
+On1003:
+    set @mobID, 1003;
+    callfunc "MobPoints";
+    end;
+
+On1028:
+    set @mobID, 1028;
+    callfunc "MobPoints";
+    end;
+
+On1029:
+    set @mobID, 1029;
+    callfunc "MobPoints";
+    end;
+
+On1030:
+    set @mobID, 1030;
+    callfunc "MobPoints";
+    end;
+
+On1035:
+    set @mobID, 1035;
+    callfunc "MobPoints";
+    end;
+
 On1037:
     set @mobID, 1037;
     callfunc "MobPoints";
     end;
 
+On1038:
+    set @mobID, 1038;
+    callfunc "MobPoints";
+    end;
+
 On1055:
     set @mobID, 1055;
     callfunc "MobPoints";
diff --git a/world/map/npc/016-1/monsters.txt b/world/map/npc/016-1/monsters.txt
deleted file mode 100644
index d9d0de4f..00000000
--- a/world/map/npc/016-1/monsters.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-// Map: 016-1
-// This is Southernmost Woodlands.
-//
-
-016-1.gat,0,0,0,0	monster	Mouboo		1028,5,0,0,Mob32::OnMouboo
-016-1.gat,0,0,0,0	monster	Scorpion	1003,15,0,0,Mob32::OnScorpion
-
-016-1.gat,0,0,0,0	monster	Mauve		1029,3,0,0,Mob32::OnMauve
-016-1.gat,0,0,0,0	monster	Cobalt		1030,3,0,0,Mob32::OnCobalt
-016-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob32::OnMauve
-
-016-1.gat,0,0,0,0	monster	SilkWorm	1035,7,15000,7000,Mob32::onSilkWorm
-
-016-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob32::OnSquirrel
-
-016-1.gat,0,0,0	script	Mob32	-1,{
-OnMouboo:
-	set @mobID, 1028;
-	callfunc "MobPoints";
-	break;
-
-OnScorpion:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnCobalt:
-	set @mobID, 1030;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/019-1/_import.txt b/world/map/npc/019-1/_import.txt
index 287a2cb2..4b4ebcf1 100644
--- a/world/map/npc/019-1/_import.txt
+++ b/world/map/npc/019-1/_import.txt
@@ -3,6 +3,5 @@
 map: 019-1.gat
 npc: npc/019-1/_mobs.txt
 npc: npc/019-1/_warps.txt
-npc: npc/019-1/monsters.txt
 npc: npc/019-1/santa_helper.txt
 npc: npc/019-1/snowman.txt
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index a2273ce7..c9b69705 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -2,9 +2,21 @@
 // Snow field mobs
 
 019-1.gat,0,0,0,0|monster|Fluffy|1020,100,100000,30000,Mob019-1::On1020
+019-1.gat,0,0,0,0|monster|SantaSlime|1015,10,0,0,Mob019-1::On1015
+019-1.gat,0,0,0,0|monster|RudolphSlime|1016,25,0,0,Mob019-1::On1016
 
 
 019-1.gat,0,0,0|script|Mob019-1|-1,{
+On1015:
+    set @mobID, 1015;
+    callfunc "MobPoints";
+    end;
+
+On1016:
+    set @mobID, 1016;
+    callfunc "MobPoints";
+    end;
+
 On1020:
     set @mobID, 1020;
     callfunc "MobPoints";
diff --git a/world/map/npc/019-1/monsters.txt b/world/map/npc/019-1/monsters.txt
deleted file mode 100644
index d41d63b3..00000000
--- a/world/map/npc/019-1/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 019-1
-// This is the Snow Fields.
-//
-
-019-1.gat,0,0,0,0	monster	SantaSlime	1015,10,0,0,Mob10::OnSantaSlime
-019-1.gat,0,0,0,0	monster	RudolphSlime	1016,25,0,0,Mob10::OnRudolphSlime
-
-019-1.gat,0,0,0	script	Mob10	-1,{
-OnSantaSlime:
-	set @mobID, 1015;
-	callfunc "MobPoints";
-	break;
-
-OnRudolphSlime:
-	set @mobID, 1016;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/world/map/npc/020-3/_import.txt b/world/map/npc/020-3/_import.txt
index fe2ee10c..d82428bf 100644
--- a/world/map/npc/020-3/_import.txt
+++ b/world/map/npc/020-3/_import.txt
@@ -3,4 +3,3 @@
 map: 020-3.gat
 npc: npc/020-3/_mobs.txt
 npc: npc/020-3/_warps.txt
-npc: npc/020-3/monsters.txt
diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt
index e886fbde..d28b5c88 100644
--- a/world/map/npc/020-3/_mobs.txt
+++ b/world/map/npc/020-3/_mobs.txt
@@ -3,6 +3,8 @@
 
 020-3.gat,40,36,29,4|monster|Bat|1017,1,100000,30000,Mob020-3::On1017
 020-3.gat,40,49,34,7|monster|Violet|1018,1,100000,30000,Mob020-3::On1018
+020-3.gat,0,0,0,0|monster|Bat|1017,20,0,0,Mob020-3::On1017
+020-3.gat,0,0,0,0|monster|Pinkie|1018,10,0,0,Mob020-3::On1018
 
 
 020-3.gat,0,0,0|script|Mob020-3|-1,{
diff --git a/world/map/npc/020-3/monsters.txt b/world/map/npc/020-3/monsters.txt
deleted file mode 100644
index 062c6a9f..00000000
--- a/world/map/npc/020-3/monsters.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-// Ice Cave level 1
-
-020-3.gat,0,0,0,0	monster	Bat	1017,20,0,0,Mob12::OnBat
-020-3.gat,0,0,0,0	monster	Pinkie	1018,10,0,0,Mob12::OnPinkie
-
-020-3.gat,0,0,0	script	Mob12	-1,{
-OnBat:
-	set @mobID, 1017;
-	callfunc "MobPoints";
-	break;
-
-OnPinkie:
-	set @mobID, 1018;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
-- 
cgit v1.2.3-70-g09d2


From 6e5fc3701b8299af02236ab77b143fce7008d772 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Mon, 5 Sep 2011 00:27:04 +0200
Subject: Client-data: maps names changed and some minor fixes.

Converter ran.
Submodule pointer updated.
---
 client-data                        |   2 +-
 world/map/data/024-2.wlk           | Bin 40004 -> 40004 bytes
 world/map/npc/001-1/_import.txt    |   2 +-
 world/map/npc/001-1/_mobs.txt      |   2 +-
 world/map/npc/001-1/_warps.txt     |   2 +-
 world/map/npc/001-2/_import.txt    |   2 +-
 world/map/npc/001-2/_mobs.txt      |   2 +-
 world/map/npc/001-2/_warps.txt     |   2 +-
 world/map/npc/001-3/_import.txt    |   2 +-
 world/map/npc/001-3/_mobs.txt      |   2 +-
 world/map/npc/001-3/_warps.txt     |   2 +-
 world/map/npc/002-1/_import.txt    |   2 +-
 world/map/npc/002-1/_mobs.txt      |   2 +-
 world/map/npc/002-1/_warps.txt     |   2 +-
 world/map/npc/002-3/_import.txt    |   2 +-
 world/map/npc/002-3/_mobs.txt      |   2 +-
 world/map/npc/002-3/_warps.txt     |   2 +-
 world/map/npc/002-4/_import.txt    |   2 +-
 world/map/npc/002-4/_mobs.txt      |   2 +-
 world/map/npc/002-4/_warps.txt     |   2 +-
 world/map/npc/003-2/_import.txt    |   2 +-
 world/map/npc/003-2/_mobs.txt      |   2 +-
 world/map/npc/003-2/_warps.txt     |   2 +-
 world/map/npc/004-2/_import.txt    |   2 +-
 world/map/npc/004-2/_mobs.txt      |   2 +-
 world/map/npc/004-2/_warps.txt     |   2 +-
 world/map/npc/005-1/_import.txt    |   2 +-
 world/map/npc/005-1/_mobs.txt      |   2 +-
 world/map/npc/005-1/_warps.txt     |   2 +-
 world/map/npc/005-3/_import.txt    |   2 +-
 world/map/npc/005-3/_mobs.txt      |   2 +-
 world/map/npc/005-3/_warps.txt     |   2 +-
 world/map/npc/006-1/_import.txt    |   2 +-
 world/map/npc/006-1/_mobs.txt      |   2 +-
 world/map/npc/006-1/_warps.txt     |   2 +-
 world/map/npc/006-3/_import.txt    |   2 +-
 world/map/npc/006-3/_mobs.txt      |   2 +-
 world/map/npc/006-3/_warps.txt     |   2 +-
 world/map/npc/008-1/_import.txt    |   2 +-
 world/map/npc/008-1/_mobs.txt      |   2 +-
 world/map/npc/008-1/_warps.txt     |   2 +-
 world/map/npc/009-2/_import.txt    |   2 +-
 world/map/npc/009-2/_mobs.txt      |   2 +-
 world/map/npc/009-2/_warps.txt     |   2 +-
 world/map/npc/009-3/_import.txt    |   2 +-
 world/map/npc/009-3/_mobs.txt      |   2 +-
 world/map/npc/009-3/_warps.txt     |   2 +-
 world/map/npc/009-4/_import.txt    |   2 +-
 world/map/npc/009-4/_mobs.txt      |   2 +-
 world/map/npc/009-4/_warps.txt     |   2 +-
 world/map/npc/011-3/_import.txt    |   2 +-
 world/map/npc/011-3/_mobs.txt      |   2 +-
 world/map/npc/011-3/_warps.txt     |   2 +-
 world/map/npc/011-4/_import.txt    |   2 +-
 world/map/npc/011-4/_mobs.txt      |   2 +-
 world/map/npc/011-4/_warps.txt     |   2 +-
 world/map/npc/011-5/_import.txt    |   2 +-
 world/map/npc/011-5/_mobs.txt      |   2 +-
 world/map/npc/011-5/_warps.txt     |   2 +-
 world/map/npc/011-6/_import.txt    |   2 +-
 world/map/npc/011-6/_mobs.txt      |   2 +-
 world/map/npc/011-6/_warps.txt     |   2 +-
 world/map/npc/012-3/_import.txt    |   2 +-
 world/map/npc/012-3/_mobs.txt      |   2 +-
 world/map/npc/012-3/_warps.txt     |   2 +-
 world/map/npc/012-4/_import.txt    |   2 +-
 world/map/npc/012-4/_mobs.txt      |   2 +-
 world/map/npc/012-4/_warps.txt     |   2 +-
 world/map/npc/013-1/_import.txt    |   2 +-
 world/map/npc/013-1/_mobs.txt      |   2 +-
 world/map/npc/013-1/_warps.txt     |   2 +-
 world/map/npc/013-2/_import.txt    |   2 +-
 world/map/npc/013-2/_mobs.txt      |   2 +-
 world/map/npc/013-2/_warps.txt     |   2 +-
 world/map/npc/013-3/_import.txt    |   2 +-
 world/map/npc/013-3/_mobs.txt      |   2 +-
 world/map/npc/013-3/_warps.txt     |   2 +-
 world/map/npc/014-3/_import.txt    |   2 +-
 world/map/npc/014-3/_mobs.txt      |   2 +-
 world/map/npc/014-3/_warps.txt     |   2 +-
 world/map/npc/015-3/_import.txt    |   2 +-
 world/map/npc/015-3/_mobs.txt      |   2 +-
 world/map/npc/015-3/_warps.txt     |   2 +-
 world/map/npc/017-1/_import.txt    |   2 +-
 world/map/npc/017-1/_mobs.txt      |   2 +-
 world/map/npc/017-1/_warps.txt     |   2 +-
 world/map/npc/018-1/_import.txt    |   2 +-
 world/map/npc/018-1/_mobs.txt      |   2 +-
 world/map/npc/018-1/_warps.txt     |   2 +-
 world/map/npc/018-2/_import.txt    |   2 +-
 world/map/npc/018-2/_mobs.txt      |   2 +-
 world/map/npc/018-2/_warps.txt     |   2 +-
 world/map/npc/018-3/_import.txt    |   2 +-
 world/map/npc/018-3/_mobs.txt      |   2 +-
 world/map/npc/018-3/_warps.txt     |   2 +-
 world/map/npc/019-1/_import.txt    |   2 +-
 world/map/npc/019-1/_mobs.txt      |   2 +-
 world/map/npc/019-1/_warps.txt     |   2 +-
 world/map/npc/021-1/_import.txt    |   2 +-
 world/map/npc/021-1/_mobs.txt      |   2 +-
 world/map/npc/021-1/_warps.txt     |   2 +-
 world/map/npc/022-1/_import.txt    |   2 +-
 world/map/npc/022-1/_mobs.txt      |   2 +-
 world/map/npc/022-1/_warps.txt     |   2 +-
 world/map/npc/027-2/_import.txt    |   2 +-
 world/map/npc/027-2/_mobs.txt      |   2 +-
 world/map/npc/027-2/_warps.txt     |   2 +-
 world/map/npc/028-1/_import.txt    |   2 +-
 world/map/npc/028-1/_mobs.txt      |   2 +-
 world/map/npc/028-1/_warps.txt     |   2 +-
 world/map/npc/028-3/_import.txt    |   2 +-
 world/map/npc/028-3/_mobs.txt      |   2 +-
 world/map/npc/028-3/_warps.txt     |   2 +-
 world/map/npc/029-1/_import.txt    |   2 +-
 world/map/npc/029-1/_mobs.txt      |   2 +-
 world/map/npc/029-1/_warps.txt     |   2 +-
 world/map/npc/029-3/_import.txt    |   2 +-
 world/map/npc/029-3/_mobs.txt      |   2 +-
 world/map/npc/029-3/_warps.txt     |   2 +-
 world/map/npc/030-1/_import.txt    |   2 +-
 world/map/npc/030-1/_mobs.txt      |   2 +-
 world/map/npc/030-1/_warps.txt     |   2 +-
 world/map/npc/031-1/_import.txt    |   2 +-
 world/map/npc/031-1/_mobs.txt      |   2 +-
 world/map/npc/031-1/_warps.txt     |   2 +-
 world/map/npc/031-3/_import.txt    |   2 +-
 world/map/npc/031-3/_mobs.txt      |   2 +-
 world/map/npc/031-3/_warps.txt     |   2 +-
 world/map/npc/031-4/_import.txt    |   2 +-
 world/map/npc/031-4/_mobs.txt      |   2 +-
 world/map/npc/031-4/_warps.txt     |   2 +-
 world/map/npc/032-3/_import.txt    |   2 +-
 world/map/npc/032-3/_mobs.txt      |   2 +-
 world/map/npc/032-3/_warps.txt     |   2 +-
 world/map/npc/033-1/_import.txt    |   2 +-
 world/map/npc/033-1/_mobs.txt      |   2 +-
 world/map/npc/033-1/_warps.txt     |   2 +-
 world/map/npc/034-1/_import.txt    |   2 +-
 world/map/npc/034-1/_mobs.txt      |   2 +-
 world/map/npc/034-1/_warps.txt     |   2 +-
 world/map/npc/041-1/_import.txt    |   2 +-
 world/map/npc/041-1/_mobs.txt      |   2 +-
 world/map/npc/041-1/_warps.txt     |   2 +-
 world/map/npc/042-1/_import.txt    |   2 +-
 world/map/npc/042-1/_mobs.txt      |   2 +-
 world/map/npc/042-1/_warps.txt     |   2 +-
 world/map/npc/042-2/_import.txt    |   2 +-
 world/map/npc/042-2/_mobs.txt      |   2 +-
 world/map/npc/042-2/_warps.txt     |   2 +-
 world/map/npc/botcheck/_import.txt |   2 +-
 world/map/npc/botcheck/_mobs.txt   |   2 +-
 world/map/npc/botcheck/_warps.txt  |   2 +-
 152 files changed, 151 insertions(+), 151 deletions(-)

(limited to 'world/map/npc/001-3')

diff --git a/client-data b/client-data
index 9990abb9..eca7fc29 160000
--- a/client-data
+++ b/client-data
@@ -1 +1 @@
-Subproject commit 9990abb9170cd06df902e5b0bd08dd709d95d9d6
+Subproject commit eca7fc2967068562f6a2ec77b3c8d5a9df331923
diff --git a/world/map/data/024-2.wlk b/world/map/data/024-2.wlk
index 74704a5f..1f63519e 100644
Binary files a/world/map/data/024-2.wlk and b/world/map/data/024-2.wlk differ
diff --git a/world/map/npc/001-1/_import.txt b/world/map/npc/001-1/_import.txt
index dba873bb..d9ac43d6 100644
--- a/world/map/npc/001-1/_import.txt
+++ b/world/map/npc/001-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 001-1: Tulimshar
+// Map 001-1: South Tulimshar
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 001-1.gat
 npc: npc/001-1/_mobs.txt
diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index b606442f..4c97718b 100644
--- a/world/map/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar mobs
+// South Tulimshar mobs
 
 001-1.gat,45,86,2,1|monster|Scorpion|1003,1,30000,30000,Mob001-1::On1003
 001-1.gat,43,85,2,1|monster|Scorpion|1003,1,60000,30000,Mob001-1::On1003
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index 2241657c..7fafbef1 100644
--- a/world/map/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar warps
+// South Tulimshar warps
 
 001-1.gat,44,88|warp|ToSandstorm|3,-1,002-1.gat,58,17
 001-1.gat,44,20|warp|toCentralTulimshar|3,-1,021-1.gat,55,145
diff --git a/world/map/npc/001-2/_import.txt b/world/map/npc/001-2/_import.txt
index 7b1c49ea..d20321fe 100644
--- a/world/map/npc/001-2/_import.txt
+++ b/world/map/npc/001-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 001-2: Tulimshar
+// Map 001-2: Tulimshar Indoor
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 001-2.gat
 npc: npc/001-2/_mobs.txt
diff --git a/world/map/npc/001-2/_mobs.txt b/world/map/npc/001-2/_mobs.txt
index 73006cc6..8bfb5d6e 100644
--- a/world/map/npc/001-2/_mobs.txt
+++ b/world/map/npc/001-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar mobs
+// Tulimshar Indoor mobs
 
 
 
diff --git a/world/map/npc/001-2/_warps.txt b/world/map/npc/001-2/_warps.txt
index 10a5c8d6..b6c48bc7 100644
--- a/world/map/npc/001-2/_warps.txt
+++ b/world/map/npc/001-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar warps
+// Tulimshar Indoor warps
 
 001-2.gat,25,35|warp|ToOutside|-1,-1,001-1.gat,32,72
 001-2.gat,44,25|warp|To2ndFloor|-1,0,001-2.gat,65,25
diff --git a/world/map/npc/001-3/_import.txt b/world/map/npc/001-3/_import.txt
index 2af9b83e..f28f0dbb 100644
--- a/world/map/npc/001-3/_import.txt
+++ b/world/map/npc/001-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 001-3: Tulimshar arena
+// Map 001-3: Tulimshar Arena
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 001-3.gat
 npc: npc/001-3/_mobs.txt
diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt
index 9a15211c..47156be7 100644
--- a/world/map/npc/001-3/_mobs.txt
+++ b/world/map/npc/001-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar arena mobs
+// Tulimshar Arena mobs
 
 001-3.gat,0,0,0,0|monster|Maggot|1002,10,0,0,Mob001-3::On1002
 
diff --git a/world/map/npc/001-3/_warps.txt b/world/map/npc/001-3/_warps.txt
index becf90ca..b8a03519 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 changes will be removed when running the Converter.
-// Tulimshar arena warps
+// Tulimshar Arena warps
 
 001-3.gat,72,28|warp|ToInn|-1,-1,001-2.gat,23,24
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index dfda9d8f..f1ebfb77 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 002-1: Sandstorm
+// Map 002-1: Sandstorm Desert
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 002-1.gat
 npc: npc/002-1/_mobs.txt
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index 7669781b..8cd52134 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Sandstorm mobs
+// Sandstorm Desert mobs
 
 002-1.gat,0,0,0,0|monster|Maggot|1002,20,1000,500,Mob002-1::On1002
 002-1.gat,96,98,19,13|monster|Maggot|1002,10,100000,30000,Mob002-1::On1002
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index e7ffdb55..c665836d 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Sandstorm warps
+// Sandstorm Desert warps
 
 002-1.gat,58,12|warp|ToTulimshar|3,-1,001-1.gat,44,80
 002-1.gat,108,79|warp|ToEasternDesert|-1,1,005-1.gat,23,40
diff --git a/world/map/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt
index c6568edf..2f37b959 100644
--- a/world/map/npc/002-3/_import.txt
+++ b/world/map/npc/002-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 002-3: Desert mines
+// Map 002-3: Desert Mines
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 002-3.gat
 npc: npc/002-3/_mobs.txt
diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt
index 55a27959..276e0462 100644
--- a/world/map/npc/002-3/_mobs.txt
+++ b/world/map/npc/002-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mines mobs
+// Desert Mines mobs
 
 002-3.gat,39,37,14,10|monster|Cave Maggot|1056,5,100000,30000,Mob002-3::On1056
 002-3.gat,91,41,17,20|monster|Ice Goblin|1058,3,100000,30000,Mob002-3::On1058
diff --git a/world/map/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt
index 4c42c73f..913bbd9d 100644
--- a/world/map/npc/002-3/_warps.txt
+++ b/world/map/npc/002-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mines warps
+// Desert Mines warps
 
 002-3.gat,37,29|warp|Exit|-1,-1,002-1.gat,25,95
diff --git a/world/map/npc/002-4/_import.txt b/world/map/npc/002-4/_import.txt
index 46fac3a9..4758cedf 100644
--- a/world/map/npc/002-4/_import.txt
+++ b/world/map/npc/002-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 002-4: Desert mines
+// Map 002-4: Deep Desert Mines
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 002-4.gat
 npc: npc/002-4/_mobs.txt
diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index 50c19490..294050a4 100644
--- a/world/map/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mines mobs
+// Deep Desert Mines mobs
 
 002-4.gat,36,89,11,6|monster|Ice Goblin|1058,3,100000,30000,Mob002-4::On1058
 002-4.gat,33,76,2,11|monster|Cave Maggot|1056,3,100000,30000,Mob002-4::On1056
diff --git a/world/map/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index e0d5f9bd..2ac66361 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 changes will be removed when running the Converter.
-// Desert mines warps
+// Deep Desert Mines warps
 
 002-4.gat,34,99|warp|toLevel1|-1,-1,002-3.gat,68,99
diff --git a/world/map/npc/003-2/_import.txt b/world/map/npc/003-2/_import.txt
index 1e6e34cc..19c55bfc 100644
--- a/world/map/npc/003-2/_import.txt
+++ b/world/map/npc/003-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 003-2: Beach House
+// Map 003-2: Southwest Beach Houses
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 003-2.gat
 npc: npc/003-2/_mobs.txt
diff --git a/world/map/npc/003-2/_mobs.txt b/world/map/npc/003-2/_mobs.txt
index af203ef4..d78f4308 100644
--- a/world/map/npc/003-2/_mobs.txt
+++ b/world/map/npc/003-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach House mobs
+// Southwest Beach Houses mobs
 
 
 
diff --git a/world/map/npc/003-2/_warps.txt b/world/map/npc/003-2/_warps.txt
index b1527ca6..75eaaa54 100644
--- a/world/map/npc/003-2/_warps.txt
+++ b/world/map/npc/003-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach House warps
+// Southwest Beach Houses warps
 
 003-2.gat,22,29|warp|toOutside|-1,-1,003-1.gat,48,37
 003-2.gat,56,29|warp|toOutside|-1,-1,003-1.gat,59,30
diff --git a/world/map/npc/004-2/_import.txt b/world/map/npc/004-2/_import.txt
index 3efc4d70..861fb5f0 100644
--- a/world/map/npc/004-2/_import.txt
+++ b/world/map/npc/004-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 004-2: Beach House
+// Map 004-2: West Beach Houses
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 004-2.gat
 npc: npc/004-2/_mobs.txt
diff --git a/world/map/npc/004-2/_mobs.txt b/world/map/npc/004-2/_mobs.txt
index 72d30f0c..5bc05f2a 100644
--- a/world/map/npc/004-2/_mobs.txt
+++ b/world/map/npc/004-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach House mobs
+// West Beach Houses mobs
 
 
 
diff --git a/world/map/npc/004-2/_warps.txt b/world/map/npc/004-2/_warps.txt
index 6a36eda2..ef1ad736 100644
--- a/world/map/npc/004-2/_warps.txt
+++ b/world/map/npc/004-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach House warps
+// West Beach Houses warps
 
 004-2.gat,39,20|warp|ToRoom|0,-1,004-2.gat,75,29
 004-2.gat,75,30|warp|ToRoom|0,-1,004-2.gat,38,21
diff --git a/world/map/npc/005-1/_import.txt b/world/map/npc/005-1/_import.txt
index 968adcd7..74d23708 100644
--- a/world/map/npc/005-1/_import.txt
+++ b/world/map/npc/005-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 005-1: Snake desert
+// Map 005-1: Snake Desert
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 005-1.gat
 npc: npc/005-1/_mobs.txt
diff --git a/world/map/npc/005-1/_mobs.txt b/world/map/npc/005-1/_mobs.txt
index df41320a..0244b5a5 100644
--- a/world/map/npc/005-1/_mobs.txt
+++ b/world/map/npc/005-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snake desert mobs
+// Snake Desert mobs
 
 005-1.gat,0,0,0,0|monster|Maggot|1002,1,100000,30000,Mob005-1::On1002
 005-1.gat,0,0,0,0|monster|Snake|1010,1,100000,30000,Mob005-1::On1010
diff --git a/world/map/npc/005-1/_warps.txt b/world/map/npc/005-1/_warps.txt
index b653c06d..63e91557 100644
--- a/world/map/npc/005-1/_warps.txt
+++ b/world/map/npc/005-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snake desert warps
+// Snake Desert warps
 
 005-1.gat,19,41|warp|ToSandstorm|-1,2,002-1.gat,106,78
 005-1.gat,89,23|warp|ToSnakeCave|-1,-1,005-3.gat,52,34
diff --git a/world/map/npc/005-3/_import.txt b/world/map/npc/005-3/_import.txt
index df5cc31b..d3f95576 100644
--- a/world/map/npc/005-3/_import.txt
+++ b/world/map/npc/005-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 005-3: Snake pit
+// Map 005-3: Snake Pit
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 005-3.gat
 npc: npc/005-3/_mobs.txt
diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt
index cb22dbbc..29e96579 100644
--- a/world/map/npc/005-3/_mobs.txt
+++ b/world/map/npc/005-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snake pit mobs
+// Snake Pit mobs
 
 005-3.gat,0,0,0,0|monster|Snake|1010,175,0,0,Mob005-3::On1010
 
diff --git a/world/map/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt
index e3aeee5d..3d211a49 100644
--- a/world/map/npc/005-3/_warps.txt
+++ b/world/map/npc/005-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snake pit warps
+// Snake Pit warps
 
 005-3.gat,52,33|warp|CaveExit|-1,-1,005-1.gat,89,24
 005-3.gat,33,82|warp|CaveExit|-1,-1,005-1.gat,71,75
diff --git a/world/map/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index ec566450..d9e43067 100644
--- a/world/map/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 006-1: Desert mountains
+// Map 006-1: Desert Mountains
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 006-1.gat
 npc: npc/006-1/_mobs.txt
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index dad1367a..d251f37b 100644
--- a/world/map/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mountains mobs
+// Desert Mountains mobs
 
 006-1.gat,25,34,12,31|monster|Snake|1010,3,100000,30000,Mob006-1::On1010
 006-1.gat,36,29,9,16|monster|Snake|1010,1,100000,30000,Mob006-1::On1010
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index 4dfc32cc..73761e0f 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mountains warps
+// Desert Mountains warps
 
 006-1.gat,28,21|warp|ToDesert|-1,-1,005-1.gat,175,96
 006-1.gat,27,22|warp|ToDesert|-1,-1,005-1.gat,174,97
diff --git a/world/map/npc/006-3/_import.txt b/world/map/npc/006-3/_import.txt
index 85228166..9dfb7081 100644
--- a/world/map/npc/006-3/_import.txt
+++ b/world/map/npc/006-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 006-3: Desert mountain caves
+// Map 006-3: Desert Mountain Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 006-3.gat
 npc: npc/006-3/_mobs.txt
diff --git a/world/map/npc/006-3/_mobs.txt b/world/map/npc/006-3/_mobs.txt
index b3271b1d..921503d1 100644
--- a/world/map/npc/006-3/_mobs.txt
+++ b/world/map/npc/006-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mountain caves mobs
+// Desert Mountain Caves mobs
 
 006-3.gat,108,25,36,8|monster|Mountain Snake|1026,3,15000,90000,Mob006-3::On1026
 006-3.gat,99,50,14,13|monster|Mountain Snake|1026,1,15000,90000,Mob006-3::On1026
diff --git a/world/map/npc/006-3/_warps.txt b/world/map/npc/006-3/_warps.txt
index cc03d8cf..a3eb2358 100644
--- a/world/map/npc/006-3/_warps.txt
+++ b/world/map/npc/006-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert mountain caves warps
+// Desert Mountain Caves warps
 
 006-3.gat,40,26|warp|ToOutside|-1,-1,006-1.gat,40,27
 006-3.gat,55,27|warp|ToOutside|-1,-1,006-1.gat,55,28
diff --git a/world/map/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt
index f517bb23..419b018b 100644
--- a/world/map/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 008-1: Hurnscald outskirts
+// Map 008-1: Hurnscald Outskirts
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 008-1.gat
 npc: npc/008-1/_mobs.txt
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index b45b27cf..c81d7214 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald outskirts mobs
+// Hurnscald Outskirts mobs
 
 008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20,0,Mob008-1::On1014
 008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20,0,Mob008-1::On1018
diff --git a/world/map/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt
index 3210f6be..131c5818 100644
--- a/world/map/npc/008-1/_warps.txt
+++ b/world/map/npc/008-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald outskirts warps
+// Hurnscald Outskirts warps
 
 008-1.gat,54,61|warp|HurnscaldWestGate|-1,1,009-1.gat,25,36
 008-1.gat,79,80|warp|HurnscaldSouthGate|2,-1,009-1.gat,48,54
diff --git a/world/map/npc/009-2/_import.txt b/world/map/npc/009-2/_import.txt
index 5289780c..f3e16386 100644
--- a/world/map/npc/009-2/_import.txt
+++ b/world/map/npc/009-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 009-2: Hurnscald
+// Map 009-2: Hurnscald Indoor
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 009-2.gat
 npc: npc/009-2/_mobs.txt
diff --git a/world/map/npc/009-2/_mobs.txt b/world/map/npc/009-2/_mobs.txt
index fd021fa2..198257c3 100644
--- a/world/map/npc/009-2/_mobs.txt
+++ b/world/map/npc/009-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald mobs
+// Hurnscald Indoor mobs
 
 
 
diff --git a/world/map/npc/009-2/_warps.txt b/world/map/npc/009-2/_warps.txt
index 21361ee5..1911c736 100644
--- a/world/map/npc/009-2/_warps.txt
+++ b/world/map/npc/009-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald warps
+// Hurnscald Indoor warps
 
 009-2.gat,75,23|warp|To1stFloor|0,-1,009-2.gat,73,46
 009-2.gat,95,30|warp|ToOutdoor|-1,-1,009-1.gat,59,34
diff --git a/world/map/npc/009-3/_import.txt b/world/map/npc/009-3/_import.txt
index 23954c93..9c42d124 100644
--- a/world/map/npc/009-3/_import.txt
+++ b/world/map/npc/009-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 009-3: Cave beneath Hurnscald
+// Map 009-3: Hurnscald Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 009-3.gat
 npc: npc/009-3/_mobs.txt
diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index 582a462f..b6018bec 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave beneath Hurnscald mobs
+// Hurnscald Caves mobs
 
 009-3.gat,0,0,0,0|monster|YellowSlime|1007,20,0,0,Mob009-3::On1007
 009-3.gat,0,0,0,0|monster|BlackScorpion|1009,25,0,0,Mob009-3::On1009
diff --git a/world/map/npc/009-3/_warps.txt b/world/map/npc/009-3/_warps.txt
index d3c2cda6..cddeb3ee 100644
--- a/world/map/npc/009-3/_warps.txt
+++ b/world/map/npc/009-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave beneath Hurnscald warps
+// Hurnscald Caves warps
 
 009-3.gat,173,20|warp|CaveExitToInn|-1,-1,009-2.gat,147,88
 009-3.gat,20,56|warp|ToLakeCave|-1,-1,011-4.gat,129,88
diff --git a/world/map/npc/009-4/_import.txt b/world/map/npc/009-4/_import.txt
index 0ecc07a2..36baf60b 100644
--- a/world/map/npc/009-4/_import.txt
+++ b/world/map/npc/009-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 009-4: unnamed map 009-4
+// Map 009-4: Orum Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 009-4.gat
 npc: npc/009-4/_mobs.txt
diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt
index 1119323d..a1e19016 100644
--- a/world/map/npc/009-4/_mobs.txt
+++ b/world/map/npc/009-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 009-4 mobs
+// Orum Caves mobs
 
 009-4.gat,117,97,24,15|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035
 009-4.gat,115,98,24,15|monster|Cave Snake|1021,5,20000,14000,Mob009-4::On1021
diff --git a/world/map/npc/009-4/_warps.txt b/world/map/npc/009-4/_warps.txt
index 80ef78cc..2fb0c28f 100644
--- a/world/map/npc/009-4/_warps.txt
+++ b/world/map/npc/009-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 009-4 warps
+// Orum Caves warps
 
 009-4.gat,37,112|warp|to 009-3|-1,-1,009-3.gat,162,114
 009-4.gat,72,136|warp|to Cavern|-1,-1,009-4.gat,36,27
diff --git a/world/map/npc/011-3/_import.txt b/world/map/npc/011-3/_import.txt
index f58ba275..ba9fdeff 100644
--- a/world/map/npc/011-3/_import.txt
+++ b/world/map/npc/011-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 011-3: Hermit's cave
+// Map 011-3: Hermit's Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 011-3.gat
 npc: npc/011-3/_mobs.txt
diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt
index 120a7da9..ef4ef58c 100644
--- a/world/map/npc/011-3/_mobs.txt
+++ b/world/map/npc/011-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hermit's cave mobs
+// Hermit's Cave mobs
 
 011-3.gat,0,0,0,0|monster|Bat|1017,10,0,0,Mob011-3::On1017
 011-3.gat,0,0,0,0|monster|Silkworm|1035,3,60000,30000,Mob011-3::On1035
diff --git a/world/map/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt
index 0bc3aed1..7107a3a2 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 changes will be removed when running the Converter.
-// Hermit's cave warps
+// Hermit's Cave warps
 
 011-3.gat,31,14|warp|ToLakeCave|-1,-1,011-4.gat,72,9
diff --git a/world/map/npc/011-4/_import.txt b/world/map/npc/011-4/_import.txt
index b40334b4..c3a0019a 100644
--- a/world/map/npc/011-4/_import.txt
+++ b/world/map/npc/011-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 011-4: Lake cave
+// Map 011-4: Lake Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 011-4.gat
 npc: npc/011-4/_mobs.txt
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index b3dd8813..b9f7cab1 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Lake cave mobs
+// Lake Cave mobs
 
 011-4.gat,52,30,39,39|monster|SpkiyMushroom|1019,1,100000,30000,Mob011-4::On1019
 011-4.gat,93,114,39,39|monster|Lamp Snake|1021,1,100000,30000,Mob011-4::On1021
diff --git a/world/map/npc/011-4/_warps.txt b/world/map/npc/011-4/_warps.txt
index f23c7368..7771aa47 100644
--- a/world/map/npc/011-4/_warps.txt
+++ b/world/map/npc/011-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Lake cave warps
+// Lake Cave warps
 
 011-4.gat,73,8|warp|ToHermitsCave|0,-1,011-3.gat,31,15
 011-4.gat,129,86|warp|ToCaveBeneathHurnscald|-1,-1,009-3.gat,21,55
diff --git a/world/map/npc/011-5/_import.txt b/world/map/npc/011-5/_import.txt
index 24b88f80..a0502fbe 100644
--- a/world/map/npc/011-5/_import.txt
+++ b/world/map/npc/011-5/_import.txt
@@ -1,4 +1,4 @@
-// Map 011-5: unnamed map 011-5
+// Map 011-5: Random
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 011-5.gat
 npc: npc/011-5/_mobs.txt
diff --git a/world/map/npc/011-5/_mobs.txt b/world/map/npc/011-5/_mobs.txt
index 6db28809..e8d2d6a7 100644
--- a/world/map/npc/011-5/_mobs.txt
+++ b/world/map/npc/011-5/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 011-5 mobs
+// Random mobs
 
 
 
diff --git a/world/map/npc/011-5/_warps.txt b/world/map/npc/011-5/_warps.txt
index 5d7dd609..a173cf10 100644
--- a/world/map/npc/011-5/_warps.txt
+++ b/world/map/npc/011-5/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 011-5 warps
+// Random warps
 
diff --git a/world/map/npc/011-6/_import.txt b/world/map/npc/011-6/_import.txt
index fbb68dc9..47530340 100644
--- a/world/map/npc/011-6/_import.txt
+++ b/world/map/npc/011-6/_import.txt
@@ -1,4 +1,4 @@
-// Map 011-6: unnamed map 011-6
+// Map 011-6: Bandit Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 011-6.gat
 npc: npc/011-6/_mobs.txt
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index 9c110ff9..e943879b 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 011-6 mobs
+// Bandit Caves mobs
 
 011-6.gat,152,72,283,127|monster|Silk Worm|1035,9,30000,100000,Mob011-6::On1035
 011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
diff --git a/world/map/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index 35ecabe7..c7946eaa 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 011-6 warps
+// Bandit Caves warps
 
 011-6.gat,51,75|warp|toMiddleCave1|-1,-1,011-6.gat,260,125
 011-6.gat,61,71|warp|toMiddleCave2|-1,-1,011-6.gat,270,122
diff --git a/world/map/npc/012-3/_import.txt b/world/map/npc/012-3/_import.txt
index 78b3bcca..b860552e 100644
--- a/world/map/npc/012-3/_import.txt
+++ b/world/map/npc/012-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 012-3: Cave
+// Map 012-3: Moggun Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 012-3.gat
 npc: npc/012-3/_mobs.txt
diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt
index 924e8ebb..fb3958e6 100644
--- a/world/map/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Moggun Caves mobs
 
 012-3.gat,447,65,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
 012-3.gat,441,45,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
diff --git a/world/map/npc/012-3/_warps.txt b/world/map/npc/012-3/_warps.txt
index 27ece076..3945ddc3 100644
--- a/world/map/npc/012-3/_warps.txt
+++ b/world/map/npc/012-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave warps
+// Moggun Caves warps
 
 012-3.gat,37,82|warp|CaveExit|0,-1,012-1.gat,98,100
 012-3.gat,80,74|warp|CaveExit|0,-1,012-1.gat,109,93
diff --git a/world/map/npc/012-4/_import.txt b/world/map/npc/012-4/_import.txt
index 7136ece3..8b3bcac3 100644
--- a/world/map/npc/012-4/_import.txt
+++ b/world/map/npc/012-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 012-4: Cave
+// Map 012-4: Terranite Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 012-4.gat
 npc: npc/012-4/_mobs.txt
diff --git a/world/map/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt
index 8d6625a0..b83a704c 100644
--- a/world/map/npc/012-4/_mobs.txt
+++ b/world/map/npc/012-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Terranite Cave mobs
 
 012-4.gat,215,44,11,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061
 012-4.gat,221,29,11,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061
diff --git a/world/map/npc/012-4/_warps.txt b/world/map/npc/012-4/_warps.txt
index 0257a0bf..a9349809 100644
--- a/world/map/npc/012-4/_warps.txt
+++ b/world/map/npc/012-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave warps
+// Terranite Cave warps
 
 012-4.gat,194,58|warp|CaveEntrance|0,-1,012-3.gat,448,62
 012-4.gat,363,26|warp|CaveEntrance|-1,-1,012-4.gat,474,186
diff --git a/world/map/npc/013-1/_import.txt b/world/map/npc/013-1/_import.txt
index 62a26f85..167433a3 100644
--- a/world/map/npc/013-1/_import.txt
+++ b/world/map/npc/013-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 013-1: Woodland hills
+// Map 013-1: Woodland Hills
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 013-1.gat
 npc: npc/013-1/_mobs.txt
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index 5c89c9ae..0e0234d9 100644
--- a/world/map/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland hills mobs
+// Woodland Hills mobs
 
 013-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0,100,Mob013-1::On1014
 013-1.gat,0,0,0,0|monster|SpikyMushroom|1019,12,0,100,Mob013-1::On1019
diff --git a/world/map/npc/013-1/_warps.txt b/world/map/npc/013-1/_warps.txt
index 3253d589..92e196aa 100644
--- a/world/map/npc/013-1/_warps.txt
+++ b/world/map/npc/013-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland hills warps
+// Woodland Hills warps
 
 013-1.gat,125,103|warp|toCave|-1,-1,013-3.gat,34,64
 013-1.gat,20,76|warp|ToWoodlandHills|-1,2,012-1.gat,148,60
diff --git a/world/map/npc/013-2/_import.txt b/world/map/npc/013-2/_import.txt
index 1ed37515..3e3d0325 100644
--- a/world/map/npc/013-2/_import.txt
+++ b/world/map/npc/013-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 013-2: Magic house
+// Map 013-2: Magic House
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 013-2.gat
 npc: npc/013-2/_mobs.txt
diff --git a/world/map/npc/013-2/_mobs.txt b/world/map/npc/013-2/_mobs.txt
index 0124aaf0..75642581 100644
--- a/world/map/npc/013-2/_mobs.txt
+++ b/world/map/npc/013-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Magic house mobs
+// Magic House mobs
 
 
 
diff --git a/world/map/npc/013-2/_warps.txt b/world/map/npc/013-2/_warps.txt
index 4f13ffd1..400d8301 100644
--- a/world/map/npc/013-2/_warps.txt
+++ b/world/map/npc/013-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Magic house warps
+// Magic House warps
 
 013-2.gat,63,43|warp|toOutside|-1,-1,013-1.gat,42,91
 013-2.gat,67,36|warp|toRoom|-1,-1,013-2.gat,21,41
diff --git a/world/map/npc/013-3/_import.txt b/world/map/npc/013-3/_import.txt
index 8be025b3..d55983bf 100644
--- a/world/map/npc/013-3/_import.txt
+++ b/world/map/npc/013-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 013-3: Cave
+// Map 013-3: Woodland Hills Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 013-3.gat
 npc: npc/013-3/_mobs.txt
diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt
index 6a1da2bf..8d15cfef 100644
--- a/world/map/npc/013-3/_mobs.txt
+++ b/world/map/npc/013-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Woodland Hills Caves mobs
 
 013-3.gat,28,89,16,52|monster|Cave Snake|1021,10,120000,60000,Mob013-3::On1021
 013-3.gat,61,22,2,2|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023
diff --git a/world/map/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt
index 871ab8dc..51dee2f4 100644
--- a/world/map/npc/013-3/_warps.txt
+++ b/world/map/npc/013-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave warps
+// Woodland Hills Caves warps
 
 013-3.gat,28,20|warp|hiddenExit|-1,-1,013-1.gat,0,0
 013-3.gat,34,63|warp|toOutside|-1,-1,013-1.gat,125,102
diff --git a/world/map/npc/014-3/_import.txt b/world/map/npc/014-3/_import.txt
index 581e3648..6da1af98 100644
--- a/world/map/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 014-3: Cave
+// Map 014-3: Woodland Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 014-3.gat
 npc: npc/014-3/_mobs.txt
diff --git a/world/map/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt
index e805bd02..db5c65b2 100644
--- a/world/map/npc/014-3/_mobs.txt
+++ b/world/map/npc/014-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Woodland Caves mobs
 
 014-3.gat,0,0,0,0|monster|Bat|1017,50,0,0,Mob014-3::On1017
 
diff --git a/world/map/npc/014-3/_warps.txt b/world/map/npc/014-3/_warps.txt
index 3b9e92fb..ac0d5474 100644
--- a/world/map/npc/014-3/_warps.txt
+++ b/world/map/npc/014-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave warps
+// Woodland Caves warps
 
 014-3.gat,35,32|warp|ToOutside|-1,-1,014-1.gat,76,39
 014-3.gat,57,173|warp|ToOutside|0,-1,014-1.gat,93,59
diff --git a/world/map/npc/015-3/_import.txt b/world/map/npc/015-3/_import.txt
index 9a9632ba..2a17ad03 100644
--- a/world/map/npc/015-3/_import.txt
+++ b/world/map/npc/015-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 015-3: Cave
+// Map 015-3: Cat's Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 015-3.gat
 npc: npc/015-3/_mobs.txt
diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt
index bafde803..98be5fc1 100644
--- a/world/map/npc/015-3/_mobs.txt
+++ b/world/map/npc/015-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Cat's Cave mobs
 
 015-3.gat,21,25,3,4|monster|Bats|1017,2,100000,30000,Mob015-3::On1017
 015-3.gat,29,31,2,2|monster|Maggots|1002,2,100000,30000,Mob015-3::On1002
diff --git a/world/map/npc/015-3/_warps.txt b/world/map/npc/015-3/_warps.txt
index 3c213c92..2c7ae69f 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 changes will be removed when running the Converter.
-// Cave warps
+// Cat's Cave warps
 
 015-3.gat,31,43|warp|to 015-1|-1,-1,015-1.gat,59,32
diff --git a/world/map/npc/017-1/_import.txt b/world/map/npc/017-1/_import.txt
index 41eb315e..9c382e96 100644
--- a/world/map/npc/017-1/_import.txt
+++ b/world/map/npc/017-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 017-1: Woodland hills
+// Map 017-1: Woodland Hills
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 017-1.gat
 npc: npc/017-1/_mobs.txt
diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index e514acc4..0aa69127 100644
--- a/world/map/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland hills mobs
+// Woodland Hills mobs
 
 017-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob017-1::On1037
 017-1.gat,29,29,19,12|monster|GambogeHerb|2033,1,0,25000,Mob017-1::On2033
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index 7edcfbb4..168293e1 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland hills warps
+// Woodland Hills warps
 
 017-1.gat,46,105|warp|toWoodland|2,-1,013-1.gat,45,22
 017-1.gat,43,32|warp|toTheatre|-1,-1,017-2.gat,26,28
diff --git a/world/map/npc/018-1/_import.txt b/world/map/npc/018-1/_import.txt
index b3ab9841..21971544 100644
--- a/world/map/npc/018-1/_import.txt
+++ b/world/map/npc/018-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 018-1: Woodland mining camp
+// Map 018-1: Woodland Mining Camp
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 018-1.gat
 npc: npc/018-1/_mobs.txt
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index 9f3cda84..b036bb7a 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland mining camp mobs
+// Woodland Mining Camp mobs
 
 018-1.gat,136,79,9,41|monster|Sea Slime|1033,10,100000,30000,Mob018-1::On1033
 018-1.gat,108,87,53,25|monster|Log Head|1025,10,100000,30000,Mob018-1::On1025
diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt
index a98bf483..dec3a6a7 100644
--- a/world/map/npc/018-1/_warps.txt
+++ b/world/map/npc/018-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland mining camp warps
+// Woodland Mining Camp warps
 
 018-1.gat,79,59|warp|toMine|0,-1,018-3.gat,99,132
 018-1.gat,112,61|warp|toCave|-1,-1,018-3.gat,44,36
diff --git a/world/map/npc/018-2/_import.txt b/world/map/npc/018-2/_import.txt
index 8ce96730..724dedf3 100644
--- a/world/map/npc/018-2/_import.txt
+++ b/world/map/npc/018-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 018-2: Woodland mining camp
+// Map 018-2: Woodland Mining Camp Indoor
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 018-2.gat
 npc: npc/018-2/_mobs.txt
diff --git a/world/map/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt
index 36d458e8..253058d8 100644
--- a/world/map/npc/018-2/_mobs.txt
+++ b/world/map/npc/018-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland mining camp mobs
+// Woodland Mining Camp Indoor mobs
 
 018-2.gat,114,21,4,3|monster|Yellow Slime|1007,1,100000,30000,Mob018-2::On1007
 
diff --git a/world/map/npc/018-2/_warps.txt b/world/map/npc/018-2/_warps.txt
index 167aa045..473d3146 100644
--- a/world/map/npc/018-2/_warps.txt
+++ b/world/map/npc/018-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland mining camp warps
+// Woodland Mining Camp Indoor warps
 
 018-2.gat,50,29|warp|toOutside|-1,-1,018-1.gat,65,74
 018-2.gat,41,20|warp|toOutside|-1,-1,018-1.gat,65,69
diff --git a/world/map/npc/018-3/_import.txt b/world/map/npc/018-3/_import.txt
index 53391a07..6957b9be 100644
--- a/world/map/npc/018-3/_import.txt
+++ b/world/map/npc/018-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 018-3: Cave
+// Map 018-3: Northern Mines
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 018-3.gat
 npc: npc/018-3/_mobs.txt
diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index a939082e..349144f4 100644
--- a/world/map/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Northern Mines mobs
 
 018-3.gat,48,28,56,17|monster|Bat|1017,10,100000,30000,Mob018-3::On1017
 018-3.gat,35,144,31,48|monster|Evil Mushroom|1013,10,120000,30000,Mob018-3::On1013
diff --git a/world/map/npc/018-3/_warps.txt b/world/map/npc/018-3/_warps.txt
index eabe34c0..4db72c80 100644
--- a/world/map/npc/018-3/_warps.txt
+++ b/world/map/npc/018-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave warps
+// Northern Mines warps
 
 018-3.gat,100,133|warp|toOutside|0,-1,018-1.gat,78,60
 018-3.gat,44,37|warp|toOutside|-1,-1,018-1.gat,112,62
diff --git a/world/map/npc/019-1/_import.txt b/world/map/npc/019-1/_import.txt
index 4b4ebcf1..c86b158e 100644
--- a/world/map/npc/019-1/_import.txt
+++ b/world/map/npc/019-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 019-1: Snow field
+// Map 019-1: Snow Field
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 019-1.gat
 npc: npc/019-1/_mobs.txt
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index c9b69705..1f34bb11 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow field mobs
+// Snow Field mobs
 
 019-1.gat,0,0,0,0|monster|Fluffy|1020,100,100000,30000,Mob019-1::On1020
 019-1.gat,0,0,0,0|monster|SantaSlime|1015,10,0,0,Mob019-1::On1015
diff --git a/world/map/npc/019-1/_warps.txt b/world/map/npc/019-1/_warps.txt
index 28b87223..721925cb 100644
--- a/world/map/npc/019-1/_warps.txt
+++ b/world/map/npc/019-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow field warps
+// Snow Field warps
 
 019-1.gat,70,21|warp|ToVillage|2,-1,020-1.gat,70,126
 019-1.gat,61,102|warp|toRomanticPlace|2,-1,030-1.gat,60,29
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
index 9d7059d0..b9b886bc 100644
--- a/world/map/npc/021-1/_import.txt
+++ b/world/map/npc/021-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 021-1: Tulimshar
+// Map 021-1: North Tulimshar
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 021-1.gat
 npc: npc/021-1/_mobs.txt
diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt
index 68822ace..f205507a 100644
--- a/world/map/npc/021-1/_mobs.txt
+++ b/world/map/npc/021-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar mobs
+// North Tulimshar mobs
 
 021-1.gat,126,86,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002
 021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index 7fd34f4d..e2baf549 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar warps
+// North Tulimshar warps
 
 021-1.gat,55,146|warp|toBazaar|3,-1,001-1.gat,44,20
 021-1.gat,136,146|warp|toSouthTulimshar|0,-1,001-1.gat,124,21
diff --git a/world/map/npc/022-1/_import.txt b/world/map/npc/022-1/_import.txt
index 7fd59b12..11b375cf 100644
--- a/world/map/npc/022-1/_import.txt
+++ b/world/map/npc/022-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 022-1: Tulimshar
+// Map 022-1: Tulimshar Port
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 022-1.gat
 npc: npc/022-1/_mobs.txt
diff --git a/world/map/npc/022-1/_mobs.txt b/world/map/npc/022-1/_mobs.txt
index 650feecc..92b81a81 100644
--- a/world/map/npc/022-1/_mobs.txt
+++ b/world/map/npc/022-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar mobs
+// Tulimshar Port mobs
 
 
 
diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
index 3b840d83..ef720469 100644
--- a/world/map/npc/022-1/_warps.txt
+++ b/world/map/npc/022-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar warps
+// Tulimshar Port warps
 
 022-1.gat,72,108|warp|ToCentralTulimshar|3,-1,021-1.gat,73,21
 022-1.gat,113,108|warp|ToCentralTulimshar|3,-1,021-1.gat,113,21
diff --git a/world/map/npc/027-2/_import.txt b/world/map/npc/027-2/_import.txt
index 56dcdd1b..b21edf9e 100644
--- a/world/map/npc/027-2/_import.txt
+++ b/world/map/npc/027-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 027-2: Caretaker's House
+// Map 027-2: Graveyard Indoor
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 027-2.gat
 npc: npc/027-2/_mobs.txt
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index b1ab84e5..b0c56143 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Caretaker's House mobs
+// Graveyard Indoor mobs
 
 027-2.gat,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
 027-2.gat,91,38,11,9|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
diff --git a/world/map/npc/027-2/_warps.txt b/world/map/npc/027-2/_warps.txt
index b7ae48a9..e9b9cdbc 100644
--- a/world/map/npc/027-2/_warps.txt
+++ b/world/map/npc/027-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Caretaker's House warps
+// Graveyard Indoor warps
 
 027-2.gat,26,33|warp|toGraveyard|-1,-1,027-1.gat,88,85
 027-2.gat,128,35|warp|To2ndFloor|0,-1,027-2.gat,75,93
diff --git a/world/map/npc/028-1/_import.txt b/world/map/npc/028-1/_import.txt
index d71d931d..db87b93f 100644
--- a/world/map/npc/028-1/_import.txt
+++ b/world/map/npc/028-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 028-1: unnamed map 028-1
+// Map 028-1: Easter Island
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 028-1.gat
 npc: npc/028-1/Portal.txt
diff --git a/world/map/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt
index c2980d7f..b8ccf404 100644
--- a/world/map/npc/028-1/_mobs.txt
+++ b/world/map/npc/028-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 028-1 mobs
+// Easter Island mobs
 
 028-1.gat,115,72,27,25|monster|SpikyMushrooms|1019,18,20000,600,Mob028-1::On1019
 028-1.gat,83,69,25,19|monster|Bat|1017,18,100000,1200,Mob028-1::On1017
diff --git a/world/map/npc/028-1/_warps.txt b/world/map/npc/028-1/_warps.txt
index fcf137a3..c32b6886 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 changes will be removed when running the Converter.
-// unnamed map 028-1 warps
+// Easter Island warps
 
 028-1.gat,114,122|warp|To028-3|-1,-1,028-3.gat,33,78
diff --git a/world/map/npc/028-3/_import.txt b/world/map/npc/028-3/_import.txt
index 6578d494..38108e9f 100644
--- a/world/map/npc/028-3/_import.txt
+++ b/world/map/npc/028-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 028-3: unnamed map 028-3
+// Map 028-3: Easter Island Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 028-3.gat
 npc: npc/028-3/_mobs.txt
diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt
index 7202e848..3f025144 100644
--- a/world/map/npc/028-3/_mobs.txt
+++ b/world/map/npc/028-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 028-3 mobs
+// Easter Island Cave mobs
 
 028-3.gat,51,49,22,15|monster|Silkworm|1035,10,0,3000,Mob028-3::On1035
 028-3.gat,43,35,1,1|monster|EvilMushroom|1013,3,40000,5000,Mob028-3::On1013
diff --git a/world/map/npc/028-3/_warps.txt b/world/map/npc/028-3/_warps.txt
index a63bbc0d..3f5a7eb4 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 changes will be removed when running the Converter.
-// unnamed map 028-3 warps
+// Easter Island Cave warps
 
 028-3.gat,33,78|warp|To028-1|-1,-1,028-1.gat,114,122
diff --git a/world/map/npc/029-1/_import.txt b/world/map/npc/029-1/_import.txt
index 5c1410b0..d424f357 100644
--- a/world/map/npc/029-1/_import.txt
+++ b/world/map/npc/029-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 029-1: Candor
+// Map 029-1: Candor Island
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 029-1.gat
 npc: npc/029-1/_mobs.txt
diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt
index 1279b773..bfc5023a 100644
--- a/world/map/npc/029-1/_mobs.txt
+++ b/world/map/npc/029-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Candor mobs
+// Candor Island mobs
 
 029-1.gat,68,64,11,13|monster|Evil Mushrooms|1013,4,20000,60000,Mob029-1::On1013
 029-1.gat,31,32,12,13|monster|Squirrel|1038,3,30000,60000,Mob029-1::On1038
diff --git a/world/map/npc/029-1/_warps.txt b/world/map/npc/029-1/_warps.txt
index ffe9c2d6..d7ee1fd0 100644
--- a/world/map/npc/029-1/_warps.txt
+++ b/world/map/npc/029-1/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Candor warps
+// Candor Island warps
 
diff --git a/world/map/npc/029-3/_import.txt b/world/map/npc/029-3/_import.txt
index e8ca1dac..ab9b8d2a 100644
--- a/world/map/npc/029-3/_import.txt
+++ b/world/map/npc/029-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 029-3: Fight Cave
+// Map 029-3: Candor Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 029-3.gat
 npc: npc/029-3/_mobs.txt
diff --git a/world/map/npc/029-3/_mobs.txt b/world/map/npc/029-3/_mobs.txt
index f5d73530..f830bb2d 100644
--- a/world/map/npc/029-3/_mobs.txt
+++ b/world/map/npc/029-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Fight Cave mobs
+// Candor Cave mobs
 
 
 
diff --git a/world/map/npc/029-3/_warps.txt b/world/map/npc/029-3/_warps.txt
index 42f13dee..5ecf4dde 100644
--- a/world/map/npc/029-3/_warps.txt
+++ b/world/map/npc/029-3/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Fight Cave warps
+// Candor Cave warps
 
diff --git a/world/map/npc/030-1/_import.txt b/world/map/npc/030-1/_import.txt
index d8cabe5d..8f8daae4 100644
--- a/world/map/npc/030-1/_import.txt
+++ b/world/map/npc/030-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 030-1: Snow field
+// Map 030-1: Snow Field
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 030-1.gat
 npc: npc/030-1/_mobs.txt
diff --git a/world/map/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt
index daaf7dea..750bf7e5 100644
--- a/world/map/npc/030-1/_mobs.txt
+++ b/world/map/npc/030-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow field mobs
+// Snow Field mobs
 
 030-1.gat,0,0,0,0|monster|Santa Slime|1015,5,100000,30000,Mob030-1::On1015
 030-1.gat,0,0,0,0|monster|Squirrel|1038,10,100000,30000,Mob030-1::On1038
diff --git a/world/map/npc/030-1/_warps.txt b/world/map/npc/030-1/_warps.txt
index e67e8921..55c7df36 100644
--- a/world/map/npc/030-1/_warps.txt
+++ b/world/map/npc/030-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow field warps
+// Snow Field warps
 
 030-1.gat,61,28|warp|toSnowfield|0,-1,019-1.gat,61,100
diff --git a/world/map/npc/031-1/_import.txt b/world/map/npc/031-1/_import.txt
index f525795e..c8de7af8 100644
--- a/world/map/npc/031-1/_import.txt
+++ b/world/map/npc/031-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 031-1: NivalisPort
+// Map 031-1: Nivalis Port
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 031-1.gat
 npc: npc/031-1/_mobs.txt
diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index a28d1e69..7a603257 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// NivalisPort mobs
+// Nivalis Port mobs
 
 031-1.gat,75,72,86,110|monster|Santa Slime|1015,5,100000,30000,Mob031-1::On1015
 031-1.gat,89,74,86,110|monster|Squirrel|1038,10,100000,30000,Mob031-1::On1038
diff --git a/world/map/npc/031-1/_warps.txt b/world/map/npc/031-1/_warps.txt
index 144b4498..809267a9 100644
--- a/world/map/npc/031-1/_warps.txt
+++ b/world/map/npc/031-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// NivalisPort warps
+// Nivalis Port warps
 
 031-1.gat,37,55|warp|toNivalis|-1,-1,020-1.gat,106,55
 031-1.gat,76,24|warp|toLabyrinth|-1,-1,031-3.gat,212,298
diff --git a/world/map/npc/031-3/_import.txt b/world/map/npc/031-3/_import.txt
index 2cb30906..d2d83387 100644
--- a/world/map/npc/031-3/_import.txt
+++ b/world/map/npc/031-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 031-3: Cave
+// Map 031-3: Ice Caves
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 031-3.gat
 npc: npc/031-3/_mobs.txt
diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index b2aa1d0d..4ab99cfd 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Ice Caves mobs
 
 031-3.gat,39,276,42,16|monster|Santa Slime|1015,5,100000,30000,Mob031-3::On1015
 031-3.gat,230,279,25,26|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt
index bcc4e966..2aea5e67 100644
--- a/world/map/npc/031-3/_warps.txt
+++ b/world/map/npc/031-3/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave warps
+// Ice Caves warps
 
 031-3.gat,212,300|warp|toOutside|-1,-1,031-1.gat,76,26
 031-3.gat,205,264|warp|toCave|-1,-1,031-3.gat,149,261
diff --git a/world/map/npc/031-4/_import.txt b/world/map/npc/031-4/_import.txt
index 87eec449..417c4680 100644
--- a/world/map/npc/031-4/_import.txt
+++ b/world/map/npc/031-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 031-4: Cave
+// Map 031-4: Cindy Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 031-4.gat
 npc: npc/031-4/_mobs.txt
diff --git a/world/map/npc/031-4/_mobs.txt b/world/map/npc/031-4/_mobs.txt
index c1f30a3d..5bbd2f39 100644
--- a/world/map/npc/031-4/_mobs.txt
+++ b/world/map/npc/031-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Cindy Cave mobs
 
 
 
diff --git a/world/map/npc/031-4/_warps.txt b/world/map/npc/031-4/_warps.txt
index d1984dbc..1b6dd614 100644
--- a/world/map/npc/031-4/_warps.txt
+++ b/world/map/npc/031-4/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave warps
+// Cindy Cave warps
 
diff --git a/world/map/npc/032-3/_import.txt b/world/map/npc/032-3/_import.txt
index 67304eae..73ed3c4f 100644
--- a/world/map/npc/032-3/_import.txt
+++ b/world/map/npc/032-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 032-3: Cave
+// Map 032-3: Outback Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 032-3.gat
 npc: npc/032-3/_mobs.txt
diff --git a/world/map/npc/032-3/_mobs.txt b/world/map/npc/032-3/_mobs.txt
index 34c4ebc4..49b68b84 100644
--- a/world/map/npc/032-3/_mobs.txt
+++ b/world/map/npc/032-3/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Cave mobs
+// Outback Cave mobs
 
 032-3.gat,90,44,9,10|monster|Sceleton|1043,3,30000,100000,Mob032-3::On1043
 032-3.gat,44,23,29,22|monster|MountainSnake|1026,7,30000,100000,Mob032-3::On1026
diff --git a/world/map/npc/032-3/_warps.txt b/world/map/npc/032-3/_warps.txt
index a2ecae33..1f452a3e 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 changes will be removed when running the Converter.
-// Cave warps
+// Outback Cave warps
 
 032-3.gat,128,33|warp|ToDesert|-1,-1,006-1.gat,30,124
 032-3.gat,56,61|warp|toDesert|-1,-1,032-1.gat,64,53
diff --git a/world/map/npc/033-1/_import.txt b/world/map/npc/033-1/_import.txt
index eb257c24..bb31437a 100644
--- a/world/map/npc/033-1/_import.txt
+++ b/world/map/npc/033-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 033-1: Snow field
+// Map 033-1: Snow Field
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 033-1.gat
 npc: npc/033-1/_mobs.txt
diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt
index daab38d9..96a51f99 100644
--- a/world/map/npc/033-1/_mobs.txt
+++ b/world/map/npc/033-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow field mobs
+// Snow Field mobs
 
 
 
diff --git a/world/map/npc/033-1/_warps.txt b/world/map/npc/033-1/_warps.txt
index 137b1780..538a5dcb 100644
--- a/world/map/npc/033-1/_warps.txt
+++ b/world/map/npc/033-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow field warps
+// Snow Field warps
 
 033-1.gat,22,20|warp|ToSnowField|-1,0,034-1.gat,159,19
diff --git a/world/map/npc/034-1/_import.txt b/world/map/npc/034-1/_import.txt
index e88cbd7a..79870598 100644
--- a/world/map/npc/034-1/_import.txt
+++ b/world/map/npc/034-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 034-1: Snow field
+// Map 034-1: Snow Forest
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 034-1.gat
 npc: npc/034-1/_mobs.txt
diff --git a/world/map/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt
index 847c66d6..12f6d0df 100644
--- a/world/map/npc/034-1/_mobs.txt
+++ b/world/map/npc/034-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow field mobs
+// Snow Forest mobs
 
 
 
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index 87897901..a87ebc1f 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow field warps
+// Snow Forest warps
 
 034-1.gat,160,20|warp|ToSnowField|-1,0,033-1.gat,23,19
diff --git a/world/map/npc/041-1/_import.txt b/world/map/npc/041-1/_import.txt
index f3ec6736..b7c08da2 100644
--- a/world/map/npc/041-1/_import.txt
+++ b/world/map/npc/041-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 041-1: unnamed map 041-1
+// Map 041-1: Beach
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 041-1.gat
 npc: npc/041-1/_mobs.txt
diff --git a/world/map/npc/041-1/_mobs.txt b/world/map/npc/041-1/_mobs.txt
index f8ae9cfd..ee5dc689 100644
--- a/world/map/npc/041-1/_mobs.txt
+++ b/world/map/npc/041-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 041-1 mobs
+// Beach mobs
 
 041-1.gat,56,55,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
 041-1.gat,76,67,18,9|monster|Scorpion|1003,3,100000,30000,Mob041-1::On1003
diff --git a/world/map/npc/041-1/_warps.txt b/world/map/npc/041-1/_warps.txt
index 7166e2f0..9bfa0da7 100644
--- a/world/map/npc/041-1/_warps.txt
+++ b/world/map/npc/041-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 041-1 warps
+// Beach warps
 
 041-1.gat,76,95|warp|to004-1|1,-1,004-1.gat,68,20
diff --git a/world/map/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt
index f7900726..d86cc00b 100644
--- a/world/map/npc/042-1/_import.txt
+++ b/world/map/npc/042-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 042-1: unnamed map 042-1
+// Map 042-1: Tulimshar Suburbs
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 042-1.gat
 npc: npc/042-1/_mobs.txt
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
index ef8b4e39..07021b21 100644
--- a/world/map/npc/042-1/_mobs.txt
+++ b/world/map/npc/042-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 042-1 mobs
+// Tulimshar Suburbs mobs
 
 
 
diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
index 3925afee..39ae762e 100644
--- a/world/map/npc/042-1/_warps.txt
+++ b/world/map/npc/042-1/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 042-1 warps
+// Tulimshar Suburbs warps
 
 042-1.gat,87,76|warp|toStorehouse|-1,-1,042-2.gat,44,91
 042-1.gat,77,76|warp|toStorehouse|-1,-1,042-2.gat,22,91
diff --git a/world/map/npc/042-2/_import.txt b/world/map/npc/042-2/_import.txt
index 09ce6d23..45f7ea62 100644
--- a/world/map/npc/042-2/_import.txt
+++ b/world/map/npc/042-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 042-2: unnamed map 042-2
+// Map 042-2: Tulimshar Suburbs Indoor
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 042-2.gat
 npc: npc/042-2/_mobs.txt
diff --git a/world/map/npc/042-2/_mobs.txt b/world/map/npc/042-2/_mobs.txt
index c1088241..4bebc4ec 100644
--- a/world/map/npc/042-2/_mobs.txt
+++ b/world/map/npc/042-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 042-2 mobs
+// Tulimshar Suburbs Indoor mobs
 
 
 
diff --git a/world/map/npc/042-2/_warps.txt b/world/map/npc/042-2/_warps.txt
index 8788103e..35475800 100644
--- a/world/map/npc/042-2/_warps.txt
+++ b/world/map/npc/042-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map 042-2 warps
+// Tulimshar Suburbs Indoor warps
 
 042-2.gat,29,62|warp|toOutside|-1,-1,042-1.gat,62,64
 042-2.gat,22,93|warp|toOutside|-1,-1,042-1.gat,77,78
diff --git a/world/map/npc/botcheck/_import.txt b/world/map/npc/botcheck/_import.txt
index 6d5394ab..26445239 100644
--- a/world/map/npc/botcheck/_import.txt
+++ b/world/map/npc/botcheck/_import.txt
@@ -1,4 +1,4 @@
-// Map botcheck: unnamed map botcheck
+// Map botcheck: Botcheck Area
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: botcheck.gat
 npc: npc/botcheck/_mobs.txt
diff --git a/world/map/npc/botcheck/_mobs.txt b/world/map/npc/botcheck/_mobs.txt
index 730058b8..c227a333 100644
--- a/world/map/npc/botcheck/_mobs.txt
+++ b/world/map/npc/botcheck/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map botcheck mobs
+// Botcheck Area mobs
 
 
 
diff --git a/world/map/npc/botcheck/_warps.txt b/world/map/npc/botcheck/_warps.txt
index 5add07b3..da1e9b33 100644
--- a/world/map/npc/botcheck/_warps.txt
+++ b/world/map/npc/botcheck/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// unnamed map botcheck warps
+// Botcheck Area warps
 
-- 
cgit v1.2.3-70-g09d2