Attach Kaizei to Argeas and Shuffle Kaizei

55 files changed, 228 insertions, 431 deletions

diff --git a/world/map/npc/017-1/_import.txt b/world/map/npc/017-1/_import.txt
index 10408f11..a4038987 100644
--- a/world/map/npc/017-1/_import.txt
+++ b/world/map/npc/017-1/_import.txt
@@ -4,4 +4,5 @@ map: 017-1.gat
 npc: npc/017-1/_mobs.txt
 npc: npc/017-1/_warps.txt
 npc: npc/017-1/flowerpentagram1.txt
+npc: npc/017-1/flowerpentagram5.txt
 npc: npc/017-1/mapflags.txt
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index cace9218..f54259a1 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -3,7 +3,9 @@
 
 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 Labyr|-1,-1,017-3.gat,51,48
-017-1.gat,98,20|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,83,33
-017-1.gat,97,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,72,67
-017-1.gat,135,56|warp|to Woods|-1,1,056-1.gat,24,28
+017-1.gat,76,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,69,68
+017-1.gat,98,20|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,83,52
+017-1.gat,97,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,76,65
+017-1.gat,168,90|warp|To Mirak's House|-1,-1,056-2.gat,34,30
+017-1.gat,188,104|warp|To Woodland Hills|-1,-1,055-1.gat,74,21
+017-1.gat,182,16|warp|To Deep Snow Forest|1,-1,045-1.gat,25,178
diff --git a/world/map/npc/056-1/flowerpentagram5.txt b/world/map/npc/017-1/flowerpentagram5.txt
index bc5b3766..24b2a9d2 100644
--- a/world/map/npc/056-1/flowerpentagram5.txt
+++ b/world/map/npc/017-1/flowerpentagram5.txt
@@ -1,7 +1,7 @@
 // Author: Jenalya
 // $@Flower_Pentagram_Time saves the time when the last summoning happened
 
