Merge pull request #1 from pret/master

synching with source repo

5 files changed, 156 insertions, 3 deletions

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




\ No newline at end of file
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc
new file mode 100644
index 000000000..d5b24c06f
--- /dev/null
+++ b/data/maps/MtPyre_2F/events.inc
@@ -0,0 +1,20 @@
+MtPyre_2F_EventObjects: @ 8534DF0
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, 10, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, 1129
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 12, 10, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 9, 3, 8, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0
+	object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, 7, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0
+	object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0
+
+MtPyre_2F_MapWarps: @ 8534EB0
+	warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F
+	warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F
+	warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F
+	warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F
+	warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F
+
+MtPyre_2F_MapEvents:: @ 8534ED8
+	map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
index 6eb960c01..d4a35c4c6 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -1,5 +1,5 @@
 MtPyre_2F: @ 8484080
-	.4byte MtPyre_2F_MapAttributes
+	.4byte MtPyre_2F_Layout
 	.4byte MtPyre_2F_MapEvents
 	.4byte MtPyre_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MtPyre_2F/map.bin b/data/maps/MtPyre_2F/map.bin
deleted file mode 100644
index 97b7e9e31..000000000
--- a/data/maps/MtPyre_2F/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ò3îç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_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
new file mode 100644
index 000000000..de8520954
--- /dev/null
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -0,0 +1,135 @@
+MtPyre_2F_MapScripts:: @ 82310FB
+	map_script 2, MtPyre_2F_MapScript2_2A8327
+	map_script 3, MtPyre_2F_MapScript1_2A8331
+	map_script 5, MtPyre_2F_MapScript1_23110B
+	.byte 0
+
+MtPyre_2F_MapScript1_23110B: @ 823110B
+	setstepcallback 7
+	setholewarp MAP_MT_PYRE_1F, 255, 0, 0
+	end
+
+MtPyre_2F_EventScript_231116:: @ 8231116
+	msgbox MtPyre_2F_Text_2311A3, 2
+	end
+
+MtPyre_2F_EventScript_23111F:: @ 823111F
+	msgbox MtPyre_2F_Text_2311E6, 2
+	end
+
+MtPyre_2F_EventScript_231128:: @ 8231128
+	trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
+	msgbox MtPyre_2F_Text_2312CB, 6
+	end
+
+MtPyre_2F_EventScript_23113F:: @ 823113F
+	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
+	msgbox MtPyre_2F_Text_2313B1, 6
+	end
+
+MtPyre_2F_EventScript_23115A:: @ 823115A
+	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
+	msgbox MtPyre_2F_Text_23154D, 6
+	end
+
+MtPyre_2F_EventScript_231175:: @ 8231175
+	trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
+	msgbox MtPyre_2F_Text_23165A, 6
+	end
+
+MtPyre_2F_EventScript_23118C:: @ 823118C
+	trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
+	msgbox MtPyre_2F_Text_2316FB, 6
+	end
+
+MtPyre_2F_Text_2311A3: @ 82311A3
+	.string "Memories of my darling SKITTY…\n"
+	.string "My eyes overflow thinking about it.$"
+
+MtPyre_2F_Text_2311E6: @ 82311E6
+	.string "Ooch, ouch… There are holes in the\n"
+	.string "ground here and there.\p"
+	.string "I didn’t notice and took a tumble from\n"
+	.string "the floor above.$"
+
+MtPyre_2F_Text_231258: @ 8231258
+	.string "Hey! Are you searching for POKéMON?\n"
+	.string "You came along after me! You’re rude!$"
+
+MtPyre_2F_Text_2312A2: @ 82312A2
+	.string "Ayieeeeh!\n"
+	.string "I’m sorry, forgive me, please!$"
+
+MtPyre_2F_Text_2312CB: @ 82312CB
+	.string "People don’t come here often, so\n"
+	.string "I thought there’d be rare POKéMON.$"
+
+MtPyre_2F_Text_23130F: @ 823130F
+	.string "LUKE: We’re here on a dare.\p"
+	.string "Heheh, if I show her how cool I am,\n"
+	.string "she’ll fall for me. I know it!\p"
+	.string "I know! I’ll cream you and show her\n"
+	.string "how cool I am!$"
+
+MtPyre_2F_Text_2313A1: @ 82313A1
+	.string "LUKE: Whoopsie!$"
+
+MtPyre_2F_Text_2313B1: @ 82313B1
+	.string "LUKE: Well, we lost but that’s okay!\n"
+	.string "I’m right here by your side.\l"
+	.string "We’ll make it through this dare!$"
+
+MtPyre_2F_Text_231414: @ 8231414
+	.string "LUKE: If you want to take me on,\n"
+	.string "bring some more POKéMON.\p"
+	.string "If you don’t, I won’t be able to show\n"
+	.string "off to my girl how cool I am!$"
+
+MtPyre_2F_Text_231492: @ 8231492
+	.string "DEZ: I came here on a dare with my\n"
+	.string "boyfriend.\p"
+	.string "It’s really scary, but I’m with my\n"
+	.string "boyfriend. It’s okay.\p"
+	.string "I know! I’ll get my boyfriend to look\n"
+	.string "cool by beating you!$"
+
+MtPyre_2F_Text_231534: @ 8231534
+	.string "DEZ: Waaaah! I’m scared!$"
+
+MtPyre_2F_Text_23154D: @ 823154D
+	.string "DEZ: We’re lovey-dovey, so we don’t\n"
+	.string "care if we lose!$"
+
+MtPyre_2F_Text_231582: @ 8231582
+	.string "DEZ: If you want to challenge us, you\n"
+	.string "should bring at least two POKéMON.\p"
+	.string "My boyfriend’s strong.\n"
+	.string "Just one POKéMON won’t do at all.$"
+
+MtPyre_2F_Text_231604: @ 8231604
+	.string "You are an unfamiliar sight…\n"
+	.string "Depart before anything befalls you!$"
+
+MtPyre_2F_Text_231645: @ 8231645
+	.string "Hmm…\n"
+	.string "You’re durable.$"
+
+MtPyre_2F_Text_23165A: @ 823165A
+	.string "Our family has been TRAINERS here\n"
+	.string "since my great-grandmother’s time…\p"
+	.string "It is my duty to protect this\n"
+	.string "mountain…$"
+
+MtPyre_2F_Text_2316C7: @ 82316C7
+	.string "Kiyaaaaah!\n"
+	.string "I’m terrified!$"
+
+MtPyre_2F_Text_2316E1: @ 82316E1
+	.string "Nooooooo!\n"
+	.string "I lost my wits!$"
+
+MtPyre_2F_Text_2316FB: @ 82316FB
+	.string "I get freaked out every time I see\n"
+	.string "anything move…\p"
+	.string "I shouldn’t have come here to train…$"
+