summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/003-1/_import.txt1
-rw-r--r--npc/003-1/quirino.txt (renamed from npc/003-10/quirino.txt)3
-rw-r--r--npc/003-10/_import.txt1
3 files changed, 2 insertions, 3 deletions
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 4d1007fc7..5b98f434d 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -26,6 +26,7 @@
"npc/003-1/neko.txt",
"npc/003-1/ninathetraveler.txt",
"npc/003-1/oldwell.txt",
+"npc/003-1/quirino.txt",
"npc/003-1/sailors.txt",
"npc/003-1/sarah.txt",
"npc/003-1/sewer.txt",
diff --git a/npc/003-10/quirino.txt b/npc/003-1/quirino.txt
index efead1db7..d2e5019ec 100644
--- a/npc/003-10/quirino.txt
+++ b/npc/003-1/quirino.txt
@@ -10,9 +10,8 @@
// 0: Register open
// 1: Fight happening
// 2: Event finished
-// TODO: NPC must be moved, or have a storeall option
-003-10,27,60,0 script Quirin NPC_ERNANDO,{
+003-1,48,73,0 script Quirin NPC_ERNANDO,{
if (is_gm()) goto L_Hub;
if ($EVENT$ != "Hunger") goto L_NoSeason;
if ($@EQ_STATUS == 0)
diff --git a/npc/003-10/_import.txt b/npc/003-10/_import.txt
index 983b7d31f..da6668941 100644
--- a/npc/003-10/_import.txt
+++ b/npc/003-10/_import.txt
@@ -3,5 +3,4 @@
"npc/003-10/_warps.txt",
"npc/003-10/arnea.txt",
"npc/003-10/guarddevoir.txt",
-"npc/003-10/quirino.txt",
"npc/003-10/slots.txt",