3 files changed, 38 insertions, 49 deletions
diff --git a/world/map/npc/016-1/_import.txt b/world/map/npc/016-1/_import.txt
index 3ba02b95..333dc950 100644
--- a/world/map/npc/016-1/_import.txt
+++ b/world/map/npc/016-1/_import.txt
@@ -4,4 +4,3 @@ map: 016-1.gat
 npc: npc/016-1/_mobs.txt
 npc: npc/016-1/_warps.txt
 npc: npc/016-1/gwendolyn.txt
-npc: npc/016-1/monsters.txt
diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index fdd033fc..e9e8dcde 100644
--- a/world/map/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-1/_mobs.txt
@@ -3,14 +3,52 @@
 
 016-1.gat,0,0,0,0|monster|Clover|1037,2,100000,30000,Mob016-1::On1037
 016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob016-1::On1055
+016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20,10,Mob016-1::On1038
+016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0,0,Mob016-1::On1028
+016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0,0,Mob016-1::On1003
+016-1.gat,0,0,0,0|monster|Mauve|1029,3,0,0,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Mauve|1029,4,270000,180000,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Cobalt|1030,3,0,0,Mob016-1::On1030
+016-1.gat,0,0,0,0|monster|Butterfly|1029,4,270000,180000,Mob016-1::On1029
+016-1.gat,0,0,0,0|monster|Silkworn|1035,7,150000,7000,Mob016-1::On1035
 
 
 016-1.gat,0,0,0|script|Mob016-1|-1,{
+On1003:
+    set @mobID, 1003;
+    callfunc "MobPoints";
+    end;
+
+On1028:
+    set @mobID, 1028;
+    callfunc "MobPoints";
+    end;
+
+On1029:
+    set @mobID, 1029;
+    callfunc "MobPoints";
+    end;
+
+On1030:
+    set @mobID, 1030;
+    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/016-1/monsters.txt b/world/map/npc/016-1/monsters.txt
deleted file mode 100644
index d9d0de4f..00000000
--- a/world/map/npc/016-1/monsters.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-// Map: 016-1
-// This is Southernmost Woodlands.
-//
-
-016-1.gat,0,0,0,0	monster	Mouboo		1028,5,0,0,Mob32::OnMouboo
-016-1.gat,0,0,0,0	monster	Scorpion	1003,15,0,0,Mob32::OnScorpion
-
-016-1.gat,0,0,0,0	monster	Mauve		1029,3,0,0,Mob32::OnMauve
-016-1.gat,0,0,0,0	monster	Cobalt		1030,3,0,0,Mob32::OnCobalt
-016-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob32::OnMauve
-
-016-1.gat,0,0,0,0	monster	SilkWorm	1035,7,15000,7000,Mob32::onSilkWorm
-
-016-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob32::OnSquirrel
-
-016-1.gat,0,0,0	script	Mob32	-1,{
-OnMouboo:
-	set @mobID, 1028;
-	callfunc "MobPoints";
-	break;
-
-OnScorpion:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnCobalt:
-	set @mobID, 1030;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}