merge with battle tent update

3 files changed, 126 insertions, 1 deletions

diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..368190914
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871
+
+FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500
+	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
+	warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN
+	warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F
+
+FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518
+	map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index c3b9ec95d..515518d9a 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 FallarborTown_PokemonCenter_1F: @ 8482DE8
-	.4byte FallarborTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte FallarborTown_PokemonCenter_1F_MapEvents
 	.4byte FallarborTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..15f5d2b9e
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,111 @@
+FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
+	map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
+	map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30
+	.byte 0
+
+FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
+	setrespawn 17
+	call FallarborTown_PokemonCenter_1F_EventScript_2718DE
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1
+	setvar VAR_0x800B, 1
+	call FallarborTown_PokemonCenter_1F_EventScript_27191E
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF
+	msgbox FallarborTown_PokemonCenter_1F_Text_200E22, 2
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8
+	msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, 2
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01
+	lock
+	faceplayer
+	msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, 4
+	closemessage
+	switch VAR_FACING
+	case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28
+	case 3, FallarborTown_PokemonCenter_1F_EventScript_200C38
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C53
+	waitmovement 0
+	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C60
+	waitmovement 0
+	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48
+	playse SE_JIDO_DOA
+	removeobject 4
+	clearflag FLAG_0x366
+	release
+	end
+
+FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	step_end
+
+FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	step_end
+
+FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B
+	.string "Oh, hello.\n"
+	.string "You are?\p"
+	.string "Okay, your name’s {PLAYER}{KUN}.\n"
+	.string "I can see that you’re a TRAINER.\p"
+	.string "So that means you use the POKéMON\n"
+	.string "Storage System I developed.\p"
+	.string "How I arrived at that conclusion is\n"
+	.string "a simple deductive process.\p"
+	.string "You spoke to me because you wanted\n"
+	.string "to access something on this PC.\p"
+	.string "Oh, I’m sorry. I’m LANETTE.\p"
+	.string "Honestly, I’m glad to meet you--it’s\n"
+	.string "great you’re using the Storage System.\p"
+	.string "If you could, please visit me at home.\n"
+	.string "My house is on ROUTE 114.$"
+
+FallarborTown_PokemonCenter_1F_Text_200E22: @ 8200E22
+	.string "I wonder what POKéMON looked like\n"
+	.string "long, long ago?\p"
+	.string "Maybe the FOSSIL MANIAC at the edge\n"
+	.string "of town will know.$"
+
+FallarborTown_PokemonCenter_1F_Text_200E8B: @ 8200E8B
+	.string "In the fields of FALLARBOR, we plant\n"
+	.string "seedlings of hardy trees that thrive\l"
+	.string "even in volcanic ash.$"
+