4 files changed, 81 insertions, 93 deletions
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;
-}