Combine special prefixes, drop more

9 files changed, 19 insertions, 19 deletions

diff --git a/src/battle_setup.c b/src/battle_setup.c
index faf63cd4c..82a73990b 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -848,7 +848,7 @@ u16 GetRivalBattleFlags(void)
     return sRivalBattleFlags;
 }
 
-u16 ScrSpecial_HasTrainerBeenFought(void)
+u16 Script_HasTrainerBeenFought(void)
 {
     return FlagGet(GetTrainerAFlag());
 }
diff --git a/src/battle_tower.c b/src/battle_tower.c
index ca434fad3..818c909aa 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -177,7 +177,7 @@ static const u16 sLongStreakPrizes[] = {
     ITEM_CHOICE_BAND
 };
 
-void ScrSpecial_BattleTowerMapScript2(void)
+void BattleTowerMapScript2(void)
 {
     u8 count = 0;
     s32 levelType;
diff --git a/src/berry_powder.c b/src/berry_powder.c
index 2eff23802..3ebffed48 100644
--- a/src/berry_powder.c
+++ b/src/berry_powder.c
@@ -36,7 +36,7 @@ static bool8 HasEnoughBerryPowder(u32 cost)
         return TRUE;
 }
 
-bool8 Special_HasEnoughBerryPowder(void)
+bool8 Script_HasEnoughBerryPowder(void)
 {
     if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < gSpecialVar_0x8004)
         return FALSE;
@@ -73,7 +73,7 @@ static bool8 TakeBerryPowder(u32 cost)
     }
 }
 
-bool8 Special_TakeBerryPowder(void)
+bool8 Script_TakeBerryPowder(void)
 {
     u32 *powder = &gSaveBlock2Ptr->berryCrush.berryPowderAmount;
     if (!HasEnoughBerryPowder(gSpecialVar_0x8004))
diff --git a/src/field_specials.c b/src/field_specials.c
index 94170b133..6d01bbee6 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1168,7 +1168,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
     data[1]++;
 }
 
-void Special_ListMenu(void)
+void ListMenu(void)
 {
     u8 taskId;
     struct Task * task;
@@ -1472,7 +1472,7 @@ static void Task_SuspendListMenu(u8 taskId)
     }
 }
 
-void Special_ReturnToListMenu(void)
+void ReturnToListMenu(void)
 {
     u8 taskId = FindTaskIdByFunc(Task_SuspendListMenu);
     if (taskId == 0xFF)
@@ -1948,7 +1948,7 @@ void sub_80CC59C(void)
     }
 }
 
-u16 Special_BattleCardAction(void)
+u16 BattleCardAction(void)
 {
     switch (gSpecialVar_Result)
     {
diff --git a/src/hof_pc.c b/src/hof_pc.c
index 353c067c2..173625774 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -39,7 +39,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void)
 {
     ScriptContext2_Enable();
     Overworld_PlaySpecialMapMusic();
-    ScrSpecial_CreatePCMenu();
+    CreatePCMenu();
     ScriptMenu_DisplayPCStartupPrompt();
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
     CreateTask(Task_WaitForPaletteFade, 10);
diff --git a/src/menews_jisan.c b/src/menews_jisan.c
index d8971f6a2..f3b8fca78 100644
--- a/src/menews_jisan.c
+++ b/src/menews_jisan.c
@@ -54,7 +54,7 @@ void MENewsJisanStepCounter(void)
     }
 }
 
-u16 Special_GetMENewsJisanItemAndState(void)
+u16 GetMENewsJisanItemAndState(void)
 {
     u16 *r6 = &gSpecialVar_Result;
     struct MENewsJisanStruct *r4 = GetMENewsJisanStructPtr();
diff --git a/src/quest_log.c b/src/quest_log.c
index 590575714..caac29f5a 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -2151,7 +2151,7 @@ void ResetTrainerFanClub(void)
     VarSet(VAR_FANCLUB_LOSE_FAN_TIMER, 0);
 }
 
