Convert map data to JSON

3 files changed, 75 insertions, 27 deletions

diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc
deleted file mode 100644
index df862d84e..000000000
--- a/data/maps/MtPyre_6F/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MtPyre_6F_EventObjects:
-	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30
-	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0
-
-MtPyre_6F_MapWarps:
-	warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
-	warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F
-
-MtPyre_6F_MapEvents::
-	map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
deleted file mode 100644
index ca0e545aa..000000000
--- a/data/maps/MtPyre_6F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_6F:
-	.4byte MtPyre_6F_Layout
-	.4byte MtPyre_6F_MapEvents
-	.4byte MtPyre_6F_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte LAYOUT_MT_PYRE_6F
-	.byte MAPSEC_MT_PYRE
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json
new file mode 100644
index 000000000..a169953f2
--- /dev/null
+++ b/data/maps/MtPyre_6F/map.json
@@ -0,0 +1,75 @@
+{
+  "id": "MAP_MT_PYRE_6F",
+  "name": "MtPyre_6F",
+  "layout": "LAYOUT_MT_PYRE_6F",
+  "music": "MUS_M_DUNGON",
+  "region_map_section": "MAPSEC_MT_PYRE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "MtPyre_6F_EventScript_231D3B",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "MtPyre_6F_EventScript_291331",
+      "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+      "x": 10,
+      "y": 3,
+      "elevation": 3,
+      "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": "MtPyre_6F_EventScript_231D9D",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_5F",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file