Merge branch 'master' into heal_location

3 files changed, 16 insertions, 0 deletions

diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
new file mode 100644
index 000000000..69fcb0ee0
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
@@ -0,0 +1,15 @@
+BattleFrontier_BattlePikeRandomRoom3: @ 8485580
+	.4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes
+	.4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
+	.4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
+	.4byte 0x0
+	.2byte BGM_BATTLE_PIKE
+	.2byte 358
+	.byte 58
+	.byte 0
+	.byte 0
+	.byte 8
+	.2byte 0
+	.byte 4
+	.byte 0
+
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin
new file mode 100644
index 000000000..8ce7f1c37
--- /dev/null
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin
@@ -0,0 +1 @@
+§ ¡¢£¤¥¦§¯¨©ª«¬­®¯·°±²6³6´6µ¶·¿6¸6Û2º6»2¼6Û2¾6¿Ù2Ú2Üã2ä2å2ÜÚ2Ú242Ý2
3æ2è2ç2
3Ý2Ý2>ùùÁ2Á2Á2ùùù72
3
3Ý2Ý2Ý2
3
3Ú2>ùùùùùùùÁ2Ù2
3
3
3
3
3
3
3Ý2Ã2ùùùùùùùù42
3
3
3
3
3
3Ú2
3>ùùùùùùÁ2ù3Ú2
3
3
3
3
3Ý2
3>Á2ùùùùùùù72Ý2
3
3
3
3
3Ú2
3>ùùùùùùÁ2ù3
3Ú2Ú2Ú2Ú2Ú2Ý2
3>ù3ã2ä2å23ùùÙ2Ú2æ2è2ç2Ú2Ú2
\ No newline at end of file