Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

3 files changed, 18 insertions, 16 deletions

diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc
deleted file mode 100644
index 8b1378917..000000000
--- a/data/maps/LinkContestRoom2/events.inc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
deleted file mode 100644
index e37d65f86..000000000
--- a/data/maps/LinkContestRoom2/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-LinkContestRoom2: @ 8484E64
-	.4byte LinkContestRoom2_Layout
-	.4byte LinkContestRoom1_MapEvents
-	.4byte LinkContestRoom1_MapScripts
-	.4byte 0x0
-	.2byte MUS_CONTEST0
-	.2byte 232
-	.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/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json
new file mode 100644
index 000000000..b02da178f
--- /dev/null
+++ b/data/maps/LinkContestRoom2/map.json
@@ -0,0 +1,18 @@
+{
+  "id": "MAP_LINK_CONTEST_ROOM2",
+  "name": "LinkContestRoom2",
+  "layout": "LAYOUT_LINK_CONTEST_ROOM2",
+  "music": "MUS_CONTEST0",
+  "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,
+  "shared_events_map": "LinkContestRoom1",
+  "shared_scripts_map": "LinkContestRoom1"
+}
\ No newline at end of file