Sync some specials/drop unnecessary prefixes

21 files changed, 138 insertions, 137 deletions

diff --git a/src/battle_records.c b/src/battle_records.c
index e2ae94f65..3196d9bad 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -88,7 +88,7 @@ static u8 *const sStringVars[3] = {
     gStringVar3
 };
 
-void Special_BattleRecords(void)
+void ShowBattleRecords(void)
 {
     SetVBlankCallback(NULL);
     SetMainCallback2(MainCB2_SetUp);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 202be1bd1..faf63cd4c 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -221,7 +221,7 @@ static bool8 CheckSilphScopeInPokemonTower(u16 mapGroup, u16 mapNum)
         return FALSE;
 }
 
-void BattleSetup_StartWildBattle(void)
+void StartWildBattle(void)
 {
     if (GetSafariZoneFlag())
         DoSafariBattle();
@@ -243,7 +243,7 @@ static void DoStandardWildBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void BattleSetup_StartRoamerBattle(void)
+void StartRoamerBattle(void)
 {
     ScriptContext2_Enable();
     FreezeObjectEvents();
@@ -285,7 +285,7 @@ static void DoTrainerBattle(void)
     IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
 }
 
-void ScrSpecial_StartOldManTutorialBattle(void)
+void StartOldManTutorialBattle(void)
 {
     CreateMaleMon(&gEnemyParty[0], SPECIES_WEEDLE, 5);
     ScriptContext2_Enable();
@@ -294,7 +294,7 @@ void ScrSpecial_StartOldManTutorialBattle(void)
     CreateBattleStartTask(B_TRANSITION_SLICED_SCREEN, 0);
 }
 
-void BattleSetup_StartScriptedWildBattle(void)
+void StartScriptedWildBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -304,7 +304,7 @@ void BattleSetup_StartScriptedWildBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void ScrSpecial_StartMarowakBattle(void)
+void StartMarowakBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndMarowakBattle;
@@ -323,7 +323,7 @@ void ScrSpecial_StartMarowakBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void ScrSpecial_StartSouthernIslandBattle(void)
+void StartSouthernIslandBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -333,7 +333,7 @@ void ScrSpecial_StartSouthernIslandBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void Special_StartLegendaryBattle(void)
+void StartLegendaryBattle(void)
 {
     u16 species;
     
@@ -364,7 +364,7 @@ void Special_StartLegendaryBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void Special_StartGroudonKyogreBattle(void)
+void StartGroudonKyogreBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -377,7 +377,7 @@ void Special_StartGroudonKyogreBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void Special_StartRegiBattle(void)
+void StartRegiBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -879,7 +879,7 @@ void ClearTrainerFlag(u16 trainerId)
     FlagClear(FLAG_TRAINER_FLAG_START + trainerId);
 }
 
-void BattleSetup_StartTrainerBattle(void)
+void StartTrainerBattle(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER;
     if (GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL && GetRivalBattleFlags() & RIVAL_BATTLE_TUTORIAL)
@@ -956,7 +956,7 @@ static void CB2_EndRematchBattle(void)
     }
 }
 
-void BattleSetup_StartRematchBattle(void)
+void StartRematchBattle(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER;
     gMain.savedCallback = CB2_EndRematchBattle;
diff --git a/src/cable_club.c b/src/cable_club.c
index e7277ed07..b7f9b9114 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -573,7 +573,7 @@ static void Task_ReestablishLinkInCableClubRoom_2(u8 taskId)
     }
 }
 
-void Special_CableClub_AskSaveTheGame(void)
+void CableClub_AskSaveTheGame(void)
 {
     Field_AskSaveTheGame();
 }
@@ -765,7 +765,7 @@ void CleanupLinkRoomState(void)
     copy_saved_warp2_bank_and_enter_x_to_warp1(127);
 }
 
-void sub_8081770(void)
+void ExitLinkRoom(void)
 {
     sub_8057F5C();
 }
@@ -896,7 +896,7 @@ static void CreateTask_StartWiredCableClubTrade(void)
     CreateTask(Task_StartWiredCableClubTrade, 80);
 }
 
