4 files changed, 49 insertions, 2 deletions
diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc
new file mode 100644
index 000000000..d115e8225
--- /dev/null
+++ b/data/maps/SlateportCity_House2/events.inc
@@ -0,0 +1,10 @@
+SlateportCity_House2_EventObjects:: @ 8388064
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0
+
+SlateportCity_House2_MapWarps:: @ 8388094
+	warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY
+	warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY
+
+SlateportCity_House2_MapEvents:: @ 83880A4
+	map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc
index 00b9399a3..d731c0542 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_House2:: @ 83060DC
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte SlateportCity_House2_MapEvents
 	.4byte SlateportCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 60
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc
new file mode 100644
index 000000000..934fae153
--- /dev/null
+++ b/data/maps/SlateportCity_House2/scripts.inc
@@ -0,0 +1,21 @@
+SlateportCity_House2_MapScripts:: @ 815638F
+	.byte 0
+
+SlateportCity_House2_EventScript_156390:: @ 8156390
+	msgbox SlateportCity_House2_Text_1804CF, 2
+	end
+
+SlateportCity_House2_EventScript_156399:: @ 8156399
+	lock
+	faceplayer
+	checkitem ITEM_CONTEST_PASS, 1
+	compare RESULT, 1
+	goto_if_eq SlateportCity_House2_EventScript_1563B5
+	msgbox SlateportCity_House2_Text_180567, 4
+	release
+	end
+
+SlateportCity_House2_EventScript_1563B5:: @ 81563B5
+	msgbox SlateportCity_House2_Text_1805CD, 4
+	release
+	end
diff --git a/data/maps/SlateportCity_House2/text.inc b/data/maps/SlateportCity_House2/text.inc
new file mode 100644
index 000000000..c3d8346bc
--- /dev/null
+++ b/data/maps/SlateportCity_House2/text.inc
@@ -0,0 +1,16 @@
+SlateportCity_House2_Text_1804CF:: @ 81804CF
+	.string "My POKéMON has a HASTY nature.\p"
+	.string "It has higher SPEED compared to my\n"
+	.string "other POKéMON.\p"
+	.string "Maybe their nature has something to\n"
+	.string "do with the stat gains of POKéMON.$"
+
+SlateportCity_House2_Text_180567:: @ 8180567
+	.string "You need a CONTEST PASS to enter a\n"
+	.string "CONTEST.\p"
+	.string "It’s easy to get. They give it to\n"
+	.string "anyone who has POKéMON.$"
+
+SlateportCity_House2_Text_1805CD:: @ 81805CD
+	.string "Oh, a CONTEST PASS!\n"
+	.string "You’re going to be a contestant?$"