diff --git a/src/maps/mt-moon-1f.ts b/src/maps/mt-moon-1f.ts
index 1e992b7..76eadae 100644
--- a/src/maps/mt-moon-1f.ts
+++ b/src/maps/mt-moon-1f.ts
@@ -67,11 +67,7 @@ const mtMoon1f: MapType = {
       15: ["Beware! ZUBAT is a blood sucker!"],
     },
   },
-  maps: {
-    15: {
-      25: MapId.MtMoon2f,
-    },
-  },
+  maps: {},
   exits: {
     35: [14, 15],
   },
@@ -79,6 +75,35 @@ const mtMoon1f: MapType = {
     x: 68,
     y: 6,
   },
+  teleports: {
+    11: {
+      17: {
+        map: MapId.MtMoon3f,
+        pos: {
+          x: 24,
+          y: 10,
+        },
+      },
+    },
+    15: {
+      25: {
+        map: MapId.MtMoon3f,
+        pos: {
+          x: 26,
+          y: 16,
+        },
+      },
+    },
+    5: {
+      5: {
+        map: MapId.MtMoon3f,
+        pos: {
+          x: 6,
+          y: 6,
+        },
+      },
+    },
+  },
   exitReturnMap: MapId.Route3,
   encounters: getEncounterData("mt-moon-1f"),
   trainers: [
diff --git a/src/maps/mt-moon-2f.ts b/src/maps/mt-moon-2f.ts
index 4a14daf..0397da5 100644
--- a/src/maps/mt-moon-2f.ts
+++ b/src/maps/mt-moon-2f.ts
@@ -88,6 +88,45 @@ const mtMoon2f: MapType = {
   text: {},
   maps: {},
   exits: {},
+  teleports: {
+    7: {
+      5: {
+        map: MapId.MtMoon3f,
+        pos: {
+          x: 22,
+          y: 2,
+        },
+      },
+    },
+    9: {
+      25: {
+        map: MapId.MtMoon3f,
+        pos: {
+          x: 18,
+          y: 10,
+        },
+      },
+    },
+    17: {
+      21: {
+        map: MapId.MtMoon3f,
+        pos: {
+          x: 20,
+          y: 17,
+        },
+      },
+    },
+    27: {
+      15: {
+        map: MapId.MtMoon3f,
+        pos: {
+          x: 14,
+          y: 26,
+        },
+      },
+    },
+  },
+
   encounters: getEncounterData("mt-moon-b2f"),
   exitReturnPos: {
     x: 1,
diff --git a/src/maps/mt-moon-3f.ts b/src/maps/mt-moon-3f.ts
index e7abe18..98d837c 100644
--- a/src/maps/mt-moon-3f.ts
+++ b/src/maps/mt-moon-3f.ts
@@ -8,8 +8,8 @@ import { MapId, MapType } from "./map-types";
 const mtMoon3f: MapType = {
   name: "Mt Moon 3F",
   image,
-  music,
   cave: true,
+  music,
   height: 28,
   width: 28,
   start: {
@@ -52,9 +52,74 @@ const mtMoon3f: MapType = {
   text: {},
   maps: {},
   exits: {},
+  teleports: {
+    3: {
+      23: {
+        map: MapId.MtMoon2f,
+        pos: {
+          x: 4,
+          y: 6,
+        },
+      },
+    },
+    5: {
+      5: {
+        map: MapId.MtMoon1f,
+        pos: {
+          x: 7,
+          y: 5,
+        },
+      },
+    },
+    9: {
+      25: {
+        map: MapId.MtMoon1f,
+        pos: {
+          x: 16,
+          y: 12,
+        },
+      },
+    },
+    11: {
+      17: {
+        map: MapId.MtMoon2f,
+        pos: {
+          x: 26,
+          y: 10,
+        },
+      },
+    },
+    17: {
+      21: {
+        map: MapId.MtMoon2f,
+        pos: {
+          x: 22,
+          y: 16,
+        },
+      },
+    },
+    15: {
+      25: {
+        map: MapId.MtMoon1f,
+        pos: {
+          x: 26,
+          y: 14,
+        },
+      },
+    },
+    27: {
+      13: {
+        map: MapId.MtMoon2f,
+        pos: {
+          x: 16,
+          y: 26,
+        },
+      },
+    },
+  },
   exitReturnPos: {
-    x: 1,
-    y: 1,
+    x: 6,
+    y: 5,
   },
   encounters: getEncounterData("mt-moon-b1f"),
   exitReturnMap: MapId.MtMoon1f,