Merge pull request #543 from pret/mapdata

Convert map data to JSON

3 files changed, 83 insertions, 29 deletions

diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc
deleted file mode 100644
index afd3801e3..000000000
--- a/data/maps/MtPyre_5F/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MtPyre_5F_EventObjects: @ 8535004
-	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE
-
-MtPyre_5F_MapWarps: @ 8535034
-	warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
-	warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F
-	warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F
-	warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F
-	warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F
-
-MtPyre_5F_MapEvents:: @ 853505C
-	map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
deleted file mode 100644
index 17c8eddcd..000000000
--- a/data/maps/MtPyre_5F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_5F: @ 84840D4
-	.4byte MtPyre_5F_Layout
-	.4byte MtPyre_5F_MapEvents
-	.4byte MtPyre_5F_MapScripts
-	.4byte 0x0
-	.2byte MUS_M_DUNGON
-	.2byte 141
-	.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_5F/map.json b/data/maps/MtPyre_5F/map.json
new file mode 100644
index 000000000..b27d426ac
--- /dev/null
+++ b/data/maps/MtPyre_5F/map.json
@@ -0,0 +1,83 @@
+{
+  "id": "MAP_MT_PYRE_5F",
+  "name": "MtPyre_5F",
+  "layout": "LAYOUT_MT_PYRE_5F",
+  "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_BLACK_BELT",
+      "x": 3,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "MtPyre_5F_EventScript_231BC9",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+      "x": 6,
+      "y": 11,
+      "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_5F_EventScript_291324",
+      "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 2,
+      "y": 1,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_6F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_6F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 12,
+      "y": 10,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 12,
+      "y": 12,
+      "elevation": 3,
+      "dest_map": "MAP_MT_PYRE_4F",
+      "dest_warp_id": 3
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file