name battle setup functions

6 files changed, 60 insertions, 60 deletions

diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s
index 5e570a00c..562b0f80d 100644
--- a/asm/rom_800D42C.s
+++ b/asm/rom_800D42C.s
@@ -2488,7 +2488,7 @@ _0800E868:
 	strh r1, [r0]
 	ldr r0, _0800E94C @ =gUnknown_030041B8
 	strh r1, [r0]
-	bl sub_8081D3C
+	bl GetBattleTerrain
 	ldr r1, _0800E950 @ =gBattleTerrain
 	strb r0, [r1]
 	ldr r0, _0800E954 @ =gUnknown_03004210
diff --git a/data/specials.inc b/data/specials.inc
index d2546d6a5..6721929a6 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -156,8 +156,8 @@ gSpecials::
 	.4byte sub_8053E90
 	.4byte sub_806A460
 	.4byte sub_810D6B8
-	.4byte sub_8082168
-	.4byte sub_8081AFC
+	.4byte ChooseStarter
+	.4byte StartBattle_WallyTutorial
 	.4byte sub_80BF9F8
 	.4byte sub_80F9A0C
 	.4byte sub_810CA00
@@ -311,9 +311,9 @@ gSpecials::
 	.4byte IsPokerusInParty
 	.4byte sub_8069D78
 	.4byte sub_810F758
-	.4byte sub_8081BF8
-	.4byte sub_8081BB8
-	.4byte sub_8081C50
+	.4byte StartBattle_GroudonKyogre
+	.4byte StartBattle_Rayquaza
+	.4byte StartBattle_Regi
 	.4byte sub_8082524
 	.4byte DoSealedChamberShakingEffect2
 	.4byte sub_810F828
@@ -323,7 +323,7 @@ gSpecials::
 	.4byte ShowContestEntryMonPic
 	.4byte sub_80C5164
 	.4byte sub_8134AB4
-	.4byte sub_8081B78
+	.4byte StartBattle_SouthernIsland
 	.4byte SetRoute119Weather
 	.4byte SetRoute123Weather
 	.4byte ScriptGetMultiplayerId
diff --git a/include/battle_setup.h b/include/battle_setup.h
index aee1f6820..6271a3cc5 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -4,29 +4,29 @@
 // task01_battle_start
 // task_add_01_battle_start
 void CheckForSafariZoneAndProceed(void);
-void sub_8081A18(void);
-void sub_8081A5C(void);
-void sub_8081AA4(void);
+void StartBattle_StandardWild(void);
+void StartBattle_Roamer(void);
+void StartBattle_Safari(void);
 // task_add_01_battle_start_with_music_and_stats
-// sub_8081AFC
-void sub_8081B3C(void);
-// sub_8081B78
-// sub_8081BB8
-// sub_8081BF8
-// sub_8081C50
-void sub_8081C8C(void);
-void sub_8081CEC(void);
-// sub_8081D3C
-// sub_8081E90
+// StartBattle_WallyTutorial
+void StartBattle_ScriptedWild(void);
+// StartBattle_SouthernIsland
+// StartBattle_Rayquaza
+// StartBattle_GroudonKyogre
+// StartBattle_Regi
+void HandleWildBattleEnd(void);
+void HandleScriptedWildBattleEnd(void);
+// GetBattleTerrain
+// GetBattleTransitionTypeByMap
 // GetSumOfPartyMonLevel
 // GetSumOfEnemyPartyLevel
 u8 GetWildBattleTransition(void);
 u8 GetTrainerBattleTransition(void);
 // GetBattleTowerBattleTransition
-// sub_8082168
-void sub_8082188(void);
-void sub_80821D8(void);
-void sub_8082228(void);
+// ChooseStarter
+void CB2_GiveStarter(void);
+void CB2_StartFirstBattle(void);
+void HandleFirstBattleEnd(void);
 // TrainerBattleLoadArg32
 // TrainerBattleLoadArg16
 // TrainerBattleLoadArg8
diff --git a/src/battle_setup.c b/src/battle_setup.c
index fbdd37616..9210a3f04 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -154,36 +154,36 @@ void task_add_01_battle_start(u8 transition, u16 song)
 void CheckForSafariZoneAndProceed(void)
 {
     if (GetSafariZoneFlag())
-        sub_8081AA4();
+        StartBattle_Safari();
     else
-        sub_8081A18();
+        StartBattle_StandardWild();
 }
 
