1 files changed, 17 insertions, 14 deletions
diff --git a/world/map/npc/042-1/zegas.txt b/world/map/npc/042-1/zegas.txt
index d3dc118c..36443a91 100644
--- a/world/map/npc/042-1/zegas.txt
+++ b/world/map/npc/042-1/zegas.txt
@@ -32,7 +32,8 @@ L_Meet:
     mes "\"Wouldn't you know it, the bug bomb Eomie gave us is in one of the store room barrels.\"";
     next;
     mes "\"Can you search the barrels for the bug bomb and set it off when you find it?\"";
-    set TUTORIAL, TUTORIAL | $@ZegasMetBit;
+    set @barrel_tmp, 1;
+    callfunc "SetBarrelMask";
     menu
         "Sure.",L_Start,
         "Maybe some other time.",L_Close;
@@ -48,7 +49,8 @@ L_Find:
 
 L_Start:
     mes "[Zegas]";
-    set TUTORIAL, TUTORIAL | $@BarrelStartBit;
+    set @barrel_tmp, 2;
+    callfunc "SetBarrelMask";
     mes "\"Thanks, come back and see me once you found the bug bomb and set it off.\"";
     goto L_Close;
 
@@ -60,11 +62,12 @@ L_Looking:
 L_QuestEnd:
     mes "[Zegas]";
     mes "\"From the smell I can see you found the bug bomb!\"";
-    getexp 50, 0;
-    next;
     mes "\"Thanks once again, I know it's not much but here is 50 GP for your troubles.\""; 
+    getexp 50, 0;
     set Zeny, (Zeny + 50);
-    set TUTORIAL, TUTORIAL | $@BarrelEndBit;
+    set @barrel_tmp, 4;
+    callfunc "SetBarrelMask";
+    next;
     goto L_Close;
 
 L_Thanks:
@@ -84,15 +87,15 @@ L_Close:
         "No.", L_End;
 
 L_Reset:
-    set TUTORIAL, TUTORIAL &~ $@BarrelStartBit;
-    set TUTORIAL, TUTORIAL &~ $@BarrelEndBit;
-    set TUTORIAL, TUTORIAL &~ (1 << 17);
-    set TUTORIAL, TUTORIAL &~ (1 << 18);
-    set TUTORIAL, TUTORIAL &~ (1 << 19);
-    set TUTORIAL, TUTORIAL &~ (1 << 20);
-    set TUTORIAL, TUTORIAL &~ (1 << 21);
-    set TUTORIAL, TUTORIAL &~ (1 << 22);
-    set TUTORIAL, TUTORIAL &~ (1 << 30);
+    set STARTAREA, (STARTAREA & ~(NIBBLE_4_MASK) | (0 << NIBBLE_4_SHIFT));
+    set STARTAREA, STARTAREA &~ (1 << 20);
+    set STARTAREA, STARTAREA &~ (1 << 21);
+    set STARTAREA, STARTAREA &~ (1 << 22);
+    set STARTAREA, STARTAREA &~ (1 << 23);
+    set STARTAREA, STARTAREA &~ (1 << 24);
+    set STARTAREA, STARTAREA &~ (1 << 25);
+    set STARTAREA, STARTAREA &~ (1 << 26);
+    set STARTAREA, STARTAREA &~ (1 << 27);
     mes "Reset!";
     goto L_End;