convert map data to json

4 files changed, 100 insertions, 30 deletions

diff --git a/data/maps/Route18/connections.inc b/data/maps/Route18/connections.inc
deleted file mode 100644
index dd721edac..000000000
--- a/data/maps/Route18/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route18_MapConnectionsList: @ 8352C08
-    connection up, 0, MAP_ROUTE17
-    connection right, -10, MAP_FUCHSIA_CITY
-
-Route18_MapConnections:: @ 8352C20
-    .4byte 2
-    .4byte Route18_MapConnectionsList
diff --git a/data/maps/Route18/events.inc b/data/maps/Route18/events.inc
deleted file mode 100644
index a07028aa1..000000000
--- a/data/maps/Route18/events.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route18_EventObjects:
-	object_event 1, 26, 0, 46, 0, 14, 0, 3, 9, 17, 0, 1, 0, 4, 0, Route18_EventScript_1AB3D3, 0, 0, 0
-	object_event 2, 26, 0, 41, 0, 15, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route18_EventScript_1AB395, 0, 0, 0
-	object_event 3, 26, 0, 39, 0, 12, 0, 3, 10, 17, 0, 1, 0, 6, 0, Route18_EventScript_1AB357, 0, 0, 0
-
-Route18_MapWarps:
-	warp_def 41, 9, 3, 0, 6656
-	warp_def 48, 9, 3, 1, 6656
-
-Route18_MapBGEvents:
-	bg_event 37, 7, 0, 0, 0, Route18_EventScript_168228
-	bg_event 52, 7, 0, 0, 0, Route18_EventScript_16821F
-
-Route18_MapEvents::
-	map_events Route18_EventObjects, Route18_MapWarps, 0x0, Route18_MapBGEvents
diff --git a/data/maps/Route18/header.inc b/data/maps/Route18/header.inc
deleted file mode 100644
index b4861fdf1..000000000
--- a/data/maps/Route18/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route18:: @ 8350A08
-    .4byte Route18_Layout @ 0x82F3750
-    .4byte Route18_MapEvents @ 0x83B7AA4
-    .4byte Route18_MapScripts @ 0x81681F6
-    .4byte Route18_MapConnections @ 0x8352C20
-    .2byte BGM_FRLG_ROUTE_3
-    .2byte 106
-    .byte 0x76, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json
new file mode 100644
index 000000000..760f31bad
--- /dev/null
+++ b/data/maps/Route18/map.json
@@ -0,0 +1,100 @@
+{
+  "id": "MAP_ROUTE18",
+  "name": "Route18",
+  "layout": "LAYOUT_ROUTE18",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_18",
+  "requires_flash": false,
+  "weather": "WEATHER_2",
+  "map_type": "MAP_TYPE_3",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_ROUTE17",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_FUCHSIA_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "26",
+      "x": 46,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route18_EventScript_1AB3D3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 41,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route18_EventScript_1AB395",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 39,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 6,
+      "script": "Route18_EventScript_1AB357",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 41,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 48,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE18_EAST_ENTRANCE_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 37,
+      "y": 7,
+      "elevation": 0,
+      "script": "Route18_EventScript_168228"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 52,
+      "y": 7,
+      "elevation": 0,
+      "script": "Route18_EventScript_16821F"
+    }
+  ]
+}
\ No newline at end of file