-void sub_8081A18(void)
+void StartBattle_StandardWild(void)
 {
     ScriptContext2_Enable();
     player_bitmagic();
     sub_80597F4();
-    gMain.field_8 = sub_8081C8C;
+    gMain.field_8 = HandleWildBattleEnd;
     gBattleTypeFlags = 0;
     task_add_01_battle_start(GetWildBattleTransition(), 0);
     sav12_xor_increment(7);
     sav12_xor_increment(8);
 }
 
-void sub_8081A5C(void)
+void StartBattle_Roamer(void)
 {
     ScriptContext2_Enable();
     player_bitmagic();
     sub_80597F4();
-    gMain.field_8 = sub_8081C8C;
+    gMain.field_8 = HandleWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_ROAMER;
     task_add_01_battle_start(GetWildBattleTransition(), 0);
     sav12_xor_increment(7);
     sav12_xor_increment(8);
 }
 
-void sub_8081AA4(void)
+void StartBattle_Safari(void)
 {
     ScriptContext2_Enable();
     player_bitmagic();
@@ -201,7 +201,7 @@ void task_add_01_battle_start_with_music_and_stats(void)
 }
 
 //Initiates battle where Wally catches Ralts
-void sub_8081AFC(void)
+void StartBattle_WallyTutorial(void)
 {
     CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
     ScriptContext2_Enable();
@@ -210,40 +210,40 @@ void sub_8081AFC(void)
     task_add_01_battle_start(8, 0);
 }
 
-void sub_8081B3C(void)
+void StartBattle_ScriptedWild(void)
 {
     ScriptContext2_Enable();
-    gMain.field_8 = sub_8081CEC;
+    gMain.field_8 = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = 0;
     task_add_01_battle_start(GetWildBattleTransition(), 0);
     sav12_xor_increment(7);
     sav12_xor_increment(8);
 }
 
-void sub_8081B78(void)
+void StartBattle_SouthernIsland(void)
 {
     ScriptContext2_Enable();
-    gMain.field_8 = sub_8081CEC;
+    gMain.field_8 = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
     task_add_01_battle_start(GetWildBattleTransition(), 0);
     sav12_xor_increment(7);
     sav12_xor_increment(8);
 }
 
-void sub_8081BB8(void)
+void StartBattle_Rayquaza(void)
 {
     ScriptContext2_Enable();
-    gMain.field_8 = sub_8081CEC;
+    gMain.field_8 = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
     task_add_01_battle_start(0, BGM_BATTLE34);
     sav12_xor_increment(7);
     sav12_xor_increment(8);
 }
 
-void sub_8081BF8(void)
+void StartBattle_GroudonKyogre(void)
 {
     ScriptContext2_Enable();
-    gMain.field_8 = sub_8081CEC;
+    gMain.field_8 = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
     if (gGameVersion == 2)
         task_add_01_battle_start(0xB, BGM_BATTLE34); // KYOGRE
@@ -253,17 +253,17 @@ void sub_8081BF8(void)
     sav12_xor_increment(8);
 }
 
-void sub_8081C50(void)
+void StartBattle_Regi(void)
 {
     ScriptContext2_Enable();
-    gMain.field_8 = sub_8081CEC;
+    gMain.field_8 = HandleScriptedWildBattleEnd;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
     task_add_01_battle_start(0xA, BGM_BATTLE36);
     sav12_xor_increment(7);
     sav12_xor_increment(8);
 }
 
-void sub_8081C8C(void)
+void HandleWildBattleEnd(void)
 {
     CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE);
     ResetOamRange(0, 128);
@@ -279,7 +279,7 @@ void sub_8081C8C(void)
     }
 }
 
-void sub_8081CEC(void)
+void HandleScriptedWildBattleEnd(void)
 {
     CpuFill16(0, (void *)BG_PLTT, BG_PLTT_SIZE);
     ResetOamRange(0, 128);
@@ -290,7 +290,7 @@ void sub_8081CEC(void)
         SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
 }
 
-s8 sub_8081D3C(void)
+s8 GetBattleTerrain(void)
 {
     u16 tileBehavior;
     s16 x, y;
@@ -346,7 +346,7 @@ s8 sub_8081D3C(void)
     return 9;
 }
 
