3 files changed, 45 insertions, 41 deletions

diff --git a/npc/000-2-1/_import.txt b/npc/000-2-1/_import.txt
index c85bfca6..eeaf6f5f 100644
--- a/npc/000-2-1/_import.txt
+++ b/npc/000-2-1/_import.txt
@@ -8,3 +8,4 @@ npc: npc/000-2-1/devis.txt
 npc: npc/000-2-1/arpan.txt
 npc: npc/000-2-1/knife.txt
 npc: npc/000-2-1/dan.txt
+npc: npc/000-2-1/savepoint.txt
\ No newline at end of file
diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt
new file mode 100644
index 00000000..f2175126
--- /dev/null
+++ b/npc/000-2-1/savepoint.txt
@@ -0,0 +1,13 @@
+// Evol scripts.
+// Authors:
+//    Reid
+// Description:
+//    Save location in 000-2-1 map.
+
+    callfunc "SavePoint";
+    set @map$, "000-2-1.gat";
+    set @x, 30;
+    set @y, 37;
+    close;
+
+}
diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt
index 95aee41f..14d9149e 100644
--- a/npc/functions/savepoint.txt
+++ b/npc/functions/savepoint.txt
@@ -5,52 +5,42 @@
 //    Add new save point localisation
 
 function	script	SavePoint	{
-  mesn "Narrator";
-  mes col(l("There is a nice place to stay beside you."), 9);
-  next;
-  mes col(l("What do you wish to do?"), 9);
-  next;
-
-  menu
-      l("Take a nap"), -,
-      l("Nothing"), L_Return;
-
-  if (PlayerInformations_SavePoint == 1)
-  goto L_Shortversion;
-
-  mesn "Narrator";
-  mes col(l("You close your eyes some seconds..."), 9);
-  next;
-  mes col(l("..."), 9);
-  next;
-  mes col(l("..."), 9);
-  next;
-  mes col(l("..."), 9);
-  next;
-  mes col(l("Your position get saved."), 9);
-  next;
-
-  set PlayerInformations_SavePoint, 1;
-  goto L_Save;
+    mesn "Narrator";
+    mes col(l("There is a nice place to stay beside you."), 9);
+    next;
+    mes col(l("What do you wish to do?"), 9);
+    next;
+
+    menu
+        l("Take a nap"), -,
+        l("Nothing"), L_Return;
+
+    if (PlayerInformations_SavePoint == 1)
+        goto L_Shortversion;
+
+    mesn "Narrator";
+    mes col(l("You close your eyes some seconds..."), 9);
+    next;
+    mes col(l("..."), 9);
+    next;
+    mes col(l("..."), 9);
+    next;
+    mes col(l("..."), 9);
+    next;
+    mes col(l("Your position get saved."), 9);
+    next;
+
+    set PlayerInformations_SavePoint, 1;
+        goto L_Save;
 
 L_Shortversion:
-  mesn "Narrator";
-  mes col(l("Your position get saved."), 9);
-  next;
+    mesn "Narrator";
+    mes col(l("Your position get saved."), 9);
+    next;
 
 L_Save:
-    if (@x == 0 && @y == 0)
-        goto L_FindPoint;
-
-L_Do_Save:
     savepoint @map$, @x, @y;
-    goto L_Return;
-
-L_FindPoint:
-    set @n, rand(getarraysize(@Xs));
-    set @x, @Xs[@n];
-    set @y, @Ys[@n];
-    goto L_Do_Save;
+        goto L_Return;
 
 L_Return:
     return;