5 files changed, 6 insertions, 11 deletions
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index 6f5e65be..33a425e3 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -12,7 +12,7 @@
 008-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob008-1::On1055
 
 
-008-1,0,0,0|script|Mob008-1|-1
+008-1,0,0,0|script|Mob008-1|32767
 {
     end;
 
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 51c901a3..d0898823 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -135,7 +135,7 @@ L_End1:
 }
 
 
-008-1,59,38,0|script|#AnnualEaster|-1
+008-1,59,38,0|script|#AnnualEaster|32767
 {
     end;
 
@@ -225,14 +225,14 @@ S_disableEggs:
 
 S_relocateEasterEgg:
     if ($@peopleFoundEggs[$@EggID] < $@AEASTER_mapcount)
-        goto L_Return;
+        goto S_Return;
 
     set $@peopleFoundEggs[$@EggID], 0;
 
     set $@eastereggPos, rand(getarraysize($@easteregg_posx));
     npcwarp $@easteregg_posx[$@eastereggPos], $@easteregg_posy[$@eastereggPos], "#TestEgg" + $@EggID;
-    goto L_Return;
+    goto S_Return;
 
-L_Return:
+S_Return:
     return;
 }
diff --git a/world/map/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt
index dae18c13..6570f1d8 100644
--- a/world/map/npc/008-1/diryn.txt
+++ b/world/map/npc/008-1/diryn.txt
@@ -4,7 +4,7 @@
 
 008-1,81,82,0|script|Diryn the Traveler|103
 {
-    set @NpcName$, "Diryn";
+    set @npcname$, "Diryn";
     set @NpcTravelBit, $@hurnscald_bit;
     callfunc "Traveler";
     end;
diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt
index 0213c3cc..c2360141 100644
--- a/world/map/npc/008-1/hinnak.txt
+++ b/world/map/npc/008-1/hinnak.txt
@@ -7,8 +7,6 @@
 
 008-1,101,30,0|script|Hinnak|142
 {
-    callfunc "ClearVariables";
-
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
     if (@inspector == 10) goto L_NohMask;
diff --git a/world/map/npc/008-1/mikhail.txt b/world/map/npc/008-1/mikhail.txt
index bf804796..98a58d12 100644
--- a/world/map/npc/008-1/mikhail.txt
+++ b/world/map/npc/008-1/mikhail.txt
@@ -2,9 +2,6 @@
 
 008-1,135,25,0|script|Mikhail|120
 {
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
-
     set @state, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
 
     if (@state >= 6) goto L_Done;