-s8 sub_8081E90(void)
+s8 GetBattleTransitionTypeByMap(void)
 {
     u8 flashUsed;
     u16 tileBehavior;
@@ -436,7 +436,7 @@ u8 GetSumOfEnemyPartyLevel(u16 trainerNum, u8 numMons)
 
 u8 GetWildBattleTransition(void)
 {
-    u8 flashVar = sub_8081E90();
+    u8 flashVar = GetBattleTransitionTypeByMap();
     u8 level = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
 
     if (level < (u8)GetSumOfPartyMonLevel(1)) // is wild mon level than the player's mon level?
@@ -478,7 +478,7 @@ u8 GetTrainerBattleTransition(void)
     else
         partyCount = 1;
 
-    flashVar = sub_8081E90();
+    flashVar = GetBattleTransitionTypeByMap();
     level = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent, partyCount);
 
     if (level < (u8)GetSumOfPartyMonLevel(partyCount)) // is wild mon level than the player's mon level?
@@ -497,13 +497,13 @@ u8 GetBattleTowerBattleTransition(void)
         return 3;
 }
 
-void sub_8082168(void)
+void ChooseStarter(void)
 {
     SetMainCallback2(CB2_ChooseStarter);
-    gMain.field_8 = sub_8082188;
+    gMain.field_8 = CB2_GiveStarter;
 }
 
-void sub_8082188(void)
+void CB2_GiveStarter(void)
 {
     u16 starterPoke;
 
@@ -512,11 +512,11 @@ void sub_8082188(void)
     ScriptGiveMon(starterPoke, 5, 0, 0, 0, 0);
     ResetTasks();
     sub_80408BC();
-    SetMainCallback2(sub_80821D8);
+    SetMainCallback2(CB2_StartFirstBattle);
     sub_811AAD8(0);
 }
 
-void sub_80821D8(void)
+void CB2_StartFirstBattle(void)
 {
     UpdatePaletteFade();
     RunTasks();
@@ -524,7 +524,7 @@ void sub_80821D8(void)
     if (sub_811AAE8() == TRUE)
     {
         gBattleTypeFlags = BATTLE_TYPE_FIRST_BATTLE;
-        gMain.field_8 = sub_8082228;
+        gMain.field_8 = HandleFirstBattleEnd;
         SetMainCallback2(sub_800E7C4);
         prev_quest_postbuffer_cursor_backup_reset();
         overworld_poison_timer_set();
@@ -533,7 +533,7 @@ void sub_80821D8(void)
     }
 }
 
-void sub_8082228(void)
+void HandleFirstBattleEnd(void)
 {
     sav1_reset_battle_music_maybe();
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 66c68be07..1b9bc7c35 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1598,7 +1598,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
 
 bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
 {
-    sub_8081B3C();
+    StartBattle_ScriptedWild();
     ScriptContext1_Stop();
     return TRUE;
 }
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 9336e6c18..48e0c1d1c 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -442,7 +442,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                             roamer = &gSaveBlock1.roamer;
                             if (RepelCheck(roamer->level))
                             {
-                                sub_8081A5C();
+                                StartBattle_Roamer();
                                 return 1;
                             }
                         }
@@ -476,7 +476,7 @@ bool8 StandardWildEncounter(u16 a, u16 b)
                             roamer = &gSaveBlock1.roamer;
                             if (RepelCheck(roamer->level))
                             {
-                                sub_8081A5C();
+                                StartBattle_Roamer();
                                 return 1;
                             }
                         }
@@ -541,7 +541,7 @@ bool8 SweetScentWildEncounter(void)
                 return FALSE;
             if (sub_81344CC() == TRUE)
             {
-                sub_8081A5C();
+                StartBattle_Roamer();
                 return TRUE;
             }
             if (DoMassOutbreakEncounterTest() == TRUE)
@@ -558,7 +558,7 @@ bool8 SweetScentWildEncounter(void)
                 return FALSE;
             if (sub_81344CC() == TRUE)
             {
-                sub_8081A5C();
+                StartBattle_Roamer();
                 return TRUE;
             }
             GenerateWildMon(wildPokemonInfo, 1, FALSE);