convert map data to json

4 files changed, 247 insertions, 41 deletions

diff --git a/data/maps/Route25/connections.inc b/data/maps/Route25/connections.inc
deleted file mode 100644
index b7b963790..000000000
--- a/data/maps/Route25/connections.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Route25_MapConnectionsList: @ 8352D08
-    connection left, 0, MAP_ROUTE24
-
-Route25_MapConnections:: @ 8352D14
-    .4byte 1
-    .4byte Route25_MapConnectionsList
diff --git a/data/maps/Route25/events.inc b/data/maps/Route25/events.inc
deleted file mode 100644
index e4085c154..000000000
--- a/data/maps/Route25/events.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-Route25_EventObjects:
-	object_event 1, 56, 0, 11, 0, 4, 0, 3, 10, 17, 0, 1, 0, 4, 0, Route25_EventScript_1A98A1, 0, 0, 0
-	object_event 2, 18, 0, 18, 0, 2, 0, 3, 8, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A976B, 0, 0, 0
-	object_event 3, 56, 0, 17, 0, 7, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A991D, 0, 0, 0
-	object_event 4, 18, 0, 22, 0, 4, 0, 3, 1, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A97A9, 0, 0, 0
-	object_event 5, 40, 0, 22, 0, 8, 0, 3, 10, 17, 0, 1, 0, 2, 0, Route25_EventScript_1A9825, 0, 0, 0
-	object_event 6, 56, 0, 27, 0, 9, 0, 3, 7, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A98DF, 0, 0, 0
-	object_event 7, 39, 0, 28, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A995B, 0, 0, 0
-	object_event 8, 18, 0, 36, 0, 4, 0, 3, 26, 49, 0, 1, 0, 2, 0, Route25_EventScript_1A97E7, 0, 0, 0
-	object_event 9, 22, 0, 42, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route25_EventScript_1A9863, 0, 0, 0
-	object_event 10, 92, 0, 26, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route25_EventScript_1BE651, 355, 0, 0
-	object_event 11, 95, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route25_EventScript_1BDF13, 18, 0, 0
-	object_event 12, 29, 0, 49, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route25_EventScript_1ACE4F, 0, 0, 0
-	object_event 13, 25, 0, 49, 0, 11, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route25_EventScript_16874F, 0, 0, 0
-
-Route25_MapWarps:
-	warp_def 51, 4, 0, 1, 7680
-
-Route25_MapBGEvents:
-	bg_event 48, 4, 0, 0, 0, Route25_EventScript_168746
-	bg_event 14, 2, 3, 7, 0, 36, 4, 1
-	bg_event 58, 6, 3, 7, 0, 34, 5, 1
-	bg_event 33, 8, 3, 7, 0, 139, 116, 1
-	bg_event 40, 3, 3, 7, 0, 149, 117, 1
-
-Route25_MapEvents::
-	map_events Route25_EventObjects, Route25_MapWarps, 0x0, Route25_MapBGEvents
diff --git a/data/maps/Route25/header.inc b/data/maps/Route25/header.inc
deleted file mode 100644
index f4525d40e..000000000
--- a/data/maps/Route25/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route25:: @ 8350AE8
-    .4byte Route25_Layout @ 0x82F996C
-    .4byte Route25_MapEvents @ 0x83B8590
-    .4byte Route25_MapScripts @ 0x8168745
-    .4byte Route25_MapConnections @ 0x8352D14
-    .2byte BGM_FRLG_ROUTE_24
-    .2byte 113
-    .byte 0x7d, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json
new file mode 100644
index 000000000..4e6baf2be
--- /dev/null
+++ b/data/maps/Route25/map.json
@@ -0,0 +1,247 @@
+{
+  "id": "MAP_ROUTE25",
+  "name": "Route25",
+  "layout": "LAYOUT_ROUTE25",
+  "music": "BGM_FRLG_ROUTE_24",
+  "region_map_section": "MAPSEC_ROUTE_25",
+  "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_ROUTE24",
+      "offset": 0,
+      "direction": "left"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "56",
+      "x": 11,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route25_EventScript_1A98A1",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 18,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A976B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 17,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A991D",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 22,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A97A9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "40",
+      "x": 22,
+      "y": 8,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A9825",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "56",
+      "x": 27,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route25_EventScript_1A98DF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "39",
+      "x": 28,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route25_EventScript_1A995B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "18",
+      "x": 36,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "26",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route25_EventScript_1A97E7",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "22",
+      "x": 42,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route25_EventScript_1A9863",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 26,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_EventScript_1BE651",
+      "flag": "355"
+    },
+    {
+      "graphics_id": "95",
+      "x": 30,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "29",
+      "x": 49,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_EventScript_1ACE4F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "25",
+      "x": 49,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route25_EventScript_16874F",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 51,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE25_SEA_COTTAGE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 48,
+      "y": 4,
+      "elevation": 0,
+      "script": "Route25_EventScript_168746"
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 2,
+      "elevation": 3,
+      "item": "ITEM_ELIXIR",
+      "flag": "4",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 58,
+      "y": 6,
+      "elevation": 3,
+      "item": "ITEM_ETHER",
+      "flag": "5",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 33,
+      "y": 8,
+      "elevation": 3,
+      "item": "ITEM_ORAN_BERRY",
+      "flag": "116",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 40,
+      "y": 3,
+      "elevation": 3,
+      "item": "ITEM_BLUK_BERRY",
+      "flag": "117",
+      "unknown": 1
+    }
+  ]
+}
\ No newline at end of file