merge with battle tent update

5 files changed, 86 insertions, 3 deletions

diff --git a/data/maps/MtPyre_6F/border.bin b/data/maps/MtPyre_6F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/MtPyre_6F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc
new file mode 100644
index 000000000..1f00209b2
--- /dev/null
+++ b/data/maps/MtPyre_6F/events.inc
@@ -0,0 +1,12 @@
+MtPyre_6F_EventObjects: @ 8535070
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, 1089
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, 24, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0
+
+MtPyre_6F_MapWarps: @ 85350B8
+	warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
+	warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F
+
+MtPyre_6F_MapEvents:: @ 85350C8
+	map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
index f6931369b..3c390f962 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_6F: @ 84840F0
-	.4byte MtPyre_6F_MapAttributes
+	.4byte MtPyre_6F_Layout
 	.4byte MtPyre_6F_MapEvents
 	.4byte MtPyre_6F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MtPyre_6F/map.bin b/data/maps/MtPyre_6F/map.bin
deleted file mode 100644
index 1f7438bfb..000000000
--- a/data/maps/MtPyre_6F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-êÃÄÅäïïïïïïïïëËÌ2Íì÷÷÷÷÷÷÷÷&è2ç2é2&&ç2ç2ç2ç2ç2ç2&ç2æ2æ2æ2îæ2æ2æ2æ2æ2æ2æ2æ2ç2æ2æ2îîæ2æ2æ2î6æ2æ2æ2æ2&æ2æ2æ2æ2æ2æ2î6î6æ2æ2æ2îïïïïïïïïïêÞ2äï÷÷÷÷÷÷÷÷÷ëÞ2ì÷&ç2ç2&&ç2×7ç2&&ç2ç2&ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2ç2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ç2æ2æ2îæ2æ2æ2æ2æ2îæ2æ2æ2&æ2æ2îîæ2æ2æ2îîæ2æ2î
\ No newline at end of file
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc
new file mode 100644
index 000000000..8d5d912c2
--- /dev/null
+++ b/data/maps/MtPyre_6F/scripts.inc
@@ -0,0 +1,73 @@
+MtPyre_6F_MapScripts:: @ 8231D3A
+	.byte 0
+
+MtPyre_6F_EventScript_231D3B:: @ 8231D3B
+	trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq MtPyre_6F_EventScript_231D86
+	msgbox MtPyre_6F_Text_231DFC, 4
+	release
+	end
+
+MtPyre_6F_EventScript_231D67:: @ 8231D67
+	special sub_80B4808
+	waitmovement 0
+	msgbox MtPyre_6F_Text_231E43, 4
+	setvar VAR_0x8004, 108
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 108
+	callstd 8
+	release
+	end
+
+MtPyre_6F_EventScript_231D86:: @ 8231D86
+	trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
+	msgbox MtPyre_6F_Text_231EE1, 6
+	end
+
+MtPyre_6F_EventScript_231D9D:: @ 8231D9D
+	trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
+	msgbox MtPyre_6F_Text_231F5C, 6
+	end
+
+MtPyre_6F_Text_231DB4: @ 8231DB4
+	.string "When I’m here…\n"
+	.string "A curious power flows into me…$"
+
+MtPyre_6F_Text_231DE2: @ 8231DE2
+	.string "The power is ebbing away…$"
+
+MtPyre_6F_Text_231DFC: @ 8231DFC
+	.string "Perhaps the power is from the spirits\n"
+	.string "of POKéMON in fitful sleep here…$"
+
+MtPyre_6F_Text_231E43: @ 8231E43
+	.string "Fufufu… I lost the match, but…\n"
+	.string "I have this little ability…\p"
+	.string "Without ever laying my hands on\n"
+	.string "your POKéNAV… Hiyah!$"
+
+MtPyre_6F_Text_231EB3: @ 8231EB3
+	.string "Behind you…\n"
+	.string "What is it…$"
+
+MtPyre_6F_Text_231ECB: @ 8231ECB
+	.string "Something faded away…$"
+
+MtPyre_6F_Text_231EE1: @ 8231EE1
+	.string "The POKéMON at rest here…\n"
+	.string "Sometimes, they play…$"
+
+MtPyre_6F_Text_231F11: @ 8231F11
+	.string "Have you lost your bearings?\n"
+	.string "Have no fear for I am here!$"
+
+MtPyre_6F_Text_231F4A: @ 8231F4A
+	.string "Weren’t you lost?$"
+
+MtPyre_6F_Text_231F5C: @ 8231F5C
+	.string "I had this feeling that a lost TRAINER\n"
+	.string "would be panicked and easy to beat.\p"
+	.string "It’s dirty and I won’t try it again…$"
+