Merge pull request #752 from camthesaxman/emerald_diff

resolve some Emerald differences

1 files changed, 7 insertions, 7 deletions

diff --git a/src/battle/anim/lunge.c b/src/battle/anim/lunge.c
index 381392e71..f23b34efc 100644
--- a/src/battle/anim/lunge.c
+++ b/src/battle/anim/lunge.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
 extern u8 gBattleAnimAttacker;
 extern u8 gBattleAnimTarget;
 
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
 
 void sub_80CD774(struct Sprite* sprite);
 void sub_80CD9C4(struct Sprite* sprite);
@@ -73,7 +73,7 @@ static void sub_80CD7CC(struct Sprite* sprite)
     sprite->data[0] = 6;
     sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2;
     sprite->data[2] = 0;
-    sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+    sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
     StoreSpriteCallbackInData(sprite, sub_80CD81C);
     sprite->callback = TranslateMonBGUntil;
 }
@@ -82,7 +82,7 @@ static void sub_80CD81C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+        sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
         PrepareBattlerSpriteForRotScale(sprite->data[3], 0);
         sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : 0xFFFFFD00;
         sprite->data[5] = 0;
@@ -103,7 +103,7 @@ static void sub_80CD8A8(struct Sprite* sprite)
     sprite->data[0] = 4;
     sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3;
     sprite->data[2] = 0;
-    sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+    sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
     StoreSpriteCallbackInData(sprite, sub_80CD9B8);
     sprite->callback = TranslateMonBGUntil;
 }
@@ -121,7 +121,7 @@ static void sub_80CD91C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+        sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
         sprite->data[6] = GetBattlerSide(gBattleAnimAttacker);
         if (GetBattlerSide(gBattleAnimAttacker))
         {
@@ -162,7 +162,7 @@ static void sub_80CD9D4(struct Sprite* sprite)
     {
     case 0:
         sprite->data[1] = 0;
-        sprite->data[2] = gBankSpriteIds[gBattleAnimAttacker];
+        sprite->data[2] = gBattlerSpriteIds[gBattleAnimAttacker];
         sprite->data[3] = GetBattlerSide(gBattleAnimAttacker);
         sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200;
         sprite->data[5] = 0;
@@ -196,7 +196,7 @@ void sub_80CDAC8(u8 taskId)
 {
     u8 a;
 
-    gTasks[taskId].data[0] = gBankSpriteIds[gBattleAnimAttacker];
+    gTasks[taskId].data[0] = gBattlerSpriteIds[gBattleAnimAttacker];
     a = GetBattlerSide(gBattleAnimAttacker);
     gTasks[taskId].data[1] = a;
     gTasks[taskId].data[2] = 0;