Merge pull request #543 from pret/mapdata

Convert map data to JSON

4 files changed, 102 insertions, 34 deletions

diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc
deleted file mode 100644
index 1293e8235..000000000
--- a/data/maps/Route129/connections.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route129_MapConnectionsList: @ 8486C58
-	connection up, 0, MAP_ROUTE128
-	connection left, 0, MAP_ROUTE130
-	connection dive, 0, MAP_UNDERWATER5
-
-Route129_MapConnections: @ 8486C7C
-	.4byte 0x3
-	.4byte Route129_MapConnectionsList
-
diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc
deleted file mode 100644
index c127ec5e3..000000000
--- a/data/maps/Route129/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route129_EventObjects: @ 852C9B4
-	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0
-	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0
-	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0
-	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0
-	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0
-
-Route129_MapEvents:: @ 852CA2C
-	map_events Route129_EventObjects, 0x0, 0x0, 0x0
-
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
deleted file mode 100644
index 645cc7d92..000000000
--- a/data/maps/Route129/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route129: @ 8482988
-	.4byte Route129_Layout
-	.4byte Route129_MapEvents
-	.4byte Route129_MapScripts
-	.4byte Route129_MapConnections
-	.2byte MUS_GRANROAD
-	.2byte 45
-	.byte MAPSEC_ROUTE_129
-	.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/Route129/map.json b/data/maps/Route129/map.json
new file mode 100644
index 000000000..310a3e06a
--- /dev/null
+++ b/data/maps/Route129/map.json
@@ -0,0 +1,102 @@
+{
+  "id": "MAP_ROUTE129",
+  "name": "Route129",
+  "layout": "LAYOUT_ROUTE129",
+  "music": "MUS_GRANROAD",
+  "region_map_section": "MAPSEC_ROUTE_129",
+  "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": "up",
+      "offset": 0,
+      "map": "MAP_ROUTE128"
+    },
+    {
+      "direction": "left",
+      "offset": 0,
+      "map": "MAP_ROUTE130"
+    },
+    {
+      "direction": "dive",
+      "offset": 0,
+      "map": "MAP_UNDERWATER5"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 28,
+      "y": 16,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT",
+      "movement_range_x": 3,
+      "movement_range_y": 4,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 3,
+      "script": "Route129_EventScript_1F72EC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 10,
+      "y": 14,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP",
+      "movement_range_x": 5,
+      "movement_range_y": 2,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route129_EventScript_1F7303",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
+      "x": 13,
+      "y": 22,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route129_EventScript_1F7331",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 35,
+      "y": 9,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 2,
+      "script": "Route129_EventScript_1F731A",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
+      "x": 13,
+      "y": 27,
+      "elevation": 1,
+      "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 1,
+      "trainer_sight_or_berry_tree_id": 5,
+      "script": "Route129_EventScript_1F7348",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file