Merge pull request #636 from huderlem/assets

Map organization

6 files changed, 115 insertions, 4 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..9f8041366
--- /dev/null
+++ b/data/maps/MtPyre_2F/events.inc
@@ -0,0 +1,17 @@
+MtPyre_2F_EventObjects:: @ 838C888
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0
+
+MtPyre_2F_MapWarps:: @ 838C918
+	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:: @ 838C940
+	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 914fdabd4..081adb3e9 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_2F:: @ 8306F30
-	.4byte MtPyre_2F_MapAttributes
+	.4byte MtPyre_2F_Layout
 	.4byte MtPyre_2F_MapEvents
 	.4byte MtPyre_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 139
 	.byte 65
 	.byte 0
diff --git a/data/maps/MtPyre_2F/map.bin b/data/maps/MtPyre_2F/map.bin
deleted file mode 100644
index 628d2262e..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ò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..1d2368597
--- /dev/null
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -0,0 +1,33 @@
+MtPyre_2F_MapScripts:: @ 815D36E
+	map_script 2, MtPyre_2F_MapScript2_1C6BB5
+	map_script 3, MtPyre_2F_MapScript1_1C6BBF
+	map_script 5, MtPyre_2F_MapScript1_15D37E
+	.byte 0
+
+MtPyre_2F_MapScript1_15D37E:: @ 815D37E
+	setstepcallback 7
+	setholewarp MAP_MT_PYRE_1F, 255, 0, 0
+	end
+
+MtPyre_2F_EventScript_15D389:: @ 815D389
+	msgbox MtPyre_2F_Text_1965BB, 2
+	end
+
+MtPyre_2F_EventScript_15D392:: @ 815D392
+	msgbox MtPyre_2F_Text_196600, 2
+	end
+
+MtPyre_2F_EventScript_15D39B:: @ 815D39B
+	trainerbattle 0, OPPONENT_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE
+	msgbox MtPyre_2F_Text_1966E7, 6
+	end
+
+MtPyre_2F_EventScript_15D3B2:: @ 815D3B2
+	trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB
+	msgbox MtPyre_2F_Text_196368, 6
+	end
+
+MtPyre_2F_EventScript_15D3CD:: @ 815D3CD
+	trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539
+	msgbox MtPyre_2F_Text_196504, 6
+	end
diff --git a/data/maps/MtPyre_2F/text.inc b/data/maps/MtPyre_2F/text.inc
new file mode 100644
index 000000000..28c57d0ba
--- /dev/null
+++ b/data/maps/MtPyre_2F/text.inc
@@ -0,0 +1,63 @@
+MtPyre_2F_Text_1962C6:: @ 81962C6
+	.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_196358:: @ 8196358
+	.string "LUKE: Whoopsie!$"
+
+MtPyre_2F_Text_196368:: @ 8196368
+	.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_1963CB:: @ 81963CB
+	.string "LUKE: If you want to take me on, bring\n"
+	.string "some more POKéMON.\p"
+	.string "If you don’t, I won’t be able to show\n"
+	.string "off how cool I am to my girl!$"
+
+MtPyre_2F_Text_196449:: @ 8196449
+	.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_1964EB:: @ 81964EB
+	.string "DEZ: Waaaah! I’m scared!$"
+
+MtPyre_2F_Text_196504:: @ 8196504
+	.string "DEZ: We’re lovey-dovey, so we don’t\n"
+	.string "care if we lose!$"
+
+MtPyre_2F_Text_196539:: @ 8196539
+	.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_1965BB:: @ 81965BB
+	.string "Memories of my darling SKITTY...\n"
+	.string "My eyes overflow thinking about it.$"
+
+MtPyre_2F_Text_196600:: @ 8196600
+	.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_196674:: @ 8196674
+	.string "Hey! Are you searching for POKéMON?\n"
+	.string "You came along after me! You’re rude!$"
+
+MtPyre_2F_Text_1966BE:: @ 81966BE
+	.string "Ayieeeeh!\n"
+	.string "I’m sorry, forgive me, please!$"
+
+MtPyre_2F_Text_1966E7:: @ 81966E7
+	.string "People don’t come here often, so\n"
+	.string "I thought there’d be rare POKéMON.$"