From 818801cf5ab0c696f2460922753f921726aac6bb Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Fri, 6 Apr 2018 16:02:31 -0700
Subject: Finish decompiling battle_9

---
 src/battle/anim/ring.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/battle/anim/ring.c')

diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 86b2c4659..7516d74e5 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -38,7 +38,7 @@ void sub_80D0FD8(struct Sprite* sprite)
         else
             r4 = GetBankPosition(bank, 2);
 
-        if (GetBankSide(bank) != 0)
+        if (GetBattlerSide(bank) != 0)
             gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0];  // This is weird.
         else
             gBattleAnimArgs[0] = sp0 - r4;
@@ -90,7 +90,7 @@ void sub_80D10B8(struct Sprite* sprite)
         sp4 = 3;
     }
 
-    if (GetBankSide(bankr7) != 0)
+    if (GetBattlerSide(bankr7) != 0)
     {
         r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0];
         if (IsAnimBankSpriteVisible(bankr8 ^ 2))
@@ -126,7 +126,7 @@ void sub_80D10B8(struct Sprite* sprite)
         sp1 = GetBankPosition(bankr8, sp4);
     }
 
-    if (GetBankSide(bankr8))
+    if (GetBattlerSide(bankr8))
         sp0 += gBattleAnimArgs[3];
     else
         sp0 -= gBattleAnimArgs[3];
-- 
cgit v1.2.3


From c36715e3b692ac116a5f8d32b5c2bde7d5ce8f8e Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Fri, 6 Apr 2018 16:24:35 -0700
Subject: Use 'battler' instead of 'bank'

---
 src/battle/anim/ring.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/battle/anim/ring.c')

diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 7516d74e5..b317cdaed 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -34,9 +34,9 @@ void sub_80D0FD8(struct Sprite* sprite)
     {
         SetAverageBattlerPositions(bank, r4, &sp0, &sp1);
         if (r4 == 0)
-            r4 = GetBankPosition(bank, 0);
+            r4 = GetBattlerSpriteCoord(bank, 0);
         else
-            r4 = GetBankPosition(bank, 2);
+            r4 = GetBattlerSpriteCoord(bank, 2);
 
         if (GetBattlerSide(bank) != 0)
             gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0];  // This is weird.
@@ -92,7 +92,7 @@ void sub_80D10B8(struct Sprite* sprite)
 
     if (GetBattlerSide(bankr7) != 0)
     {
-        r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0];
+        r9 = GetBattlerSpriteCoord(bankr7, r10) + gBattleAnimArgs[0];
         if (IsAnimBankSpriteVisible(bankr8 ^ 2))
             sprite->subpriority = gSprites[gBankSpriteIds[bankr8 ^ 2]].subpriority - 1;
         else
@@ -100,7 +100,7 @@ void sub_80D10B8(struct Sprite* sprite)
     }
     else
     {
-        r9 = GetBankPosition(bankr7, r10) - gBattleAnimArgs[0];
+        r9 = GetBattlerSpriteCoord(bankr7, r10) - gBattleAnimArgs[0];
         if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2))
         {
             if (gSprites[gBankSpriteIds[bankr7]].pos1.x < gSprites[gBankSpriteIds[bankr7 ^ 2]].pos1.x)
@@ -115,15 +115,15 @@ void sub_80D10B8(struct Sprite* sprite)
 
     }
 
-    r6 = GetBankPosition(bankr7, sp4) + gBattleAnimArgs[1];
+    r6 = GetBattlerSpriteCoord(bankr7, sp4) + gBattleAnimArgs[1];
     if (gMain.inBattle && IsAnimBankSpriteVisible(bankr8 ^ 2))
     {
         SetAverageBattlerPositions(bankr8, gBattleAnimArgs[6], &sp0, &sp1);
     }
     else
     {
-        sp0 = GetBankPosition(bankr8, r10);
-        sp1 = GetBankPosition(bankr8, sp4);
+        sp0 = GetBattlerSpriteCoord(bankr8, r10);
+        sp1 = GetBattlerSpriteCoord(bankr8, sp4);
     }
 
     if (GetBattlerSide(bankr8))
-- 
cgit v1.2.3