3 files changed, 58 insertions, 71 deletions
diff --git a/npc/013-1_Woodland_hills/_import.txt b/npc/013-1_Woodland_hills/_import.txt
index 899d3d7e..ea553681 100644
--- a/npc/013-1_Woodland_hills/_import.txt
+++ b/npc/013-1_Woodland_hills/_import.txt
@@ -1,5 +1,4 @@
 map: 013-1.gat
 npc: npc/013-1_Woodland_hills/_mobs.txt
 npc: npc/013-1_Woodland_hills/_warps.txt
-npc: npc/013-1_Woodland_hills/monsters.txt
 npc: npc/013-1_Woodland_hills/sagatha.txt
diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1_Woodland_hills/_mobs.txt
index 32aeb3f6..5fba767e 100644
--- a/npc/013-1_Woodland_hills/_mobs.txt
+++ b/npc/013-1_Woodland_hills/_mobs.txt
@@ -1,13 +1,71 @@
 // 013-1 Woodland hills mobs
 
+013-1.gat,0,0,0,0	monster	Flower	1014,13,0,100,Mob013-1::On1014
+013-1.gat,0,0,0,0	monster	SpikyMushroom	1019,12,0,100,Mob013-1::On1019
+013-1.gat,0,0,0,0	monster	Mouboo	1028,5,0,100,Mob013-1::On1028
+013-1.gat,0,0,0,0	monster	Mauve	1029,1,270,180,Mob013-1::On1029
+013-1.gat,0,0,0,0	monster	Mauve	1029,4,2700000,1800000,Mob013-1::On1029
+013-1.gat,0,0,0,0	monster	Cobalt	1030,1,270,180,Mob013-1::On1030
+013-1.gat,0,0,0,0	monster	Cobalt	1030,2,2700000,1800000,Mob013-1::On1030
+013-1.gat,0,0,0,0	monster	Gamboge	1031,1,270,180,Mob013-1::On1031
+013-1.gat,0,0,0,0	monster	Gamboge	1031,2,2700000,1800000,Mob013-1::On1031
+013-1.gat,0,0,0,0	monster	Alizarin	1032,1,270,180,Mob013-1::On1032
+013-1.gat,0,0,0,0	monster	Alizarin	1032,2,2700000,1800000,Mob013-1::On1032
+013-1.gat,0,0,0,0	monster	SilkWorm	1035,4,60000,30000,Mob013-1::On1035
 013-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob013-1::On1037
+013-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob013-1::On1038
 
 
 013-1.gat,0,0,0	script	Mob013-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/013-1_Woodland_hills/monsters.txt b/npc/013-1_Woodland_hills/monsters.txt
deleted file mode 100644
index f9bb0925..00000000
--- a/npc/013-1_Woodland_hills/monsters.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-// Map: 013-2
-// This is North-East Woodland.
-//
-
-013-1.gat,0,0,0,0	monster	Mouboo		1028,5,0,0,Mob28::OnMouboo
-013-1.gat,0,0,0,0	monster	SpikyMushroom	1019,15,0,0,Mob28::OnSpikyMushroom
-013-1.gat,0,0,0,0	monster	Flower		1014,15,0,0,Mob28::OnFlower
-
-013-1.gat,0,0,0,0	monster	Alizarin	1032,1,0,0,Mob28::OnAlizarin
-013-1.gat,0,0,0,0	monster	Gamboge		1031,1,0,0,Mob28::OnGamboge
-013-1.gat,0,0,0,0	monster	Cobalt		1030,1,0,0,Mob28::OnCobalt
-013-1.gat,0,0,0,0	monster	Mauve		1029,1,0,0,Mob28::OnMauve
-
-013-1.gat,0,0,0,0	monster	Alizarin	1032,2,2700000,1800000,Mob28::OnAlizarin
-013-1.gat,0,0,0,0	monster	Gamboge		1031,2,2700000,1800000,Mob28::OnGamboge
-013-1.gat,0,0,0,0	monster	Cobalt		1030,2,2700000,1800000,Mob28::OnCobalt
-013-1.gat,0,0,0,0	monster	Mauve		1029,4,2700000,1800000,Mob28::OnMauve
-
-013-1.gat,0,0,0,0	monster	SilkWorm	1035,4,6000,3000,Mob28::OnSilkWorm
-
-013-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob28::OnSquirrel
-
-013-1.gat,0,0,0	script	Mob28	-1,{
-OnMouboo:
-	set @mobID, 1028;
-	callfunc "MobPoints";
-	break;
-
-OnSpikyMushroom:
-	set @mobID, 1019;
-	callfunc "MobPoints";
-	break;
-
-OnFlower:
-	set @mobID, 1014;
-	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;
-}