7 files changed, 15 insertions, 22 deletions
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 1dfc72bcc..65749894b 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -57,7 +57,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
 	closemessage
 	special sub_80F88DC
 	setvar VAR_0x4099, 0
-	specialvar VAR_RESULT, sub_80F8C7C
+	specialvar VAR_RESULT, GiveMonArtistRibbon
 	compare VAR_RESULT, 1
 	call_if 1, LilycoveCity_ContestLobby_EventScript_21A314
 	applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
@@ -230,7 +230,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
 	closemessage
 	special sub_80F88DC
 	setvar VAR_0x4099, 0
-	specialvar VAR_RESULT, sub_80F8C7C
+	specialvar VAR_RESULT, GiveMonArtistRibbon
 	compare VAR_RESULT, 1
 	call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4
 	applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
@@ -324,7 +324,7 @@ LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554
 	goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF
 	call LilycoveCity_ContestLobby_EventScript_279CC5
 	call LilycoveCity_ContestLobby_EventScript_21A670
-	special sub_80F87D8
+	special SetContestTrainerGfxIds
 	call LilycoveCity_ContestLobby_EventScript_23BEB6
 	call LilycoveCity_ContestLobby_EventScript_21A585
 	call LilycoveCity_ContestLobby_EventScript_21A5EF
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 242d1b8d8..424ee4bf3 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -260,7 +260,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
 	goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
 
 MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
-	special ReducePlayerPartyToThree
+	special ReducePlayerPartyToSelectedMons
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 4bd15c332..e11d3ae9f 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -106,7 +106,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
 	compare VAR_RESULT, 0
 	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
 	special SavePlayerParty
-	special ReducePlayerPartyToThree
+	special ReducePlayerPartyToSelectedMons
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4
 	closemessage
 	compare VAR_FACING, 2
diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc
index eb6bf8da4..2e13983fa 100644
--- a/data/maps/UnknownMap_25_34/scripts.inc
+++ b/data/maps/UnknownMap_25_34/scripts.inc
@@ -18,7 +18,7 @@ LinkContestRoom1_MapScript1_23B79F: @ 823B79F
 
 LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
 	call LinkContestRoom1_EventScript_27A133
-	special sub_80F8FA0
+	special ScriptGetMultiplayerId
 	compare VAR_RESULT, 0
 	call_if 1, LinkContestRoom1_EventScript_23B7EF
 	compare VAR_RESULT, 1
@@ -134,7 +134,7 @@ LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
 
 LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
 	setvar VAR_RESULT, 32
-	special sub_80F8FE8
+	special ScriptRandom
 	addvar VAR_RESULT, 1
 	switch VAR_RESULT
 	case 1, LinkContestRoom1_EventScript_23BA6B
diff --git a/data/script_pokemon_util_80F87D8.s b/data/script_pokemon_util_80F87D8.s
deleted file mode 100644
index dcf9edeea..000000000
--- a/data/script_pokemon_util_80F87D8.s
+++ /dev/null
@@ -1,7 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-gUnknown_0858D8EC:: @ 858D8EC
-	.byte 3, 4, 5, 14
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index afd2ca851..48c5d8d01 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -388,7 +388,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
 	releaseall
 	addvar VAR_0x8006, 65535
 	playse SE_BOWA2
-	special sub_80F8D28
+	special ShowContestEntryMonPic
 	call LinkContestRoom1_EventScript_27A217
 	return
 
@@ -517,7 +517,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 
 LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5
 	setvar VAR_RESULT, 8
-	special sub_80F8FE8
+	special ScriptRandom
 	compare VAR_RESULT, 0
 	call_if 1, LinkContestRoom1_EventScript_27A65A
 	compare VAR_RESULT, 1
diff --git a/data/specials.inc b/data/specials.inc
index 75f180420..a1d9734ca 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -94,7 +94,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80F8390
 	def_special sub_80F8850
 	def_special sub_80F82B4
-	def_special sub_80F87D8
+	def_special SetContestTrainerGfxIds
 	def_special sub_80F7F30
 	def_special sub_80F8970
 	def_special sub_80F8AFC
@@ -102,7 +102,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80F7F7C
 	def_special sub_80F7FFC
 	def_special sub_80F8D24
-	def_special sub_80F8C7C
+	def_special GiveMonArtistRibbon
 	def_special sub_80B3000
 	def_special SaveGame
 	def_special sub_80FAFF8
@@ -259,7 +259,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_80F9490
 	def_special ValidateEReaderTrainer
 	def_special GetBestBattleTowerStreak
-	def_special ReducePlayerPartyToThree
+	def_special ReducePlayerPartyToSelectedMons
 	def_special BedroomPC
 	def_special PlayerPC
 	def_special FieldShowRegionMap
@@ -330,13 +330,13 @@ gSpecials:: @ 81DBA64
 	def_special sub_80AC81C
 	def_special sp13E_warp_to_last_warp
 	def_special sp13F_fall_to_last_warp
-	def_special sub_80F8D28
+	def_special ShowContestEntryMonPic
 	def_special sub_80F8EB8
 	def_special SetEReaderTrainerGfxId
 	def_special BattleSetup_StartLatiBattle
 	def_special SetRoute119Weather
 	def_special SetRoute123Weather
-	def_special sub_80F8FA0
+	def_special ScriptGetMultiplayerId
 	def_special ScriptGetPartyMonSpecies
 	def_special sub_81B98DC
 	def_special nullsub_54
@@ -350,7 +350,7 @@ gSpecials:: @ 81DBA64
 	def_special BufferLottoTicketNumber
 	def_special sub_81653CC
 	def_special sub_80F9370
-	def_special sub_80F8FE8
+	def_special ScriptRandom
 	def_special sub_81AFDD0
 	def_special sub_80EDCE8
 	def_special sub_80EE2CC