7 files changed, 22 insertions, 22 deletions
diff --git a/world/map/npc/017-4/_import.txt b/world/map/npc/017-4/_import.txt
index 6a31069e..fcd79a8e 100644
--- a/world/map/npc/017-4/_import.txt
+++ b/world/map/npc/017-4/_import.txt
@@ -1,6 +1,6 @@
 // Map 017-4: Hideout
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 017-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 017-4
 npc: npc/017-4/_mobs.txt
 npc: npc/017-4/_warps.txt
 npc: npc/017-4/guardingspirit.txt
diff --git a/world/map/npc/017-4/_mobs.txt b/world/map/npc/017-4/_mobs.txt
index 0a7d5d29..12f048ec 100644
--- a/world/map/npc/017-4/_mobs.txt
+++ b/world/map/npc/017-4/_mobs.txt
@@ -1,9 +1,9 @@
-// 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.
 // Hideout mobs
 
 
 
-017-4.gat,0,0,0|script|Mob017-4|-1
+017-4,0,0,0|script|Mob017-4|-1
 {
     end;
 }
diff --git a/world/map/npc/017-4/_warps.txt b/world/map/npc/017-4/_warps.txt
index 46c24dfa..b06a8db2 100644
--- a/world/map/npc/017-4/_warps.txt
+++ b/world/map/npc/017-4/_warps.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.
 // Hideout warps
 
-017-4.gat,201,25|warp|To Labyrinth|-1,-1,017-4.gat,173,46
-017-4.gat,91,26|warp|To Cave|-1,-1,017-3.gat,69,51
-017-4.gat,123,26|warp|To Cave|-1,-1,017-3.gat,32,69
-017-4.gat,166,26|warp|To Cave|-1,-1,017-3.gat,82,76
-017-4.gat,30,47|warp|To Cave|-1,-1,017-3.gat,29,47
-017-4.gat,52,25|warp|To Cave|-1,-1,017-3.gat,63,27
-017-4.gat,83,41|warp|To Cave|-1,-1,017-3.gat,58,61
+017-4,201,25|warp|To Labyrinth|-1,-1,017-4,173,46
+017-4,91,26|warp|To Cave|-1,-1,017-3,69,51
+017-4,123,26|warp|To Cave|-1,-1,017-3,32,69
+017-4,166,26|warp|To Cave|-1,-1,017-3,82,76
+017-4,30,47|warp|To Cave|-1,-1,017-3,29,47
+017-4,52,25|warp|To Cave|-1,-1,017-3,63,27
+017-4,83,41|warp|To Cave|-1,-1,017-3,58,61
diff --git a/world/map/npc/017-4/guardingspirit.txt b/world/map/npc/017-4/guardingspirit.txt
index 6b39bbd5..8fef95ed 100644
--- a/world/map/npc/017-4/guardingspirit.txt
+++ b/world/map/npc/017-4/guardingspirit.txt
@@ -1,6 +1,6 @@
 // Author: Jenalya
 
-017-4.gat,173,47,0|script|#Guarding Spirit#_M|204,0,0
+017-4,173,47,0|script|#Guarding Spirit#_M|204,0,0
 {
     goto L_Talk;
 
@@ -59,7 +59,7 @@ L_Pass:
     next;
     mes "\"Remember that when you speak with him, do so with respect for someone befitting his status.\"";
     set OrumQuest, 15;
-    warp "017-4.gat", 201, 26;
+    warp "017-4", 201, 26;
     goto L_Close;
 
 L_Block:
@@ -92,6 +92,6 @@ OnTouch:
         goto L_Talk;
     if (OrumQuest == 35)
         goto L_Block;
-    warp "017-4.gat", 201, 26;
+    warp "017-4", 201, 26;
     end;
 }
diff --git a/world/map/npc/017-4/mapflags.txt b/world/map/npc/017-4/mapflags.txt
index bd0ecdff..a137e471 100644
--- a/world/map/npc/017-4/mapflags.txt
+++ b/world/map/npc/017-4/mapflags.txt
@@ -1 +1 @@
-017-4.gat|mapflag|resave|017-1,107,70
+017-4|mapflag|resave|017-1,107,70
diff --git a/world/map/npc/017-4/orum.txt b/world/map/npc/017-4/orum.txt
index b13f415d..213f14af 100644
--- a/world/map/npc/017-4/orum.txt
+++ b/world/map/npc/017-4/orum.txt
@@ -20,7 +20,7 @@
 // 31: Placed fifth flower
 // 32: Got reward
 
-017-4.gat,211,32,0|script|Orum|158
+017-4,211,32,0|script|Orum|158
 {
     // first flower
     set @AMOUNT_SMALLMUSHROOM, 5;
@@ -124,7 +124,7 @@ L_Banish:
     mes "He starts mumbling under his breath and you suddenly feel weirdly weightless. Your vision fades...";
     mes "The last thing you hear is Waric shouting something about untalented apprentices.";
     set Hp, 1 + rand(5);
-    warp "017-1.gat", 0, 0;
+    warp "017-1", 0, 0;
     goto L_Close;
 
 L_FirstFlower: // 16: Got task to bring materials for first magical flower
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index 917c93db..618f4a8f 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -19,7 +19,7 @@
 // OrumQuest State 41 - Learned Summon snake
 // When extending these Quest Variable to 51 all of the other dark magic spells will be available. Keep this in mind.
 
-017-4.gat,216,36,0|script|Waric|153
+017-4,216,36,0|script|Waric|153
 {
     set @mouboo_status, ((QUEST_MAGIC & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) & 3;
     set @killed_mouboo, 0;
@@ -223,7 +223,7 @@ L_Next3:
 
 L_NoOath:
     mes "Waric mumbles something. You guess it's a magic spell.";
-    warp "005-3.gat", 86 , 33;
+    warp "005-3", 86 , 33;
     percentheal 100, 0;
     percentheal -50, 0;
     set OrumQuest, OrumQuest + 1;
@@ -298,7 +298,7 @@ L_Next6:
     next;
     mes "The Egg cracks open and a living snake comes out of the egg.";
     next;
-    monster "017-4.gat", 217,36, "Evil", 1010, 1;
+    monster "017-4", 217,36, "Evil", 1010, 1;
     mes "The wizard looks at you, his eyes flashing, and laughs diabolically.";
     set OrumQuest, 40;
     goto L_Close;
@@ -383,7 +383,7 @@ L_Close:
     close;
 }
 
-017-1.gat,74,32,0|script|DebugFlowerP|153
+017-1,74,32,0|script|DebugFlowerP|153
 {
     mes "Debug options for Orum's quest:";
     menu