9 files changed, 52 insertions, 49 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 3516f61dc..c4a98ae81 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -4,6 +4,7 @@ map_list: (
     "000-0-0",
     "000-0",
     "000-1",
+    "001-1",
     "002-1",
     "002-2",
     "002-3",
@@ -48,7 +49,6 @@ map_list: (
     "008-2-7",
     "008-2-8",
     "008-2-9",
-    "aeros",
     "test",
     "testbg",
 )
diff --git a/db/map_index.txt b/db/map_index.txt
index e50e1aff3..cda6249bc 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1,50 +1,50 @@
 000-0-0 1
 000-0 2
 000-1 3
-002-1 4
-002-2 5
-002-3 6
-002-4 7
-003-1-2 8
-003-1-3 9
-003-1 10
-003-13 11
-003-2-0 12
-003-2-1 13
-003-2-2 14
-003-2 15
-003-3 16
-003-4 17
-003-5 18
-003-6 19
-003-7 20
-003-8 21
-004-1 22
-004-2 23
-005-1 24
-005-2 25
-005-3 26
-005-4 27
-005-5 28
-005-6 29
-005-7 30
-007-1 31
-008-1 32
-008-2-0 33
-008-2-1 34
-008-2-10 35
-008-2-11 36
-008-2-12 37
-008-2-13 38
-008-2-14 39
-008-2-2 40
-008-2-3 41
-008-2-4 42
-008-2-5 43
-008-2-6 44
-008-2-7 45
-008-2-8 46
-008-2-9 47
-aeros 48
+001-1 4
+002-1 5
+002-2 6
+002-3 7
+002-4 8
+003-1-2 9
+003-1-3 10
+003-1 11
+003-13 12
+003-2-0 13
+003-2-1 14
+003-2-2 15
+003-2 16
+003-3 17
+003-4 18
+003-5 19
+003-6 20
+003-7 21
+003-8 22
+004-1 23
+004-2 24
+005-1 25
+005-2 26
+005-3 27
+005-4 28
+005-5 29
+005-6 30
+005-7 31
+007-1 32
+008-1 33
+008-2-0 34
+008-2-1 35
+008-2-10 36
+008-2-11 37
+008-2-12 38
+008-2-13 39
+008-2-14 40
+008-2-2 41
+008-2-3 42
+008-2-4 43
+008-2-5 44
+008-2-6 45
+008-2-7 46
+008-2-8 47
+008-2-9 48
 test 49
 testbg 50
diff --git a/maps/re/001-1.mcache b/maps/re/001-1.mcache
new file mode 100644
index 000000000..c2e4ac7b9
--- /dev/null
+++ b/maps/re/001-1.mcache
diff --git a/maps/re/004-1.mcache b/maps/re/004-1.mcache
index fa3b169f6..0c6c6ad65 100644
--- a/maps/re/004-1.mcache
+++ b/maps/re/004-1.mcache
diff --git a/maps/re/aeros.mcache b/maps/re/aeros.mcache
deleted file mode 100644
index 375ebfa29..000000000
--- a/maps/re/aeros.mcache
+++ /dev/null
diff --git a/npc/aeros/_import.txt b/npc/001-1/_import.txt
index dff8755f6..1c524da11 100644
--- a/npc/aeros/_import.txt
+++ b/npc/001-1/_import.txt
@@ -1,2 +1,3 @@
-// Map aeros: Floating Island of Aeros
+// Map 001-1: Floating Island of Aeros
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-1/mapflags.txt",
diff --git a/npc/001-1/mapflags.txt b/npc/001-1/mapflags.txt
new file mode 100644
index 000000000..1aeaed1e8
--- /dev/null
+++ b/npc/001-1/mapflags.txt
@@ -0,0 +1 @@
+001-1	mapflag	nosave	002-1,53,38
diff --git a/npc/_import.txt b/npc/_import.txt
index a8988caff..cca29abf5 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -3,6 +3,7 @@
 @include "npc/000-0-0/_import.txt"
 @include "npc/000-0/_import.txt"
 @include "npc/000-1/_import.txt"
+@include "npc/001-1/_import.txt"
 @include "npc/002-1/_import.txt"
 @include "npc/002-2/_import.txt"
 @include "npc/002-3/_import.txt"
@@ -47,6 +48,5 @@
 @include "npc/008-2-7/_import.txt"
 @include "npc/008-2-8/_import.txt"
 @include "npc/008-2-9/_import.txt"
-@include "npc/aeros/_import.txt"
 @include "npc/test/_import.txt"
 @include "npc/testbg/_import.txt"
diff --git a/npc/commands/warp.txt b/npc/commands/warp.txt
index 35af43406..1e5a2b379 100644
--- a/npc/commands/warp.txt
+++ b/npc/commands/warp.txt
@@ -70,7 +70,8 @@ OnInit:
         "^CANDOR",          "005-1 28 92",    // Tulishmar
 
         // TMW-BR
-        "^AEROS",           "aeros 76 26",    // Floating Island of Aeros (GM Events)
+        "^AEROS",           "001-1 235 26",    // Floating Island of Aeros (GM Events)
+        "^GM",              "001-1 235 26",    // Floating Island of Aeros (GM Events)
 
         // WOODLAND
         "^HURN",            "008-1 79 64";    // hurnscald: town square