merge union room with master

5 files changed, 40 insertions, 7 deletions

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




\ No newline at end of file
diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc
new file mode 100644
index 000000000..73c0a59cf
--- /dev/null
+++ b/data/maps/MtPyre_4F/events.inc
@@ -0,0 +1,15 @@
+MtPyre_4F_EventObjects: @ 8534F90
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, 1130
+
+MtPyre_4F_MapWarps: @ 8534FC0
+	warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F
+	warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F
+	warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F
+	warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F
+	warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F
+	warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F
+
+MtPyre_4F_MapEvents:: @ 8534FF0
+	map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
index c94284c2f..bee0a548f 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -1,15 +1,15 @@
 MtPyre_4F: @ 84840B8
-	.4byte MtPyre_4F_MapAttributes
+	.4byte MtPyre_4F_Layout
 	.4byte MtPyre_4F_MapEvents
 	.4byte MtPyre_4F_MapScripts
 	.4byte 0x0
 	.2byte MUS_M_DUNGON
 	.2byte 140
-	.byte 65
+	.byte MAPSEC_MT_PYRE
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 8
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/MtPyre_4F/map.bin b/data/maps/MtPyre_4F/map.bin
deleted file mode 100644
index 98dc679ff..000000000
--- a/data/maps/MtPyre_4F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-






äï³´µê






ì÷»¼2½ëïïïïïï&&è2ç2é2&÷÷÷÷÷÷'&îæ2æ2æ2îïÃÄÅïïïïêÞ2Ï0Ï0ä÷ËÌ2Í÷÷÷÷ëÞ2Ï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í6æ2æ2îîîò3æ2æ2æ2&æ2æ2æ2æ2æ2îîîîîîî&æ2ò3æ2æ2æ2æ2æ2æ2æ2æ2æ2æ2
\ No newline at end of file
diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc
new file mode 100644
index 000000000..0573e0f11
--- /dev/null
+++ b/data/maps/MtPyre_4F/scripts.inc
@@ -0,0 +1,20 @@
+MtPyre_4F_MapScripts:: @ 8231BC8
+	.byte 0
+
+MtPyre_5F_EventScript_231BC9:: @ 8231BC9
+	trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08
+	msgbox MtPyre_5F_Text_231C24, 6
+	end
+
+MtPyre_5F_Text_231BE0: @ 8231BE0
+	.string "Teacher…\n"
+	.string "Please watch over my progress!$"
+
+MtPyre_5F_Text_231C08: @ 8231C08
+	.string "Teacher…\n"
+	.string "Please forgive me!$"
+
+MtPyre_5F_Text_231C24: @ 8231C24
+	.string "Until I improve, my teacher, who rests\n"
+	.string "here, will never find true peace…$"
+