merge union room with master

3 files changed, 79 insertions, 5 deletions

diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..cf0215573
--- /dev/null
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc
@@ -0,0 +1,15 @@
+BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0
+	object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0
+
+BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4
+	warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+	warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F
+
+BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC
+	map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
index 561aba67e..a136e803d 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_PokemonCenter_1F: @ 8485708
-	.4byte BattleFrontier_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte BattleFrontier_PokemonCenter_1F_MapEvents
 	.4byte BattleFrontier_PokemonCenter_1F_MapScripts
 	.4byte 0x0
 	.2byte MUS_POKECEN
 	.2byte 61
-	.byte 58
+	.byte MAPSEC_BATTLE_FRONTIER
 	.byte 0
-	.byte 0
-	.byte 8
+	.byte WEATHER_NONE
+	.byte MAP_TYPE_INDOOR
 	.2byte 0
 	.byte 0
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..23818d64c
--- /dev/null
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,59 @@
+BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
+	map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904
+	map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30
+	.byte 0
+
+BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
+	setrespawn 22
+	end
+
+BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
+	setvar VAR_0x800B, 1
+	call BattleFrontier_PokemonCenter_1F_EventScript_27191E
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916
+	msgbox BattleFrontier_PokemonCenter_1F_Text_267944, 2
+	end
+
+BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F
+	msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, 2
+	end
+
+BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928
+	msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, 2
+	end
+
+BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_SKITTY, 0
+	msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, 4
+	waitmoncry
+	release
+	end
+
+BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944
+	.string "There was someone here using a \n"
+	.string "POKéMON I’ve never seen before.\p"
+	.string "I never learned about it at\n"
+	.string "TRAINER’S SCHOOL at least.\p"
+	.string "I wonder where you can catch POKéMON\n"
+	.string "like that.$"
+
+BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB
+	.string "Okay! Next stop, the BATTLE ARENA!\n"
+	.string "I’d better get the right POKéMON from\l"
+	.string "the PC Storage System.$"
+
+BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B
+	.string "Giggle… I’m going to go through every\n"
+	.string "challenge with just this baby!$"
+
+BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90
+	.string "SKITTY: Mya myaaah!$"
+