-void Special_TryLoseFansFromPlayTimeAfterLinkBattle(void)
+void Script_TryLoseFansFromPlayTimeAfterLinkBattle(void)
 {
     TryLoseFansFromPlayTimeAfterLinkBattle(TRAINER_FAN_CLUB);
 }
@@ -2165,7 +2165,7 @@ static void TryLoseFansFromPlayTimeAfterLinkBattle(struct TrainerFanClub *fanClu
     }
 }
 
-void Special_UpdateTrainerFanClubGameClear(void)
+void Script_UpdateTrainerFanClubGameClear(void)
 {
     UpdateTrainerFanClubGameClear(TRAINER_FAN_CLUB);
 }
@@ -2282,7 +2282,7 @@ static u8 PlayerLoseRandomTrainerFan(struct TrainerFanClub *fanClub)
     return sFanClubMemberIds[idx];
 }
 
-u16 Special_GetNumFansOfPlayerInTrainerFanClub(void)
+u16 Script_GetNumFansOfPlayerInTrainerFanClub(void)
 {
     return GetNumFansOfPlayerInTrainerFanClub(TRAINER_FAN_CLUB);
 }
@@ -2301,7 +2301,7 @@ static u16 GetNumFansOfPlayerInTrainerFanClub(struct TrainerFanClub *fanClub)
     return count;
 }
 
-void Special_TryLoseFansFromPlayTime(void)
+void Script_TryLoseFansFromPlayTime(void)
 {
     TryLoseFansFromPlayTime(TRAINER_FAN_CLUB);
 }
@@ -2335,7 +2335,7 @@ static void TryLoseFansFromPlayTime(struct TrainerFanClub *fanClub)
     }
 }
 
-bool16 Special_IsFanClubMemberFanOfPlayer(void)
+bool16 Script_IsFanClubMemberFanOfPlayer(void)
 {
     return IsFanClubMemberFanOfPlayer(TRAINER_FAN_CLUB);
 }
@@ -2352,7 +2352,7 @@ static void SetInitialFansOfPlayer(struct TrainerFanClub *fanClub)
     SET_TRAINER_FAN_CLUB_FLAG(FANCLUB_MEMBER3);
 }
 
-void Special_BufferFanClubTrainerName(void)
+void Script_BufferFanClubTrainerName(void)
 {
     u8 whichLinkTrainer = 0;
     u8 whichNPCTrainer = 0;
@@ -2446,7 +2446,7 @@ static bool8 DidPlayerGetFirstFans(struct TrainerFanClub *fanClub)
     return fanClub->gotInitialFans;
 }
 
-void Special_SetPlayerGotFirstFans(void)
+void Script_SetPlayerGotFirstFans(void)
 {
     SetPlayerGotFirstFans(TRAINER_FAN_CLUB);
 }
@@ -2456,7 +2456,7 @@ static void SetPlayerGotFirstFans(struct TrainerFanClub *fanClub)
     fanClub->gotInitialFans = TRUE;
 }
 
-u8 Special_TryGainNewFanFromCounter(void)
+u8 Script_TryGainNewFanFromCounter(void)
 {
     return TryGainNewFanFromCounter(TRAINER_FAN_CLUB, gSpecialVar_0x8004);
 }
diff --git a/src/script_menu.c b/src/script_menu.c
index 1fd9a2990..a4745ee10 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -944,7 +944,7 @@ static void Hask_MultichoiceGridMenu_HandleInput(u8 taskId)
     EnableBothScriptContexts();
 }
 
-bool8 ScrSpecial_CreatePCMenu(void)
+bool8 CreatePCMenu(void)
 {
     if (FuncIsActiveTask(Task_MultichoiceMenu_HandleInput) == TRUE)
         return FALSE;
diff --git a/src/seagallop.c b/src/seagallop.c
index 3257819aa..1e2234b9c 100644
--- a/src/seagallop.c
+++ b/src/seagallop.c
@@ -16,7 +16,7 @@
 #include "field_weather.h"
 #include "constants/songs.h"
 #include "constants/maps.h"
-#include "seagallop.h"
+#include "constants/seagallop.h"
 
 #define TILESTAG_FERRY 3000
 #define TILESTAG_WAKE  4000