convert map data to json

4 files changed, 164 insertions, 34 deletions

diff --git a/data/maps/Route24/connections.inc b/data/maps/Route24/connections.inc
deleted file mode 100644
index a255e904a..000000000
--- a/data/maps/Route24/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route24_MapConnectionsList: @ 8352CE8
-    connection down, -12, MAP_CERULEAN_CITY
-    connection right, 0, MAP_ROUTE25
-
-Route24_MapConnections:: @ 8352D00
-    .4byte 2
-    .4byte Route24_MapConnectionsList
diff --git a/data/maps/Route24/events.inc b/data/maps/Route24/events.inc
deleted file mode 100644
index 701cc2b25..000000000
--- a/data/maps/Route24/events.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-Route24_EventObjects:
-	object_event 1, 25, 0, 12, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route24_EventScript_168620, 49, 0, 0
-	object_event 2, 39, 0, 12, 0, 19, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A972D, 0, 0, 0
-	object_event 3, 22, 0, 10, 0, 22, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A9673, 0, 0, 0
-	object_event 4, 18, 0, 12, 0, 25, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A95F7, 0, 0, 0
-	object_event 5, 22, 0, 10, 0, 28, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A96B1, 0, 0, 0
-	object_event 6, 20, 0, 12, 0, 31, 0, 3, 9, 17, 0, 1, 0, 2, 0, Route24_EventScript_1A9635, 0, 0, 0
-	object_event 7, 39, 0, 5, 0, 21, 0, 3, 7, 17, 0, 1, 0, 5, 0, Route24_EventScript_1A96EF, 0, 0, 0
-	object_event 8, 92, 0, 11, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route24_EventScript_1BE644, 354, 0, 0
-
-Route24_MapCoordEvents:
-	coord_event 10, 15, 3, 0, 16491, 0, 0, Route24_EventScript_168660
-	coord_event 11, 15, 3, 0, 16491, 0, 0, Route24_EventScript_16866C
-
-Route24_MapBGEvents:
-	bg_event 19, 4, 3, 7, 0, 135, 115, 1
-
-Route24_MapEvents::
-	map_events Route24_EventObjects, 0x0, Route24_MapCoordEvents, Route24_MapBGEvents
diff --git a/data/maps/Route24/header.inc b/data/maps/Route24/header.inc
deleted file mode 100644
index 298826eef..000000000
--- a/data/maps/Route24/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route24:: @ 8350ACC
-    .4byte Route24_Layout @ 0x82F8E08
-    .4byte Route24_MapEvents @ 0x83B8400
-    .4byte Route24_MapScripts @ 0x816861F
-    .4byte Route24_MapConnections @ 0x8352D00
-    .2byte BGM_FRLG_ROUTE_24
-    .2byte 112
-    .byte 0x7c, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json
new file mode 100644
index 000000000..edc86edb8
--- /dev/null
+++ b/data/maps/Route24/map.json
@@ -0,0 +1,164 @@
+{
+  "id": "MAP_ROUTE24",
+  "name": "Route24",
+  "layout": "LAYOUT_ROUTE24",
+  "music": "BGM_FRLG_ROUTE_24",
+  "region_map_section": "MAPSEC_ROUTE_24",
+  "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_CERULEAN_CITY",
+      "offset": -12,
+      "direction": "down"
+    },
+    {
+      "map": "MAP_ROUTE25",
+      "offset": 0,
+      "direction": "right"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "25",
+      "x": 12,
+      "y": 15,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route24_EventScript_168620",
+      "flag": "49"
+    },
+    {
+      "graphics_id": "39",
+      "x": 12,
+      "y": 19,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A972D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 10,
+      "y": 22,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A9673",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 12,
+      "y": 25,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A95F7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 10,
+      "y": 28,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A96B1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "20",
+      "x": 12,
+      "y": 31,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route24_EventScript_1A9635",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 5,
+      "y": 21,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route24_EventScript_1A96EF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route24_EventScript_1BE644",
+      "flag": "354"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x406B",
+      "var_value": 0,
+      "script": "Route24_EventScript_168660"
+    },
+    {
+      "type": "trigger",
+      "x": 11,
+      "y": 15,
+      "elevation": 3,
+      "var": "VAR_0x406B",
+      "var_value": 0,
+      "script": "Route24_EventScript_16866C"
+    }
+  ],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 19,
+      "y": 4,
+      "elevation": 3,
+      "item": "ITEM_PECHA_BERRY",
+      "flag": "115",
+      "unknown": 1
+    }
+  ]
+}
\ No newline at end of file