2 files changed, 32 insertions, 138 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index a7b3a0fe1..3d7d7cbec 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -966,19 +966,13 @@ Common_EventScript_FerryDepartIsland:: @ 81A047C
 	.include "data/scripts/cave_of_origin.inc"
 	.include "data/scripts/static_pokemon.inc"
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678
-MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678
-RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678
-SlateportCity_House1_EventScript_1A0678:: @ 81A0678
+Common_EventScript_NameReceivedPartyMon:: @ 81A0678
 	fadescreen FADE_TO_BLACK
 	special ChangePokemonNickname
 	waitstate
 	return
 
-FallarborTown_House1_EventScript_1A067F:: @ 81A067F
-GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
-MtPyre_Summit_EventScript_1A067F:: @ 81A067F
-SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
+Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F
 	bufferitemname 0, VAR_0x8004
 	playfanfare MUS_ME_WAZA
 	message FallarborTown_House1_Text_1A1498
@@ -987,109 +981,9 @@ SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
 	removeitem VAR_0x8004, 1
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693
-EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693
-EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693
-EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
-	waitmovement 0
-	playse SE_DOOR
-	setmetatile 6, 1, 836, 0
-	setmetatile 6, 2, 837, 0
-	setmetatile 0, 2, 734, 1
-	setmetatile 1, 2, 733, 1
-	setmetatile 2, 2, 734, 1
-	setmetatile 3, 2, 733, 1
-	setmetatile 4, 2, 734, 1
-	setmetatile 8, 2, 733, 1
-	setmetatile 9, 2, 734, 1
-	setmetatile 10, 2, 733, 1
-	setmetatile 11, 2, 734, 1
-	setmetatile 12, 2, 733, 1
-	special DrawWholeMapView
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710
-EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710
-EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710
-EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710
-	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
-	waitmovement 0
-	playse SE_TRACK_DOOR
-	setmetatile 5, 12, 518, 1
-	setmetatile 6, 12, 518, 1
-	setmetatile 7, 12, 518, 1
-	setmetatile 5, 13, 526, 1
-	setmetatile 6, 13, 526, 1
-	setmetatile 7, 13, 526, 1
-	special DrawWholeMapView
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757
-EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757
-EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757
-EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757
-	setmetatile 6, 1, 836, 0
-	setmetatile 6, 2, 837, 0
-	setmetatile 5, 12, 518, 1
-	setmetatile 6, 12, 518, 1
-	setmetatile 7, 12, 518, 1
-	setmetatile 5, 13, 526, 1
-	setmetatile 6, 13, 526, 1
-	setmetatile 7, 13, 526, 1
-	setmetatile 0, 2, 734, 1
-	setmetatile 1, 2, 733, 1
-	setmetatile 2, 2, 734, 1
-	setmetatile 3, 2, 733, 1
-	setmetatile 4, 2, 734, 1
-	setmetatile 8, 2, 733, 1
-	setmetatile 9, 2, 734, 1
-	setmetatile 10, 2, 733, 1
-	setmetatile 11, 2, 734, 1
-	setmetatile 12, 2, 733, 1
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA
-EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA
-EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA
-EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA
-	setmetatile 5, 12, 518, 1
-	setmetatile 6, 12, 518, 1
-	setmetatile 7, 12, 518, 1
-	setmetatile 5, 13, 526, 1
-	setmetatile 6, 13, 526, 1
-	setmetatile 7, 13, 526, 1
-	return
-
+	.include "data/scripts/elite_four.inc"
 	.include "data/scripts/movement.inc"
-
-PictureBookShelfScript:: @ 81A085B
-	msgbox PictureBookShelfText, MSGBOX_SIGN
-	end
-
-BookshelfScript:: @ 81A0864
-	msgbox BookshelfText, MSGBOX_SIGN
-	end
-
-PokemonCenterBookshelfScript:: @ 81A086D
-	msgbox PokemonCenterBookshelfText, MSGBOX_SIGN
-	end
-
-VaseScript:: @ 81A0876
-	msgbox VaseText, MSGBOX_SIGN
-	end
-
-TrashCanScript:: @ 81A087F
-	msgbox TrashCanText, MSGBOX_SIGN
-	end
-
-ShopShelfScript:: @ 81A0888
-	msgbox ShopShelfText, MSGBOX_SIGN
-	end
-
-BlueprintScript:: @ 81A0891
-	msgbox BlueprintText, MSGBOX_SIGN
-	end
+	.include "data/scripts/check_furniture.inc"
 
 SampleMessage1:: @ 81A089A
 	.string "Dies ist Beispiel 1.\p"
@@ -2979,34 +2873,7 @@ MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA
 	.include "data/text/braille.inc"
 	.include "data/text/berries.inc"
 	.include "data/text/shoal_cave.inc"
-
-PictureBookShelfText: @ 81C6A69
-	.string "Eine Sammlung von POKéMON-Büchern.$"
-
-BookshelfText: @ 81C6A91
-	.string "Hier stehen jede Menge Bücher.$"
-
-PokemonCenterBookshelfText: @ 81C6AB6
-	.string "POKéMON-Magazine!\n"
-	.string "DER POKéMON FREUND...\p"
-	.string "POKéMON HANDBUCH...\n"
-	.string "GELIEBTE POKéMON...$"
-
-VaseText: @ 81C6B00
-	.string "Diese Vase sieht sehr teuer aus...\n"
-	.string "Schauen wir mal hinein...\p"
-	.string "Och, sie ist leer.$"
-
-TrashCanText: @ 81C6B41
-	.string "Leer...$"
-
-ShopShelfText: @ 81C6B4D
-	.string "Die Regale biegen sich unter dem\n"
-	.string "Gewicht von POKéMON-Artikeln.$"
-
-BlueprintText: @ 81C6B85
-	.string "Sind das Blaupausen?\n"
-	.string "Die sind zu kompliziert zu lesen.$"
+	.include "data/text/check_furniture.inc"
 
 GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
diff --git a/data-de/text/check_furniture.inc b/data-de/text/check_furniture.inc
new file mode 100644
index 000000000..4d933de13
--- /dev/null
+++ b/data-de/text/check_furniture.inc
@@ -0,0 +1,27 @@
+Text_PictureBookshelf: @ 81C6A69
+	.string "Eine Sammlung von POKéMON-Büchern.$"
+
+Text_Bookshelf: @ 81C6A91
+	.string "Hier stehen jede Menge Bücher.$"
+
+Text_PokemonCenterBookshelf: @ 81C6AB6
+	.string "POKéMON-Magazine!\n"
+	.string "DER POKéMON FREUND...\p"
+	.string "POKéMON HANDBUCH...\n"
+	.string "GELIEBTE POKéMON...$"
+
+Text_Vase: @ 81C6B00
+	.string "Diese Vase sieht sehr teuer aus...\n"
+	.string "Schauen wir mal hinein...\p"
+	.string "Och, sie ist leer.$"
+
+Text_EmptyTrashCan: @ 81C6B41
+	.string "Leer...$"
+
+Text_ShopShelf: @ 81C6B4D
+	.string "Die Regale biegen sich unter dem\n"
+	.string "Gewicht von POKéMON-Artikeln.$"
+
+Text_Blueprint: @ 81C6B85
+	.string "Sind das Blaupausen?\n"
+	.string "Die sind zu kompliziert zu lesen.$"