Convert map data to JSON

3 files changed, 68 insertions, 29 deletions

diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc
deleted file mode 100644
index 79faca7e6..000000000
--- a/data/maps/TradeCenter/events.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-TradeCenter_EventObjects:
-	object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0
-
-TradeCenter_MapWarps:
-	warp_def 5, 8, 3, 127, MAP_NONE
-	warp_def 6, 8, 3, 127, MAP_NONE
-
-TradeCenter_MapCoordEvents:
-	coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5
-	coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF
-
-TradeCenter_MapEvents::
-	map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
-
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
deleted file mode 100644
index 80a11cd52..000000000
--- a/data/maps/TradeCenter/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-TradeCenter:
-	.4byte TradeCenter_Layout
-	.4byte TradeCenter_MapEvents
-	.4byte TradeCenter_MapScripts
-	.4byte 0x0
-	.2byte MUS_RAINBOW
-	.2byte LAYOUT_TRADE_CENTER
-	.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/TradeCenter/map.json b/data/maps/TradeCenter/map.json
new file mode 100644
index 000000000..f7511a753
--- /dev/null
+++ b/data/maps/TradeCenter/map.json
@@ -0,0 +1,68 @@
+{
+  "id": "MAP_TRADE_CENTER",
+  "name": "TradeCenter",
+  "layout": "LAYOUT_TRADE_CENTER",
+  "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": 9,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TradeCenter_EventScript_2774B6",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 5,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    },
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_NONE",
+      "dest_warp_id": 127
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 4,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_082773F5"
+    },
+    {
+      "type": "trigger",
+      "x": 7,
+      "y": 5,
+      "elevation": 3,
+      "var": "VAR_TEMP_0",
+      "var_value": 0,
+      "script": "gUnknown_082773FF"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file