Merge pull request #1 from pret/master

synching with source repo

5 files changed, 121 insertions, 3 deletions

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




\ No newline at end of file
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc
new file mode 100644
index 000000000..bf0d1af77
--- /dev/null
+++ b/data/maps/MtPyre_3F/events.inc
@@ -0,0 +1,17 @@
+MtPyre_3F_EventObjects: @ 8534EEC
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, 17, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, 1120
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 14, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0
+
+MtPyre_3F_MapWarps: @ 8534F4C
+	warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F
+	warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F
+	warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F
+	warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F
+	warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F
+	warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F
+
+MtPyre_3F_MapEvents:: @ 8534F7C
+	map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
index 9dcd40578..8bf9f015a 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_3F: @ 848409C
-	.4byte MtPyre_3F_MapAttributes
+	.4byte MtPyre_3F_Layout
 	.4byte MtPyre_3F_MapEvents
 	.4byte MtPyre_3F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MtPyre_3F/map.bin b/data/maps/MtPyre_3F/map.bin
deleted file mode 100644
index 758eccc3a..000000000
--- a/data/maps/MtPyre_3F/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æ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ò3îîæ2ò3îî
\ No newline at end of file
diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc
new file mode 100644
index 000000000..ec5373509
--- /dev/null
+++ b/data/maps/MtPyre_3F/scripts.inc
@@ -0,0 +1,103 @@
+MtPyre_3F_MapScripts:: @ 8231752
+	.byte 0
+
+MtPyre_3F_EventScript_231753:: @ 8231753
+	trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
+	msgbox MtPyre_3F_Text_231869, 6
+	end
+
+MtPyre_3F_EventScript_23176A:: @ 823176A
+	trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
+	msgbox MtPyre_3F_Text_2318F2, 6
+	end
+
+MtPyre_3F_EventScript_231781:: @ 8231781
+	trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq MtPyre_3F_EventScript_2317CC
+	msgbox MtPyre_3F_Text_23199B, 4
+	release
+	end
+
+MtPyre_3F_EventScript_2317AD:: @ 82317AD
+	special sub_80B4808
+	waitmovement 0
+	msgbox MtPyre_3F_Text_231A49, 4
+	setvar VAR_0x8004, 9
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 9
+	callstd 8
+	release
+	end
+
+MtPyre_3F_EventScript_2317CC:: @ 82317CC
+	trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
+	msgbox MtPyre_3F_Text_231B0D, 6
+	end
+
+MtPyre_3F_Text_2317E3: @ 82317E3
+	.string "The rich atmosphere of the mountain\n"
+	.string "has elevated my psychic power!\p"
+	.string "A mere child like you…\n"
+	.string "You dream of winning?$"
+
+MtPyre_3F_Text_231853: @ 8231853
+	.string "I drown in self-pity…$"
+
+MtPyre_3F_Text_231869: @ 8231869
+	.string "My psychic powers have surely\n"
+	.string "grown several times, but…$"
+
+MtPyre_3F_Text_2318A1: @ 82318A1
+	.string "Ahahahaha!\p"
+	.string "This is no place for children, least\n"
+	.string "of all you!$"
+
+MtPyre_3F_Text_2318DD: @ 82318DD
+	.string "I lost that cleanly…$"
+
+MtPyre_3F_Text_2318F2: @ 82318F2
+	.string "This means my training is still not\n"
+	.string "enough…\p"
+	.string "I’ve got to keep working toward the\n"
+	.string "summit…\p"
+	.string "Go, me!$"
+
+MtPyre_3F_Text_231952: @ 8231952
+	.string "Why have you come here?$"
+
+MtPyre_3F_Text_23196A: @ 823196A
+	.string "That was amazing!\n"
+	.string "You’re a very special TRAINER.$"
+
+MtPyre_3F_Text_23199B: @ 823199B
+	.string "POKéMON no longer of this world.\n"
+	.string "POKéMON that are with you now.\p"
+	.string "And the POKéMON that you will meet\n"
+	.string "in the future…\p"
+	.string "They are all to be equally cherished.\n"
+	.string "Please remember that.$"
+
+MtPyre_3F_Text_231A49: @ 8231A49
+	.string "I would like to see your POKéMON\n"
+	.string "when they grow up some more…\p"
+	.string "Please, I need to see your POKéNAV.$"
+
+MtPyre_3F_Text_231AAB: @ 8231AAB
+	.string "Oh, it’s you…\p"
+	.string "Have you come to show me your grown\n"
+	.string "POKéMON?$"
+
+MtPyre_3F_Text_231AE6: @ 8231AE6
+	.string "How amazing!\n"
+	.string "You are a special person.$"
+
+MtPyre_3F_Text_231B0D: @ 8231B0D
+	.string "POKéMON no longer of this world.\n"
+	.string "POKéMON that are with you now.\p"
+	.string "And the POKéMON that you will meet\n"
+	.string "in the future…\p"
+	.string "They are all to be equally cherished.\n"
+	.string "I see that you’ve remembered that.$"
+