1 files changed, 23 insertions, 23 deletions

diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index a35687796..54bb9d7f9 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "battle.h"
+#include "battle_anim.h"
 #include "battle_interface.h"
 #include "data2.h"
 #include "battle_811DA74.h"
@@ -22,7 +23,7 @@
 #include "util.h"
 #include "ewram.h"
 
-struct UnknownStruct3
+struct MovePpInfo
 {
     u16 moves[4];
     u8 pp[4];
@@ -40,13 +41,12 @@ extern u8 gUnknown_0300434C[];
 extern u8 gHealthboxIDs[];
 extern u16 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent;
-extern u32 *gDisableStructMoveAnim;
-extern u32 gMoveDmgMoveAnim;
-extern u16 gMovePowerMoveAnim;
-extern u8 gHappinessMoveAnim;
+extern u32 gAnimMoveDmg;
+extern u16 gAnimMovePower;
+extern u8 gAnimFriendship;
 extern u16 gWeatherMoveAnim;
-extern u32 gPID_perBank[];
-extern u8 gUnknown_0202F7C4;
+extern u32 gTransformedPersonalities[];
+extern u8 gAnimMoveTurn;
 extern u8 gAnimScriptActive;
 extern void (*gAnimScriptCallback)(void);
 extern struct Window gUnknown_03004210;
@@ -65,7 +65,7 @@ extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_BGM;
 extern u32 gBattleExecBuffer;
 
-extern u8 sub_8077ABC();
+extern u8 GetBankPosition();
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
 extern void sub_8033018(void);
@@ -91,7 +91,7 @@ extern void sub_803311C(void);
 extern void sub_8010384(struct Sprite *);
 extern bool8 mplay_80342A4(u8);
 extern u8 sub_8031720();
-extern void ExecuteMoveAnim();
+extern void DoMoveAnim();
 extern void sub_80326EC();
 extern void sub_8031F24(void);
 extern void sub_80324BC();
@@ -114,7 +114,7 @@ extern void nullsub_45(void);
 extern void sub_8031B74();
 extern bool8 IsDoubleBattle(void);
 extern void sub_8032E2C(void);
-extern u8 AnimBankSpriteExists();
+extern u8 IsBankSpritePresent();
 extern u8 move_anim_start_t3();
 extern void sub_80334C0(void);
 
@@ -560,7 +560,7 @@ void OpponentHandleGetAttributes(void)
 u32 sub_8033598(u8 a, u8 *buffer)
 {
     struct BattlePokemon battlePokemon;
-    struct UnknownStruct3 moveData;
+    struct MovePpInfo moveData;
     u8 nickname[20];
     u8 *src;
     s16 data16;
@@ -896,7 +896,7 @@ void OpponentHandleSetAttributes(void)
 void sub_8033E24(u8 a)
 {
     struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3];
-    struct UnknownStruct3 *moveData = (struct UnknownStruct3 *)&gBattleBufferA[gActiveBank][3];
+    struct MovePpInfo *moveData = (struct MovePpInfo *)&gBattleBufferA[gActiveBank][3];
     s32 i;
 
     switch (gBattleBufferA[gActiveBank][1])
@@ -1127,7 +1127,7 @@ void OpponentHandleLoadPokeSprite(void)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(gActiveBank));
     gObjectBankIDs[gActiveBank] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(gActiveBank, 2),
+      GetBankPosition(gActiveBank, 2),
       sub_8077F68(gActiveBank),
       sub_8079E90(gActiveBank));
     gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240;
@@ -1159,7 +1159,7 @@ void sub_803495C(u8 a, u8 b)
     GetMonSpriteTemplate_803C56C(species, GetBankIdentity(a));
     gObjectBankIDs[a] = CreateSprite(
       &gUnknown_02024E8C,
-      sub_8077ABC(a, 2),
+      GetBankPosition(a, 2),
       sub_8077F68(a),
       sub_8079E90(a));
     gSprites[gObjectBankIDs[a]].data[0] = a;
@@ -1325,21 +1325,21 @@ void OpponentHandleMoveAnimation(void)
         u32 r0 = gBattleBufferA[gActiveBank][1]
                | (gBattleBufferA[gActiveBank][2] << 8);
 
-        gUnknown_0202F7C4 = gBattleBufferA[gActiveBank][3];
-        gMovePowerMoveAnim = gBattleBufferA[gActiveBank][4]
+        gAnimMoveTurn = gBattleBufferA[gActiveBank][3];
+        gAnimMovePower = gBattleBufferA[gActiveBank][4]
                           | (gBattleBufferA[gActiveBank][5] << 8);
-        gMoveDmgMoveAnim = gBattleBufferA[gActiveBank][6]
+        gAnimMoveDmg = gBattleBufferA[gActiveBank][6]
                           | (gBattleBufferA[gActiveBank][7] << 8)
                           | (gBattleBufferA[gActiveBank][8] << 16)
                           | (gBattleBufferA[gActiveBank][9] << 24);
-        gHappinessMoveAnim = gBattleBufferA[gActiveBank][10];
+        gAnimFriendship = gBattleBufferA[gActiveBank][10];
         gWeatherMoveAnim = gBattleBufferA[gActiveBank][12]
                           | (gBattleBufferA[gActiveBank][13] << 8);
-        gDisableStructMoveAnim = (u32 *)&gBattleBufferA[gActiveBank][16];
-        gPID_perBank[gActiveBank] = *gDisableStructMoveAnim;
+        gAnimDisableStructPtr = (struct DisableStruct *)&gBattleBufferA[gActiveBank][16];
+        gTransformedPersonalities[gActiveBank] = gAnimDisableStructPtr->transformedMonPersonality;
 
         // Dead code. sub_8031720 always returns 0.
-        if (sub_8031720(r0, gUnknown_0202F7C4) != 0)
+        if (sub_8031720(r0, gAnimMoveTurn) != 0)
         {
             OpponentBufferExecCompleted();
         }
@@ -1371,7 +1371,7 @@ void sub_8035238(void)
         if (!ewram17810[gActiveBank].unk0_6)
         {
             sub_80326EC(0);
-            ExecuteMoveAnim(r4);
+            DoMoveAnim(r4);
             ewram17810[gActiveBank].unk4 = 2;
         }
         break;
@@ -2003,7 +2003,7 @@ void OpponentHandlecmd50(void)
 
 void OpponentHandleSpriteInvisibility(void)
 {
-    if (AnimBankSpriteExists(gActiveBank) != 0)
+    if (IsBankSpritePresent(gActiveBank) != 0)
     {
         gSprites[gObjectBankIDs[gActiveBank]].invisible = gBattleBufferA[gActiveBank][1];
         sub_8031F88(gActiveBank);