document battle_setup symbols

8 files changed, 26 insertions, 26 deletions

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 544af1006..ad4201225 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -85,9 +85,9 @@ static void InitSinglePlayerBtlControllers(void)
         gBattleMainFunc = BeginBattleIntro;
         if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
         {
-            gBattlerControllerFuncs[0] = SetControllerToPokedude;
+            gBattlerControllerFuncs[0] = SetControllerToPokeDude;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
-            gBattlerControllerFuncs[1] = SetControllerToPokedude;
+            gBattlerControllerFuncs[1] = SetControllerToPokeDude;
             gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
             gBattlersCount = 2;
         }
@@ -96,7 +96,7 @@ static void InitSinglePlayerBtlControllers(void)
             if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
                 gBattlerControllerFuncs[0] = SetControllerToSafari;
             else if (gBattleTypeFlags & (BATTLE_TYPE_OLDMAN_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE))
-                gBattlerControllerFuncs[0] = SetControllerToOakOrOldman;
+                gBattlerControllerFuncs[0] = SetControllerToOakOrOldMan;
             else
                 gBattlerControllerFuncs[0] = SetControllerToPlayer;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
@@ -110,13 +110,13 @@ static void InitSinglePlayerBtlControllers(void)
         gBattleMainFunc = BeginBattleIntro;
         if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE)
         {
-            gBattlerControllerFuncs[0] = SetControllerToPokedude;
+            gBattlerControllerFuncs[0] = SetControllerToPokeDude;
             gBattlerPositions[0] = B_POSITION_PLAYER_LEFT;
-            gBattlerControllerFuncs[1] = SetControllerToPokedude;
+            gBattlerControllerFuncs[1] = SetControllerToPokeDude;
             gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT;
-            gBattlerControllerFuncs[2] = SetControllerToPokedude;
+            gBattlerControllerFuncs[2] = SetControllerToPokeDude;
             gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT;
-            gBattlerControllerFuncs[3] = SetControllerToPokedude;
+            gBattlerControllerFuncs[3] = SetControllerToPokeDude;
             gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT;
             gBattlersCount = MAX_BATTLERS_COUNT;
         }
