3 files changed, 16 insertions, 9 deletions
diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt
index 951774eb8..6087b8789 100644
--- a/npc/003-1/aidan.txt
+++ b/npc/003-1/aidan.txt
@@ -189,15 +189,6 @@ OnInit:
     .sex = G_MALE;
     .distance = 5;
     end;
-
-
-OnNPCKillEvent:
-    if (getq(General_Hunter) == 0) end;
-
-    .@ghd=getq(General_Hunter);
-    if (killedrid == GHQ_GetMonsterIDByQuestID(.@ghd))
-        setq2 General_Hunter, getq2(General_Hunter)+1;
-    end;
 }
 
 
diff --git a/npc/functions/mobhunter.txt b/npc/functions/mobhunter.txt
index 7030d28ef..9c3f76571 100644
--- a/npc/functions/mobhunter.txt
+++ b/npc/functions/mobhunter.txt
@@ -3,6 +3,21 @@
 // Desc:   Grand Hunter Quest Utils
 // Note:   Remember to update Aidan too
 
+function	script	mobhunter	{
+    if (getq(General_Hunter) == 0)
+        return;
+
+    .@ghd=getq(General_Hunter);
+    if (killedrid == GHQ_GetMonsterIDByQuestID(.@ghd)) {
+        setq2 General_Hunter, getq2(General_Hunter)+1;
+        .@ghd=getq2(General_Hunter);
+        if (! (.@ghd % 1000))
+            dispbottom l("Grand Hunter Quest: @@/10,000", format_number(.@ghd));
+    }
+    return;
+
+}
+
 // MobID
 function	script	GHQ_GetQuestIDByMonsterID	{
     switch (getarg(0)) {
diff --git a/npc/functions/mobpoint.txt b/npc/functions/mobpoint.txt
index d59eeac8d..dfdeb53a0 100644
--- a/npc/functions/mobpoint.txt
+++ b/npc/functions/mobpoint.txt
@@ -35,6 +35,7 @@ OnNPCKillEvent:
 
     // call functions
     callfunc "mobpoint";
+    callfunc "mobhunter";
     callfunc "SQuest_Hasan";
     end;