convert map data to json

4 files changed, 122 insertions, 35 deletions

diff --git a/data/maps/Route22/connections.inc b/data/maps/Route22/connections.inc
deleted file mode 100644
index f9c5a939b..000000000
--- a/data/maps/Route22/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route22_MapConnectionsList: @ 8352CA8
-    connection up, 0, MAP_ROUTE23
-    connection right, -10, MAP_VIRIDIAN_CITY
-
-Route22_MapConnections:: @ 8352CC0
-    .4byte 2
-    .4byte Route22_MapConnectionsList
diff --git a/data/maps/Route22/events.inc b/data/maps/Route22/events.inc
deleted file mode 100644
index 76c259321..000000000
--- a/data/maps/Route22/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route22_EventObjects:
-	object_event 1, 72, 0, 25, 0, 4, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 79, 0, 0
-
-Route22_MapWarps:
-	warp_def 8, 5, 0, 2, 7168
-	warp_def 9, 5, 0, 2, 7168
-
-Route22_MapCoordEvents:
-	coord_event 33, 4, 3, 0, 16468, 1, 0, Route22_EventScript_16828C
-	coord_event 33, 5, 3, 0, 16468, 1, 0, Route22_EventScript_168298
-	coord_event 33, 6, 0, 0, 16468, 1, 0, Route22_EventScript_1682AB
-	coord_event 33, 4, 3, 0, 16468, 3, 0, Route22_EventScript_1683ED
-	coord_event 33, 5, 3, 0, 16468, 3, 0, Route22_EventScript_1683F9
-	coord_event 33, 6, 0, 0, 16468, 3, 0, Route22_EventScript_16840C
-
-Route22_MapBGEvents:
-	bg_event 7, 12, 0, 0, 0, Route22_EventScript_1684E2
-
-Route22_MapEvents::
-	map_events Route22_EventObjects, Route22_MapWarps, Route22_MapCoordEvents, Route22_MapBGEvents
diff --git a/data/maps/Route22/header.inc b/data/maps/Route22/header.inc
deleted file mode 100644
index 70942583f..000000000
--- a/data/maps/Route22/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route22:: @ 8350A94
-    .4byte Route22_Layout @ 0x82F6840
-    .4byte Route22_MapEvents @ 0x83B7F18
-    .4byte Route22_MapScripts @ 0x816828B
-    .4byte Route22_MapConnections @ 0x8352CC0
-    .2byte BGM_FRLG_ROUTE_3
-    .2byte 110
-    .byte 0x7a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
new file mode 100644
index 000000000..2acb37549
--- /dev/null
+++ b/data/maps/Route22/map.json
@@ -0,0 +1,122 @@
+{
+  "id": "MAP_ROUTE22",
+  "name": "Route22",
+  "layout": "LAYOUT_ROUTE22",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_22",
+  "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_ROUTE23",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_VIRIDIAN_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "72",
+      "x": 25,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "0x0",
+      "flag": "79"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 9,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE22_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4054",
+      "var_value": 1,
+      "script": "Route22_EventScript_16828C"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4054",
+      "var_value": 1,
+      "script": "Route22_EventScript_168298"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 6,
+      "elevation": 0,
+      "var": "VAR_0x4054",
+      "var_value": 1,
+      "script": "Route22_EventScript_1682AB"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_0x4054",
+      "var_value": 3,
+      "script": "Route22_EventScript_1683ED"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_0x4054",
+      "var_value": 3,
+      "script": "Route22_EventScript_1683F9"
+    },
+    {
+      "type": "trigger",
+      "x": 33,
+      "y": 6,
+      "elevation": 0,
+      "var": "VAR_0x4054",
+      "var_value": 3,
+      "script": "Route22_EventScript_16840C"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 12,
+      "elevation": 0,
+      "script": "Route22_EventScript_1684E2"
+    }
+  ]
+}
\ No newline at end of file