convert map data to json

4 files changed, 76 insertions, 28 deletions

diff --git a/data/maps/Route7/connections.inc b/data/maps/Route7/connections.inc
deleted file mode 100644
index dec257fa1..000000000
--- a/data/maps/Route7/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route7_MapConnectionsList: @ 8352A9C
-    connection left, -10, MAP_CELADON_CITY
-    connection right, -10, MAP_SAFFRON_CITY
-
-Route7_MapConnections:: @ 8352AB4
-    .4byte 2
-    .4byte Route7_MapConnectionsList
diff --git a/data/maps/Route7/events.inc b/data/maps/Route7/events.inc
deleted file mode 100644
index a394e8394..000000000
--- a/data/maps/Route7/events.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route7_EventObjects:
-	object_event 1, 65375, 0, 248, 255, 12, 0, 10, 0, 0, 0, 6, 0, 3, 0, 0x0, 0, 0, 0
-
-Route7_MapWarps:
-	warp_def 7, 14, 0, 1, 289
-	warp_def 15, 10, 3, 0, 4864
-
-Route7_MapBGEvents:
-	bg_event 5, 14, 0, 0, 0, Route7_EventScript_167FBC
-	bg_event 16, 15, 3, 7, 0, 151, 152, 1
-
-Route7_MapEvents::
-	map_events Route7_EventObjects, Route7_MapWarps, 0x0, Route7_MapBGEvents
diff --git a/data/maps/Route7/header.inc b/data/maps/Route7/header.inc
deleted file mode 100644
index b7c432750..000000000
--- a/data/maps/Route7/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route7:: @ 83508D4
-    .4byte Route7_Layout @ 0x82E9DE4
-    .4byte Route7_MapEvents @ 0x83B6AF4
-    .4byte Route7_MapScripts @ 0x8167FBB
-    .4byte Route7_MapConnections @ 0x8352AB4
-    .2byte BGM_FRLG_ROUTE_3
-    .2byte 95
-    .byte 0x6b, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
new file mode 100644
index 000000000..2974e7ba8
--- /dev/null
+++ b/data/maps/Route7/map.json
@@ -0,0 +1,76 @@
+{
+  "id": "MAP_ROUTE7",
+  "name": "Route7",
+  "layout": "LAYOUT_ROUTE7",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_7",
+  "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_CELADON_CITY",
+      "offset": -10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_SAFFRON_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "65375",
+      "x": 65528,
+      "y": 12,
+      "elevation": 10,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 6,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 14,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 15,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE7_EAST_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 5,
+      "y": 14,
+      "elevation": 0,
+      "script": "Route7_EventScript_167FBC"
+    },
+    {
+      "type": "hidden_item",
+      "x": 16,
+      "y": 15,
+      "elevation": 3,
+      "item": "ITEM_WEPEAR_BERRY",
+      "flag": "152",
+      "unknown": 1
+    }
+  ]
+}
\ No newline at end of file