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

# Conflicts:
#	src/use_pokeblock.c

4 files changed, 61 insertions, 29 deletions

diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc
deleted file mode 100644
index fbf4941ca..000000000
--- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
-	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0
-	object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
-
-BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
-	coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
-
-BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
-	map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0
-
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc
deleted file mode 100644
index d58e1fe81..000000000
--- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleFrontier_BattlePyramidTop: @ 8485430
-	.4byte BattleFrontier_BattlePyramidTop_Layout
-	.4byte BattleFrontier_BattlePyramidTop_MapEvents
-	.4byte BattleFrontier_BattlePyramidTop_MapScripts
-	.4byte 0x0
-	.2byte 65535
-	.2byte 378
-	.byte MAPSEC_BATTLE_FRONTIER
-	.byte 0
-	.byte WEATHER_NONE
-	.byte MAP_TYPE_INDOOR
-	.2byte 0
-	map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
-	.byte MAP_BATTLE_SCENE_NORMAL
-
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json
new file mode 100644
index 000000000..d73dc1692
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json
@@ -0,0 +1,57 @@
+{
+  "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
+  "name": "BattleFrontier_BattlePyramidTop",
+  "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
+  "music": "MUS_NONE",
+  "region_map_section": "MAPSEC_BATTLE_FRONTIER",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_bike": false,
+  "allow_escape_rope": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "EVENT_OBJ_GFX_HIKER",
+      "x": 17,
+      "y": 11,
+      "elevation": 6,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "3",
+      "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "EVENT_OBJ_GFX_BRANDON",
+      "x": 17,
+      "y": 7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": "0",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "0x0",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 17,
+      "y": 9,
+      "elevation": 4,
+      "var": "VAR_TEMP_2",
+      "var_value": "0",
+      "script": "BattleFrontier_BattlePyramidTop_EventScript_255256"
+    }
+  ],
+  "bg_events": []
+}
\ No newline at end of file
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index d04fe23f2..39bb39f49 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -1,8 +1,8 @@
 BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
-	map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
-	map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E
-	map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
-	map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
+	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
 	.byte 0
 
 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6