Merge pull request #79 from wushin/Tile-Fixes-Map-Travelv2014.4.16

Tile map fixes sprite travel

1 files changed, 35 insertions, 6 deletions

diff --git a/world/map/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt
index b8fcf2c6..93f1700a 100644
--- a/world/map/npc/022-1/tutorial.txt
+++ b/world/map/npc/022-1/tutorial.txt
@@ -1,20 +1,49 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 // if you enter the tutorial area from outside, it is set to be already done
+// Tutorial
+// Nibble 0
+// 1-4: Sorfina
 
-022-1.gat,19,37,0|script|#tutorial-outside1|45,0,2
+022-1.gat,46,82,0|script|#tutorial-outside1|45,2,1
 {
     callfunc "TutorialCompleted";
-    warp "042-1.gat", 95, 69;
+    warp "042-1.gat", 115, 85;
     end;
 }
 
+-|script|#TutorialConfig|-1,
+{
+    end;
+
+OnInit:
+    set $@ScorpionFighter, 0;
+    set $@ScorpionTimer, 0;
+    set $@ScorpDeath, 0; 
+    set $@SorfinaHasanBit, (1 << 4); 
+    set $@TanishaHasanBit, (1 << 5); 
+    end;
+}
+
+function|script|TutorialState|,
+{
+    callfunc "ClearVariables";
+    set @tutorial, ((TUTORIAL & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
+    set @sorfina_hasan, (TUTORIAL & $@SorfinaHasanBit);
+    set @tanisha_hasan, (TUTORIAL & $@TanishaHasanBit);
+    return;
+}
+
+function|script|SetTutorialMask|,
+{
+    set TUTORIAL, (TUTORIAL & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
+    set @tutorial_tmp, 0;
+    return;
+}
+
 function|script|TutorialCompleted|,
 {
-    set hasan, 0;
-    set kaan, 0;
-    set sorfina, 0;
-    set tanisha, 0;
     set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
+    callfunc "ClearVariables";
     return;
 }