Removed duplicates and added some missing mapflags (#3161)

npc/mapflag/night.txt

@@ -259,9 +259,6 @@ mosk_dun02	mapflag	nightenabled
 mosk_dun03	mapflag	nightenabled
 que_temsky	mapflag	nightenabled
 sch_gld	mapflag	nightenabled
-moc_fild20	mapflag	nightenabled
-moc_fild21	mapflag	nightenabled
-moc_fild22	mapflag	nightenabled
 aru_gld	mapflag	nightenabled
 que_qsch01	mapflag	nightenabled
 que_qsch02	mapflag	nightenabled

npc/re/mapflag/nobranch.txt

@@ -95,6 +95,15 @@ izlude_b	mapflag	nobranch
 izlude_c	mapflag	nobranch
 izlude_d	mapflag	nobranch
 
+// Glast Heim Memorial Dungeon ===
+1@gl_k	mapflag	nobranch
+2@gl_k	mapflag	nobranch
+
+// Wave Mode Memorial Dungeon ====
+1@def01	mapflag	nobranch
+1@def02	mapflag	nobranch
+1@def03	mapflag	nobranch
+
 // Heroes' Trail - Part 1 ========
 1@face	mapflag	nobranch
 1@sara	mapflag	nobranch
@@ -146,7 +155,3 @@ te_aldecas2	mapflag	nobranch
 te_aldecas3	mapflag	nobranch
 te_aldecas4	mapflag	nobranch
 te_aldecas5	mapflag	nobranch
-
-// Episode 15
-1@lab	mapflag	nobranch
-1@uns	mapflag	nobranch

npc/re/mapflag/noicewall.txt

@@ -32,6 +32,15 @@
 // Inside Eclage ===========
 1@ecl	mapflag	noicewall
 
+// Glast Heim Memorial Dungeon ===
+1@gl_k	mapflag	noicewall
+2@gl_k	mapflag	noicewall
+
+// Wave Mode Memorial Dungeon ====
+1@def01	mapflag	noicewall
+1@def02	mapflag	noicewall
+1@def03	mapflag	noicewall
+
 // Heroes' Trail - Part 1 ========
 1@face	mapflag	noicewall
 1@sara	mapflag	noicewall
@@ -79,7 +88,3 @@ te_aldecas2	mapflag	noicewall
 te_aldecas3	mapflag	noicewall
 te_aldecas4	mapflag	noicewall
 te_aldecas5	mapflag	noicewall
-
-// Episode 15
-1@lab	mapflag	noicewall
-1@uns	mapflag	noicewall

npc/re/mapflag/nomemo.txt

@@ -117,23 +117,48 @@ gl_cas02_	mapflag	nomemo
 // Glast Heim Memorial Dungeon ===
 1@gl_k	mapflag	nomemo
 2@gl_k	mapflag	nomemo
-gl_chyard_	mapflag	nomemo
-gl_cas02_	mapflag	nomemo
 
 // Wave Mode Memorial Dungeon ====
 1@def01	mapflag	nomemo
 1@def02	mapflag	nomemo
 1@def03	mapflag	nomemo
 
-// Heroes' Trails - Part 1 =======
-1@gef	mapflag	nomemo
+// Heroes' Trail - Part 1 ========
 1@face	mapflag	nomemo
 1@sara	mapflag	nomemo
-1@gef_in	mapflag	nomemo
-1@glast	mapflag	nomemo
 dali	mapflag	nomemo
 dali02	mapflag	nomemo
 
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	nomemo
+1@gef	mapflag	nomemo
+1@gef_in	mapflag	nomemo
+1@spa	mapflag	nomemo
+1@tnm1	mapflag	nomemo
+1@tnm2	mapflag	nomemo
+1@tnm3	mapflag	nomemo
+
+// Heroes' Trail - Part 3 ========
+1@glast	mapflag	nomemo
+1@air1	mapflag	nomemo
+1@air2	mapflag	nomemo
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	nomemo
+1@dth2	mapflag	nomemo
+1@dth3	mapflag	nomemo
+1@rev	mapflag	nomemo
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	nomemo
+1@jtb	mapflag	nomemo
+
+// Episode 15 - Phantasmagorica
+1@lab	mapflag	nomemo
+1@uns	mapflag	nomemo
+1@mcd	mapflag	nomemo
+un_myst	mapflag	nomemo
+
 // WOE:TE Maps ===================
 te_prtcas01	mapflag	nomemo
 te_prtcas02	mapflag	nomemo
@@ -147,9 +172,3 @@ te_aldecas4	mapflag	nomemo
 te_aldecas5	mapflag	nomemo
 teg_dun01	mapflag	nomemo
 teg_dun02	mapflag	nomemo
-
-// Episode 15
-1@lab	mapflag	nomemo
-1@uns	mapflag	nomemo
-un_bk_q	mapflag	nomemo
-un_myst	mapflag	nomemo

npc/re/mapflag/noteleport.txt

@@ -83,20 +83,6 @@ gl_cas02_	mapflag	noteleport
 1@def03	mapflag	noteleport
 1@def03	mapflag	monster_noteleport
 
-// Heroes' Trails - Part 1 =======
-1@gef	mapflag	noteleport
-1@gef	mapflag	monster_noteleport
-1@face	mapflag	noteleport
-1@face	mapflag	monster_noteleport
-1@sara	mapflag	noteleport
-1@sara	mapflag	monster_noteleport
-1@gef_in	mapflag	noteleport
-1@gef_in	mapflag	monster_noteleport
-1@glast	mapflag	noteleport
-1@glast	mapflag	monster_noteleport
-dali	mapflag	noteleport
-dali02	mapflag	noteleport
-
 // Heroes' Trail - Part 1 ========
 1@face	mapflag	noteleport
 1@face	mapflag	monster_noteleport
@@ -183,13 +169,3 @@ te_aldecas2	mapflag	monster_noteleport
 te_aldecas3	mapflag	monster_noteleport
 te_aldecas4	mapflag	monster_noteleport
 te_aldecas5	mapflag	monster_noteleport
-
-// Episode 15
-1@lab	mapflag	noteleport
-1@uns	mapflag	noteleport
-un_bk_q	mapflag	noteleport
-un_myst	mapflag	noteleport
-verus04	mapflag	noteleport
-1@lab	mapflag	monster_noteleport
-1@uns	mapflag	monster_noteleport
-un_bk_q	mapflag	monster_noteleport

npc/re/mapflag/nowarpto.txt

@@ -111,10 +111,5 @@ te_aldecas3	mapflag	nowarpto
 te_aldecas4	mapflag	nowarpto
 te_aldecas5	mapflag	nowarpto
 
-// Episode 15
-1@lab	mapflag	nowarpto
-1@uns	mapflag	nowarpto
-un_bk_q	mapflag	nowarpto
-un_myst	mapflag	nowarpto
-
+// Rebellion Job Change Map
 job_gun	mapflag	nowarpto

npc/re/mapflag/partylock.txt

@@ -47,16 +47,38 @@
 1@def02	mapflag	partylock
 1@def03	mapflag	partylock
 
-// Heroes' Trails - Part 1 ========
-1@gef	mapflag	partylock
+// Heroes' Trail - Part 1 ========
 1@face	mapflag	partylock
 1@sara	mapflag	partylock
+
+// Heroes' Trail - Part 2 ========
+1@ge_st	mapflag	partylock
+1@gef	mapflag	partylock
 1@gef_in	mapflag	partylock
-1@glast	mapflag	partylock
+1@spa	mapflag	partylock
+1@tnm1	mapflag	partylock
+1@tnm2	mapflag	partylock
+1@tnm3	mapflag	partylock
 
-// Horror Toy Factory
+// Horror Toy Factory Memorial Dungeon
 1@xm_d	mapflag	partylock
 
-// Central Laboratory Memorial ====
+// Heroes' Trail - Part 3 ========
+1@glast	mapflag	partylock
+1@air1	mapflag	partylock
+1@air2	mapflag	partylock
+
+// Decisive Battle - Part 1 ======
+1@dth1	mapflag	partylock
+1@dth2	mapflag	partylock
+1@dth3	mapflag	partylock
+1@rev	mapflag	partylock
+
+// Decisive Battle - Part 2 ======
+1@eom	mapflag	partylock
+1@jtb	mapflag	partylock
+
+// Episode 15 - Phantasmagorica
 1@lab	mapflag	partylock
 1@uns	mapflag	partylock
+1@mcd	mapflag	partylock

npc/re/mapflag/restricted.txt

@@ -20,6 +20,15 @@
 1@ma_b	mapflag	restricted	6
 1@ecl	mapflag	restricted	6
 
+// Glast Heim Memorial Dungeon ===
+1@gl_k	mapflag	restricted	6
+2@gl_k	mapflag	restricted	6
+
+// Wave Mode Memorial Dungeon ====
+1@def01	mapflag	restricted	6
+1@def02	mapflag	restricted	6
+1@def03	mapflag	restricted	6
+
 // Heroes' Trail - Part 1 ========
 1@face	mapflag	restricted	6
 1@sara	mapflag	restricted	6