convert map data to json

4 files changed, 221 insertions, 41 deletions

diff --git a/data/maps/Route16/connections.inc b/data/maps/Route16/connections.inc
deleted file mode 100644
index c48d0b461..000000000
--- a/data/maps/Route16/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route16_MapConnectionsList: @ 8352BC8
-    connection down, 0, MAP_ROUTE17
-    connection right, -10, MAP_CELADON_CITY
-
-Route16_MapConnections:: @ 8352BE0
-    .4byte 2
-    .4byte Route16_MapConnectionsList
diff --git a/data/maps/Route16/events.inc b/data/maps/Route16/events.inc
deleted file mode 100644
index 316615eab..000000000
--- a/data/maps/Route16/events.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-Route16_EventObjects:
-	object_event 1, 53, 0, 16, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAEEB, 0, 0, 0
-	object_event 2, 53, 0, 14, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAFA5, 0, 0, 0
-	object_event 3, 53, 0, 12, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAFE3, 0, 0, 0
-	object_event 4, 53, 0, 8, 0, 12, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAF67, 0, 0, 0
-	object_event 5, 53, 0, 10, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AAF29, 0, 0, 0
-	object_event 6, 53, 0, 6, 0, 14, 0, 3, 1, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB021, 0, 0, 0
-	object_event 7, 95, 0, 41, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_EventScript_1BDF13, 18, 0, 0
-	object_event 8, 29, 0, 30, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB0A5, 0, 0, 0
-	object_event 9, 25, 0, 31, 0, 5, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route16_EventScript_1AB05F, 0, 0, 0
-	object_event 10, 109, 0, 31, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route16_EventScript_168121, 128, 0, 0
-
-Route16_MapWarps:
-	warp_def 10, 5, 0, 1, 6400
-	warp_def 20, 6, 3, 0, 6401
-	warp_def 27, 6, 3, 1, 6401
-	warp_def 20, 13, 3, 2, 6401
-	warp_def 27, 13, 3, 3, 6401
-
-Route16_MapBGEvents:
-	bg_event 6, 17, 0, 0, 0, Route16_EventScript_1681B6
-	bg_event 33, 11, 0, 0, 0, Route16_EventScript_1681AD
-	bg_event 31, 13, 3, 7, 0, 200, 132, 129
-
-Route16_MapEvents::
-	map_events Route16_EventObjects, Route16_MapWarps, 0x0, Route16_MapBGEvents
diff --git a/data/maps/Route16/header.inc b/data/maps/Route16/header.inc
deleted file mode 100644
index 71785a7a5..000000000
--- a/data/maps/Route16/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route16:: @ 83509D0
-    .4byte Route16_Layout @ 0x82F0FA8
-    .4byte Route16_MapEvents @ 0x83B7898
-    .4byte Route16_MapScripts @ 0x81680E5
-    .4byte Route16_MapConnections @ 0x8352BE0
-    .2byte BGM_FRLG_ROUTE_3
-    .2byte 104
-    .byte 0x74, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json
new file mode 100644
index 000000000..a8dd02f92
--- /dev/null
+++ b/data/maps/Route16/map.json
@@ -0,0 +1,221 @@
+{
+  "id": "MAP_ROUTE16",
+  "name": "Route16",
+  "layout": "LAYOUT_ROUTE16",
+  "music": "BGM_FRLG_ROUTE_3",
+  "region_map_section": "MAPSEC_ROUTE_16",
+  "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": "down"
+    },
+    {
+      "map": "MAP_CELADON_CITY",
+      "offset": -10,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "53",
+      "x": 16,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAEEB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 14,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAFA5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAFE3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 8,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAF67",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 10,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AAF29",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 6,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AB021",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "95",
+      "x": 41,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "29",
+      "x": 30,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AB0A5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 31,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route16_EventScript_1AB05F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "109",
+      "x": 31,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route16_EventScript_168121",
+      "flag": "128"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 10,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE16_HOUSE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 27,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 20,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 27,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE16_NORTH_ENTRANCE_1F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 6,
+      "y": 17,
+      "elevation": 0,
+      "script": "Route16_EventScript_1681B6"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 33,
+      "y": 11,
+      "elevation": 0,
+      "script": "Route16_EventScript_1681AD"
+    },
+    {
+      "type": "hidden_item",
+      "x": 31,
+      "y": 13,
+      "elevation": 3,
+      "item": "ITEM_LEFTOVERS",
+      "flag": "132",
+      "unknown": 129
+    }
+  ]
+}
\ No newline at end of file