Fixes #1626. Adds missed mapflags on instances.

- Mapflags are moved into map_zone_db, this will make easier and more intuitive in the future to add mapflags to new instances and avoid miss any mapflag.
- Zone mapflags for renewal instances are moved into renewal folder.

Signed-off-by: Ragno <ragno@atlantis-ro.net>

26 files changed, 87 insertions, 372 deletions

diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index a3d465c0a..b8797a6d3 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -334,6 +334,19 @@ zones: (
 		SC_FATALMENACE: "PLAYER"
 		SC_DIMENSIONDOOR: "PLAYER"
 	}
+
+	mapflags: (
+		"nobranch",
+		"noicewall",
+		"nomemo",
+		"nosave	SavePoint",
+		"noteleport",
+		"monster_noteleport",
+		"nowarpto",
+		"partylock",
+		"pvp	off",
+		"src4instance",
+	)
 },
 {
 	name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */
@@ -347,6 +360,19 @@ zones: (
 		SC_FATALMENACE: "PLAYER"
 		SC_DIMENSIONDOOR: "PLAYER"
 	}
+
+	mapflags: (
+		"nobranch",
+		"noicewall",
+		"nomemo",
+		"nosave	SavePoint",
+		"noteleport",
+		"monster_noteleport",
+		"nowarpto",
+		"partylock",
+		"pvp	off",
+		"src4instance",
+	)
 },
 {
 	name: "Towns"
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index ae6f23f01..133cc5337 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -443,6 +443,19 @@ zones: (
 		SC_FATALMENACE: "PLAYER"
 		SC_DIMENSIONDOOR: "PLAYER"
 	}
+
+	mapflags: (
+		"nobranch",
+		"noicewall",
+		"nomemo",
+		"nosave	SavePoint",
+		"noteleport",
+		"monster_noteleport",
+		"nowarpto",
+		"partylock",
+		"pvp	off",
+		"src4instance",
+	)
 },
 {
 	name: "Memorial Dungeon" /* ETower, Orc's Memory, Nidhoggur's Nest, etc */
@@ -456,6 +469,19 @@ zones: (
 		SC_FATALMENACE: "PLAYER"
 		SC_DIMENSIONDOOR: "PLAYER"
 	}
+
+	mapflags: (
+		"nobranch",
+		"noicewall",
+		"nomemo",
+		"nosave	SavePoint",
+		"noteleport",
+		"monster_noteleport",
+		"nowarpto",
+		"partylock",
+		"pvp	off",
+		"src4instance",
+	)
 },
 {
 	name: "Towns"
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..d6d7742e3 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.";
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;
diff --git a/npc/mapflag/nobranch.txt b/npc/mapflag/nobranch.txt
index 60db05cf5..4ad59ad67 100644
--- a/npc/mapflag/nobranch.txt
+++ b/npc/mapflag/nobranch.txt
@@ -306,15 +306,7 @@ que_qaru04	mapflag	nobranch
 que_qaru05	mapflag	nobranch
 
 // Episode 12 ===========
-1@cata	mapflag	nobranch
-2@cata	mapflag	nobranch
 e_tower	mapflag	nobranch
-1@tower	mapflag	nobranch
-2@tower	mapflag	nobranch
-3@tower	mapflag	nobranch
-4@tower	mapflag	nobranch
-5@tower	mapflag	nobranch
-6@tower	mapflag	nobranch
 
 // Episode 13.1 ===========
 mid_camp	mapflag	nobranch
@@ -325,8 +317,6 @@ que_dan01	mapflag	nobranch
 que_dan02	mapflag	nobranch
 schg_que01	mapflag	nobranch
 arug_que01	mapflag	nobranch
-1@orcs	mapflag	nobranch
-2@orcs	mapflag	nobranch
 
 // Battle Grounds ==============
 bat_c01	mapflag	nobranch
@@ -339,8 +329,6 @@ bat_a01	mapflag	nobranch
 bat_a02	mapflag	nobranch
 
 // Episode 13.2 ===========
-1@nyd	mapflag	nobranch
-2@nyd	mapflag	nobranch
 manuk	mapflag	nobranch
 man_fild02	mapflag	nobranch
 man_in01	mapflag	nobranch
@@ -377,7 +365,6 @@ s_atelier	mapflag	nobranch
 
 // Episode 14.1 & Dewata ===========
 mora	mapflag	nobranch
-1@mist	mapflag	nobranch
 dewata	mapflag	nobranch
 dew_in01	mapflag	nobranch
 
@@ -385,16 +372,9 @@ dew_in01	mapflag	nobranch
 malangdo	mapflag	nobranch
 mal_in01	mapflag	nobranch
 mal_in02	mapflag	nobranch
-1@cash	mapflag	nobranch
-1@pump	mapflag	nobranch
-2@pump	mapflag	nobranch
-1@lhz	mapflag	nobranch
 malaya	mapflag	nobranch
 ma_scene01	mapflag	nobranch
 ma_in01	mapflag	nobranch
-1@ma_h	mapflag	nobranch
-1@ma_c	mapflag	nobranch
-1@ma_b	mapflag	nobranch
 
 // Episode 14.2 ===========
 eclage	mapflag	nobranch
@@ -402,7 +382,6 @@ ecl_in01	mapflag	nobranch
 ecl_in02	mapflag	nobranch
 ecl_in03	mapflag	nobranch
 ecl_in04	mapflag	nobranch
-1@ecl	mapflag	nobranch
 ecl_hub01	mapflag	nobranch
 
 // Episode 14.3 ===========
@@ -411,12 +390,6 @@ c_tower3_	mapflag	nobranch
 gl_chyard_	mapflag	nobranch
 gl_cas02_	mapflag	nobranch
 
-// Ghost Palace ===========
-1@spa	mapflag	nobranch
-
-// Sara's Memory Instance ===========
-1@sara	mapflag	nobranch
-
 //evt_zombie	mapflag	nobranch
 
 // Poring War ==================
diff --git a/npc/mapflag/noicewall.txt b/npc/mapflag/noicewall.txt
index 6c1af1b09..195bec2bb 100644
--- a/npc/mapflag/noicewall.txt
+++ b/npc/mapflag/noicewall.txt
@@ -159,53 +159,6 @@ nguild_gef	mapflag	noicewall
 nguild_pay	mapflag	noicewall
 nguild_prt	mapflag	noicewall
 
-//Endless Tower ==================
-1@tower	mapflag	noicewall
-2@tower	mapflag	noicewall
-3@tower	mapflag	noicewall
-4@tower	mapflag	noicewall
-5@tower	mapflag	noicewall
-6@tower	mapflag	noicewall
-
-// Orc's Memory ===================
-1@orcs	mapflag	noicewall
-2@orcs	mapflag	noicewall
-
-// Nidhoggr's Instance ===========
-1@nyd	mapflag	noicewall
-2@nyd	mapflag	noicewall
-
-// Misty Forest Labyrinth ===========
-1@mist	mapflag	noicewall
-
-// Octopus Cave ===========
-1@cash	mapflag	noicewall
-
-// Drain ===========
-1@pump	mapflag	noicewall
-2@pump	mapflag	noicewall
-
-// Somatology Laboratory ===========
-1@lhz	mapflag	noicewall
-
-// Bangungot Hospital F2 ===========
-1@ma_h	mapflag	noicewall
-
-// Buwaya Cave ===========
-1@ma_c	mapflag	noicewall
-
-// Bakonawa Hideout ===========
-1@ma_b	mapflag	noicewall
-
-// Inside Eclage ===========
-1@ecl	mapflag	noicewall
-
-// Ghost Palace ===========
-1@spa	mapflag	noicewall
-
-// Sara's Memory Instance ===========
-1@sara	mapflag	noicewall
-
 // Poring War ====================
 poring_w01	mapflag	noicewall
 poring_w02	mapflag	noicewall
diff --git a/npc/mapflag/nomemo.txt b/npc/mapflag/nomemo.txt
index a0dd66e9d..662bf4c05 100644
--- a/npc/mapflag/nomemo.txt
+++ b/npc/mapflag/nomemo.txt
@@ -656,18 +656,8 @@ que_qaru03	mapflag	nomemo
 que_qaru04	mapflag	nomemo
 que_qaru05	mapflag	nomemo
 
-//Sealed Shrine ==================
-1@cata	mapflag	nomemo
-2@cata	mapflag	nomemo
-
 //Endless Tower ==================
 e_tower	mapflag	nomemo
-1@tower	mapflag	nomemo
-2@tower	mapflag	nomemo
-3@tower	mapflag	nomemo
-4@tower	mapflag	nomemo
-5@tower	mapflag	nomemo
-6@tower	mapflag	nomemo
 
 // Battle Grounds ================
 bat_c01	mapflag	nomemo
@@ -731,7 +721,6 @@ dic_dun02	mapflag	nomemo
 // Episode 14 ====================
 bif_fild01	mapflag	nomemo
 bif_fild02	mapflag	nomemo
-1@mist	mapflag	nomemo
 mora	mapflag	nomemo
 dew_dun01	mapflag	nomemo
 dew_dun02	mapflag	nomemo
@@ -740,13 +729,9 @@ dic_dun03	mapflag	nomemo
 mal_in01	mapflag	nomemo
 mal_in02	mapflag	nomemo
 mal_dun01	mapflag	nomemo
-1@cash	mapflag	nomemo
-1@pump	mapflag	nomemo
-2@pump	mapflag	nomemo
 iz_dun05	mapflag	nomemo
 lhz_dun04	mapflag	nomemo
 que_lhz	mapflag	nomemo
-1@lhz	mapflag	nomemo
 gld_dun01_2	mapflag	nomemo
 gld_dun02_2	mapflag	nomemo
 gld_dun03_2	mapflag	nomemo
@@ -758,9 +743,6 @@ gld2_prt	mapflag	nomemo
 ma_scene01	mapflag	nomemo
 ma_in01	mapflag	nomemo
 ma_dun01	mapflag	nomemo
-1@ma_h	mapflag	nomemo
-1@ma_c	mapflag	nomemo
-1@ma_b	mapflag	nomemo
 ma_zif01	mapflag	nomemo
 ma_zif02	mapflag	nomemo
 ma_zif03	mapflag	nomemo
@@ -776,7 +758,6 @@ ecl_in01	mapflag	nomemo
 ecl_in02	mapflag	nomemo
 ecl_in03	mapflag	nomemo
 ecl_in04	mapflag	nomemo
-1@ecl	mapflag	nomemo
 ecl_tdun01	mapflag	nomemo
 ecl_tdun02	mapflag	nomemo
 ecl_tdun03	mapflag	nomemo
@@ -791,20 +772,6 @@ c_tower3_	mapflag	nomemo
 gl_chyard_	mapflag	nomemo
 gl_cas02_	mapflag	nomemo
 
-//Orc's Memory ===================
-1@orcs	mapflag	nomemo
-2@orcs	mapflag	nomemo
-
-// Nidhoggr's Instance ===========
-1@nyd	mapflag	nomemo
-2@nyd	mapflag	nomemo
-
-// Ghost Palace ===========
-1@spa	mapflag	nomemo
-
-// Sara's Memory Instance ===========
-1@sara	mapflag	nomemo
-
 //evt_zombie	mapflag	nomemo
 
 // Poring War ====================
diff --git a/npc/mapflag/nopvp.txt b/npc/mapflag/nopvp.txt
index 8a396bf69..41127332b 100644
--- a/npc/mapflag/nopvp.txt
+++ b/npc/mapflag/nopvp.txt
@@ -32,30 +32,6 @@
 //= Prevents PvP mode on a map.
 //=========================================================================
 
-1@cata	mapflag	pvp	off
-2@cata	mapflag	pvp	off
-1@nyd	mapflag	pvp	off
-2@nyd	mapflag	pvp	off
-1@orcs	mapflag	pvp	off
-2@orcs	mapflag	pvp	off
-1@tower	mapflag	pvp	off
-2@tower	mapflag	pvp	off
-3@tower	mapflag	pvp	off
-4@tower	mapflag	pvp	off
-5@tower	mapflag	pvp	off
-6@tower	mapflag	pvp	off
-1@mist	mapflag	pvp	off
-1@cash	mapflag	pvp	off
-1@pump	mapflag	pvp	off
-2@pump	mapflag	pvp	off
-1@lhz	mapflag	pvp	off
-1@ma_h	mapflag	pvp	off
-1@ma_c	mapflag	pvp	off
-1@ma_b	mapflag	pvp	off
-1@ecl	mapflag	pvp	off
-1@spa	mapflag	pvp	off
-1@sara	mapflag	pvp	off
-
 bat_a01	mapflag	pvp	off
 bat_a02	mapflag	pvp	off
 bat_b01	mapflag	pvp	off
diff --git a/npc/mapflag/nosave.txt b/npc/mapflag/nosave.txt
index 3465cc0c3..8137e500b 100644
--- a/npc/mapflag/nosave.txt
+++ b/npc/mapflag/nosave.txt
@@ -281,18 +281,8 @@ que_qaru03	mapflag	nosave	SavePoint
 que_qaru04	mapflag	nosave	SavePoint
 que_qaru05	mapflag	nosave	SavePoint
 
-// Sealed Shrine ==================
-1@cata	mapflag	nosave	SavePoint
-2@cata	mapflag	nosave	SavePoint
-
 // Endless Tower ==================
 e_tower	mapflag	nosave	SavePoint
-1@tower	mapflag	nosave	SavePoint
-2@tower	mapflag	nosave	SavePoint
-3@tower	mapflag	nosave	SavePoint
-4@tower	mapflag	nosave	SavePoint
-5@tower	mapflag	nosave	SavePoint
-6@tower	mapflag	nosave	SavePoint
 
 // Battle Grounds ==============
 bat_c01	mapflag	nosave	SavePoint
@@ -312,45 +302,8 @@ schg_dun01	mapflag	nosave	SavePoint
 arug_que01	mapflag	nosave	SavePoint
 arug_dun01	mapflag	nosave	SavePoint
 
-// Orc's Memory ===================
-1@orcs	mapflag	nosave	SavePoint
-2@orcs	mapflag	nosave	SavePoint
-
-// Nidhoggr's Instance ===========
-1@nyd	mapflag	nosave	SavePoint
-2@nyd	mapflag	nosave	SavePoint
-
-// Misty Forest Labyrinth ===========
-1@mist	mapflag	nosave	SavePoint
-
-// Octopus Cave ===========
-1@cash	mapflag	nosave	SavePoint
-
-// Drain ===========
-1@pump	mapflag	nosave	SavePoint
-2@pump	mapflag	nosave	SavePoint
-
 // Somatology Laboratory ===========
 que_lhz	mapflag	nosave	SavePoint
-1@lhz	mapflag	nosave	SavePoint
-
-// Bangungot Hospital F2 ===========
-1@ma_h	mapflag	nosave	SavePoint
-
-// Buwaya Cave ===========
-1@ma_c	mapflag	nosave	SavePoint
-
-// Bakonawa Hideout ===========
-1@ma_b	mapflag	nosave	SavePoint
-
-// Inside Eclage ===========
-1@ecl	mapflag	nosave	SavePoint
-
-// Ghost Palace ===========
-1@spa	mapflag	nosave	SavePoint
-
-// Sara's Memory Instance ===========
-1@sara	mapflag	nosave	SavePoint
 
 //evt_zombie	mapflag	nosave	SavePoint
 
diff --git a/npc/mapflag/noteleport.txt b/npc/mapflag/noteleport.txt
index 8b1109ef1..700964da4 100644
--- a/npc/mapflag/noteleport.txt
+++ b/npc/mapflag/noteleport.txt
@@ -368,26 +368,8 @@ que_qaru04	mapflag	monster_noteleport
 que_qaru05	mapflag	noteleport
 que_qaru05	mapflag	monster_noteleport
 
-//Sealed Shrine ==================
-1@cata	mapflag	noteleport
-1@cata	mapflag	monster_noteleport
-2@cata	mapflag	noteleport
-2@cata	mapflag	monster_noteleport
-
 //Endless Tower ==================
 e_tower	mapflag	noteleport
-1@tower	mapflag	noteleport
-1@tower	mapflag	monster_noteleport
-2@tower	mapflag	noteleport
-2@tower	mapflag	monster_noteleport
-3@tower	mapflag	noteleport
-3@tower	mapflag	monster_noteleport
-4@tower	mapflag	noteleport
-4@tower	mapflag	monster_noteleport
-5@tower	mapflag	noteleport
-5@tower	mapflag	monster_noteleport
-6@tower	mapflag	noteleport
-6@tower	mapflag	monster_noteleport
 
 // Battle Grounds ==============
 bat_c01	mapflag	noteleport
@@ -413,29 +395,13 @@ bra_in01	mapflag	noteleport
 dic_in01	mapflag	noteleport
 
 // Episode 14 ====================
-1@mist	mapflag	noteleport
-1@mist	mapflag	monster_noteleport
 dew_in01	mapflag	noteleport
 mal_in01	mapflag	noteleport
 mal_in02	mapflag	noteleport
-1@cash	mapflag	noteleport
-1@cash	mapflag	monster_noteleport
-1@pump	mapflag	noteleport
-1@pump	mapflag	monster_noteleport
-2@pump	mapflag	noteleport
-2@pump	mapflag	monster_noteleport
 que_lhz	mapflag	noteleport
 que_lhz	mapflag	monster_noteleport
-1@lhz	mapflag	noteleport
-1@lhz	mapflag	monster_noteleport
 ma_scene01	mapflag	noteleport
 ma_in01	mapflag	noteleport
-1@ma_h	mapflag	noteleport
-1@ma_h	mapflag	monster_noteleport
-1@ma_c	mapflag	noteleport
-1@ma_c	mapflag	monster_noteleport
-1@ma_b	mapflag	noteleport
-1@ma_b	mapflag	monster_noteleport
 ma_zif01	mapflag	noteleport
 ma_zif02	mapflag	noteleport
 ma_zif03	mapflag	noteleport
@@ -449,35 +415,13 @@ ecl_in01	mapflag	noteleport
 ecl_in02	mapflag	noteleport
 ecl_in03	mapflag	noteleport
 ecl_in04	mapflag	noteleport
-1@ecl	mapflag	noteleport
-1@ecl	mapflag	monster_noteleport
 ecl_hub01	mapflag	noteleport
 dali	mapflag	noteleport
 dali02	mapflag	noteleport
 
-//Orc's Memory ===================
-1@orcs	mapflag	noteleport
-1@orcs	mapflag	monster_noteleport
-2@orcs	mapflag	noteleport
-2@orcs	mapflag	monster_noteleport
-
 // Yggdrasil Dungeon =============
 nyd_dun02	mapflag	noteleport
 
-// Nidhoggr's Instance ===========
-1@nyd	mapflag	noteleport
-1@nyd	mapflag	monster_noteleport
-2@nyd	mapflag	noteleport
-2@nyd	mapflag	monster_noteleport
-
-// Ghost Palace ===========
-1@spa	mapflag	noteleport
-1@spa	mapflag	monster_noteleport
-
-// Sara's Memory Instance ===========
-1@sara	mapflag	noteleport
-1@sara	mapflag	monster_noteleport
-
 //evt_zombie	mapflag	noteleport
 
 // Poring War ====================
diff --git a/npc/mapflag/nowarpto.txt b/npc/mapflag/nowarpto.txt
index 34d093ae2..783dc8cc9 100644
--- a/npc/mapflag/nowarpto.txt
+++ b/npc/mapflag/nowarpto.txt
@@ -115,18 +115,8 @@ que_qaru03	mapflag	nowarpto
 que_qaru04	mapflag	nowarpto
 que_qaru05	mapflag	nowarpto
 
-//Sealed Shrine ==================
-1@cata	mapflag	nowarpto
-2@cata	mapflag	nowarpto
-
 //Endless Tower ==================
 e_tower	mapflag	nowarpto
-1@tower	mapflag	nowarpto
-2@tower	mapflag	nowarpto
-3@tower	mapflag	nowarpto
-4@tower	mapflag	nowarpto
-5@tower	mapflag	nowarpto
-6@tower	mapflag	nowarpto
 
 // Battle Grounds ==============
 bat_c01	mapflag	nowarpto
@@ -160,17 +150,6 @@ splendide	mapflag	nowarpto
 spl_fild01	mapflag	nowarpto
 spl_in01	mapflag	nowarpto
 
-//Orc's Memory ===================
-1@orcs	mapflag	nowarpto
-2@orcs	mapflag	nowarpto
-
-// Nidhoggr's Instance ===========
-1@nyd	mapflag	nowarpto
-2@nyd	mapflag	nowarpto
-
-// Ghost Palace ===========
-1@spa	mapflag	nowarpto
-
 // Poring War ====================
 poring_w01	mapflag	nowarpto
 poring_w02	mapflag	nowarpto
diff --git a/npc/mapflag/partylock.txt b/npc/mapflag/partylock.txt
index 9e604fedc..1aa9d4991 100644
--- a/npc/mapflag/partylock.txt
+++ b/npc/mapflag/partylock.txt
@@ -33,54 +33,3 @@
 //= Blocks all party modifications on a map:
 //=   /organize, /leave, /invite, @changeleader
 //=========================================================================
-
-// Sealed Shrine ==================
-1@cata	mapflag	partylock
-2@cata	mapflag	partylock
-
-// Endless Tower ==================
-1@tower	mapflag	partylock
-2@tower	mapflag	partylock
-3@tower	mapflag	partylock
-4@tower	mapflag	partylock
-5@tower	mapflag	partylock
-6@tower	mapflag	partylock
-
-// Orc's Memory ===================
-1@orcs	mapflag	partylock
-2@orcs	mapflag	partylock
-
-// Nidhoggr's Instance ===========
-1@nyd	mapflag	partylock
-2@nyd	mapflag	partylock
-
-// Misty Forest Labyrinth ===========
-1@mist	mapflag	partylock
-
-// Octopus Cave ===========
-1@cash	mapflag	partylock
-
-// Drain ===========
-1@pump	mapflag	partylock
-2@pump	mapflag	partylock
-
-// Somatology Laboratory ===========
-1@lhz	mapflag	partylock
-
-// Bangungot Hospital F2 ===========
-1@ma_h	mapflag	partylock
-
-// Buwaya Cave ===========
-1@ma_c	mapflag	partylock
-
-// Bakonawa Hideout ===========
-1@ma_b	mapflag	partylock
-
-// Inside Eclage ===========
-1@ecl	mapflag	partylock
-
-// Ghost Palace ===========
-1@spa	mapflag	partylock
-
-// Sara's Memory Instance ===========
-1@sara	mapflag	partylock
diff --git a/npc/mapflag/zone.txt b/npc/mapflag/zone.txt
index cb73a32ec..b90116911 100644
--- a/npc/mapflag/zone.txt
+++ b/npc/mapflag/zone.txt
@@ -75,37 +75,6 @@ prt_are_in	mapflag	zone	Izlude Battle Arena
 1@nyd	mapflag	zone	Memorial Dungeon
 2@nyd	mapflag	zone	Memorial Dungeon
 
-// Misty Forest Labyrinth ===========
-1@mist	mapflag	zone	Memorial Dungeon
-
-// Octopus Cave ===========
-1@cash	mapflag	zone	Memorial Dungeon
-
-// Drain ===========
-1@pump	mapflag	zone	Memorial Dungeon
-2@pump	mapflag	zone	Memorial Dungeon
-
-// Somatology Laboratory ===========
-1@lhz	mapflag	zone	Memorial Dungeon
-
-// Bangungot Hospital F2 ===========
-1@ma_h	mapflag	zone	Memorial Dungeon
-
-// Buwaya Cave ===========
-1@ma_c	mapflag	zone	Memorial Dungeon
-
-// Bakonawa Hideout ===========
-1@ma_b	mapflag	zone	Memorial Dungeon
-
-// Inside Eclage ===========
-1@ecl	mapflag	zone	Memorial Dungeon
-
-// Ghost Palace ===========
-1@spa	mapflag	zone	Memorial Dungeon
-
-// Sara's Memory Instance ===========
-1@sara	mapflag	zone	Memorial Dungeon
-
 //Towns
 alberta	mapflag	zone	Towns
 aldebaran	mapflag	zone	Towns
diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt
index 5e2ae7f33..2868cc589 100644
--- a/npc/re/instances/BakonawaLake.txt
+++ b/npc/re/instances/BakonawaLake.txt
@@ -33,8 +33,6 @@
 //= 1.1
 //=========================================================================
 
-1@ma_b	mapflag	src4instance
-
 ma_scene01,174,179,4	script	Taho	4_M_DEWZATIMAN,{
 	disable_items;
 	if (checkweight(Knife,1) == 0) {
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index 1504f892f..3962ee4fa 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -33,8 +33,6 @@
 //= 1.1
 //=========================================================================
 
-1@ma_h	mapflag	src4instance
-
 //== Instance Creation =====================================
 ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 	if (BaseLevel < 100) end;
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 242d0a8e4..859d6bd85 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -33,8 +33,6 @@
 //= 1.0
 //=========================================================================
 
-1@ma_c	mapflag	src4instance
-
 ma_fild02,312,317,5	script	Guard#buwaya_cave	4_MAL_SOLDIER,{
 	if (BaseLevel < 130) {
 		mes "[Guard]";
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index 7f85fee50..c649171f8 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -33,8 +33,6 @@
 //= 1.1
 //=========================================================================
 
-1@mist	mapflag	src4instance
-
 //== Instance Creation =====================================
 bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index 164caf548..1bd76aedb 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -35,9 +35,6 @@
 //= 1.1
 //=========================================================================
 
-1@pump	mapflag	src4instance
-2@pump	mapflag	src4instance
-
 //== Quest NPCs ============================================
 mal_in01,172,28,2	script	Albo#mal	4_CAT_SAILOR5,{
 	if (checkweight(Knife,1) == 0) {
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index bf099cd2d..9f3f29fdf 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -36,8 +36,6 @@
 //================= Current Version =======================================
 //= 1.2
 //=========================================================================
-1@gl_k	mapflag	src4instance
-2@gl_k	mapflag	src4instance
 
 glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	if (BaseLevel < 130) { // iRO text
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index e88ec4332..51e2f8a06 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -33,8 +33,6 @@
 //= 1.0.2
 //=========================================================================
 
-1@lhz	mapflag	src4instance
-
 //== Giacomo Girolam =======================================
 lighthalzen,303,303,6	script	Giacomo Girolamo#kiup2	4_M_KHMAN,3,3,{
 	if ((MaxWeight - Weight) < 1000 || !checkweight(Knife, 1)) {
diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt
index b1a8f3c10..6e77db2f8 100644
--- a/npc/re/instances/ghost_palace.txt
+++ b/npc/re/instances/ghost_palace.txt
@@ -30,7 +30,6 @@
 //================= Current Version =======================================
 //= 1.1
 //=========================================================================
-1@spa	mapflag	src4instance
 
 dali02,44,129,5	script	Unpleasent Royal Guard	4_M_SAKRAYROYAL,{
 	if (BaseLevel < 120) {
diff --git a/npc/re/instances/octopus_cave.txt b/npc/re/instances/octopus_cave.txt
index b09d243ab..b134742c9 100644
--- a/npc/re/instances/octopus_cave.txt
+++ b/npc/re/instances/octopus_cave.txt
@@ -33,8 +33,6 @@
 //= 1.1
 //=========================================================================
 
-1@cash	mapflag	src4instance
-
 //== Instance Creation =====================================
 mal_dun01,151,235,5	script	Starfish	4_ASTER,{
 
diff --git a/npc/re/instances/saras_memory.txt b/npc/re/instances/saras_memory.txt
index 2b3b4f2c0..38b598d5b 100644
--- a/npc/re/instances/saras_memory.txt
+++ b/npc/re/instances/saras_memory.txt
@@ -37,7 +37,6 @@
 //================= Current Version =======================================
 //= 1.1
 //=========================================================================
-1@sara	mapflag	src4instance
 
 dali,130,107,5	script	Leon the Adventurer#Sara	4_M_DST_GRAND,{ // instance CD check only at the Dimensional Device
 	mes("[Leon the Adventurer]");
diff --git a/npc/re/mapflag/zone.txt b/npc/re/mapflag/zone.txt
index a6cfd95f1..24ffce665 100644
--- a/npc/re/mapflag/zone.txt
+++ b/npc/re/mapflag/zone.txt
@@ -32,6 +32,41 @@
 //= Flags maps as part of zones defined in map_zone_db.txt
 //=========================================================================
 
+// Misty Forest Labyrinth ===========
+1@mist	mapflag	zone	Memorial Dungeon
+
+// Octopus Cave ===========
+1@cash	mapflag	zone	Memorial Dungeon
+
+// Drain ===========
+1@pump	mapflag	zone	Memorial Dungeon
+2@pump	mapflag	zone	Memorial Dungeon
+
+// Somatology Laboratory ===========
+1@lhz	mapflag	zone	Memorial Dungeon
+
+// Bangungot Hospital F2 ===========
+1@ma_h	mapflag	zone	Memorial Dungeon
+
+// Buwaya Cave ===========
+1@ma_c	mapflag	zone	Memorial Dungeon
+
+// Bakonawa Hideout ===========
+1@ma_b	mapflag	zone	Memorial Dungeon
+
+// Inside Eclage ===========
+1@ecl	mapflag	zone	Memorial Dungeon
+
+// Old Glast Heim ===========
+1@gl_k	mapflag	zone	Memorial Dungeon
+2@gl_k	mapflag	zone	Memorial Dungeon
+
+// Ghost Palace ===========
+1@spa	mapflag	zone	Memorial Dungeon
+
+// Sara's Memory Instance ===========
+1@sara	mapflag	zone	Memorial Dungeon
+
 // WoE:TE
 te_prt_gld	mapflag	zone	WoE TE
 te_prtcas01	mapflag	zone	WoE TE