diff --git a/src/battle_main.c b/src/battle_main.c
index d82cf471b..2966866c3 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 && sub_80803CC() == 9)
+        if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerBattleMode() == 9)
         {
             if (sub_80803D8() & 1)
                 gBattleCommunication[MULTISTRING_CHOOSER] = 1;
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 6a539b60e..87e42bbb1 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -323,14 +323,14 @@ static void sub_807DFBC(u8 taskId)
     {
     case 0: // Never reached
         sub_807DCB0(0);
-        player_bitmagic();
+        FreezeEventObjects();
         PlayerGetDestCoords(x, y);
         FieldSetDoorOpened(*x, *y);
         task->data[0] = 1;
         break;
     case 5:
         sub_807DCB0(0);
-        player_bitmagic();
+        FreezeEventObjects();
         sub_807F114();
         sub_807DBAC();
         task->data[0] = 6;
@@ -408,7 +408,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
     {
     case 0:
         sub_807DCB0(0);
-        player_bitmagic();
+        FreezeEventObjects();
         PlayerGetDestCoords(x, y);
         task->data[0] = 1;
         break;
@@ -439,7 +439,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        player_bitmagic();
+        FreezeEventObjects();
         ScriptContext2_Enable();
         gTasks[taskId].data[0]++;
         break;
@@ -459,7 +459,7 @@ static void sub_807E31C(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        player_bitmagic();
+        FreezeEventObjects();
         ScriptContext2_Enable();
         sub_805DC04();
         gTasks[taskId].data[0]++;
@@ -689,7 +689,7 @@ static void sub_807E718(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        player_bitmagic();
+        FreezeEventObjects();
         ScriptContext2_Enable();
         task->data[0]++;
         break;
@@ -711,7 +711,7 @@ static void sub_807E784(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        player_bitmagic();
+        FreezeEventObjects();
         ScriptContext2_Enable();
         PlaySE(SE_TK_WARPIN);
         sub_805DAB0();
@@ -744,7 +744,7 @@ static void sub_807E80C(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        player_bitmagic();
+        FreezeEventObjects();
         PlayerGetDestCoords(xp, yp);
         PlaySE(GetDoorSoundEffect(*xp, *yp - 1));
         task->data[1] = FieldAnimateDoorOpen(*xp, *yp - 1);
@@ -798,7 +798,7 @@ static void sub_807E980(u8 taskId)
     {
     case 0:
         ScriptContext2_Enable();
-        player_bitmagic();
+        FreezeEventObjects();
         CameraObjectReset2();
         data[0]++;
         break;
diff --git a/src/item_use.c b/src/item_use.c
index 98817f2d7..8602d6f72 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -162,7 +162,7 @@ void sub_80A1184(void)
 
 bool8 sub_80A1194(void)
 {
-    player_bitmagic();
+    FreezeEventObjects();
     ScriptContext2_Enable();
     sub_807DC00();
     CreateTask(sub_80A11C0, 10);
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c
index f89819647..e28872fd4 100644
--- a/src/map_obj_lock.c
+++ b/src/map_obj_lock.c
@@ -38,7 +38,7 @@ bool8 sub_8069590(void)
 
 void ScriptFreezeMapObjects(void)
 {
-    player_bitmagic();
+    FreezeEventObjects();
     CreateTask(sub_8069570, 80);
 }
 
diff --git a/src/quest_log.c b/src/quest_log.c
index ef8f56249..0f0f3a6eb 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -1513,7 +1513,7 @@ static void sub_8111F8C(u8 taskId)
 
     if (ScriptContext2_IsEnabled() != TRUE)
     {
-        player_bitmagic();
+        FreezeEventObjects();
         sub_805C270();
         sub_805C780();
         ScriptContext2_Enable();
@@ -1536,7 +1536,7 @@ static void sub_8111FCC(u8 taskId)
         task->data[0] = 0;
         task->data[1] = 0;
         task->func = sub_8112044;
-        player_bitmagic();
+        FreezeEventObjects();
         ScriptContext2_Enable();
     }
 }
diff --git a/src/start_menu.c b/src/start_menu.c
index e3854b803..1c57dee0c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -392,7 +392,7 @@ void ShowStartMenu(void)
 {
     if (!IsUpdateLinkStateCBActive())
     {
-        player_bitmagic();
+        FreezeEventObjects();
         sub_805C270();
         sub_805C780();
     }
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index cfc99551a..2c339cceb 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -625,7 +625,7 @@ void sub_810C444(void)
             mapObject = &gMapObjects[sp0];
             if (sub_810CF04(sp0) == TRUE)
             {
-                npc_set_running_behaviour_etc(mapObject, r6);
+                SetTrainerMovementType(mapObject, r6);
             }
             templates[i].movementType = r6;
         }
@@ -763,7 +763,7 @@ static void sub_810C594(void)
             {
                 gSprites[mapObject->spriteId].pos2.x = 0;
                 gSprites[mapObject->spriteId].pos2.y = 0;
-                npc_set_running_behaviour_etc(mapObject, r3);
+                SetTrainerMovementType(mapObject, r3);
             }
         }
     }
@@ -1324,7 +1324,7 @@ static bool8 HasRematchTrainerAlreadyBeenFought(const VsSeekerData *vsSeekerData
 void sub_810CDE8(void)
 {
     gSaveBlock1Ptr->trainerRematches[gSpecialVar_LastTalked] = 0;
-    sub_80803FC();
+    SetBattledTrainerFlag();
 }
 
 static s32 sub_810CE10(const VsSeekerData * a0, u16 a1)
@@ -1596,7 +1596,7 @@ static void StartAllRespondantIdleMovements(void)
                 struct MapObject *r4 = &gMapObjects[sVsSeeker->trainerInfo[j].fieldObjectId];
 
                 if (sub_810CF04(sVsSeeker->trainerInfo[j].fieldObjectId) == 1)
-                    npc_set_running_behaviour_etc(r4, sVsSeeker->runningBehaviourEtcArray[i]);
+                    SetTrainerMovementType(r4, sVsSeeker->runningBehaviourEtcArray[i]);
                 sub_805FE7C(r4, sVsSeeker->runningBehaviourEtcArray[i]);
                 gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[j].localId] = GetNextAvailableRematchTrainer(sVsSeekerData, sVsSeeker->trainerInfo[j].trainerIdx, &dummy);
             }