convert map data to json

4 files changed, 236 insertions, 40 deletions

diff --git a/data/maps/Route15/connections.inc b/data/maps/Route15/connections.inc
deleted file mode 100644
index 3706a64ed..000000000
--- a/data/maps/Route15/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route15_MapConnectionsList: @ 8352BA8
-    connection left, -10, MAP_FUCHSIA_CITY
-    connection right, -40, MAP_ROUTE14
-
-Route15_MapConnections:: @ 8352BC0
-    .4byte 2
-    .4byte Route15_MapConnectionsList
diff --git a/data/maps/Route15/events.inc b/data/maps/Route15/events.inc
deleted file mode 100644
index ecb7f3069..000000000
--- a/data/maps/Route15/events.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-Route15_EventObjects:
-	object_event 1, 40, 0, 22, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAD67, 0, 0, 0
-	object_event 2, 26, 0, 31, 0, 12, 0, 3, 9, 17, 0, 1, 0, 5, 0, Route15_EventScript_1AACEB, 0, 0, 0
-	object_event 3, 26, 0, 37, 0, 14, 0, 3, 7, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAD29, 0, 0, 0
-	object_event 4, 40, 0, 44, 0, 13, 0, 3, 2, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AADA5, 0, 0, 0
-	object_event 5, 29, 0, 50, 0, 12, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AACAD, 0, 0, 0
-	object_event 6, 53, 0, 59, 0, 12, 0, 3, 18, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAC31, 0, 0, 0
-	object_event 7, 53, 0, 63, 0, 13, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AABF3, 0, 0, 0
-	object_event 8, 40, 0, 52, 0, 8, 0, 3, 2, 66, 0, 1, 0, 1, 0, Route15_EventScript_1AADE3, 0, 0, 0
-	object_event 9, 29, 0, 54, 0, 12, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route15_EventScript_1AAC6F, 0, 0, 0
-	object_event 10, 40, 0, 28, 0, 6, 0, 3, 2, 66, 0, 1, 0, 1, 0, Route15_EventScript_1AAE21, 0, 0, 0
-	object_event 11, 92, 0, 20, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route15_EventScript_1BE7CA, 384, 0, 0
-	object_event 12, 54, 0, 39, 0, 7, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAEA5, 0, 0, 0
-	object_event 13, 24, 0, 40, 0, 7, 0, 3, 8, 17, 0, 1, 0, 1, 0, Route15_EventScript_1AAE5F, 0, 0, 0
-	object_event 14, 65375, 0, 73, 0, 7, 0, 13, 0, 0, 0, 32, 0, 3, 0, 0x0, 0, 0, 0
-
-Route15_MapWarps:
-	warp_def 9, 11, 3, 0, 6144
-	warp_def 16, 11, 3, 2, 6144
-
-Route15_MapBGEvents:
-	bg_event 41, 11, 0, 0, 0, Route15_EventScript_1680DC
-
-Route15_MapEvents::
-	map_events Route15_EventObjects, Route15_MapWarps, 0x0, Route15_MapBGEvents
diff --git a/data/maps/Route15/header.inc b/data/maps/Route15/header.inc
deleted file mode 100644
index c1fc1f9cd..000000000
--- a/data/maps/Route15/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route15:: @ 83509B4
-    .4byte Route15_Layout @ 0x82F0804
-    .4byte Route15_MapEvents @ 0x83B7748
-    .4byte Route15_MapScripts @ 0x81680DB
-    .4byte Route15_MapConnections @ 0x8352BC0
-    .2byte BGM_FRLG_ROUTE_11
-    .2byte 103
-    .byte 0x73, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json
new file mode 100644
index 000000000..213b89fdc
--- /dev/null
+++ b/data/maps/Route15/map.json
@@ -0,0 +1,236 @@
+{
+  "id": "MAP_ROUTE15",
+  "name": "Route15",
+  "layout": "LAYOUT_ROUTE15",
+  "music": "BGM_FRLG_ROUTE_11",
+  "region_map_section": "MAPSEC_ROUTE_15",
+  "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_FUCHSIA_CITY",
+      "offset": -10,
+      "direction": "left"
+    },
+    {
+      "map": "MAP_ROUTE14",
+      "offset": -40,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "40",
+      "x": 22,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AAD67",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 31,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route15_EventScript_1AACEB",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 37,
+      "y": 14,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route15_EventScript_1AAD29",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 44,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AADA5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 50,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route15_EventScript_1AACAD",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 59,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route15_EventScript_1AAC31",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "53",
+      "x": 63,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "13",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AABF3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 52,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AADE3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "29",
+      "x": 54,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route15_EventScript_1AAC6F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 28,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 2,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AAE21",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 20,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route15_EventScript_1BE7CA",
+      "flag": "384"
+    },
+    {
+      "graphics_id": "54",
+      "x": 39,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AAEA5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "24",
+      "x": 40,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route15_EventScript_1AAE5F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "65375",
+      "x": 73,
+      "y": 7,
+      "elevation": 13,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 32,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE15_WEST_ENTRANCE_1F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 41,
+      "y": 11,
+      "elevation": 0,
+      "script": "Route15_EventScript_1680DC"
+    }
+  ]
+}
\ No newline at end of file