3 files changed, 64 insertions, 77 deletions
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
index 6160ff13..3c67f38f 100644
--- a/npc/014-1_Woodland/_import.txt
+++ b/npc/014-1_Woodland/_import.txt
@@ -1,6 +1,5 @@
 map: 014-1.gat
 npc: npc/014-1_Woodland/_mobs.txt
 npc: npc/014-1_Woodland/_warps.txt
-npc: npc/014-1_Woodland/monsters.txt
 npc: npc/014-1_Woodland/taro.txt
 npc: npc/014-1_Woodland/wedding-officiator.txt
diff --git a/npc/014-1_Woodland/_mobs.txt b/npc/014-1_Woodland/_mobs.txt
index 4c86f12b..19194433 100644
--- a/npc/014-1_Woodland/_mobs.txt
+++ b/npc/014-1_Woodland/_mobs.txt
@@ -1,13 +1,77 @@
 // 014-1 Woodland mobs
 
+014-1.gat,0,0,0,0	monster	EvilMushroom	1013,20,0,0,Mob014-1::On1013
+014-1.gat,0,0,0,0	monster	Flower	1014,25,0,0,Mob014-1::On1014
+014-1.gat,0,0,0,0	monster	Spiky Mushroom	1019,15,0,0,Mob014-1::On1019
+014-1.gat,0,0,0,0	monster	Mouboo	1028,5,0,10,Mob014-1::On1028
+014-1.gat,0,0,0,0	monster	Mauve	1029,1,270,180,Mob014-1::On1029
+014-1.gat,0,0,0,0	monster	Mauve	1029,5,2700000,1800000,Mob014-1::On1029
+014-1.gat,0,0,0,0	monster	Cobalt	1030,1,270,180,Mob014-1::On1030
+014-1.gat,0,0,0,0	monster	Cobalt	1030,2,2700000,1800000,Mob014-1::On1030
+014-1.gat,0,0,0,0	monster	Gamboge	1031,1,270,180,Mob014-1::On1031
+014-1.gat,0,0,0,0	monster	Gamboge	1031,2,2700000,1800000,Mob014-1::On1031
+014-1.gat,0,0,0,0	monster	Alizarin	1032,1,270,180,Mob014-1::On1032
+014-1.gat,0,0,0,0	monster	Alizarin	1032,2,2700000,1800000,Mob014-1::On1032
+014-1.gat,0,0,0,0	monster	SilkWorm	1035,4,6000,3000,Mob014-1::On1035
 014-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob014-1::On1037
+014-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob014-1::On1038
 
 
 014-1.gat,0,0,0	script	Mob014-1	-1,{
+On1013:
+	set @mobID, 1013;
+	callfunc "MobPoints";
+	break;
+
+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/014-1_Woodland/monsters.txt b/npc/014-1_Woodland/monsters.txt
deleted file mode 100644
index be07addc..00000000
--- a/npc/014-1_Woodland/monsters.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-// Map: 014-1
-// This is West Woodland.
-//
-
-014-1.gat,0,0,0,0	monster	Mouboo		1028,5,0,0,Mob29::OnMouboo
-014-1.gat,0,0,0,0	monster	EvilMushroom	1013,15,0,0,Mob29::OnEvilMushroom
-014-1.gat,0,0,0,0	monster	Flower		1014,25,0,0,Mob29::OnFlower
-014-1.gat,0,0,0,0	monster	FireGoblin	1011,20,0,0,Mob29::OnFireGoblin
-
-014-1.gat,0,0,0,0	monster	Alizarin	1032,1,0,0,Mob29::OnAlizarin
-014-1.gat,0,0,0,0	monster	Gamboge		1031,1,0,0,Mob29::OnGamboge
-014-1.gat,0,0,0,0	monster	Cobalt		1030,1,0,0,Mob29::OnCobalt
-014-1.gat,0,0,0,0	monster	Mauve		1029,1,0,0,Mob29::OnMauve
-
-014-1.gat,0,0,0,0	monster	Alizarin	1032,2,2700000,1800000,Mob29::OnAlizarin
-014-1.gat,0,0,0,0	monster	Gamboge		1031,2,2700000,1800000,Mob29::OnGamboge
-014-1.gat,0,0,0,0	monster	Cobalt		1030,2,2700000,1800000,Mob29::OnCobalt
-014-1.gat,0,0,0,0	monster	Mauve		1029,6,2700000,1800000,Mob29::OnMauve
-
-014-1.gat,0,0,0,0	monster	SilkWorm	1035,4,6000,3000,Mob29::OnSilkWorm
-
-014-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob29::OnSquirrel
-
-014-1.gat,0,0,0	script	Mob29	-1,{
-OnMouboo:
-	set @mobID, 1028;
-	callfunc "MobPoints";
-	break;
-
-OnEvilMushroom:
-	set @mobID, 1013;
-	callfunc "MobPoints";
-	break;
-
-OnFlower:
-	set @mobID, 1014;
-	callfunc "MobPoints";
-	break;
-
-OnFireGoblin:
-	set @mobID, 1011;
-	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;
-}