8 files changed, 70 insertions, 57 deletions
diff --git a/npc/000-1/_import.txt b/npc/000-1/_import.txt
index ccbf2979..3846cc45 100644
--- a/npc/000-1/_import.txt
+++ b/npc/000-1/_import.txt
@@ -1,16 +1,21 @@
 map: 000-1.gat
 npc: npc/000-1/_mobs.txt
 npc: npc/000-1/_warps.txt
-npc: npc/000-1/silvio.txt
-npc: npc/000-1/darlin.txt
-npc: npc/000-1/mickael.txt
-npc: npc/000-1/muller.txt
+
+npc: npc/000-1/ale.txt
 npc: npc/000-1/astapolos.txt
-npc: npc/000-1/max.txt
-npc: npc/000-1/sapartan.txt
-npc: npc/000-1/tarlan.txt
 npc: npc/000-1/chest.txt
-npc: npc/000-1/shop.txt
+npc: npc/000-1/couwan.txt
+npc: npc/000-1/darlin.txt
 npc: npc/000-1/fexil.txt
 npc: npc/000-1/gugli.txt
 npc: npc/000-1/gulukan.txt
+npc: npc/000-1/jalad.txt
+npc: npc/000-1/lean.txt
+npc: npc/000-1/max.txt
+npc: npc/000-1/muller.txt
+npc: npc/000-1/sapartan.txt
+npc: npc/000-1/silvio.txt
+npc: npc/000-1/shop.txt
+npc: npc/000-1/tarlan.txt
+npc: npc/000-1/tibbo.txt
diff --git a/npc/000-1/_mobs.txt b/npc/000-1/_mobs.txt
index d857b684..206118bd 100644
--- a/npc/000-1/_mobs.txt
+++ b/npc/000-1/_mobs.txt
@@ -1,12 +1,4 @@
 // 000-1 mobs
-<<<<<<< HEAD
-
-000-1.gat,0,0,0	script	Mob000-1	-1,{
-	end;
-}
-=======
-000-1.gat,0,0,0,0	monster	Piou	1002,4,15000,10000
 000-1.gat,61,122,77,31	monster	Tortuga	1004,4,35000,28000
 000-1.gat,28,46,13,24	monster	Tortuga	1004,2,16000,12000
 000-1.gat,79,48,59,56	monster	Tortuga	1004,5,16000,12000
->>>>>>> Add mobs on 000-1 map.
diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
new file mode 100644
index 00000000..60c58868
--- /dev/null
+++ b/npc/000-1/ale.txt
@@ -0,0 +1,14 @@
+// Evol scripts.
+// Author:
+//    Reid
+// Description:
+//    .
+
+000-1.gat,55,23,0,1	script	Ale	105;2,{
+
+    mesn;
+    mesq l("Hello world!");
+
+    close;
+
+}
diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt
new file mode 100644
index 00000000..68504240
--- /dev/null
+++ b/npc/000-1/couwan.txt
@@ -0,0 +1,14 @@
+// Evol scripts.
+// Author:
+//    Reid
+// Description:
+//    .
+
+000-1.gat,89,36,0,1	script	Couwan	111;2,{
+
+    mesn;
+    mesq l("Hello world!");
+
+    close;
+
+}
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index 51a89039..37ba393d 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -4,7 +4,7 @@
 // Description:
 //    .
 
-000-1.gat,34,90,0,1	script	Gulukan	111;2,{
+000-1.gat,54,90,0,1	script	Gulukan	111;2,{
 
     mesn;
     mesq l("Hello world!");
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
new file mode 100644
index 00000000..75ee5587
--- /dev/null
+++ b/npc/000-1/jalad.txt
@@ -0,0 +1,14 @@
+// Evol scripts.
+// Author:
+//    Reid
+// Description:
+//    .
+
+000-1.gat,46,35,0,1	script	Jalad	110;2,{
+
+    mesn;
+    mesq l("Hello world!");
+
+    close;
+
+}
diff --git a/npc/000-1/mickael.txt b/npc/000-1/mickael.txt
deleted file mode 100644
index bc634a0a..00000000
--- a/npc/000-1/mickael.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-// Evol scripts.
-// Author:
-//    Reid
-// Description:
-//    Sailor who gives some informations to the player.
-
-000-1.gat,79,108,0,1	script	Mickael	106;2,{
-
-    mesn;
-    mesq l("Oh, hey you.");
-    next;
-    mesq l("I hope that you don't mind that we used your raft to build this ramp.");
-    next;
-    mesq l("We usually don't stop in such places, but the capt'ain let us stay here while he writes the location of this new island on his map!");
-    next;
-    mesq l("So we are looking for some new merchandise that we could trade at our next destination.");
-    next;
-    mesq l("That's where you go as well, right?");
-    next;
-
-    menu
-        l("That's right."), -,
-        l("Where?"), l_Artis;
-
-    mes "";
-    mesn;
-    mesq l("If you are looking for us there, mostly all of us will be at Pedro's restaurant and in the Inn for Silvio's case.");
-
-    close;
-
-l_Artis:
-    mes "";
-    mesn;
-    mesq l("Artis of course!");
-    next;
-    mesq l("It's where every merchant ship ends their travel and we won't be an exception.");
-
-    close;
-
-}
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
new file mode 100644
index 00000000..8d97d947
--- /dev/null
+++ b/npc/000-1/tibbo.txt
@@ -0,0 +1,14 @@
+// Evol scripts.
+// Author:
+//    Reid
+// Description:
+//    .
+
+000-1.gat,34,111,0,1	script	Tibbo	110;2,{
+
+    mesn;
+    mesq l("Hello world!");
+
+    close;
+
+}