-void Special_WiredCableClubTrade(void)
+void StartWiredCableClubTrade(void)
 {
     CreateTask_StartWiredCableClubTrade();
     ScriptContext1_Stop();
diff --git a/src/credits.c b/src/credits.c
index a53d72f31..63d4c9c85 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -714,7 +714,7 @@ static const struct CreditsTextHeader sCreditsTexts[] = {
     { gString_Dummy, gString_Dummy, FALSE }
 };
 
-void Special_Credits(void)
+void DoCredits(void)
 {
     sCreditsMgr = AllocZeroed(sizeof(*sCreditsMgr));
     ResetTasks();
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 14662b660..657d178d7 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -276,7 +276,7 @@ static u16 GetRandomWordFromAnyGroup(u16 groupId)
     return GetRandomWordFromGroup(groupId);
 }
 
-void Special_BufferEasyChatMessage(void)
+void ShowEasyChatMessage(void)
 {
     u16 *easyChatWords;
     int columns, rows;
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 4f9446942..327426231 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -21,6 +21,7 @@ void nullsub_60(void)
 {
 }
 
-void nullsub_61(void)
+// From Hoenn's SS Tidal
+void LookThroughPorthole(void)
 {
 }
diff --git a/src/field_specials.c b/src/field_specials.c
index f8f346318..f455ae561 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -76,12 +76,12 @@ static void Task_SuspendListMenu(u8 taskId);
 static void Task_RedrawScrollArrowsAndWaitInput(u8 taskId);
 static void Task_CreateMenuRemoveScrollIndicatorArrowPair(u8 taskId);
 static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId);
-static u16 GetStarterPokemon(u16 starterIdx);
+static u16 GetStarterSpeciesById(u16 starterIdx);
 static void ChangeBoxPokemonNickname_CB(void);
 static void ChangePokemonNickname_CB(void);
 static void Task_RunPokemonLeagueLightingEffect(u8 taskId);
 static void Task_CancelPokemonLeagueLightingEffect(u8 taskId);
-static void Task_DoDeoxysRockInteraction(u8 taskId);
+static void Task_DoDeoxysTriangleInteraction(u8 taskId);
 static void MoveDeoxysObject(u8 num);
 static void Task_WaitDeoxysFieldEffect(u8 taskId);
 static void Task_WingFlapSound(u8 taskId);
@@ -92,14 +92,14 @@ static u8 *const sStringVarPtrs[] = {
     gStringVar3
 };
 
-void Special_ShowDiploma(void)
+void ShowDiploma(void)
 {
     sub_8112364();
     SetMainCallback2(CB2_ShowDiploma);
     ScriptContext2_Enable();
 }
 
-void Special_ForcePlayerOntoBike(void)
+void ForcePlayerOntoBike(void)
 {
     if (gPlayerAvatar.flags & 1)
         SetPlayerAvatarTransitionFlags(2);
@@ -112,7 +112,7 @@ void nullsub_74(void)
 
 }
 
-u8 Special_GetPlayerAvatarBike(void)
+u8 GetPlayerAvatarBike(void)
 {
     if (TestPlayerAvatarFlags(4))
         return 1;
@@ -122,24 +122,24 @@ u8 Special_GetPlayerAvatarBike(void)
         return 0;
 }
 
-void Special_ShowStringVar4AsFieldMessage(void)
+void ShowFieldMessageStringVar4(void)
 {
     ShowFieldMessage(gStringVar4);
 }
 
-void Special_GetPlayerXY(void)
+void GetPlayerXY(void)
 {
     gSpecialVar_0x8004 = gSaveBlock1Ptr->pos.x;
     gSpecialVar_0x8005 = gSaveBlock1Ptr->pos.y;
 }
 
-u8 Special_GetPlayerTrainerIdOnesDigit(void)
+u8 GetPlayerTrainerIdOnesDigit(void)
 {
     u16 playerId = (gSaveBlock2Ptr->playerTrainerId[1] << 8) | gSaveBlock2Ptr->playerTrainerId[0];
     return playerId % 10;
 }
 
-void Special_BufferBigGuyOrBigGirlString(void)
+void BufferBigGuyOrBigGirlString(void)
 {
     if (gSaveBlock2Ptr->playerGender == MALE)
         StringCopy(gStringVar1, gText_BigGuy);
@@ -147,7 +147,7 @@ void Special_BufferBigGuyOrBigGirlString(void)
         StringCopy(gStringVar1, gText_BigGirl);
 }
 
-void Special_BufferSonOrDaughterString(void)
+void BufferSonOrDaughterString(void)
 {
     if (gSaveBlock2Ptr->playerGender == MALE)
         StringCopy(gStringVar1, gText_Son);
@@ -155,12 +155,12 @@ void Special_BufferSonOrDaughterString(void)
         StringCopy(gStringVar1, gText_Daughter);
 }
 
-u8 Special_GetBattleOutcome(void)
+u8 GetBattleOutcome(void)
 {
     return gBattleOutcome;
 }
 
-void Special_SetHiddenItemFlag(void)
+void SetHiddenItemFlag(void)
 {
     FlagSet(gSpecialVar_0x8004);
 }
@@ -184,13 +184,13 @@ u8 GetLeadMonFriendship(void)
         return 0;
 }
 
-void Special_TownMap(void)
+void ShowTownMap(void)
 {
     sub_8112364();
     sub_80BFF50(1, CB2_ReturnToFieldContinueScriptPlayMapMusic);
 }
 
-bool8 Special_PlayerHasGrassPokemonInParty(void)
+bool8 PlayerHasGrassPokemonInParty(void)
 {
     u8 i;
     struct Pokemon * pokemon;
@@ -211,7 +211,7 @@ bool8 Special_PlayerHasGrassPokemonInParty(void)
     return FALSE;
 }
 
