convert map data to json

3 files changed, 81 insertions, 20 deletions

diff --git a/data/maps/SafariZone_Building2/events.inc b/data/maps/SafariZone_Building2/events.inc
deleted file mode 100644
index fadf6acc5..000000000
--- a/data/maps/SafariZone_Building2/events.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SafariZone_Building2_EventObjects:
-	object_event 1, 55, 0, 3, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_162408, 0, 0, 0
-	object_event 2, 26, 0, 6, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_1623FF, 0, 0, 0
-	object_event 3, 30, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, SafariZone_Building2_EventScript_162411, 0, 0, 0
-
-SafariZone_Building2_MapWarps:
-	warp_def 3, 9, 3, 6, 320
-	warp_def 4, 9, 3, 6, 320
-	warp_def 5, 9, 3, 6, 320
-
-SafariZone_Building2_MapEvents::
-	map_events SafariZone_Building2_EventObjects, SafariZone_Building2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SafariZone_Building2/header.inc b/data/maps/SafariZone_Building2/header.inc
deleted file mode 100644
index 706671bbb..000000000
--- a/data/maps/SafariZone_Building2/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SafariZone_Building2:: @ 834F984
-    .4byte SafariZone_Building_Layout @ 0x831C028
-    .4byte SafariZone_Building2_MapEvents @ 0x83B1340
-    .4byte SafariZone_Building2_MapScripts @ 0x81623FE
-    .4byte NULL
-    .2byte BGM_FRLG_SAFARI_ZONE
-    .2byte 198
-    .byte 0x88, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00
diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json
new file mode 100644
index 000000000..96282855f
--- /dev/null
+++ b/data/maps/SafariZone_Building2/map.json
@@ -0,0 +1,81 @@
+{
+  "id": "MAP_SAFARI_ZONE_BUILDING2",
+  "name": "SafariZone_Building2",
+  "layout": "LAYOUT_SAFARI_ZONE_BUILDING",
+  "music": "BGM_FRLG_SAFARI_ZONE",
+  "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE",
+  "requires_flash": false,
+  "weather": "WEATHER_0",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 0,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "55",
+      "x": 3,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building2_EventScript_162408",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "26",
+      "x": 6,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building2_EventScript_1623FF",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "30",
+      "x": 7,
+      "y": 3,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SafariZone_Building2_EventScript_162411",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 4,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 6
+    },
+    {
+      "x": 5,
+      "y": 9,
+      "elevation": 3,
+      "dest_map": "MAP_SAFARI_ZONE_EAST",
+      "dest_warp_id": 6
+    }
+  ],
+  "coord_events": [],
+  "bg_events": []
+}
\ No newline at end of file