Merge pull request #543 from pret/mapdata

Convert map data to JSON

4 files changed, 39 insertions, 29 deletions

diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc
deleted file mode 100644
index 2a0442a05..000000000
--- a/data/maps/Route122/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route122_MapConnectionsList: @ 8486B0C
-	connection up, -20, MAP_ROUTE121
-	connection down, -100, MAP_ROUTE123
-
-Route122_MapConnections: @ 8486B24
-	.4byte 0x2
-	.4byte Route122_MapConnectionsList
-
diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc
deleted file mode 100644
index 4c5b9b464..000000000
--- a/data/maps/Route122/events.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Route122_MapWarps: @ 852BDA0
-	warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F
-
-Route122_MapEvents:: @ 852BDA8
-	map_events 0x0, Route122_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
deleted file mode 100644
index eddd1a234..000000000
--- a/data/maps/Route122/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route122: @ 84828C4
-	.4byte Route122_Layout
-	.4byte Route122_MapEvents
-	.4byte Route122_MapScripts
-	.4byte Route122_MapConnections
-	.2byte MUS_DOORO_X4
-	.2byte 38
-	.byte MAPSEC_ROUTE_122
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_ROUTE
-	.2byte 0
-	map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json
new file mode 100644
index 000000000..9dee984d9
--- /dev/null
+++ b/data/maps/Route122/map.json
@@ -0,0 +1,39 @@
+{
+  "id": "MAP_ROUTE122",
+  "name": "Route122",
+  "layout": "LAYOUT_ROUTE122",
+  "music": "MUS_DOORO_X4",
+  "region_map_section": "MAPSEC_ROUTE_122",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_ROUTE",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "up",
+      "offset": -20,
+      "map": "MAP_ROUTE121"
+    },
+    {
+      "direction": "down",
+      "offset": -100,
+      "map": "MAP_ROUTE123"
+    }
+  ],
+  "object_events": [],
+  "warp_events": [
+    {
+      "x": 22,
+      "y": 29,
+      "elevation": 0,
+      "dest_map": "MAP_MT_PYRE_1F",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file