10 files changed, 26 insertions, 26 deletions
diff --git a/world/map/npc/020-1/KrickKrackKrock.txt b/world/map/npc/020-1/KrickKrackKrock.txt
index cd0b7c3e..8ba67feb 100644
--- a/world/map/npc/020-1/KrickKrackKrock.txt
+++ b/world/map/npc/020-1/KrickKrackKrock.txt
@@ -3,7 +3,7 @@
 
 //To enable: sed 's_^// __' -i npc/020-1/KrickKrackKrock.txt
 
-// 020-1.gat,82,82,0|script|Criker|192
+// 020-1,82,82,0|script|Criker|192
 // {
 // L_Main:
 // //Var
diff --git a/world/map/npc/020-1/_import.txt b/world/map/npc/020-1/_import.txt
index e7372302..b85bd34f 100644
--- a/world/map/npc/020-1/_import.txt
+++ b/world/map/npc/020-1/_import.txt
@@ -1,6 +1,6 @@
 // Map 020-1: Nivalis
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 020-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 020-1
 npc: npc/020-1/KrickKrackKrock.txt
 npc: npc/020-1/_mobs.txt
 npc: npc/020-1/_warps.txt
diff --git a/world/map/npc/020-1/_mobs.txt b/world/map/npc/020-1/_mobs.txt
index 549ae3bf..3f534e8d 100644
--- a/world/map/npc/020-1/_mobs.txt
+++ b/world/map/npc/020-1/_mobs.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Nivalis mobs
 
-020-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob020-1::On1095
+020-1,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob020-1::On1095
 
 
-020-1.gat,0,0,0|script|Mob020-1|-1
+020-1,0,0,0|script|Mob020-1|-1
 {
     end;
 
diff --git a/world/map/npc/020-1/_warps.txt b/world/map/npc/020-1/_warps.txt
index 3990da1f..2a52ade5 100644
--- a/world/map/npc/020-1/_warps.txt
+++ b/world/map/npc/020-1/_warps.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Nivalis warps
 
-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
-020-1.gat,59,45|warp|To Nivalis Storage|-1,-1,020-2.gat,127,68
-020-1.gat,33,93|warp|To Christmas Inn|-1,-1,030-2.gat,88,50
+020-1,76,38|warp|To Ice Cave|1,-1,020-3,31,26
+020-1,47,48|warp|To Nivalis Indoor|-1,-1,020-2,25,35
+020-1,66,52|warp|To Nivalis House|-1,-1,020-2,72,70
+020-1,64,82|warp|To Nivalis Inn|-1,-1,020-2,111,32
+020-1,86,46|warp|To Armory|-1,-1,020-2,32,73
+020-1,57,91|warp|To Nivalis Shop|-1,-1,020-2,65,23
+020-1,70,128|warp|To Snow Field|2,-1,019-1,70,22
+020-1,107,55|warp|To Nivalis Port|-1,-1,031-1,38,55
+020-1,59,45|warp|To Nivalis Storage|-1,-1,020-2,127,68
+020-1,33,93|warp|To Christmas Inn|-1,-1,030-2,88,50
diff --git a/world/map/npc/020-1/dock.txt b/world/map/npc/020-1/dock.txt
index ce7807e8..46d7de73 100644
--- a/world/map/npc/020-1/dock.txt
+++ b/world/map/npc/020-1/dock.txt
@@ -1,5 +1,5 @@
 // Ferry Sign
-020-1.gat,81,76,0|script|Ferry Schedule#7|398
+020-1,81,76,0|script|Ferry Schedule#7|398
 {
     callfunc "FerryManifest";
     end;
diff --git a/world/map/npc/020-1/mapflags.txt b/world/map/npc/020-1/mapflags.txt
index 4044d492..dbaedb2e 100644
--- a/world/map/npc/020-1/mapflags.txt
+++ b/world/map/npc/020-1/mapflags.txt
@@ -1,2 +1,2 @@
-020-1.gat|mapflag|town
-020-1.gat|mapflag|resave|020-1,52,118
+020-1|mapflag|town
+020-1|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/020-1/rockscissor.txt b/world/map/npc/020-1/rockscissor.txt
index 1bfbf62c..9023b6d6 100644
--- a/world/map/npc/020-1/rockscissor.txt
+++ b/world/map/npc/020-1/rockscissor.txt
@@ -11,7 +11,7 @@
 
 //To enable: sed 's_^// __' -i npc/020-1/rockscissor.txt
 
-// 020-1.gat,74,78,0|script|Gobmel|189
+// 020-1,74,78,0|script|Gobmel|189
 // {
 //     //var
 //     set @NPC_name$, "[Gobmel]";
diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt
index 5cd3c7e3..6066c2ea 100644
--- a/world/map/npc/020-1/soul-menhir.txt
+++ b/world/map/npc/020-1/soul-menhir.txt
@@ -1,9 +1,9 @@
 //
 
-020-1.gat,63,89,0|script|Soul Menhir#nivalis|346
+020-1,63,89,0|script|Soul Menhir#nivalis|346
 {
     callfunc "ClearVariables";
-    set @map$, "020-1.gat";
+    set @map$, "020-1";
     setarray @Xs, 62, 63, 64, 62, 64, 62, 64;
     setarray @Ys, 88, 88, 88, 89, 89, 90, 90;
     set @x, 0;
diff --git a/world/map/npc/020-1/traveler.txt b/world/map/npc/020-1/traveler.txt
index 65bacdbc..d873a57f 100644
--- a/world/map/npc/020-1/traveler.txt
+++ b/world/map/npc/020-1/traveler.txt
@@ -1,4 +1,4 @@
-020-1.gat,57,123,0|script|Knox the Traveler|103
+020-1,57,123,0|script|Knox the Traveler|103
 {
     set @NpcName$, "Knox";
     set @NpcTravelBit, $@nivalis_bit;
diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt
index 9aa70d32..a4513536 100644
--- a/world/map/npc/020-1/well.txt
+++ b/world/map/npc/020-1/well.txt
@@ -14,7 +14,7 @@
 //# used variables: QUEST_Nivalis_state Nibble4
 //############################################
 
-020-1.gat,99,83,0|script|#Well|400
+020-1,99,83,0|script|#Well|400
 {
     set @Q_MASK, NIBBLE_4_MASK;
     set @Q_SHIFT, NIBBLE_4_SHIFT;
@@ -98,7 +98,7 @@ S_Update_Var:
     return;
 }
 
-020-2.gat,100,28,0|script|Miler|100
+020-2,100,28,0|script|Miler|100
 {
     set @Q_MASK, NIBBLE_4_MASK;
     set @Q_SHIFT, NIBBLE_4_SHIFT;