3 files changed, 96 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc
new file mode 100644
index 000000000..24d7958ec
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge6/events.inc
@@ -0,0 +1,9 @@
+BattleFrontier_Lounge6_EventObjects: @ 853D370
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0
+
+BattleFrontier_Lounge6_MapWarps: @ 853D388
+	warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
+
+BattleFrontier_Lounge6_MapEvents:: @ 853D390
+	map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc
index c41376cfd..e07dd297f 100644
--- a/data/maps/BattleFrontier_Lounge6/header.inc
+++ b/data/maps/BattleFrontier_Lounge6/header.inc
@@ -1,15 +1,15 @@
 BattleFrontier_Lounge6: @ 848567C
-	.4byte BattleFrontier_Lounge6_MapAttributes
+	.4byte BattleFrontier_Lounge2_Layout
 	.4byte BattleFrontier_Lounge6_MapEvents
 	.4byte BattleFrontier_Lounge6_MapScripts
 	.4byte 0x0
 	.2byte MUS_B_TOWER
 	.2byte 429
-	.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_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc
new file mode 100644
index 000000000..c779e7c76
--- /dev/null
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
@@ -0,0 +1,82 @@
+BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
+	.byte 0
+
+BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
+	lock
+	faceplayer
+	checkflag FLAG_0x09C
+	goto_eq BattleFrontier_Lounge6_EventScript_265083
+	setvar VAR_0x8008, 3
+	copyvar VAR_0x8004, VAR_0x8008
+	specialvar VAR_RESULT, sub_807E73C
+	copyvar VAR_0x8009, VAR_RESULT
+	msgbox BattleFrontier_Lounge6_Text_26508D, 5
+	compare VAR_RESULT, 0
+	goto_eq BattleFrontier_Lounge6_EventScript_26506B
+	special sub_81B94B0
+	waitstate
+	copyvar VAR_0x800A, VAR_0x8004
+	compare VAR_0x8004, 255
+	goto_eq BattleFrontier_Lounge6_EventScript_26506B
+	copyvar VAR_0x8005, VAR_0x800A
+	specialvar VAR_RESULT, sub_807E9D4
+	copyvar VAR_0x800B, VAR_RESULT
+	compare VAR_RESULT, VAR_0x8009
+	goto_if 5, BattleFrontier_Lounge6_EventScript_265075
+	copyvar VAR_0x8004, VAR_0x8008
+	copyvar VAR_0x8005, VAR_0x800A
+	special sub_807EA10
+	special sub_807F0E4
+	waitstate
+	msgbox BattleFrontier_Lounge6_Text_265128, 4
+	setflag FLAG_0x09C
+	release
+	end
+
+BattleFrontier_Lounge6_EventScript_26506B:: @ 826506B
+	msgbox BattleFrontier_Lounge6_Text_2651CB, 4
+	release
+	end
+
+BattleFrontier_Lounge6_EventScript_265075:: @ 8265075
+	bufferspeciesname 0, VAR_0x8009
+	msgbox BattleFrontier_Lounge6_Text_26518D, 4
+	release
+	end
+
+BattleFrontier_Lounge6_EventScript_265083:: @ 8265083
+	msgbox BattleFrontier_Lounge6_Text_26520E, 4
+	release
+	end
+
+BattleFrontier_Lounge6_Text_26508D: @ 826508D
+	.string "My POKéMON is a {STR_VAR_2}.\n"
+	.string "Do you know it?\l"
+	.string "It’s quite cute and rather nice.\p"
+	.string "This little one, I could trade with\n"
+	.string "pride!\p"
+	.string "Would you like to trade me a {STR_VAR_1}\n"
+	.string "for my {STR_VAR_2}?$"
+
+BattleFrontier_Lounge6_Text_265128: @ 8265128
+	.string "Oh, it’s adorable!\n"
+	.string "Thank you!\l"
+	.string "I promise I’ll be good to it!\p"
+	.string "Oh! I hope you’ll be good to\n"
+	.string "my {STR_VAR_2}, too!$"
+
+BattleFrontier_Lounge6_Text_26518D: @ 826518D
+	.string "Oh, I’m sorry!\n"
+	.string "I don’t intend to trade for anything\l"
+	.string "but a {STR_VAR_1}.$"
+
+BattleFrontier_Lounge6_Text_2651CB: @ 82651CB
+	.string "Oh, you won’t?\n"
+	.string "Well, that’s fine, too.\l"
+	.string "Please come visit us again.$"
+
+BattleFrontier_Lounge6_Text_26520E: @ 826520E
+	.string "Giggle!\n"
+	.string "A SKITTY is so much cuter than I had\l"
+	.string "imagined. I’m delighted!$"
+