-void Special_AnimatePcTurnOn(void)
+void AnimatePcTurnOn(void)
 {
     u8 taskId;
 
@@ -281,7 +281,7 @@ static void PcTurnOnUpdateMetatileId(bool16 a0)
     MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | 0xC00);
 }
 
-void Special_AnimatePcTurnOff()
+void AnimatePcTurnOff()
 {
     u16 metatileId = 0;
     s8 deltaX = 0;
@@ -381,7 +381,7 @@ static const u8 sSlotMachineIndices[] = {
     5
 };
 
-u8 Special_GetRandomSlotMachine(void)
+u8 GetRandomSlotMachineId(void)
 {
     u16 rval = Random() % NELEMS(sSlotMachineIndices);
     return sSlotMachineIndices[rval];
@@ -404,7 +404,7 @@ void GiveLeadMonEffortRibbon(void)
     SetMonData(&gPlayerParty[leadMonIdx], MON_DATA_EFFORT_RIBBON, &param);
 }
 
-bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
+bool8 AreLeadMonEVsMaxedOut(void)
 {
     u8 leadMonIndex = GetLeadMonIndex();
     if (GetMonEVCount(&gPlayerParty[leadMonIndex]) >= 510)
@@ -413,9 +413,9 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
         return FALSE;
 }
 
-bool8 Special_IsStarterFirstStageInParty(void)
+bool8 IsStarterFirstStageInParty(void)
 {
-    u16 species = GetStarterPokemon(VarGet(VAR_STARTER_MON));
+    u16 species = GetStarterSpeciesById(VarGet(VAR_STARTER_MON));
     u8 partyCount = CalculatePlayerPartyCount();
     u8 i;
     for (i = 0; i < partyCount; i++)
@@ -426,7 +426,7 @@ bool8 Special_IsStarterFirstStageInParty(void)
     return FALSE;
 }
 
-bool8 Special_IsThereRoomInAnyBoxForMorePokemon(void)
+bool8 IsThereRoomInAnyBoxForMorePokemon(void)
 {
     u16 i;
     u16 j;
@@ -441,7 +441,7 @@ bool8 Special_IsThereRoomInAnyBoxForMorePokemon(void)
     return FALSE;
 }
 
-bool8 Special_CheckPartyPokerus(void)
+bool8 IsPokerusInParty(void)
 {
     if (!CheckPartyPokerus(gPlayerParty, 0x3F))
         return FALSE;
@@ -455,7 +455,7 @@ bool8 Special_CheckPartyPokerus(void)
 #define tDuration data[3]
 #define tYtrans   data[4]
 
-void Special_ShakeScreen(void)
+void ShakeScreen(void)
 {
     /*
      * 0x8004 = x translation
@@ -518,12 +518,12 @@ u8 GetLeadMonIndex(void)
     return 0;
 }
 
-u16 Special_GetSpeciesOfPartySlot_x8004(void)
+u16 GetPartyMonSpecies(void)
 {
     return GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES2, NULL);
 }
 
-bool8 Special_IsMonOTNameNotPlayers(void)
+bool8 IsMonOTNameNotPlayers(void)
 {
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1);
     
@@ -546,7 +546,7 @@ void sub_80CADC4(void)
     sub_809D424();
 }
 
-void Special_SetVermilionTrashCans(void)
+void SetVermilionTrashCans(void)
 {
     u16 idx = (Random() % 15) + 1;
     gSpecialVar_0x8004 = idx;
@@ -713,7 +713,7 @@ static u16 SampleResortGorgeousReward(void)
         return sResortGorgeousDeluxeRewards[Random() % NELEMS(sResortGorgeousDeluxeRewards)];
 }
 
-bool8 Special_CheckAddCoins(void)
+bool8 CheckAddCoins(void)
 {
     if (gSpecialVar_Result + gSpecialVar_0x8006 > 9999)
         return FALSE;
@@ -805,7 +805,7 @@ static const u8 sElevatorWindowAnimDuration[] = {
     27
 };
 
-void Special_GetElevatorFloor(void)
+void GetElevatorFloor(void)
 {
     u16 floor = 4;
     if (gSaveBlock1Ptr->warp2.mapGroup == MAP_GROUP(ROCKET_HIDEOUT_B1F))
@@ -900,7 +900,7 @@ void Special_GetElevatorFloor(void)
     VarSet(VAR_ELEVATOR_FLOOR, floor);
 }
 
-u16 Special_InitElevatorFloorSelectMenuPos(void)
+u16 InitElevatorFloorSelectMenuPos(void)
 {
     sElevatorScroll = 0;
     sElevatorCursorPos = 0;
@@ -1018,7 +1018,7 @@ u16 Special_InitElevatorFloorSelectMenuPos(void)
     return sElevatorCursorPos;
 }
 
-void Special_AnimateElevator(void)
+void AnimateElevator(void)
 {
     u16 nfloors;
     s16 *data = gTasks[CreateTask(Task_ElevatorShake, 9)].data;
@@ -1063,7 +1063,7 @@ static void Task_ElevatorShake(u8 taskId)
     }
 }
 
-void Special_DrawElevatorCurrentFloorWindow(void)
+void DrawElevatorCurrentFloorWindow(void)
 {
     const u8 *floorname;
     u32 strwidth;
@@ -1081,7 +1081,7 @@ void Special_DrawElevatorCurrentFloorWindow(void)
     }
 }
 
-void Special_CloseElevatorCurrentFloorWindow(void)
+void CloseElevatorCurrentFloorWindow(void)
 {
     ClearStdWindowAndFrameToTransparent(sElevatorCurrentFloorWindowId, TRUE);
     RemoveWindow(sElevatorCurrentFloorWindowId);
@@ -1484,31 +1484,31 @@ static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId)
         RemoveScrollIndicatorArrowPair(task->data[12]);
 }
 
-void Special_ForcePlayerToStartSurfing(void)
+void ForcePlayerToStartSurfing(void)
 {
     HelpSystem_SetSomeVariable2(22);
     SetPlayerAvatarTransitionFlags(8);
 }
 
-static const u16 sStarterMon[] = {
+static const u16 sStarterSpecies[] = {
     SPECIES_BULBASAUR,
     SPECIES_SQUIRTLE,
     SPECIES_CHARMANDER
 };
 
-static u16 GetStarterPokemon(u16 idx)
+static u16 GetStarterSpeciesById(u16 idx)
 {
-    if (idx >= NELEMS(sStarterMon))
+    if (idx >= NELEMS(sStarterSpecies))
         idx = 0;
-    return sStarterMon[idx];
+    return sStarterSpecies[idx];
 }
 
-u16 ScrSpecial_GetStarter(void)
+u16 GetStarterSpecies(void)
 {
-    return GetStarterPokemon(VarGet(VAR_STARTER_MON));
+    return GetStarterSpeciesById(VarGet(VAR_STARTER_MON));
 }
 
-void Special_SetSeenMon(void)
+void SetSeenMon(void)
 {
     GetSetPokedexFlag(SpeciesToNationalPokedexNum(gSpecialVar_0x8004), 2);
 }
@@ -1549,7 +1549,7 @@ static bool8 HasMonBeenRenamed(u8 idx)
         return FALSE;
 }
 
-bool8 Special_HasLeadMonBeenRenamed(void)
+bool8 HasLeadMonBeenRenamed(void)
 {
     return HasMonBeenRenamed(GetLeadMonIndex());
 }
@@ -1634,13 +1634,13 @@ static void ChangePokemonNickname_CB(void)
     CB2_ReturnToFieldContinueScriptPlayMapMusic();
 }
 
-void Special_GetMonNickname(void)
+void BufferMonNickname(void)
 {
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
     StringGetEnd10(gStringVar1);
 }
 
-void Special_IsMonOTIDNotPlayers(void)
+void IsMonOTIDNotPlayers(void)
 {
     if (GetPlayerTrainerId() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL))
         gSpecialVar_Result = FALSE;
@@ -1673,7 +1673,7 @@ u8 GetUnlockedSeviiAreas(void)
     return result;
 }
 
-void Special_UpdateTrainerCardPhotoIcons(void)
+void UpdateTrainerCardPhotoIcons(void)
 {
     u16 species[PARTY_SIZE];
     u32 personality[PARTY_SIZE];
@@ -1730,7 +1730,7 @@ u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr)
         return 1;
 }
 
-bool8 Special_PlayerPartyContainsSpecies(void)
+bool8 DoesPlayerPartyContainSpecies(void)
 {
     u8 partyCount = CalculatePlayerPartyCount();
     u8 i;
@@ -1757,7 +1757,7 @@ static const u8 sMartMaps[][3] = {
     {MAP_GROUP(SIX_ISLAND_MART),      MAP_NUM(SIX_ISLAND_MART),      1}
 };
 
-u8 Special_GetMartClerkObjectId(void)
+u8 GetMartClerkObjectId(void)
 {
     u8 i;
     for (i = 0; i < NELEMS(sMartMaps); i++)
@@ -2017,7 +2017,7 @@ bool8 sub_80CC87C(void)
     return FALSE;
 }
 
-bool8 Special_ItemIsTM_GetMoveName(void)
+bool8 BufferTMHMMoveName(void)
 {
     // 8004 = item ID
     if (gSpecialVar_0x8004 >= ITEM_TM01 && gSpecialVar_0x8004 <= ITEM_HM08)
@@ -2036,7 +2036,7 @@ void RunMassageCooldownStepCounter(void)
         VarSet(VAR_MASSAGE_COOLDOWN_STEP_COUNTER, count + 1);
 }
 
-void Special_DaisyMassageServices(void)
+void DaisyMassageServices(void)
 {
     AdjustFriendship(&gPlayerParty[gSpecialVar_0x8004], 6);
     VarSet(VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 0);
@@ -2094,7 +2094,7 @@ static const u8 sChampionRoomLightingTimers[] = {
      8
 };
 
-void Special_PokemonLeagueLightingEffect(void)
+void DoPokemonLeagueLightingEffect(void)
 {
     u8 taskId = CreateTask(Task_RunPokemonLeagueLightingEffect, 8);
     s16 *data = gTasks[taskId].data;
@@ -2184,36 +2184,36 @@ static const u8 sCapeBrinkCompatibleSpecies[] = {
     SPECIES_BLASTOISE
 };
 
-bool8 Special_CapeBrinkGetMoveToTeachLeadPokemon(void)
+bool8 CapeBrinkGetMoveToTeachLeadPokemon(void)
 {
     // Returns:
     //   8005 = Move tutor index
     //   8006 = Num moves known by lead mon
     //   8007 = Index of lead mon
     //   to specialvar = whether a move can be taught in the first place
-    u8 r7 = 0;
-    u8 r6 = 0;
-    u8 r8 = GetLeadMonIndex();
-    u8 r4;
-    gSpecialVar_0x8007 = r8;
-    for (r4 = 0; r4 < NELEMS(sCapeBrinkCompatibleSpecies); r4++)
-    {
-        if (GetMonData(&gPlayerParty[r8], MON_DATA_SPECIES2, NULL) == sCapeBrinkCompatibleSpecies[r4])
+    u8 tutorMonId = 0;
+    u8 numMovesKnown = 0;
+    u8 leadMonSlot = GetLeadMonIndex();
+    u8 i;
+    gSpecialVar_0x8007 = leadMonSlot;
+    for (i = 0; i < NELEMS(sCapeBrinkCompatibleSpecies); i++)
+    {
+        if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_SPECIES2, NULL) == sCapeBrinkCompatibleSpecies[i])
         {
-            r7 = r4;
+            tutorMonId = i;
             break;
         }
     }
-    if (r4 == NELEMS(sCapeBrinkCompatibleSpecies) || GetMonData(&gPlayerParty[r8], MON_DATA_FRIENDSHIP) != 255)
+    if (i == NELEMS(sCapeBrinkCompatibleSpecies) || GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_FRIENDSHIP) != 255)
         return FALSE;
-    if (r7 == 0)
+    if (tutorMonId == 0)
     {
         StringCopy(gStringVar2, gMoveNames[MOVE_FRENZY_PLANT]);
         gSpecialVar_0x8005 = MOVETUTOR_FRENZY_PLANT;
         if (FlagGet(FLAG_TUTOR_FRENZY_PLANT) == TRUE)
             return FALSE;
     }
-    else if (r7 == 1)
+    else if (tutorMonId == 1)
     {
         StringCopy(gStringVar2, gMoveNames[MOVE_BLAST_BURN]);
         gSpecialVar_0x8005 = MOVETUTOR_BLAST_BURN;
@@ -2227,21 +2227,21 @@ bool8 Special_CapeBrinkGetMoveToTeachLeadPokemon(void)
         if (FlagGet(FLAG_TUTOR_HYDRO_CANNON) == TRUE)
             return FALSE;
     }
-    if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE1) != MOVE_NONE)
-        r6++;
-    if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE2) != MOVE_NONE)
-        r6++;
-    if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE3) != MOVE_NONE)
-        r6++;
-    if (GetMonData(&gPlayerParty[r8], MON_DATA_MOVE4) != MOVE_NONE)
-        r6++;
-    gSpecialVar_0x8006 = r6;
+    if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE1) != MOVE_NONE)
+        numMovesKnown++;
+    if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE2) != MOVE_NONE)
+        numMovesKnown++;
+    if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE3) != MOVE_NONE)
+        numMovesKnown++;
+    if (GetMonData(&gPlayerParty[leadMonSlot], MON_DATA_MOVE4) != MOVE_NONE)
+        numMovesKnown++;
+    gSpecialVar_0x8006 = numMovesKnown;
     return TRUE;
 }
 
-bool8 Special_HasLearnedAllMovesFromCapeBrinkTutor(void)
+bool8 HasLearnedAllMovesFromCapeBrinkTutor(void)
 {
-    // 8005 is set by Special_CapeBrinkGetMoveToTeachLeadPokemon
+    // 8005 is set by CapeBrinkGetMoveToTeachLeadPokemon
     u8 r4 = 0;
     if (gSpecialVar_0x8005 == MOVETUTOR_FRENZY_PLANT)
         FlagSet(FLAG_TUTOR_FRENZY_PLANT);
@@ -2325,12 +2325,12 @@ static const u8 sDeoxysStepCaps[] = {
     3
 };
 
-void DoDeoxysRockInteraction(void)
+void DoDeoxysTriangleInteraction(void)
 {
-    CreateTask(Task_DoDeoxysRockInteraction, 8);
+    CreateTask(Task_DoDeoxysTriangleInteraction, 8);
 }
 
-static void Task_DoDeoxysRockInteraction(u8 taskId)
+static void Task_DoDeoxysTriangleInteraction(u8 taskId)
 {
     u16 r5;
     u16 r6;
@@ -2416,14 +2416,14 @@ void BirthIslandDeoxysStepCounter(void)
     }
 }
 
-void Special_SetDeoxysTriangleObjectPal(void)
+void SetDeoxysTrianglePalette(void)
 {
     u8 num = VarGet(VAR_DEOXYS_INTERACTION_NUM);
     LoadPalette(sDeoxysObjectPals[num], 0x1A0, 0x08);
     sub_8083598(10);
 }
 
-bool8 Special_BadEggInParty(void)
+bool8 IsBadEggInParty(void)
 {
     u8 partyCount = CalculatePlayerPartyCount();
     u8 i;
@@ -2435,7 +2435,7 @@ bool8 Special_BadEggInParty(void)
     return FALSE;
 }
 
-bool8 Special_PlayerIsNotInTrainerTowerLobby(void)
+bool8 IsPlayerNotInTrainerTowerLobby(void)
 {
     if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRAINER_TOWER_LOBBY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRAINER_TOWER_LOBBY))
         return FALSE;
@@ -2443,7 +2443,7 @@ bool8 Special_PlayerIsNotInTrainerTowerLobby(void)
         return TRUE;
 }
 
-void Special_BrailleCursorToggle(void)
+void BrailleCursorToggle(void)
 {
     // 8004 = x - 27
     // 8005 = y
@@ -2477,7 +2477,7 @@ bool8 PlayerPartyContainsSpeciesWithPlayerID(void)
  * Determines which of Lorelei's doll collection to show
  * based on how many times you've entered the Hall of Fame.
  */
-void Special_ComputeLoreleiDollCollection(void)
+void UpdateLoreleiDollCollection(void)
 {
     u32 numHofClears = GetGameStat(GAME_STAT_ENTERED_HOF);
     if (numHofClears >= 25)
@@ -2500,7 +2500,7 @@ void Special_ComputeLoreleiDollCollection(void)
     }
 }
 
-void Special_LoopWingFlapSound(void)
+void LoopWingFlapSound(void)
 {
     // 8004 = Num flaps
     // 8005 = Frame delay between flaps
diff --git a/src/field_tasks.c b/src/field_tasks.c
index cd72e111a..1c7288240 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -137,7 +137,7 @@ static void MarkIcefallCaveCoordVisited(s16 x, s16 y)
     }
 }
 
-void Special_SetIcefallCaveCrackedIceMetatiles(void)
+void SetIcefallCaveCrackedIceMetatiles(void)
 {
     u8 i = 0;
     for (; i < NELEMS(sIcefallCaveIceTileCoords); ++i)
diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c
index 90ca36508..3826e1d33 100644
--- a/src/fldeff_berrytree.c
+++ b/src/fldeff_berrytree.c
@@ -1,4 +1,4 @@
-void nullsub_56(void)
+// From R/S, removed
+void DoWateringBerryTreeAnim(void)
 {
-	
 }
diff --git a/src/party_menu_specials.c b/src/party_menu_specials.c
index 242422f7b..aba11a534 100644
--- a/src/party_menu_specials.c
+++ b/src/party_menu_specials.c
@@ -13,7 +13,7 @@
 
 static void sub_80BF97C(u8 taskId);
 
-void Special_ChooseMonFromParty(void)
+void ChoosePartyMon(void)
 {
     u8 taskId;
 
@@ -23,7 +23,7 @@ void Special_ChooseMonFromParty(void)
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
 }
 
-void Special_SelectMoveTutorMon(void)
+void SelectMoveTutorMon(void)
 {
     u8 taskId;
 
@@ -43,14 +43,14 @@ static void sub_80BF97C(u8 taskId)
     }
 }
 
-void Special_SelectMove(void)
+void SelectMoveDeleterMove(void)
 {
     ShowSelectMovePokemonSummaryScreen(gPlayerParty, gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField, 0);
     sub_8138B38(3);
     gFieldCallback = FieldCallback_ReturnToEventScript2;
 }
 
-void Special_GetNumMovesSelectedMonHas(void)
+void GetNumMovesSelectedMonHas(void)
 {
     u8 i;
 
@@ -60,7 +60,7 @@ void Special_GetNumMovesSelectedMonHas(void)
             ++gSpecialVar_Result;
 }
 
-void Special_BufferMoveDeleterNicknameAndMove(void)
+void BufferMoveDeleterNicknameAndMove(void)
 {
     struct Pokemon *mon = &gPlayerParty[gSpecialVar_0x8004];
     u16 move = GetMonData(mon, MON_DATA_MOVE1 + gSpecialVar_0x8005);
@@ -91,7 +91,7 @@ static void ShiftMoveSlot(struct Pokemon *mon, u8 slotTo, u8 slotFrom)
     SetMonData(mon, MON_DATA_PP_BONUSES, &ppBonuses);
 }
 
-void Special_MoveDeleterForgetMove(void)
+void MoveDeleterForgetMove(void)
 {
     u16 i;
 
@@ -101,7 +101,7 @@ void Special_MoveDeleterForgetMove(void)
         ShiftMoveSlot(&gPlayerParty[gSpecialVar_0x8004], i, i + 1);
 }
 
-void Special_IsSelectedMonEgg(void)
+void IsSelectedMonEgg(void)
 {
     if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_IS_EGG))
         gSpecialVar_Result = TRUE;
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 72d4266c8..b564e74ce 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -8,7 +8,7 @@
 #include "constants/flags.h"
 #include "constants/spawn_points.h"
 
