Sync elite_four.inc, check_furniture.inc

19 files changed, 194 insertions, 317 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.$"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index a25738495..9c288d27d 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -965,19 +965,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
@@ -986,109 +980,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, METATILE_EliteFour_OpenDoor_Frame, 0
-	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
-	setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 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, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 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, METATILE_EliteFour_OpenDoor_Frame, 0
-	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
-	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 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, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 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 "This is sample message 1.\p"
@@ -2952,34 +2846,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 "There's a set of POKéMON picture books.$"
-
-BookshelfText: @ 81C6A91
-	.string "It's filled with all sorts of books.$"
-
-PokemonCenterBookshelfText: @ 81C6AB6
-	.string "POKéMON magazines!\n"
-	.string "POKéMON PAL...\p"
-	.string "POKéMON HANDBOOK...\n"
-	.string "ADORABLE POKéMON...$"
-
-VaseText: @ 81C6B00
-	.string "This vase looks expensive...\n"
-	.string "Peered inside...\p"
-	.string "But, it was empty.$"
-
-TrashCanText: @ 81C6B41
-	.string "It's empty.$"
-
-ShopShelfText: @ 81C6B4D
-	.string "The shelves brim with all sorts of\n"
-	.string "POKéMON merchandise.$"
-
-BlueprintText: @ 81C6B85
-	.string "A blueprint of some sort?\n"
-	.string "It's too complicated!$"
+	.include "data/text/check_furniture.inc"
 
 GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index 45e9f9782..fcf09914b 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -18,7 +18,7 @@ EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
 
 EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
 	lockall
-	call EverGrandeCity_DrakesRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 4
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
 	end
 
 EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758
-	call EverGrandeCity_DrakesRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
-	call EverGrandeCity_DrakesRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
@@ -56,7 +56,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
 	setvar VAR_0x8004, 0
 	special sub_810FF60
 	setflag FLAG_DEFEATED_ELITE_4_DRAKE
-	call EverGrandeCity_DrakesRoom_EventScript_1A0693
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
index 1218cf1d0..d4b5c8582 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -18,7 +18,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692
 
 EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
 	lockall
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 3
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
-	call EverGrandeCity_GlaciasRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
@@ -54,7 +54,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
 	setflag FLAG_DEFEATED_ELITE_4_GLACIA
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
index ea84a7d81..c5394ecb0 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -18,7 +18,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8
 
 EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
 	lockall
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 2
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
-	call EverGrandeCity_PhoebesRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
@@ -54,7 +54,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
 
 EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
 	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index 527aefdda..7bd896364 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -11,11 +11,11 @@ EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564
-	call EverGrandeCity_SidneysRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A
-	call EverGrandeCity_SidneysRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570
@@ -33,7 +33,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F
 
 EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
 	lockall
-	call EverGrandeCity_SidneysRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 1
 	releaseall
 	end
@@ -55,7 +55,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
 
 EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
 	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
-	call EverGrandeCity_SidneysRoom_EventScript_1A0693
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_SidneysRoom_Text_19086D, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc
index f8b990423..9690ccb29 100644
--- a/data/maps/FallarborTown_House1/scripts.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
@@ -25,8 +25,8 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
 	giveitem ITEM_TM27_RETURN
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setvar VAR_0x8004, 280
-	call FallarborTown_House1_EventScript_1A067F
+	setvar VAR_0x8004, ITEM_METEORITE
+	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_RECEIVED_TM27
 	msgbox FallarborTown_House1_Text_177910, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index e8b8c6133..861b0eccb 100644
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -6,7 +6,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
 	faceplayer
 	msgbox GraniteCave_StevensRoom_Text_194AE5, MSGBOX_DEFAULT
 	setvar VAR_0x8004, ITEM_LETTER
-	call GraniteCave_StevensRoom_EventScript_1A067F
+	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_194BDD, MSGBOX_DEFAULT
 	giveitem ITEM_TM47_STEEL_WING
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 945f5d35a..15267ec8a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -38,7 +38,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA
 	setvar VAR_0x8004, 0
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678
+	call Common_EventScript_NameReceivedPartyMon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
 	end
 
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 26ab6aed3..07fe1b296 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -86,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	bufferspeciesname 1, SPECIES_BELDUM
 	msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
 	setflag FLAG_RECEIVED_BELDUM
 	releaseall
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index a55ae8800..fc0776fb5 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -194,7 +194,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A
 
 MtPyre_Summit_EventScript_15D669:: @ 815D669
 	setvar VAR_0x8004, ITEM_RED_OR_BLUE_ORB
-	call MtPyre_Summit_EventScript_1A067F
+	call Common_EventScript_PlayerHandedOverTheItem
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 33a25c7ca..ae04f9779 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -145,7 +145,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
 	givemon SPECIES_LILEEP, 20, ITEM_NONE
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	release
 	end
 
@@ -165,7 +165,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
 	givemon SPECIES_ANORITH, 20, ITEM_NONE
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	release
 	end
 
diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc
index f047c80a5..b5139c129 100644
--- a/data/maps/SlateportCity_House1/scripts.inc
+++ b/data/maps/SlateportCity_House1/scripts.inc
@@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_155726:: @ 8155726
 
 SlateportCity_House1_EventScript_155730:: @ 8155730
 	msgbox SlateportCity_House1_Text_17D580, MSGBOX_DEFAULT
