4 files changed, 36 insertions, 23 deletions
diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc
deleted file mode 100644
index bdc629846..000000000
--- a/data/maps/CaveOfOrigin_1F/events.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-CaveOfOrigin_1F_MapWarps: @ 8535D40
-	warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE
-	warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F
-
-CaveOfOrigin_1F_MapEvents:: @ 8535D50
-	map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
deleted file mode 100644
index f051c230c..000000000
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_1F: @ 84842E8
-	.4byte CaveOfOrigin_1F_Layout
-	.4byte CaveOfOrigin_1F_MapEvents
-	.4byte CaveOfOrigin_1F_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN03
-	.2byte 158
-	.byte MAPSEC_CAVE_OF_ORIGIN
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json
new file mode 100644
index 000000000..989b1cf30
--- /dev/null
+++ b/data/maps/CaveOfOrigin_1F/map.json
@@ -0,0 +1,35 @@
+{
+  "id": "MAP_CAVE_OF_ORIGIN_1F",
+  "name": "CaveOfOrigin_1F",
+  "layout": "LAYOUT_CAVE_OF_ORIGIN_1F",
+  "music": "MUS_DAN03",
+  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 11,
+      "y": 17,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_B1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
+\ No newline at end of file
diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 1804e58ea..e8d722dee 100644
--- a/data/maps/CaveOfOrigin_1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_1F_MapScripts:: @ 8235768
-	map_script 3, CaveOfOrigin_1F_MapScript1_23576E
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E
 	.byte 0
 
 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E