convert map data to json

4 files changed, 194 insertions, 38 deletions

diff --git a/data/maps/TwoIsland/connections.inc b/data/maps/TwoIsland/connections.inc
deleted file mode 100644
index 3cd53b58f..000000000
--- a/data/maps/TwoIsland/connections.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-TwoIsland_MapConnectionsList: @ 8352954
-    connection up, 24, MAP_TWO_ISLAND_CAPEBRINK
-
-TwoIsland_MapConnections:: @ 8352960
-    .4byte 1
-    .4byte TwoIsland_MapConnectionsList
diff --git a/data/maps/TwoIsland/events.inc b/data/maps/TwoIsland/events.inc
deleted file mode 100644
index 5ae72f9ed..000000000
--- a/data/maps/TwoIsland/events.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-TwoIsland_EventObjects:
-	object_event 1, 68, 0, 28, 0, 4, 0, 3, 8, 33, 0, 0, 0, 0, 0, TwoIsland_EventScript_16760F, 0, 0, 0
-	object_event 2, 23, 0, 31, 0, 6, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167755, 123, 0, 0
-	object_event 3, 29, 0, 30, 0, 11, 0, 3, 7, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_16775E, 124, 0, 0
-	object_event 4, 62, 0, 26, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_16774C, 0, 0, 0
-	object_event 5, 52, 0, 27, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167777, 125, 0, 0
-	object_event 6, 95, 0, 30, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_1BDF13, 18, 0, 0
-	object_event 7, 92, 0, 39, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_1BEAAF, 442, 0, 0
-	object_event 8, 16, 0, 37, 0, 12, 0, 3, 8, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167789, 0, 0, 0
-	object_event 9, 19, 0, 24, 0, 12, 0, 3, 2, 17, 0, 0, 0, 0, 0, TwoIsland_EventScript_167780, 0, 0, 0
-
-TwoIsland_MapWarps:
-	warp_def 39, 9, 0, 0, 8448
-	warp_def 33, 9, 0, 0, 8449
-	warp_def 21, 7, 0, 0, 8450
-	warp_def 10, 8, 3, 0, 8452
-
-TwoIsland_MapBGEvents:
-	bg_event 29, 8, 0, 0, 0, TwoIsland_EventScript_167792
-	bg_event 40, 10, 0, 0, 0, TwoIsland_EventScript_16779B
-	bg_event 8, 3, 0, 0, 0, TwoIsland_EventScript_1677A4
-
-TwoIsland_MapEvents::
-	map_events TwoIsland_EventObjects, TwoIsland_MapWarps, 0x0, TwoIsland_MapBGEvents
diff --git a/data/maps/TwoIsland/header.inc b/data/maps/TwoIsland/header.inc
deleted file mode 100644
index 698e7544b..000000000
--- a/data/maps/TwoIsland/header.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-TwoIsland:: @ 8350784
-    .4byte TwoIsland_Layout @ 0x8321EB8
-    .4byte TwoIsland_MapEvents @ 0x83B6074
-    .4byte TwoIsland_MapScripts @ 0x8167564
-    .4byte TwoIsland_MapConnections @ 0x8352960
-    .2byte BGM_FRLG_ISLAND_ONE
-    .2byte 231
-    .byte 0x90, 0x00, 0x02, 0x01, 0x01, 0x06, 0x00, 0x00
diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json
new file mode 100644
index 000000000..42e6a428e
--- /dev/null
+++ b/data/maps/TwoIsland/map.json
@@ -0,0 +1,194 @@
+{
+  "id": "MAP_TWO_ISLAND",
+  "name": "TwoIsland",
+  "layout": "LAYOUT_TWO_ISLAND",
+  "music": "BGM_FRLG_ISLAND_ONE",
+  "region_map_section": "MAPSEC_TWO_ISLAND",
+  "requires_flash": false,
+  "weather": "WEATHER_2",
+  "map_type": "MAP_TYPE_1",
+  "unknown_18": 1,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": [
+    {
+      "map": "MAP_TWO_ISLAND_CAPE_BRINK",
+      "offset": 24,
+      "direction": "up"
+    }
+  ],
+  "object_events": [
+    {
+      "graphics_id": "68",
+      "x": 28,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_16760F",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "23",
+      "x": 31,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_167755",
+      "flag": "123"
+    },
+    {
+      "graphics_id": "29",
+      "x": 30,
+      "y": 11,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_16775E",
+      "flag": "124"
+    },
+    {
+      "graphics_id": "62",
+      "x": 26,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_16774C",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "52",
+      "x": 27,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "10",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_167777",
+      "flag": "125"
+    },
+    {
+      "graphics_id": "95",
+      "x": 30,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "1",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_1BDF13",
+      "flag": "18"
+    },
+    {
+      "graphics_id": "92",
+      "x": 39,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_1BEAAF",
+      "flag": "442"
+    },
+    {
+      "graphics_id": "16",
+      "x": 37,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_167789",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "19",
+      "x": 24,
+      "y": 12,
+      "elevation": 3,
+      "movement_type": "2",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TwoIsland_EventScript_167780",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 39,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 33,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_TWO_ISLAND_HOUSE",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 21,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_TWO_ISLAND_POKEMON_CENTER_1F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 10,
+      "y": 8,
+      "elevation": 3,
+      "dest_map": "MAP_TWO_ISLAND_HARBOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "bg_event_type_0",
+      "x": 29,
+      "y": 8,
+      "elevation": 0,
+      "script": "TwoIsland_EventScript_167792"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 40,
+      "y": 10,
+      "elevation": 0,
+      "script": "TwoIsland_EventScript_16779B"
+    },
+    {
+      "type": "bg_event_type_0",
+      "x": 8,
+      "y": 3,
+      "elevation": 0,
+      "script": "TwoIsland_EventScript_1677A4"
+    }
+  ]
+}
\ No newline at end of file