9 files changed, 7 insertions, 21 deletions
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index 62c76e38..6f4be2bd 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -163,7 +163,7 @@ L_Next2:
 
 L_intro_proof:
     mes "[Airlia]";
-    mes "\"Let's say " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s. You don't know how much this means to me, thank you.\"";
+    mes "\"Let's say " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s. You don't know how much this means to me, thank you.\"";
     set QUEST_Airlia, @Q_STATUS_HELP_AIRLIA;
     close;
 
@@ -180,12 +180,12 @@ L_Fetch:
     if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
         menu
             "You are welcome.", L_Close,
-            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
     if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
         menu
             "You are welcome.", L_Close,
             "I have another letter from your father.", L_later_rewards,
-            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
+            "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward;
     goto L_Close;
 
 L_Fetch_initial_reward:
@@ -233,12 +233,12 @@ L_Rewarded:
     if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER)
         menu
             "You are welcome.", L_Close,
-            "I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+            "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
     if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER)
         menu
             "You are welcome.", L_Close,
             "I have another letter from your father.", L_later_rewards,
-            "I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
+            "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards;
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index 412b5823..6e0e6f21 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -10,8 +10,6 @@
 // Archer Shop Master
 009-2,99,23,0|script|Alan|125
 {
-    callfunc "ClearVariables";
-
     set @Q_MASK, NIBBLE_0_MASK;
     set @Q_SHIFT, NIBBLE_0_SHIFT;
 
diff --git a/world/map/npc/009-2/bernard.txt b/world/map/npc/009-2/bernard.txt
index f0c03fbc..1d6b4229 100644
--- a/world/map/npc/009-2/bernard.txt
+++ b/world/map/npc/009-2/bernard.txt
@@ -2,9 +2,6 @@
 
 009-2,67,79,0|script|Bernard|117
 {
-    // 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_Done3;
diff --git a/world/map/npc/009-2/doctor.txt b/world/map/npc/009-2/doctor.txt
index 9137d8d4..f44cda64 100644
--- a/world/map/npc/009-2/doctor.txt
+++ b/world/map/npc/009-2/doctor.txt
@@ -2,8 +2,6 @@
 
 009-2,148,25,0|script|Doctor|107
 {
-    callfunc "ClearVariables";
-
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
     if (getequipid(equip_head) == 616) goto L_Axe;
diff --git a/world/map/npc/009-2/inspector.txt b/world/map/npc/009-2/inspector.txt
index 966fe45e..d61fc708 100644
--- a/world/map/npc/009-2/inspector.txt
+++ b/world/map/npc/009-2/inspector.txt
@@ -2,8 +2,6 @@
 
 009-2,24,99,0|script|Inspector#Hurnscald|150
 {
-    callfunc "ClearVariables";
-
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
     if (@inspector == 0 && BaseLevel >= 30) goto L_Start;
diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt
index e151736b..6f22030a 100644
--- a/world/map/npc/009-2/lena.txt
+++ b/world/map/npc/009-2/lena.txt
@@ -3,9 +3,6 @@
 
 009-2,146,43,0|script|Lena|182
 {
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
-
     set @state, ((QUEST_Hurnscald & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
 
     if (@state >= 6) goto L_Lena_Done;
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index fa1ee5d2..8a5b3862 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -24,7 +24,6 @@
 //######################################################################################
 009-2,147,65,0|script|Nurse|119
 {
-    callfunc "ClearVariables";
     set @halloween_npc_id, $@halloween_npc_nurse;
     callfunc "TrickOrTreat";
 
diff --git a/world/map/npc/009-2/richard.txt b/world/map/npc/009-2/richard.txt
index b39a7969..11c180d4 100644
--- a/world/map/npc/009-2/richard.txt
+++ b/world/map/npc/009-2/richard.txt
@@ -2,7 +2,6 @@
 
 009-2,20,99,0|script|Richard|161
 {
-    callfunc "ClearVariables";
     set @npcname$, "Richard";
     callfunc "Banker";
     close;
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index 80abfdcc..474dec3c 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -140,7 +140,7 @@ L_explain_dye:
     goto L_Close;
 
 L_finish:
-    if(getitemname($@DYE_colors$[@colour] + @item_del$) == "Unknown Item") mapexit;
+    if(getitemlink($@DYE_colors$[@colour] + @item_del$) == "Unknown Item") mapexit;
     if(countitem(@item_del$) < 1) goto L_havenone;
     delitem @item$, 1;
     delitem @item_del$, 1;
@@ -159,6 +159,6 @@ L_havenone:
 L_Close:
     mes "\"Farewell and good luck in your journeys!\"";
     close2;
-    emotion EMOTE_WINK;
+    emotion EMOTE_WINK, strcharinfo(0);
     end;
 }