merge with battle tent update

5 files changed, 68 insertions, 23 deletions

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




\ No newline at end of file
diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc
new file mode 100644
index 000000000..ff920f86d
--- /dev/null
+++ b/data/maps/MeteorFalls_StevensCave/events.inc
@@ -0,0 +1,9 @@
+MeteorFalls_StevensCave_EventObjects: @ 85378B0
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, 7, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0
+
+MeteorFalls_StevensCave_MapWarps: @ 85378C8
+	warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R
+
+MeteorFalls_StevensCave_MapEvents:: @ 85378D0
+	map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc
index d5415ea46..22b3aaeb6 100644
--- a/data/maps/MeteorFalls_StevensCave/header.inc
+++ b/data/maps/MeteorFalls_StevensCave/header.inc
@@ -1,5 +1,5 @@
 MeteorFalls_StevensCave: @ 8484A74
-	.4byte MeteorFalls_StevensCave_MapAttributes
+	.4byte MeteorFalls_StevensCave_Layout
 	.4byte MeteorFalls_StevensCave_MapEvents
 	.4byte MeteorFalls_StevensCave_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MeteorFalls_StevensCave/map.bin b/data/maps/MeteorFalls_StevensCave/map.bin
deleted file mode 100644
index e509d66c2..000000000
--- a/data/maps/MeteorFalls_StevensCave/map.bin
+++ /dev/null
@@ -1,21 +0,0 @@
- 														"11111					
- 												"111((			
-( 	"1111111121((((
6
6
6(
6111111112
2((((1112(
6111111112
2(((111112(
6111111112
2((11111
6(
6111111112
2(11111(
6(
6
2
2
2Œ
2
2
2
2
2
2011111((
6(
6Œ
2
2Œ
2
2Œ
2
2
2
2
2
2
2
2
2(((
6(
6
2
2
2
2Œ
2
2
2									(
6(
6
2
2Œ
2
2
2
2(							
-(
6(1ž
2
2
2
2
2
2
2((1111111ž(
6(111ž						
-
2
2(111111!!
611111ž 				"
-
21
-1((	
-111111ž	
-
2
2
2((Œ((((
6111111((
6	
-
2
2((
2((((
61111(((
6
6
2
2((
2((((
6*
2
2
2
2(((1ž
6
2
2(ž–
2((((
6*
2
2
2
2(((
612
6
2
211ž
2((((
6*
2ŒŒ
2(((
612ž
2Œ
2
2
2
2
2((((
6*
2Œ
2
2(((*1ž
2
2
2ŒŒ
2
2
2((((
6			
-
2
2
2(((
6**
2
2
2
2
2Œ
2
2				(
6	
-
-Œ
2((ž**
2
2
2
2Œ
2
2(
6			
6(
6**
-
2(ž
2
2
2
2
2
2((
6(		
-(
6***
2ž
2
2
2			((
6((
-(
6***
2
2
2
2
2
2
2
2
2Œ
2(
6
6		
6((((
6**	
-
2
2
2
2Œ
2
2ŒŒ
2(
6(
6
6
6((((
6**
6		
-
2
2
2
2
2
2
2
2(((			(((
6*			
-*
2
2
2Œ
2			((((
6		((
6*			
-**
22
2
2
2(			(((
6(
6
6ž(
6			
-*	HIJ			(
6
6
6(((
6žž															ž
\ No newline at end of file
diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc
new file mode 100644
index 000000000..5226ddb4a
--- /dev/null
+++ b/data/maps/MeteorFalls_StevensCave/scripts.inc
@@ -0,0 +1,58 @@
+MeteorFalls_StevensCave_MapScripts:: @ 823B181
+	.byte 0
+
+MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
+	lock
+	checkflag FLAG_0x4F8
+	goto_eq MeteorFalls_StevensCave_EventScript_23B1CD
+	waitse
+	playse SE_PIN
+	applymovement 1, MeteorFalls_StevensCave_Movement_272598
+	waitmovement 0
+	applymovement 1, MeteorFalls_StevensCave_Movement_27259A
+	waitmovement 0
+	applymovement 1, MeteorFalls_StevensCave_Movement_27259E
+	waitmovement 0
+	msgbox MeteorFalls_StevensCave_Text_23B1E1, 4
+	trainerbattle 3, TRAINER_STEVEN, 0, MeteorFalls_StevensCave_Text_23B32D
+	msgbox MeteorFalls_StevensCave_Text_23B358, 4
+	setflag FLAG_0x4F8
+	release
+	end
+
+MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD
+	applymovement 1, MeteorFalls_StevensCave_Movement_27259E
+	waitmovement 0
+	msgbox MeteorFalls_StevensCave_Text_23B358, 4
+	release
+	end
+
+MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1
+	.string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n"
+	.string "I’m amazed you knew where to find me.\p"
+	.string "Do you, uh…maybe think of me as\n"
+	.string "just a rock maniac?\p"
+	.string "No, that can’t be right.\p"
+	.string "We battled alongside each other at\n"
+	.string "the SOOTOPOLIS SPACE CENTER.\p"
+	.string "You should have a very good idea\n"
+	.string "about how good I am.\p"
+	.string "Okay, {PLAYER}{KUN}, if you’re going to mount\n"
+	.string "a serious challenge, expect the worst!$"
+
+MeteorFalls_StevensCave_Text_23B32D: @ 823B32D
+	.string "You…\n"
+	.string "I had no idea you’d become so strong…$"
+
+MeteorFalls_StevensCave_Text_23B358: @ 823B358
+	.string "STEVEN: Come to think of it, ever since\n"
+	.string "our paths first crossed in GRANITE\l"
+	.string "CAVE in DEWFORD, I had this feeling.\p"
+	.string "I thought that you would eventually\n"
+	.string "become the CHAMPION.\p"
+	.string "My predictions usually come true.\p"
+	.string "And where will you go from here?\p"
+	.string "… … … … … …\n"
+	.string "… … … … … …\p"
+	.string "Fufufu, even I couldn’t tell you that.$"
+