-bool8 Special_HallOfFame(void)
+bool8 EnterHallOfFame(void)
 {
     bool8 ribbonState;
     bool8 *r7;
@@ -52,7 +52,7 @@ bool8 Special_HallOfFame(void)
     return FALSE;
 }
 
-bool8 SetCB2Whiteout(void)
+bool8 SetCB2WhiteOut(void)
 {
     SetMainCallback2(CB2_WhiteOut);
     return FALSE;
diff --git a/src/prof_pc.c b/src/prof_pc.c
index ce81d9ce8..c7eed8878 100644
--- a/src/prof_pc.c
+++ b/src/prof_pc.c
@@ -21,7 +21,7 @@ extern const u8 PokedexRating_Text_LessThan140[];
 extern const u8 PokedexRating_Text_LessThan150[];
 extern const u8 PokedexRating_Text_Complete[];
 
-u16 Special_GetPokedexCount(void)
+u16 GetPokedexCount(void)
 {
     if (gSpecialVar_0x8004 == 0)
     {
@@ -104,7 +104,7 @@ static const u8 *GetProfOaksRatingMessageByCount(u16 count)
     return PokedexRating_Text_LessThan10;
 }
 
-void Special_GetProfOaksRatingMessage(void)
+void GetProfOaksRatingMessage(void)
 {
     ShowFieldMessage(GetProfOaksRatingMessageByCount(gSpecialVar_0x8004));
 }
diff --git a/src/quest_log.c b/src/quest_log.c
index c9a930032..590575714 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -526,7 +526,7 @@ static void sub_8110A3C(void)
     }
 }
 
