name/rename a lot of functions

2 files changed, 22 insertions, 22 deletions

diff --git a/data/data2.s b/data/data2.s
index 0370630c0..4da2572a4 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -12171,7 +12171,7 @@ gBadgesTiles:: @ 83B5AB8
 gUnknown_083B5EBC:: @ 83B5EBC
 	.4byte sub_8093864
 	.4byte sub_80938A8
-	.4byte rfu_NI_stopReceivingData
+	.4byte sub_80938CC
 	.4byte sub_8093918
 	.4byte sub_8093938
 	.4byte sub_8093954
@@ -15479,7 +15479,7 @@ gSpriteImageTable_83D2688:: @ 83D2688
 
 	.align 2
 gSpriteTemplate_83D26A0:: @ 83D26A0
-	spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, door_restore_tilemap
+	spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, SpriteCB_SandPillar_0
 
 @ This uses one of the secret base palettes, so there is no "09.pal" file.
 	.align 2
diff --git a/data/specials.s b/data/specials.s
index 0d79f0368..33ac3f6e8 100644
--- a/data/specials.s
+++ b/data/specials.s
@@ -1,6 +1,6 @@
 	.align 2
 gSpecials::
-	.4byte sp000_heal_pokemon
+	.4byte HealPlayerParty
 	.4byte sub_8068FEC
 	.4byte sub_808102C
 	.4byte sub_80810DC
@@ -61,9 +61,9 @@ gSpecials::
 	.4byte sub_8082C9C
 	.4byte sub_80826B0
 	.4byte sub_8096100
-	.4byte sub_80C5428
+	.4byte CheckForAlivePartyMons
 	.4byte TurnOffTVScreen
-	.4byte sub_80C07C4
+	.4byte DoTVShow
 	.4byte sub_80BECE8
 	.4byte special_0x44
 	.4byte sub_80BDA0C
@@ -91,10 +91,10 @@ gSpecials::
 	.4byte sub_80C4440
 	.4byte sub_80C44C0
 	.4byte sub_80C5044
-	.4byte sub_80C4FBC
+	.4byte GiveMonArtistRibbon
 	.4byte sub_808363C
 	.4byte InitSaveDialog
-	.4byte sub_80C71C4
+	.4byte DoWateringBerryTreeAnim
 	.4byte sub_80E60D8
 	.4byte sub_80EB7C4
 	.4byte sub_80F7B14
@@ -119,10 +119,10 @@ gSpecials::
 	.4byte sub_8109C90
 	.4byte sub_8109CF0
 	.4byte sub_8109DE0
-	.4byte sub_80C5B98
-	.4byte sub_80C5BB4
-	.4byte sub_80C5BF0
-	.4byte sub_80C5C0C
+	.4byte GetBigShroomishInfo
+	.4byte CompareShroomishSize
+	.4byte GetBigBarboachInfo
+	.4byte CompareBarboachSize
 	.4byte sub_80BF9B4
 	.4byte sub_80BFAE0
 	.4byte sub_80BFB10
@@ -130,7 +130,7 @@ gSpecials::
 	.4byte sub_80FA5E4
 	.4byte sub_80EB83C
 	.4byte sub_80FA648
-	.4byte sub_80A9884
+	.4byte SwapRegisteredBike
 	.4byte CalculatePlayerPartyCount
 	.4byte sub_8095B6C
 	.4byte sub_8095C10
@@ -138,7 +138,7 @@ gSpecials::
 	.4byte sub_80C4CEC
 	.4byte sub_80C4C78
 	.4byte sub_80C4D50
-	.4byte sub_80C4F10
+	.4byte ShowContestWinner
 	.4byte sub_810DCCC
 	.4byte sub_810DC7C
 	.4byte sub_810E24C
@@ -162,7 +162,7 @@ gSpecials::
 	.4byte sub_80F9A0C
 	.4byte sub_810CA00
 	.4byte sub_804E538
-	.4byte sub_81177FC
+	.4byte PlayRoulette
 	.4byte sub_810FD60
 	.4byte sub_810FCB0
 	.4byte sub_810FDAC
@@ -199,7 +199,7 @@ gSpecials::
 	.4byte sub_811043C
 	.4byte sub_80B7CE8
 	.4byte sub_80B7D0C
-	.4byte sub_80C5824
+	.4byte DoWhiteOut
 	.4byte sp0C8_whiteout_maybe
 	.4byte sub_80C8040
 	.4byte sub_80C8080
@@ -245,10 +245,10 @@ gSpecials::
 	.4byte sub_8135D84
 	.4byte sub_8135DEC
 	.4byte sub_8135E50
-	.4byte sub_80C55B0
+	.4byte ChooseBattleTowerPlayerParty
 	.4byte sub_813601C
 	.4byte sub_810F404
-	.4byte sub_80C5604
+	.4byte ReducePlayerPartyToThree
 	.4byte sub_8139C74
 	.4byte sub_8139CB4
 	.4byte sub_810E414
@@ -307,7 +307,7 @@ gSpecials::
 	.4byte sub_810F6EC
 	.4byte sub_81477B4
 	.4byte sub_810E944
-	.4byte sub_80C6F38
+	.4byte GetShieldToyTVDecorationInfo
 	.4byte sub_810F738
 	.4byte sub_8069D78
 	.4byte sub_810F758
@@ -320,13 +320,13 @@ gSpecials::
 	.4byte sub_807E25C
 	.4byte sp13E_warp_to_last_warp
 	.4byte sp13F_fall_to_last_warp
-	.4byte sub_80C5050
+	.4byte ShowContestEntryMonPic
 	.4byte sub_80C5164
 	.4byte sub_8134AB4
 	.4byte sub_8081B78
 	.4byte sub_810F83C
 	.4byte sub_810F85C
-	.4byte sub_80C5228
+	.4byte ScriptGetMultiplayerId
 	.4byte sub_810F8D4
 	.4byte sub_80FA148
 	.4byte sub_810F8FC
@@ -339,6 +339,6 @@ gSpecials::
 	.4byte sub_810F96C
 	.4byte sub_810F9AC
 	.4byte sub_813610C
-	.4byte sub_80C54A0
-	.4byte sub_80C525C
+	.4byte GetNameOfEnigmaBerryInPlayerParty
+	.4byte ScriptRandom
 	.4byte sub_80835D8