3 files changed, 54 insertions, 60 deletions
diff --git a/npc/012-1_Woodland_Hills/_import.txt b/npc/012-1_Woodland_Hills/_import.txt
index c330811f..842667dc 100644
--- a/npc/012-1_Woodland_Hills/_import.txt
+++ b/npc/012-1_Woodland_Hills/_import.txt
@@ -3,5 +3,4 @@ npc: npc/012-1_Woodland_Hills/_mobs.txt
 npc: npc/012-1_Woodland_Hills/_warps.txt
 npc: npc/012-1_Woodland_Hills/amrak.txt
 npc: npc/012-1_Woodland_Hills/injured-mouboo.txt
-npc: npc/012-1_Woodland_Hills/monsters.txt
 npc: npc/012-1_Woodland_Hills/shops.txt
diff --git a/npc/012-1_Woodland_Hills/_mobs.txt b/npc/012-1_Woodland_Hills/_mobs.txt
index a5159257..65aa2be8 100644
--- a/npc/012-1_Woodland_Hills/_mobs.txt
+++ b/npc/012-1_Woodland_Hills/_mobs.txt
@@ -1,13 +1,67 @@
 // 012-1 Woodland Hills mobs
 
+012-1.gat,0,0,0,0	monster	Flower	1014,13,0,100,Mob012-1::On1014
+012-1.gat,0,0,0,0	monster	SpikyMushroom	1019,25,0,10,Mob012-1::On1019
+012-1.gat,0,0,0,0	monster	Mouboo	1028,20,0,10,Mob012-1::On1028
+012-1.gat,0,0,0,0	monster	Mauve	1029,5,2700000,1800000,Mob012-1::On1029
+012-1.gat,0,0,0,0	monster	Cobalt	1030,2,2700000,1800000,Mob012-1::On1030
+012-1.gat,0,0,0,0	monster	Gamboge	1031,2,2700000,1800000,Mob012-1::On1031
+012-1.gat,0,0,0,0	monster	Alizarin	1032,2,2700000,1800000,Mob012-1::On1032
+012-1.gat,0,0,0,0	monster	SilkWorm	1035,5,60000,30000,Mob012-1::On1035
 012-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob012-1::On1037
+012-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob012-1::On1038
 
 
 012-1.gat,0,0,0	script	Mob012-1	-1,{
+On1014:
+	set @mobID, 1014;
+	callfunc "MobPoints";
+	break;
+
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
+On1028:
+	set @mobID, 1028;
+	callfunc "MobPoints";
+	break;
+
+On1029:
+	set @mobID, 1029;
+	callfunc "MobPoints";
+	break;
+
+On1030:
+	set @mobID, 1030;
+	callfunc "MobPoints";
+	break;
+
+On1031:
+	set @mobID, 1031;
+	callfunc "MobPoints";
+	break;
+
+On1032:
+	set @mobID, 1032;
+	callfunc "MobPoints";
+	break;
+
+On1035:
+	set @mobID, 1035;
+	callfunc "MobPoints";
+	break;
+
 On1037:
 	set @mobID, 1037;
 	callfunc "MobPoints";
 	break;
 
+On1038:
+	set @mobID, 1038;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/012-1_Woodland_Hills/monsters.txt b/npc/012-1_Woodland_Hills/monsters.txt
deleted file mode 100644
index c9c4ab02..00000000
--- a/npc/012-1_Woodland_Hills/monsters.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-// Map: 012-1
-// This is North Woodland.
-//
-
-012-1.gat,0,0,0,0	monster	Mouboo		1028,25,0,0,Mob26::OnMouboo
-012-1.gat,0,0,0,0	monster	SpikyMushroom	1019,30,0,0,Mob26::OnSpikyMushroom
-
-012-1.gat,0,0,0,0	monster	Alizarin	1032,2,2700000,1800000,Mob26::OnAlizarin
-012-1.gat,0,0,0,0	monster	Gamboge		1031,2,2700000,1800000,Mob26::OnGamboge
-012-1.gat,0,0,0,0	monster	Cobalt		1030,2,2700000,1800000,Mob26::OnCobalt
-012-1.gat,0,0,0,0	monster	Mauve		1029,6,2700000,1800000,Mob26::OnMauve
-
-012-1.gat,0,0,0,0	monster	SilkWorm	1035,5,6000,3000,Mob26::OnSilkWorm
-
-012-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob26::OnSquirrel
-
-012-1.gat,0,0,0	script	Mob26	-1,{
-OnMouboo:
-	set @mobID, 1028;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	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;
-}