-void Special_GetQuestLogState(void)
+void GetQuestLogState(void)
 {
     gSpecialVar_Result = gQuestLogState;
 }
diff --git a/src/roamer.c b/src/roamer.c
index cf30dc3d2..25b5109b0 100644
--- a/src/roamer.c
+++ b/src/roamer.c
@@ -61,7 +61,7 @@ void ClearRoamerData(void)
 
 #define GetRoamerSpecies() ({\
     u16 a;\
-    switch (ScrSpecial_GetStarter())\
+    switch (GetStarterSpecies())\
     {\
     default:\
         a = SPECIES_RAIKOU;\
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 77b87aaa8..76b020fbc 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1892,7 +1892,7 @@ bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
 
 bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx)
 {
-    BattleSetup_StartTrainerBattle();
+    StartTrainerBattle();
     return TRUE;
 }
 
@@ -1944,7 +1944,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
 
 bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
 {
-    BattleSetup_StartScriptedWildBattle();
+    StartScriptedWildBattle();
     ScriptContext1_Stop();
     return TRUE;
 }
diff --git a/src/script_menu.c b/src/script_menu.c
index 12e89832c..1fd9a2990 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1116,7 +1116,7 @@ void Task_WaitMuseumFossilPic(u8 taskId)
     }
 }
 
