convert map data to json

3 files changed, 54 insertions, 17 deletions

diff --git a/data/maps/SSAnne_2F_Room3/events.inc b/data/maps/SSAnne_2F_Room3/events.inc
deleted file mode 100644
index 82a89c51f..000000000
--- a/data/maps/SSAnne_2F_Room3/events.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SSAnne_2F_Room3_EventObjects:
-	object_event 1, 61, 0, 2, 0, 5, 0, 3, 5, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room3_EventScript_160CE0, 0, 0, 0
-	object_event 2, 32, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_2F_Room3_EventScript_160CE9, 0, 0, 0
-
-SSAnne_2F_Room3_MapWarps:
-	warp_def 4, 7, 3, 5, 262
-
-SSAnne_2F_Room3_MapEvents::
-	map_events SSAnne_2F_Room3_EventObjects, SSAnne_2F_Room3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SSAnne_2F_Room3/header.inc b/data/maps/SSAnne_2F_Room3/header.inc
deleted file mode 100644
index 9d3cb6e63..000000000
--- a/data/maps/SSAnne_2F_Room3/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnne_2F_Room3:: @ 834F444
-    .4byte SSAnne_Room2_Layout @ 0x8319F04
-    .4byte SSAnne_2F_Room3_MapEvents @ 0x83AEF4C
-    .4byte SSAnne_2F_Room3_MapScripts @ 0x8160CDF
-    .4byte NULL
-    .2byte BGM_FRLG_SS_ANNE
-    .2byte 178
-    .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json
new file mode 100644
index 000000000..266e87a29
--- /dev/null
+++ b/data/maps/SSAnne_2F_Room3/map.json
@@ -0,0 +1,54 @@
+{
+  "id": "MAP_SSANNE_2F_ROOM3",
+  "name": "SSAnne_2F_Room3",
+  "layout": "LAYOUT_SSANNE_ROOM2",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_0",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "61",
+      "x": 2,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "5",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room3_EventScript_160CE0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "32",
+      "x": 3,
+      "y": 2,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_2F_Room3_EventScript_160CE9",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 3,
+      "dest_map": "MAP_SSANNE_2F_CORRIDOR",
+      "dest_warp_id": 5
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file