Merge pull request #1 from pret/master

synching with source repo

5 files changed, 38 insertions, 3 deletions

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




\ No newline at end of file
diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc
new file mode 100644
index 000000000..03a9b773f
--- /dev/null
+++ b/data/maps/MtPyre_5F/events.inc
@@ -0,0 +1,14 @@
+MtPyre_5F_EventObjects: @ 8535004
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, 1052
+
+MtPyre_5F_MapWarps: @ 8535034
+	warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
+	warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F
+	warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F
+	warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F
+	warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F
+
+MtPyre_5F_MapEvents:: @ 853505C
+	map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
index efabc0917..193120ca8 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_5F: @ 84840D4
-	.4byte MtPyre_5F_MapAttributes
+	.4byte MtPyre_5F_Layout
 	.4byte MtPyre_5F_MapEvents
 	.4byte MtPyre_5F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MtPyre_5F/map.bin b/data/maps/MtPyre_5F/map.bin
deleted file mode 100644
index 12fbeeb7e..000000000
--- a/data/maps/MtPyre_5F/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æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2&îæ2æ2æ2îîîæ2æ2æ2îîç2æ2îîîæ2í6æ2îîîæ2ò3&æ2æ2îæ2æ2æ2æ2æ2îæ2æ2î&æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2ò3
\ No newline at end of file
diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc
new file mode 100644
index 000000000..4678ac7e0
--- /dev/null
+++ b/data/maps/MtPyre_5F/scripts.inc
@@ -0,0 +1,23 @@
+MtPyre_5F_MapScripts:: @ 8231C6D
+	.byte 0
+
+MtPyre_4F_EventScript_231C6E:: @ 8231C6E
+	trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB
+	msgbox MtPyre_4F_Text_231CEE, 6
+	end
+
+MtPyre_4F_Text_231C85: @ 8231C85
+	.string "I love all things horrifying…\n"
+	.string "It’s like a disease…\p"
+	.string "When I’m here…\n"
+	.string "I shiver with fear…$"
+
+MtPyre_4F_Text_231CDB: @ 8231CDB
+	.string "Losing, I dislike…$"
+
+MtPyre_4F_Text_231CEE: @ 8231CEE
+	.string "I want to see dreadful things…\n"
+	.string "I can’t leave…\p"
+	.string "Stay…\n"
+	.string "Won’t you stay with me?$"
+