Merge pull request #543 from pret/mapdata

Convert map data to JSON

3 files changed, 42 insertions, 24 deletions

diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc
deleted file mode 100644
index 94f30d262..000000000
--- a/data/maps/CaveOfOrigin_B1F/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-CaveOfOrigin_B1F_EventObjects: @ 8535DD0
-	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE
-
-CaveOfOrigin_B1F_MapWarps: @ 8535DE8
-	warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F
-
-CaveOfOrigin_B1F_MapEvents:: @ 8535DF0
-	map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
deleted file mode 100644
index 7b70ba43f..000000000
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-CaveOfOrigin_B1F: @ 8484358
-	.4byte CaveOfOrigin_B1F_Layout
-	.4byte CaveOfOrigin_B1F_MapEvents
-	.4byte CaveOfOrigin_B1F_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 162
-	.byte MAPSEC_CAVE_OF_ORIGIN
-	.byte 0
-	.byte WEATHER_FOG_1
-	.byte MAP_TYPE_UNDERGROUND
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json
new file mode 100644
index 000000000..f8c584845
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B1F/map.json
@@ -0,0 +1,42 @@
+{
+  "id": "MAP_CAVE_OF_ORIGIN_B1F",
+  "name": "CaveOfOrigin_B1F",
+  "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F",
+  "music": "65535",
+  "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
+  "requires_flash": false,
+  "weather": "WEATHER_FOG_1",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_bike": false,
+  "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_WALLACE",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "CaveOfOrigin_B1F_EventScript_2357A9",
+      "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 9,
+      "y": 3,
+      "elevation": 3,
+      "dest_map": "MAP_CAVE_OF_ORIGIN_1F",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file