-bool8 Special_OpenMuseumFossilPic(void)
+bool8 OpenMuseumFossilPic(void)
 {
     u8 spriteId;
     u8 taskId;
@@ -1149,7 +1149,7 @@ bool8 Special_OpenMuseumFossilPic(void)
     return TRUE;
 }
 
-bool8 Special_CloseMuseumFossilPic(void)
+bool8 CloseMuseumFossilPic(void)
 {
     u8 taskId = FindTaskIdByFunc(Task_WaitMuseumFossilPic);
     if (taskId == 0xFF)
@@ -1197,7 +1197,7 @@ void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void)
     }
 }
 
-void Special_DrawSeagallopDestinationMenu(void)
+void DrawSeagallopDestinationMenu(void)
 {
     // 8004 = Starting location
     // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit)
@@ -1249,7 +1249,7 @@ void Special_DrawSeagallopDestinationMenu(void)
     }
 }
 
-u16 Special_GetSelectedSeagallopDestination(void)
+u16 GetSelectedSeagallopDestination(void)
 {
     // 8004 = Starting location
     // 8005 = Page (0: Verm, One, Two, Three, Four, Other, Exit; 1: Four, Five, Six, Seven, Other, Exit)
diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c
index 7c8604b8e..677759497 100644
--- a/src/script_pokemon_util.c
+++ b/src/script_pokemon_util.c
@@ -117,7 +117,7 @@ static bool8 CheckPartyMonHasHeldItem(u16 item)
     return FALSE;
 }
 
