summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/001-1/_mobs.txt4
-rw-r--r--world/map/npc/001-1/_warps.txt10
-rw-r--r--world/map/npc/001-2/_import.txt2
-rw-r--r--world/map/npc/001-2/_mobs.txt2
-rw-r--r--world/map/npc/001-2/_warps.txt22
-rw-r--r--world/map/npc/001-3/_warps.txt2
-rw-r--r--world/map/npc/002-1/_mobs.txt2
-rw-r--r--world/map/npc/002-1/_warps.txt8
-rw-r--r--world/map/npc/002-3/_mobs.txt6
-rw-r--r--world/map/npc/002-3/_warps.txt2
-rw-r--r--world/map/npc/002-4/_mobs.txt34
-rw-r--r--world/map/npc/002-4/_warps.txt2
-rw-r--r--world/map/npc/003-1/_mobs.txt2
-rw-r--r--world/map/npc/003-1/_warps.txt8
-rw-r--r--world/map/npc/003-2/_import.txt2
-rw-r--r--world/map/npc/003-2/_mobs.txt2
-rw-r--r--world/map/npc/003-2/_warps.txt6
-rw-r--r--world/map/npc/004-1/_mobs.txt12
-rw-r--r--world/map/npc/004-1/_warps.txt10
-rw-r--r--world/map/npc/004-2/_import.txt2
-rw-r--r--world/map/npc/004-2/_mobs.txt2
-rw-r--r--world/map/npc/004-2/_warps.txt18
-rw-r--r--world/map/npc/005-1/_warps.txt32
-rw-r--r--world/map/npc/005-3/_warps.txt4
-rw-r--r--world/map/npc/005-4/_warps.txt2
-rw-r--r--world/map/npc/006-1/_warps.txt66
-rw-r--r--world/map/npc/006-3/_import.txt2
-rw-r--r--world/map/npc/006-3/_mobs.txt2
-rw-r--r--world/map/npc/006-3/_warps.txt40
-rw-r--r--world/map/npc/007-1/_mobs.txt8
-rw-r--r--world/map/npc/007-1/_warps.txt6
-rw-r--r--world/map/npc/008-1/_mobs.txt10
-rw-r--r--world/map/npc/008-1/_warps.txt16
-rw-r--r--world/map/npc/009-1/_mobs.txt4
-rw-r--r--world/map/npc/009-1/_warps.txt22
-rw-r--r--world/map/npc/009-2/_warps.txt40
-rw-r--r--world/map/npc/009-3/_import.txt2
-rw-r--r--world/map/npc/009-3/_mobs.txt8
-rw-r--r--world/map/npc/009-3/_warps.txt10
-rw-r--r--world/map/npc/009-4/_mobs.txt2
-rw-r--r--world/map/npc/009-4/_warps.txt12
-rw-r--r--world/map/npc/010-1/_mobs.txt16
-rw-r--r--world/map/npc/010-1/_warps.txt10
-rw-r--r--world/map/npc/010-2/_warps.txt14
-rw-r--r--world/map/npc/011-1/_mobs.txt12
-rw-r--r--world/map/npc/011-1/_warps.txt12
-rw-r--r--world/map/npc/011-3/_warps.txt2
-rw-r--r--world/map/npc/011-4/_mobs.txt8
-rw-r--r--world/map/npc/011-4/_warps.txt22
-rw-r--r--world/map/npc/011-6/_import.txt2
-rw-r--r--world/map/npc/011-6/_mobs.txt4
-rw-r--r--world/map/npc/011-6/_warps.txt48
-rw-r--r--world/map/npc/012-1/_mobs.txt16
-rw-r--r--world/map/npc/012-1/_warps.txt22
-rw-r--r--world/map/npc/012-3/_import.txt2
-rw-r--r--world/map/npc/012-3/_mobs.txt32
-rw-r--r--world/map/npc/012-3/_warps.txt22
-rw-r--r--world/map/npc/012-4/_mobs.txt112
-rw-r--r--world/map/npc/012-4/_warps.txt6
-rw-r--r--world/map/npc/013-1/_mobs.txt22
-rw-r--r--world/map/npc/013-1/_warps.txt8
-rw-r--r--world/map/npc/013-2/_warps.txt6
-rw-r--r--world/map/npc/013-3/_import.txt2
-rw-r--r--world/map/npc/013-3/_mobs.txt32
-rw-r--r--world/map/npc/013-3/_warps.txt74
-rw-r--r--world/map/npc/014-1/_mobs.txt24
-rw-r--r--world/map/npc/014-1/_warps.txt6
-rw-r--r--world/map/npc/014-3/_import.txt2
-rw-r--r--world/map/npc/014-3/_mobs.txt2
-rw-r--r--world/map/npc/014-3/_warps.txt10
-rw-r--r--world/map/npc/015-1/_mobs.txt14
-rw-r--r--world/map/npc/015-1/_warps.txt6
-rw-r--r--world/map/npc/015-3/_mobs.txt6
-rw-r--r--world/map/npc/015-3/_warps.txt2
-rw-r--r--world/map/npc/016-1/_warps.txt4
-rw-r--r--world/map/npc/017-1/_import.txt1
-rw-r--r--world/map/npc/017-1/_mobs.txt80
-rw-r--r--world/map/npc/017-1/_warps.txt10
-rw-r--r--world/map/npc/017-1/monsters.txt83
-rw-r--r--world/map/npc/017-2/_warps.txt14
-rw-r--r--world/map/npc/017-9/_warps.txt12
-rw-r--r--world/map/npc/018-1/_mobs.txt14
-rw-r--r--world/map/npc/018-1/_warps.txt31
-rw-r--r--world/map/npc/018-2/_warps.txt14
-rw-r--r--world/map/npc/018-3/_mobs.txt26
-rw-r--r--world/map/npc/018-3/_warps.txt42
-rw-r--r--world/map/npc/019-1/_mobs.txt4
-rw-r--r--world/map/npc/019-1/_warps.txt9
-rw-r--r--world/map/npc/019-3/_mobs.txt2
-rw-r--r--world/map/npc/019-3/_warps.txt4
-rw-r--r--world/map/npc/020-1/_warps.txt17
-rw-r--r--world/map/npc/020-2/_import.txt2
-rw-r--r--world/map/npc/020-2/_mobs.txt2
-rw-r--r--world/map/npc/020-2/_warps.txt12
-rw-r--r--world/map/npc/020-3/_mobs.txt2
-rw-r--r--world/map/npc/020-3/_warps.txt14
-rw-r--r--world/map/npc/021-1/_warps.txt22
-rw-r--r--world/map/npc/021-2/_import.txt2
-rw-r--r--world/map/npc/021-2/_mobs.txt2
-rw-r--r--world/map/npc/021-2/_warps.txt24
-rw-r--r--world/map/npc/022-1/_warps.txt4
-rw-r--r--world/map/npc/024-1/_mobs.txt2
-rw-r--r--world/map/npc/024-1/_warps.txt6
-rw-r--r--world/map/npc/024-2/_warps.txt4
-rw-r--r--world/map/npc/025-1/_mobs.txt6
-rw-r--r--world/map/npc/025-1/_warps.txt6
-rw-r--r--world/map/npc/025-3/_mobs.txt4
-rw-r--r--world/map/npc/025-3/_warps.txt4
-rw-r--r--world/map/npc/025-4/_mobs.txt4
-rw-r--r--world/map/npc/025-4/_warps.txt2
-rw-r--r--world/map/npc/026-1/_mobs.txt16
-rw-r--r--world/map/npc/026-1/_warps.txt4
-rw-r--r--world/map/npc/027-1/_mobs.txt20
-rw-r--r--world/map/npc/027-1/_warps.txt4
-rw-r--r--world/map/npc/027-2/_mobs.txt12
-rw-r--r--world/map/npc/027-2/_warps.txt8
-rw-r--r--world/map/npc/027-3/_warps.txt2
-rw-r--r--world/map/npc/027-4/_warps.txt2
-rw-r--r--world/map/npc/028-1/_mobs.txt2
-rw-r--r--world/map/npc/028-1/_warps.txt2
-rw-r--r--world/map/npc/028-3/_mobs.txt4
-rw-r--r--world/map/npc/028-3/_warps.txt2
-rw-r--r--world/map/npc/029-1/_mobs.txt10
-rw-r--r--world/map/npc/030-1/_warps.txt3
-rw-r--r--world/map/npc/031-1/_mobs.txt6
-rw-r--r--world/map/npc/031-1/_warps.txt4
-rw-r--r--world/map/npc/031-2/_warps.txt2
-rw-r--r--world/map/npc/031-3/_import.txt2
-rw-r--r--world/map/npc/031-3/_mobs.txt71
-rw-r--r--world/map/npc/031-3/_warps.txt96
-rw-r--r--world/map/npc/032-1/_mobs.txt6
-rw-r--r--world/map/npc/032-1/_warps.txt2
-rw-r--r--world/map/npc/032-3/_mobs.txt12
-rw-r--r--world/map/npc/032-3/_warps.txt4
-rw-r--r--world/map/npc/033-1/_warps.txt2
-rw-r--r--world/map/npc/034-1/_warps.txt2
-rw-r--r--world/map/npc/041-1/_warps.txt2
-rw-r--r--world/map/npc/042-1/_warps.txt8
-rw-r--r--world/map/npc/042-2/_warps.txt6
139 files changed, 910 insertions, 923 deletions
diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index 4c97718b..38851e5f 100644
--- a/world/map/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
@@ -12,9 +12,9 @@
001-1.gat,124,53,15,13|monster|Maggot|1002,10,100000,30000,Mob001-1::On1002
001-1.gat,120,64,15,13|monster|Maggot|1002,11,100000,30000,Mob001-1::On1002
001-1.gat,53,23,26,4|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
-001-1.gat,68,67,9,10|monster|Maggots|1002,2,100000,30000,Mob001-1::On1002
+001-1.gat,68,67,9,10|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
001-1.gat,99,81,24,4|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
-001-1.gat,139,65,12,23|monster|Maggots|1002,2,100000,30000,Mob001-1::On1002
+001-1.gat,139,65,12,23|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
001-1.gat,113,47,8,11|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
001-1.gat,132,38,11,12|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
001-1.gat,77,49,17,13|monster|Maggot|1002,2,100000,30000,Mob001-1::On1002
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index 7fafbef1..a15050cf 100644
--- a/world/map/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-001-1.gat,125,20|warp|toCentralTulimshar|0,-1,021-1.gat,136,146
-001-1.gat,32,71|warp|ToInn|-1,-1,001-2.gat,25,34
-001-1.gat,75,41|warp|ToHouse|-1,-1,001-2.gat,71,72
+001-1.gat,44,87|warp|To Sandstorm Desert|3,-1,002-1.gat,58,14
+001-1.gat,44,20|warp|To North Tulimshar|3,-1,021-1.gat,55,145
+001-1.gat,125,21|warp|To North Tulimshar|0,-1,021-1.gat,136,146
+001-1.gat,32,71|warp|To Tulimshar Indoor|-1,-1,001-2.gat,25,34
+001-1.gat,75,41|warp|To Tulimshar Indoor|-1,-1,001-2.gat,71,72
diff --git a/world/map/npc/001-2/_import.txt b/world/map/npc/001-2/_import.txt
index d20321fe..ae570981 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 Indoor
+// Map 001-2: South 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 8bfb5d6e..4aeb43d6 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 Indoor mobs
+// South Tulimshar Indoor mobs
diff --git a/world/map/npc/001-2/_warps.txt b/world/map/npc/001-2/_warps.txt
index b6c48bc7..50745da6 100644
--- a/world/map/npc/001-2/_warps.txt
+++ b/world/map/npc/001-2/_warps.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Indoor warps
+// South 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
-001-2.gat,64,25|warp|To1stFloor|-1,-1,001-2.gat,42,25
-001-2.gat,67,30|warp|ToBedroom|-1,-1,001-2.gat,102,23
-001-2.gat,76,30|warp|ToDeposit|-1,-1,001-2.gat,130,23
-001-2.gat,69,22|warp|ToCasino|0,-1,001-2.gat,32,72
-001-2.gat,103,22|warp|To2ndFloor|0,-1,001-2.gat,67,29
-001-2.gat,131,22|warp|To2ndFloor|0,-1,001-2.gat,76,29
-001-2.gat,32,73|warp|To2ndFloor|-1,-1,001-2.gat,68,23
-001-2.gat,71,73|warp|ToOutdoor|-1,-1,001-1.gat,75,42
+001-2.gat,25,35|warp|To Outside|-1,-1,001-1.gat,32,72
+001-2.gat,44,25|warp|To Second Floor|-1,0,001-2.gat,65,25
+001-2.gat,64,25|warp|To First Floor|-1,-1,001-2.gat,43,25
+001-2.gat,67,30|warp|To Bedroom|-1,-1,001-2.gat,103,23
+001-2.gat,76,30|warp|To Deposit|-1,-1,001-2.gat,131,23
+001-2.gat,69,22|warp|To Casino|0,-1,001-2.gat,32,72
+001-2.gat,103,22|warp|To Second Floor|0,-1,001-2.gat,67,29
+001-2.gat,131,22|warp|To Second Floor|0,-1,001-2.gat,76,29
+001-2.gat,32,73|warp|To Second Floor|-1,-1,001-2.gat,69,23
+001-2.gat,71,73|warp|To Outside|-1,-1,001-1.gat,75,42
diff --git a/world/map/npc/001-3/_warps.txt b/world/map/npc/001-3/_warps.txt
index b8a03519..e8e35ee1 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
-001-3.gat,72,28|warp|ToInn|-1,-1,001-2.gat,23,24
+001-3.gat,73,28|warp|To Tulimshar Indoor|-1,-1,001-2.gat,23,24
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index 8cd52134..16a8ae05 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -13,7 +13,7 @@
002-1.gat,61,74,41,43|monster|Fire Goblin|1011,15,100000,30000,Mob002-1::On1011
002-1.gat,82,24,34,15|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
002-1.gat,32,35,34,33|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,27,81,22,43|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
+002-1.gat,27,82,22,43|monster|Scorpion|1003,8,100000,30000,Mob002-1::On1003
002-1.gat,95,75,15,17|monster|Black Scorpion|1009,1,100000,1800000,Mob002-1::On1009
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index c665836d..e238d32f 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-002-1.gat,12,66|warp|ToWesternDesert|-1,3,003-1.gat,168,76
-002-1.gat,28,13|warp|ToBeach|1,-1,004-1.gat,84,111
+002-1.gat,58,13|warp|To South Tulimshar|3,-1,001-1.gat,44,86
+002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40
+002-1.gat,12,67|warp|To Beach|-1,3,003-1.gat,171,76
+002-1.gat,28,13|warp|To Beach|1,-1,004-1.gat,84,114
diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt
index 276e0462..c3f36dda 100644
--- a/world/map/npc/002-3/_mobs.txt
+++ b/world/map/npc/002-3/_mobs.txt
@@ -1,12 +1,12 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Desert Mines mobs
-002-3.gat,39,37,14,10|monster|Cave Maggot|1056,5,100000,30000,Mob002-3::On1056
+002-3.gat,39,37,15,11|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
002-3.gat,71,35,25,17|monster|Cave Maggot|1056,4,100000,30000,Mob002-3::On1056
-002-3.gat,68,100,8,5|monster|Ice Goblin|1058,2,100000,30000,Mob002-3::On1058
+002-3.gat,69,100,8,5|monster|Ice Goblin|1058,2,100000,30000,Mob002-3::On1058
002-3.gat,68,57,26,24|monster|Angry Scorpion|1057,5,100000,30000,Mob002-3::On1057
-002-3.gat,48,57,3,14|monster|Angry Scorpion|1057,5,100000,30000,Mob002-3::On1057
+002-3.gat,49,58,4,15|monster|Angry Scorpion|1057,5,100000,30000,Mob002-3::On1057
002-3.gat,38,76,15,22|monster|Angry Scorpion|1057,4,100000,30000,Mob002-3::On1057
002-3.gat,58,78,6,17|monster|Cave Maggot|1056,4,100000,30000,Mob002-3::On1056
002-3.gat,89,68,11,32|monster|Angry Scorpion|1057,4,100000,30000,Mob002-3::On1057
diff --git a/world/map/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt
index 913bbd9d..7a1d02bb 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
-002-3.gat,37,29|warp|Exit|-1,-1,002-1.gat,25,95
+002-3.gat,37,29|warp|To Outside|-1,-1,002-1.gat,20,95
diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index 294050a4..ff19bf7d 100644
--- a/world/map/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
@@ -1,23 +1,23 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-002-4.gat,39,67,5,3|monster|Angry Scorpion|1057,3,100000,30000,Mob002-4::On1057
-002-4.gat,39,37,17,4|monster|Archant|1060,3,100000,30000,Mob002-4::On1060
-002-4.gat,61,70,1,7|monster|Ice Goblin|1058,3,100000,30000,Mob002-4::On1058
-002-4.gat,55,96,1,3|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,67,99,11,1|monster|Yellow Slime|1007,4,100000,30000,Mob002-4::On1007
-002-4.gat,91,80,1,4|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,88,93,1,4|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,73,77,1,4|monster|Archant|1060,2,100000,30000,Mob002-4::On1060
-002-4.gat,93,69,1,4|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,90,62,7,1|monster|Yellow Slime|1007,1,100000,30000,Mob002-4::On1007
-002-4.gat,73,35,1,4|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,84,33,1,4|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,84,45,1,4|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,98,37,1,4|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
-002-4.gat,92,38,7,1|monster|Yellow Slime|1007,2,100000,30000,Mob002-4::On1007
+002-4.gat,37,89,12,7|monster|Ice Goblin|1058,3,100000,30000,Mob002-4::On1058
+002-4.gat,33,76,3,11|monster|Cave Maggot|1056,3,100000,30000,Mob002-4::On1056
+002-4.gat,40,68,7,5|monster|Angry Scorpion|1057,3,100000,30000,Mob002-4::On1057
+002-4.gat,40,38,18,5|monster|Archant|1060,3,100000,30000,Mob002-4::On1060
+002-4.gat,62,71,3,7|monster|Ice Goblin|1058,3,100000,30000,Mob002-4::On1058
+002-4.gat,56,97,2,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,68,100,12,2|monster|Yellow Slime|1007,4,100000,30000,Mob002-4::On1007
+002-4.gat,92,80,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,89,94,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,74,78,1,5|monster|Archant|1060,2,100000,30000,Mob002-4::On1060
+002-4.gat,94,71,2,6|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,91,64,8,2|monster|Yellow Slime|1007,1,100000,30000,Mob002-4::On1007
+002-4.gat,74,35,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,84,33,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,84,46,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,99,38,1,5|monster|Archant|1060,1,100000,30000,Mob002-4::On1060
+002-4.gat,93,39,8,2|monster|Yellow Slime|1007,2,100000,30000,Mob002-4::On1007
002-4.gat,0,0,0|script|Mob002-4|-1,{
diff --git a/world/map/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index 2ac66361..4d4af370 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.
// Deep Desert Mines warps
-002-4.gat,34,99|warp|toLevel1|-1,-1,002-3.gat,68,99
+002-4.gat,34,99|warp|To First Level|-1,-1,002-3.gat,68,99
diff --git a/world/map/npc/003-1/_mobs.txt b/world/map/npc/003-1/_mobs.txt
index fafa39c6..62e1391e 100644
--- a/world/map/npc/003-1/_mobs.txt
+++ b/world/map/npc/003-1/_mobs.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Beach mobs
-003-1.gat,64,67,87,93|monster|Sea Slime|1033,15,100000,30000,Mob003-1::On1033
+003-1.gat,0,0,0,0|monster|Sea Slime|1033,15,100000,30000,Mob003-1::On1033
003-1.gat,120,31,22,22|monster|Sea Slime|1033,5,100000,30000,Mob003-1::On1033
003-1.gat,119,68,105,101|monster|Green Slime|1005,35,100000,30000,Mob003-1::On1005
003-1.gat,134,69,76,71|monster|Red Scorpion|1004,20,100000,30000,Mob003-1::On1004
diff --git a/world/map/npc/003-1/_warps.txt b/world/map/npc/003-1/_warps.txt
index 2ca977fe..fc6128df 100644
--- a/world/map/npc/003-1/_warps.txt
+++ b/world/map/npc/003-1/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Beach warps
-003-1.gat,172,77|warp|ToSandstorm|-1,3,002-1.gat,15,66
-003-1.gat,141,19|warp|ToBeach|1,-1,004-1.gat,37,111
-003-1.gat,48,36|warp|toHouse|-1,-1,003-2.gat,22,28
-003-1.gat,59,29|warp|toStorage|-1,-1,003-2.gat,56,28
+003-1.gat,172,77|warp|To Sandstorm Desert|-1,3,002-1.gat,13,66
+003-1.gat,141,19|warp|To Beach|1,-1,004-1.gat,37,110
+003-1.gat,48,36|warp|To Beach House|-1,-1,003-2.gat,22,28
+003-1.gat,59,29|warp|To Beach Storage|-1,-1,003-2.gat,56,28
diff --git a/world/map/npc/003-2/_import.txt b/world/map/npc/003-2/_import.txt
index 19c55bfc..1e6e34cc 100644
--- a/world/map/npc/003-2/_import.txt
+++ b/world/map/npc/003-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 003-2: Southwest Beach Houses
+// Map 003-2: Beach House
// 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 d78f4308..af203ef4 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.
-// Southwest Beach Houses mobs
+// Beach House mobs
diff --git a/world/map/npc/003-2/_warps.txt b/world/map/npc/003-2/_warps.txt
index 75eaaa54..56865f1e 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.
-// Southwest Beach Houses warps
+// Beach House 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
+003-2.gat,22,29|warp|To Outside|-1,-1,003-1.gat,48,37
+003-2.gat,56,29|warp|To Outside|-1,-1,003-1.gat,59,30
diff --git a/world/map/npc/004-1/_mobs.txt b/world/map/npc/004-1/_mobs.txt
index ba18279d..874fd792 100644
--- a/world/map/npc/004-1/_mobs.txt
+++ b/world/map/npc/004-1/_mobs.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Beach mobs
-004-1.gat,39,57,8,29|monster|Sea slime|1033,5,100000,30000,Mob004-1::On1033
+004-1.gat,39,57,8,29|monster|Sea Slime|1033,5,100000,30000,Mob004-1::On1033
004-1.gat,33,83,9,40|monster|Sea Slime|1033,11,100000,30000,Mob004-1::On1033
-004-1.gat,28,103,11,14|monster|Sea slime|1033,7,100000,30000,Mob004-1::On1033
-004-1.gat,71,103,27,19|monster|Giant maggot|1006,5,100000,30000,Mob004-1::On1006
-004-1.gat,76,68,21,49|monster|Red scorpion|1004,13,100000,30000,Mob004-1::On1004
-004-1.gat,68,25,19,10|monster|Giant maggot|1006,2,100000,30000,Mob004-1::On1006
-004-1.gat,93,27,2,3|monster|Black scorpion|1009,1,120000,60000,Mob004-1::On1009
+004-1.gat,28,103,11,14|monster|Sea Slime|1033,7,100000,30000,Mob004-1::On1033
+004-1.gat,71,104,27,20|monster|Giant Maggot|1006,5,100000,30000,Mob004-1::On1006
+004-1.gat,76,68,21,49|monster|Red Scorpion|1004,13,100000,30000,Mob004-1::On1004
+004-1.gat,68,25,19,10|monster|Giant Maggot|1006,2,100000,30000,Mob004-1::On1006
+004-1.gat,93,27,2,3|monster|Black Scorpion|1009,1,120000,60000,Mob004-1::On1009
004-1.gat,0,0,0|script|Mob004-1|-1,{
diff --git a/world/map/npc/004-1/_warps.txt b/world/map/npc/004-1/_warps.txt
index 20a600bc..1024a421 100644
--- a/world/map/npc/004-1/_warps.txt
+++ b/world/map/npc/004-1/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Beach warps
-004-1.gat,84,113|warp|ToSandstorm|1,-1,002-1.gat,29,15
-004-1.gat,37,111|warp|ToBeach|1,-1,003-1.gat,141,21
-004-1.gat,80,31|warp|ToHouse|-1,-1,004-2.gat,21,28
-004-1.gat,86,27|warp|To2ndFloor|-1,-1,004-2.gat,57,65
-004-1.gat,68,19|warp|to041-1|1,-1,041-1.gat,76,94
+004-1.gat,84,115|warp|To Sandstorm Desert|1,-1,002-1.gat,28,14
+004-1.gat,37,111|warp|To Beach|1,-1,003-1.gat,141,20
+004-1.gat,80,31|warp|To Beach House|-1,-1,004-2.gat,21,28
+004-1.gat,86,27|warp|To Second Floor|-1,-1,004-2.gat,57,65
+004-1.gat,68,19|warp|To Beach|1,-1,041-1.gat,76,94
diff --git a/world/map/npc/004-2/_import.txt b/world/map/npc/004-2/_import.txt
index 861fb5f0..3efc4d70 100644
--- a/world/map/npc/004-2/_import.txt
+++ b/world/map/npc/004-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 004-2: West Beach Houses
+// Map 004-2: Beach House
// 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 5bc05f2a..72d30f0c 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.
-// West Beach Houses mobs
+// Beach House mobs
diff --git a/world/map/npc/004-2/_warps.txt b/world/map/npc/004-2/_warps.txt
index ef1ad736..76eccea3 100644
--- a/world/map/npc/004-2/_warps.txt
+++ b/world/map/npc/004-2/_warps.txt
@@ -1,11 +1,11 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// West Beach Houses warps
+// Beach House 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
-004-2.gat,21,29|warp|ToOutside|-1,-1,004-1.gat,80,32
-004-2.gat,62,28|warp|ToBasement|-1,-1,004-2.gat,21,62
-004-2.gat,20,62|warp|To1stFloor|-1,-1,004-2.gat,63,28
-004-2.gat,68,66|warp|To1stFloor|0,-1,004-2.gat,35,21
-004-2.gat,36,20|warp|To2ndFloor|0,-1,004-2.gat,68,65
-004-2.gat,57,66|warp|ToOutside|-1,-1,004-1.gat,86,28
+004-2.gat,39,20|warp|To Room|0,-1,004-2.gat,74,29
+004-2.gat,75,30|warp|To Entrance|0,-1,004-2.gat,38,21
+004-2.gat,21,29|warp|To Outside|-1,-1,004-1.gat,80,32
+004-2.gat,62,28|warp|To Basement|-1,-1,004-2.gat,21,61
+004-2.gat,20,62|warp|To First Floor|-1,-1,004-2.gat,63,27
+004-2.gat,68,66|warp|To First Floor|0,-1,004-2.gat,35,19
+004-2.gat,36,18|warp|To Second Floor|0,-1,004-2.gat,67,65
+004-2.gat,57,66|warp|To Roof|-1,-1,004-1.gat,86,28
diff --git a/world/map/npc/005-1/_warps.txt b/world/map/npc/005-1/_warps.txt
index 63e91557..85c8e4ff 100644
--- a/world/map/npc/005-1/_warps.txt
+++ b/world/map/npc/005-1/_warps.txt
@@ -1,19 +1,19 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-005-1.gat,71,75|warp|ToSnakeCave|-1,-1,005-3.gat,33,82
-005-1.gat,167,108|warp|ToDesertMountains|-1,-1,006-1.gat,20,33
-005-1.gat,168,107|warp|ToDesertMountains|-1,-1,006-1.gat,21,32
-005-1.gat,169,106|warp|ToDesertMountains|-1,-1,006-1.gat,22,31
-005-1.gat,171,104|warp|ToDesertMountains|-1,-1,006-1.gat,24,29
-005-1.gat,170,105|warp|ToDesertMountains|-1,-1,006-1.gat,23,30
-005-1.gat,172,103|warp|ToDesertMountains|-1,-1,006-1.gat,25,28
-005-1.gat,174,101|warp|ToDesertMountains|-1,-1,006-1.gat,27,26
-005-1.gat,173,102|warp|ToDesertMountains|-1,-1,006-1.gat,26,27
-005-1.gat,175,100|warp|ToDesertMountains|-1,-1,006-1.gat,28,25
-005-1.gat,176,99|warp|ToDesertMountains|-1,-1,006-1.gat,29,24
-005-1.gat,177,98|warp|ToDesertMountains|-1,-1,006-1.gat,30,23
-005-1.gat,178,97|warp|ToDesertMountains|-1,-1,006-1.gat,31,22
-005-1.gat,179,96|warp|ToDesertMountains|-1,-1,006-1.gat,32,21
+005-1.gat,19,41|warp|To Sandstorm Desert|-1,2,002-1.gat,107,79
+005-1.gat,89,23|warp|To Snake Pit|-1,-1,005-3.gat,52,34
+005-1.gat,71,75|warp|To Snake Pit|-1,-1,005-3.gat,33,83
+005-1.gat,167,108|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,168,107|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,169,106|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,170,105|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,171,104|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,172,103|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,173,102|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,174,101|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,175,100|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,176,99|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,177,98|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,178,97|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,179,96|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
diff --git a/world/map/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt
index 3d211a49..4455a32b 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
-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
+005-3.gat,52,33|warp|To Outside|-1,-1,005-1.gat,89,24
+005-3.gat,33,82|warp|To Outside|-1,-1,005-1.gat,71,76
diff --git a/world/map/npc/005-4/_warps.txt b/world/map/npc/005-4/_warps.txt
index 5fba1532..6d2cb2de 100644
--- a/world/map/npc/005-4/_warps.txt
+++ b/world/map/npc/005-4/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Electricity Boss Cave warps
-005-4.gat,37,36|warp|toCave|0,-1,005-3.gat,85,50
+005-4.gat,37,36|warp|To Snake Pit|0,-1,005-3.gat,85,50
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index 73761e0f..95cac41f 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -1,36 +1,36 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-006-1.gat,30,19|warp|ToDesert|-1,-1,005-1.gat,177,94
-006-1.gat,29,20|warp|ToDesert|-1,-1,005-1.gat,176,95
-006-1.gat,26,23|warp|ToDesert|-1,-1,005-1.gat,173,98
-006-1.gat,25,24|warp|ToDesert|-1,-1,005-1.gat,172,99
-006-1.gat,23,26|warp|ToDesert|-1,-1,005-1.gat,170,101
-006-1.gat,24,25|warp|ToDesert|-1,-1,005-1.gat,171,100
-006-1.gat,22,27|warp|ToDesert|-1,-1,005-1.gat,169,102
-006-1.gat,21,28|warp|ToDesert|-1,-1,005-1.gat,168,103
-006-1.gat,20,29|warp|ToDesert|-1,-1,005-1.gat,167,104
-006-1.gat,19,30|warp|ToDesert|-1,-1,005-1.gat,166,105
-006-1.gat,18,31|warp|ToDesert|-1,-1,005-1.gat,165,106
-006-1.gat,40,26|warp|ToCave|-1,-1,006-3.gat,40,27
-006-1.gat,60,58|warp|ToCave|-1,-1,006-3.gat,60,69
-006-1.gat,62,30|warp|ToCave|-1,-1,006-3.gat,62,31
-006-1.gat,55,27|warp|ToCave|-1,-1,006-3.gat,55,28
-006-1.gat,77,44|warp|ToCave|-1,-1,006-3.gat,77,45
-006-1.gat,86,24|warp|ToCave|-1,-1,006-3.gat,86,25
-006-1.gat,91,24|warp|ToCave|-1,-1,006-3.gat,91,25
-006-1.gat,104,44|warp|ToCave|-1,-1,006-3.gat,104,45
-006-1.gat,122,24|warp|ToCave|-1,-1,006-3.gat,122,25
-006-1.gat,114,49|warp|ToCave|-1,-1,006-3.gat,114,50
-006-1.gat,110,56|warp|ToCave|-1,-1,006-3.gat,110,57
-006-1.gat,125,59|warp|ToCave|-1,-1,006-3.gat,125,60
-006-1.gat,92,63|warp|ToCave|-1,-1,006-3.gat,92,64
-006-1.gat,112,74|warp|ToCave|-1,-1,006-3.gat,112,75
-006-1.gat,121,110|warp|ToCave|-1,-1,006-3.gat,121,111
-006-1.gat,79,120|warp|ToCave|-1,-1,006-3.gat,79,121
-006-1.gat,38,121|warp|ToCave|-1,-1,006-3.gat,38,122
-006-1.gat,74,90|warp|ToCave|-1,-1,006-3.gat,74,91
-006-1.gat,51,90|warp|ToCave|-1,-1,006-3.gat,51,91
-006-1.gat,30,123|warp|ToCave|-1,-1,032-3.gat,128,31
+006-1.gat,18,31|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,40,26|warp|To Desert Mountains Cave|-1,-1,006-3.gat,41,27
+006-1.gat,60,58|warp|To Desert Mountains Cave|-1,-1,006-3.gat,61,69
+006-1.gat,62,30|warp|To Desert Mountains Cave|-1,-1,006-3.gat,63,31
+006-1.gat,55,27|warp|To Desert Mountains Cave|-1,-1,006-3.gat,56,28
+006-1.gat,77,44|warp|To Desert Mountains Cave|-1,-1,006-3.gat,78,45
+006-1.gat,86,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,87,25
+006-1.gat,91,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,92,25
+006-1.gat,104,44|warp|To Desert Mountains Cave|-1,-1,006-3.gat,105,45
+006-1.gat,122,24|warp|To Desert Mountains Cave|-1,-1,006-3.gat,123,25
+006-1.gat,114,49|warp|To Desert Mountains Cave|-1,-1,006-3.gat,115,50
+006-1.gat,110,56|warp|To Desert Mountains Cave|-1,-1,006-3.gat,111,57
+006-1.gat,125,59|warp|To Desert Mountains Cave|-1,-1,006-3.gat,126,60
+006-1.gat,92,63|warp|To Desert Mountains Cave|-1,-1,006-3.gat,93,64
+006-1.gat,112,74|warp|To Desert Mountains Cave|-1,-1,006-3.gat,113,75
+006-1.gat,121,110|warp|To Desert Mountains Cave|-1,-1,006-3.gat,122,111
+006-1.gat,79,120|warp|To Desert Mountains Cave|-1,-1,006-3.gat,80,121
+006-1.gat,38,121|warp|To Desert Mountains Cave|-1,-1,006-3.gat,39,122
+006-1.gat,74,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,75,91
+006-1.gat,51,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,52,91
+006-1.gat,30,123|warp|To Outback Cave|-1,-1,032-3.gat,128,32
+006-1.gat,19,30|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,20,29|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,21,28|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,22,27|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,23,26|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,24,25|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,25,24|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,26,23|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,27,22|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,28,21|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,29,20|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+006-1.gat,30,19|warp|To Snake Desert|-1,-1,005-1.gat,172,101
diff --git a/world/map/npc/006-3/_import.txt b/world/map/npc/006-3/_import.txt
index 9dfb7081..1b556b58 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 Cave
// 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 921503d1..46fdfd33 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 Cave 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 a3eb2358..06e84dbe 100644
--- a/world/map/npc/006-3/_warps.txt
+++ b/world/map/npc/006-3/_warps.txt
@@ -1,22 +1,22 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Desert Mountain Caves warps
+// Desert Mountain Cave 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
-006-3.gat,62,30|warp|ToOutside|-1,-1,006-1.gat,62,31
-006-3.gat,86,24|warp|ToOutside|-1,-1,006-1.gat,86,25
-006-3.gat,91,24|warp|ToOutside|-1,-1,006-1.gat,91,25
-006-3.gat,122,24|warp|ToOutside|-1,-1,006-1.gat,122,25
-006-3.gat,114,49|warp|ToOutside|-1,-1,006-1.gat,114,50
-006-3.gat,104,44|warp|ToOutside|-1,-1,006-1.gat,104,45
-006-3.gat,77,44|warp|ToOutside|-1,-1,006-1.gat,77,45
-006-3.gat,60,68|warp|ToOutside|-1,-1,006-1.gat,60,59
-006-3.gat,92,63|warp|ToOutside|-1,-1,006-1.gat,92,64
-006-3.gat,112,74|warp|ToOutside|-1,-1,006-1.gat,112,75
-006-3.gat,110,56|warp|ToOutside|-1,-1,006-1.gat,110,57
-006-3.gat,125,59|warp|ToOutside|-1,-1,006-1.gat,125,60
-006-3.gat,74,90|warp|ToOutside|-1,-1,006-1.gat,74,91
-006-3.gat,51,90|warp|ToOutside|-1,-1,006-1.gat,51,91
-006-3.gat,38,121|warp|ToOutside|-1,-1,006-1.gat,38,122
-006-3.gat,79,120|warp|ToOutside|-1,-1,006-1.gat,79,121
-006-3.gat,121,110|warp|ToOutside|-1,-1,006-1.gat,121,111
+006-3.gat,40,26|warp|To Desert Mountains|-1,-1,006-1.gat,39,27
+006-3.gat,55,27|warp|To Desert Mountains|-1,-1,006-1.gat,56,28
+006-3.gat,62,30|warp|To Desert Mountains|-1,-1,006-1.gat,61,31
+006-3.gat,86,24|warp|To Desert Mountains|-1,-1,006-1.gat,85,25
+006-3.gat,91,24|warp|To Desert Mountains|-1,-1,006-1.gat,92,25
+006-3.gat,122,24|warp|To Desert Mountains|-1,-1,006-1.gat,123,25
+006-3.gat,114,49|warp|To Desert Mountains|-1,-1,006-1.gat,115,50
+006-3.gat,104,44|warp|To Desert Mountains|-1,-1,006-1.gat,105,45
+006-3.gat,77,44|warp|To Desert Mountains|-1,-1,006-1.gat,78,45
+006-3.gat,60,68|warp|To Desert Mountains|-1,-1,006-1.gat,61,59
+006-3.gat,92,63|warp|To Desert Mountains|-1,-1,006-1.gat,93,64
+006-3.gat,112,74|warp|To Desert Mountains|-1,-1,006-1.gat,111,75
+006-3.gat,110,56|warp|To Desert Mountains|-1,-1,006-1.gat,111,57
+006-3.gat,125,59|warp|To Desert Mountains|-1,-1,006-1.gat,126,60
+006-3.gat,74,90|warp|To Desert Mountains|-1,-1,006-1.gat,75,91
+006-3.gat,51,90|warp|To Desert Mountains|-1,-1,006-1.gat,52,91
+006-3.gat,38,121|warp|To Desert Mountains|-1,-1,006-1.gat,39,122
+006-3.gat,79,120|warp|To Desert Mountains|-1,-1,006-1.gat,80,121
+006-3.gat,121,110|warp|To Desert Mountains|-1,-1,006-1.gat,122,111
diff --git a/world/map/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt
index 6bf7a5a4..64e64fd6 100644
--- a/world/map/npc/007-1/_mobs.txt
+++ b/world/map/npc/007-1/_mobs.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland mobs
-007-1.gat,0,0,0,0|monster|PinkFlower|1014,17,100000,30000,Mob007-1::On1014
+007-1.gat,0,0,0,0|monster|Pink Flower|1014,17,100000,30000,Mob007-1::On1014
007-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,15,100000,30000,Mob007-1::On1019
007-1.gat,0,0,0,0|monster|Snail|1041,25,100000,30000,Mob007-1::On1041
-007-1.gat,0,0,0,0|monster|Mauve|1029,3,270000,180000,Mob007-1::On1029
+007-1.gat,0,0,0,0|monster|Mauve Herb|1029,3,270000,180000,Mob007-1::On1029
007-1.gat,0,0,0,0|monster|Gamboge|1031,1,2700000,1800000,Mob007-1::On1031
-007-1.gat,0,0,0,0|monster|SilkWorm|1035,2,60000,30000,Mob007-1::On1035
-007-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob007-1::On1037
+007-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob007-1::On1035
+007-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob007-1::On1037
007-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob007-1::On1038
007-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob007-1::On1055
diff --git a/world/map/npc/007-1/_warps.txt b/world/map/npc/007-1/_warps.txt
index fc1e226b..b5fa5dc4 100644
--- a/world/map/npc/007-1/_warps.txt
+++ b/world/map/npc/007-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland warps
-007-1.gat,20,54|warp|ToHurnscald|-1,0,010-1.gat,127,53
-007-1.gat,69,21|warp|ToHurnscald|2,-1,008-1.gat,78,100
-007-1.gat,122,20|warp|ToHurnscald|1,-1,008-1.gat,132,98
+007-1.gat,20,54|warp|To Woodland|-1,0,010-1.gat,130,53
+007-1.gat,69,21|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,101
+007-1.gat,122,20|warp|To Hurnscald|1,-1,008-1.gat,132,98
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index c81d7214..579027c5 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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|Pink Flower|1014,10,20,0,Mob008-1::On1014
008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20,0,Mob008-1::On1018
-008-1.gat,0,0,0,0|monster|SpikyMushroom|1019,18,20,0,Mob008-1::On1019
+008-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,18,20,0,Mob008-1::On1019
008-1.gat,0,0,0,0|monster|Snail|1041,5,30,0,Mob008-1::On1041
-008-1.gat,0,0,0,0|monster|Mauve|1029,2,270000,180000,Mob008-1::On1029
-008-1.gat,0,0,0,0|monster|SilkWorm|1035,2,60000,30000,Mob008-1::On1035
-008-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob008-1::On1037
+008-1.gat,0,0,0,0|monster|Mauve Herb|1029,2,270000,180000,Mob008-1::On1029
+008-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob008-1::On1035
+008-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob008-1::On1037
008-1.gat,0,0,0,0|monster|Squirrel|1038,10,30,20,Mob008-1::On1038
008-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob008-1::On1055
diff --git a/world/map/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt
index 131c5818..9ce6481b 100644
--- a/world/map/npc/008-1/_warps.txt
+++ b/world/map/npc/008-1/_warps.txt
@@ -1,11 +1,11 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-008-1.gat,127,61|warp|HurnscaldEastGate|-1,0,009-1.gat,96,36
-008-1.gat,79,49|warp|HurnscaldNorthGate|2,-1,009-1.gat,48,25
-008-1.gat,24,62|warp|ToWoodland|-1,2,011-1.gat,123,61
-008-1.gat,79,17|warp|ToWoodlandMines|2,-1,018-1.gat,79,97
-008-1.gat,79,102|warp|ToWoodland|2,-1,007-1.gat,68,23
-008-1.gat,132,101|warp|ToWoodland|1,-1,007-1.gat,122,23
+008-1.gat,54,61|warp|Hurnscald West Entrance|-1,1,009-1.gat,25,36
+008-1.gat,79,80|warp|Hurnscald South Entrance|2,-1,009-1.gat,48,54
+008-1.gat,127,61|warp|Hurnscald East Entrance|-1,0,009-1.gat,96,36
+008-1.gat,79,49|warp|Hurnscald North Entrance|2,-1,009-1.gat,48,25
+008-1.gat,24,62|warp|To Woodland|-1,2,011-1.gat,123,61
+008-1.gat,79,17|warp|To Woodland Mining Camp|2,-1,018-1.gat,78,97
+008-1.gat,79,102|warp|To Woodland|2,-1,007-1.gat,68,22
+008-1.gat,132,101|warp|To Woodland|1,-1,007-1.gat,122,23
diff --git a/world/map/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt
index 36dd8c1e..1a9cae57 100644
--- a/world/map/npc/009-1/_mobs.txt
+++ b/world/map/npc/009-1/_mobs.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Hurnscald mobs
-009-1.gat,74,32,2,1|monster|Clover patch|1037,1,100000,120000,Mob009-1::On1037
-009-1.gat,29,44,9,13|monster|PinkFlower|1014,2,0,250,Mob009-1::On1014
+009-1.gat,74,32,2,1|monster|Clover Patch|1037,1,100000,120000,Mob009-1::On1037
+009-1.gat,29,44,9,13|monster|Pink Flower|1014,2,0,250,Mob009-1::On1014
009-1.gat,88,51,15,4|monster|Squirrel|1038,2,0,5000,Mob009-1::On1038
009-1.gat,80,38,5,5|monster|Squirrel|1038,1,0,5000,Mob009-1::On1038
009-1.gat,0,0,0,0|monster|Butterfly|1055,5,30,20,Mob009-1::On1055
diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt
index 611ccb17..d800fda7 100644
--- a/world/map/npc/009-1/_warps.txt
+++ b/world/map/npc/009-1/_warps.txt
@@ -1,14 +1,14 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Hurnscald warps
-009-1.gat,49,55|warp|HurnscaldSouthGate|2,-1,008-1.gat,78,81
-009-1.gat,97,36|warp|HurnscaldEastGate|-1,0,008-1.gat,128,61
-009-1.gat,35,30|warp|ToInn|-1,-1,009-2.gat,50,55
-009-1.gat,58,46|warp|ToGeneralStore|-1,-1,009-2.gat,27,105
-009-1.gat,59,33|warp|ToArcherShop|-1,-1,009-2.gat,95,29
-009-1.gat,71,30|warp|ToPotionShop|-1,-1,009-2.gat,130,25
-009-1.gat,80,31|warp|ToHospital|-1,-1,009-2.gat,149,66
-009-1.gat,72,44|warp|ToMayor|-1,-1,009-2.gat,114,77
-009-1.gat,91,46|warp|ToBlacksmith|0,-1,009-2.gat,181,66
-009-1.gat,24,36|warp|HurnscaldWestGate|-1,1,008-1.gat,53,61
-009-1.gat,49,24|warp|HurnscaldNorthGate|2,-1,008-1.gat,78,48
+009-1.gat,49,55|warp|Hurnscald South Exit|2,-1,008-1.gat,78,81
+009-1.gat,97,36|warp|Hurnscald East Exit|-1,0,008-1.gat,128,61
+009-1.gat,35,30|warp|To Hurnscald Inn|-1,-1,009-2.gat,50,54
+009-1.gat,58,46|warp|To Storage Room|-1,-1,009-2.gat,27,106
+009-1.gat,59,33|warp|To Archer Shop|-1,-1,009-2.gat,95,29
+009-1.gat,71,30|warp|To Hurnscald Potion Shop|-1,-1,009-2.gat,130,25
+009-1.gat,80,31|warp|To Hurnscald Hospital|-1,-1,009-2.gat,149,66
+009-1.gat,72,44|warp|To Hurnscald House|-1,-1,009-2.gat,114,77
+009-1.gat,91,46|warp|To Hurnscald Forge|0,-1,009-2.gat,182,66
+009-1.gat,24,36|warp|Hurnscald West Exit|-1,1,008-1.gat,53,61
+009-1.gat,49,24|warp|Hurnscald North Exit|2,-1,008-1.gat,78,48
diff --git a/world/map/npc/009-2/_warps.txt b/world/map/npc/009-2/_warps.txt
index 1911c736..e2035b60 100644
--- a/world/map/npc/009-2/_warps.txt
+++ b/world/map/npc/009-2/_warps.txt
@@ -1,23 +1,23 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-009-2.gat,130,26|warp|ToOutdoor|-1,-1,009-1.gat,71,31
-009-2.gat,144,26|warp|To2ndFloor|0,-1,009-2.gat,143,44
-009-2.gat,144,42|warp|To3rdFloor|0,-1,009-2.gat,143,24
-009-2.gat,155,47|warp|To1stFloor|0,-1,009-2.gat,154,63
-009-2.gat,114,46|warp|To1stFloor|0,-1,009-2.gat,113,69
-009-2.gat,50,55|warp|ToOutdoor|-1,-1,009-1.gat,35,31
-009-2.gat,74,53|warp|ToCellar|-1,-1,009-2.gat,143,81
-009-2.gat,74,45|warp|To2ndFloor|0,-1,009-2.gat,74,23
-009-2.gat,114,78|warp|ToOutdoor|-1,-1,009-1.gat,72,45
-009-2.gat,114,68|warp|To2ndFloor|0,-1,009-2.gat,113,46
-009-2.gat,149,67|warp|ToOutdoor|-1,-1,009-1.gat,80,32
-009-2.gat,143,79|warp|To1stFloor|-1,-1,009-2.gat,74,52
-009-2.gat,155,62|warp|To2ndFloor|0,-1,009-2.gat,154,46
-009-2.gat,182,67|warp|ToOutdoor|0,-1,009-1.gat,91,47
-009-2.gat,147,89|warp|ToCaveBeneathHurnscald|-1,-1,009-3.gat,173,22
-009-2.gat,27,106|warp|ToOutdoor|-1,-1,009-1.gat,58,47
-009-2.gat,46,50|warp|ToPrivateRooms|-1,-1,009-2.gat,75,78
-009-2.gat,77,78|warp|ToPrivateRooms|-1,-1,009-2.gat,48,50
+009-2.gat,75,23|warp|To First Floor|0,-1,009-2.gat,74,47
+009-2.gat,95,30|warp|To Outside|-1,-1,009-1.gat,59,34
+009-2.gat,130,26|warp|To Outside|-1,-1,009-1.gat,71,31
+009-2.gat,144,26|warp|To Second Floor|0,-1,009-2.gat,144,43
+009-2.gat,144,42|warp|To Third Floor|0,-1,009-2.gat,144,25
+009-2.gat,155,47|warp|To First Floor|0,-1,009-2.gat,155,63
+009-2.gat,114,46|warp|To First Floor|0,-1,009-2.gat,114,70
+009-2.gat,50,55|warp|To Outside|-1,-1,009-1.gat,35,31
+009-2.gat,74,53|warp|To Cellar|-1,-1,009-2.gat,143,78
+009-2.gat,74,46|warp|To Second Floor|0,-1,009-2.gat,75,22
+009-2.gat,114,78|warp|To Outside|-1,-1,009-1.gat,72,45
+009-2.gat,114,69|warp|To Second Floor|0,-1,009-2.gat,114,45
+009-2.gat,149,67|warp|To Outside|-1,-1,009-1.gat,80,32
+009-2.gat,143,77|warp|To First Floor|-1,-1,009-2.gat,74,52
+009-2.gat,155,62|warp|To Second Floor|0,-1,009-2.gat,155,46
+009-2.gat,182,67|warp|To Outside|0,-1,009-1.gat,91,47
+009-2.gat,147,90|warp|To Hurnscald Cave|-1,-1,009-3.gat,173,21
+009-2.gat,27,107|warp|To Outside|-1,-1,009-1.gat,58,47
+009-2.gat,46,50|warp|To Inn Private Room|-1,-1,009-2.gat,76,78
+009-2.gat,77,78|warp|To Hurnscald Inn|-1,-1,009-2.gat,47,50
diff --git a/world/map/npc/009-3/_import.txt b/world/map/npc/009-3/_import.txt
index 9c42d124..37ec9044 100644
--- a/world/map/npc/009-3/_import.txt
+++ b/world/map/npc/009-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 009-3: Hurnscald Caves
+// Map 009-3: Hurnscald Cave
// 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 b6018bec..2a48b62a 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald Caves mobs
+// Hurnscald Cave 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,0|monster|Yellow Slime|1007,20,0,0,Mob009-3::On1007
+009-3.gat,0,0,0,0|monster|Black Scorpion|1009,25,0,0,Mob009-3::On1009
+009-3.gat,0,0,0,0|monster|Red Slime|1008,35,0,0,Mob009-3::On1008
009-3.gat,0,0,0|script|Mob009-3|-1,{
diff --git a/world/map/npc/009-3/_warps.txt b/world/map/npc/009-3/_warps.txt
index cddeb3ee..f2e36ac1 100644
--- a/world/map/npc/009-3/_warps.txt
+++ b/world/map/npc/009-3/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Hurnscald Caves warps
+// Hurnscald Cave 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
-009-3.gat,157,30|warp|toCave|-1,-1,018-3.gat,179,178
-009-3.gat,117,19|warp|toCave|-1,-1,013-3.gat,160,101
+009-3.gat,173,20|warp|To Cellar|-1,-1,009-2.gat,147,89
+009-3.gat,20,57|warp|To Lake Cave|-1,-1,011-4.gat,129,87
+009-3.gat,157,30|warp|To Northern Mines|-1,-1,018-3.gat,179,180
+009-3.gat,117,19|warp|To Woodland Hills Cave|-1,-1,013-3.gat,160,102
diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt
index a1e19016..fdbd4472 100644
--- a/world/map/npc/009-4/_mobs.txt
+++ b/world/map/npc/009-4/_mobs.txt
@@ -5,7 +5,7 @@
009-4.gat,115,98,24,15|monster|Cave Snake|1021,5,20000,14000,Mob009-4::On1021
009-4.gat,103,28,24,15|monster|Cave Snake|1021,3,20000,14000,Mob009-4::On1021
009-4.gat,106,27,24,15|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035
-009-4.gat,119,44,12,10|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035
+009-4.gat,119,45,12,10|monster|Silkworm|1035,3,20000,14000,Mob009-4::On1035
009-4.gat,72,130,24,15|monster|Maggot|1002,3,20000,14000,Mob009-4::On1002
009-4.gat,38,116,24,15|monster|Maggot|1002,3,20000,14000,Mob009-4::On1002
diff --git a/world/map/npc/009-4/_warps.txt b/world/map/npc/009-4/_warps.txt
index 2fb0c28f..18912219 100644
--- a/world/map/npc/009-4/_warps.txt
+++ b/world/map/npc/009-4/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-009-4.gat,37,123|warp|to Cavern|-1,-1,009-4.gat,36,27
-009-4.gat,72,125|warp|to 009-3|-1,-1,009-3.gat,162,114
-009-4.gat,103,22|warp|to Cavern|-1,-1,009-4.gat,51,46
-009-4.gat,103,76|warp|to torches|-1,-1,009-4.gat,51,46
+009-4.gat,37,112|warp|To Hurnscald Cave|-1,-1,009-3.gat,163,114
+009-4.gat,72,136|warp|To Torches Cave|-1,-1,009-4.gat,36,27
+009-4.gat,37,123|warp|To Torches Cave|-1,-1,009-4.gat,36,27
+009-4.gat,72,125|warp|To Hurnscald Cave|-1,-1,009-3.gat,163,114
+009-4.gat,103,22|warp|To Torches Cave|-1,-1,009-4.gat,51,46
+009-4.gat,103,76|warp|To Torches Cave|-1,-1,009-4.gat,51,46
diff --git a/world/map/npc/010-1/_mobs.txt b/world/map/npc/010-1/_mobs.txt
index ca58dffa..ca430c25 100644
--- a/world/map/npc/010-1/_mobs.txt
+++ b/world/map/npc/010-1/_mobs.txt
@@ -2,16 +2,16 @@
// Woodland mobs
010-1.gat,82,63,19,19|monster|Scorpion|1003,1,100000,30000,Mob010-1::On1003
-010-1.gat,49,71,31,19|monster|Shroom|1019,1,100000,30000,Mob010-1::On1019
-010-1.gat,0,0,0,0|monster|PinkFlower|1014,30,50,0,Mob010-1::On1014
+010-1.gat,49,71,31,19|monster|Spiky Mushroom|1019,1,100000,30000,Mob010-1::On1019
+010-1.gat,0,0,0,0|monster|Pink Flower|1014,30,50,0,Mob010-1::On1014
010-1.gat,0,0,0,0|monster|Snail|1041,20,50,0,Mob010-1::On1041
-010-1.gat,0,0,0,0|monster|SpikyMushroom|1019,45,50,0,Mob010-1::On1019
-010-1.gat,0,0,0,0|monster|LogHead|1025,40,100,0,Mob010-1::On1025
+010-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,45,50,0,Mob010-1::On1019
+010-1.gat,0,0,0,0|monster|Log Head|1025,40,100,0,Mob010-1::On1025
010-1.gat,0,0,0,0|monster|Mouboo|1028,15,0,10,Mob010-1::On1028
-010-1.gat,0,0,0,0|monster|Mauve|1029,3,270000,180000,Mob010-1::On1029
-010-1.gat,0,0,0,0|monster|Cobalt|1030,1,2700000,1800000,Mob010-1::On1030
-010-1.gat,0,0,0,0|monster|SilkWorm|1035,2,60000,30000,Mob010-1::On1035
-010-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob010-1::On1037
+010-1.gat,0,0,0,0|monster|Mauve Herb|1029,3,270000,180000,Mob010-1::On1029
+010-1.gat,0,0,0,0|monster|Cobalt Herb|1030,1,2700000,1800000,Mob010-1::On1030
+010-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob010-1::On1035
+010-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob010-1::On1037
010-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob010-1::On1038
010-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob010-1::On1055
diff --git a/world/map/npc/010-1/_warps.txt b/world/map/npc/010-1/_warps.txt
index 0b1bf19a..f60febd3 100644
--- a/world/map/npc/010-1/_warps.txt
+++ b/world/map/npc/010-1/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland warps
-010-1.gat,49,23|warp|ToWoodland|0,-1,011-1.gat,48,103
-010-1.gat,14,55|warp|ToWoodland|-1,0,015-1.gat,92,54
-010-1.gat,36,94|warp|ToDimondsCove|-1,-1,010-2.gat,32,44
-010-1.gat,56,104|warp|ToWoodland|1,-1,016-1.gat,56,21
-010-1.gat,131,54|warp|ToWoodland|-1,0,007-1.gat,25,53
+010-1.gat,49,24|warp|To Woodland|0,-1,011-1.gat,48,103
+010-1.gat,13,55|warp|To Woodland|-1,0,015-1.gat,92,54
+010-1.gat,36,94|warp|To Dimond's Cove|-1,-1,010-2.gat,32,44
+010-1.gat,56,105|warp|To Woodland|1,-1,016-1.gat,56,19
+010-1.gat,131,54|warp|To Woodland|-1,0,007-1.gat,21,53
diff --git a/world/map/npc/010-2/_warps.txt b/world/map/npc/010-2/_warps.txt
index 7839f58f..26a2ae56 100644
--- a/world/map/npc/010-2/_warps.txt
+++ b/world/map/npc/010-2/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Dimond's Cove warps
-010-2.gat,27,24|warp|ToCellar|-1,-1,010-2.gat,35,68
-010-2.gat,32,45|warp|ToOutdoor|-1,-1,010-1.gat,36,95
-010-2.gat,40,27|warp|To2ndFloor|1,-1,010-2.gat,82,26
-010-2.gat,36,68|warp|To1stFloor|-1,-1,010-2.gat,28,24
-010-2.gat,67,27|warp|To3rdFloor|1,-1,010-2.gat,67,71
-010-2.gat,83,29|warp|To1stFloor|1,-1,010-2.gat,40,27
-010-2.gat,67,73|warp|To2ndFloor|1,-1,010-2.gat,67,28
+010-2.gat,27,24|warp|To Cellar|-1,-1,010-2.gat,35,68
+010-2.gat,32,45|warp|To Outside|-1,-1,010-1.gat,36,95
+010-2.gat,40,27|warp|To Second Floor|1,-1,010-2.gat,83,28
+010-2.gat,36,68|warp|To First Floor|-1,-1,010-2.gat,28,24
+010-2.gat,67,27|warp|To Third Floor|1,-1,010-2.gat,67,72
+010-2.gat,83,29|warp|To First Floor|1,-1,010-2.gat,40,28
+010-2.gat,67,73|warp|To Second Floor|1,-1,010-2.gat,67,28
diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt
index 99e3347d..277d938d 100644
--- a/world/map/npc/011-1/_mobs.txt
+++ b/world/map/npc/011-1/_mobs.txt
@@ -1,15 +1,15 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland mobs
-011-1.gat,0,0,0,0|monster|EvilMushroom|1013,30,0,0,Mob011-1::On1013
-011-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0,0,Mob011-1::On1014
+011-1.gat,0,0,0,0|monster|Evil Mushroom|1013,30,0,0,Mob011-1::On1013
+011-1.gat,0,0,0,0|monster|Pink Flower|1014,20,0,0,Mob011-1::On1014
011-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,5,0,0,Mob011-1::On1019
011-1.gat,0,0,0,0|monster|Snail|1041,1,0,0,Mob011-1::On1041
011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob011-1::On1028
-011-1.gat,0,0,0,0|monster|Mauve|1029,3,270000,180000,Mob011-1::On1029
-011-1.gat,0,0,0,0|monster|Alizarin|1032,1,2700000,1800000,Mob011-1::On1032
-011-1.gat,0,0,0,0|monster|SilkWorm|1035,2,60000,30000,Mob011-1::On1035
-011-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob011-1::On1037
+011-1.gat,0,0,0,0|monster|Mauve Herb|1029,3,270000,180000,Mob011-1::On1029
+011-1.gat,0,0,0,0|monster|Alizarin Herb|1032,1,2700000,1800000,Mob011-1::On1032
+011-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000,30000,Mob011-1::On1035
+011-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob011-1::On1037
011-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob011-1::On1038
011-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob011-1::On1055
011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob011-1::On1028
diff --git a/world/map/npc/011-1/_warps.txt b/world/map/npc/011-1/_warps.txt
index bc67cb3f..d608163f 100644
--- a/world/map/npc/011-1/_warps.txt
+++ b/world/map/npc/011-1/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland warps
-011-1.gat,58,92|warp|ToCave|-1,-1,011-3.gat,15,15
-011-1.gat,30,61|warp|ToWoodland|-1,1,014-1.gat,106,91
-011-1.gat,49,104|warp|ToWoodland|0,-1,010-1.gat,48,24
-011-1.gat,124,62|warp|ToWoodland|-1,2,008-1.gat,25,61
-011-1.gat,73,11|warp|ToWoodlandHills|0,-1,012-1.gat,131,162
-011-1.gat,38,36|warp|affenpeter|-1,-1,011-6.gat,49,99
+011-1.gat,58,92|warp|To Hermit's Cave|-1,-1,011-3.gat,0,0
+011-1.gat,30,61|warp|To Woodland|-1,1,014-1.gat,108,91
+011-1.gat,49,104|warp|To Woodland|0,-1,010-1.gat,48,25
+011-1.gat,124,62|warp|To Hurnscald Outskirts|-1,2,008-1.gat,25,61
+011-1.gat,73,9|warp|To Woodland Hills|0,-1,012-1.gat,132,175
+011-1.gat,38,36|warp|To Bandit Cave|-1,-1,011-6.gat,49,100
diff --git a/world/map/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt
index 7107a3a2..a447bf89 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
-011-3.gat,31,14|warp|ToLakeCave|-1,-1,011-4.gat,72,9
+011-3.gat,31,14|warp|To Lake Cave|-1,-1,011-4.gat,73,9
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index b9f7cab1..7f233015 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-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,52,30,39,39|monster|Spiky Mushroom|1019,1,100000,30000,Mob011-4::On1019
+011-4.gat,93,114,39,39|monster|Cave Snake|1021,1,100000,30000,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|Cave Snake|1021,40,0,0,Mob011-4::On1021
+011-4.gat,0,0,0,0|monster|Spiky Mushroom|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/_warps.txt b/world/map/npc/011-4/_warps.txt
index 7771aa47..9312e7db 100644
--- a/world/map/npc/011-4/_warps.txt
+++ b/world/map/npc/011-4/_warps.txt
@@ -1,14 +1,14 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-011-4.gat,39,35|warp|warp|-1,-1,011-6.gat,47,183
-011-4.gat,16,57|warp|warp|-1,-1,011-6.gat,24,204
-011-4.gat,89,20|warp|warp|-1,-1,011-6.gat,97,168
-011-4.gat,105,32|warp|warp|-1,-1,011-6.gat,113,184
-011-4.gat,114,61|warp|warp|-1,-1,011-6.gat,122,213
-011-4.gat,86,75|warp|warp|-1,-1,011-6.gat,94,227
-011-4.gat,62,86|warp|warp|-1,-1,011-6.gat,68,233
-011-4.gat,32,5|warp|warp|0,-1,011-6.gat,186,180
-011-4.gat,45,118|warp|warp|-1,-1,011-6.gat,266,180
+011-4.gat,73,8|warp|To Hermit's Cave|-2,-2,011-3.gat,31,15
+011-4.gat,129,86|warp|To Hurnscald Cave|-1,-1,009-3.gat,20,56
+011-4.gat,39,35|warp|To Bandit Cave|-1,-1,011-6.gat,47,184
+011-4.gat,16,57|warp|To Bryant Cave|-1,-1,011-6.gat,24,205
+011-4.gat,89,20|warp|To Bandit Cave|-1,-1,011-6.gat,97,168
+011-4.gat,105,32|warp|To Bandit Cave|-1,-1,011-6.gat,114,183
+011-4.gat,114,61|warp|To Bandit Cave|-1,-1,011-6.gat,123,212
+011-4.gat,86,75|warp|To Bandit Cave|-1,-1,011-6.gat,95,226
+011-4.gat,62,86|warp|To Bandit Cave|-1,-1,011-6.gat,68,234
+011-4.gat,32,5|warp|To Small Cave|0,-1,011-6.gat,186,181
+011-4.gat,45,118|warp|To Small Cave|-1,-1,011-6.gat,266,181
diff --git a/world/map/npc/011-6/_import.txt b/world/map/npc/011-6/_import.txt
index 47530340..27d8ef9a 100644
--- a/world/map/npc/011-6/_import.txt
+++ b/world/map/npc/011-6/_import.txt
@@ -1,4 +1,4 @@
-// Map 011-6: Bandit Caves
+// Map 011-6: Bandit Cave
// 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 e943879b..013ea725 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Bandit Caves mobs
+// Bandit Cave mobs
-011-6.gat,152,72,283,127|monster|Silk Worm|1035,9,30000,100000,Mob011-6::On1035
+011-6.gat,152,72,283,127|monster|Silkworm|1035,9,30000,100000,Mob011-6::On1035
011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
011-6.gat,262,114,38,38|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
011-6.gat,132,119,17,21|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 c7946eaa..fd5828ca 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -1,26 +1,26 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Bandit Caves warps
+// Bandit Cave 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
-011-6.gat,270,125|warp|toMainCave|-1,-1,011-6.gat,61,73
-011-6.gat,260,128|warp|toMiddleCave2|-1,-1,011-6.gat,51,77
-011-6.gat,145,118|warp|ToMainCave3|-1,-1,011-6.gat,47,119
-011-6.gat,196,26|warp|toSmallCave1|-1,-1,011-6.gat,261,44
-011-6.gat,261,47|warp|toPassage1|-1,-1,011-6.gat,196,28
-011-6.gat,271,52|warp|toMainCave4|-1,-1,011-6.gat,98,32
-011-6.gat,98,30|warp|toSmallCave|-1,-1,011-6.gat,271,50
-011-6.gat,47,120|warp|toPassage|-1,-1,011-6.gat,145,115
-011-6.gat,49,101|warp|toOutside|-1,-1,011-1.gat,38,37
-011-6.gat,24,206|warp|warp|-1,-1,011-4.gat,17,59
-011-6.gat,47,185|warp|warp|-1,-1,011-4.gat,39,38
-011-6.gat,97,169|warp|warp|-1,-1,011-4.gat,89,21
-011-6.gat,113,182|warp|warp|-1,-1,011-4.gat,105,34
-011-6.gat,122,211|warp|warp|-1,-1,011-4.gat,114,63
-011-6.gat,94,225|warp|warp|-1,-1,011-4.gat,86,77
-011-6.gat,68,235|warp|warp|-1,-1,011-4.gat,62,87
-011-6.gat,251,278|warp|warp|-1,-1,011-4.gat,111,123
-011-6.gat,186,182|warp|warp|-1,-1,011-4.gat,31,7
-011-6.gat,266,182|warp|warp|-1,-1,011-4.gat,45,120
-011-6.gat,174,256|warp|warp|-1,-1,011-6.gat,264,238
-011-6.gat,264,236|warp|warp|-1,-1,011-6.gat,174,252
+011-6.gat,51,75|warp|To Small Bandit Cave|-1,-1,011-6.gat,260,127
+011-6.gat,61,71|warp|To Small Bandit Cave|-1,-1,011-6.gat,270,124
+011-6.gat,270,125|warp|To Bandit Cave|-1,-1,011-6.gat,61,72
+011-6.gat,260,128|warp|To Bandit Cave|-1,-1,011-6.gat,51,76
+011-6.gat,145,118|warp|To Bandit Cave|-1,-1,011-6.gat,48,119
+011-6.gat,196,26|warp|To Small Bandit Cave|-1,-1,011-6.gat,261,46
+011-6.gat,261,47|warp|To Second Bandit Cave|-1,-1,011-6.gat,196,27
+011-6.gat,271,52|warp|To Bandit Cave|-1,-1,011-6.gat,98,31
+011-6.gat,98,30|warp|To Small Bandit Cave|-1,-1,011-6.gat,271,51
+011-6.gat,47,120|warp|To Second Bandit Cave|-1,-1,011-6.gat,146,117
+011-6.gat,49,101|warp|To Woodland|-1,-1,011-1.gat,38,37
+011-6.gat,24,206|warp|To Lake Cave|-1,-1,011-4.gat,16,58
+011-6.gat,47,185|warp|To Lake Cave|-1,-1,011-4.gat,39,36
+011-6.gat,97,169|warp|To Lake Cave|-1,-1,011-4.gat,89,21
+011-6.gat,113,182|warp|To Lake Cave|-1,-1,011-4.gat,106,33
+011-6.gat,122,211|warp|To Lake Cave|-1,-1,011-4.gat,115,62
+011-6.gat,94,225|warp|To Lake Cave|-1,-1,011-4.gat,87,76
+011-6.gat,68,235|warp|To Lake Cave|-1,-1,011-4.gat,62,87
+011-6.gat,251,278|warp|To Lake Cave|-1,-1,011-4.gat,111,122
+011-6.gat,186,182|warp|To Lake Cave|0,-1,011-4.gat,32,6
+011-6.gat,266,182|warp|To Lake Cave|-1,-1,011-4.gat,45,119
+011-6.gat,174,256|warp|To Bandit Lord Cave|-1,-1,011-6.gat,264,237
+011-6.gat,264,236|warp|To Isolated Storage Room|-1,-1,011-6.gat,174,255
diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index f755efb5..c1063285 100644
--- a/world/map/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
@@ -1,15 +1,15 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland Hills mobs
-012-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0,100,Mob012-1::On1014
-012-1.gat,0,0,0,0|monster|SpikyMushroom|1019,25,0,10,Mob012-1::On1019
+012-1.gat,0,0,0,0|monster|Pink Flower|1014,13,0,100,Mob012-1::On1014
+012-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,25,0,10,Mob012-1::On1019
012-1.gat,0,0,0,0|monster|Mouboo|1028,20,0,10,Mob012-1::On1028
-012-1.gat,0,0,0,0|monster|Mauve|1029,5,2700000,1800000,Mob012-1::On1029
-012-1.gat,0,0,0,0|monster|Cobalt|1030,2,2700000,1800000,Mob012-1::On1030
-012-1.gat,0,0,0,0|monster|Gamboge|1031,2,2700000,1800000,Mob012-1::On1031
-012-1.gat,0,0,0,0|monster|Alizarin|1032,2,2700000,1800000,Mob012-1::On1032
-012-1.gat,0,0,0,0|monster|SilkWorm|1035,5,60000,30000,Mob012-1::On1035
-012-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob012-1::On1037
+012-1.gat,0,0,0,0|monster|Mauve Herb|1029,5,2700000,1800000,Mob012-1::On1029
+012-1.gat,0,0,0,0|monster|Cobalt Herb|1030,2,2700000,1800000,Mob012-1::On1030
+012-1.gat,0,0,0,0|monster|Gamboge Herb|1031,2,2700000,1800000,Mob012-1::On1031
+012-1.gat,0,0,0,0|monster|Alizarin Herb|1032,2,2700000,1800000,Mob012-1::On1032
+012-1.gat,0,0,0,0|monster|Silkworm|1035,5,60000,30000,Mob012-1::On1035
+012-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob012-1::On1037
012-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob012-1::On1038
012-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob012-1::On1055
diff --git a/world/map/npc/012-1/_warps.txt b/world/map/npc/012-1/_warps.txt
index c5ccb12d..2cd4a55e 100644
--- a/world/map/npc/012-1/_warps.txt
+++ b/world/map/npc/012-1/_warps.txt
@@ -1,14 +1,14 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland Hills warps
-012-1.gat,51,39|warp|ToCaves|-1,-1,012-3.gat,370,45
-012-1.gat,147,67|warp|ToCaves|-1,-1,012-3.gat,474,103
-012-1.gat,41,48|warp|ToCaves|-1,-1,012-3.gat,353,78
-012-1.gat,44,88|warp|ToCaves|-1,-1,012-3.gat,354,187
-012-1.gat,92,104|warp|ToCaves|-1,-1,012-3.gat,270,111
-012-1.gat,98,99|warp|ToCaves|-1,-1,012-3.gat,36,81
-012-1.gat,109,92|warp|ToCaves|-1,-1,012-3.gat,79,73
-012-1.gat,123,90|warp|ToCaves|-1,-1,012-3.gat,38,156
-012-1.gat,150,61|warp|ToWoodlandHills|-1,2,013-1.gat,21,75
-012-1.gat,132,163|warp|ToWoodland|0,-1,011-1.gat,72,16
-012-1.gat,65,126|warp|ToCaves|-1,-1,012-3.gat,176,139
+012-1.gat,51,39|warp|To Moggun Cave|-1,-1,012-3.gat,370,43
+012-1.gat,147,67|warp|To Moggun Cave|-1,-1,012-3.gat,474,106
+012-1.gat,41,48|warp|To Moggun Cave|-1,-1,012-3.gat,353,78
+012-1.gat,44,88|warp|To Moggun Cave|-1,-1,012-3.gat,355,187
+012-1.gat,92,104|warp|To Moggun Cave|-1,-1,012-3.gat,270,111
+012-1.gat,98,99|warp|To Small Cave|-1,-1,012-3.gat,37,81
+012-1.gat,109,92|warp|To Small Cave|-1,-1,012-3.gat,80,73
+012-1.gat,123,90|warp|To Mana Seed Cave|-1,-1,012-3.gat,38,156
+012-1.gat,150,61|warp|To Woodland Hills|-1,2,013-1.gat,21,75
+012-1.gat,132,176|warp|To Woodland|0,-1,011-1.gat,73,10
+012-1.gat,65,126|warp|To Moggun Cave|-1,-1,012-3.gat,177,139
diff --git a/world/map/npc/012-3/_import.txt b/world/map/npc/012-3/_import.txt
index b860552e..c92c8000 100644
--- a/world/map/npc/012-3/_import.txt
+++ b/world/map/npc/012-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 012-3: Moggun Caves
+// Map 012-3: Moggun Cave
// 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 fb3958e6..6bc9664e 100644
--- a/world/map/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
@@ -1,22 +1,22 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Moggun Caves mobs
+// Moggun Cave 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
-012-3.gat,411,30,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
-012-3.gat,345,39,7,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
-012-3.gat,362,101,16,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
-012-3.gat,444,81,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
-012-3.gat,387,137,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
-012-3.gat,408,78,7,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
-012-3.gat,382,151,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
-012-3.gat,428,116,7,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
-012-3.gat,329,100,7,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
-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,448,65,18,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,442,45,18,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,412,31,18,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,347,39,8,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,363,101,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,446,81,18,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,388,138,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,409,78,8,17|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,382,152,17,7|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,430,117,8,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,330,100,8,16|monster|Moggun|1061,5,100000,30000,Mob012-3::On1061
+012-3.gat,269,138,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,188,52,17,18|monster|Moggun|1061,10,100000,30000,Mob012-3::On1061
+012-3.gat,165,106,17,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,0|monster|Cave Snake|1021,75,0,0,Mob012-3::On1021
012-3.gat,0,0,0|script|Mob012-3|-1,{
diff --git a/world/map/npc/012-3/_warps.txt b/world/map/npc/012-3/_warps.txt
index 3945ddc3..809a2281 100644
--- a/world/map/npc/012-3/_warps.txt
+++ b/world/map/npc/012-3/_warps.txt
@@ -1,13 +1,13 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Moggun Caves warps
+// Moggun Cave 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
-012-3.gat,39,157|warp|CaveExit|0,-1,012-1.gat,123,91
-012-3.gat,270,112|warp|CaveExit|-1,-1,012-1.gat,92,105
-012-3.gat,176,138|warp|CaveExit|-1,-1,012-1.gat,65,127
-012-3.gat,355,188|warp|CaveExit|0,-1,012-1.gat,44,89
-012-3.gat,371,46|warp|CaveExit|0,-1,012-1.gat,51,40
-012-3.gat,354,79|warp|CaveExit|0,-1,012-1.gat,41,48
-012-3.gat,473,104|warp|CaveExit|-1,1,012-1.gat,146,67
-012-3.gat,448,61|warp|CaveExit|-1,-1,012-4.gat,194,57
+012-3.gat,37,82|warp|To Woodland Hills|-1,-1,012-1.gat,98,100
+012-3.gat,80,74|warp|To Woodland Hills|-1,-1,012-1.gat,109,93
+012-3.gat,38,157|warp|To Woodland Hills|-1,-1,012-1.gat,123,91
+012-3.gat,270,112|warp|To Woodland Hills|-1,-1,012-1.gat,92,105
+012-3.gat,176,138|warp|To Blossom Land|-1,-1,012-1.gat,66,127
+012-3.gat,355,188|warp|To Blossom Land|-1,-1,012-1.gat,44,89
+012-3.gat,370,44|warp|To Small Lost Land|-1,-1,012-1.gat,51,40
+012-3.gat,353,79|warp|To Lost Land|-1,-1,012-1.gat,41,49
+012-3.gat,473,106|warp|To Small Closed Hill|-1,-1,012-1.gat,146,67
+012-3.gat,448,61|warp|To Terranite Cave|-1,-1,012-4.gat,193,57
diff --git a/world/map/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt
index b83a704c..902dbe5f 100644
--- a/world/map/npc/012-4/_mobs.txt
+++ b/world/map/npc/012-4/_mobs.txt
@@ -1,70 +1,70 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-012-4.gat,237,48,11,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061
-012-4.gat,196,38,7,8|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061
+012-4.gat,217,45,12,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061
+012-4.gat,223,30,12,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061
+012-4.gat,239,48,12,3|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061
+012-4.gat,197,39,7,8|monster|Moggun|1061,3,100000,30000,Mob012-4::On1061
012-4.gat,210,35,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
012-4.gat,241,38,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,236,58,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,226,72,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,209,94,9,4|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,263,28,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,274,47,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,266,69,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,259,78,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,273,79,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,267,91,23,14|monster|Moggun|1061,10,100000,30000,Mob012-4::On1061
-012-4.gat,209,144,69,53|monster|Spider|1012,50,100000,30000,Mob012-4::On1012
-012-4.gat,254,162,18,46|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,166,174,17,21|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,147,175,17,21|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
-012-4.gat,131,86,17,21|monster|Red Slime|1008,15,100000,30000,Mob012-4::On1008
-012-4.gat,140,130,17,21|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,42,128,16,9|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,64,61,25,29|monster|Spider|1012,20,100000,30000,Mob012-4::On1012
+012-4.gat,237,59,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,226,73,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,209,94,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,263,29,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,274,48,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,267,70,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,259,79,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,274,79,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,268,91,24,15|monster|Moggun|1061,10,100000,30000,Mob012-4::On1061
+012-4.gat,209,146,69,55|monster|Spider|1012,50,100000,30000,Mob012-4::On1012
+012-4.gat,254,163,19,46|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,167,175,17,22|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,148,176,17,22|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
+012-4.gat,131,88,17,22|monster|Red Slime|1008,15,100000,30000,Mob012-4::On1008
+012-4.gat,140,131,17,22|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,42,128,17,9|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,64,62,25,30|monster|Spider|1012,20,100000,30000,Mob012-4::On1012
012-4.gat,69,89,17,21|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,33,44,17,33|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
+012-4.gat,34,45,17,33|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
012-4.gat,64,36,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
012-4.gat,100,115,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
-012-4.gat,89,135,17,21|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,59,113,14,16|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
-012-4.gat,41,175,15,13|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
-012-4.gat,119,176,24,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
-012-4.gat,286,180,24,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
-012-4.gat,339,175,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
-012-4.gat,390,154,69,53|monster|Spider|1012,40,100000,30000,Mob012-4::On1012
-012-4.gat,357,33,19,25|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
-012-4.gat,481,109,19,23|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
-012-4.gat,433,114,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
+012-4.gat,90,137,17,22|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,59,113,14,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
+012-4.gat,42,176,15,13|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
+012-4.gat,120,177,24,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
+012-4.gat,287,180,24,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
+012-4.gat,340,175,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
+012-4.gat,390,156,69,54|monster|Spider|1012,40,100000,30000,Mob012-4::On1012
+012-4.gat,358,37,20,22|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
+012-4.gat,481,110,19,24|monster|Terranite|1062,3,100000,30000,Mob012-4::On1062
+012-4.gat,435,114,24,17|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
012-4.gat,477,82,24,17|monster|Lady Skeleton|1044,3,100000,30000,Mob012-4::On1044
-012-4.gat,353,105,18,46|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
-012-4.gat,341,137,17,21|monster|Red Slime|1008,15,100000,30000,Mob012-4::On1008
-012-4.gat,389,81,32,14|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
-012-4.gat,409,34,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,412,72,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,395,62,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,313,182,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,408,121,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,354,106,19,46|monster|Yellow Slime|1007,10,100000,30000,Mob012-4::On1007
+012-4.gat,342,139,17,22|monster|Red Slime|1008,15,100000,30000,Mob012-4::On1008
+012-4.gat,389,81,33,15|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
+012-4.gat,409,35,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,413,73,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,395,63,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,314,182,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,409,121,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
012-4.gat,456,99,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,132,152,9,4|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,152,97,9,4|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,126,64,9,4|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,81,180,9,4|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,61,159,9,4|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,270,157,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,269,182,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,321,140,17,21|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
-012-4.gat,450,110,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,421,48,10,31|monster|Spider|1012,10,100000,30000,Mob012-4::On1012
-012-4.gat,379,40,13,22|monster|Spider|1012,10,100000,30000,Mob012-4::On1012
+012-4.gat,133,153,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,153,98,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,126,65,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,81,180,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,61,159,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,271,157,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,270,182,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,322,141,17,22|monster|Red Slime|1008,20,100000,30000,Mob012-4::On1008
+012-4.gat,451,111,7,8|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,422,50,11,32|monster|Spider|1012,10,100000,30000,Mob012-4::On1012
+012-4.gat,380,40,14,22|monster|Spider|1012,10,100000,30000,Mob012-4::On1012
012-4.gat,124,49,9,24|monster|Terranite|1062,1,100000,30000,Mob012-4::On1062
-012-4.gat,80,109,9,4|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,42,141,20,10|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
-012-4.gat,41,157,9,19|monster|Spider|1012,20,100000,30000,Mob012-4::On1012
-012-4.gat,95,180,9,4|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
-012-4.gat,90,179,22,10|monster|Spider|1012,20,100000,30000,Mob012-4::On1012
+012-4.gat,80,110,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,42,142,20,11|monster|Skeleton|1043,3,100000,30000,Mob012-4::On1043
+012-4.gat,41,159,11,20|monster|Spider|1012,20,100000,30000,Mob012-4::On1012
+012-4.gat,95,180,9,5|monster|Bat|1017,5,100000,30000,Mob012-4::On1017
+012-4.gat,91,180,23,10|monster|Spider|1012,20,100000,30000,Mob012-4::On1012
012-4.gat,0,0,0|script|Mob012-4|-1,{
diff --git a/world/map/npc/012-4/_warps.txt b/world/map/npc/012-4/_warps.txt
index a9349809..74a4d302 100644
--- a/world/map/npc/012-4/_warps.txt
+++ b/world/map/npc/012-4/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-012-4.gat,474,187|warp|CaveEntrance|-1,-1,012-4.gat,363,26
+012-4.gat,193,58|warp|To Moggun Cave|-1,-1,012-3.gat,448,62
+012-4.gat,363,26|warp|To Small Cave|-1,-1,012-4.gat,474,187
+012-4.gat,474,188|warp|To Terranite Cave|-1,-1,012-4.gat,363,27
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index 0e0234d9..e2c2b9b2 100644
--- a/world/map/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
@@ -1,19 +1,19 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
+013-1.gat,0,0,0,0|monster|Pink Flower|1014,13,0,100,Mob013-1::On1014
+013-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,12,0,100,Mob013-1::On1019
013-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,100,Mob013-1::On1028
-013-1.gat,0,0,0,0|monster|Mauve|1029,1,270,180,Mob013-1::On1029
-013-1.gat,0,0,0,0|monster|Mauve|1029,4,2700000,1800000,Mob013-1::On1029
-013-1.gat,0,0,0,0|monster|Cobalt|1030,1,270,180,Mob013-1::On1030
+013-1.gat,0,0,0,0|monster|Mauve Herb|1029,1,270,180,Mob013-1::On1029
+013-1.gat,0,0,0,0|monster|Mauve Herb|1029,4,2700000,1800000,Mob013-1::On1029
+013-1.gat,0,0,0,0|monster|Cobalt Herb|1030,1,270,180,Mob013-1::On1030
013-1.gat,0,0,0,0|monster|Cobalt|1030,2,2700000,1800000,Mob013-1::On1030
-013-1.gat,0,0,0,0|monster|Gamboge|1031,1,270,180,Mob013-1::On1031
-013-1.gat,0,0,0,0|monster|Gamboge|1031,2,2700000,1800000,Mob013-1::On1031
-013-1.gat,0,0,0,0|monster|Alizarin|1032,1,270,180,Mob013-1::On1032
-013-1.gat,0,0,0,0|monster|Alizarin|1032,2,2700000,1800000,Mob013-1::On1032
-013-1.gat,0,0,0,0|monster|SilkWorm|1035,4,60000,30000,Mob013-1::On1035
-013-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob013-1::On1037
+013-1.gat,0,0,0,0|monster|Gamboge Herb|1031,1,270,180,Mob013-1::On1031
+013-1.gat,0,0,0,0|monster|Gamboge Herb|1031,2,2700000,1800000,Mob013-1::On1031
+013-1.gat,0,0,0,0|monster|Alizarin Herb|1032,1,270,180,Mob013-1::On1032
+013-1.gat,0,0,0,0|monster|Alizarin Herb|1032,2,2700000,1800000,Mob013-1::On1032
+013-1.gat,0,0,0,0|monster|Silkworm|1035,4,60000,30000,Mob013-1::On1035
+013-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob013-1::On1037
013-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob013-1::On1038
013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob013-1::On1055
diff --git a/world/map/npc/013-1/_warps.txt b/world/map/npc/013-1/_warps.txt
index 92e196aa..0fe0a18a 100644
--- a/world/map/npc/013-1/_warps.txt
+++ b/world/map/npc/013-1/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-013-1.gat,45,21|warp|ToWoodland|1,-1,017-1.gat,46,104
-013-1.gat,42,90|warp|toHouse|-1,-1,013-2.gat,63,41
+013-1.gat,125,104|warp|To Woodland Hills Cave|-1,-1,013-3.gat,34,64
+013-1.gat,20,76|warp|To Woodland Hills|-1,2,012-1.gat,149,60
+013-1.gat,46,20|warp|To Woodland Hills|2,-1,017-1.gat,46,104
+013-1.gat,42,90|warp|To Magic House|-1,-1,013-2.gat,63,41
diff --git a/world/map/npc/013-2/_warps.txt b/world/map/npc/013-2/_warps.txt
index 400d8301..a94e5702 100644
--- a/world/map/npc/013-2/_warps.txt
+++ b/world/map/npc/013-2/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-013-2.gat,21,42|warp|toRoom|-1,-1,013-2.gat,67,37
+013-2.gat,63,42|warp|To Outside|-1,-1,013-1.gat,42,91
+013-2.gat,67,36|warp|To Magic Room|-1,-1,013-2.gat,21,40
+013-2.gat,21,41|warp|To Magic House Entrance|-1,-1,013-2.gat,67,37
diff --git a/world/map/npc/013-3/_import.txt b/world/map/npc/013-3/_import.txt
index d55983bf..79ed5aed 100644
--- a/world/map/npc/013-3/_import.txt
+++ b/world/map/npc/013-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 013-3: Woodland Hills Caves
+// Map 013-3: Woodland Hills Cave
// 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 8d15cfef..8132bd96 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.
-// Woodland Hills Caves mobs
+// Woodland Hills Cave 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
@@ -7,33 +7,33 @@
013-3.gat,109,31,6,22|monster|Black Scorpion|1009,20,50000,25000,Mob013-3::On1009
013-3.gat,119,84,27,38|monster|Spider|1012,20,120000,40000,Mob013-3::On1012
013-3.gat,176,23,5,6|monster|Spider|1012,10,100000,40000,Mob013-3::On1012
-013-3.gat,82,75,2,2|monster|Fire skull|1023,1,180000,60000,Mob013-3::On1023
-013-3.gat,142,37,2,2|monster|Poison skull|1024,1,180000,60000,Mob013-3::On1024
+013-3.gat,82,75,2,2|monster|Fire Skull|1023,1,180000,60000,Mob013-3::On1023
+013-3.gat,142,37,2,2|monster|Poison Skull|1024,1,180000,60000,Mob013-3::On1024
013-3.gat,79,134,21,16|monster|Black Scorpion|1009,5,80000,40000,Mob013-3::On1009
013-3.gat,71,169,38,17|monster|Black Scorpion|1009,5,80000,40000,Mob013-3::On1009
-013-3.gat,64,85,9,21|monster|Black scorpion|1009,10,80000,40000,Mob013-3::On1009
-013-3.gat,81,92,3,20|monster|Black scorpion|1009,10,80000,40000,Mob013-3::On1009
-013-3.gat,162,84,33,37|monster|Snake|1010,30,120000,50000,Mob013-3::On1010
+013-3.gat,64,85,9,21|monster|Black Scorpion|1009,10,80000,40000,Mob013-3::On1009
+013-3.gat,81,92,3,20|monster|Black Scorpion|1009,10,80000,40000,Mob013-3::On1009
+013-3.gat,163,84,33,37|monster|Snake|1010,30,120000,50000,Mob013-3::On1010
013-3.gat,162,85,33,37|monster|Spider|1012,30,120000,50000,Mob013-3::On1012
-013-3.gat,172,77,18,25|monster|Black scorpion|1009,15,120000,50000,Mob013-3::On1009
-013-3.gat,145,36,20,15|monster|Red slime|1008,25,80000,40000,Mob013-3::On1008
+013-3.gat,172,77,18,25|monster|Black Scorpion|1009,15,120000,50000,Mob013-3::On1009
+013-3.gat,145,36,20,15|monster|Red Slime|1008,25,80000,40000,Mob013-3::On1008
013-3.gat,167,37,23,11|monster|Snake|1010,20,120000,40000,Mob013-3::On1010
-013-3.gat,165,25,16,11|monster|Black scorpion|1009,15,120000,40000,Mob013-3::On1009
+013-3.gat,165,25,16,11|monster|Black Scorpion|1009,15,120000,40000,Mob013-3::On1009
013-3.gat,71,39,2,3|monster|Snake|1010,2,40000,20000,Mob013-3::On1010
-013-3.gat,159,102,3,5|monster|Yellow slime|1007,2,80000,40000,Mob013-3::On1007
+013-3.gat,159,102,3,5|monster|Yellow Slime|1007,2,80000,40000,Mob013-3::On1007
013-3.gat,67,22,2,2|monster|Maggot|1002,2,40000,20000,Mob013-3::On1002
013-3.gat,75,22,2,2|monster|Maggot|1002,2,40000,20000,Mob013-3::On1002
-013-3.gat,76,39,7,4|monster|Black scorpion|1009,8,40000,20000,Mob013-3::On1009
-013-3.gat,65,39,7,4|monster|Red slime|1008,8,40000,20000,Mob013-3::On1008
+013-3.gat,76,39,7,4|monster|Black Scorpion|1009,8,40000,20000,Mob013-3::On1009
+013-3.gat,65,39,7,4|monster|Red Slime|1008,8,40000,20000,Mob013-3::On1008
013-3.gat,62,33,2,1|monster|Poison Skull|1024,1,120000,60000,Mob013-3::On1024
013-3.gat,80,33,2,1|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023
013-3.gat,75,46,2,1|monster|Poison Skull|1024,1,120000,60000,Mob013-3::On1024
013-3.gat,67,46,2,1|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023
013-3.gat,149,145,7,26|monster|Silkworm|2037,10,20000,5000,Mob013-3::On2037
-013-3.gat,117,157,6,14|monster|CaveSnake|2023,3,30000,10000,Mob013-3::On2023
-013-3.gat,150,129,17,4|monster|CaveSnake|2023,3,30000,10000,Mob013-3::On2023
-013-3.gat,162,138,5,5|monster|CaveSnake|2023,3,30000,10000,Mob013-3::On2023
-013-3.gat,138,174,15,8|monster|CaveSnake|2023,3,30000,10000,Mob013-3::On2023
+013-3.gat,117,157,6,14|monster|Cave Snake|2023,3,30000,10000,Mob013-3::On2023
+013-3.gat,150,129,17,4|monster|Cave Snake|2023,3,30000,10000,Mob013-3::On2023
+013-3.gat,162,138,5,5|monster|Cave Snake|2023,3,30000,10000,Mob013-3::On2023
+013-3.gat,138,174,15,8|monster|Cave Snake|2023,3,30000,10000,Mob013-3::On2023
013-3.gat,146,151,62,54|monster|Bat|2019,20,15000,5000,Mob013-3::On2019
diff --git a/world/map/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt
index 51dee2f4..f4fdc860 100644
--- a/world/map/npc/013-3/_warps.txt
+++ b/world/map/npc/013-3/_warps.txt
@@ -1,39 +1,39 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland Hills Caves warps
+// Woodland Hills Cave 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
-013-3.gat,36,96|warp|toCave|-1,-1,013-3.gat,79,126
-013-3.gat,79,125|warp|toCave|-1,-1,013-3.gat,35,96
-013-3.gat,22,115|warp|toOutside|-1,-1,018-1.gat,115,41
-013-3.gat,139,45|warp|toOutside|-1,-1,018-1.gat,127,37
-013-3.gat,61,179|warp|toOutside|-1,-1,018-1.gat,134,46
-013-3.gat,69,143|warp|toCave|-1,-1,018-3.gat,50,89
-013-3.gat,81,103|warp|toOutside|-1,-1,018-1.gat,147,41
-013-3.gat,177,91|warp|toOutside|-1,-1,018-1.gat,177,21
-013-3.gat,178,44|warp|toCave|-1,-1,018-3.gat,97,70
-013-3.gat,169,45|warp|toCave|-1,-1,018-3.gat,27,55
-013-3.gat,152,28|warp|toCave|-1,-1,018-3.gat,134,60
-013-3.gat,123,104|warp|toCave|-1,-1,018-3.gat,172,22
-013-3.gat,147,104|warp|toCave|-1,-1,018-3.gat,177,22
-013-3.gat,158,66|warp|toCave|-1,-1,018-3.gat,27,90
-013-3.gat,75,51|warp|toCave|-1,-1,013-3.gat,109,65
-013-3.gat,109,64|warp|toCave|-1,-1,013-3.gat,75,50
-013-3.gat,67,51|warp|toCave|-1,-1,018-3.gat,90,51
-013-3.gat,71,20|warp|toCave|-1,-1,013-3.gat,28,39
-013-3.gat,28,39|warp|toCave|-1,-1,013-3.gat,71,21
-013-3.gat,71,42|warp|toCave|-1,-1,013-3.gat,109,21
-013-3.gat,109,20|warp|toCave|-1,-1,013-3.gat,71,41
-013-3.gat,111,42|warp|toCave|-1,-1,018-3.gat,71,123
-013-3.gat,62,100|warp|toCave|-1,-1,018-3.gat,174,86
-013-3.gat,68,97|warp|toCave|-1,-1,018-3.gat,102,70
-013-3.gat,160,102|warp|toCave|-1,-1,009-3.gat,117,20
-013-3.gat,141,146|warp|toLowerEntrance|-1,-1,017-1.gat,76,32
-013-3.gat,173,127|warp|toOutsideUpper|-1,-1,017-1.gat,98,21
-013-3.gat,162,170|warp|toOutsideClovers|-1,-1,017-1.gat,97,30
-013-3.gat,153,126|warp|toCave02|-1,-1,013-3.gat,119,147
-013-3.gat,119,149|warp|toCave01|-1,-1,013-3.gat,153,127
-013-3.gat,159,152|warp|toCave03|-1,-1,013-3.gat,148,161
-013-3.gat,148,160|warp|toCave04|-1,-1,013-3.gat,159,151
-013-3.gat,122,170|warp|toCave_05|0,-1,013-3.gat,171,175
-013-3.gat,172,177|warp|toCave_06|1,-1,013-3.gat,121,168
+013-3.gat,28,20|warp|To Woodland Hills|-1,-1,013-1.gat,0,0
+013-3.gat,34,63|warp|To Woodland Hills|-1,-1,013-1.gat,125,103
+013-3.gat,36,96|warp|To Woodland Hills Cave|-1,-1,013-3.gat,79,126
+013-3.gat,79,125|warp|To Woodland Hills Cave|-1,-1,013-3.gat,35,96
+013-3.gat,22,115|warp|To Woodland Mining Camp|-1,-1,018-1.gat,115,41
+013-3.gat,139,45|warp|To Woodland Mining Camp|-1,-1,018-1.gat,127,37
+013-3.gat,61,179|warp|To Woodland Mining Camp|-1,-1,018-1.gat,134,46
+013-3.gat,69,143|warp|To Northern Mine|-1,-1,018-3.gat,50,89
+013-3.gat,81,103|warp|To Woodland Mining Camp|-1,-1,018-1.gat,147,41
+013-3.gat,177,91|warp|To Jack O Land|-1,-1,018-1.gat,177,21
+013-3.gat,178,44|warp|To Northern Mine|-1,-1,018-3.gat,97,70
+013-3.gat,169,45|warp|To Northern Mine|-1,-1,018-3.gat,27,55
+013-3.gat,152,28|warp|To Northern Mine|-1,-1,018-3.gat,134,62
+013-3.gat,123,104|warp|To Northern Mine|-1,-1,018-3.gat,172,22
+013-3.gat,147,104|warp|To Northern Mine|-1,-1,018-3.gat,177,22
+013-3.gat,158,66|warp|To Northern Mine|-1,-1,018-3.gat,27,90
+013-3.gat,75,51|warp|To Woodland Hills Cave|-1,-1,013-3.gat,109,65
+013-3.gat,109,64|warp|To Woodland Hills Cave|-1,-1,013-3.gat,75,50
+013-3.gat,67,51|warp|To Northern Mine|-1,-1,018-3.gat,90,51
+013-3.gat,71,20|warp|To Demon Mask Chest Cave|-1,-1,013-3.gat,28,39
+013-3.gat,28,41|warp|To Fight Cave|-1,-1,013-3.gat,71,21
+013-3.gat,71,42|warp|To Black Scorpion Cave|-1,-1,013-3.gat,109,21
+013-3.gat,109,20|warp|To Woodland Hills Cave|-1,-1,013-3.gat,71,41
+013-3.gat,111,42|warp|To Magic Bookshelf Cave|-1,-1,018-3.gat,71,123
+013-3.gat,62,100|warp|To Northern Mine|-1,-1,018-3.gat,174,86
+013-3.gat,68,97|warp|To Northern Mine|-1,-1,018-3.gat,102,70
+013-3.gat,160,103|warp|To Hurnscald Cave|-1,-1,009-3.gat,117,20
+013-3.gat,141,146|warp|To Woodland Hills|-1,-1,017-1.gat,75,32
+013-3.gat,173,131|warp|To Theater Hill|-1,-1,017-1.gat,97,21
+013-3.gat,162,169|warp|To Woodland Hills Labyrinth|-1,-1,017-1.gat,98,30
+013-3.gat,153,126|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,119,147
+013-3.gat,119,148|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,153,127
+013-3.gat,159,152|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,148,161
+013-3.gat,148,160|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,159,151
+013-3.gat,122,170|warp|To Woodland Hills Labyrinth|0,-1,013-3.gat,172,176
+013-3.gat,172,177|warp|To Woodland Hills Cave|1,-1,013-3.gat,122,169
diff --git a/world/map/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt
index bc5194c4..815d7e94 100644
--- a/world/map/npc/014-1/_mobs.txt
+++ b/world/map/npc/014-1/_mobs.txt
@@ -1,20 +1,20 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland mobs
-014-1.gat,0,0,0,0|monster|EvilMushroom|1013,20,0,0,Mob014-1::On1013
-014-1.gat,0,0,0,0|monster|PinkFlower|1014,25,0,0,Mob014-1::On1014
+014-1.gat,0,0,0,0|monster|Evil Mushroom|1013,20,0,0,Mob014-1::On1013
+014-1.gat,0,0,0,0|monster|Pink Flower|1014,25,0,0,Mob014-1::On1014
014-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,15,0,0,Mob014-1::On1019
014-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,10,Mob014-1::On1028
-014-1.gat,0,0,0,0|monster|Mauve|1029,1,270,180,Mob014-1::On1029
-014-1.gat,0,0,0,0|monster|Mauve|1029,5,2700000,1800000,Mob014-1::On1029
-014-1.gat,0,0,0,0|monster|Cobalt|1030,1,270,180,Mob014-1::On1030
-014-1.gat,0,0,0,0|monster|Cobalt|1030,2,2700000,1800000,Mob014-1::On1030
-014-1.gat,0,0,0,0|monster|Gamboge|1031,1,270,180,Mob014-1::On1031
-014-1.gat,0,0,0,0|monster|Gamboge|1031,2,2700000,1800000,Mob014-1::On1031
-014-1.gat,0,0,0,0|monster|Alizarin|1032,1,270,180,Mob014-1::On1032
-014-1.gat,0,0,0,0|monster|Alizarin|1032,2,2700000,1800000,Mob014-1::On1032
-014-1.gat,0,0,0,0|monster|SilkWorm|1035,4,6000,3000,Mob014-1::On1035
-014-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob014-1::On1037
+014-1.gat,0,0,0,0|monster|Mauve Herb|1029,1,270,180,Mob014-1::On1029
+014-1.gat,0,0,0,0|monster|Mauve Herb|1029,5,2700000,1800000,Mob014-1::On1029
+014-1.gat,0,0,0,0|monster|Cobalt Herb|1030,1,270,180,Mob014-1::On1030
+014-1.gat,0,0,0,0|monster|Cobalt Herb|1030,2,2700000,1800000,Mob014-1::On1030
+014-1.gat,0,0,0,0|monster|Gamboge Herb|1031,1,270,180,Mob014-1::On1031
+014-1.gat,0,0,0,0|monster|Gamboge Herb|1031,2,2700000,1800000,Mob014-1::On1031
+014-1.gat,0,0,0,0|monster|Alizarin Herb|1032,1,270,180,Mob014-1::On1032
+014-1.gat,0,0,0,0|monster|Alizarin Herb|1032,2,2700000,1800000,Mob014-1::On1032
+014-1.gat,0,0,0,0|monster|Silkworm|1035,4,6000,3000,Mob014-1::On1035
+014-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob014-1::On1037
014-1.gat,0,0,0,0|monster|Squirrel|1038,25,30,20,Mob014-1::On1038
014-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob014-1::On1055
diff --git a/world/map/npc/014-1/_warps.txt b/world/map/npc/014-1/_warps.txt
index d97afc5f..78d911dd 100644
--- a/world/map/npc/014-1/_warps.txt
+++ b/world/map/npc/014-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland warps
-014-1.gat,109,91|warp|ToWoodland|-1,1,011-1.gat,31,62
-014-1.gat,93,58|warp|ToCave|-1,-1,014-3.gat,56,172
-014-1.gat,76,38|warp|ToCave|-1,-1,014-3.gat,35,33
+014-1.gat,109,91|warp|To Woodland|-1,1,011-1.gat,31,61
+014-1.gat,93,58|warp|To Woodland Cave|-1,-1,014-3.gat,57,172
+014-1.gat,76,38|warp|To Woodland Cave|-1,-1,014-3.gat,35,33
diff --git a/world/map/npc/014-3/_import.txt b/world/map/npc/014-3/_import.txt
index 6da1af98..612fdc1d 100644
--- a/world/map/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 014-3: Woodland Caves
+// Map 014-3: Woodland Cave
// 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 db5c65b2..7e7300c3 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.
-// Woodland Caves mobs
+// Woodland Cave 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 ac0d5474..22701003 100644
--- a/world/map/npc/014-3/_warps.txt
+++ b/world/map/npc/014-3/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woodland Caves warps
+// Woodland Cave 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
-014-3.gat,91,108|warp|ToCave|-1,-1,014-3.gat,103,53
-014-3.gat,103,54|warp|ToCave|-1,-1,014-3.gat,91,109
+014-3.gat,35,32|warp|To Woodland|-1,-1,014-1.gat,76,39
+014-3.gat,57,173|warp|To Woodland|0,-1,014-1.gat,93,59
+014-3.gat,91,108|warp|To Second Cave|-1,-1,014-3.gat,103,53
+014-3.gat,103,54|warp|To First Cave|-1,-1,014-3.gat,91,109
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index 44544f23..e1153c95 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -1,16 +1,16 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland mobs
-015-1.gat,0,0,0,0|monster|Clover|1037,2,100000,1000,Mob015-1::On1037
+015-1.gat,0,0,0,0|monster|Clover Patch|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|Log Head|1025,40,0,0,Mob015-1::On1025
+015-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,20,0,0,Mob015-1::On1019
+015-1.gat,0,0,0,0|monster|Pink Flower|1014,20,0,0,Mob015-1::On1014
+015-1.gat,0,0,0,0|monster|Gamboge Herb|1031,5,0,0,Mob015-1::On1031
+015-1.gat,0,0,0,0|monster|Alizarin Herb|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,0|monster|Mauve Herb|1029,4,270000,180000,Mob015-1::On1029
015-1.gat,0,0,0|script|Mob015-1|-1,{
diff --git a/world/map/npc/015-1/_warps.txt b/world/map/npc/015-1/_warps.txt
index 2be9d74f..56e6166b 100644
--- a/world/map/npc/015-1/_warps.txt
+++ b/world/map/npc/015-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland warps
-015-1.gat,93,55|warp|ToWoodland|-1,0,010-1.gat,15,55
-015-1.gat,59,31|warp|to 015_3|-1,-1,015-3.gat,31,42
-015-1.gat,59,101|warp|toSwamp|2,-1,025-1.gat,89,20
+015-1.gat,93,55|warp|To Woodland|-1,0,010-1.gat,14,54
+015-1.gat,59,31|warp|To Cat's Cave|-1,-1,015-3.gat,31,42
+015-1.gat,59,101|warp|To Woodland Swamp|2,-1,025-1.gat,89,20
diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt
index 98be5fc1..66c28a26 100644
--- a/world/map/npc/015-3/_mobs.txt
+++ b/world/map/npc/015-3/_mobs.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-015-3.gat,23,19,1,1|monster|Maggots|1002,1,100000,30000,Mob015-3::On1002
+015-3.gat,22,25,2,4|monster|Bat|1017,2,100000,30000,Mob015-3::On1017
+015-3.gat,29,31,2,2|monster|Maggot|1002,2,100000,30000,Mob015-3::On1002
+015-3.gat,23,19,1,1|monster|Maggot|1002,1,100000,30000,Mob015-3::On1002
015-3.gat,40,19,1,1|monster|Spider|1012,1,100000,30000,Mob015-3::On1012
diff --git a/world/map/npc/015-3/_warps.txt b/world/map/npc/015-3/_warps.txt
index 2c7ae69f..ec6b4d3e 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.
// Cat's Cave warps
-015-3.gat,31,43|warp|to 015-1|-1,-1,015-1.gat,59,32
+015-3.gat,31,43|warp|To Woodland|-1,-1,015-1.gat,59,32
diff --git a/world/map/npc/016-1/_warps.txt b/world/map/npc/016-1/_warps.txt
index abb02935..6587c824 100644
--- a/world/map/npc/016-1/_warps.txt
+++ b/world/map/npc/016-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland warps
-016-1.gat,56,20|warp|ToWoodland|1,-1,010-1.gat,56,103
-016-1.gat,20,53|warp|toSwamp|-1,1,025-1.gat,129,58
+016-1.gat,56,18|warp|To Woodland|1,-1,010-1.gat,56,104
+016-1.gat,20,53|warp|To Woodland Swamp|-1,1,025-1.gat,129,58
diff --git a/world/map/npc/017-1/_import.txt b/world/map/npc/017-1/_import.txt
index 9c382e96..29858887 100644
--- a/world/map/npc/017-1/_import.txt
+++ b/world/map/npc/017-1/_import.txt
@@ -3,4 +3,3 @@
map: 017-1.gat
npc: npc/017-1/_mobs.txt
npc: npc/017-1/_warps.txt
-npc: npc/017-1/monsters.txt
diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index 0aa69127..af722b24 100644
--- a/world/map/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
@@ -1,19 +1,91 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-017-1.gat,91,25,76,8|monster|Loghead|2027,3,5000,60000,Mob017-1::On2027
-017-1.gat,31,48,19,12|monster|Loghead|2027,3,5000,60000,Mob017-1::On2027
+017-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob017-1::On1037
+017-1.gat,29,29,19,12|monster|Gamboge Herb|2033,1,0,25000,Mob017-1::On2033
+017-1.gat,91,25,76,8|monster|Log Head|2027,3,5000,60000,Mob017-1::On2027
+017-1.gat,31,48,19,12|monster|Log Head|2027,3,5000,60000,Mob017-1::On2027
017-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob017-1::On1055
+017-1.gat,0,0,0,0|monster|Bat|1017,5,0,0,Mob017-1::On1017
+017-1.gat,0,0,0,0|monster|Fire Goblin|1011,5,0,0,Mob017-1::On1011
+017-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob017-1::On1028
+017-1.gat,0,0,0,0|monster|Pink Flower|1014,5,0,0,Mob017-1::On1014
+017-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,5,0,0,Mob017-1::On1019
+017-1.gat,0,0,0,0|monster|Evil Mushroom|1013,10,0,0,Mob017-1::On1013
+017-1.gat,0,0,0,0|monster|Alizarin Herb|1032,3,0,0,Mob017-1::On1032
+017-1.gat,0,0,0,0|monster|Gamboge Herb|1031,3,0,0,Mob017-1::On1031
+017-1.gat,0,0,0,0|monster|Cobalt Herb|1030,3,0,0,Mob017-1::On1030
+017-1.gat,0,0,0,0|monster|Mauve Herb|1029,5,0,0,Mob017-1::On1029
+017-1.gat,0,0,0,0|monster|Silkworm|1035,10,0,0,Mob017-1::On1035
+017-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob017-1::On1038
017-1.gat,0,0,0|script|Mob017-1|-1,{
+On1011:
+ set @mobID, 1011;
+ callfunc "MobPoints";
+ end;
+
+On1013:
+ set @mobID, 1013;
+ callfunc "MobPoints";
+ end;
+
+On1014:
+ set @mobID, 1014;
+ callfunc "MobPoints";
+ end;
+
+On1017:
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ end;
+
+On1019:
+ set @mobID, 1019;
+ callfunc "MobPoints";
+ end;
+
+On1028:
+ set @mobID, 1028;
+ callfunc "MobPoints";
+ end;
+
+On1029:
+ set @mobID, 1029;
+ callfunc "MobPoints";
+ end;
+
+On1030:
+ set @mobID, 1030;
+ 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/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index 168293e1..665718e0 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-017-1.gat,76,31|warp|toCave|-1,-1,013-3.gat,141,147
-017-1.gat,98,20|warp|toCave|-1,-1,013-3.gat,173,129
-017-1.gat,97,31|warp|toCave|-1,-1,013-3.gat,162,168
+017-1.gat,46,105|warp|To Woodland Hills|2,-1,013-1.gat,45,21
+017-1.gat,43,32|warp|To Theater|-1,-1,017-2.gat,26,30
+017-1.gat,76,31|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,140,147
+017-1.gat,98,20|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,172,132
+017-1.gat,97,31|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,163,168
diff --git a/world/map/npc/017-1/monsters.txt b/world/map/npc/017-1/monsters.txt
deleted file mode 100644
index 21f4939a..00000000
--- a/world/map/npc/017-1/monsters.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-// Map: 017-1
-// This is North Woodlands Mountains.
-//
-
-017-1.gat,0,0,0,0|monster|Bat|1017,5,0,0,Mob33::OnBat
-017-1.gat,0,0,0,0|monster|FireGoblin|1011,5,0,0,Mob33::OnFireGoblin
-017-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob33::OnMouboo
-017-1.gat,0,0,0,0|monster|PinkFlower|1014,5,0,0,Mob33::OnPinkFlower
-017-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0,0,Mob33::OnSpikyMushroom
-017-1.gat,0,0,0,0|monster|EvilMushshroom|1013,10,0,0,Mob33::OnEvilMushroom
-
-017-1.gat,0,0,0,0|monster|Alizarin|1032,3,0,0,Mob33::OnAlizarin
-017-1.gat,0,0,0,0|monster|Gamboge|1031,3,0,0,Mob33::OnGamboge
-017-1.gat,0,0,0,0|monster|Cobalt|1030,3,0,0,Mob33::OnCobalt
-017-1.gat,0,0,0,0|monster|Mauve|1029,5,0,0,Mob33::OnMauve
-
-017-1.gat,0,0,0,0|monster|SilkWorm|1035,10,0,0,Mob33::OnSilkWorm
-
-017-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob33::OnSquirrel
-
-017-1.gat,0,0,0|script|Mob33|-1,{
-OnBat:
- set @mobID, 1017;
- callfunc "MobPoints";
- break;
-
-OnFireGoblin:
- set @mobID, 1011;
- callfunc "MobPoints";
- break;
-
-OnMouboo:
- set @mobID, 1028;
- callfunc "MobPoints";
- break;
-
-OnPinkFlower:
- set @mobID, 1014;
- callfunc "MobPoints";
- break;
-
-OnSpikyMushroom:
- set @mobID, 1019;
- callfunc "MobPoints";
- break;
-
-OnEvilMushroom:
- set @mobID, 1013;
- callfunc "MobPoints";
- break;
-
-OnAlizarin:
- set @mobID, 1032;
- callfunc "MobPoints";
- break;
-
-OnGamboge:
- set @mobID, 1031;
- callfunc "MobPoints";
- break;
-
-OnCobalt:
- set @mobID, 1030;
- callfunc "MobPoints";
- break;
-
-OnMauve:
- set @mobID, 1029;
- callfunc "MobPoints";
- break;
-
-OnSilkWorm:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
-
-OnSquirrel:
- set @mobID, 1038;
- callfunc "MobPoints";
- break;
-
- end;
-}
diff --git a/world/map/npc/017-2/_warps.txt b/world/map/npc/017-2/_warps.txt
index 2a9898ed..0e2b50de 100644
--- a/world/map/npc/017-2/_warps.txt
+++ b/world/map/npc/017-2/_warps.txt
@@ -1,11 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Theater warps
-017-2.gat,30,20|warp|toBackStage02|-1,-1,017-9.gat,30,23
-017-2.gat,26,30|warp|toWoodlandHills|-1,-1,017-1.gat,43,33
-017-2.gat,22,20|warp|toBackStage01|-1,-1,017-9.gat,22,23
-017-2.gat,21,-3|warp|toStage01|-2,-2,013-2.gat,24,58
-017-2.gat,26,-3|warp|toStage01|-2,-2,013-2.gat,26,54
-017-2.gat,22,-13|warp|toStage02|-2,-2,013-2.gat,22,54
-017-2.gat,30,-13|warp|toStage01|-2,-2,013-2.gat,30,54
-017-2.gat,31,-3|warp|toStage01|-2,-2,013-2.gat,28,58
+017-2.gat,30,20|warp|To Right Door Backstage|-1,-1,017-9.gat,29,21
+017-2.gat,26,31|warp|To Outside|-1,-1,017-1.gat,43,33
+017-2.gat,22,20|warp|To Left Door Backstage|-1,-1,017-9.gat,23,21
+017-2.gat,24,25|warp|To Left Trapdoor Backstage|-1,-1,017-9.gat,21,26
+017-2.gat,26,21|warp|To Center Trapdoor Backstage|-1,-1,017-9.gat,26,27
+017-2.gat,28,25|warp|To Right Trapdoor Backstage|-1,-1,017-9.gat,31,26
diff --git a/world/map/npc/017-9/_warps.txt b/world/map/npc/017-9/_warps.txt
index 864ceefb..fe1d81d4 100644
--- a/world/map/npc/017-9/_warps.txt
+++ b/world/map/npc/017-9/_warps.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Backstage warps
-017-9.gat,22,21|warp|toLeftDoor|-1,-1,017-2.gat,22,21
-017-9.gat,26,22|warp|toWoodlandHills|-1,-1,017-1.gat,43,33
-017-9.gat,30,21|warp|toRightDoor|-1,-1,017-2.gat,30,21
-017-9.gat,21,28|warp|toLeftTrapdoor|-1,-1,017-2.gat,24,25
-017-9.gat,26,28|warp|toCentreTrapdoor|-1,-1,017-2.gat,26,21
-017-9.gat,31,28|warp|toRightTrapdoor|-1,-1,017-2.gat,28,25
+017-9.gat,22,20|warp|To Left Door Onstage|-1,-1,017-2.gat,23,21
+017-9.gat,26,21|warp|To Outside|-1,-1,017-1.gat,44,33
+017-9.gat,30,20|warp|To Right Door Onstage|-1,-1,017-2.gat,29,21
+017-9.gat,21,28|warp|To Left Trapdoor Onstage|-1,-1,017-2.gat,25,25
+017-9.gat,26,28|warp|To Centre Trapdoor Onstage|-1,-1,017-2.gat,26,23
+017-9.gat,31,28|warp|To Right Trapdoor Onstage|-1,-1,017-2.gat,27,25
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index b036bb7a..336e823b 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -3,11 +3,11 @@
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
-018-1.gat,116,44,6,7|monster|Sea Slime|1033,3,100000,30000,Mob018-1::On1033
-018-1.gat,119,56,13,6|monster|PinkFlower|1014,2,100000,30000,Mob018-1::On1014
+018-1.gat,116,44,6,7|monster|Sea Slime|1033,3,100000,30000,Mob018-1::On1033
+018-1.gat,119,56,13,6|monster|Pink Flower|1014,2,100000,30000,Mob018-1::On1014
018-1.gat,175,28,17,19|monster|Jack O|1022,1,300000,240000,Mob018-1::On1022
018-1.gat,78,59,3,1|monster|Yellow Slime|1007,1,100000,30000,Mob018-1::On1007
-018-1.gat,57,63,14,7|monster|Silk Worm|1035,2,100000,30000,Mob018-1::On1035
+018-1.gat,57,63,14,7|monster|Silkworm|1035,2,100000,30000,Mob018-1::On1035
018-1.gat,43,63,31,28|monster|Bat|1017,10,100000,30000,Mob018-1::On1017
018-1.gat,134,39,18,10|monster|Grass Snake|1034,4,100000,50000,Mob018-1::On1034
018-1.gat,124,42,9,11|monster|Grass Snake|1034,2,100000,50000,Mob018-1::On1034
@@ -16,16 +16,16 @@
018-1.gat,149,45,10,8|monster|Bat|1017,5,100000,30000,Mob018-1::On1017
018-1.gat,169,47,20,10|monster|Red Slime|1008,4,120000,30000,Mob018-1::On1008
018-1.gat,136,49,13,8|monster|Bat|1017,4,100000,30000,Mob018-1::On1017
-018-1.gat,136,49,13,9|monster|Clover Patch|1037,1,100000,30000,Mob018-1::On1037
-018-1.gat,111,62,5,2|monster|Silk Worm|1035,1,60000,30000,Mob018-1::On1035
+018-1.gat,166,49,13,9|monster|Clover Patch|1037,1,100000,30000,Mob018-1::On1037
+018-1.gat,111,62,5,2|monster|Silkworm|1035,1,60000,30000,Mob018-1::On1035
018-1.gat,117,50,4,3|monster|Sea Slime|1033,1,120000,60000,Mob018-1::On1033
018-1.gat,96,47,18,11|monster|Red Slime|1008,3,100000,50000,Mob018-1::On1008
-018-1.gat,106,52,15,6|monster|Cobalt Plant|1030,1,240000,120000,Mob018-1::On1030
+018-1.gat,106,52,15,6|monster|Cobalt Herb|1030,1,240000,120000,Mob018-1::On1030
018-1.gat,78,55,37,6|monster|Red Slime|1008,7,100000,50000,Mob018-1::On1008
018-1.gat,145,24,10,9|monster|Red Slime|1008,3,100000,50000,Mob018-1::On1008
018-1.gat,68,89,14,17|monster|Bat|1017,3,100000,50000,Mob018-1::On1017
018-1.gat,160,31,11,18|monster|Red Slime|1008,5,100000,50000,Mob018-1::On1008
-018-1.gat,0,0,0,0|monster|Clover|1037,2,0,1000,Mob018-1::On1037
+018-1.gat,0,0,0,0|monster|Clover Patch|1037,2,0,1000,Mob018-1::On1037
018-1.gat,0,0,0,0|monster|Butterfly|1055,20,30,20,Mob018-1::On1055
diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt
index dec3a6a7..4e9f356a 100644
--- a/world/map/npc/018-1/_warps.txt
+++ b/world/map/npc/018-1/_warps.txt
@@ -1,18 +1,19 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-018-1.gat,115,40|warp|toCave|-1,-1,013-3.gat,22,114
-018-1.gat,128,56|warp|toCave|-1,-1,018-3.gat,49,97
-018-1.gat,90,42|warp|toCave|-1,-1,018-3.gat,123,164
-018-1.gat,69,54|warp|toCave|-1,-1,018-3.gat,70,103
-018-1.gat,127,36|warp|toCave|-1,-1,013-3.gat,139,44
-018-1.gat,134,45|warp|toCave|-1,-1,013-3.gat,61,178
-018-1.gat,147,40|warp|toCave|-1,-1,013-3.gat,81,102
-018-1.gat,153,46|warp|toCave|-1,-1,018-3.gat,146,160
-018-1.gat,158,34|warp|toCave|-1,-1,018-3.gat,64,101
-018-1.gat,162,44|warp|toCave|-1,-1,018-3.gat,29,164
-018-1.gat,177,20|warp|toCave|-1,-1,013-3.gat,177,90
-018-1.gat,65,73|warp|toIndoor|-1,-1,018-2.gat,50,28
-018-1.gat,79,98|warp|toHurnscald|2,-1,008-1.gat,79,18
+018-1.gat,79,59|warp|To Northern Mine|0,-1,018-3.gat,100,132
+018-1.gat,112,61|warp|To Bat Cave|-1,-1,018-3.gat,44,38
+018-1.gat,115,40|warp|To Woodland Hills Cave|-1,-1,013-3.gat,22,114
+018-1.gat,128,56|warp|To Northern Mine|-1,-1,018-3.gat,49,99
+018-1.gat,90,42|warp|To Northern Mine|-1,-1,018-3.gat,123,166
+018-1.gat,69,54|warp|To Northern Mine|-1,-1,018-3.gat,70,105
+018-1.gat,127,36|warp|To Woodland Hills Cave|-1,-1,013-3.gat,139,44
+018-1.gat,134,45|warp|To Woodland Hills Cave|-1,-1,013-3.gat,61,178
+018-1.gat,147,40|warp|To Woodland Hills Cave|-1,-1,013-3.gat,81,102
+018-1.gat,153,46|warp|To Northern Mine|-1,-1,018-3.gat,145,162
+018-1.gat,158,34|warp|To Northern Mine|-1,-1,018-3.gat,64,103
+018-1.gat,162,44|warp|To Northern Mine|-1,-1,018-3.gat,29,166
+018-1.gat,177,20|warp|To Jack O Cave|-1,-1,013-3.gat,177,90
+018-1.gat,65,73|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28
+018-1.gat,79,98|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,18
+018-1.gat,64,69|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21
diff --git a/world/map/npc/018-2/_warps.txt b/world/map/npc/018-2/_warps.txt
index 473d3146..ad14cbed 100644
--- a/world/map/npc/018-2/_warps.txt
+++ b/world/map/npc/018-2/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-018-2.gat,20,24|warp|toBasement|-1,-1,018-2.gat,112,27
-018-2.gat,112,26|warp|toFirstFloor|-1,-1,018-2.gat,20,23
-018-2.gat,21,28|warp|toSecondFloor|0,-1,018-2.gat,79,25
-018-2.gat,79,26|warp|toFirstFloor|0,-1,018-2.gat,21,29
-018-2.gat,114,20|warp|toCave|-1,-1,018-3.gat,177,53
+018-2.gat,50,29|warp|To Outside|-1,-1,018-1.gat,65,74
+018-2.gat,41,20|warp|To Outside|-1,-1,018-1.gat,64,68
+018-2.gat,20,24|warp|To Bottom Floor|-1,-1,018-2.gat,112,26
+018-2.gat,112,25|warp|To First Floor|-1,-1,018-2.gat,20,23
+018-2.gat,21,28|warp|To Second Floor|0,-1,018-2.gat,79,25
+018-2.gat,79,26|warp|To First Floor|0,-1,018-2.gat,21,29
+018-2.gat,114,19|warp|To Northern Mine|-1,-1,018-3.gat,117,55
diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index 349144f4..9b201828 100644
--- a/world/map/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
@@ -1,27 +1,27 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Northern Mines mobs
-018-3.gat,48,28,56,17|monster|Bat|1017,10,100000,30000,Mob018-3::On1017
+018-3.gat,48,29,57,19|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
018-3.gat,35,65,28,22|monster|Spider|1012,20,100000,50000,Mob018-3::On1012
-018-3.gat,28,157,3,2|monster|PinkFlower|1014,1,60000,30000,Mob018-3::On1014
-018-3.gat,99,111,17,41|monster|Yellow slime|1007,10,90000,30000,Mob018-3::On1007
+018-3.gat,28,157,3,2|monster|Pink Flower|1014,1,60000,30000,Mob018-3::On1014
+018-3.gat,99,111,17,41|monster|Yellow Slime|1007,10,90000,30000,Mob018-3::On1007
018-3.gat,134,140,12,8|monster|Maggot|1002,3,80000,40000,Mob018-3::On1002
018-3.gat,132,137,15,25|monster|Spider|1012,8,300000,120000,Mob018-3::On1012
-018-3.gat,102,172,131,13|monster|Black scorpions|1009,20,60000,10000,Mob018-3::On1009
-018-3.gat,174,37,10,31|monster|Yellow slime|1007,5,180000,120000,Mob018-3::On1007
+018-3.gat,102,172,131,13|monster|Black Scorpion|1009,20,60000,10000,Mob018-3::On1009
+018-3.gat,174,37,10,31|monster|Yellow Slime|1007,5,180000,120000,Mob018-3::On1007
018-3.gat,87,153,78,22|monster|Snake|1010,10,60000,10000,Mob018-3::On1010
018-3.gat,148,148,13,24|monster|Bat|1017,3,180000,40000,Mob018-3::On1017
-018-3.gat,153,97,18,22|monster|Yellow slime|1007,6,80000,40000,Mob018-3::On1007
-018-3.gat,81,77,27,21|monster|Red slime|1008,15,80000,40000,Mob018-3::On1008
-018-3.gat,111,80,5,6|monster|Black scorpions|1009,10,80000,40000,Mob018-3::On1009
+018-3.gat,153,97,18,22|monster|Yellow Slime|1007,6,80000,40000,Mob018-3::On1007
+018-3.gat,81,77,27,21|monster|Red Slime|1008,15,80000,40000,Mob018-3::On1008
+018-3.gat,111,80,5,6|monster|Black Scorpion|1009,10,80000,40000,Mob018-3::On1009
018-3.gat,175,122,5,40|monster|Snake|1010,15,40000,20000,Mob018-3::On1010
-018-3.gat,98,75,1,2|monster|Fire skull|1023,1,120000,30000,Mob018-3::On1023
-018-3.gat,100,75,1,2|monster|Poison skull|1024,1,120000,30000,Mob018-3::On1024
-018-3.gat,171,95,15,19|monster|Black scorpion|1009,5,60000,30000,Mob018-3::On1009
-018-3.gat,134,87,17,7|monster|Red slime|1008,10,60000,30000,Mob018-3::On1008
+018-3.gat,98,75,1,2|monster|Fire Skull|1023,1,120000,30000,Mob018-3::On1023
+018-3.gat,100,75,1,2|monster|Poison Skull|1024,1,120000,30000,Mob018-3::On1024
+018-3.gat,171,95,15,19|monster|Black Scorpion|1009,5,60000,30000,Mob018-3::On1009
+018-3.gat,134,87,17,7|monster|Red Slime|1008,10,60000,30000,Mob018-3::On1008
018-3.gat,59,95,11,8|monster|Spider|1012,15,60000,30000,Mob018-3::On1012
-018-3.gat,77,92,23,7|monster|Black scorpion|1009,15,60000,30000,Mob018-3::On1009
+018-3.gat,77,92,23,7|monster|Black Scorpion|1009,15,60000,30000,Mob018-3::On1009
018-3.gat,94,55,16,8|monster|Snake|1010,5,60000,30000,Mob018-3::On1010
018-3.gat,133,39,12,17|monster|Spider|1012,10,60000,30000,Mob018-3::On1012
018-3.gat,111,33,30,16|monster|Snake|1010,15,60000,30000,Mob018-3::On1010
diff --git a/world/map/npc/018-3/_warps.txt b/world/map/npc/018-3/_warps.txt
index 4db72c80..851be1d3 100644
--- a/world/map/npc/018-3/_warps.txt
+++ b/world/map/npc/018-3/_warps.txt
@@ -1,24 +1,24 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-018-3.gat,49,98|warp|toOutside|-1,-1,018-1.gat,128,57
-018-3.gat,123,165|warp|toOutside|-1,-1,018-1.gat,90,43
-018-3.gat,70,104|warp|toOutside|-1,-1,018-1.gat,69,55
-018-3.gat,50,88|warp|toCave|-1,-1,013-3.gat,69,142
-018-3.gat,146,161|warp|toOutside|0,-1,018-1.gat,153,47
-018-3.gat,64,102|warp|toOutside|-1,-1,018-1.gat,158,35
-018-3.gat,29,165|warp|toOutside|-1,-1,018-1.gat,162,45
-018-3.gat,97,69|warp|toCave|-1,-1,013-3.gat,178,43
-018-3.gat,27,54|warp|toCave|-1,-1,013-3.gat,169,44
-018-3.gat,134,61|warp|toCave|-1,-1,013-3.gat,152,29
-018-3.gat,177,54|warp|toBasement|-1,-1,018-2.gat,114,20
-018-3.gat,172,21|warp|toCave|-1,-1,013-3.gat,123,103
-018-3.gat,177,21|warp|toCave|-1,-1,013-3.gat,147,103
-018-3.gat,27,91|warp|toCave|-1,-1,013-3.gat,158,67
-018-3.gat,90,50|warp|toCave|-1,-1,013-3.gat,67,50
-018-3.gat,71,122|warp|toCave|-1,-1,013-3.gat,111,41
-018-3.gat,174,85|warp|toCave|-1,-1,013-3.gat,62,99
-018-3.gat,102,69|warp|toCave|-1,-1,013-3.gat,68,96
-018-3.gat,179,179|warp|toCave|-1,-1,009-3.gat,157,31
+018-3.gat,100,133|warp|To Woodland Hills|0,-1,018-1.gat,79,60
+018-3.gat,44,39|warp|To Woodland Mining Camp|-1,-1,018-1.gat,112,62
+018-3.gat,49,100|warp|To Woodland Hills|-1,-1,018-1.gat,128,57
+018-3.gat,123,167|warp|To Woodland Mining Camp|-1,-1,018-1.gat,90,43
+018-3.gat,70,106|warp|To Woodland Hills|-1,-1,018-1.gat,69,55
+018-3.gat,50,88|warp|To Woodland Hills Cave|-1,-1,013-3.gat,69,142
+018-3.gat,145,163|warp|To Woodland Mining Camp|-1,-1,018-1.gat,153,47
+018-3.gat,64,104|warp|To Woodland Hills|-1,-1,018-1.gat,158,35
+018-3.gat,29,167|warp|To Woodland Mining Camp|-1,-1,018-1.gat,162,45
+018-3.gat,97,69|warp|To Fight Cave|-1,-1,013-3.gat,178,43
+018-3.gat,27,54|warp|To Woodland Hills Cave|-1,-1,013-3.gat,169,44
+018-3.gat,134,63|warp|To Fight Cave|-1,-1,013-3.gat,152,29
+018-3.gat,177,56|warp|To Woodland Mining Camp Indoor|-1,-1,018-2.gat,114,20
+018-3.gat,172,21|warp|To Woodland Hills Cave|-1,-1,013-3.gat,123,103
+018-3.gat,177,21|warp|To Jack O Cave|-1,-1,013-3.gat,147,103
+018-3.gat,27,91|warp|To Jack O Cave|-1,-1,013-3.gat,158,67
+018-3.gat,90,50|warp|To Fight Cave|-1,-1,013-3.gat,67,50
+018-3.gat,71,122|warp|To Black Scorpion Cave|-1,-1,013-3.gat,111,41
+018-3.gat,174,85|warp|To Woodland Hills Cave|-1,-1,013-3.gat,62,99
+018-3.gat,102,69|warp|To Woodland Hills Cave|-1,-1,013-3.gat,68,96
+018-3.gat,179,181|warp|To Hurnscald Cave|-1,-1,009-3.gat,157,31
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index 1f34bb11..150c88f6 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -2,8 +2,8 @@
// 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,0|monster|Santa Slime|1015,10,0,0,Mob019-1::On1015
+019-1.gat,0,0,0,0|monster|Rudolph Slime|1016,25,0,0,Mob019-1::On1016
019-1.gat,0,0,0|script|Mob019-1|-1,{
diff --git a/world/map/npc/019-1/_warps.txt b/world/map/npc/019-1/_warps.txt
index 721925cb..427bf5d6 100644
--- a/world/map/npc/019-1/_warps.txt
+++ b/world/map/npc/019-1/_warps.txt
@@ -1,7 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-019-1.gat,96,40|warp|toCave|-1,-1,019-3.gat,98,27
-019-1.gat,38,75|warp|toCave2|-1,-1,019-3.gat,40,97
+019-1.gat,70,21|warp|To Nivalis|2,-1,020-1.gat,70,127
+019-1.gat,61,102|warp|To Snow Field|2,-1,030-1.gat,61,28
+019-1.gat,96,40|warp|To Snow Cave|-1,-1,019-3.gat,98,26
+019-1.gat,38,75|warp|To Snow Cave|-1,-1,019-3.gat,39,97
+019-1.gat,109,104|warp|To Snow Field|-1,-1,030-1.gat,109,30
diff --git a/world/map/npc/019-3/_mobs.txt b/world/map/npc/019-3/_mobs.txt
index 5360bf33..1592d3dc 100644
--- a/world/map/npc/019-3/_mobs.txt
+++ b/world/map/npc/019-3/_mobs.txt
@@ -2,7 +2,7 @@
// Snow Cave mobs
019-3.gat,0,0,0,0|monster|Moggun|1061,10,100000,30000,Mob019-3::On1061
-019-3.gat,0,0,0,0|monster|Bats|1017,50,100000,30000,Mob019-3::On1017
+019-3.gat,0,0,0,0|monster|Bat|1017,50,100000,30000,Mob019-3::On1017
019-3.gat,0,0,0|script|Mob019-3|-1,{
diff --git a/world/map/npc/019-3/_warps.txt b/world/map/npc/019-3/_warps.txt
index 169b7002..7f3eea50 100644
--- a/world/map/npc/019-3/_warps.txt
+++ b/world/map/npc/019-3/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Snow Cave warps
-019-3.gat,40,99|warp|WarpOutside1|-1,-1,019-1.gat,38,73
-019-3.gat,98,25|warp|warpOutside2|-1,-1,019-1.gat,96,38
+019-3.gat,40,98|warp|To Snow Field|-1,-1,019-1.gat,37,74
+019-3.gat,98,25|warp|To Snow Field|-1,-1,019-1.gat,96,39
diff --git a/world/map/npc/020-1/_warps.txt b/world/map/npc/020-1/_warps.txt
index f86e4966..b63439ea 100644
--- a/world/map/npc/020-1/_warps.txt
+++ b/world/map/npc/020-1/_warps.txt
@@ -1,12 +1,11 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Nivalis warps
-020-1.gat,76,38|warp|ToIceCave|1,-1,020-3.gat,31,28
-020-1.gat,47,48|warp|ToClothesShop|-1,-1,020-2.gat,25,33
-020-1.gat,66,52|warp|ToHouse|-1,-1,020-2.gat,72,68
-020-1.gat,70,127|warp|toSnowField|2,-1,019-1.gat,70,22
-020-1.gat,64,82|warp|toInn|-1,-1,020-2.gat,111,31
-020-1.gat,86,46|warp|toWeaponShop|-1,-1,020-2.gat,32,72
-020-1.gat,56,90|warp|ToPotionsShop|-1,-1,020-2.gat,66,25
-020-1.gat,70,127|warp|toSnowField|2,-1,019-1.gat,70,22
-020-1.gat,107,55|warp|toPort|-1,-1,031-1.gat,38,55
+020-1.gat,76,38|warp|To Ice Cave|1,-1,020-3.gat,31,26
+020-1.gat,47,48|warp|To Nivalis Indoor|-1,-1,020-2.gat,25,35
+020-1.gat,66,52|warp|To Nivalis House|-1,-1,020-2.gat,72,70
+020-1.gat,64,82|warp|To Nivalis Inn|-1,-1,020-2.gat,111,32
+020-1.gat,86,46|warp|To Armory|-1,-1,020-2.gat,32,73
+020-1.gat,57,91|warp|To Nivalis Shop|-1,-1,020-2.gat,65,23
+020-1.gat,70,128|warp|To Snow Field|2,-1,019-1.gat,70,22
+020-1.gat,107,55|warp|To Nivalis Port|-1,-1,031-1.gat,38,55
diff --git a/world/map/npc/020-2/_import.txt b/world/map/npc/020-2/_import.txt
index 77e81574..0036f403 100644
--- a/world/map/npc/020-2/_import.txt
+++ b/world/map/npc/020-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 020-2: Nivalis
+// Map 020-2: Nivalis Indoor
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 020-2.gat
npc: npc/020-2/_mobs.txt
diff --git a/world/map/npc/020-2/_mobs.txt b/world/map/npc/020-2/_mobs.txt
index 96ac4c9f..01a67c89 100644
--- a/world/map/npc/020-2/_mobs.txt
+++ b/world/map/npc/020-2/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Nivalis mobs
+// Nivalis Indoor mobs
diff --git a/world/map/npc/020-2/_warps.txt b/world/map/npc/020-2/_warps.txt
index 983a168a..e5c61ebb 100644
--- a/world/map/npc/020-2/_warps.txt
+++ b/world/map/npc/020-2/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Nivalis warps
+// Nivalis Indoor warps
-020-2.gat,25,35|warp|ToOutside|-1,-1,020-1.gat,47,50
-020-2.gat,64,25|warp|ToOutside|-1,-1,020-1.gat,55,90
-020-2.gat,111,32|warp|ToOutside|-1,-1,020-1.gat,64,83
-020-2.gat,32,73|warp|ToOutside|-1,-1,020-1.gat,84,48
-020-2.gat,72,70|warp|ToOutside|-1,-1,020-1.gat,66,54
+020-2.gat,25,36|warp|To Outside|-1,-1,020-1.gat,47,49
+020-2.gat,64,23|warp|To Outside|-1,-1,020-1.gat,56,91
+020-2.gat,111,33|warp|To Outside|-1,-1,020-1.gat,64,83
+020-2.gat,32,74|warp|To Outside|-1,-1,020-1.gat,80,47
+020-2.gat,72,71|warp|To Outside|-1,-1,020-1.gat,66,53
diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt
index d28b5c88..47d1ca5f 100644
--- a/world/map/npc/020-3/_mobs.txt
+++ b/world/map/npc/020-3/_mobs.txt
@@ -2,7 +2,7 @@
// Ice cave mobs
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,40,49,34,7|monster|Pinkie|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
diff --git a/world/map/npc/020-3/_warps.txt b/world/map/npc/020-3/_warps.txt
index 17d1c1b3..4e33c532 100644
--- a/world/map/npc/020-3/_warps.txt
+++ b/world/map/npc/020-3/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Ice cave warps
-020-3.gat,31,25|warp|toOutside|-1,-1,020-1.gat,76,37
-020-3.gat,25,22|warp|toRightLowerCave|-1,-1,020-3.gat,97,101
-020-3.gat,97,99|warp|toLeftUpperCave|-1,-1,020-3.gat,25,24
-020-3.gat,28,57|warp|toLeftLowerCave|-1,-1,020-3.gat,33,100
-020-3.gat,49,33|warp|ToRightUpperCave|-1,-1,020-3.gat,110,55
-020-3.gat,33,98|warp|toLeftUpperCave|-1,-1,020-3.gat,28,54
-020-3.gat,110,57|warp|ToLeftUpperCave|-1,-1,020-3.gat,49,35
+020-3.gat,31,25|warp|To Nivalis|-1,-1,020-1.gat,76,37
+020-3.gat,25,22|warp|To Ice Cave|-1,-1,020-3.gat,97,100
+020-3.gat,97,99|warp|To Ice Entrance|-1,-1,020-3.gat,25,23
+020-3.gat,28,57|warp|To Ice Cave|-1,-1,020-3.gat,33,99
+020-3.gat,49,33|warp|To Ice Cave|-1,-1,020-3.gat,110,56
+020-3.gat,33,98|warp|To Ice Entrance|-1,-1,020-3.gat,28,56
+020-3.gat,110,57|warp|To Ice Entrance|-1,-1,020-3.gat,49,34
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index e2baf549..0bdd3fed 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -1,15 +1,15 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-021-1.gat,53,134|warp|toBuilding|-1,-1,021-2.gat,27,29
-021-1.gat,55,134|warp|toBuilding|-1,-1,021-2.gat,33,29
-021-1.gat,57,134|warp|toBuilding|-1,-1,021-2.gat,39,29
-021-1.gat,103,100|warp|toBakery|-1,-1,021-2.gat,91,27
+021-1.gat,55,146|warp|To South Tulimshar|3,-1,001-1.gat,44,21
+021-1.gat,136,147|warp|To South Tulimshar|0,-1,001-1.gat,125,22
+021-1.gat,53,134|warp|To Government Building|-1,-1,021-2.gat,27,29
+021-1.gat,55,134|warp|To Government Building|-1,-1,021-2.gat,33,29
+021-1.gat,57,134|warp|To Government Building|-1,-1,021-2.gat,39,29
+021-1.gat,103,100|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27
021-1.gat,103,96|warp|toBakery|-1,-1,021-2.gat,122,23
-021-1.gat,49,63|warp|toMagicSchool|3,-1,024-1.gat,86,72
-021-1.gat,53,99|warp|toTaylor|-1,-1,021-2.gat,25,66
-021-1.gat,52,95|warp|toTaylor|-1,-1,021-2.gat,23,98
-021-1.gat,73,20|warp|ToNorthTulimshar|3,-1,022-1.gat,73,107
-021-1.gat,113,20|warp|ToNorthTulimshar|3,-1,022-1.gat,113,107
+021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73
+021-1.gat,53,99|warp|To Tulimshar Forge|-1,-1,021-2.gat,25,66
+021-1.gat,52,95|warp|To Tulimshar Forge|-1,-1,021-2.gat,23,98
+021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109
+021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109
diff --git a/world/map/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt
index 9dc3ac4b..f7bb7eb1 100644
--- a/world/map/npc/021-2/_import.txt
+++ b/world/map/npc/021-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 021-2: Tulimshar
+// Map 021-2: North Tulimshar Indoor
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 021-2.gat
npc: npc/021-2/_mobs.txt
diff --git a/world/map/npc/021-2/_mobs.txt b/world/map/npc/021-2/_mobs.txt
index 4fa557c8..d45ca8be 100644
--- a/world/map/npc/021-2/_mobs.txt
+++ b/world/map/npc/021-2/_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 Indoor mobs
diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt
index 786d5835..3204033a 100644
--- a/world/map/npc/021-2/_warps.txt
+++ b/world/map/npc/021-2/_warps.txt
@@ -1,14 +1,14 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar warps
+// North Tulimshar Indoor warps
-021-2.gat,27,30|warp|toOutside|-1,-1,021-1.gat,53,135
-021-2.gat,33,30|warp|toOutside|-1,-1,021-1.gat,55,135
-021-2.gat,39,30|warp|toOutside|-1,-1,021-1.gat,57,135
-021-2.gat,91,28|warp|toOutside|-1,-1,021-1.gat,103,101
-021-2.gat,122,24|warp|toOutside|-1,-1,021-1.gat,103,97
-021-2.gat,118,24|warp|to1stFloor|0,-1,021-2.gat,79,22
-021-2.gat,80,22|warp|to2ndFloor|0,-1,021-2.gat,118,23
-021-2.gat,23,99|warp|toOutside|-1,-1,021-1.gat,52,96
-021-2.gat,25,67|warp|toOutside|-1,-1,021-1.gat,53,100
-021-2.gat,46,97|warp|to1stFloor|0,-1,021-2.gat,45,58
-021-2.gat,46,57|warp|to2ndFloor|0,-1,021-2.gat,46,96
+021-2.gat,27,30|warp|To Outside|-1,-1,021-1.gat,53,135
+021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135
+021-2.gat,39,30|warp|To Outside|-1,-1,021-1.gat,57,135
+021-2.gat,91,28|warp|To Outside|-1,-1,021-1.gat,103,101
+021-2.gat,122,24|warp|To Roof|-1,-1,021-1.gat,103,97
+021-2.gat,118,24|warp|To First Floor|0,-1,021-2.gat,79,23
+021-2.gat,80,22|warp|To Second Floor|0,-1,021-2.gat,117,23
+021-2.gat,23,99|warp|To Roof|-1,-1,021-1.gat,52,96
+021-2.gat,25,67|warp|To Outside|-1,-1,021-1.gat,53,100
+021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58
+021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96
diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
index ef720469..2b39a96d 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 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
+022-1.gat,73,110|warp|To North Tulimshar|3,-1,021-1.gat,73,23
+022-1.gat,113,110|warp|To North Tulimshar|3,-1,021-1.gat,113,23
diff --git a/world/map/npc/024-1/_mobs.txt b/world/map/npc/024-1/_mobs.txt
index eb00caac..cffd26aa 100644
--- a/world/map/npc/024-1/_mobs.txt
+++ b/world/map/npc/024-1/_mobs.txt
@@ -6,7 +6,7 @@
024-1.gat,90,37,10,7|monster|Maggot|1002,4,100000,30000,Mob024-1::On1002
024-1.gat,96,25,3,10|monster|Sea Sime|1033,1,100000,30000,Mob024-1::On1033
024-1.gat,33,45,24,20|monster|Black Scorpion|1009,3,100000,30000,Mob024-1::On1009
-024-1.gat,93,35,5,6|monster|Gian Maggot|1006,1,100000,30000,Mob024-1::On1006
+024-1.gat,93,35,5,6|monster|Giant Maggot|1006,1,100000,30000,Mob024-1::On1006
024-1.gat,63,54,3,6|monster|Maggot|1002,1,100000,30000,Mob024-1::On1002
diff --git a/world/map/npc/024-1/_warps.txt b/world/map/npc/024-1/_warps.txt
index 23d36809..b2c4babf 100644
--- a/world/map/npc/024-1/_warps.txt
+++ b/world/map/npc/024-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar Canyon warps
-024-1.gat,86,73|warp|toCentralTulimshar|3,-1,021-1.gat,49,64
-024-1.gat,80,48|warp|toBuilding|0,-1,024-2.gat,26,26
-024-1.gat,86,48|warp|toBuilding|-1,-1,024-2.gat,42,27
+024-1.gat,86,74|warp|To North Tulimshar|3,-1,021-1.gat,49,65
+024-1.gat,80,48|warp|To Tulimshar Magic School|0,-1,024-2.gat,26,26
+024-1.gat,86,48|warp|To Tulimshar Magic School|-1,-1,024-2.gat,42,27
diff --git a/world/map/npc/024-2/_warps.txt b/world/map/npc/024-2/_warps.txt
index 21e15afb..b6e41de6 100644
--- a/world/map/npc/024-2/_warps.txt
+++ b/world/map/npc/024-2/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar Magic School warps
-024-2.gat,26,27|warp|toOutside|0,-1,024-1.gat,79,49
-024-2.gat,42,28|warp|toOutside|-1,-1,024-1.gat,86,49
+024-2.gat,26,27|warp|To Tulimshar Canyon|0,-1,024-1.gat,80,49
+024-2.gat,42,28|warp|To Outside|-1,-1,024-1.gat,86,49
diff --git a/world/map/npc/025-1/_mobs.txt b/world/map/npc/025-1/_mobs.txt
index e57f0e8e..09e14b8a 100644
--- a/world/map/npc/025-1/_mobs.txt
+++ b/world/map/npc/025-1/_mobs.txt
@@ -3,12 +3,12 @@
025-1.gat,100,60,56,79|monster|Clover Patch|1037,3,30000,10000,Mob025-1::On1037
025-1.gat,56,96,13,5|monster|Clover Patch|1037,1,1200000,10000,Mob025-1::On1037
-025-1.gat,56,36,77,33|monster|Alizarin Plant|1032,2,240000,12000,Mob025-1::On1032
+025-1.gat,56,35,77,33|monster|Alizarin Herb|1032,2,240000,12000,Mob025-1::On1032
025-1.gat,55,62,24,13|monster|Snail|1041,7,30000,12000,Mob025-1::On1041
025-1.gat,38,84,37,31|monster|Silkworm|1035,18,40000,300,Mob025-1::On1035
025-1.gat,96,47,63,55|monster|Log Head|1025,14,18000,3000,Mob025-1::On1025
-025-1.gat,73,61,106,83|monster|PinkFlower|1014,34,20000,5000,Mob025-1::On1014
-025-1.gat,73,61,107,82|monster|Spiky Mushroom|1019,40,90000,500,Mob025-1::On1019
+025-1.gat,0,0,0,0|monster|Pink Flower|1014,34,20000,5000,Mob025-1::On1014
+025-1.gat,0,0,0,0|monster|Spiky Mushroom|1019,40,90000,500,Mob025-1::On1019
025-1.gat,101,53,55,65|monster|Squirrel|1038,18,60000,9000,Mob025-1::On1038
025-1.gat,26,61,15,85|monster|Scorpion|1003,12,100000,50000,Mob025-1::On1003
diff --git a/world/map/npc/025-1/_warps.txt b/world/map/npc/025-1/_warps.txt
index b5166b89..63c30e13 100644
--- a/world/map/npc/025-1/_warps.txt
+++ b/world/map/npc/025-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland Swamp warps
-025-1.gat,19,66|warp|toSwamp|-1,-1,026-1.gat,128,66
-025-1.gat,90,19|warp|toWoodland|2,-1,015-1.gat,59,100
-025-1.gat,130,58|warp|toWoodland|-1,1,016-1.gat,20,53
+025-1.gat,19,66|warp|To Swamp|-1,-1,026-1.gat,128,66
+025-1.gat,90,19|warp|To Woodland|2,-1,015-1.gat,59,100
+025-1.gat,130,58|warp|To Woodland|-1,1,016-1.gat,21,53
diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt
index 3b7e395d..36e60dba 100644
--- a/world/map/npc/025-3/_mobs.txt
+++ b/world/map/npc/025-3/_mobs.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Rossy Main Hall mobs
-025-3.gat,0,0,0,0|monster|CaveMaggot|1056,100,0,100,Mob025-3::On1056
+025-3.gat,0,0,0,0|monster|Cave Maggot|1056,100,0,100,Mob025-3::On1056
025-3.gat,0,0,0,0|monster|Archant|1060,20,0,100,Mob025-3::On1060
-025-3.gat,0,0,0,0|monster|AngryScorpion|1057,25,0,0,Mob025-3::On1057
+025-3.gat,0,0,0,0|monster|Angry Scorpion|1057,25,0,0,Mob025-3::On1057
025-3.gat,69,153,13,1|monster|Skeleton|1043,1,0,30000,Mob025-3::On1043
diff --git a/world/map/npc/025-3/_warps.txt b/world/map/npc/025-3/_warps.txt
index 83648ab3..d474997a 100644
--- a/world/map/npc/025-3/_warps.txt
+++ b/world/map/npc/025-3/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Rossy Main Hall warps
-025-3.gat,112,98|warp|ToOutside|1,-1,025-1.gat,42,81
-025-3.gat,105,86|warp|ToHelper|-1,-1,025-4.gat,28,36
+025-3.gat,112,98|warp|To Woodland Swamp|1,-1,025-1.gat,42,81
+025-3.gat,105,86|warp|To Clauquer's Cave|-1,-1,025-4.gat,28,36
diff --git a/world/map/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt
index 16893437..7f18439c 100644
--- a/world/map/npc/025-4/_mobs.txt
+++ b/world/map/npc/025-4/_mobs.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Rossy Battle Caves mobs
-025-4.gat,29,31,20,14|monster|CaveMaggot|1056,3,0,0,Mob025-4::On1056
-025-4.gat,94,24,20,21|monster|CaveMaggot|1056,5,0,0,Mob025-4::On1056
+025-4.gat,29,31,20,14|monster|Cave Maggot|1056,3,0,0,Mob025-4::On1056
+025-4.gat,94,24,20,21|monster|Cave Maggot|1056,5,0,0,Mob025-4::On1056
025-4.gat,0,0,0|script|Mob025-4|-1,{
diff --git a/world/map/npc/025-4/_warps.txt b/world/map/npc/025-4/_warps.txt
index fb9998a1..91526eef 100644
--- a/world/map/npc/025-4/_warps.txt
+++ b/world/map/npc/025-4/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Rossy Battle Caves warps
-025-4.gat,28,37|warp|ToMainHall|-1,-1,025-3.gat,105,87
+025-4.gat,28,37|warp|To Rossy Main Hall|-1,-1,025-3.gat,105,87
diff --git a/world/map/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt
index 59f0da22..d92d8e46 100644
--- a/world/map/npc/026-1/_mobs.txt
+++ b/world/map/npc/026-1/_mobs.txt
@@ -1,14 +1,14 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Swamp mobs
-026-1.gat,70,58,111,83|monster|Wisp|1040,34,120000,40000,Mob026-1::On1040
-026-1.gat,70,59,110,84|monster|Spectre|1042,34,120000,40000,Mob026-1::On1042
-026-1.gat,69,59,109,85|monster|Poltergeist|1047,34,120000,40000,Mob026-1::On1047
-026-1.gat,71,58,112,82|monster|Silkworm|1035,10,300000,60000,Mob026-1::On1035
-026-1.gat,69,60,108,86|monster|Scorpion|1003,15,300000,30000,Mob026-1::On1003
-026-1.gat,71,57,113,81|monster|Skeleton|1043,5,900000,10000,Mob026-1::On1043
-026-1.gat,68,61,106,88|monster|LadySkeleton|1044,5,900000,20000,Mob026-1::On1044
-026-1.gat,68,60,107,87|monster|Log Head|1025,8,300000,40000,Mob026-1::On1025
+026-1.gat,0,0,0,0|monster|Wisp|1040,34,120000,40000,Mob026-1::On1040
+026-1.gat,0,0,0,0|monster|Spectre|1042,34,120000,40000,Mob026-1::On1042
+026-1.gat,0,0,0,0|monster|Poltergeist|1047,34,120000,40000,Mob026-1::On1047
+026-1.gat,0,0,0,0|monster|Silkworm|1035,10,300000,60000,Mob026-1::On1035
+026-1.gat,0,0,0,0|monster|Scorpion|1003,15,300000,30000,Mob026-1::On1003
+026-1.gat,0,0,0,0|monster|Skeleton|1043,5,900000,10000,Mob026-1::On1043
+026-1.gat,0,0,0,0|monster|Lady Skeleton|1044,5,900000,20000,Mob026-1::On1044
+026-1.gat,0,0,0,0|monster|Log Head|1025,8,300000,40000,Mob026-1::On1025
026-1.gat,0,0,0|script|Mob026-1|-1,{
diff --git a/world/map/npc/026-1/_warps.txt b/world/map/npc/026-1/_warps.txt
index 63319686..723e5ba0 100644
--- a/world/map/npc/026-1/_warps.txt
+++ b/world/map/npc/026-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Swamp warps
-026-1.gat,63,16|warp|toGraveyard|-1,-1,027-1.gat,63,105
-026-1.gat,129,66|warp|toSwamp|-1,-1,025-1.gat,20,66
+026-1.gat,63,16|warp|To Graveyard|-1,-1,027-1.gat,63,105
+026-1.gat,129,66|warp|To Woodland Swamp|-1,-1,025-1.gat,20,66
diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index 46dc3fe9..22342bd7 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -4,20 +4,20 @@
027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000,60000,Mob027-1::On1047
027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000,60000,Mob027-1::On1042
027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000,60000,Mob027-1::On1040
-027-1.gat,54,53,66,46|monster|FireSkull|1023,2,60000,20000,Mob027-1::On1023
-027-1.gat,54,53,66,46|monster|PoisonSkull|1024,1,60000,20000,Mob027-1::On1024
+027-1.gat,54,53,66,46|monster|Fire Skull|1023,2,60000,20000,Mob027-1::On1023
+027-1.gat,54,53,66,46|monster|Poison Skull|1024,1,60000,20000,Mob027-1::On1024
027-1.gat,54,53,66,46|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
-027-1.gat,54,53,66,46|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
+027-1.gat,54,53,66,46|monster|Lady Skeleton|1044,2,60000,8000,Mob027-1::On1044
027-1.gat,71,41,31,22|monster|Skeleton|1043,2,175000,20000,Mob027-1::On1043
-027-1.gat,71,41,31,22|monster|LadySkeleton|1044,2,175000,20000,Mob027-1::On1044
-027-1.gat,37,41,33,22|monster|FireSkull|1023,2,200000,10000,Mob027-1::On1023
-027-1.gat,37,41,33,22|monster|PoisonSkull|1024,2,200000,10000,Mob027-1::On1024
+027-1.gat,71,41,31,22|monster|Lady Skeleton|1044,2,175000,20000,Mob027-1::On1044
+027-1.gat,37,41,33,22|monster|Fire Skull|1023,2,200000,10000,Mob027-1::On1023
+027-1.gat,37,41,33,22|monster|Poison Skull|1024,2,200000,10000,Mob027-1::On1024
027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000,20000,Mob027-1::On1043
-027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000,20000,Mob027-1::On1044
-027-1.gat,105,40,32,21|monster|Fire skull|1023,1,28000,25000,Mob027-1::On1023
-027-1.gat,105,40,32,21|monster|Poison skull|1024,1,30000,20000,Mob027-1::On1024
+027-1.gat,37,41,33,22|monster|Lady Skeleton|1044,4,180000,20000,Mob027-1::On1044
+027-1.gat,105,40,32,21|monster|Fire Skull|1023,1,28000,25000,Mob027-1::On1023
+027-1.gat,105,40,32,21|monster|Poison Skull|1024,1,30000,20000,Mob027-1::On1024
027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000,20000,Mob027-1::On1043
-027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000,25000,Mob027-1::On1044
+027-1.gat,105,40,32,21|monster|Lady Skeleton|1044,3,33000,25000,Mob027-1::On1044
027-1.gat,28,67,2,1|monster|Jack O|1022,1,265000,200000,Mob027-1::On1022
diff --git a/world/map/npc/027-1/_warps.txt b/world/map/npc/027-1/_warps.txt
index 54433d75..a13804da 100644
--- a/world/map/npc/027-1/_warps.txt
+++ b/world/map/npc/027-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Graveyard warps
-027-1.gat,88,84|warp|toCaretaker's|-1,-1,027-2.gat,26,32
-027-1.gat,63,106|warp|toSwamp|-1,-1,026-1.gat,63,17
+027-1.gat,88,84|warp|To Caretaker's House|-1,-1,027-2.gat,26,33
+027-1.gat,63,106|warp|To Swamp|-1,-1,026-1.gat,63,17
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index b0c56143..4f2819c6 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -1,12 +1,12 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-027-2.gat,110,26,11,11|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
-027-2.gat,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
-027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
-027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
+027-2.gat,81,41,11,9|monster|Drunken Skeleton|1077,1,100000,30000,Mob027-2::On1077
+027-2.gat,91,38,11,9|monster|Tipsy Skeleton|1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,110,26,11,11|monster|Tipsy Skeleton|1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,104,28,11,9|monster|Drunken Skeleton|1077,1,100000,30000,Mob027-2::On1077
+027-2.gat,89,34,11,9|monster|Drunken Lady Skeleton|1079,1,100000,30000,Mob027-2::On1079
+027-2.gat,116,26,11,9|monster|Drunken Lady Skeleton|1079,1,100000,30000,Mob027-2::On1079
027-2.gat,0,0,0|script|Mob027-2|-1,{
diff --git a/world/map/npc/027-2/_warps.txt b/world/map/npc/027-2/_warps.txt
index e9b9cdbc..43840de9 100644
--- a/world/map/npc/027-2/_warps.txt
+++ b/world/map/npc/027-2/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-027-2.gat,75,95|warp|To1stFloor|0,-1,027-2.gat,127,37
-027-2.gat,106,46|warp|ToOutside|0,-1,027-1.gat,68,89
+027-2.gat,26,34|warp|To Outside|-1,-1,027-1.gat,88,85
+027-2.gat,128,35|warp|To Second Floor|0,-1,027-2.gat,75,93
+027-2.gat,76,95|warp|To First Floor|0,-1,027-2.gat,128,36
+027-2.gat,106,46|warp|To Outside|0,-1,027-1.gat,68,89
diff --git a/world/map/npc/027-3/_warps.txt b/world/map/npc/027-3/_warps.txt
index 4c82a1b0..51e3727d 100644
--- a/world/map/npc/027-3/_warps.txt
+++ b/world/map/npc/027-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Crypt warps
-027-3.gat,127,44|warp|toCryptLevel2|1,-1,027-4.gat,37,21
+027-3.gat,127,44|warp|To Crypt Level 2|1,-1,027-4.gat,37,20
diff --git a/world/map/npc/027-4/_warps.txt b/world/map/npc/027-4/_warps.txt
index 12d06b2f..8615d220 100644
--- a/world/map/npc/027-4/_warps.txt
+++ b/world/map/npc/027-4/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Inner Chamber warps
-027-4.gat,37,19|warp|toCryptLevel1|1,-1,027-3.gat,127,42
+027-4.gat,37,19|warp|To Crypt Level 1|1,-1,027-3.gat,127,43
diff --git a/world/map/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt
index b8ccf404..18dd5ccc 100644
--- a/world/map/npc/028-1/_mobs.txt
+++ b/world/map/npc/028-1/_mobs.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Easter Island mobs
-028-1.gat,115,72,27,25|monster|SpikyMushrooms|1019,18,20000,600,Mob028-1::On1019
+028-1.gat,115,72,27,25|monster|Spiky Mushroom|1019,18,20000,600,Mob028-1::On1019
028-1.gat,83,69,25,19|monster|Bat|1017,18,100000,1200,Mob028-1::On1017
028-1.gat,93,33,48,32|monster|Wisp|1040,8,200000,15000,Mob028-1::On1040
028-1.gat,93,33,46,34|monster|Spectre|1042,8,200000,15000,Mob028-1::On1042
diff --git a/world/map/npc/028-1/_warps.txt b/world/map/npc/028-1/_warps.txt
index c32b6886..2ff66202 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.
// Easter Island warps
-028-1.gat,114,122|warp|To028-3|-1,-1,028-3.gat,33,78
+028-1.gat,114,122|warp|To Easter Island Cave|-1,-1,028-3.gat,33,77
diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt
index 3f025144..2816948d 100644
--- a/world/map/npc/028-3/_mobs.txt
+++ b/world/map/npc/028-3/_mobs.txt
@@ -2,8 +2,8 @@
// 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
-028-3.gat,27,31,1,1|monster|EvilMushroom|1013,3,40000,5000,Mob028-3::On1013
+028-3.gat,43,35,1,1|monster|Evil Mushroom|1013,3,40000,5000,Mob028-3::On1013
+028-3.gat,27,31,1,1|monster|Evil Mushroom|1013,3,40000,5000,Mob028-3::On1013
028-3.gat,50,49,61,60|monster|Bat|1017,10,60000,10000,Mob028-3::On1017
diff --git a/world/map/npc/028-3/_warps.txt b/world/map/npc/028-3/_warps.txt
index 3f5a7eb4..0f8ddaf3 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.
// Easter Island Cave warps
-028-3.gat,33,78|warp|To028-1|-1,-1,028-1.gat,114,122
+028-3.gat,33,78|warp|To Easter Island|-1,-1,028-1.gat,114,123
diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt
index bfc5023a..cfa726b8 100644
--- a/world/map/npc/029-1/_mobs.txt
+++ b/world/map/npc/029-1/_mobs.txt
@@ -1,12 +1,12 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
+029-1.gat,69,65,12,13|monster|Evil Mushroom|1013,4,20000,60000,Mob029-1::On1013
+029-1.gat,32,33,12,13|monster|Squirrel|1038,3,30000,60000,Mob029-1::On1038
029-1.gat,46,48,4,1|monster|Clover Patch|1037,1,10000,120000,Mob029-1::On1037
-029-1.gat,36,59,22,20|monster|Spiky Mushroom|1019,5,10000,30000,Mob029-1::On1019
-029-1.gat,53,35,17,17|monster|Bats|1017,4,25000,30000,Mob029-1::On1017
-029-1.gat,59,51,13,9|monster|Log heads|1025,2,25000,30000,Mob029-1::On1025
+029-1.gat,37,60,22,20|monster|Spiky Mushroom|1019,5,10000,30000,Mob029-1::On1019
+029-1.gat,54,36,17,18|monster|Bat|1017,4,25000,30000,Mob029-1::On1017
+029-1.gat,59,51,13,9|monster|Log Head|1025,2,25000,30000,Mob029-1::On1025
029-1.gat,0,0,0|script|Mob029-1|-1,{
diff --git a/world/map/npc/030-1/_warps.txt b/world/map/npc/030-1/_warps.txt
index 55c7df36..937c545c 100644
--- a/world/map/npc/030-1/_warps.txt
+++ b/world/map/npc/030-1/_warps.txt
@@ -1,4 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Snow Field warps
-030-1.gat,61,28|warp|toSnowfield|0,-1,019-1.gat,61,100
+030-1.gat,61,27|warp|To Snow Field|2,-1,019-1.gat,61,101
+030-1.gat,109,29|warp|To Snow Field|-1,-1,019-1.gat,109,103
diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index 7a603257..1c843eec 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-031-1.gat,89,74,86,110|monster|Fluffy|1020,15,100000,30000,Mob031-1::On1020
+031-1.gat,0,0,0,0|monster|Santa Slime|1015,5,100000,30000,Mob031-1::On1015
+031-1.gat,0,0,0,0|monster|Squirrel|1038,10,100000,30000,Mob031-1::On1038
+031-1.gat,0,0,0,0|monster|Fluffy|1020,15,100000,30000,Mob031-1::On1020
031-1.gat,0,0,0|script|Mob031-1|-1,{
diff --git a/world/map/npc/031-1/_warps.txt b/world/map/npc/031-1/_warps.txt
index 809267a9..8becf0e4 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.
// 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
+031-1.gat,37,55|warp|To Nivalis|-1,-1,020-1.gat,106,55
+031-1.gat,76,24|warp|To Ice Labyrinth|-1,-1,031-3.gat,212,299
diff --git a/world/map/npc/031-2/_warps.txt b/world/map/npc/031-2/_warps.txt
index 56df8588..88ff0d61 100644
--- a/world/map/npc/031-2/_warps.txt
+++ b/world/map/npc/031-2/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Angela's House warps
-031-2.gat,23,30|warp|door|-1,-1,031-1.gat,95,82
+031-2.gat,23,30|warp|To Outside|-1,-1,031-1.gat,95,81
diff --git a/world/map/npc/031-3/_import.txt b/world/map/npc/031-3/_import.txt
index d2d83387..1d0b99f8 100644
--- a/world/map/npc/031-3/_import.txt
+++ b/world/map/npc/031-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 031-3: Ice Caves
+// Map 031-3: Ice Labyrinth
// 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 4ab99cfd..5815a10d 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -1,44 +1,43 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Ice Caves mobs
+// Ice Labyrinth 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
-031-3.gat,195,277,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,230,279,25,26|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,195,277,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
-031-3.gat,37,213,27,23|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
-031-3.gat,35,212,27,23|monster|bat|1017,11,100000,30000,Mob031-3::On1017
+031-3.gat,37,213,27,23|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,35,212,27,23|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
031-3.gat,38,147,44,68|monster|Moggun|1061,19,100000,30000,Mob031-3::On1061
031-3.gat,97,261,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061
031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061
-031-3.gat,36,148,64,43|monster|bat|1017,11,100000,30000,Mob031-3::On1017
-031-3.gat,97,277,22,42|monster|bat|1017,11,100000,30000,Mob031-3::On1017
-031-3.gat,148,282,22,42|monster|bat|1017,11,100000,30000,Mob031-3::On1017
+031-3.gat,36,148,64,43|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
+031-3.gat,97,277,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
+031-3.gat,148,282,22,42|monster|Bat|1017,11,100000,30000,Mob031-3::On1017
031-3.gat,142,266,29,16|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
-031-3.gat,145,293,25,26|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,144,216,29,44|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,98,214,39,44|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,99,214,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
-031-3.gat,198,144,29,53|monster|IceGoblin|1058,4,100000,30000,Mob031-3::On1058
+031-3.gat,145,293,25,26|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,144,216,29,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,98,214,39,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,99,214,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,198,144,29,53|monster|Ice Goblin|1058,4,100000,30000,Mob031-3::On1058
031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000,30000,Mob031-3::On1061
031-3.gat,142,266,29,16|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
031-3.gat,283,286,33,30|monster|Santa Slime|1015,3,100000,30000,Mob031-3::On1015
-031-3.gat,278,282,33,14|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,278,282,33,14|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,98,214,39,44|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,285,218,8,75|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,278,282,33,14|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,98,214,39,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,285,218,8,75|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
031-3.gat,283,217,41,64|monster|Bat|1017,15,100000,30000,Mob031-3::On1017
031-3.gat,282,237,63,20|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
-031-3.gat,229,226,27,34|monster|yeti|1072,3,100000,30000,Mob031-3::On1072
-031-3.gat,230,227,12,42|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058
-031-3.gat,209,199,12,17|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
-031-3.gat,193,216,12,17|monster|yeti|1072,1,100000,30000,Mob031-3::On1072
+031-3.gat,229,226,27,34|monster|Yeti|1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,230,227,12,42|monster|Ice Goblin|1058,5,100000,30000,Mob031-3::On1058
+031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,193,216,12,17|monster|Yeti|1072,1,100000,30000,Mob031-3::On1072
031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
031-3.gat,213,282,66,43|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
031-3.gat,199,200,45,14|monster|Bat|1017,13,100000,30000,Mob031-3::On1017
-031-3.gat,209,199,12,17|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
-031-3.gat,144,216,29,44|monster|iceelement|1071,2,100000,30000,Mob031-3::On1071
-031-3.gat,234,141,18,19|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,144,216,29,44|monster|Ice Element|1071,2,100000,30000,Mob031-3::On1071
+031-3.gat,234,141,18,19|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000,30000,Mob031-3::On1061
031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061
031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061
@@ -46,19 +45,19 @@
031-3.gat,284,143,40,48|monster|Moggun|1061,7,100000,30000,Mob031-3::On1061
031-3.gat,283,84,36,31|monster|Bat|1017,15,100000,30000,Mob031-3::On1017
031-3.gat,283,84,36,31|monster|Bat|1017,15,100000,30000,Mob031-3::On1017
-031-3.gat,274,81,15,32|monster|yeti|1072,2,100000,30000,Mob031-3::On1072
+031-3.gat,274,81,15,32|monster|Yeti|1072,2,100000,30000,Mob031-3::On1072
031-3.gat,40,53,44,68|monster|Moggun|1061,10,100000,30000,Mob031-3::On1061
-031-3.gat,120,160,85,30|monster|yeti|1072,4,100000,30000,Mob031-3::On1072
-031-3.gat,120,131,82,24|monster|yeti|1072,8,100000,30000,Mob031-3::On1072
-031-3.gat,107,130,25,26|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,145,160,25,24|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,94,167,25,24|monster|IceGoblin|1058,6,100000,30000,Mob031-3::On1058
-031-3.gat,282,37,31,28|monster|iceelement|1071,5,100000,30000,Mob031-3::On1071
-031-3.gat,213,36,64,32|monster|iceelement|1071,5,100000,30000,Mob031-3::On1071
-031-3.gat,228,83,31,28|monster|iceelement|1071,3,100000,30000,Mob031-3::On1071
-031-3.gat,283,138,15,13|monster|iceelement|1071,1,100000,30000,Mob031-3::On1071
-031-3.gat,198,83,31,28|monster|iceelement|1071,3,100000,30000,Mob031-3::On1071
-031-3.gat,214,75,25,26|monster|IceGoblin|1058,3,100000,30000,Mob031-3::On1058
+031-3.gat,120,160,85,30|monster|Yeti|1072,4,100000,30000,Mob031-3::On1072
+031-3.gat,120,131,82,24|monster|Yeti|1072,8,100000,30000,Mob031-3::On1072
+031-3.gat,107,130,25,26|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,145,160,25,24|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,94,167,25,24|monster|Ice Goblin|1058,6,100000,30000,Mob031-3::On1058
+031-3.gat,282,37,31,28|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
+031-3.gat,213,36,64,32|monster|Ice Element|1071,5,100000,30000,Mob031-3::On1071
+031-3.gat,228,83,31,28|monster|Ice Element|1071,3,100000,30000,Mob031-3::On1071
+031-3.gat,283,138,15,13|monster|Ice Element|1071,1,100000,30000,Mob031-3::On1071
+031-3.gat,198,83,31,28|monster|Ice Element|1071,3,100000,30000,Mob031-3::On1071
+031-3.gat,214,75,25,26|monster|Ice Goblin|1058,3,100000,30000,Mob031-3::On1058
031-3.gat,217,37,66,43|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
031-3.gat,39,52,64,56|monster|Bat|1017,5,100000,30000,Mob031-3::On1017
031-3.gat,38,277,64,56|monster|Bat|1017,10,100000,30000,Mob031-3::On1017
diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt
index 2aea5e67..14a0f28b 100644
--- a/world/map/npc/031-3/_warps.txt
+++ b/world/map/npc/031-3/_warps.txt
@@ -1,50 +1,50 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Ice Caves warps
+// Ice Labyrinth 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
-031-3.gat,149,259|warp|toCave|-1,-1,031-3.gat,205,266
-031-3.gat,225,282|warp|toCave|-1,-1,031-3.gat,274,299
-031-3.gat,274,300|warp|toCave|-1,-1,031-3.gat,225,283
-031-3.gat,283,271|warp|toCave|-1,-1,031-3.gat,269,244
-031-3.gat,269,245|warp|toCave|-1,-1,031-3.gat,283,272
-031-3.gat,148,150|warp|toCave|-1,-1,031-3.gat,128,134
-031-3.gat,139,258|warp|toCave|-1,-1,031-3.gat,155,196
-031-3.gat,155,195|warp|toCave|-1,-1,031-3.gat,139,259
-031-3.gat,142,301|warp|toCave|-1,-1,031-3.gat,97,298
-031-3.gat,97,301|warp|toCave|-1,-1,031-3.gat,142,298
-031-3.gat,135,196|warp|toCave|-1,-1,031-3.gat,106,231
-031-3.gat,106,232|warp|toCave|-1,-1,031-3.gat,135,197
-031-3.gat,286,190|warp|toCave|-1,-1,031-3.gat,227,241
-031-3.gat,227,242|warp|toCave|-1,-1,031-3.gat,286,191
-031-3.gat,236,211|warp|toCave|-1,-1,031-3.gat,187,227
-031-3.gat,187,228|warp|toCave|-1,-1,031-3.gat,236,212
-031-3.gat,94,254|warp|toCave|-1,-1,031-3.gat,54,253
-031-3.gat,54,250|warp|toCave|-1,-1,031-3.gat,94,257
-031-3.gat,103,199|warp|toCave|-1,-1,031-3.gat,52,175
-031-3.gat,52,177|warp|toCave|-1,-1,031-3.gat,103,201
-031-3.gat,212,193|warp|toCave|-1,-1,031-3.gat,207,165
-031-3.gat,207,168|warp|toCave|-1,-1,031-3.gat,212,195
-031-3.gat,235,167|warp|toCave|-1,-1,031-3.gat,195,124
-031-3.gat,195,122|warp|toCave|-1,-1,031-3.gat,235,165
-031-3.gat,296,97|warp|toCave|-1,-1,031-3.gat,292,125
-031-3.gat,292,123|warp|toCave|-1,-1,031-3.gat,296,95
-031-3.gat,289,164|warp|toCave|-1,-1,031-3.gat,228,123
-031-3.gat,228,121|warp|toCave|-1,-1,031-3.gat,289,162
-031-3.gat,24,157|warp|toCave|-1,-1,031-3.gat,31,142
-031-3.gat,31,144|warp|toCave|-1,-1,031-3.gat,24,159
-031-3.gat,36,249|warp|toCave|-1,-1,031-3.gat,35,224
-031-3.gat,35,226|warp|toCave|-1,-1,031-3.gat,36,251
-031-3.gat,34,25|warp|toCave|-1,-1,031-3.gat,281,25
-031-3.gat,281,22|warp|toCave|-1,-1,031-3.gat,34,28
-031-3.gat,283,48|warp|toCave|-1,-1,031-3.gat,275,74
-031-3.gat,275,73|warp|toCave|-1,-1,031-3.gat,283,47
-031-3.gat,26,178|warp|toCave|-1,-1,031-3.gat,36,202
-031-3.gat,36,200|warp|toCave|-1,-1,031-3.gat,26,176
-031-3.gat,91,125|warp|toCave|-1,-1,031-3.gat,36,78
-031-3.gat,36,80|warp|toCave|-1,-1,031-3.gat,91,127
-031-3.gat,52,78|warp|toCave|-1,-1,031-3.gat,192,72
-031-3.gat,192,70|warp|toCave|-1,-1,031-3.gat,52,76
-031-3.gat,128,135|warp|toCave|-1,-1,031-3.gat,148,152
-031-3.gat,232,93|warp|toCave|-1,-1,031-3.gat,200,47
-031-3.gat,200,50|warp|toCave|-1,-1,031-3.gat,232,90
+031-3.gat,212,300|warp|To Nivalis Port|-1,-1,031-1.gat,76,25
+031-3.gat,205,264|warp|To Ice Labyrinth|-1,-1,031-3.gat,150,260
+031-3.gat,149,259|warp|To Ice Labyrinth|-1,-1,031-3.gat,206,265
+031-3.gat,225,282|warp|To Ice Labyrinth|-1,-1,031-3.gat,274,299
+031-3.gat,274,300|warp|To Ice Labyrinth|-1,-1,031-3.gat,225,283
+031-3.gat,283,271|warp|To Ice Labyrinth|-1,-1,031-3.gat,269,244
+031-3.gat,269,245|warp|To Ice Labyrinth|-1,-1,031-3.gat,283,272
+031-3.gat,148,150|warp|To Ice Labyrinth|-1,-1,031-3.gat,128,134
+031-3.gat,139,258|warp|To Ice Labyrinth|-1,-1,031-3.gat,156,196
+031-3.gat,155,195|warp|To Ice Labyrinth|-1,-1,031-3.gat,139,259
+031-3.gat,142,301|warp|To Ice Labyrinth|-1,-1,031-3.gat,98,300
+031-3.gat,97,301|warp|To Ice Labyrinth|-1,-1,031-3.gat,143,300
+031-3.gat,135,196|warp|To Ice Labyrinth|-1,-1,031-3.gat,106,231
+031-3.gat,106,232|warp|To Ice Labyrinth|-1,-1,031-3.gat,135,197
+031-3.gat,286,190|warp|To Ice Labyrinth|-1,-1,031-3.gat,227,241
+031-3.gat,227,242|warp|To Ice Labyrinth|-1,-1,031-3.gat,286,191
+031-3.gat,236,211|warp|To Ice Labyrinth|-1,-1,031-3.gat,187,227
+031-3.gat,187,228|warp|To Ice Labyrinth|-1,-1,031-3.gat,236,212
+031-3.gat,94,254|warp|To Ice Labyrinth|-1,-1,031-3.gat,54,251
+031-3.gat,54,250|warp|To Ice Labyrinth|-1,-1,031-3.gat,94,255
+031-3.gat,103,199|warp|To Ice Labyrinth|-1,-1,031-3.gat,52,176
+031-3.gat,52,177|warp|To Ice Labyrinth|-1,-1,031-3.gat,103,200
+031-3.gat,212,193|warp|To Ice Labyrinth|-1,-1,031-3.gat,207,167
+031-3.gat,207,168|warp|To Ice Labyrinth|-1,-1,031-3.gat,212,194
+031-3.gat,235,167|warp|To Ice Labyrinth|-1,-1,031-3.gat,195,123
+031-3.gat,195,122|warp|To Ice Labyrinth|-1,-1,031-3.gat,235,166
+031-3.gat,296,97|warp|To Ice Labyrinth|-1,-1,031-3.gat,292,124
+031-3.gat,292,123|warp|To Ice Labyrinth|-1,-1,031-3.gat,296,96
+031-3.gat,289,164|warp|To Ice Labyrinth|-1,-1,031-3.gat,228,122
+031-3.gat,228,121|warp|To Ice Labyrinth|-1,-1,031-3.gat,289,163
+031-3.gat,24,157|warp|To Ice Labyrinth|-1,-1,031-3.gat,31,143
+031-3.gat,31,144|warp|To Ice Labyrinth|-1,-1,031-3.gat,24,158
+031-3.gat,36,249|warp|To Ice Labyrinth|-1,-1,031-3.gat,35,225
+031-3.gat,35,226|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,250
+031-3.gat,34,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,282,23
+031-3.gat,281,22|warp|To Ice Labyrinth|-1,-1,031-3.gat,34,26
+031-3.gat,283,48|warp|To Ice Labyrinth|-1,-1,031-3.gat,275,74
+031-3.gat,275,73|warp|To Ice Labyrinth|-1,-1,031-3.gat,283,47
+031-3.gat,26,178|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,201
+031-3.gat,36,200|warp|To Ice Labyrinth|-1,-1,031-3.gat,26,177
+031-3.gat,91,125|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,79
+031-3.gat,36,80|warp|To Ice Labyrinth|-1,-1,031-3.gat,91,126
+031-3.gat,52,78|warp|To Ice Labyrinth|-1,-1,031-3.gat,192,71
+031-3.gat,192,70|warp|To Ice Labyrinth|-1,-1,031-3.gat,52,77
+031-3.gat,128,135|warp|To Ice Labyrinth|-1,-1,031-3.gat,148,151
+031-3.gat,232,93|warp|To Ice Labyrinth|-1,-1,031-3.gat,234,26
+031-3.gat,234,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,232,92
diff --git a/world/map/npc/032-1/_mobs.txt b/world/map/npc/032-1/_mobs.txt
index dc68e34b..b557274a 100644
--- a/world/map/npc/032-1/_mobs.txt
+++ b/world/map/npc/032-1/_mobs.txt
@@ -1,9 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Outback mobs
-032-1.gat,47,64,27,15|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009
-032-1.gat,24,72,27,24|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009
-032-1.gat,24,48,25,21|monster|BlackScorpion|1009,5,30000,100000,Mob032-1::On1009
+032-1.gat,47,64,27,15|monster|Black Scorpion|1009,5,30000,100000,Mob032-1::On1009
+032-1.gat,24,72,27,24|monster|Black Scorpion|1009,5,30000,100000,Mob032-1::On1009
+032-1.gat,24,48,25,21|monster|Black Scorpion|1009,5,30000,100000,Mob032-1::On1009
032-1.gat,57,44,23,18|monster|Snake|1010,13,30000,100000,Mob032-1::On1010
032-1.gat,77,76,34,27|monster|Snake|1010,13,30000,100000,Mob032-1::On1010
diff --git a/world/map/npc/032-1/_warps.txt b/world/map/npc/032-1/_warps.txt
index 8ff6d19a..bdef5c3f 100644
--- a/world/map/npc/032-1/_warps.txt
+++ b/world/map/npc/032-1/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Outback warps
-032-1.gat,64,52|warp|ToCave|-1,-1,032-3.gat,56,59
+032-1.gat,64,52|warp|To Outback Cave|-1,-1,032-3.gat,56,60
diff --git a/world/map/npc/032-3/_mobs.txt b/world/map/npc/032-3/_mobs.txt
index 49b68b84..42d920b4 100644
--- a/world/map/npc/032-3/_mobs.txt
+++ b/world/map/npc/032-3/_mobs.txt
@@ -1,15 +1,15 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-032-3.gat,125,46,35,75|monster|MountainSnake|1010,13,30000,100000,Mob032-3::On1010
-032-3.gat,80,44,9,10|monster|BlackScorpion|1009,5,30000,100000,Mob032-3::On1009
+032-3.gat,90,44,9,10|monster|Skeleton|1043,3,30000,100000,Mob032-3::On1043
+032-3.gat,44,23,29,22|monster|Mountain Snake|1026,7,30000,100000,Mob032-3::On1026
+032-3.gat,125,46,35,75|monster|Mountain Snake|1010,13,30000,100000,Mob032-3::On1010
+032-3.gat,80,44,9,10|monster|Black Scorpion|1009,5,30000,100000,Mob032-3::On1009
032-3.gat,85,33,9,10|monster|Spider|1012,5,30000,100000,Mob032-3::On1012
032-3.gat,83,18,37,9|monster|Archant|1060,8,30000,100000,Mob032-3::On1060
032-3.gat,78,76,24,21|monster|Archant|1060,8,30000,100000,Mob032-3::On1060
-032-3.gat,25,76,24,21|monster|YellowSlime|1007,11,300000,1000000,Mob032-3::On1007
-032-3.gat,46,51,34,18|monster|CaveMaggot|1056,11,30000,100000,Mob032-3::On1056
+032-3.gat,25,76,24,21|monster|Yellow Slime|1007,11,300000,1000000,Mob032-3::On1007
+032-3.gat,46,51,34,18|monster|Cave Maggot|1056,11,30000,100000,Mob032-3::On1056
032-3.gat,0,0,0,0|monster|Bat|1017,25,30000,100000,Mob032-3::On1017
diff --git a/world/map/npc/032-3/_warps.txt b/world/map/npc/032-3/_warps.txt
index 1f452a3e..7d7964c2 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.
// 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
+032-3.gat,128,33|warp|To Desert Mountains|-1,-1,006-1.gat,30,124
+032-3.gat,56,61|warp|To Outback|-1,-1,032-1.gat,64,53
diff --git a/world/map/npc/033-1/_warps.txt b/world/map/npc/033-1/_warps.txt
index 538a5dcb..9a66308b 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
-033-1.gat,22,20|warp|ToSnowField|-1,0,034-1.gat,159,19
+033-1.gat,22,20|warp|To Snow Field|-1,0,034-1.gat,159,19
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index a87ebc1f..69d8b198 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 Forest warps
-034-1.gat,160,20|warp|ToSnowField|-1,0,033-1.gat,23,19
+034-1.gat,160,20|warp|To Snow Field|-1,0,033-1.gat,23,19
diff --git a/world/map/npc/041-1/_warps.txt b/world/map/npc/041-1/_warps.txt
index 9bfa0da7..7f8901c4 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.
// Beach warps
-041-1.gat,76,95|warp|to004-1|1,-1,004-1.gat,68,20
+041-1.gat,76,95|warp|To Beach|1,-1,004-1.gat,68,20
diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
index 39ae762e..e6adc5c3 100644
--- a/world/map/npc/042-1/_warps.txt
+++ b/world/map/npc/042-1/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-042-1.gat,62,62|warp|toInside|-1,-1,042-2.gat,29,60
-042-1.gat,37,56|warp|toInside|-1,-1,042-2.gat,44,29
+042-1.gat,87,76|warp|To Store House|-1,-1,042-2.gat,44,92
+042-1.gat,77,76|warp|To Store House|-1,-1,042-2.gat,22,92
+042-1.gat,62,62|warp|To Tulimshar Suburbs House|-1,-1,042-2.gat,29,61
+042-1.gat,37,56|warp|To Sorfina's House|-1,-1,042-2.gat,44,30
diff --git a/world/map/npc/042-2/_warps.txt b/world/map/npc/042-2/_warps.txt
index 35475800..4acaf9cc 100644
--- a/world/map/npc/042-2/_warps.txt
+++ b/world/map/npc/042-2/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// 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
-042-2.gat,44,93|warp|toOutside|-1,-1,042-1.gat,87,78
+042-2.gat,29,62|warp|To Outside|-1,-1,042-1.gat,62,63
+042-2.gat,22,93|warp|To Outside|-1,-1,042-1.gat,77,77
+042-2.gat,44,93|warp|To Outside|-1,-1,042-1.gat,87,77