-	call SlateportCity_House1_EventScript_1A0678
+	call Common_EventScript_NameReceivedPartyMon
 	specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	compare VAR_RESULT, 1
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 47d49639e..0450d51f1 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -78,8 +78,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 269
-	call SlateportCity_OceanicMuseum_2F_EventScript_1A067F
+	setvar VAR_0x8004, ITEM_DEVON_GOODS
+	call Common_EventScript_PlayerHandedOverTheItem
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98
diff --git a/data/scripts/check_furniture.inc b/data/scripts/check_furniture.inc
new file mode 100644
index 000000000..66df09e02
--- /dev/null
+++ b/data/scripts/check_furniture.inc
@@ -0,0 +1,27 @@
+EventScript_PictureBookshelf:: @ 81A085B
+    msgbox Text_PictureBookshelf, MSGBOX_SIGN
+    end
+
+EventScript_Bookshelf:: @ 81A0864
+    msgbox Text_Bookshelf, MSGBOX_SIGN
+    end
+
+EventScript_PokemonCenterBookshelf:: @ 81A086D
+    msgbox Text_PokemonCenterBookshelf, MSGBOX_SIGN
+    end
+
+EventScript_Vase:: @ 81A0876
+    msgbox Text_Vase, MSGBOX_SIGN
+    end
+
+EventScript_EmptyTrashCan:: @ 81A087F
+    msgbox Text_EmptyTrashCan, MSGBOX_SIGN
+    end
+
+EventScript_ShopShelf:: @ 81A0888
+    msgbox Text_ShopShelf, MSGBOX_SIGN
+    end
+
+EventScript_Blueprint:: @ 81A0891
+    msgbox Text_Blueprint, MSGBOX_SIGN
+    end
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
new file mode 100644
index 000000000..39d52825e
--- /dev/null
+++ b/data/scripts/elite_four.inc
@@ -0,0 +1,62 @@
+PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 81A0693
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
+	waitmovement 0
+	playse SE_DOOR
+	setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
+	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
+	setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	special DrawWholeMapView
+	return
+
+PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 81A0710
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
+	waitmovement 0
+	playse SE_TRACK_DOOR
+	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	special DrawWholeMapView
+	return
+
+@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible
+PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 81A0757
+	setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
+	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
+	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	return
+
+PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 81A07FA
+	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	return
diff --git a/data/text/check_furniture.inc b/data/text/check_furniture.inc
new file mode 100644
index 000000000..a8e008e7c
--- /dev/null
+++ b/data/text/check_furniture.inc
@@ -0,0 +1,27 @@
+Text_PictureBookshelf: @ 81C6A69
+	.string "There's a set of POKéMON picture books.$"
+
+Text_Bookshelf: @ 81C6A91
+	.string "It's filled with all sorts of books.$"
+
+Text_PokemonCenterBookshelf: @ 81C6AB6
+	.string "POKéMON magazines!\n"
+	.string "POKéMON PAL...\p"
+	.string "POKéMON HANDBOOK...\n"
+	.string "ADORABLE POKéMON...$"
+
+Text_Vase: @ 81C6B00
+	.string "This vase looks expensive...\n"
+	.string "Peered inside...\p"
+	.string "But, it was empty.$"
+
+Text_EmptyTrashCan: @ 81C6B41
+	.string "It's empty.$"
+
+Text_ShopShelf: @ 81C6B4D
+	.string "The shelves brim with all sorts of\n"
+	.string "POKéMON merchandise.$"
+
+Text_Blueprint: @ 81C6B85
+	.string "A blueprint of some sort?\n"
+	.string "It's too complicated!$"
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 1775801ed..b0b56ac13 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -61,13 +61,13 @@ extern u8 gUnknown_081C346A[];
 extern u8 gUnknown_081616E1[];
 extern u8 EventScript_RegionMap[];
 extern u8 S_RunningShoesManual[];
-extern u8 PictureBookShelfScript[];
-extern u8 BookshelfScript[];
-extern u8 PokemonCenterBookshelfScript[];
-extern u8 VaseScript[];
-extern u8 TrashCanScript[];
-extern u8 ShopShelfScript[];
-extern u8 BlueprintScript[];
+extern u8 EventScript_PictureBookshelf[];
+extern u8 EventScript_Bookshelf[];
+extern u8 EventScript_PokemonCenterBookshelf[];
+extern u8 EventScript_Vase[];
+extern u8 EventScript_EmptyTrashCan[];
+extern u8 EventScript_ShopShelf[];
+extern u8 EventScript_Blueprint[];
 extern u8 SecretBase_EventScript_SandOrnament[];
 extern u8 SecretBase_EventScript_ShieldOrToyTV[];
 extern u8 EventScript_UseSurf[];
@@ -469,19 +469,19 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile
     if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE)
         return S_RunningShoesManual;
     if (MetatileBehavior_IsPictureBookShelf(metatileBehavior) == TRUE)
-        return PictureBookShelfScript;
+        return EventScript_PictureBookshelf;
     if (MetatileBehavior_IsBookShelf(metatileBehavior) == TRUE)
-        return BookshelfScript;
+        return EventScript_Bookshelf;
     if (MetatileBehavior_IsPokeCenterBookShelf(metatileBehavior) == TRUE)
-        return PokemonCenterBookshelfScript;
+        return EventScript_PokemonCenterBookshelf;
     if (MetatileBehavior_IsVase(metatileBehavior) == TRUE)
-        return VaseScript;
+        return EventScript_Vase;
     if (MetatileBehavior_IsTrashCan(metatileBehavior) == TRUE)
-        return TrashCanScript;
+        return EventScript_EmptyTrashCan;
     if (MetatileBehavior_IsShopShelf(metatileBehavior) == TRUE)
-        return ShopShelfScript;
+        return EventScript_ShopShelf;
     if (MetatileBehavior_IsBlueprint(metatileBehavior) == TRUE)
-        return BlueprintScript;
+        return EventScript_Blueprint;
 
     height = position->height;
     if (height == MapGridGetZCoordAt(position->x, position->y))