2 files changed, 4 insertions, 15 deletions
diff --git a/world/map/npc/022-1/adrian.txt b/world/map/npc/022-1/adrian.txt
index e4e1e2c6..978c537e 100644
--- a/world/map/npc/022-1/adrian.txt
+++ b/world/map/npc/022-1/adrian.txt
@@ -7,7 +7,7 @@
 
 022-1.gat,58,54,0|script|Adrian|213,
 {
-    set @state, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
+    set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
     mes "[Adrian]";
     mes "\"Hello. Are you here to get the luggage for some of our passengers?\"";
@@ -36,7 +36,7 @@ L_Get:
     mes "Adrain hands you a very heavy suitcase.";
     getitem "LeatherSuitcase", 1;
     set @state, 2;
-    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~($@businessmanNT_MASK)) | (@state << $@businessmanNT_SHIFT);
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_5_MASK)) | (@state << NIBBLE_5_SHIFT);
     goto L_Close;
 
 L_Inventory:
diff --git a/world/map/npc/022-1/anwar.txt b/world/map/npc/022-1/anwar.txt
index f01089aa..7c031d9c 100644
--- a/world/map/npc/022-1/anwar.txt
+++ b/world/map/npc/022-1/anwar.txt
@@ -16,20 +16,9 @@
 // state 13: Anwar asked to bring present to Eomie
 // state 14: gave present to Eomie
 // state 15: reported back to Anwar and done
-
--|script|#magicfieldNTconfig|-1,
-{
-    end;
-
-OnInit:
-    set $@magicfieldNT_MASK, NIBBLE_3_MASK;
-    set $@magicfieldNT_SHIFT, NIBBLE_3_SHIFT;
-    end;
-}
-
 022-1.gat,41,46,0|script|Anwar|156,
 {
-    set @state, ((QUEST_NorthTulimshar & $@magicfieldNT_MASK) >> $@magicfieldNT_SHIFT);
+    set @state, ((QUEST_NorthTulimshar & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
     set @cloth_amount, 3;
     set @silk_amount, 30;
@@ -209,6 +198,6 @@ L_Close:
     close;
 
 S_Update_Mask:
-    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~($@magicfieldNT_MASK)) | (@state << $@magicfieldNT_SHIFT);
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~(NIBBLE_3_MASK)) | (@state << NIBBLE_3_SHIFT);
     return;
 }