Mid boss fights are working, all 8 of them are fine =D

2 files changed, 30 insertions, 30 deletions

diff --git a/npc/018-6-3/main.txt b/npc/018-6-3/main.txt
index aceb78db4..df44376d6 100644
--- a/npc/018-6-3/main.txt
+++ b/npc/018-6-3/main.txt
@@ -49,10 +49,10 @@ function	script	01863_DisableAllWarps	{
     disablenpc instance_npcname("#01863_fromSEtoNE", .@q2);
     disablenpc instance_npcname("#01863_fromNCtoNW", .@q2);
     disablenpc instance_npcname("#01863_fromNCtoNE", .@q2);
-    //disablenpc instance_npcname("#01863_fromNCtoCC", .@q2);
+    disablenpc instance_npcname("#01863_fromNCtoCC", .@q2);
     disablenpc instance_npcname("#01863_fromSCtoSW", .@q2);
     disablenpc instance_npcname("#01863_fromSCtoSE", .@q2);
-    //disablenpc instance_npcname("#01863_fromSCtoCC", .@q2);
+    disablenpc instance_npcname("#01863_fromSCtoCC", .@q2);
     disablenpc instance_npcname("#01863_fromCCtoNC", .@q2);
     disablenpc instance_npcname("#01863_fromCCtoSC", .@q2);
     return;
@@ -145,7 +145,7 @@ L_Room4:
     if (BossRoom(4, 77, 65, 103, 76)) {
         enablenpc instance_npcname("#01863_fromNCtoNW");
         enablenpc instance_npcname("#01863_fromNCtoNE");
-        //enablenpc instance_npcname("#01863_fromNCtoCC");
+        enablenpc instance_npcname("#01863_fromNCtoCC");
     }
     end;
 
@@ -172,7 +172,7 @@ L_Room32:
     if (BossRoom(32, 77, 104, 103, 115)) {
         enablenpc instance_npcname("#01863_fromSCtoSW");
         enablenpc instance_npcname("#01863_fromSCtoSE");
-        //enablenpc instance_npcname("#01863_fromSCtoCC");
+        enablenpc instance_npcname("#01863_fromSCtoCC");
     }
     end;
 
diff --git a/npc/018-6-3/wsys.txt b/npc/018-6-3/wsys.txt
index 0fce5f11a..7d5abc264 100644
--- a/npc/018-6-3/wsys.txt
+++ b/npc/018-6-3/wsys.txt
@@ -17,7 +17,7 @@ OnTouch:
     slide 86, 44;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNorth";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNorth";
     end;
 
 // NPC must remain hidden.
@@ -59,7 +59,7 @@ OnTouch:
     slide 58, 67;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNW";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNW";
     end;
 
 // NPC must remain hidden.
@@ -83,7 +83,7 @@ OnTouch:
     slide 65, 50;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNorth";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNorth";
     end;
 
 // NPC must remain hidden.
@@ -107,7 +107,7 @@ OnTouch:
     slide 122, 68;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNE";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNE";
     end;
 
 // NPC must remain hidden.
@@ -131,7 +131,7 @@ OnTouch:
     slide 118, 50;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNorth";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNorth";
     end;
 
 // NPC must remain hidden.
@@ -155,7 +155,7 @@ OnTouch:
     slide 79, 71;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNC";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNC";
     end;
 
 // NPC must remain hidden.
@@ -179,7 +179,7 @@ OnTouch:
     slide 66, 75;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNW";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNW";
     end;
 
 // NPC must remain hidden.
@@ -203,7 +203,7 @@ OnTouch:
     slide 57, 97;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSW";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSW";
     end;
 
 // NPC must remain hidden.
@@ -227,7 +227,7 @@ OnTouch:
     slide 57, 82;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNW";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNW";
     end;
 
 // NPC must remain hidden.
@@ -251,7 +251,7 @@ OnTouch:
     slide 101, 70;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNC";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNC";
     end;
 
 // NPC must remain hidden.
@@ -275,7 +275,7 @@ OnTouch:
     slide 113, 75;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNE";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNE";
     end;
 
 // NPC must remain hidden.
@@ -299,7 +299,7 @@ OnTouch:
     slide 121, 97;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSE";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSE";
     end;
 
 // NPC must remain hidden.
@@ -323,7 +323,7 @@ OnTouch:
     slide 121, 83;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNE";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNE";
     end;
 
 // NPC must remain hidden.
@@ -347,7 +347,7 @@ OnTouch:
     slide 64, 131;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSouth";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSouth";
     end;
 
 // NPC must remain hidden.
@@ -371,7 +371,7 @@ OnTouch:
     slide 57, 112;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSW";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSW";
     end;
 
 // NPC must remain hidden.
@@ -395,7 +395,7 @@ OnTouch:
     slide 119, 131;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSouth";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSouth";
     end;
 
 // NPC must remain hidden.
@@ -419,7 +419,7 @@ OnTouch:
     slide 123, 112;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSE";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSE";
     end;
 
 // NPC must remain hidden.
@@ -443,7 +443,7 @@ OnTouch:
     slide 79, 110;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSC";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSC";
     end;
 
 // NPC must remain hidden.
@@ -467,7 +467,7 @@ OnTouch:
     slide 65, 106;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSW";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSW";
     end;
 
 // NPC must remain hidden.
@@ -491,7 +491,7 @@ OnTouch:
     slide 101, 110;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSC";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSC";
     end;
 
 // NPC must remain hidden.
@@ -515,7 +515,7 @@ OnTouch:
     slide 113, 110;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSE";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSE";
     end;
 
 // NPC must remain hidden.
@@ -560,7 +560,7 @@ OnTouch:
     slide 92, 136;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSouth";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSouth";
     end;
 
 // NPC must remain hidden.
@@ -581,7 +581,7 @@ OnTouch:
     slide 90, 73;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomNC";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomNC";
     end;
 
 // NPC must remain hidden.
@@ -605,7 +605,7 @@ OnTouch:
     slide 90, 106;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomSC";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomSC";
     end;
 
 // NPC must remain hidden.
@@ -629,7 +629,7 @@ OnTouch:
     slide 90, 85;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomCC";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomCC";
     end;
 
 // NPC must remain hidden.
@@ -653,7 +653,7 @@ OnTouch:
     slide 90, 95;
 
     // Execute the next room code and finish
-    doevent instance_npcname("#01863_InstCtrl", .@q2)+"::OnRoomCC";
+    doevent instance_npcname("#01863_InstCtrl")+"::OnRoomCC";
     end;
 
 // NPC must remain hidden.