convert map data to json

3 files changed, 68 insertions, 19 deletions

diff --git a/data/maps/Route2_House/events.inc b/data/maps/Route2_House/events.inc
deleted file mode 100644
index e6f06bc09..000000000
--- a/data/maps/Route2_House/events.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route2_House_EventObjects:
-	object_event 1, 55, 0, 4, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route2_House_EventScript_16F5F9, 0, 0, 0
-	object_event 2, 51, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route2_House_EventScript_16F602, 0, 0, 0
-
-Route2_House_MapWarps:
-	warp_def 3, 7, 0, 4, 788
-	warp_def 4, 7, 0, 4, 788
-	warp_def 5, 7, 0, 4, 788
-
-Route2_House_MapEvents::
-	map_events Route2_House_EventObjects, Route2_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route2_House/header.inc b/data/maps/Route2_House/header.inc
deleted file mode 100644
index c04a3439c..000000000
--- a/data/maps/Route2_House/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route2_House:: @ 835177C
-    .4byte House2_Layout @ 0x82D5840
-    .4byte Route2_House_MapEvents @ 0x83BD3D8
-    .4byte Route2_House_MapScripts @ 0x816F5F8
-    .4byte NULL
-    .2byte BGM_FRLG_VIRIDIAN_CITY
-    .2byte 7
-    .byte 0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json
new file mode 100644
index 000000000..cbb0eb947
--- /dev/null
+++ b/data/maps/Route2_House/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_ROUTE2_HOUSE",
+  "name": "Route2_House",
+  "layout": "LAYOUT_HOUSE2",
+  "music": "BGM_FRLG_VIRIDIAN_CITY",
+  "region_map_section": "MAPSEC_ROUTE_2",
+  "requires_flash": false,
+  "weather": "WEATHER_0",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "Route2_House_EventScript_16F5F9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "51",
+      "x": 7,
+      "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": "Route2_House_EventScript_16F602",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 4
+    },
+    {
+      "x": 5,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE2",
+      "dest_warp_id": 4
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file