revert some symbol documentation (I hate this)

14 files changed, 50 insertions, 50 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index dbb81864b..66ae76910 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -876,7 +876,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
 	goto EventScript_1A4FC7
 
 EventScript_1A4F19:: @ 81A4F19
-	special ShowTrainerCantBattleSpeech
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waitmessage
 	waitbuttonpress
 	release
@@ -902,13 +902,13 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
 	goto_if eq, EventScript_1A4F72
 	special SetUpTrainerEncounterMusic
 	special SetUpTrainerMovement
-	special ShowTrainerIntroSpeech
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
 	waitbuttonpress
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A4FB8
-	special BattleSetup_StartRematchBattle
+	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
@@ -925,13 +925,13 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
 	goto_if ne, EventScript_1A4FB1
 	special SetUpTrainerEncounterMusic
 	special SetUpTrainerMovement
-	special ShowTrainerIntroSpeech
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
 	waitbuttonpress
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A4FB8
-	special BattleSetup_StartRematchBattle
+	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
 	releaseall
 	end
@@ -940,7 +940,7 @@ EventScript_1A4FB0:: @ 81A4FB0
 	ontrainerbattleend
 
 EventScript_1A4FB1:: @ 81A4FB1
-	special ShowTrainerCantBattleSpeech
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
 	waitmessage
 	waitbuttonpress
 	release
@@ -960,14 +960,14 @@ Movement_1A4FC5:: @ 81A4FC5
 	step_end
 
 EventScript_1A4FC7:: @ 81A4FC7
-	special ShowTrainerIntroSpeech
+	special ScrSpecial_ShowTrainerIntroSpeech
 	waitmessage
 	waitbuttonpress
 	special sub_8110AB4
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A501A
 	battlebegin
-	specialvar VAR_RESULT, GetTrainerBattleMode
+	specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1A5017
 	compare_var_to_value VAR_RESULT, 2
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index b51a8ff00..44c5297e5 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -92,7 +92,7 @@ EventScript_1652C0:: @ 81652C0
 	setvar VAR_0x8006, 0
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special BattleSetup_StartLegendaryBattle
+	special Special_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc
index e477ef3e3..5c51d2601 100644
--- a/data/maps/CeruleanCave_B1F/scripts.inc
+++ b/data/maps/CeruleanCave_B1F/scripts.inc
@@ -41,7 +41,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
 	waitbuttonpress
 	setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special BattleSetup_StartLegendaryBattle
+	special Special_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc
index 87b3a6e4a..3f8256837 100644
--- a/data/maps/MtEmber_Summit/scripts.inc
+++ b/data/maps/MtEmber_Summit/scripts.inc
@@ -41,7 +41,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special BattleSetup_StartLegendaryBattle
+	special Special_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
index f86d87888..4cca0f497 100644
--- a/data/maps/NavelRock_Base/scripts.inc
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -65,7 +65,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
 	setvar VAR_0x8006, 0
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special BattleSetup_StartLegendaryBattle
+	special Special_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
index 46336b536..0c5a694d7 100644
--- a/data/maps/NavelRock_Summit/scripts.inc
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -69,7 +69,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
 	setvar VAR_0x8006, 0
 	special CreateObedientEnemyMon
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special BattleSetup_StartLegendaryBattle
+	special Special_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	setvar VAR_LAST_TALKED, 1
diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc
index 55be7ec1b..086f589de 100644
--- a/data/maps/PokemonTower_6F/scripts.inc
+++ b/data/maps/PokemonTower_6F/scripts.inc
@@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A7AE0
 	setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
-	special BattleSetup_StartMarowakBattle
+	special ScrSpecial_StartMarowakBattle
 	waitstate
 	special sub_8112364
 	compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc
index 5f7b9ea24..aa16e1881 100644
--- a/data/maps/PowerPlant/scripts.inc
+++ b/data/maps/PowerPlant/scripts.inc
@@ -54,7 +54,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special BattleSetup_StartLegendaryBattle
+	special Special_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc
index a93ecaa50..64ff2b3ab 100644
--- a/data/maps/SeafoamIslands_B4F/scripts.inc
+++ b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -179,7 +179,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
-	special BattleSetup_StartLegendaryBattle
+	special Special_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
 	specialvar VAR_RESULT, Special_GetBattleOutcome
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index fe3ca4ec4..24c38bfd7 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -151,7 +151,7 @@ EventScript_165A65:: @ 8165A65
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
-	special BattleSetup_StartOldManTutorialBattle
+	special ScrSpecial_StartOldManTutorialBattle
 	waitstate
 	release
 	end
