diff --git a/.gitmodules b/.gitmodules
index 3e737ac2e3..0337383c7f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "external/porymap"]
 	path = external/porymap
 	url = https://git.devraza.giize.com/devraza/porymap
+[submodule "external/tilemap-studio"]
+	path = external/tilemap-studio
+	url = https://github.com/Rangi42/tilemap-studio
diff --git a/external/tilemap-studio b/external/tilemap-studio
new file mode 160000
index 0000000000..69b1d9aa98
--- /dev/null
+++ b/external/tilemap-studio
@@ -0,0 +1 @@
+Subproject commit 69b1d9aa985c4b083294aa25cb0dc59ed5e44065