3 files changed, 12 insertions, 13 deletions
diff --git a/include/battle_setup.h b/include/battle_setup.h
index e85ee2faf..9074c94f9 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -3,15 +3,15 @@
 
 #include "global.h"
 
-void BattleSetup_StartWildBattle(void);
-void BattleSetup_StartRoamerBattle(void);
-void ScrSpecial_StartOldManTutorialBattle(void);
-void BattleSetup_StartScriptedWildBattle(void);
-void ScrSpecial_StartMarowakBattle(void);
-void ScrSpecial_StartSouthernIslandBattle(void);
-void Special_StartLegendaryBattle(void);
-void Special_StartGroudonKyogreBattle(void);
-void Special_StartRegiBattle(void);
+void StartWildBattle(void);
+void StartRoamerBattle(void);
+void StartOldManTutorialBattle(void);
+void StartScriptedWildBattle(void);
+void StartMarowakBattle(void);
+void StartSouthernIslandBattle(void);
+void StartLegendaryBattle(void);
+void StartGroudonKyogreBattle(void);
+void StartRegiBattle(void);
 u8 BattleSetup_GetTerrainId(void);
 u8 BattleSetup_GetBattleTowerBattleTransition(void);
 const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
@@ -24,8 +24,8 @@ void SetBattledTrainerFlag(void);
 bool8 HasTrainerBeenFought(u16 trainerId);
 void SetTrainerFlag(u16 trainerId);
 void ClearTrainerFlag(u16 trainerId);
-void BattleSetup_StartTrainerBattle(void);
-void BattleSetup_StartRematchBattle(void);
+void StartTrainerBattle(void);
+void StartRematchBattle(void);
 void ShowTrainerIntroSpeech(void);
 const u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 const u8 *BattleSetup_GetTrainerPostBattleScript(void);
diff --git a/include/field_specials.h b/include/field_specials.h
index 9653a9169..811bfef93 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -14,7 +14,7 @@ enum HiddenItemAttr
 u8 GetLeadMonIndex(void);
 s32 CountDigits(s32 number);
 void TV_PrintIntToStringVar(u8, int);
-u16 ScrSpecial_GetStarter(void);
+u16 GetStarterSpecies(void);
 void StopPokemonLeagueLightingEffectTask(void);
 void nullsub_60(void);
 void nullsub_61(void);
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index d0420438a..5d57ddd12 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -35,7 +35,6 @@ extern const struct WildPokemonHeader gWildMonHeaders[];
 
 void DisableWildEncounters(bool8 disabled);
 bool8 StandardWildEncounter(u32 currMetaTileBehavior, u16 previousMetaTileBehavior);
-void ScrSpecial_RockSmashWildEncounter(void);
 bool8 SweetScentWildEncounter(void);
 bool8 DoesCurrentMapHaveFishingMons(void);
 void FishingWildEncounter(u8 rod);