convert map data to json

4 files changed, 157 insertions, 35 deletions

diff --git a/data/maps/Route6/connections.inc b/data/maps/Route6/connections.inc
deleted file mode 100644
index 7f0a3d191..000000000
--- a/data/maps/Route6/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route6_MapConnectionsList: @ 8352A7C
-    connection up, 0, MAP_SAFFRON_CITY
-    connection down, -12, MAP_VERMILION_CITY
-
-Route6_MapConnections:: @ 8352A94
-    .4byte 2
-    .4byte Route6_MapConnectionsList
diff --git a/data/maps/Route6/events.inc b/data/maps/Route6/events.inc
deleted file mode 100644
index a6ff2b010..000000000
--- a/data/maps/Route6/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route6_EventObjects:
-	object_event 1, 20, 0, 3, 0, 16, 0, 3, 10, 17, 0, 1, 0, 5, 0, Route6_EventScript_1A9999, 0, 0, 0
-	object_event 2, 39, 0, 12, 0, 21, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route6_EventScript_1A9A15, 0, 0, 0
-	object_event 3, 40, 0, 13, 0, 21, 0, 3, 9, 17, 0, 1, 0, 0, 0, Route6_EventScript_1A9A91, 0, 0, 0
-	object_event 4, 20, 0, 20, 0, 25, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A99D7, 0, 0, 0
-	object_event 5, 40, 0, 13, 0, 32, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A9ACF, 0, 0, 0
-	object_event 6, 39, 0, 13, 0, 33, 0, 3, 9, 17, 0, 1, 0, 3, 0, Route6_EventScript_1A9A53, 0, 0, 0
-
-Route6_MapWarps:
-	warp_def 19, 13, 0, 1, 288
-	warp_def 12, 5, 3, 2, 4608
-	warp_def 13, 5, 3, 2, 4608
-
-Route6_MapBGEvents:
-	bg_event 21, 15, 0, 0, 0, Route6_EventScript_167FB2
-	bg_event 5, 5, 3, 7, 0, 142, 118, 1
-	bg_event 19, 5, 3, 7, 0, 68, 119, 1
-
-Route6_MapEvents::
-	map_events Route6_EventObjects, Route6_MapWarps, 0x0, Route6_MapBGEvents
diff --git a/data/maps/Route6/header.inc b/data/maps/Route6/header.inc
deleted file mode 100644
index 8e2668411..000000000
--- a/data/maps/Route6/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route6:: @ 83508B8
-    .4byte Route6_Layout @ 0x82E9A00
-    .4byte Route6_MapEvents @ 0x83B6AA0
-    .4byte Route6_MapScripts @ 0x8167FB1
-    .4byte Route6_MapConnections @ 0x8352A94
-    .2byte BGM_FRLG_ROUTE_3
-    .2byte 94
-    .byte 0x6a, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
new file mode 100644
index 000000000..13dc779ef
--- /dev/null
+++ b/data/maps/Route6/map.json
@@ -0,0 +1,157 @@
+{
+  "id": "MAP_ROUTE6",
+  "name": "Route6",
+  "layout": "LAYOUT_ROUTE6",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_6",
+  "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_SAFFRON_CITY",
+      "offset": 0,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_VERMILION_CITY",
+      "offset": -12,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "20",
+      "x": 3,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route6_EventScript_1A9999",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 12,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route6_EventScript_1A9A15",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 13,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route6_EventScript_1A9A91",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 20,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A99D7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 13,
+      "y": 32,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A9ACF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 13,
+      "y": 33,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route6_EventScript_1A9A53",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 19,
+      "y": 13,
+      "elevation": 0,
+      "dest_map": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE6_NORTH_ENTRANCE",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 21,
+      "y": 15,
+      "elevation": 0,
+      "script": "Route6_EventScript_167FB2"
+    },
+    {
+      "type": "hidden_item",
+      "x": 5,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_SITRUS_BERRY",
+      "flag": "118",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 5,
+      "elevation": 3,
+      "item": "ITEM_RARE_CANDY",
+      "flag": "119",
+      "unknown": 1
+    }
+  ]
+}
\ No newline at end of file