1 files changed, 36 insertions, 12 deletions
diff --git a/npc/018-6-3/main.txt b/npc/018-6-3/main.txt
index 8d38f1080..63064aa97 100644
--- a/npc/018-6-3/main.txt
+++ b/npc/018-6-3/main.txt
@@ -123,49 +123,73 @@ function BossRoom {
 OnRoomNorth:
 L_Room1:
     if (BossRoom(1, 62, 41, 121, 58, true)) {
-        debugmes "Here we need to enable room warps";
-        //enablenpc instance_npcname("#01863_fromNorthtoNW");
-        //enablenpc instance_npcname("#01863_fromNorthtoNE");
+        enablenpc instance_npcname("#01863_fromNorthtoNW");
+        enablenpc instance_npcname("#01863_fromNorthtoNE");
+        enablenpc instance_npcname("#01863_fromNorthtoOut");
     }
     end;
 
 OnRoomNW:
 L_Room2:
     if (BossRoom(2, 48, 65, 68, 85)) {
-        debugmes "Here we need to enable room warps";
-        //enablenpc instance_npcname("#01863_fromNWtoNorth");
-        //enablenpc instance_npcname("#01863_fromNWtoNC");
+        enablenpc instance_npcname("#01863_fromNWtoNorth");
+        enablenpc instance_npcname("#01863_fromNWtoNC");
+        enablenpc instance_npcname("#01863_fromNWtoSW");
     }
     end;
 
 OnRoomNC:
 L_Room4:
-    BossRoom(4, 77, 65, 103, 76);
+    if (BossRoom(4, 77, 65, 103, 76)) {
+        enablenpc instance_npcname("#01863_fromNCtoNW");
+        enablenpc instance_npcname("#01863_fromNCtoNE");
+        //enablenpc instance_npcname("#01863_fromNCtoCC");
+    }
     end;
 
 OnRoomNE:
 L_Room8:
-    BossRoom(8, 111, 65, 131, 85);
+    if (BossRoom(8, 111, 65, 131, 85)) {
+        enablenpc instance_npcname("#01863_fromNEtoNorth");
+        enablenpc instance_npcname("#01863_fromNEtoNC");
+        enablenpc instance_npcname("#01863_fromNEtoSE");
+    }
     end;
 
 OnRoomSW:
 L_Room16:
-    BossRoom(16, 48, 95, 68, 115);
+    if (BossRoom(16, 48, 95, 68, 115)) {
+        enablenpc instance_npcname("#01863_fromSWtoSouth");
+        enablenpc instance_npcname("#01863_fromSWtoSC");
+        enablenpc instance_npcname("#01863_fromSWtoNW");
+    }
     end;
 
 OnRoomSC:
 L_Room32:
-    BossRoom(32, 77, 104, 103, 115);
+    if (BossRoom(32, 77, 104, 103, 115)) {
+        enablenpc instance_npcname("#01863_fromSCtoSW");
+        enablenpc instance_npcname("#01863_fromSCtoSE");
+        //enablenpc instance_npcname("#01863_fromSCtoCC");
+    }
     end;
 
 OnRoomSE:
 L_Room64:
-    BossRoom(64, 111, 95, 131, 115);
+    if (BossRoom(64, 111, 95, 131, 115)) {
+        enablenpc instance_npcname("#01863_fromSEtoSouth");
+        enablenpc instance_npcname("#01863_fromSEtoSC");
+        enablenpc instance_npcname("#01863_fromSEtoNE");
+    }
     end;
 
 OnRoomSouth:
 L_Room128:
-    BossRoom(128, 62, 122, 121, 139, true);
+    if (BossRoom(128, 62, 122, 121, 139, true)) {
+        enablenpc instance_npcname("#01863_fromSouthtoSW");
+        enablenpc instance_npcname("#01863_fromSouthtoSE");
+        enablenpc instance_npcname("#01863_fromSouthtoOut");
+    }
     end;
 
 // Kill boss will use setq3 and also erase any remaining monster