-bool8 GetNameOfEnigmaBerryInPlayerParty(void)
+bool8 DoesPartyHaveEnigmaBerry(void)
 {
     bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY);
     if (hasItem == TRUE)
diff --git a/src/ss_anne.c b/src/ss_anne.c
index 401f4e235..df04d8c66 100644
--- a/src/ss_anne.c
+++ b/src/ss_anne.c
@@ -79,7 +79,7 @@ static const struct SpriteTemplate sSmokeSpriteTemplate = {
     SmokeSpriteCallback
 };
 
-void Special_SSAnneDepartureCutscene(void)
+void DoSSAnneDepartureCutscene(void)
 {
     u8 taskId;
 
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index b3605db47..cf495db56 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -387,7 +387,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
                     return FALSE;
                 }
 
-                BattleSetup_StartRoamerBattle();
+                StartRoamerBattle();
                 return TRUE;
             }
             else
@@ -396,7 +396,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
                 // try a regular wild land encounter
                 if (TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_REPEL) == TRUE)
                 {
-                    BattleSetup_StartWildBattle();
+                    StartWildBattle();
                     return TRUE;
                 }
                 else
@@ -426,14 +426,14 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
                     return FALSE;
                 }
 
-                BattleSetup_StartRoamerBattle();
+                StartRoamerBattle();
                 return TRUE;
             }
             else // try a regular surfing encounter
             {
                 if (TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, WILD_AREA_WATER, WILD_CHECK_REPEL) == TRUE)
                 {
-                    BattleSetup_StartWildBattle();
+                    StartWildBattle();
                     return TRUE;
                 }
                 else
