Convert map data to JSON

4 files changed, 123 insertions, 35 deletions

diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc
deleted file mode 100644
index d1bb18b87..000000000
--- a/data/maps/Route107/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route107_MapConnectionsList:
-	connection left, 0, MAP_DEWFORD_TOWN
-	connection right, 0, MAP_ROUTE108
-
-Route107_MapConnections:
-	.4byte 2
-	.4byte Route107_MapConnectionsList
-
diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc
deleted file mode 100644
index 461d8cd86..000000000
--- a/data/maps/Route107/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route107_EventObjects:
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route107_EventScript_1EE625, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0
-	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0
-	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0
-
-Route107_MapEvents::
-	map_events Route107_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
deleted file mode 100644
index db53b811d..000000000
--- a/data/maps/Route107/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route107:
-	.4byte Route107_Layout
-	.4byte Route107_MapEvents
-	.4byte Route107_MapScripts
-	.4byte Route107_MapConnections
-	.2byte MUS_NEXTROAD
-	.2byte LAYOUT_ROUTE107
-	.byte MAPSEC_ROUTE_107
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json
new file mode 100644
index 000000000..dcb17ed8c
--- /dev/null
+++ b/data/maps/Route107/map.json
@@ -0,0 +1,123 @@
+{
+  "id": "MAP_ROUTE107",
+  "name": "Route107",
+  "layout": "LAYOUT_ROUTE107",
+  "music": "MUS_NEXTROAD",
+  "region_map_section": "MAPSEC_ROUTE_107",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_DEWFORD_TOWN"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE108"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 41,
+      "y": 10,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route107_EventScript_1EE595",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 23,
+      "y": 11,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP",
+      "movement_range_x": 6,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route107_EventScript_1EE5AC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 16,
+      "y": 7,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route107_EventScript_1EE60E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 50,
+      "y": 11,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route107_EventScript_1EE625",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 33,
+      "y": 4,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route107_EventScript_1EE63C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING",
+      "x": 32,
+      "y": 4,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route107_EventScript_1EE657",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 50,
+      "y": 5,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route107_EventScript_1EE672",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file