Convert map data to JSON

3 files changed, 42 insertions, 24 deletions

diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc
deleted file mode 100644
index f43240a78..000000000
--- a/data/maps/ScorchedSlab/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-ScorchedSlab_EventObjects:
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11
-
-ScorchedSlab_MapWarps:
-	warp_def 7, 16, 1, 1, MAP_ROUTE120
-
-ScorchedSlab_MapEvents::
-	map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
deleted file mode 100644
index ec09efb0f..000000000
--- a/data/maps/ScorchedSlab/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ScorchedSlab:
-	.4byte ScorchedSlab_Layout
-	.4byte ScorchedSlab_MapEvents
-	.4byte ScorchedSlab_MapScripts
-	.4byte 0x0
-	.2byte MUS_DAN01
-	.2byte LAYOUT_SCORCHED_SLAB
-	.byte MAPSEC_SCORCHED_SLAB
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json
new file mode 100644
index 000000000..f24aa0eba
--- /dev/null
+++ b/data/maps/ScorchedSlab/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_SCORCHED_SLAB",
+  "name": "ScorchedSlab",
+  "layout": "LAYOUT_SCORCHED_SLAB",
+  "music": "MUS_DAN01",
+  "region_map_section": "MAPSEC_SCORCHED_SLAB",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": true,
+  "allow_escape_rope": true,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "ScorchedSlab_EventScript_2912AF",
+      "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 16,
+      "elevation": 1,
+      "dest_map": "MAP_ROUTE120",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file