4 files changed, 7 insertions, 19 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index e6947d2a4..f94bc177a 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -36,13 +36,6 @@
 //= 2.4
 //=========================================================================
 
-1@tower	mapflag	src4instance
-2@tower	mapflag	src4instance
-3@tower	mapflag	src4instance
-4@tower	mapflag	src4instance
-5@tower	mapflag	src4instance
-6@tower	mapflag	src4instance
-
 alberta,214,77,6	script	Captain Janssen	4_M_SEAMAN,{
 	if (checkweight(Knife,1) == 0) {
 		mes "^008800Wait here!!";
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 16df567e3..2a64e13be 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -33,9 +33,6 @@
 //= 1.6
 //=========================================================================
 
-1@nyd	mapflag	src4instance
-2@nyd	mapflag	src4instance
-
 nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 	if (ins_nyd == 0) {
 		mes "A great stone gate stands before you. The sculpture of a terrible dragon spreads its powerful looking wings.";
@@ -153,7 +150,7 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 					mes "If you are ready, I will allow you to enter.";
 					close;
 				case 2:
-					goto L_Enter;
+					callsub L_Enter;
 				case 3:
 					close;
 				}
@@ -163,8 +160,12 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 			next;
 			if(select("I want to go in.", "I want to leave.") == 2)
 				close;
-			goto L_Enter;
+			callsub L_Enter;
 		} else {
+			.@instance = has_instance2("1@nyd");
+			if (.@instance >= 0) {
+				instance_attach(.@instance);
+			}
 			if (.@ins_nyd_check == 1) {
 				if ('ins_nyd2 == 3 || 'ins_nyd2 == 4) {
 					mes "[Yggdrasil Gatekeeper]";
@@ -179,7 +180,7 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 				next;
 				if(select("I want to go in.", "I want to leave.") == 2)
 					close;
-				goto L_Enter;
+				callsub L_Enter;
 			} else if (.@ins_nyd_check == 2) {
 				if (.@ins_nyd_check2 == 1) {
 					mes "[Yggdrasil Gatekeeper]";
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 48412a631..28cc9bbd5 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -33,9 +33,6 @@
 //= 1.7
 //=========================================================================
 
-1@orcs	mapflag	src4instance
-2@orcs	mapflag	src4instance
-
 //== Entrance ==============================================
 gef_fild10,242,202,0	script	Dimensional Gorge Piece	2_MONEMUS,{
 
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 90efe6f5c..de59b7599 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -35,9 +35,6 @@
 //= 2.3
 //=========================================================================
 
-1@cata	mapflag	src4instance
-2@cata	mapflag	src4instance
-
 //== Sealed Catacomb Entrance ==============================
 monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 	cutin "ins_cata_pri_n",2;