merge with battle tent update

5 files changed, 46 insertions, 3 deletions

diff --git a/data/maps/DesertUnderpass/border.bin b/data/maps/DesertUnderpass/border.bin
deleted file mode 100644
index 423a0732e..000000000
--- a/data/maps/DesertUnderpass/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc
new file mode 100644
index 000000000..05fb939a0
--- /dev/null
+++ b/data/maps/DesertUnderpass/events.inc
@@ -0,0 +1,9 @@
+DesertUnderpass_EventObjects: @ 85376D4
+	object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, 8, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, 874
+
+DesertUnderpass_MapWarps: @ 85376EC
+	warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
+
+DesertUnderpass_MapEvents:: @ 85376F4
+	map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc
index b01e7638a..2a420d703 100644
--- a/data/maps/DesertUnderpass/header.inc
+++ b/data/maps/DesertUnderpass/header.inc
@@ -1,5 +1,5 @@
 DesertUnderpass: @ 8484978
-	.4byte DesertUnderpass_MapAttributes
+	.4byte DesertUnderpass_Layout
 	.4byte DesertUnderpass_MapEvents
 	.4byte DesertUnderpass_MapScripts
 	.4byte 0x0
diff --git a/data/maps/DesertUnderpass/map.bin b/data/maps/DesertUnderpass/map.bin
deleted file mode 100644
index 2f82e9357..000000000
--- a/data/maps/DesertUnderpass/map.bin
+++ /dev/null
@@ -1 +0,0 @@
- ##" #" !!" !!"##" #" #" ####" ####" #" #" "#"˜™™™™š ###" # #˜š #" "#" ‘©©©ͺ # #"#" #"¨ͺ ###" "¨ͺ ######"##˜š' # " " ' ‘š #˜š˜‘‘‘š#"#"' "˜‘’˜š˜‘‘‘‘‘š#"˜š˜h˜‘©‘š˜‘ͺ˜™‘‘‘‘‘‘’˜™‘ͺ¨‘š˜‘ͺ ’˜‘ͺ˜‘‘‘‘‘‘‘‘’ ####" ##" ##" #"¨©ͺ¨‘š¨ͺ¨ͺ¨ͺ #q‘‘‘‘‘‘‘‘’##"##"< # #"#" " # "#" " ##" #####" ##"##"¨ͺ ###"˜š q‘‘‘‘‘‘‘’#"#"#XYZ# ##"#"#" #" " ###" " #"#" # #" #"" ###"  #""˜‘’ ###q‘‘‘‘‘p######" ##"  #01##"##" 0#101#####"#####" ####" #### #01######q‘’ 0##101##q‘‘‘p#"" ######" #######"  ##"##" #"#" ##########" #####"#q’###### "####################" ##########" #############" #"" " #####" #" ########" ##############" #### ######" #####" ##" ##" ##"  ##" #" ###" # ####" ######"" # " ##"˜š#"'˜š˜š ## ##"##" # #"#" # "#########" ########" ##"#" #"### ##### #"##### " ##"####"#" #####" ###### # ##"### ##"#" ## ######" "### " ###"#"#"#" # #" #" #"#" ## #####" ##" # " #" ###"### ## " #"##"#"#"###" ##"##" #####" ##" #"## # # #"#" #"#" #############
\ No newline at end of file
diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc
new file mode 100644
index 000000000..486bd2577
--- /dev/null
+++ b/data/maps/DesertUnderpass/scripts.inc
@@ -0,0 +1,36 @@
+DesertUnderpass_MapScripts:: @ 823AF37
+	map_script 3, DesertUnderpass_MapScript1_23AF3D
+	.byte 0
+
+DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
+	setflag FLAG_LANDMARK_DESERT_UNDERPASS
+	end
+
+DesertUnderpass_EventScript_23AF41:: @ 823AF41
+	lock
+	faceplayer
+	checkflag FLAG_0x14F
+	goto_eq DesertUnderpass_EventScript_23AF57
+	checkflag FLAG_0x150
+	goto_eq DesertUnderpass_EventScript_23AF68
+	release
+	end
+
+DesertUnderpass_EventScript_23AF57:: @ 823AF57
+	giveitem_std ITEM_CLAW_FOSSIL
+	removeobject 1
+	release
+	end
+
+DesertUnderpass_EventScript_23AF68:: @ 823AF68
+	giveitem_std ITEM_ROOT_FOSSIL
+	removeobject 1
+	release
+	end
+
+DesertUnderpass_Text_23AF79:: @ 823AF79
+	.string "{PLAYER} found the ROOT FOSSIL.$"
+
+DesertUnderpass_Text_23AF93:: @ 823AF93
+	.string "{PLAYER} found the CLAW FOSSIL.$"
+