Merge with master

1 files changed, 1073 insertions, 16 deletions

diff --git a/src/electric.c b/src/electric.c
index 5d65915b2..ed495fa59 100644
--- a/src/electric.c
+++ b/src/electric.c
@@ -1,24 +1,43 @@
 #include "global.h"
 #include "battle_anim.h"
 #include "constants/rgb.h"
+#include "trig.h"
+#include "constants/songs.h"
+#include "sound.h"
 
-extern void sub_810A1A8(struct Sprite *);
-extern void sub_810A214(struct Sprite *);
-extern void sub_810A274(struct Sprite *);
-extern void sub_810A308(struct Sprite *);
+extern void sub_810E2C8(struct Sprite *);
+extern bool8 sub_810B614(struct Task *task, u8 taskId);
 extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *);
-extern void sub_810A46C(struct Sprite *);
-extern void sub_810A5BC(struct Sprite *);
-extern void sub_810A628(struct Sprite *);
-extern void sub_810A75C(struct Sprite *);
-extern void sub_810A9DC(struct Sprite *);
-extern void sub_810AA2C(struct Sprite *);
-extern void sub_810ACD8(struct Sprite *);
-extern void sub_810AD30(struct Sprite *);
-extern void sub_810AD98(struct Sprite *);
-extern void sub_810B1F0(struct Sprite *);
-extern void sub_810B23C(struct Sprite *);
-extern void sub_810B51C(struct Sprite *);
+
+static void sub_810A1A8(struct Sprite *);
+static void sub_810A1F8(struct Sprite *);
+static void sub_810A214(struct Sprite *);
+static void sub_810A258(struct Sprite *);
+static void sub_810A274(struct Sprite *);
+static void sub_810A308(struct Sprite *);
+static void sub_810A46C(struct Sprite *);
+static void sub_810A4F4(struct Sprite *);
+static void sub_810A56C(struct Sprite *);
+static void sub_810A5BC(struct Sprite *);
+static void sub_810A628(struct Sprite *);
+static void sub_810A6EC(struct Sprite *);
+static void sub_810A75C(struct Sprite *);
+static void sub_810A834(u8 taskId);
+static void sub_810A9DC(struct Sprite *);
+static void sub_810AA2C(struct Sprite *);
+static void sub_810AAB0(struct Sprite *);
+static void sub_810AB78(u8 taskId);
+static void sub_810AC8C(struct Sprite *);
+static void sub_810ACC0(struct Sprite *);
+static void sub_810ACD8(struct Sprite *);
+static void sub_810AD30(struct Sprite *);
+static void sub_810AD98(struct Sprite *);
+static void sub_810ADF8(struct Sprite *);
+static bool8 sub_810B154(struct Task *task, u8 taskId);
+static void sub_810B1F0(struct Sprite *);
+static void sub_810B23C(struct Sprite *);
+static bool8 sub_810B430(struct Task *task, u8 taskId);
+static void sub_810B51C(struct Sprite *);
 
 const union AnimCmd gUnknown_085956A4[] =
 {
@@ -436,3 +455,1041 @@ const struct SpriteTemplate gUnknown_08595A30 =
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = sub_810B51C,
 };
