convert map data to json

3 files changed, 160 insertions, 28 deletions

diff --git a/data/maps/SSAnne_Kitchen/events.inc b/data/maps/SSAnne_Kitchen/events.inc
deleted file mode 100644
index d5034af53..000000000
--- a/data/maps/SSAnne_Kitchen/events.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SSAnne_Kitchen_EventObjects:
-	object_event 1, 59, 0, 1, 0, 5, 0, 3, 3, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160AB3, 0, 0, 0
-	object_event 2, 59, 0, 6, 0, 6, 0, 3, 3, 33, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160ABC, 0, 0, 0
-	object_event 3, 59, 0, 10, 0, 4, 0, 3, 18, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160AC5, 0, 0, 0
-	object_event 4, 59, 0, 8, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160ACE, 0, 0, 0
-	object_event 5, 59, 0, 14, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B1E, 0, 0, 0
-	object_event 6, 59, 0, 14, 0, 7, 0, 3, 9, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B27, 0, 0, 0
-	object_event 7, 59, 0, 14, 0, 9, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_160B30, 0, 0, 0
-	object_event 8, 92, 0, 1, 0, 10, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSAnne_Kitchen_EventScript_1BE6AC, 362, 0, 0
-
-SSAnne_Kitchen_MapWarps:
-	warp_def 7, 1, 0, 1, 261
-
-SSAnne_Kitchen_MapBGEvents:
-	bg_event 14, 8, 0, 7, 0, 134, 122, 1
-	bg_event 14, 4, 0, 7, 0, 135, 120, 1
-	bg_event 14, 6, 0, 7, 0, 133, 121, 1
-
-SSAnne_Kitchen_MapEvents::
-	map_events SSAnne_Kitchen_EventObjects, SSAnne_Kitchen_MapWarps, 0x0, SSAnne_Kitchen_MapBGEvents
diff --git a/data/maps/SSAnne_Kitchen/header.inc b/data/maps/SSAnne_Kitchen/header.inc
deleted file mode 100644
index a2128fe93..000000000
--- a/data/maps/SSAnne_Kitchen/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SSAnne_Kitchen:: @ 834F32C
-    .4byte SSAnne_Kitchen_Layout @ 0x8319214
-    .4byte SSAnne_Kitchen_MapEvents @ 0x83AEC60
-    .4byte SSAnne_Kitchen_MapScripts @ 0x8160AB2
-    .4byte NULL
-    .2byte BGM_FRLG_SS_ANNE
-    .2byte 170
-    .byte 0x80, 0x00, 0x00, 0x08, 0x00, 0x06, 0x00, 0x00
diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
new file mode 100644
index 000000000..bb094e87c
--- /dev/null
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -0,0 +1,160 @@
+{
+  "id": "MAP_SSANNE_KITCHEN",
+  "name": "SSAnne_Kitchen",
+  "layout": "LAYOUT_SSANNE_KITCHEN",
+  "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": "59",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160AB3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160ABC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160AC5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160ACE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B1E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B27",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B30",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 10,
+      "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_Kitchen_EventScript_1BE6AC",
+      "flag": "362"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 8,
+      "elevation": 0,
+      "item": "ITEM_CHESTO_BERRY",
+      "flag": "122",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 4,
+      "elevation": 0,
+      "item": "ITEM_PECHA_BERRY",
+      "flag": "120",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 6,
+      "elevation": 0,
+      "item": "ITEM_CHERI_BERRY",
+      "flag": "121",
+      "unknown": 1
+    }
+  ]
+}
\ No newline at end of file