@@ -246,7 +246,7 @@ EventScript_165B4C:: @ 8165B4C
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A7AE0
 	special sub_8112364
-	special BattleSetup_StartOldManTutorialBattle
+	special ScrSpecial_StartOldManTutorialBattle
 	waitstate
 	lock
 	faceplayer
diff --git a/data/specials.inc b/data/specials.inc
index d2ea38639..f5bb13bc6 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -60,15 +60,15 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special IsEnigmaBerryValid
-	def_special GetTrainerBattleMode
-	def_special ShowTrainerIntroSpeech
-	def_special ShowTrainerCantBattleSpeech
+	def_special ScrSpecial_GetTrainerBattleMode
+	def_special ScrSpecial_ShowTrainerIntroSpeech
+	def_special ScrSpecial_ShowTrainerNonBattlingSpeech
 	def_special GetTrainerFlag
 	def_special ScrSpecial_EndTrainerApproach
 	def_special SetUpTrainerEncounterMusic
 	def_special sub_810CD4C
 	def_special sub_810CEB4
-	def_special BattleSetup_StartRematchBattle
+	def_special ScrSpecial_StartTrainerEyeRematch
 	def_special sub_808C6A8
 	def_special CheckForAlivePartyMons
 	def_special nullsub_75
@@ -166,7 +166,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
-	def_special BattleSetup_StartOldManTutorialBattle
+	def_special ScrSpecial_StartOldManTutorialBattle
 	def_special ChangePokemonNickname
 	def_special Special_ChooseMonFromParty
 	def_special nullsub_75
@@ -320,9 +320,9 @@ gSpecials:: @ 815FD60
 	def_special sub_80CAC08
 	def_special sub_806E99C
 	def_special sub_80CAC28
-	def_special BattleSetup_StartIceCaveBattle
-	def_special BattleSetup_StartLegendaryBattle
-	def_special sub_807FABC
+	def_special Special_StartGroudonKyogreBattle
+	def_special Special_StartLegendaryBattle
+	def_special Special_StartRegiBattle
 	def_special SetUpTrainerMovement
 	def_special nullsub_75
 	def_special nullsub_75
@@ -332,7 +332,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special sub_80E5E70
-	def_special sub_807F998
+	def_special ScrSpecial_StartSouthernIslandBattle
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
@@ -351,7 +351,7 @@ gSpecials:: @ 815FD60
 	def_special GetNameOfEnigmaBerryInPlayerParty
 	def_special nullsub_75
 	def_special sub_810B82C
-	def_special BattleSetup_StartMarowakBattle
+	def_special ScrSpecial_StartMarowakBattle
 	def_special sub_80CA630
 	def_special sub_80CB7C4
 	def_special sub_80CBC5C
diff --git a/include/battle_setup.h b/include/battle_setup.h
index e599acd8a..8a362a82e 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -5,20 +5,20 @@
 
 void BattleSetup_StartWildBattle(void);
 void BattleSetup_StartRoamerBattle(void);
-void BattleSetup_StartOldManTutorialBattle(void);
+void ScrSpecial_StartOldManTutorialBattle(void);
 void BattleSetup_StartScriptedWildBattle(void);
-void BattleSetup_StartMarowakBattle(void);
-void sub_807F998(void);
-void BattleSetup_StartLegendaryBattle(void);
-void BattleSetup_StartIceCaveBattle(void);
-void sub_807FABC(void);
+void ScrSpecial_StartMarowakBattle(void);
+void ScrSpecial_StartSouthernIslandBattle(void);
+void Special_StartLegendaryBattle(void);
+void Special_StartGroudonKyogreBattle(void);
+void Special_StartRegiBattle(void);
 u8 BattleSetup_GetTerrainId(void);
 u8 sub_8080060(void);
 const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
 void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript);
 bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
 void SetUpTrainerMovement(void);
-u8 GetTrainerBattleMode(void);
+u8 ScrSpecial_GetTrainerBattleMode(void);
 u16 sub_80803D8(void);
 u16 GetTrainerFlag(void);
 void SetBattledTrainerFlag(void);
