Merge branch 'master' into unk_text_8095904

1 files changed, 16 insertions, 16 deletions

diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 0a5816b23..915cadcbc 100755
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -7,8 +7,8 @@
 #include "blend_palette.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 extern u8 gObjectBankIDs[];
 
@@ -25,18 +25,18 @@ void sub_80D0FD8(struct Sprite* sprite)
     u8 r4;
 
     if (gBattleAnimArgs[2] == 0)
-        bank = gBattleAnimBankAttacker;
+        bank = gAnimBankAttacker;
     else
-        bank = gBattleAnimBankTarget;
+        bank = gAnimBankTarget;
 
     r4 = gBattleAnimArgs[3] ^ 1;
     if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2))
     {
         sub_807A3FC(bank, r4, &sp0, &sp1);
         if (r4 == 0)
-            r4 = sub_8077ABC(bank, 0);
+            r4 = GetBankPosition(bank, 0);
         else
-            r4 = sub_8077ABC(bank, 2);
+            r4 = GetBankPosition(bank, 2);
 
         if (GetBankSide(bank) != 0)
             gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0];  // This is weird.
@@ -53,7 +53,7 @@ void sub_80D1098(struct Sprite* sprite)
     if (sub_8078B5C(sprite))
     {
         FreeSpriteOamMatrix(sprite);
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
     }
 }
 
@@ -70,13 +70,13 @@ void sub_80D10B8(struct Sprite* sprite)
 
     if (gBattleAnimArgs[5] == 0)
     {
-        bankr7 = gBattleAnimBankAttacker;
-        bankr8 = gBattleAnimBankTarget;
+        bankr7 = gAnimBankAttacker;
+        bankr8 = gAnimBankTarget;
     }
     else
     {
-        bankr7 = gBattleAnimBankTarget;
-        bankr8 = gBattleAnimBankAttacker;
+        bankr7 = gAnimBankTarget;
+        bankr8 = gAnimBankAttacker;
     }
 
     if (gBattleAnimArgs[6] == 0)
@@ -92,7 +92,7 @@ void sub_80D10B8(struct Sprite* sprite)
 
     if (GetBankSide(bankr7) != 0)
     {
-        r9 = sub_8077ABC(bankr7, r10) + gBattleAnimArgs[0];
+        r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0];
         if (IsAnimBankSpriteVisible(bankr8 ^ 2))
             sprite->subpriority = gSprites[gObjectBankIDs[bankr8 ^ 2]].subpriority - 1;
         else
@@ -100,7 +100,7 @@ void sub_80D10B8(struct Sprite* sprite)
     }
     else
     {
-        r9 = sub_8077ABC(bankr7, r10) - gBattleAnimArgs[0];
+        r9 = GetBankPosition(bankr7, r10) - gBattleAnimArgs[0];
         if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2))
         {
             if (gSprites[gObjectBankIDs[bankr7]].pos1.x < gSprites[gObjectBankIDs[bankr7 ^ 2]].pos1.x)
@@ -115,15 +115,15 @@ void sub_80D10B8(struct Sprite* sprite)
 
     }
 
-    r6 = sub_8077ABC(bankr7, sp4) + gBattleAnimArgs[1];
+    r6 = GetBankPosition(bankr7, sp4) + gBattleAnimArgs[1];
     if (gMain.inBattle && IsAnimBankSpriteVisible(bankr8 ^ 2))
     {
         sub_807A3FC(bankr8, gBattleAnimArgs[6], &sp0, &sp1);
     }
     else
     {
-        sp0 = sub_8077ABC(bankr8, r10);
-        sp1 = sub_8077ABC(bankr8, sp4);
+        sp0 = GetBankPosition(bankr8, r10);
+        sp1 = GetBankPosition(bankr8, sp4);
     }
 
     if (GetBankSide(bankr8))