3 files changed, 11 insertions, 11 deletions
diff --git a/include/battle.h b/include/battle.h
index 5bb05755b..3a6ed2c24 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -657,7 +657,7 @@ struct BattleStruct
     u8 field_B3;
     void (*savedCallback)(void);
     u16 usedHeldItems[BATTLE_BANKS_COUNT];
-    u8 field_C0[4];
+    u8 chosenItem[4]; // why is this an u8?
     u8 AI_itemType[2];
     u8 AI_itemFlags[2];
     u16 choicedMove[BATTLE_BANKS_COUNT];
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 67f0813bc..e912af6b1 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -84,7 +84,7 @@ void sub_80A6B30(struct UnknownAnimStruct2*);
 void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1);
 u8 sub_80A82E4(u8 bank);
 u8 sub_80A5C6C(u8 bank, u8 attributeId);
-bool8 AnimBankSpriteExists(u8 bank);
+bool8 IsBankSpritePresent(u8 bank);
 void sub_80A6C68(u8 arg0);
 u8 GetAnimBankSpriteId(u8 wantedBank);
 bool8 IsDoubleBattle(void);
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 8affb1406..2f7b88c2f 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -238,7 +238,7 @@ void EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
 void EmitCmd55(u8 bufferId, u8 arg1);
 
 // player controller
-void SetBankFuncToPlayerBufferRunCommand(void);
+void SetControllerToPlayer(void);
 void nullsub_21(void);
 void PlayerHandleGetRawMonData(void);
 void sub_80587B0(void);
@@ -251,27 +251,27 @@ void ActionSelectionDestroyCursorAt(u8 cursorPos);
 void InitMoveSelectionsVarsAndStrings(void);
 
 // recorded player controller
-void SetBankFuncToRecordedPlayerBufferRunCommand(void);
+void SetControllerToRecordedPlayer(void);
 
 // opponent controller
-void SetBankFuncToOpponentBufferRunCommand(void);
+void SetControllerToOpponent(void);
 
 // player partner controller
-void SetBankFuncToPlayerPartnerBufferRunCommand(void);
+void SetControllerToPlayerPartner(void);
 
 // safari controller
-void SetBankFuncToSafariBufferRunCommand(void);
+void SetControllerToSafari(void);
 
 // wally controller
-void SetBankFuncToWallyBufferRunCommand(void);
+void SetControllerToWally(void);
 
 // recorded opponent controller
-void SetBankFuncToRecordedOpponentBufferRunCommand(void);
+void SetControllerToRecordedOpponent(void);
 
 // link opponent
-void SetBankFuncToLinkOpponentBufferRunCommand(void);
+void SetControllerToLinkOpponent(void);
 
 // link partner
-void SetBankFuncToLinkPartnerBufferRunCommand(void);
+void SetControllerToLinkPartner(void);
 
 #endif // GUARD_BATTLE_CONTROLLERS_H