3 files changed, 27 insertions, 51 deletions
diff --git a/npc/007-1_Woodland/_import.txt b/npc/007-1_Woodland/_import.txt
index 1bd01390..0b239a93 100644
--- a/npc/007-1_Woodland/_import.txt
+++ b/npc/007-1_Woodland/_import.txt
@@ -1,4 +1,3 @@
 map: 007-1.gat
 npc: npc/007-1_Woodland/_mobs.txt
 npc: npc/007-1_Woodland/_warps.txt
-npc: npc/007-1_Woodland/monsters.txt
diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt
index 6fc539af..7838015f 100644
--- a/npc/007-1_Woodland/_mobs.txt
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -1,9 +1,13 @@
 // 007-1 Woodland mobs
 
-007-1.gat,53,46,67,53	monster	Flower	1014,15,100000,30000,Mob007-1::On1014
-007-1.gat,105,57,53,74	monster	Fluffy	1020,20,100000,30000,Mob007-1::On1020
-007-1.gat,105,48,55,51	monster	Spiky Mushroom	1019,10,100000,30000,Mob007-1::On1019
+007-1.gat,0,0,0,0	monster	Flower	1014,17,100000,30000,Mob007-1::On1014
+007-1.gat,0,0,0,0	monster	Spiky Mushroom	1019,15,100000,30000,Mob007-1::On1019
+007-1.gat,0,0,0,0	monster	Fluffy	1020,25,100000,30000,Mob007-1::On1020
+007-1.gat,0,0,0,0	monster	Mauve	1029,3,270000,180000,Mob007-1::On1029
+007-1.gat,0,0,0,0	monster	Gamboge	1031,1,2700000,1800000,Mob007-1::On1031
+007-1.gat,0,0,0,0	monster	SilkWorm	1035,2,60000,30000,Mob007-1::On1035
 007-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob007-1::On1037
+007-1.gat,0,0,0,0	monster	Squirrel	1038,25,30,20,Mob007-1::On1038
 
 
 007-1.gat,0,0,0	script	Mob007-1	-1,{
@@ -22,10 +26,30 @@ On1020:
 	callfunc "MobPoints";
 	break;
 
+On1029:
+	set @mobID, 1029;
+	callfunc "MobPoints";
+	break;
+
+On1031:
+	set @mobID, 1031;
+	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/007-1_Woodland/monsters.txt b/npc/007-1_Woodland/monsters.txt
deleted file mode 100644
index ab1f2b7d..00000000
--- a/npc/007-1_Woodland/monsters.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-// Map: 007-1
-// This is South-East Woodland.
-//
-
-007-1.gat,0,0,0,0	monster	Fluffy	1020,50,20,15,Mob16::OnFluffy
-007-1.gat,0,0,0,0	monster	Flower	1014,40,30,10,Mob16::OnFlower
-
-007-1.gat,0,0,0,0	monster	Gamboge	1031,1,2700000,1800000,Mob16::OnGamboge
-007-1.gat,0,0,0,0	monster	Mauve	1029,4,270000,180000,Mob16::OnMauve
-
-007-1.gat,0,0,0,0	monster	SilkWorm	1035,2,60000,30000,Mob16::OnSilkWorm
-
-007-1.gat,0,0,0,0	monster	Squirrel	1038,30,20,10,Mob16::OnSquirrel
-
-007-1.gat,0,0,0	script	Mob16	-1,{
-OnFluffy:
-	set @mobID, 1020;
-	callfunc "MobPoints";
-	break;
-
-OnFlower:
-	set @mobID, 1014;
-	callfunc "MobPoints";
-	break;
-
-OnMauve:
-	set @mobID, 1029;
-	callfunc "MobPoints";
-	break;
-
-OnGamboge:
-	set @mobID, 1031;
-	callfunc "MobPoints";
-	break;
-
-OnSilkWorm:
-	set @mobID, 1035;
-	callfunc "MobPoints";
-	break;
-
-OnSquirrel:
-	set @mobID, 1038;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}