@@ -447,7 +447,7 @@ bool8 StandardWildEncounter(u32 currMetatileBehavior, u16 previousMetatileBehavi
     return FALSE;
 }
 
-void ScrSpecial_RockSmashWildEncounter(void)
+void RockSmashWildEncounter(void)
 {
     u16 headerIdx = GetCurrentMapWildMonHeaderId();
     if (headerIdx == 0xFFFF)
@@ -458,7 +458,7 @@ void ScrSpecial_RockSmashWildEncounter(void)
         gSpecialVar_Result = FALSE;
     else if (TryGenerateWildMon(gWildMonHeaders[headerIdx].rockSmashMonsInfo, WILD_AREA_ROCKS, WILD_CHECK_REPEL) == TRUE)
     {
-        BattleSetup_StartWildBattle();
+        StartWildBattle();
         gSpecialVar_Result = TRUE;
     }
     else
@@ -478,7 +478,7 @@ bool8 SweetScentWildEncounter(void)
         {
             if (TryStartRoamerEncounter() == TRUE)
             {
-                BattleSetup_StartRoamerBattle();
+                StartRoamerBattle();
                 return TRUE;
             }
 
@@ -487,14 +487,14 @@ bool8 SweetScentWildEncounter(void)
 
             TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0);
 
-            BattleSetup_StartWildBattle();
+            StartWildBattle();
             return TRUE;
         }
         else if (MapGridGetMetatileAttributeAt(x, y, 4) == 2)
         {
             if (TryStartRoamerEncounter() == TRUE)
             {
-                BattleSetup_StartRoamerBattle();
+                StartRoamerBattle();
                 return TRUE;
             }
 
@@ -502,7 +502,7 @@ bool8 SweetScentWildEncounter(void)
                 return FALSE;
 
             TryGenerateWildMon(gWildMonHeaders[headerId].waterMonsInfo, WILD_AREA_WATER, 0);
-            BattleSetup_StartWildBattle();
+            StartWildBattle();
             return TRUE;
         }
     }
@@ -524,7 +524,7 @@ void FishingWildEncounter(u8 rod)
 {
     GenerateFishingEncounter(gWildMonHeaders[GetCurrentMapWildMonHeaderId()].fishingMonsInfo, rod);
     IncrementGameStat(GAME_STAT_FISHING_CAPTURES);
-    BattleSetup_StartWildBattle();
+    StartWildBattle();
 }
 
 u16 GetLocalWildMon(bool8 *isWaterMon)
diff --git a/src/wild_pokemon_area.c b/src/wild_pokemon_area.c
index 3c5afaf25..28c07abc7 100644
--- a/src/wild_pokemon_area.c
+++ b/src/wild_pokemon_area.c
@@ -244,7 +244,7 @@ static s32 CountRoamerNests(u16 species, struct Subsprite * subsprites)
     roamerIdx = GetRoamerIndex(species);
     if (roamerIdx < 0)
         return 0;
-    if (sRoamerPairs[roamerIdx].starter != ScrSpecial_GetStarter())
+    if (sRoamerPairs[roamerIdx].starter != GetStarterSpecies())
         return 0;
     roamerLocation = GetRoamerLocationMapSectionId();
     dexAreaEntryLUTidx = 0;
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c
index 7267d4ace..a284a6d16 100644
--- a/src/wireless_communication_status_screen.c
+++ b/src/wireless_communication_status_screen.c
@@ -171,7 +171,7 @@ static void VBlankCB_WirelessCommunicationScreen(void)
     TransferPlttBuffer();
 }
 
-void Special_WirelessCommunicationScreen(void)
+void ShowWirelessCommunicationScreen(void)
 {
     SetMainCallback2(CB2_InitWirelessCommunicationScreen);
 }