@@ -26,11 +26,11 @@ bool8 HasTrainerBeenFought(u16 trainerId);
 void SetTrainerFlag(u16 trainerId);
 void ClearTrainerFlag(u16 trainerId);
 void BattleSetup_StartTrainerBattle(void);
-void BattleSetup_StartRematchBattle(void);
-void ShowTrainerIntroSpeech(void);
+void ScrSpecial_StartTrainerEyeRematch(void);
+void ScrSpecial_ShowTrainerIntroSpeech(void);
 const u8 *BattleSetup_GetScriptAddrAfterBattle(void);
 const u8 *BattleSetup_GetTrainerPostBattleScript(void);
-void ShowTrainerCantBattleSpeech(void);
+void ScrSpecial_ShowTrainerNonBattlingSpeech(void);
 void SetUpTrainerEncounterMusic(void);
 const u8 *GetTrainerALoseText(void);
 const u8 *GetTrainerWonSpeech(void);
diff --git a/src/battle_main.c b/src/battle_main.c
index d8dfcda15..bb7e300ba 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3719,7 +3719,7 @@ static void HandleEndTurn_BattleLost(void)
     }
     else
     {
-        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerBattleMode() == 9)
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == 9)
         {
             if (sub_80803D8() & 1)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 130a592ff..b43f43ce2 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -288,7 +288,7 @@ static void DoTrainerBattle(void)
     IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
 }
 
-void BattleSetup_StartOldManTutorialBattle(void)
+void ScrSpecial_StartOldManTutorialBattle(void)
 {
     CreateMaleMon(&gEnemyParty[0], SPECIES_WEEDLE, 5);
     ScriptContext2_Enable();
@@ -307,7 +307,7 @@ void BattleSetup_StartScriptedWildBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void BattleSetup_StartMarowakBattle(void)
+void ScrSpecial_StartMarowakBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndMarowakBattle;
@@ -326,7 +326,7 @@ void BattleSetup_StartMarowakBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void sub_807F998(void)
+void ScrSpecial_StartSouthernIslandBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -336,7 +336,7 @@ void sub_807F998(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void BattleSetup_StartLegendaryBattle(void)
+void Special_StartLegendaryBattle(void)
 {
     u16 species;
     
@@ -367,7 +367,7 @@ void BattleSetup_StartLegendaryBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void BattleSetup_StartIceCaveBattle(void)
+void Special_StartGroudonKyogreBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -380,7 +380,7 @@ void BattleSetup_StartIceCaveBattle(void)
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
 
-void sub_807FABC(void)
+void Special_StartRegiBattle(void)
 {
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -840,7 +840,7 @@ void SetUpTrainerMovement(void)
     SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
 }
 
-u8 GetTrainerBattleMode(void)
+u8 ScrSpecial_GetTrainerBattleMode(void)
 {
     return sTrainerBattleMode;
 }
@@ -884,7 +884,7 @@ void ClearTrainerFlag(u16 trainerId)
 void BattleSetup_StartTrainerBattle(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER;
-    if (GetTrainerBattleMode() == TRAINER_BATTLE_TUTORIAL
+    if (ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_TUTORIAL
      && sub_80803D8() & 3)
         gBattleTypeFlags |= BATTLE_TYPE_FIRST_BATTLE;
     gMain.savedCallback = CB2_EndTrainerBattle;
@@ -959,7 +959,7 @@ static void CB2_EndRematchBattle(void)
     }
 }
 
-void BattleSetup_StartRematchBattle(void)
+void ScrSpecial_StartTrainerEyeRematch(void)
 {
     gBattleTypeFlags = BATTLE_TYPE_TRAINER;
     gMain.savedCallback = CB2_EndRematchBattle;
@@ -967,7 +967,7 @@ void BattleSetup_StartRematchBattle(void)
     ScriptContext1_Stop();
 }
 
-void ShowTrainerIntroSpeech(void)
+void ScrSpecial_ShowTrainerIntroSpeech(void)
 {
     ShowFieldMessage(GetIntroSpeechOfApproachingTrainer());
 }
@@ -988,7 +988,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void)
         return EventScript_1C555B;
 }
 
-void ShowTrainerCantBattleSpeech(void)
+void ScrSpecial_ShowTrainerNonBattlingSpeech(void)
 {
     ShowFieldMessage(GetTrainerCantBattleSpeech());
 }