7 files changed, 40 insertions, 28 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 70504e28b..0215b53c0 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -48,6 +48,7 @@ map_list: (
     "006-1",
     "007-1",
     "009-1",
+    "009-2",
     "010-1-1",
     "010-1",
     "010-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 565977d0b..67c88bc2e 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -45,31 +45,32 @@
 006-1 45
 007-1 46
 009-1 47
-010-1-1 48
-010-1 49
-010-2 50
-011-1 51
-011-2 52
-012-1 53
-012-2 54
-012-3 55
-012-4 56
-012-5 57
-012-6 58
-012-7 59
-014-1 60
-014-2 61
-014-3 62
-015-1 63
-015-2 64
-015-3 65
-016-1 66
-016-6 67
-016-7 68
-boss 69
-botcheck 70
-sec_pri 71
-soren-2 72
-soren 73
-test 74
-testbg 75
+009-2 48
+010-1-1 49
+010-1 50
+010-2 51
+011-1 52
+011-2 53
+012-1 54
+012-2 55
+012-3 56
+012-4 57
+012-5 58
+012-6 59
+012-7 60
+014-1 61
+014-2 62
+014-3 63
+015-1 64
+015-2 65
+015-3 66
+016-1 67
+016-6 68
+016-7 69
+boss 70
+botcheck 71
+sec_pri 72
+soren-2 73
+soren 74
+test 75
+testbg 76
diff --git a/maps/re/009-2.mcache b/maps/re/009-2.mcache
new file mode 100644
index 000000000..74a8cfad1
--- /dev/null
+++ b/maps/re/009-2.mcache
diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt
index c8b9057ef..acb339920 100644
--- a/npc/009-1/_warps.txt
+++ b/npc/009-1/_warps.txt
@@ -2,3 +2,5 @@
 // Map 009-1: Halinarzo warps
 009-1,56,107,0	warp	#009-1_56_107	2,0,010-2,171,20
 009-1,119,40,0	warp	#009-1_119_40	0,0,011-1,177,177
+009-1,84,63,0	warp	#009-1_84_63	0,0,009-2,62,66
+009-1,73,63,0	warp	#009-1_73_63	0,0,009-2,28,65
diff --git a/npc/009-2/_import.txt b/npc/009-2/_import.txt
new file mode 100644
index 000000000..3d586a4f8
--- /dev/null
+++ b/npc/009-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 009-2: Halinarzo Library & Bar
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-2/_warps.txt",
diff --git a/npc/009-2/_warps.txt b/npc/009-2/_warps.txt
new file mode 100644
index 000000000..df08e8bae
--- /dev/null
+++ b/npc/009-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-2: Halinarzo Library & Bar warps
+009-2,28,66,0	warp	#009-2_28_66	0,0,009-1,73,64
+009-2,62,67,0	warp	#009-2_62_67	0,0,009-1,84,64
diff --git a/npc/_import.txt b/npc/_import.txt
index fdf7a7d77..3af3f93e8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -47,6 +47,7 @@
 @include "npc/006-1/_import.txt"
 @include "npc/007-1/_import.txt"
 @include "npc/009-1/_import.txt"
+@include "npc/009-2/_import.txt"
 @include "npc/010-1-1/_import.txt"
 @include "npc/010-1/_import.txt"
 @include "npc/010-2/_import.txt"