Convert map data to JSON

5 files changed, 145 insertions, 40 deletions

diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc
deleted file mode 100644
index 9697ba1e0..000000000
--- a/data/maps/Route131/connections.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route131_MapConnectionsList:
-	connection left, 0, MAP_PACIFIDLOG_TOWN
-	connection right, 0, MAP_ROUTE130
-
-Route131_MapConnections:
-	.4byte 2
-	.4byte Route131_MapConnectionsList
-
diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc
deleted file mode 100644
index 4f57f7b1c..000000000
--- a/data/maps/Route131/events.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route131_EventObjects:
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 3, 5, 1, 3, Route131_EventScript_1F746E, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F7485, 0
-	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0
-	object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0
-	object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0
-
-Route131_MapWarps:
-	warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE
-
-Route131_MapEvents::
-	map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0
-
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
deleted file mode 100644
index 177dba5ab..000000000
--- a/data/maps/Route131/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route131:
-	.4byte Route131_Layout
-	.4byte Route131_MapEvents
-	.4byte Route131_MapScripts
-	.4byte Route131_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte LAYOUT_ROUTE131
-	.byte MAPSEC_ROUTE_131
-	.byte 0
-	.byte WEATHER_SUNNY
-	.byte MAP_TYPE_6
-	.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/Route131/map.json b/data/maps/Route131/map.json
new file mode 100644
index 000000000..f8d56cc35
--- /dev/null
+++ b/data/maps/Route131/map.json
@@ -0,0 +1,144 @@
+{
+  "id": "MAP_ROUTE131",
+  "name": "Route131",
+  "layout": "LAYOUT_ROUTE131",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_131",
+  "requires_flash": false,
+  "weather": "WEATHER_SUNNY",
+  "map_type": "MAP_TYPE_6",
+  "allow_bike": true,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": [
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_PACIFIDLOG_TOWN"
+    },
+    {
+      "direction": "right",
+      "offset": 0,
+      "map": "MAP_ROUTE130"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 41,
+      "y": 32,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN",
+      "movement_range_x": 5,
+      "movement_range_y": 7,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route131_EventScript_1F7429",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 18,
+      "y": 19,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT",
+      "movement_range_x": 0,
+      "movement_range_y": 7,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route131_EventScript_1F7440",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 10,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT",
+      "movement_range_x": 6,
+      "movement_range_y": 0,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 4,
+      "script": "Route131_EventScript_1F7457",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 31,
+      "y": 25,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP",
+      "movement_range_x": 3,
+      "movement_range_y": 5,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route131_EventScript_1F746E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 9,
+      "y": 16,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route131_EventScript_1F7485",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING",
+      "x": 8,
+      "y": 16,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 1,
+      "script": "Route131_EventScript_1F74A0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 52,
+      "y": 20,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route131_EventScript_1F74D2",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 52,
+      "y": 27,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 3,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route131_EventScript_1F74BB",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 36,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_SKY_PILLAR_ENTRANCE",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index da36f4001..700ac25f6 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A
 	end
 
 Route131_EventScript_1F741B:: @ 81F741B
-	setmaplayoutindex 319
+	setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470
 	return
 
 Route131_EventScript_1F741F:: @ 81F741F