-056-1.gat,62,31,0|script|#FlowerPentagram5|400
+017-1.gat,176,59,0|script|#FlowerPentagram5|400
 {
     if (OrumQuest >= 31) goto L_PlacedFifthFlower;
 
@@ -17,7 +17,7 @@ L_FifthFlower:
         "Leave.", L_Close;
 
 L_PlaceTheFlower:
-    if (isin("056-1.gat", 61, 30, 63, 32))
+    if (isin("017-1.gat", 175, 58, 177, 60))
         goto L_Place;
 
     mes "This isn't working, you're too far away.";
@@ -53,14 +53,14 @@ L_Place:
     mes "The pressure builds to the point where you don't think you can endure it any longer; the fabric that binds your consciousness together seemingly unravels.";
     set OrumQuest, 31;
     close2;
-    areamonster "056-1.gat", 56, 26, 80, 46, "", 1105, 3, "#FlowerPentagram5::OnSquirrelDeath";
-    areamonster "056-1.gat", 56, 26, 80, 46, "", 1106, 2, "#FlowerPentagram5::OnMushroomDeath";
-    areamonster "056-1.gat", 56, 26, 80, 46, "", 1107, 3, "#FlowerPentagram5::OnBlueparDeath";
-    areamonster "056-1.gat", 56, 26, 80, 46, "", 1104, 2, "#FlowerPentagram5::OnMoubooDeath";
-    areamonster "056-1.gat", 56, 26, 80, 46, "", 1003, 3, "#FlowerPentagram5::OnScorpionDeath";
-    areamonster "056-1.gat", 56, 26, 80, 46, "", 1004, 2, "#FlowerPentagram5::OnRScorpionDeath";
-    areamonster "056-1.gat", 56, 26, 80, 46, "", 1057, 2, "#FlowerPentagram5::OnAScorpionDeath";
-    areamonster "056-1.gat", 56, 26, 80, 46, "", 1009, 2, "#FlowerPentagram5::OnBScorpionDeath";
+    areamonster "017-1.gat", 170, 55, 190, 75, "", 1105, 3, "#FlowerPentagram5::OnSquirrelDeath";
+    areamonster "017-1.gat", 170, 55, 190, 75, "", 1106, 2, "#FlowerPentagram5::OnMushroomDeath";
+    areamonster "017-1.gat", 170, 55, 190, 75, "", 1107, 3, "#FlowerPentagram5::OnBlueparDeath";
+    areamonster "017-1.gat", 170, 55, 190, 75, "", 1104, 2, "#FlowerPentagram5::OnMoubooDeath";
+    areamonster "017-1.gat", 170, 55, 190, 75, "", 1003, 3, "#FlowerPentagram5::OnScorpionDeath";
+    areamonster "017-1.gat", 170, 55, 190, 75, "", 1004, 2, "#FlowerPentagram5::OnRScorpionDeath";
+    areamonster "017-1.gat", 170, 55, 190, 75, "", 1057, 2, "#FlowerPentagram5::OnAScorpionDeath";
+    areamonster "017-1.gat", 170, 55, 190, 75, "", 1009, 2, "#FlowerPentagram5::OnBScorpionDeath";
     set @value, 15;
     callfunc "QuestSagathaAnnoy";
     set @value, 0;
diff --git a/world/map/npc/017-3/_warps.txt b/world/map/npc/017-3/_warps.txt
index c984f124..65f035bd 100644
--- a/world/map/npc/017-3/_warps.txt
+++ b/world/map/npc/017-3/_warps.txt
@@ -1,9 +1,9 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Woodland Cave warps
 
-017-3.gat,51,46|warp|To Woodland Hills|-1,-1,017-1.gat,76,33
-017-3.gat,83,31|warp|To Theater Hill|-1,-1,017-1.gat,98,22
-017-3.gat,72,69|warp|To Woodland Hills Labyr|-1,-1,017-1.gat,98,30
+017-3.gat,69,69|warp|To Woodland Hills|-1,-1,017-1.gat,76,32
+017-3.gat,83,53|warp|To Theater Hill|-1,-1,017-1.gat,98,21
+017-3.gat,76,64|warp|To Woodland Hills Labyr|-1,-1,017-1.gat,98,30
 017-3.gat,63,26|warp|To Deeper Labyrinth|-1,-1,017-4.gat,52,24
 017-3.gat,29,48|warp|To Deeper Labyrinth|-1,-1,017-4.gat,30,48
 017-3.gat,69,52|warp|To Deeper Labyrinth|-1,-1,017-4.gat,91,27
diff --git a/world/map/npc/019-1/_warps.txt b/world/map/npc/019-1/_warps.txt
index 8f745b21..2034ce12 100644
--- a/world/map/npc/019-1/_warps.txt
+++ b/world/map/npc/019-1/_warps.txt
@@ -2,8 +2,6 @@
 // snow Field warps
 
 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,30
 019-1.gat,38,75|warp|To Snow Cave|-1,-1,019-3.gat,39,101
-019-1.gat,109,104|warp|To Snow Field|-1,-1,030-1.gat,109,30
 019-1.gat,21,70|warp|To Snow Path|-1,0,033-1.gat,118,69
diff --git a/world/map/npc/019-3/_warps.txt b/world/map/npc/019-3/_warps.txt
index ec5e5027..f06e2a27 100644
--- a/world/map/npc/019-3/_warps.txt
+++ b/world/map/npc/019-3/_warps.txt
@@ -3,5 +3,4 @@
 
 019-3.gat,40,102|warp|To Snow Field|-1,-1,019-1.gat,37,74
 019-3.gat,98,29|warp|To Snow Field|-1,-1,019-1.gat,96,39
-019-3.gat,57,49|warp|To Deeper Snow Cave|0,-1,019-4.gat,70,25
 019-3.gat,80,103|warp|To Frozen Lake|-1,-1,030-3.gat,54,70
diff --git a/world/map/npc/019-4/_import.txt b/world/map/npc/019-4/_import.txt
index e37f8154..5baebb59 100644
--- a/world/map/npc/019-4/_import.txt
+++ b/world/map/npc/019-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 019-4: Deeper Snow Cave
+// Map 019-4: Snow Cave
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 019-4.gat
 npc: npc/019-4/_mobs.txt
diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt
index de8892bf..8b269356 100644
--- a/world/map/npc/019-4/_mobs.txt
+++ b/world/map/npc/019-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Deeper Snow Cave mobs
+// Snow Cave mobs
 
 019-4.gat,0,0,0,0|monster|Moggun|1061,12,45000ms,30000ms,Mob019-4::On1061
 019-4.gat,47,67,15,9|monster|WhiteSlime|1093,5,45000ms,45000ms,Mob019-4::On1093
diff --git a/world/map/npc/019-4/_warps.txt b/world/map/npc/019-4/_warps.txt
index 2a90de1b..a1e621d0 100644
--- a/world/map/npc/019-4/_warps.txt
+++ b/world/map/npc/019-4/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Deeper Snow Cave warps
+// Snow Cave warps
 
-019-4.gat,70,24|warp|To Snow Cave|-1,-1,019-3.gat,57,48
-019-4.gat,25,124|warp|To Snow Hills|0,-1,044-1.gat,154,93
+019-4.gat,74,28|warp|To Snow Hills|-1,-1,047-1.gat,154,93
+019-4.gat,25,124|warp|To Snow Hills|0,-1,046-1.gat,62,27
diff --git a/world/map/npc/020-1/_warps.txt b/world/map/npc/020-1/_warps.txt
index 4898a5d5..3990da1f 100644
--- a/world/map/npc/020-1/_warps.txt
+++ b/world/map/npc/020-1/_warps.txt
@@ -10,3 +10,4 @@
 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
diff --git a/world/map/npc/030-1/_import.txt b/world/map/npc/030-1/_import.txt
deleted file mode 100644
index ee14f056..00000000
--- a/world/map/npc/030-1/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 030-1: Romantic Place
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 030-1.gat
-npc: npc/030-1/_mobs.txt
-npc: npc/030-1/_warps.txt
-npc: npc/030-1/mapflags.txt
diff --git a/world/map/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt
deleted file mode 100644
index 45b7d067..00000000
--- a/world/map/npc/030-1/_mobs.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Romantic Place mobs
-
-030-1.gat,0,0,0,0|monster|Pollett|1113,7,100000ms,30000ms,Mob030-1::On1113
-030-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob030-1::On1095
-030-1.gat,71,67,0,0|monster|Santaboo|1112,2,100000ms,30000ms,Mob030-1::On1112
-030-1.gat,71,67,0,0|monster|Reinboo|1094,2,100000ms,30000ms,Mob030-1::On1094
-
-
-030-1.gat,0,0,0|script|Mob030-1|-1
-{
-    end;
-
-On1094:
-    set @mobID, 1094;
-    callfunc "MobPoints";
-    end;
-
-On1095:
-    set @mobID, 1095;
-    callfunc "MobPoints";
-    end;
-
-On1112:
-    set @mobID, 1112;
-    callfunc "MobPoints";
-    end;
-
-On1113:
-    set @mobID, 1113;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/030-1/_warps.txt b/world/map/npc/030-1/_warps.txt
deleted file mode 100644
index 896804d8..00000000
--- a/world/map/npc/030-1/_warps.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Romantic Place warps
-
-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
-030-1.gat,99,53|warp|To Christmas Inn|-1,-1,030-2.gat,88,50
diff --git a/world/map/npc/030-1/mapflags.txt b/world/map/npc/030-1/mapflags.txt
deleted file mode 100644
index 313fcdb6..00000000
--- a/world/map/npc/030-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-030-1.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/030-2/_warps.txt b/world/map/npc/030-2/_warps.txt
index 98dd5ce0..af368314 100644
--- a/world/map/npc/030-2/_warps.txt
+++ b/world/map/npc/030-2/_warps.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Christmas Inn warps
 
-030-2.gat,88,51|warp|To Outside|-1,-1,030-1.gat,99,54
+030-2.gat,88,51|warp|To Outside|-1,-1,020-1.gat,33,94
 030-2.gat,72,31|warp|To Basement|-1,-1,030-2.gat,51,31
 030-2.gat,194,68|warp|To Fourth Floor|-1,-1,030-2.gat,78,88
 030-2.gat,52,31|warp|To First Floor|-1,-1,030-2.gat,73,31
diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt
index 96119fe4..aaa9c29c 100644
--- a/world/map/npc/030-2/eljas.txt
+++ b/world/map/npc/030-2/eljas.txt
@@ -187,8 +187,8 @@ L_NotWelcome:
     mes "... You hear a voice calling your name ... ";
     mes "[Orum's Homunculus]";
     mes "\"Come See me in the caves below.\"";
-    mes "\"go north till you reach the snoman. Then head into the cave to the east.\"";
-    warp "030-1",99,55;
+    mes "\"go south till you reach the snoman. Then head into the cave to the east.\"";
+    warp "020-1",33,94;
     close;
 
 L_Close:
diff --git a/world/map/npc/030-3/orum_homunculus.txt b/world/map/npc/030-3/orum_homunculus.txt
index ee325875..16cb1433 100644
--- a/world/map/npc/030-3/orum_homunculus.txt
+++ b/world/map/npc/030-3/orum_homunculus.txt
@@ -93,7 +93,7 @@ L_End:
     end;
 }
 
-030-3.gat,62,74,0|script|#OrumTelepathy5|45,1,1
+030-3.gat,49,53,0|script|#OrumTelepathy5|45,1,1
 {
     callfunc "XmasStates";
 
@@ -109,7 +109,7 @@ L_XmasMain:
 L_Telepathy:
     mes "[Orum's Homunculus]";
     mes "\"Wrong way!\"";
-    mes "\"I'm in the northwestern corner.\"";
+    mes "\"I am in the northeastern corner.\"";
     close;
 
 L_End:
@@ -132,14 +132,14 @@ L_XmasMain:
 L_Telepathy:
     mes "[Orum's Homunculus]";
     mes "\"Wrong Way!\"";
-    mes "\"I am in the northwestern corner.\"";
+    mes "\"I am in the northeastern corner.\"";
     close;
 
 L_End:
     end;
 }
 
-030-3.gat,55,52,0|script|#OrumTelepathy7|45,1,1
+030-3.gat,95,66,0|script|#OrumTelepathy7|45,1,1
 {
     callfunc "XmasStates";
 
@@ -155,14 +155,14 @@ L_XmasMain:
 L_Telepathy:
     mes "[Orum's Homunculus]";
     mes "\"Wrong Way!\"";
-    mes "\"I am in the northwestern corner.\"";
+    mes "\"I am in the northeastern corner.\"";
     close;
 
 L_End:
     end;
 }
 
-030-3.gat,28,28,0|script|Orum's Homunculus|385
+030-3.gat,100,49,0|script|Orum's Homunculus|385
 {
     callfunc "XmasStates";
 
@@ -310,7 +310,7 @@ L_FakeList:
     mes "\"Now listen:\"";
     next;
     mes "\"So far my basement portal has remained undetected:";
-    mes "Head to the east in this cave to find it.\"";
+    mes "Head to the west in this cave to find it.\"";
     mes "\"Once there smash your fist into the small crack and you will be teleported into the basement of the inn.\"";
     mes "\"Let me fake the mark Chief Warrick uses to identify his helpers. Don't get to close to the gaurds they might spot you.\"";
     mes "\"Now, prove yourself, gather the required items and go back to the Inn to sabotage Santa's Helpers.\"";
@@ -351,7 +351,7 @@ L_HelpHelpers:
 
 L_HelpPassage:
     mes "\"As I told you, I installed a passage to the Inn's basement:";
-    mes "Head to the east in this cave to find it.\"";
+    mes "Head to the west in this cave to find it.\"";
     mes "\"Once there, smash your fist into the small crack and you will be teleported into the basement of the inn.\"";
     goto L_Close;
 
diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index 73ef1579..7348ecbb 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -2,7 +2,7 @@
 // Nivalis Port mobs
 
 031-1.gat,0,0,0,0|monster|Fluffy|1020,10,100000ms,30000ms,Mob031-1::On1020
-031-1.gat,0,0,0,0|monster|Pollett|1113,7,100000ms,30000ms,Mob031-1::On1113
+031-1.gat,0,0,0,0|monster|Pollett|1113,14,100000ms,30000ms,Mob031-1::On1113
 031-1.gat,76,26,10,5|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-1::On1093
 031-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob031-1::On1095
 
diff --git a/world/map/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt
index 70d6e061..e56ba391 100644
--- a/world/map/npc/034-1/_mobs.txt
+++ b/world/map/npc/034-1/_mobs.txt
@@ -2,10 +2,11 @@
 // Snow Forest mobs
 
 034-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000ms,30000ms,Mob034-1::On1094
-034-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob034-1::On1020
+034-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000ms,30000ms,Mob034-1::On1020
 034-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob034-1::On1095
-034-1.gat,0,0,0,0|monster|Squirrel|1038,50,100000ms,30000ms,Mob034-1::On1038
+034-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000ms,30000ms,Mob034-1::On1038
 034-1.gat,0,0,0,0|monster|Santaboo|1112,4,100000ms,30000ms,Mob034-1::On1112
+034-1.gat,1,1,0,0|monster|IceGoblin|1058,25,100000ms,30000ms,Mob034-1::On1058
 
 
 034-1.gat,0,0,0|script|Mob034-1|-1
@@ -22,6 +23,11 @@ On1038:
     callfunc "MobPoints";
     end;
 
+On1058:
+    set @mobID, 1058;
+    callfunc "MobPoints";
+    end;
+
 On1094:
     set @mobID, 1094;
     callfunc "MobPoints";
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index d9443552..eef9e54d 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -4,6 +4,6 @@
 034-1.gat,160,20|warp|To Snow Field|-1,0,033-1.gat,23,19
 034-1.gat,16,103|warp|To Deep Snow Forest|-1,1,045-1.gat,176,133
 034-1.gat,15,31|warp|To Deep Snow Forest|-1,0,045-1.gat,174,59
-034-1.gat,95,18|warp|To Highlands|0,-1,046-1.gat,95,116
+034-1.gat,95,18|warp|To Highlands|0,-1,046-1.gat,94,123
 034-1.gat,31,68|warp|To Trapper|-1,-1,034-2.gat,28,31
 034-1.gat,64,99|warp|To Cabin|-1,-1,034-2.gat,73,29
diff --git a/world/map/npc/044-1/_import.txt b/world/map/npc/044-1/_import.txt
deleted file mode 100644
index 4e909abe..00000000
--- a/world/map/npc/044-1/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// Map 044-1: snow Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 044-1.gat
-npc: npc/044-1/_mobs.txt
-npc: npc/044-1/_warps.txt
-npc: npc/044-1/mapflags.txt
-npc: npc/044-1/traveler.txt
diff --git a/world/map/npc/044-1/_mobs.txt b/world/map/npc/044-1/_mobs.txt
deleted file mode 100644
index 471c997c..00000000
--- a/world/map/npc/044-1/_mobs.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// snow Hills mobs
-
-044-1.gat,37,175,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-1::On1093
-044-1.gat,45,75,2,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob044-1::On1091
-044-1.gat,0,0,0,0|monster|Reinboo|1094,50,100000ms,30000ms,Mob044-1::On1094
-044-1.gat,0,0,0,0|monster|Fluffy|1020,60,100000ms,30000ms,Mob044-1::On1020
-044-1.gat,0,0,0,0|monster|Squirrel|1038,60,100000ms,30000ms,Mob044-1::On1038
-044-1.gat,81,125,103,56|monster|Moggun|1061,25,100000ms,30000ms,Mob044-1::On1061
-044-1.gat,157,66,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090
-044-1.gat,160,115,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090
-044-1.gat,169,163,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090
-044-1.gat,58,71,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090
-044-1.gat,113,67,23,62|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090
-044-1.gat,110,173,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob044-1::On1090
-044-1.gat,108,168,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-1::On1093
-044-1.gat,108,158,3,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob044-1::On1091
-044-1.gat,101,146,10,5|monster|IceGoblin|1058,4,100000ms,30000ms,Mob044-1::On1058
-044-1.gat,0,0,0,0|monster|WhiteBell|1095,10,100000ms,30000ms,Mob044-1::On1095
-
-
-044-1.gat,0,0,0|script|Mob044-1|-1
-{
-    end;
-
-On1020:
-    set @mobID, 1020;
-    callfunc "MobPoints";
-    end;
-
-On1038:
-    set @mobID, 1038;
-    callfunc "MobPoints";
-    end;
-
-On1058:
-    set @mobID, 1058;
-    callfunc "MobPoints";
-    end;
-
-On1061:
-    set @mobID, 1061;
-    callfunc "MobPoints";
-    end;
-
-On1090:
-    set @mobID, 1090;
-    callfunc "MobPoints";
-    end;
-
-On1091:
-    set @mobID, 1091;
-    callfunc "MobPoints";
-    end;
-
-On1093:
-    set @mobID, 1093;
-    callfunc "MobPoints";
-    end;
-
-On1094:
-    set @mobID, 1094;
-    callfunc "MobPoints";
-    end;
-
-On1095:
-    set @mobID, 1095;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/044-1/_warps.txt b/world/map/npc/044-1/_warps.txt
deleted file mode 100644
index 342e0c4a..00000000
--- a/world/map/npc/044-1/_warps.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// snow Hills warps
-
-044-1.gat,108,165|warp|To Small Cave|-1,-1,044-3.gat,110,102
-044-1.gat,108,156|warp|To Small Cave|-1,-1,044-3.gat,119,94
-044-1.gat,102,111|warp|To Small Cave|-1,-1,044-3.gat,119,58
-044-1.gat,102,107|warp|To Small Cave|-1,-1,044-3.gat,128,45
-044-1.gat,154,92|warp|To Deeper Snow Cave|-1,-1,019-4.gat,25,123
-044-1.gat,101,143|warp|To Snow Hills Cave|-1,-1,044-3.gat,126,180
-044-1.gat,37,173|warp|To Snow Hills Cave|-1,-1,044-3.gat,33,175
-044-1.gat,45,73|warp|To Snow Hills Cave|-1,-1,044-3.gat,46,76
-044-1.gat,78,109|warp|To Snow Hills Cave|-1,-1,044-3.gat,35,41
-044-1.gat,83,123|warp|To Snow Hills Cave|-1,-1,044-3.gat,108,165
-044-1.gat,151,24|warp|To Traveler|-1,-1,044-1.gat,151,21
-044-1.gat,151,22|warp|To Snow Hills|-1,-1,044-1.gat,151,25
diff --git a/world/map/npc/044-1/mapflags.txt b/world/map/npc/044-1/mapflags.txt
deleted file mode 100644
index 5f02a6ad..00000000
--- a/world/map/npc/044-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-044-1.gat|mapflag|resave|044-1,145,20
diff --git a/world/map/npc/044-1/traveler.txt b/world/map/npc/044-1/traveler.txt
deleted file mode 100644
index 36eb4a9a..00000000
--- a/world/map/npc/044-1/traveler.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// This is a teleportation (warp) NPC. Its purpose is to offer expensive, fast trips throughout the world.
-// Author: Wombat, wushin
-// cost depending on level and adapted to new scripting guidelines: Jenalya
-
-044-1.gat,151,17,0|script|Klaus the Traveler|103
-{
-    set @NpcName$, "Klaus";
-    set @NpcTravelBit, $@nivalis_snow_hills_bit;
-    callfunc "Traveler";
-    end;
-}
diff --git a/world/map/npc/044-3/_import.txt b/world/map/npc/044-3/_import.txt
deleted file mode 100644
index b0a99cfc..00000000
--- a/world/map/npc/044-3/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 044-3: Snow Hills Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 044-3.gat
-npc: npc/044-3/_mobs.txt
-npc: npc/044-3/_warps.txt
-npc: npc/044-3/mapflags.txt
diff --git a/world/map/npc/044-3/_mobs.txt b/world/map/npc/044-3/_mobs.txt
deleted file mode 100644
index 61be9266..00000000
--- a/world/map/npc/044-3/_mobs.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Hills Cave mobs
-
-044-3.gat,56,135,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093
-044-3.gat,35,153,6,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093
-044-3.gat,39,104,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093
-044-3.gat,73,153,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093
-044-3.gat,64,104,3,3|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093
-044-3.gat,24,168,6,4|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091
-044-3.gat,87,134,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091
-044-3.gat,55,122,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091
-044-3.gat,35,128,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091
-044-3.gat,53,84,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091
-044-3.gat,75,136,21,26|monster|Moggun|1061,5,100000ms,30000ms,Mob044-3::On1061
-044-3.gat,39,31,42,21|monster|Moggun|1061,12,100000ms,30000ms,Mob044-3::On1061
-044-3.gat,40,31,5,3|monster|IceGoblin|1058,2,100000ms,30000ms,Mob044-3::On1058
-044-3.gat,122,157,21,16|monster|Yeti|1072,2,100000ms,30000ms,Mob044-3::On1072
-044-3.gat,102,166,15,13|monster|IceGoblin|1058,5,100000ms,30000ms,Mob044-3::On1058
-044-3.gat,109,81,15,13|monster|IceElement|1071,1,100000ms,30000ms,Mob044-3::On1071
-044-3.gat,123,90,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob044-3::On1091
-044-3.gat,109,97,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093
-044-3.gat,119,41,42,21|monster|Moggun|1061,8,100000ms,30000ms,Mob044-3::On1061
-044-3.gat,51,94,39,14|monster|IceGoblin|1058,5,100000ms,30000ms,Mob044-3::On1058
-044-3.gat,121,172,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob044-3::On1093
-
-
-044-3.gat,0,0,0|script|Mob044-3|-1
-{
-    end;
-
-On1058:
-    set @mobID, 1058;
-    callfunc "MobPoints";
-    end;
-
-On1061:
-    set @mobID, 1061;
-    callfunc "MobPoints";
-    end;
-
-On1071:
-    set @mobID, 1071;
-    callfunc "MobPoints";
-    end;
-
-On1072:
-    set @mobID, 1072;
-    callfunc "MobPoints";
-    end;
-
-On1091:
-    set @mobID, 1091;
-    callfunc "MobPoints";
-    end;
-
-On1093:
-    set @mobID, 1093;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/044-3/_warps.txt b/world/map/npc/044-3/_warps.txt
deleted file mode 100644
index 763feb7d..00000000
--- a/world/map/npc/044-3/_warps.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Hills Cave warps
-
-044-3.gat,46,74|warp|To Snow Hills|-1,-1,044-1.gat,45,75
-044-3.gat,33,176|warp|To Snow Hills|-1,-1,044-1.gat,37,174
-044-3.gat,126,181|warp|To Snow Hills|-1,-1,044-1.gat,101,144
-044-3.gat,35,42|warp|To Snow Hills|-1,-1,044-1.gat,78,110
-044-3.gat,108,163|warp|To Snow Hills|-1,-1,044-1.gat,83,125
-044-3.gat,110,103|warp|To Snow Hills|-1,-1,044-1.gat,108,166
-044-3.gat,119,95|warp|To Snow Hills|-1,-1,044-1.gat,108,157
-044-3.gat,119,59|warp|To Snow Hills|-1,-1,044-1.gat,102,112
-044-3.gat,128,46|warp|To Snow Hills|-1,-1,044-1.gat,102,108
diff --git a/world/map/npc/044-3/mapflags.txt b/world/map/npc/044-3/mapflags.txt
deleted file mode 100644
index 16c93b94..00000000
--- a/world/map/npc/044-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-044-3.gat|mapflag|resave|044-1,145,20
diff --git a/world/map/npc/045-1/_mobs.txt b/world/map/npc/045-1/_mobs.txt
index 439c0690..270486cc 100644
--- a/world/map/npc/045-1/_mobs.txt
+++ b/world/map/npc/045-1/_mobs.txt
@@ -2,17 +2,20 @@
 // Deep Snow Forest mobs
 
 045-1.gat,102,122,23,22|monster|Wolvern|1090,10,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,71,69,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1.gat,98,77,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
 045-1.gat,147,63,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,51,155,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1.gat,60,97,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
 045-1.gat,106,44,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,135,159,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,42,108,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,148,111,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1.gat,133,93,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1.gat,38,76,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1.gat,60,59,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
 045-1.gat,0,0,0,0|monster|Squirrel|1038,40,100000ms,30000ms,Mob045-1::On1038
 045-1.gat,0,0,0,0|monster|Reinboo|1094,30,100000ms,30000ms,Mob045-1::On1094
 045-1.gat,0,0,0,0|monster|Fluffy|1020,40,100000ms,30000ms,Mob045-1::On1020
 045-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob045-1::On1095
+045-1.gat,47,145,25,25|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
+045-1.gat,150,126,25,24|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
+045-1.gat,104,149,79,10|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
 
 
 045-1.gat,0,0,0|script|Mob045-1|-1
@@ -29,6 +32,11 @@ On1038:
     callfunc "MobPoints";
     end;
 
+On1058:
+    set @mobID, 1058;
+    callfunc "MobPoints";
+    end;
+
 On1090:
     set @mobID, 1090;
     callfunc "MobPoints";
diff --git a/world/map/npc/045-1/_warps.txt b/world/map/npc/045-1/_warps.txt
index 4fe703c1..79de0d21 100644
--- a/world/map/npc/045-1/_warps.txt
+++ b/world/map/npc/045-1/_warps.txt
@@ -3,3 +3,4 @@
 
 045-1.gat,175,60|warp|To Snow Forest|-1,0,034-1.gat,16,30
 045-1.gat,177,132|warp|To Snow Forest|-1,1,034-1.gat,17,102
+045-1.gat,26,179|warp|To Woodland Hills|2,-1,017-1.gat,182,17
diff --git a/world/map/npc/045-1/mapflags.txt b/world/map/npc/045-1/mapflags.txt
index b03ceee5..5349fac2 100644
--- a/world/map/npc/045-1/mapflags.txt
+++ b/world/map/npc/045-1/mapflags.txt
@@ -1 +1 @@
-045-1.gat|mapflag|resave|033-1,67,33
+045-1.gat|mapflag|resave|017-1,170,25
diff --git a/world/map/npc/046-1/_mobs.txt b/world/map/npc/046-1/_mobs.txt
index d478ac67..21715acb 100644
--- a/world/map/npc/046-1/_mobs.txt
+++ b/world/map/npc/046-1/_mobs.txt
@@ -1,17 +1,17 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Rock Plateau mobs
 
-046-1.gat,0,0,0,0|monster|Reinboo|1094,40,100000ms,30000ms,Mob046-1::On1094
-046-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob046-1::On1020
-046-1.gat,0,0,0,0|monster|Squirrel|1038,50,100000ms,30000ms,Mob046-1::On1038
-046-1.gat,44,28,52,20|monster|Moggun|1061,12,100000ms,30000ms,Mob046-1::On1061
-046-1.gat,0,0,0,0|monster|Yeti|1072,2,100000ms,30000ms,Mob046-1::On1072
-046-1.gat,87,94,23,13|monster|Wolvern|1090,5,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,0,0,0,0|monster|WhiteBell|1095,9,100000ms,30000ms,Mob046-1::On1095
-046-1.gat,72,52,15,12|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,36,105,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,115,33,45,33|monster|Wolvern|1090,7,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,145,60,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
+046-1.gat,0,7,0,0|monster|Reinboo|1094,40,100000ms,30000ms,Mob046-1::On1094
+046-1.gat,0,7,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob046-1::On1020
+046-1.gat,0,7,0,0|monster|Squirrel|1038,50,100000ms,30000ms,Mob046-1::On1038
+046-1.gat,44,35,52,20|monster|Moggun|1061,12,100000ms,30000ms,Mob046-1::On1061
+046-1.gat,0,7,0,0|monster|Yeti|1072,2,100000ms,30000ms,Mob046-1::On1072
+046-1.gat,87,101,23,13|monster|Wolvern|1090,5,100000ms,30000ms,Mob046-1::On1090
+046-1.gat,0,7,0,0|monster|WhiteBell|1095,9,100000ms,30000ms,Mob046-1::On1095
+046-1.gat,72,59,15,12|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
+046-1.gat,36,112,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
+046-1.gat,115,40,45,33|monster|Wolvern|1090,7,100000ms,30000ms,Mob046-1::On1090
+046-1.gat,145,67,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
 
 
 046-1.gat,0,0,0|script|Mob046-1|-1
diff --git a/world/map/npc/046-1/_warps.txt b/world/map/npc/046-1/_warps.txt
index e50ae158..137a5ab4 100644
--- a/world/map/npc/046-1/_warps.txt
+++ b/world/map/npc/046-1/_warps.txt
@@ -1,12 +1,13 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Rock Plateau warps
 
-046-1.gat,95,117|warp|To Snow Forest|0,-1,034-1.gat,94,19
-046-1.gat,29,13|warp|To Highlands|-1,-1,047-1.gat,34,112
-046-1.gat,31,13|warp|To Highlands|-1,-1,047-1.gat,36,112
-046-1.gat,78,30|warp|To Frosty Underground|-1,-1,046-3.gat,78,29
-046-1.gat,131,48|warp|To Frosty Underground|-1,-1,046-3.gat,131,47
-046-1.gat,131,55|warp|To Frosty Underground|-1,-1,046-3.gat,131,54
-046-1.gat,139,19|warp|To Frosty Underground|-1,-1,046-3.gat,139,18
-046-1.gat,83,43|warp|To Frosty Underground|-1,-1,046-3.gat,83,42
-046-1.gat,124,109|warp|To Frosty Underground|-1,-1,046-3.gat,124,108
+046-1.gat,95,124|warp|To Snow Forest|0,-1,034-1.gat,94,19
+046-1.gat,29,20|warp|To Highlands|-1,-1,047-1.gat,70,178
+046-1.gat,31,20|warp|To Highlands|-1,-1,047-1.gat,70,178
+046-1.gat,78,37|warp|To Frosty Underground|-1,-1,046-3.gat,78,29
+046-1.gat,131,55|warp|To Frosty Underground|-1,-1,046-3.gat,131,47
+046-1.gat,131,62|warp|To Frosty Underground|-1,-1,046-3.gat,131,54
+046-1.gat,139,26|warp|To Frosty Underground|-1,-1,046-3.gat,139,18
+046-1.gat,83,50|warp|To Frosty Underground|-1,-1,046-3.gat,83,42
+046-1.gat,124,116|warp|To Frosty Underground|-1,-1,046-3.gat,124,108
+046-1.gat,62,26|warp|To Frosty Underground|-1,-1,019-4.gat,24,123
diff --git a/world/map/npc/046-3/_warps.txt b/world/map/npc/046-3/_warps.txt
index dddf3434..804f3446 100644
--- a/world/map/npc/046-3/_warps.txt
+++ b/world/map/npc/046-3/_warps.txt
@@ -1,9 +1,9 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Frosty Underground warps
 
-046-3.gat,139,19|warp|To Outside|-1,-1,046-1.gat,139,20
-046-3.gat,78,30|warp|To Outside|-1,-1,046-1.gat,78,31
-046-3.gat,83,43|warp|To Outside|-1,-1,046-1.gat,83,44
-046-3.gat,131,48|warp|To Outside|-1,-1,046-1.gat,131,49
-046-3.gat,131,55|warp|To Outside|-1,-1,046-1.gat,131,56
-046-3.gat,124,109|warp|To Outside|-1,-1,046-1.gat,124,110
+046-3.gat,139,19|warp|To Outside|-1,-1,046-1.gat,139,27
+046-3.gat,78,30|warp|To Outside|-1,-1,046-1.gat,78,38
+046-3.gat,83,43|warp|To Outside|-1,-1,046-1.gat,83,51
+046-3.gat,131,48|warp|To Outside|-1,-1,046-1.gat,131,56
+046-3.gat,131,55|warp|To Outside|-1,-1,046-1.gat,131,63
+046-3.gat,124,109|warp|To Outside|-1,-1,046-1.gat,124,117
diff --git a/world/map/npc/047-1/_import.txt b/world/map/npc/047-1/_import.txt
index 8176e20d..aaf41a35 100644
--- a/world/map/npc/047-1/_import.txt
+++ b/world/map/npc/047-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 047-1: Highlands
+// Map 047-1: snow Hills
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 047-1.gat
 npc: npc/047-1/_mobs.txt
diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt
index 28cd5228..5d8ec344 100644
--- a/world/map/npc/047-1/_mobs.txt
+++ b/world/map/npc/047-1/_mobs.txt
@@ -1,15 +1,28 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Highlands mobs
+// snow Hills mobs
 
-047-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000ms,30000ms,Mob047-1::On1094
-047-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000ms,30000ms,Mob047-1::On1020
-047-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob047-1::On1095
-047-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000ms,30000ms,Mob047-1::On1038
-047-1.gat,24,57,1,1|monster|Yeti|1072,1,100000ms,30000ms,Mob047-1::On1072
-047-1.gat,111,26,23,13|monster|Wolvern|1090,4,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,35,79,22,27|monster|Wolvern|1090,4,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,127,65,23,13|monster|Wolvern|1090,4,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,61,29,23,13|monster|Wolvern|1090,4,100000ms,30000ms,Mob047-1::On1090
+047-1.gat,37,175,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-1::On1093
+047-1.gat,45,75,2,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob047-1::On1091
+047-1.gat,0,0,0,0|monster|Reinboo|1094,50,100000ms,30000ms,Mob047-1::On1094
+047-1.gat,0,0,0,0|monster|Fluffy|1020,60,100000ms,30000ms,Mob047-1::On1020
+047-1.gat,0,0,0,0|monster|Squirrel|1038,60,100000ms,30000ms,Mob047-1::On1038
+047-1.gat,81,125,103,56|monster|Moggun|1061,25,100000ms,30000ms,Mob047-1::On1061
+047-1.gat,189,123,25,36|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1.gat,160,115,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1.gat,169,163,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1.gat,58,71,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1.gat,122,116,20,24|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1.gat,110,173,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1.gat,108,168,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-1::On1093
+047-1.gat,108,158,3,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob047-1::On1091
+047-1.gat,0,0,0,0|monster|WhiteBell|1095,10,100000ms,30000ms,Mob047-1::On1095
+047-1.gat,87,119,36,35|monster|Yeti|1072,2,100000ms,30000ms,Mob047-1::On1072
+047-1.gat,138,22,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
+047-1.gat,157,66,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
+047-1.gat,174,46,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
+047-1.gat,143,43,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
+047-1.gat,122,61,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
+047-1.gat,132,70,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
 
 
 047-1.gat,0,0,0|script|Mob047-1|-1
@@ -26,6 +39,11 @@ On1038:
     callfunc "MobPoints";
     end;
 
+On1061:
+    set @mobID, 1061;
+    callfunc "MobPoints";
+    end;
+
 On1072:
     set @mobID, 1072;
     callfunc "MobPoints";
@@ -36,6 +54,16 @@ On1090:
     callfunc "MobPoints";
     end;
 
+On1091:
+    set @mobID, 1091;
+    callfunc "MobPoints";
+    end;
+
+On1093:
+    set @mobID, 1093;
+    callfunc "MobPoints";
+    end;
+
 On1094:
     set @mobID, 1094;
     callfunc "MobPoints";
diff --git a/world/map/npc/047-1/_warps.txt b/world/map/npc/047-1/_warps.txt
index 9e95bfe3..de141059 100644
--- a/world/map/npc/047-1/_warps.txt
+++ b/world/map/npc/047-1/_warps.txt
@@ -1,7 +1,17 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
-// Highlands warps
+// snow Hills warps
 
-047-1.gat,34,113|warp|To Rock Plateau|-1,-1,046-1.gat,29,14
-047-1.gat,36,113|warp|To Rock Plateau|-1,-1,046-1.gat,31,14
-047-1.gat,25,76|warp|To Blue Sage|-1,0,048-1.gat,155,75
-047-1.gat,24,63|warp|To Blue Sage|-1,0,048-1.gat,154,62
+047-1.gat,108,165|warp|To Small Cave|-1,-1,047-3.gat,110,102
+047-1.gat,108,156|warp|To Small Cave|-1,-1,047-3.gat,119,94
+047-1.gat,102,111|warp|To Small Cave|-1,-1,047-3.gat,119,58
+047-1.gat,102,107|warp|To Small Cave|-1,-1,047-3.gat,128,45
+047-1.gat,154,92|warp|To Deeper Snow Cave|-1,-1,019-4.gat,74,27
+047-1.gat,101,143|warp|To Snow Hills Cave|-1,-1,047-3.gat,126,180
+047-1.gat,37,173|warp|To Snow Hills Cave|-1,-1,047-3.gat,33,175
+047-1.gat,45,73|warp|To Snow Hills Cave|-1,-1,047-3.gat,46,76
+047-1.gat,78,109|warp|To Snow Hills Cave|-1,-1,047-3.gat,35,41
+047-1.gat,83,123|warp|To Snow Hills Cave|-1,-1,047-3.gat,108,165
+047-1.gat,71,179|warp|To Rock Plateau|1,-1,046-1.gat,29,21
+047-1.gat,130,50|warp|To Blue Sage Mansion|-1,-1,047-1.gat,130,47
+047-1.gat,130,48|warp|To Snow Hills|-1,-1,047-1.gat,130,51
+047-1.gat,128,39|warp|To Blue Sage|-1,-1,048-2.gat,40,48
diff --git a/world/map/npc/047-3/_import.txt b/world/map/npc/047-3/_import.txt
new file mode 100644
index 00000000..298708e1
--- /dev/null
+++ b/world/map/npc/047-3/_import.txt
@@ -0,0 +1,6 @@
+// Map 047-3: Snow Hills Cave
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 047-3.gat
+npc: npc/047-3/_mobs.txt
+npc: npc/047-3/_warps.txt
+npc: npc/047-3/mapflags.txt
diff --git a/world/map/npc/047-3/_mobs.txt b/world/map/npc/047-3/_mobs.txt
new file mode 100644
index 00000000..e10f4854
--- /dev/null
+++ b/world/map/npc/047-3/_mobs.txt
@@ -0,0 +1,60 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Snow Hills Cave mobs
+
+047-3.gat,56,135,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3.gat,35,153,6,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3.gat,39,104,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3.gat,73,153,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3.gat,64,104,3,3|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3.gat,24,168,6,4|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3.gat,87,134,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3.gat,55,122,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3.gat,35,128,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3.gat,53,84,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3.gat,75,136,21,26|monster|Moggun|1061,5,100000ms,30000ms,Mob047-3::On1061
+047-3.gat,39,31,42,21|monster|Moggun|1061,12,100000ms,30000ms,Mob047-3::On1061
+047-3.gat,40,31,5,3|monster|IceSkull|1085,2,100000ms,30000ms,Mob047-3::On1085
+047-3.gat,122,157,21,16|monster|Yeti|1072,2,100000ms,30000ms,Mob047-3::On1072
+047-3.gat,102,166,15,13|monster|IceSkull|1085,5,100000ms,30000ms,Mob047-3::On1085
+047-3.gat,109,81,15,13|monster|IceElement|1071,1,100000ms,30000ms,Mob047-3::On1071
+047-3.gat,123,90,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3.gat,109,97,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3.gat,119,41,42,21|monster|Moggun|1061,8,100000ms,30000ms,Mob047-3::On1061
+047-3.gat,51,94,39,14|monster|IceSkull|1085,5,100000ms,30000ms,Mob047-3::On1085
+047-3.gat,121,172,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+
+
+047-3.gat,0,0,0|script|Mob047-3|-1
+{
+    end;
+
+On1061:
+    set @mobID, 1061;
+    callfunc "MobPoints";
+    end;
+
+On1071:
+    set @mobID, 1071;
+    callfunc "MobPoints";
+    end;
+
+On1072:
+    set @mobID, 1072;
+    callfunc "MobPoints";
+    end;
+
+On1085:
+    set @mobID, 1085;
+    callfunc "MobPoints";
+    end;
+
+On1091:
+    set @mobID, 1091;
+    callfunc "MobPoints";
+    end;
+
+On1093:
+    set @mobID, 1093;
+    callfunc "MobPoints";
+    end;
+}
diff --git a/world/map/npc/047-3/_warps.txt b/world/map/npc/047-3/_warps.txt
new file mode 100644
index 00000000..ca8b585c
--- /dev/null
+++ b/world/map/npc/047-3/_warps.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Snow Hills Cave warps
+
+047-3.gat,46,74|warp|To Snow Hills|-1,-1,047-1.gat,45,75
+047-3.gat,33,176|warp|To Snow Hills|-1,-1,047-1.gat,37,174
+047-3.gat,126,181|warp|To Snow Hills|-1,-1,047-1.gat,101,144
+047-3.gat,35,42|warp|To Snow Hills|-1,-1,047-1.gat,78,110
+047-3.gat,108,163|warp|To Snow Hills|-1,-1,047-1.gat,83,125
+047-3.gat,110,103|warp|To Snow Hills|-1,-1,047-1.gat,108,166
+047-3.gat,119,95|warp|To Snow Hills|-1,-1,047-1.gat,108,157
+047-3.gat,119,59|warp|To Snow Hills|-1,-1,047-1.gat,102,112
+047-3.gat,128,46|warp|To Snow Hills|-1,-1,047-1.gat,102,108
diff --git a/world/map/npc/047-3/mapflags.txt b/world/map/npc/047-3/mapflags.txt
new file mode 100644
index 00000000..3cab7365
--- /dev/null
+++ b/world/map/npc/047-3/mapflags.txt
@@ -0,0 +1 @@
+047-3.gat|mapflag|resave|047-1,145,20
diff --git a/world/map/npc/048-1/_import.txt b/world/map/npc/048-1/_import.txt
deleted file mode 100644
index a2d24a78..00000000
--- a/world/map/npc/048-1/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// Map 048-1: Snow Forest
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 048-1.gat
-npc: npc/048-1/_mobs.txt
-npc: npc/048-1/_warps.txt
-npc: npc/048-1/mapflags.txt
diff --git a/world/map/npc/048-1/_mobs.txt b/world/map/npc/048-1/_mobs.txt
deleted file mode 100644
index 5365a6d2..00000000
--- a/world/map/npc/048-1/_mobs.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Forest mobs
-
-048-1.gat,0,0,0,0|monster|Reinboo|1094,20,100000ms,30000ms,Mob048-1::On1094
-048-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000ms,30000ms,Mob048-1::On1020
-048-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000ms,30000ms,Mob048-1::On1038
-048-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob048-1::On1095
-048-1.gat,68,40,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob048-1::On1093
-048-1.gat,72,61,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob048-1::On1091
-048-1.gat,48,37,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob048-1::On1093
-048-1.gat,72,30,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob048-1::On1093
-048-1.gat,61,50,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob048-1::On1091
-048-1.gat,61,35,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob048-1::On1091
-048-1.gat,42,25,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob048-1::On1093
-
-
-048-1.gat,0,0,0|script|Mob048-1|-1
-{
-    end;
-
-On1020:
-    set @mobID, 1020;
-    callfunc "MobPoints";
-    end;
-
-On1038:
-    set @mobID, 1038;
-    callfunc "MobPoints";
-    end;
-
-On1091:
-    set @mobID, 1091;
-    callfunc "MobPoints";
-    end;
-
-On1093:
-    set @mobID, 1093;
-    callfunc "MobPoints";
-    end;
-
-On1094:
-    set @mobID, 1094;
-    callfunc "MobPoints";
-    end;
-
-On1095:
-    set @mobID, 1095;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/048-1/_warps.txt b/world/map/npc/048-1/_warps.txt
deleted file mode 100644
index b1ab529b..00000000
--- a/world/map/npc/048-1/_warps.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Forest warps
-
-048-1.gat,155,63|warp|To Highlands|-1,0,047-1.gat,25,62
-048-1.gat,156,76|warp|To Highlands|-1,0,047-1.gat,26,76
-048-1.gat,64,41|warp|To Blue Sage|-1,-1,048-2.gat,40,48
diff --git a/world/map/npc/048-1/mapflags.txt b/world/map/npc/048-1/mapflags.txt
deleted file mode 100644
index 4b5da68d..00000000
--- a/world/map/npc/048-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-048-1.gat|mapflag|resave|048-2,26,46
diff --git a/world/map/npc/048-2/_warps.txt b/world/map/npc/048-2/_warps.txt
index c064278f..174fe7e8 100644
--- a/world/map/npc/048-2/_warps.txt
+++ b/world/map/npc/048-2/_warps.txt
@@ -3,7 +3,7 @@
 
 048-2.gat,22,78|warp|To Second Floor|0,-1,048-2.gat,84,23
 048-2.gat,60,21|warp|To Second Floor|0,-1,048-2.gat,121,26
-048-2.gat,40,50|warp|To Outside|-1,-1,048-1.gat,64,42
+048-2.gat,40,50|warp|To Outside|-1,-1,047-1.gat,128,40
 048-2.gat,84,21|warp|To Third Floor|0,-1,048-2.gat,22,76
 048-2.gat,113,23|warp|To Office|-1,-1,048-2.gat,147,35
 048-2.gat,122,28|warp|To First Floor|0,-1,048-2.gat,59,22
diff --git a/world/map/npc/055-1/_warps.txt b/world/map/npc/055-1/_warps.txt
index be1df9d0..05e5cac2 100644
--- a/world/map/npc/055-1/_warps.txt
+++ b/world/map/npc/055-1/_warps.txt
@@ -6,5 +6,5 @@
 055-1.gat,22,52|warp|To Woodland Hills|-1,2,013-1.gat,135,51
 055-1.gat,137,96|warp|To Cave|-1,-1,055-3.gat,76,39
 055-1.gat,60,93|warp|To Cave|-1,-1,055-3.gat,96,70
-055-1.gat,75,20|warp|To Woods|0,-1,056-1.gat,74,75
+055-1.gat,75,20|warp|To Woods|0,-1,017-1.gat,188,103
 055-1.gat,149,63|warp|To Woodland|-1,1,057-1.gat,20,63
diff --git a/world/map/npc/056-1/_import.txt b/world/map/npc/056-1/_import.txt
deleted file mode 100644
index ae136805..00000000
--- a/world/map/npc/056-1/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// Map 056-1: Woods
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 056-1.gat
-npc: npc/056-1/_mobs.txt
-npc: npc/056-1/_warps.txt
-npc: npc/056-1/flowerpentagram5.txt
-npc: npc/056-1/mapflags.txt
diff --git a/world/map/npc/056-1/_mobs.txt b/world/map/npc/056-1/_mobs.txt
deleted file mode 100644
index 6f4e6bf5..00000000
--- a/world/map/npc/056-1/_mobs.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woods mobs
-
-056-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,10000ms,45000ms,Mob056-1::On1013
-056-1.gat,0,0,0,0|monster|LogHead|1025,10,10000ms,45000ms,Mob056-1::On1025
-056-1.gat,0,0,0,0|monster|MauvePlant|1029,2,10000ms,85000ms,Mob056-1::On1029
-
-
-056-1.gat,0,0,0|script|Mob056-1|-1
-{
-    end;
-
-On1013:
-    set @mobID, 1013;
-    callfunc "MobPoints";
-    end;
-
-On1025:
-    set @mobID, 1025;
-    callfunc "MobPoints";
-    end;
-
-On1029:
-    set @mobID, 1029;
-    callfunc "MobPoints";
-    end;
-}
diff --git a/world/map/npc/056-1/_warps.txt b/world/map/npc/056-1/_warps.txt
deleted file mode 100644
index 8895f37e..00000000
--- a/world/map/npc/056-1/_warps.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Woods warps
-
-056-1.gat,74,76|warp|To Woodland Hills|-1,-1,055-1.gat,74,21
-056-1.gat,23,29|warp|To Woodland Hills|-1,3,017-1.gat,134,56
-056-1.gat,54,62|warp|To Mirak's House|-1,-1,056-2.gat,34,30
diff --git a/world/map/npc/056-1/mapflags.txt b/world/map/npc/056-1/mapflags.txt
deleted file mode 100644
index 3826d217..00000000
--- a/world/map/npc/056-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-056-1.gat|mapflag|resave|055-1,133,61
diff --git a/world/map/npc/056-2/_warps.txt b/world/map/npc/056-2/_warps.txt
index 202e86d3..f148b077 100644
--- a/world/map/npc/056-2/_warps.txt
+++ b/world/map/npc/056-2/_warps.txt
@@ -2,4 +2,4 @@
 // Mirak's House warps
 
 056-2.gat,63,34|warp|To First Floor|-1,-1,056-2.gat,23,32
-056-2.gat,35,30|warp|To Woods|-1,-1,056-1.gat,55,62
+056-2.gat,35,30|warp|To Woods|-1,-1,017-1.gat,169,90
diff --git a/world/map/npc/056-2/mapflags.txt b/world/map/npc/056-2/mapflags.txt
index 6c4c9171..90524dd8 100644
--- a/world/map/npc/056-2/mapflags.txt
+++ b/world/map/npc/056-2/mapflags.txt
@@ -1,2 +1,2 @@
-056-2.gat|mapflag|nosave|056-1,56,62
-056-2.gat|mapflag|resave|056-1,56,62
+056-2.gat|mapflag|nosave|017-1,107,70
+056-2.gat|mapflag|resave|017-1,107,70
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 71a3e3c5..43fd69c8 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -88,7 +88,6 @@ import: npc/028-1/_import.txt
 import: npc/028-3/_import.txt
 import: npc/029-1/_import.txt
 import: npc/029-3/_import.txt
-import: npc/030-1/_import.txt
 import: npc/030-2/_import.txt
 import: npc/030-3/_import.txt
 import: npc/030-4/_import.txt
@@ -110,13 +109,11 @@ import: npc/042-3/_import.txt
 import: npc/043-1/_import.txt
 import: npc/043-3/_import.txt
 import: npc/043-4/_import.txt
-import: npc/044-1/_import.txt
-import: npc/044-3/_import.txt
 import: npc/045-1/_import.txt
 import: npc/046-1/_import.txt
 import: npc/046-3/_import.txt
 import: npc/047-1/_import.txt
-import: npc/048-1/_import.txt
+import: npc/047-3/_import.txt
 import: npc/048-2/_import.txt
 import: npc/051-1/_import.txt
 import: npc/051-3/_import.txt
@@ -124,7 +121,6 @@ import: npc/052-1/_import.txt
 import: npc/052-2/_import.txt
 import: npc/055-1/_import.txt
 import: npc/055-3/_import.txt
-import: npc/056-1/_import.txt
 import: npc/056-2/_import.txt
 import: npc/057-1/_import.txt
 import: npc/068-1/_import.txt