Merge branch 'master' into pokeball-doc

1 files changed, 12 insertions, 11 deletions

diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 516c58e55..c8d43e12e 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -3178,14 +3178,14 @@ static void AnimItemSteal_Step3(struct Sprite* sprite)
 
     sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
     if (sprite->pos2.y == 0)
-        PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(63));
 
     if (moveAlongLinearPath(sprite))
     {
         sprite->pos2.y = 0;
         sprite->data[0] = 0;
         sprite->callback = AnimItemSteal_Step2;
-        PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+        PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64));
     }
 }
 
@@ -3967,24 +3967,25 @@ static void AnimProtect(struct Sprite* sprite)
 
 static void AnimProtect_Step(struct Sprite *sprite)
 {
-    int a;
-    int i;
+    int i, savedPal;
     sprite->data[5] += 96;
     sprite->pos2.x = -(sprite->data[5] >> 8);
     if (++sprite->data[1] > 1)
     {
+        int id;
         sprite->data[1] = 0;
-        a = gPlttBufferFaded[sprite->data[2] + 1];
+        savedPal = gPlttBufferFaded[sprite->data[2] + 1];
         i = 0;
         do
         {
-            gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1];
+            id = sprite->data[2] + ++i;
+            gPlttBufferFaded[id] = gPlttBufferFaded[id + 1];
         } while (i < 6);
 
-        gPlttBufferFaded[sprite->data[2] + 7] = a;
+        gPlttBufferFaded[sprite->data[2] + 7] = savedPal;
     }
 
-    if (sprite->data[7] > 6 && sprite->data[0] >0 && ++sprite->data[6] > 1)
+    if (sprite->data[7] > 6 && sprite->data[0] > 0 && ++sprite->data[6] > 1)
     {
         sprite->data[6] = 0;
         sprite->data[7] -= 1;
@@ -4259,7 +4260,7 @@ static void AnimLockOnTarget_Step1(struct Sprite* sprite)
         sprite->callback = StartAnimLinearTranslation;
         StoreSpriteCallbackInData6(sprite, AnimLockOnTarget_Step2);
         sprite->data[5] += 0x100;
-        PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_M_LOCK_ON, BattleAnimAdjustPanning(63));
         break;
     }
 
@@ -4345,7 +4346,7 @@ static void AnimLockOnTarget_Step4(struct Sprite* sprite)
         sprite->data[2]++;
         pal = sprite->oam.paletteNum;
         LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4);
-        PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(63));
     }
     else if (sprite->data[1] == 0)
     {
@@ -4820,7 +4821,7 @@ static void AnimSharpenSphere_Step(struct Sprite* sprite)
         {
             sprite->data[4]++;
             if (!(sprite->data[4] & 1))
-                PlaySE12WithPanning(SE_W207B, sprite->data[5]);
+                PlaySE12WithPanning(SE_M_SWAGGER2, sprite->data[5]);
         }
 
         sprite->data[0] = 0;