Merge remote-tracking branch 'upstream/master' into fldeff

8 files changed, 41 insertions, 41 deletions

diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index 6225ae0cc..facd60979 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -19,7 +19,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
 	setvar VAR_RESULT, 0
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	delay 2
 	compare VAR_RESULT, 2
 	goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77
@@ -39,7 +39,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
 
 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
 	setvar VAR_0x8004, 15
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 0
 	special CallFrontierUtilFunc
 	switch VAR_TEMP_0
@@ -68,7 +68,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
 	setvar VAR_0x8004, 17
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	end
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42
@@ -80,16 +80,16 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 7
 	setvar VAR_0x8006, 255
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
 BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
 	setvar VAR_0x8004, 13
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 14
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special HealPlayerParty
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
 	waitstate
@@ -98,14 +98,14 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 1
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special SavePlayerParty
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 9
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special CallFrontierUtilFunc
@@ -121,7 +121,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
 	setvar VAR_0x8004, 13
 	setvar VAR_0x8005, 32
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	return
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
@@ -137,7 +137,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
 	compare VAR_RESULT, 7
 	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
 	setvar VAR_0x8004, 6
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
@@ -155,7 +155,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
 	trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D
 	setvar VAR_0x8004, 10
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	waitmessage
 	waitbuttonpress
 	closemessage
@@ -164,12 +164,12 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A
 	setvar VAR_0x8004, 7
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	callstd 1
 	compare VAR_0x8007, 0
 	goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
 	setvar VAR_0x8004, 8
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 
 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87:: @ 8252C87
 	end
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 4ae7b8e55..bcd2e32c9 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -35,11 +35,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
@@ -69,7 +69,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	setvar VAR_0x8004, 14
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special HealPlayerParty
 	message BattleFrontier_BattlePyramidLobby_Text_2519F8
 	waitmessage
@@ -82,10 +82,10 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	message BattleFrontier_BattlePyramidLobby_Text_251A77
 	waitmessage
 	setvar VAR_0x8004, 4
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	playse SE_SAVE
 	waitse
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4
@@ -99,7 +99,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	special CallFrontierUtilFunc
 	special LoadPlayerParty
 	setvar VAR_0x8004, 14
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special HealPlayerParty
 	lockall
 	message BattleFrontier_BattlePyramidLobby_Text_251B5A
@@ -111,10 +111,10 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	playse SE_SAVE
 	waitse
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4
@@ -180,11 +180,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_0x8005, 4
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 1
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 1
@@ -194,9 +194,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 6
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 9
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special LoadPlayerParty
 	closemessage
 	delay 2
@@ -284,7 +284,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 5
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53
 	setvar VAR_RESULT, 0
@@ -294,7 +294,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
 BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 3
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
 	return
 
@@ -302,7 +302,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 6
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91
 	setvar VAR_RESULT, 0
@@ -312,7 +312,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
 BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 4
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
 	return
 
@@ -439,7 +439,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
 	msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
 	msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index 46ecef737..e77013519 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
 	setvar VAR_0x8004, 13
 	setvar VAR_0x8005, 200
 	setvar VAR_0x8006, 0
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_TEMP_F, 1
 	end
 
@@ -71,14 +71,14 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
 BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 1
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	special SavePlayerParty
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0
 	special CallFrontierUtilFunc
 	setvar VAR_0x8004, 9
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special CallFrontierUtilFunc
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index de179850d..f16b7e6a0 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -7,7 +7,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
 	setvar VAR_0x8004, 17
-	special sub_81A8E7C
+	special CallBattlePyramidFunction
 	end
 
 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
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