merge with battle tent update

5 files changed, 66 insertions, 3 deletions

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




\ No newline at end of file
diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc
new file mode 100644
index 000000000..80bf46c2e
--- /dev/null
+++ b/data/maps/MtPyre_1F/events.inc
@@ -0,0 +1,16 @@
+MtPyre_1F_EventObjects: @ 8534D64
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0
+
+MtPyre_1F_MapWarps: @ 8534DAC
+	warp_def 17, 18, 3, 0, MAP_ROUTE122
+	warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR
+	warp_def 18, 18, 3, 0, MAP_ROUTE122
+	warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR
+	warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F
+	warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F
+
+MtPyre_1F_MapEvents:: @ 8534DDC
+	map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc
index 519211b49..17b7673c7 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_1F: @ 8484064
-	.4byte MtPyre_1F_MapAttributes
+	.4byte MtPyre_1F_Layout
 	.4byte MtPyre_1F_MapEvents
 	.4byte MtPyre_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MtPyre_1F/map.bin b/data/maps/MtPyre_1F/map.bin
deleted file mode 100644
index 60b992a73..000000000
--- a/data/maps/MtPyre_1F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-








ï³´µïïäïïäïïä








÷»¼2½÷÷ì÷÷ì÷÷ì








ç2è2ç2é2&7&7ç2ç2ç2ç2ç2ç2ç2


ïäïïäç2æ2æ2æ2î6î6æ2î6î6î6æ2î6î6


÷ì÷÷ì'7ç2æ2æ2æ2î6î6æ2î6î6î6æ2î6î6


ç2ç2ç2ç2ç2ç2ç2æ2æ2æ2î6î6æ2æ2æ2æ2æ2æ2æ2


22æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2î6î6î6æ2î6î6








&7î6æ2æ2æ2æ2æ2î6î6î6æ2î6î6








&7î6æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2








ç2æ2î6î6æ2æ2æ2æ2æ2æ2æ2æ2æ2








ç2æ2î6î6æ2æ2æ2æ2æ2æ2æ2æ2æ2








&7î6æ2æ2î6î6æ2æ2æ2æ2æ2î6î6








&7î6æ2æ2î6î6æ2æ2æ2æ2æ2î6î6
















ç2æ2



















ç2æ2



















ç2æ2



















ç2æ2



















ç2æ2



















22



\ No newline at end of file
diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc
new file mode 100644
index 000000000..51c8a88fb
--- /dev/null
+++ b/data/maps/MtPyre_1F/scripts.inc
@@ -0,0 +1,49 @@
+MtPyre_1F_MapScripts:: @ 8230F3E
+	.byte 0
+
+MtPyre_1F_EventScript_230F3F:: @ 8230F3F
+	lock
+	faceplayer
+	checkflag FLAG_0x11A
+	goto_eq MtPyre_1F_EventScript_230F6E
+	msgbox MtPyre_1F_Text_230F8A, 4
+	giveitem_std ITEM_CLEANSE_TAG
+	compare VAR_RESULT, 0
+	goto_eq MtPyre_1F_EventScript_272054
+	setflag FLAG_0x11A
+	release
+	end
+
+MtPyre_1F_EventScript_230F6E:: @ 8230F6E
+	msgbox MtPyre_1F_Text_231005, 4
+	release
+	end
+
+MtPyre_1F_EventScript_230F78:: @ 8230F78
+	msgbox MtPyre_1F_Text_23104F, 2
+	end
+
+MtPyre_1F_EventScript_230F81:: @ 8230F81
+	msgbox MtPyre_1F_Text_2310BA, 2
+	end
+
+MtPyre_1F_Text_230F8A: @ 8230F8A
+	.string "All sorts of beings wander the slopes\n"
+	.string "of MT. PYRE…\p"
+	.string "There is no telling what may happen.\n"
+	.string "Take this. It’s for your own good.$"
+
+MtPyre_1F_Text_231005: @ 8231005
+	.string "Have a POKéMON hold that\n"
+	.string "CLEANSE TAG.\p"
+	.string "It will help ward off wild POKéMON.$"
+
+MtPyre_1F_Text_23104F: @ 823104F
+	.string "Did you come to pay your respect\n"
+	.string "to the spirits of departed POKéMON?\p"
+	.string "You must care for your POKéMON a lot.$"
+
+MtPyre_1F_Text_2310BA: @ 82310BA
+	.string "This is the final resting place of my\n"
+	.string "ZIGZAGOON. I cherished it…$"
+