4 files changed, 15 insertions, 15 deletions
diff --git a/include/battle.h b/include/battle.h
index 48194d711..cea83fc7d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -84,13 +84,13 @@ struct Trainer
     /*0x24*/ const void *party;
 };
 
-struct UnkBattleStruct1 // AI_Opponent_Info?
+struct BattleHistory
 {
-    /*0x00*/ u16 movesUsed[2][8]; // 0xFFFF means move not used (confuse self hit, etc)
-    /*0x20*/ u8 unk20[2];
-    /*0x22*/ u8 unk22[2];
-    /*0x24*/ u16 items[4];
-    /*0x2C*/ u8 numOfItems;
+    /*0x00*/ u16 usedMoves[2][8]; // 0xFFFF means move not used (confuse self hit, etc)
+    /*0x20*/ u8 abilities[MAX_BATTLERS_COUNT / 2];
+    /*0x22*/ u8 itemEffects[MAX_BATTLERS_COUNT / 2];
+    /*0x24*/ u16 trainerItems[MAX_BATTLERS_COUNT];
+    /*0x2C*/ u8 numItems;
 };
 
 struct AI_Stack
@@ -350,7 +350,7 @@ struct BattleStruct /* 0x2000000 */
     /*0x1611F*/ u8 unk1611F;
 
     //u8 filler2[0x72E];
-    /* 0x16A00 */ struct UnkBattleStruct1 unk_2016A00_2;
+    /* 0x16A00 */ struct BattleHistory unk_2016A00_2;
 };
 
 struct StatsArray
@@ -557,7 +557,7 @@ struct WishFutureKnock
     u8 knockedOffPokes[2];
 };
 
-extern struct UnkBattleStruct1 unk_2016A00;
+extern struct BattleHistory unk_2016A00;
 extern struct DisableStruct gDisableStructs[MAX_BATTLERS_COUNT];
 extern struct BattleResults gBattleResults;
 extern struct ProtectStruct gProtectStructs[MAX_BATTLERS_COUNT];
@@ -830,7 +830,6 @@ void sub_8032AA8(u8, u8);
 void SetBankFuncToOpponentBufferRunCommand(void);
 void BattleStopLowHpSound(void);
 
-// asm/battle_9.o
 void SetBankFuncToLinkOpponentBufferRunCommand(void);
 
 #endif // GUARD_BATTLE_H
diff --git a/include/ewram.h b/include/ewram.h
index f1d9baa78..297fdcf69 100644
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -186,7 +186,7 @@ extern u8 gSharedMem[];
 #define ewram16113                      (gSharedMem[0x16113])
 #define ewram16400                      (gSharedMem + 0x16400)
 #define AI_THINKING_STRUCT              ((struct AI_ThinkingStruct *)(gSharedMem + 0x16800))
-#define UNK_2016A00_STRUCT              ((struct UnkBattleStruct1 *) (gSharedMem + 0x16A00))
+#define AI_BATTLE_HISTORY               ((struct BattleHistory *) (gSharedMem + 0x16A00))
 #define AI_STACK                        ((struct AI_Stack *)         (gSharedMem + 0x16C00))
 #define AI_ARRAY_160CC(i)               (gSharedMem[0x160CC + i * 2])
 #define ewram16800                      (&gSharedMem[0x16800])
diff --git a/include/pokemon.h b/include/pokemon.h
index 90d384d91..a6bd7d0c6 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -632,5 +632,6 @@ struct Sprite *sub_80F7920(u16, u16, const u16 *);
 void BoxMonRestorePP(struct BoxPokemon *);
 
 bool8 HealStatusConditions(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId);
+u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit);
 
 #endif // GUARD_POKEMON_H
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 272509b8f..0c529335b 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -18,11 +18,11 @@ void sub_8078314(struct Sprite *sprite);
 void TranslateSpriteOverDuration(struct Sprite *sprite);
 void TranslateMonBGUntil(struct Sprite *sprite);
 void TranslateMonBGSubPixelUntil(struct Sprite *sprite);
-u8 GetBankSide(u8);
-u8 GetBankSide(u8);
-u8 GetBankSide(u8 side);
-u8 GetBankSide(u8 slot);
-u8 GetBankSide(u8);
+u8 GetBattlerSide(u8);
+u8 GetBattlerSide(u8);
+u8 GetBattlerSide(u8 side);
+u8 GetBattlerSide(u8 slot);
+u8 GetBattlerSide(u8);
 u8 GetBattlerPosition(u8);
 u8 GetBattlerPosition(u8 slot);
 u8 GetBattlerAtPosition(u8);