Merge pull request #543 from pret/mapdata

Convert map data to JSON

3 files changed, 100 insertions, 33 deletions

diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc
deleted file mode 100644
index 06c6588a9..000000000
--- a/data/maps/RecordCorner/events.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-RecordCorner_EventObjects: @ 8539DFC
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0
-
-RecordCorner_MapWarps: @ 8539E14
-	warp_def 8, 9, 3, 127, MAP_NONE
-	warp_def 9, 9, 3, 127, MAP_NONE
-	warp_def 11, 9, 3, 127, MAP_NONE
-	warp_def 10, 9, 3, 127, MAP_NONE
-
-RecordCorner_MapCoordEvents: @ 8539E34
-	coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D
-	coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447
-	coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432
-	coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C
-
-RecordCorner_MapEvents:: @ 8539E74
-	map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
-
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
deleted file mode 100644
index c0864092b..000000000
--- a/data/maps/RecordCorner/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-RecordCorner: @ 8484D68
-	.4byte RecordCorner_Layout
-	.4byte RecordCorner_MapEvents
-	.4byte RecordCorner_MapScripts
-	.4byte 0x0
-	.2byte MUS_RAINBOW
-	.2byte 223
-	.byte MAPSEC_DYNAMIC
-	.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=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json
new file mode 100644
index 000000000..98bcc0201
--- /dev/null
+++ b/data/maps/RecordCorner/map.json
@@ -0,0 +1,100 @@
+{
+  "id": "MAP_RECORD_CORNER",
+  "name": "RecordCorner",
+  "layout": "LAYOUT_RECORD_CORNER",
+  "music": "MUS_RAINBOW",
+  "region_map_section": "MAPSEC_DYNAMIC",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
+      "x": 10,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "RecordCorner_EventScript_2774C6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 9,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 11,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 10,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_0827741D"
+    },
+    {
+      "type": "trigger",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_08277447"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 4,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_08277432"
+    },
+    {
+      "type": "trigger",
+      "x": 13,
+      "y": 6,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_0827745C"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file