Merge branch 'master' into contest_link_80C2020

1 files changed, 6 insertions, 6 deletions

diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c
index 22bb26973..403894cc8 100644
--- a/src/battle/anim/scan.c
+++ b/src/battle/anim/scan.c
@@ -26,7 +26,7 @@ void sub_80CD3E0(struct Sprite* sprite)
     sprite->pos1.x -= 32;
     sprite->pos1.y -= 32;
     sprite->data[0] = 20;
-    sprite->callback = sub_80782D8;
+    sprite->callback = WaitAnimForDuration;
     StoreSpriteCallbackInData(sprite, sub_80CD408);
 }
 
@@ -36,7 +36,7 @@ void sub_80CD408(struct Sprite* sprite)
     {
     case 0:
         sprite->data[0] = 1;
-        sprite->callback = sub_80782D8;
+        sprite->callback = WaitAnimForDuration;
         StoreSpriteCallbackInData(sprite, sub_80CD408);
         break;
     case 1:
@@ -47,7 +47,7 @@ void sub_80CD408(struct Sprite* sprite)
         sprite->data[0] = 8;
         sprite->data[2] = sprite->pos1.x + gUnknown_083D6DDC[sprite->data[5] >> 8][0];
         sprite->data[4] = sprite->pos1.y + gUnknown_083D6DDC[sprite->data[5] >> 8][1];
-        sprite->callback = sub_8078B34;
+        sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, sub_80CD4B8);
         sprite->data[5] += 0x100;
         PlaySE12WithPanning(0xD2, BattleAnimAdjustPanning(0x3F));
@@ -62,7 +62,7 @@ void sub_80CD4B8(struct Sprite* sprite)
     if ((sprite->data[5] >> 8) == 4)
     {
         sprite->data[0] = 10;
-        sprite->callback = sub_80782D8;
+        sprite->callback = WaitAnimForDuration;
         StoreSpriteCallbackInData(sprite, sub_80CD4EC);
     }
     else
@@ -80,7 +80,7 @@ void sub_80CD4EC(struct Sprite* sprite)
         sprite->data[0] = 3;
         sprite->data[1] = 0;
         sprite->data[2] = 0;
-        sprite->callback = sub_80782D8;
+        sprite->callback = WaitAnimForDuration;
         StoreSpriteCallbackInData(sprite, sub_80CD5A8);
     }
     else
@@ -112,7 +112,7 @@ void sub_80CD4EC(struct Sprite* sprite)
         sprite->data[0] = 6;
         sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + a;
         sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + b;
-        sprite->callback = sub_8078B34;
+        sprite->callback = StartTranslateAnimSpriteByDeltas;
         StoreSpriteCallbackInData(sprite, sub_80CD654);
     }
 }