convert map data to json

4 files changed, 208 insertions, 42 deletions

diff --git a/data/maps/Route2/connections.inc b/data/maps/Route2/connections.inc
deleted file mode 100644
index d37b77d96..000000000
--- a/data/maps/Route2/connections.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route2_MapConnectionsList: @ 83529FC
-    connection up, -12, MAP_PEWTER_CITY
-    connection down, -12, MAP_VIRIDIAN_CITY
-
-Route2_MapConnections:: @ 8352A14
-    .4byte 2
-    .4byte Route2_MapConnectionsList
diff --git a/data/maps/Route2/events.inc b/data/maps/Route2/events.inc
deleted file mode 100644
index 316893612..000000000
--- a/data/maps/Route2/events.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-Route2_EventObjects:
-	object_event 1, 95, 0, 16, 0, 62, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 20, 0, 0
-	object_event 2, 95, 0, 15, 0, 69, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 19, 0, 0
-	object_event 3, 95, 0, 11, 0, 13, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 21, 0, 0
-	object_event 4, 95, 0, 18, 0, 26, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BDF13, 22, 0, 0
-	object_event 5, 92, 0, 17, 0, 54, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BE58E, 340, 0, 0
-	object_event 6, 92, 0, 17, 0, 64, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_EventScript_1BE59B, 341, 0, 0
-	object_event 7, 65375, 0, 6, 0, 85, 0, 8, 0, 0, 0, 1, 0, 3, 0, 0x0, 0, 0, 0
-
-Route2_MapWarps:
-	warp_def 5, 13, 3, 3, 3843
-	warp_def 6, 13, 3, 3, 3843
-	warp_def 5, 51, 3, 1, 3840
-	warp_def 17, 11, 3, 1, 292
-	warp_def 17, 22, 0, 1, 3841
-	warp_def 18, 46, 3, 1, 3842
-	warp_def 18, 41, 3, 3, 3842
-	warp_def 19, 41, 3, 3, 3842
-	warp_def 19, 46, 3, 1, 3842
-	warp_def 6, 51, 3, 1, 3840
-
-Route2_MapBGEvents:
-	bg_event 14, 12, 0, 0, 0, Route2_EventScript_167F6E
-	bg_event 7, 73, 0, 0, 0, Route2_EventScript_167F65
-
-Route2_MapEvents::
-	map_events Route2_EventObjects, Route2_MapWarps, 0x0, Route2_MapBGEvents
diff --git a/data/maps/Route2/header.inc b/data/maps/Route2/header.inc
deleted file mode 100644
index 985fe6d72..000000000
--- a/data/maps/Route2/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route2:: @ 8350848
-    .4byte Route2_Layout @ 0x82E64F0
-    .4byte Route2_MapEvents @ 0x83B676C
-    .4byte Route2_MapScripts @ 0x8167F64
-    .4byte Route2_MapConnections @ 0x8352A14
-    .2byte BGM_FRLG_ROUTE_1
-    .2byte 90
-    .byte 0x66, 0x00, 0x02, 0x03, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
new file mode 100644
index 000000000..a8fde02a1
--- /dev/null
+++ b/data/maps/Route2/map.json
@@ -0,0 +1,208 @@
+{
+  "id": "MAP_ROUTE2",
+  "name": "Route2",
+  "layout": "LAYOUT_ROUTE2",
+  "music": "BGM_FRLG_ROUTE_1",
+  "region_map_section": "MAPSEC_ROUTE_2",
+  "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_PEWTER_CITY",
+      "offset": -12,
+      "direction": "up"
+    },
+    {
+      "map": "MAP_VIRIDIAN_CITY",
+      "offset": -12,
+      "direction": "down"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "95",
+      "x": 16,
+      "y": 62,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BDF13",
+      "flag": "20"
+    },
+    {
+      "graphics_id": "95",
+      "x": 15,
+      "y": 69,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BDF13",
+      "flag": "19"
+    },
+    {
+      "graphics_id": "95",
+      "x": 11,
+      "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": "Route2_EventScript_1BDF13",
+      "flag": "21"
+    },
+    {
+      "graphics_id": "95",
+      "x": 18,
+      "y": 26,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BDF13",
+      "flag": "22"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 54,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BE58E",
+      "flag": "340"
+    },
+    {
+      "graphics_id": "92",
+      "x": 17,
+      "y": 64,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_EventScript_1BE59B",
+      "flag": "341"
+    },
+    {
+      "graphics_id": "65375",
+      "x": 6,
+      "y": 85,
+      "elevation": 8,
+      "movement_type": "0",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 6,
+      "y": 13,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 5,
+      "y": 51,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 17,
+      "y": 11,
+      "elevation": 3,
+      "dest_map": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 17,
+      "y": 22,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2_HOUSE",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 18,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_EAST_BUILDING",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 18,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_EAST_BUILDING",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 19,
+      "y": 41,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_EAST_BUILDING",
+      "dest_warp_id": 3
+    },
+    {
+      "x": 19,
+      "y": 46,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_EAST_BUILDING",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 6,
+      "y": 51,
+      "elevation": 3,
+      "dest_map": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 14,
+      "y": 12,
+      "elevation": 0,
+      "script": "Route2_EventScript_167F6E"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 7,
+      "y": 73,
+      "elevation": 0,
+      "script": "Route2_EventScript_167F65"
+    }
+  ]
+}
\ No newline at end of file