+
+static void sub_810A1A8(struct Sprite *sprite)
+{
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
+        sprite->pos1.x -= gBattleAnimArgs[0];
+    else
+        sprite->pos1.x += gBattleAnimArgs[0];
+    
+    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->callback = sub_810A1F8;
+}
+
+static void sub_810A1F8(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+        DestroyAnimSprite(sprite);
+}
+
+static void sub_810A214(struct Sprite *sprite)
+{
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
+        sprite->pos1.x -= gBattleAnimArgs[0];
+    else
+        sprite->pos1.x += gBattleAnimArgs[0];
+    
+    sprite->callback = sub_810A258;
+}
+
+static void sub_810A258(struct Sprite *sprite)
+{
+    if (sprite->affineAnimEnded)
+        DestroySpriteAndMatrix(sprite);
+}
+
+static void sub_810A274(struct Sprite *sprite)
+{
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+    
+    if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
+    {
+        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->pos1.y -= gBattleAnimArgs[1];
+    }
+    else
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+    }
+    sprite->data[0] = 0;
+    sprite->data[1] = gBattleAnimArgs[2];
+    sprite->data[2] = gBattleAnimArgs[3];
+    sprite->data[3] = gBattleAnimArgs[4];
+    StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
+    sprite->callback = TranslateSpriteInCircleOverDuration;
+}
+
+static void sub_810A308(struct Sprite *sprite)
+{
+    u8 battler;
+    u32 matrixNum;
+    s16 sineVal;
+
+    switch (gBattleAnimArgs[4])
+    {
+    case 0:
+        battler = gBattleAnimAttacker;
+        break;
+    case 1:
+    default:
+        battler = gBattleAnimTarget;
+        break;
+    case 2:
+        if (!IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
+            battler = gBattleAnimAttacker;
+        else
+            battler = BATTLE_PARTNER(gBattleAnimAttacker);
+        break;
+    case 3:
+        if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
+            battler = BATTLE_PARTNER(gBattleAnimTarget);
+        else
+            battler = gBattleAnimTarget;
+        break;
+    }
+
+    if (gBattleAnimArgs[5] == 0)
+    {
+        sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X);
+        sprite->pos1.y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y);
+    }
+    else
+    {
+        sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2);
+        sprite->pos1.y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET);
+    }
+
+    sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;
+    sprite->pos2.y = (gSineTable[gBattleAnimArgs[0] + 64] * gBattleAnimArgs[1]) >> 8;
+
+    if (gBattleAnimArgs[6] & 1)
+        sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1;
+
+    matrixNum = sprite->oam.matrixNum;
+    sineVal = gSineTable[gBattleAnimArgs[2]];
+
+    gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d =  gSineTable[gBattleAnimArgs[2] + 64];
+    gOamMatrices[matrixNum].b =  sineVal;
+    gOamMatrices[matrixNum].c = -sineVal;
+
+    sprite->data[0] = gBattleAnimArgs[3];
+    sprite->callback = sub_810E2C8;
+}
+
+static void sub_810A46C(struct Sprite *sprite)
+{
+    InitSpritePosToAnimAttacker(sprite, 1);
+    sprite->data[0] = gBattleAnimArgs[3];
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+    sprite->data[3] = sprite->pos1.y;
+    sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+    InitAnimLinearTranslation(sprite);
+    sprite->data[5] = gBattleAnimArgs[2];
+    sprite->data[6] = gBattleAnimArgs[5];
+    sprite->data[7] = gBattleAnimArgs[4];
+    sprite->oam.tileNum += gBattleAnimArgs[6] * 4;
+    sprite->callback = sub_810A4F4;
+    sub_810A4F4(sprite);
+}
+
+static void sub_810A4F4(struct Sprite *sprite)
+{
+    if (!AnimTranslateLinear(sprite))
+    {
+        sprite->pos2.x += Sin(sprite->data[7], sprite->data[5]);
+        sprite->pos2.y += Cos(sprite->data[7], sprite->data[5]);
+        sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF;
+        if(!(sprite->data[7] % 3))
+            sprite->invisible ^= 1;
+    }
+    else
+        DestroyAnimSprite(sprite);
+}
+
+static void sub_810A56C(struct Sprite *sprite)
+{
+    if (--sprite->data[5] == -1)
+    {
+        sprite->invisible ^= 1;
+        sprite->data[5] = sprite->data[4];
+    }
+    if (sprite->data[3]-- <= 0)
+        DestroyAnimSprite(sprite);
+}
+
+static void sub_810A5BC(struct Sprite *sprite)
+{
+    if (IsContest() || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
+        gBattleAnimArgs[1] = -gBattleAnimArgs[1];
+    
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
+    sprite->data[3] = gBattleAnimArgs[0];
+    sprite->data[4] = gBattleAnimArgs[3];
+    sprite->data[5] = gBattleAnimArgs[3];
+    sprite->callback = sub_810A56C;
+}
+
+static void sub_810A628(struct Sprite *sprite)
+{
+    u8 battler;
+
+    sprite->data[0] = gBattleAnimArgs[3];
+    if (gBattleAnimArgs[7] & 0x8000)
+        battler = gBattleAnimTarget;
+    else
+        battler = gBattleAnimAttacker;
+
+    if (IsContest() || GetBattlerSide(battler) == B_SIDE_PLAYER)
+        gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+
+    sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[1];
+
+    sprite->data[4] = gBattleAnimArgs[7] & 0x7FFF;
+    sprite->data[5] = gBattleAnimArgs[2];
+    sprite->data[6] = gBattleAnimArgs[5];
+    sprite->data[7] = gBattleAnimArgs[4];
+
+    sprite->oam.tileNum += gBattleAnimArgs[6] * 4;
+    sprite->callback = sub_810A6EC;
+    sprite->callback(sprite);
+}
+
+static void sub_810A6EC(struct Sprite *sprite)
+{
+    sprite->pos2.x = Sin(sprite->data[7], sprite->data[5]);
+    sprite->pos2.y = Cos(sprite->data[7], sprite->data[5]);
+
+    sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF;
+    if (sprite->data[7] % sprite->data[4] == 0)
+        sprite->invisible ^= 1;
+
+    if (sprite->data[0]-- <= 0)
+        DestroyAnimSprite(sprite);
+}
+
+static void sub_810A75C(struct Sprite *sprite)
+{
+    InitSpritePosToAnimTarget(sprite, FALSE);
+    sprite->oam.tileNum += gBattleAnimArgs[3] * 4;
+
+    if (gBattleAnimArgs[3] == 1)
+        sprite->oam.matrixNum = 8;
+    else if (gBattleAnimArgs[3] == 2)
+        sprite->oam.matrixNum = 16;
+
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->callback = WaitAnimForDuration;
+    StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
+}
+
+void sub_810A7DC(u8 taskId)
+{
+    gTasks[taskId].data[0] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0];
+    gTasks[taskId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1];
+    gTasks[taskId].data[2] = gBattleAnimArgs[2];
+    gTasks[taskId].func = sub_810A834;
+}
+
+#ifdef NONMATCHING // couldn't get the proper tail merging in the "CreateSprite" switch cases.(ported from ruby)
+static void sub_810A834(u8 taskId)
+{
+    u16 r8;
+    s16 r12;
+    s16 r2;
+    u8 spriteId = 0;
+    u8 r7 = 0;
+    u8 sp = gTasks[taskId].data[2];
+    s16 r4 = gTasks[taskId].data[0];
+    s16 r6 = gTasks[taskId].data[1];
+
+    if (!gTasks[taskId].data[2])
+    {
+        r8 = 0;
+        r2 = 1;
+        r12 = 16;
+    }
+    else
+    {
+        r12 = 16;
+        r8 = 8;
+        r2 = 4;
+    }
+
+    switch (gTasks[taskId].data[10])
+    {
+    case 0:
+        r8 += r2 * 0;
+        spriteId = CreateSprite(&gUnknown_08595828, r4, r6 + (r12 * 1), 2);
+        r7++;
+        break;
+    case 2:
+        r8 += r2;
+        spriteId = CreateSprite(&gUnknown_08595828, r4, r6 + (r12 * 2), 2);
+        r7++;
+        break;
+    case 4:
+        r8 += r2 * 2;
+        spriteId = CreateSprite(&gUnknown_08595828, r4, r6 + (r12 * 3), 2);
+        r7++;
+        break;
+    case 6:
+        r8 += r2 * 3;
+        spriteId = CreateSprite(&gUnknown_08595828, r4, r6 + (r12 * 4), 2);
+        r7++;
+        break;
+    case 8:
+        spriteId = CreateSprite(&gUnknown_08595828, r4, r6 + (r12 * 5), 2);
+        r7++;
+        break;
+    case 10:
+        DestroyAnimVisualTask(taskId);
+        return;
+    }
+
+    if (r7)
+    {
+        gSprites[spriteId].oam.tileNum += r8;
+        gSprites[spriteId].data[0] = sp;
+        gSprites[spriteId].callback(&gSprites[spriteId]);
+    }
+
+    gTasks[taskId].data[10]++;
+}
+#else
+NAKED
+static void sub_810A834(u8 taskId)
+{
+    asm_unified("\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x4\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r9, r0\n\
+    movs r5, 0\n\
+    movs r7, 0\n\
+    ldr r1, =gTasks\n\
+    lsls r0, 2\n\
+    add r0, r9\n\
+    lsls r0, 3\n\
+    adds r0, r1\n\
+    ldrb r2, [r0, 0xC]\n\
+    str r2, [sp]\n\
+    ldrh r4, [r0, 0x8]\n\
+    ldrh r6, [r0, 0xA]\n\
+    movs r3, 0xC\n\
+    ldrsh r0, [r0, r3]\n\
+    mov r10, r1\n\
+    cmp r0, 0\n\
+    bne _0810A878\n\
+    movs r0, 0\n\
+    mov r8, r0\n\
+    movs r2, 0x1\n\
+    movs r1, 0x10\n\
+    mov r12, r1\n\
+    b _0810A882\n\
+    .pool\n\
+_0810A878:\n\
+    movs r2, 0x10\n\
+    mov r12, r2\n\
+    movs r3, 0x8\n\
+    mov r8, r3\n\
+    movs r2, 0x4\n\
+_0810A882:\n\
+    mov r0, r9\n\
+    lsls r1, r0, 2\n\
+    adds r0, r1, r0\n\
+    lsls r0, 3\n\
+    add r0, r10\n\
+    movs r3, 0x1C\n\
+    ldrsh r0, [r0, r3]\n\
+    mov r10, r1\n\
+    cmp r0, 0xA\n\
+    bhi _0810A978\n\
+    lsls r0, 2\n\
+    ldr r1, =_0810A8A4\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .pool\n\
+    .align 2, 0\n\
+_0810A8A4:\n\
+    .4byte _0810A8D0\n\
+    .4byte _0810A978\n\
+    .4byte _0810A8E4\n\
+    .4byte _0810A978\n\
+    .4byte _0810A904\n\
+    .4byte _0810A978\n\
+    .4byte _0810A91A\n\
+    .4byte _0810A978\n\
+    .4byte _0810A93C\n\
+    .4byte _0810A978\n\
+    .4byte _0810A970\n\
+_0810A8D0:\n\
+    ldr r0, =gUnknown_08595828\n\
+    lsls r1, r4, 16\n\
+    asrs r1, 16\n\
+    lsls r2, r6, 16\n\
+    asrs r2, 16\n\
+    mov r4, r12\n\
+    lsls r3, r4, 16\n\
+    b _0810A952\n\
+    .pool\n\
+_0810A8E4:\n\
+    mov r0, r12\n\
+    lsls r3, r0, 17\n\
+    mov r1, r8\n\
+    adds r0, r1, r2\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r8, r0\n\
+    ldr r0, =gUnknown_08595828\n\
+    lsls r1, r4, 16\n\
+    asrs r1, 16\n\
+    lsls r2, r6, 16\n\
+    asrs r2, 16\n\
+    b _0810A952\n\
+    .pool\n\
+_0810A904:\n\
+    mov r3, r12\n\
+    lsls r0, r3, 16\n\
+    asrs r0, 16\n\
+    lsls r3, r0, 1\n\
+    adds r3, r0\n\
+    lsls r0, r2, 1\n\
+    add r0, r8\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r8, r0\n\
+    b _0810A946\n\
+_0810A91A:\n\
+    mov r0, r12\n\
+    lsls r3, r0, 18\n\
+    lsls r0, r2, 1\n\
+    adds r0, r2\n\
+    add r0, r8\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r8, r0\n\
+    ldr r0, =gUnknown_08595828\n\
+    lsls r1, r4, 16\n\
+    asrs r1, 16\n\
+    lsls r2, r6, 16\n\
+    asrs r2, 16\n\
+    b _0810A952\n\
+    .pool\n\
+_0810A93C:\n\
+    mov r1, r12\n\
+    lsls r0, r1, 16\n\
+    asrs r0, 16\n\
+    lsls r3, r0, 2\n\
+    adds r3, r0\n\
+_0810A946:\n\
+    ldr r0, =gUnknown_08595828\n\
+    lsls r1, r4, 16\n\
+    asrs r1, 16\n\
+    lsls r2, r6, 16\n\
+    asrs r2, 16\n\
+    lsls r3, 16\n\
+_0810A952:\n\
+    asrs r3, 16\n\
+    adds r2, r3\n\
+    lsls r2, 16\n\
+    asrs r2, 16\n\
+    movs r3, 0x2\n\
+    bl CreateSprite\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r7, r0, 24\n\
+    b _0810A978\n\
+    .pool\n\
+_0810A970:\n\
+    mov r0, r9\n\
+    bl DestroyAnimVisualTask\n\
+    b _0810A9BC\n\
+_0810A978:\n\
+    cmp r7, 0\n\
+    beq _0810A9AC\n\
+    ldr r4, =gSprites\n\
+    lsls r3, r5, 4\n\
+    adds r3, r5\n\
+    lsls r3, 2\n\
+    adds r0, r3, r4\n\
+    ldrh r5, [r0, 0x4]\n\
+    lsls r2, r5, 22\n\
+    lsrs r2, 22\n\
+    add r2, r8\n\
+    ldr r6, =0x000003ff\n\
+    adds r1, r6, 0\n\
+    ands r2, r1\n\
+    ldr r1, =0xfffffc00\n\
+    ands r1, r5\n\
+    orrs r1, r2\n\
+    strh r1, [r0, 0x4]\n\
+    mov r1, sp\n\
+    ldrh r1, [r1]\n\
+    strh r1, [r0, 0x2E]\n\
+    adds r4, 0x1C\n\
+    adds r3, r4\n\
+    ldr r1, [r3]\n\
+    bl _call_via_r1\n\
+_0810A9AC:\n\
+    ldr r0, =gTasks\n\
+    mov r1, r10\n\
+    add r1, r9\n\
+    lsls r1, 3\n\
+    adds r1, r0\n\
+    ldrh r0, [r1, 0x1C]\n\
+    adds r0, 0x1\n\
+    strh r0, [r1, 0x1C]\n\
+_0810A9BC:\n\
+    add sp, 0x4\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .pool\n\
+    ");
+}
+#endif
+
+static void sub_810A9DC(struct Sprite *sprite)
+{
+    if (!sprite->data[0])
+    {
+        sprite->oam.shape = 2;
+        sprite->oam.size = 0;
+    }
+    else
+    {
+        sprite->oam.shape = 0;
+        sprite->oam.size = 1;
+    }
+    if (++sprite->data[1] == 15)
+        DestroySprite(sprite);
+}
+
+static void sub_810AA2C(struct Sprite *sprite)
+{
+    u8 spriteId;
+
+    sprite->pos1.x += gBattleAnimArgs[0];
+    sprite->pos1.y += gBattleAnimArgs[1];
+    spriteId = CreateSprite(&gUnknown_08595840, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority);
+    gSprites[spriteId].oam.tileNum += 8;
+    gAnimVisualTaskCount++;
+    gSprites[spriteId].callback = sub_810AAB0;
+    sprite->callback = sub_810AAB0;
+}
+
+static void sub_810AAB0(struct Sprite *sprite)
+{
+    if (++sprite->data[0] == 3)
+    {
+        sprite->data[0] = 0;
+        sprite->invisible ^= 1;
+    }
+
+    if (++sprite->data[1] == 51)
+        DestroyAnimSprite(sprite);
+}
+
+void sub_810AAFC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    if (!gBattleAnimArgs[0]) 
+    {
+        task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        task->data[15] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    }
+    else
+    {
+        task->data[14] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+        task->data[15] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+    }
+
+    task->data[6] = gBattleAnimArgs[1];
+    task->data[7] = 0;
+    task->data[8] = 0;
+    task->data[9] = 0;
+    task->data[10] = 0;
+    task->data[11] = gBattleAnimArgs[3];
+    task->data[12] = 0;
+    task->data[13] = gBattleAnimArgs[2];
+    task->func = sub_810AB78;
+}
+
+void sub_810AB78(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    if (task->data[6])
+    {
+        if (++task->data[12] > task->data[13])
+        {
+            u8 spriteId;
+            task->data[12] = 0;
+            spriteId = CreateSprite(&gUnknown_085958A8, task->data[14], task->data[15], 2);
+            if (spriteId != MAX_SPRITES)
+            {
+                struct Sprite *sprite = &gSprites[spriteId];
+                sprite->pos1.x += gUnknown_08595858[task->data[9]][0];
+                sprite->pos1.y += gUnknown_08595858[task->data[9]][1];
+
+                sprite->data[0] = 40 - task->data[8] * 5;
+                sprite->data[1] = sprite->pos1.x;
+                sprite->data[2] = task->data[14];
+                sprite->data[3] = sprite->pos1.y;
+                sprite->data[4] = task->data[15];
+                sprite->data[5] = taskId;
+
+                InitAnimLinearTranslation(sprite);
+                StoreSpriteCallbackInData6(sprite, sub_810ACC0);
+                sprite->callback = RunStoredCallbackWhenAnimEnds;
+
+                if (++task->data[9] > 15)
+                    task->data[9] = 0;
+
+                if (++task->data[10] >= task->data[11])
+                {
+                    task->data[10] = 0;
+                    if (task->data[8] <= 5)
+                        task->data[8]++;
+                }
+
+                task->data[7]++;
+                task->data[6]--;
+            }
+        }
+    }
+    else if(task->data[7] == 0)
+        DestroyAnimVisualTask(taskId);
+}
+
+static void sub_810AC8C(struct Sprite *sprite)
+{
+    if (AnimTranslateLinear(sprite))
+    {
+        gTasks[sprite->data[5]].data[7]--;
+        DestroySprite(sprite);
+    }
+}
+
+static void sub_810ACC0(struct Sprite *sprite)
+{
+    StartSpriteAnim(sprite, 1);
+    sprite->callback = sub_810AC8C;
+}
+
+static void sub_810ACD8(struct Sprite *sprite)
+{
+    if (!gBattleAnimArgs[0])
+    {
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    }
+    else
+    {
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+    }
+
+    StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
+    sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
+}
+
+static void sub_810AD30(struct Sprite *sprite)
+{
+    if (!gBattleAnimArgs[0])
+    {
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    }
+    else
+    {
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+    }
+
+    sprite->pos2.x = gBattleAnimArgs[1];
+    sprite->pos2.y = gBattleAnimArgs[2];
+    StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
+    sprite->callback = RunStoredCallbackWhenAnimEnds;
+}
+
+static void sub_810AD98(struct Sprite *sprite)
+{
+    StartSpriteAffineAnim(sprite, 1);
+    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->data[6] = GetAnimBattlerSpriteId(0);
+    sprite->data[7] = 16;
+
+    if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
+        sprite->data[7] *= -1;
+
+    sprite->callback = sub_810ADF8;
+}
+
+static void sub_810ADF8(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        if (++sprite->data[1] > 40)
+            sprite->data[0]++;
+        break;
+    case 1:
+        sprite->pos1.x += sprite->data[7];
+        gSprites[sprite->data[6]].pos2.x += sprite->data[7];
+        if ((u16)(sprite->pos1.x + 80) > 400)
+            DestroySpriteAndMatrix(sprite);
+    }
+}
+
+void sub_810AE5C(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        task->data[15] = GetAnimBattlerSpriteId(0);
+        task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
+        {
+            task->data[14] = -32;
+            task->data[13] = 2;
+        }
+        else
+        {
+            task->data[14] = 32;
+            task->data[13] = -2;
+        }
+
+        gSprites[task->data[15]].pos2.x = task->data[14];
+        task->data[0]++;
+        break;
+    case 1:
+        if (++task->data[1] > 1)
+        {
+            task->data[1] = 0;
+            gSprites[task->data[15]].invisible ^= 1;
+
+            if (task->data[14])
+            {
+                task->data[14] += task->data[13];
+                gSprites[task->data[15]].pos2.x = task->data[14];
+            }
+            else
+                task->data[0]++;
+            
+        }
+        break;
+    case 2:
+        if (++task->data[1] > 1)
+        {
+            task->data[1] = 0;
+            gSprites[task->data[15]].invisible ^= 1;
+
+            if (++task->data[2] == 8)
+                task->data[0]++;
+        }
+        break;
+    case 3:
+        gSprites[task->data[15]].invisible = 0;
+        DestroyAnimVisualTask(taskId);
+    }
+}
+
+void sub_810AFCC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch(task->data[0])
+    {
+    case 0:
+        task->data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER ? 1 : -1;
+
+        switch (gBattleAnimArgs[0])
+        {
+        case 0:
+            task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+            task->data[5] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+            task->data[4] = (task->data[1] * 128) + 120;
+            break;
+        case 4:
+            task->data[3] = 120 - (task->data[1] * 128);
+            task->data[5] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+            task->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) - (task->data[1] * 32);
+            break;
+        default:
+            if ((gBattleAnimArgs[0] & 1) != 0)
+            {
+                task->data[3] = 256;
+                task->data[4] = -16;
+            }
+            else
+            {
+                task->data[3] = -16;
+                task->data[4] = 256;
+            }
+
+            if (task->data[1] == 1)
+            {
+                task->data[5] = 80 - gBattleAnimArgs[0] * 10;
+            }
+            else
+            {
+                u16 temp;
+                task->data[5] = gBattleAnimArgs[0] * 10 + 40;
+                temp = task->data[3];
+                task->data[3] = task->data[4];
+                task->data[4] = temp;
+            }
+        }
+
+        if (task->data[3] < task->data[4])
+        {
+            task->data[1] = 1;
+            task->data[6] = 0;
+        }
+        else
+        {
+            task->data[1] = -1;
+            task->data[6] = 3;
+        }
+
+        task->data[0]++;
+        break;
+    case 1:
+        if (++task->data[2] > 0)
+        {
+            task->data[2] = 0;
+            if (sub_810B154(task, taskId) || sub_810B154(task, taskId))
+                task->data[0]++;
+        }
+        break;
+    case 2:
+        if (task->data[7] == 0)
+            DestroyAnimVisualTask(taskId);
+    }
+}
+
+static bool8 sub_810B154(struct Task *task, u8 taskId)
+{
+    u8 spriteId = CreateSprite(&gUnknown_08595A00, task->data[3], task->data[5], 35);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].data[6] = taskId;
+        gSprites[spriteId].data[7] = 7;
+        task->data[7]++;
+    }
+
+    task->data[6] += task->data[1];
+    if (task->data[6] < 0)
+        task->data[6] = 3;
+
+    if (task->data[6] > 3)
+        task->data[6] = 0;
+
+    task->data[3] += task->data[1] * 16;
+
+    if ((task->data[1] == 1 && task->data[3] >= task->data[4])
+        || (task->data[1] == -1 && task->data[3] <= task->data[4]))
+    {
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+static void sub_810B1F0(struct Sprite *sprite)
+{
+    if (++sprite->data[0] > 12)
+    {
+        gTasks[sprite->data[6]].data[sprite->data[7]]--;
+        FreeOamMatrix(sprite->oam.matrixNum);
+        DestroySprite(sprite);
+    }
+}
+
+static void sub_810B23C(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+        StartSpriteAffineAnim(sprite, 2);
+        sprite->data[0]++;
+        break;
+    case 1:
+        if (sprite->affineAnimEnded)
+            DestroySpriteAndMatrix(sprite);
+    }
+}
+
+void sub_810B29C(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        task->data[6] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        task->data[7] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+        task->data[8] = 4;
+        task->data[10] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+        task->data[9] = (task->data[10] - task->data[6]) / 5;
+        task->data[4] = 7;
+        task->data[5] = -1;
+        task->data[11] = 12;
+        task->data[12] = BattleAnimAdjustPanning(task->data[11] - 76);
+        task->data[13] = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
+        task->data[14] = task->data[12];
+        task->data[15] = (task->data[13] - task->data[12]) / 3;
+        task->data[0]++;
+        break;
+    case 1:
+        if (++task->data[1] > 0)
+        {
+            task->data[1] = 0;
+            if (sub_810B430(task, taskId))
+            {
+                if (task->data[2] == 5)
+                    task->data[0] = 3;
+                else
+                    task->data[0]++;
+            }
+        }
+
+        if (task->data[11])
+            task->data[11]--;
+        break;
+    case 2:
+        if (task->data[11])
+            task->data[11]--;
+
+        if (++task->data[1] > 4)
+        {
+            task->data[1] = 0;
+            if (task->data[2] & 1)
+            {
+                task->data[7] = 4;
+                task->data[8] = 68;
+                task->data[4] = 0;
+                task->data[5] = 1;
+            }
+            else
+            {
+                task->data[7] = 68;
+                task->data[8] = 4;
+                task->data[4] = 7;
+                task->data[5] = -1;
+            }
+
+            if (task->data[11])
+                task->data[0] = 4;
+            else
+                task->data[0] = 1;
+        }
+        break;
+    case 3:
+        if (task->data[3] == 0)
+            DestroyAnimVisualTask(taskId);
+        break;
+    case 4:
+        if (task->data[11])
+            task->data[11]--;
+        else
+            task->data[0] = 1;
+        break;
+    }
+}
+
+static bool8 sub_810B430(struct Task *task, u8 taskId)
+{
+    u8 spriteId = CreateSprite(&gUnknown_08595A30, task->data[6], task->data[7], 35);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].oam.tileNum += task->data[4];
+        task->data[4] += task->data[5];
+        if (task->data[4] < 0)
+            task->data[4] = 7;
+        if (task->data[4] > 7)
+            task->data[4] = 0;
+
+        gSprites[spriteId].data[6] = taskId;
+        gSprites[spriteId].data[7] = 3;
+        task->data[3]++;
+    }
+
+    if (task->data[4] == 0 && task->data[5] > 0)
+    {
+        task->data[14] += task->data[15];
+        PlaySE12WithPanning(SE_W085, task->data[14]);
+    }
+
+    if ((task->data[5] < 0 && task->data[7] <= task->data[8])
+        || (task->data[5] > 0 && task->data[7] >= task->data[8]))
+    {
+        task->data[2]++;
+        task->data[6] += task->data[9];
+        return TRUE;
+    }
+    else
+    {
+        task->data[7] += task->data[5] * 8;
+        return FALSE;
+    }
+}
+
+static void sub_810B51C(struct Sprite *sprite)
+{
+    if (++sprite->data[0] > 12)
+    {
+        gTasks[sprite->data[6]].data[sprite->data[7]]--;
+        DestroySprite(sprite);
+    }
+}
+
+void sub_810B55C(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        task->data[15] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 32;
+        task->data[14] = task->data[15];
+        while (task->data[14] > 16)
+        {
+            task->data[14] -= 32;
+        }
+
+        task->data[13] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+        task->data[12] = GetBattlerSpriteSubpriority(gBattleAnimTarget) - 2;
+        task->data[0]++;
+        break;
+    case 1:
+        if (++task->data[1] > 1)
+        {
+            task->data[1] = 0;
+            if (sub_810B614(task, taskId))
+                task->data[0]++;
+        }
+        break;
+    case 2:
+        if (task->data[10] == 0)
+            DestroyAnimVisualTask(taskId);
+        break;
+    }
+}