Merge pull request #489 from camthesaxman/battle_anim

decompile some battle anim files

6 files changed, 208 insertions, 2 deletions

diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c
new file mode 100644
index 000000000..1ca5e649f
--- /dev/null
+++ b/src/battle/anim/aurora.c
@@ -0,0 +1,72 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "palette.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+#include "task.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D344C(struct Sprite *);
+static void sub_80D34D4(u8);
+
+void sub_80D33B4(struct Sprite *sprite)
+{
+    s16 r6;
+
+    sub_80787B0(sprite, 1);
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+        r6 = -gBattleAnimArgs[2];
+    else
+        r6 = gBattleAnimArgs[2];
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r6;
+    sprite->data[3] = sprite->pos1.y;
+    sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3];
+    obj_translate_based_on_private_1_2_3_4(sprite);
+    sprite->callback = sub_80D344C;
+    sprite->affineAnimPaused = TRUE;
+    sprite->callback(sprite);
+}
+
+static void sub_80D344C(struct Sprite *sprite)
+{
+    if ((u16)gBattleAnimArgs[7] == 0xFFFF)
+    {
+        StartSpriteAnim(sprite, 1);
+        sprite->affineAnimPaused = FALSE;
+    }
+    if (sub_8078B5C(sprite) != 0)
+        move_anim_8072740(sprite);
+}
+
+void sub_80D3490(u8 taskId)
+{
+    gTasks[taskId].data[0] = gBattleAnimArgs[0];
+    gTasks[taskId].data[2] = 0x100 + IndexOfSpritePaletteTag(0x279C) * 16;
+    gTasks[taskId].func = sub_80D34D4;
+}
+
+static void sub_80D34D4(u8 taskId)
+{
+    gTasks[taskId].data[10]++;
+    if (gTasks[taskId].data[10] == 3)
+    {
+        u16 r5;
+        u16 r6;
+        s32 i;
+
+        gTasks[taskId].data[10] = 0;
+        r5 = gTasks[taskId].data[2] + 1;
+        r6 = gPlttBufferFaded[r5];
+        for (i = 1; i < 8; i++)
+            gPlttBufferFaded[r5 + i - 1] = gPlttBufferFaded[r5 + i];
+        gPlttBufferFaded[r5 + 7] = r6;
+    }
+    gTasks[taskId].data[11]++;
+    if (gTasks[taskId].data[11] == gTasks[taskId].data[0])
+        DestroyAnimVisualTask(taskId);
+}
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c
new file mode 100644
index 000000000..345ee53ea
--- /dev/null
+++ b/src/battle/anim/devil.c
@@ -0,0 +1,37 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankTarget;
+
+void sub_80D2ABC(struct Sprite *sprite)
+{
+    if (sprite->data[3] == 0)
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+        StartSpriteAnim(sprite, 0);
+        sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1;
+        sprite->data[2] = 1;
+    }
+    sprite->data[0] += sprite->data[2];
+    sprite->data[1] = (sprite->data[0] * 4) % 256;
+    if (sprite->data[1] < 0)
+        sprite->data[1] = 0;
+    sprite->pos2.x = Cos(sprite->data[1], 30 - sprite->data[0] / 4);
+    sprite->pos2.y = Sin(sprite->data[1], 10 - sprite->data[0] / 8);
+    if (sprite->data[1] > 128 && sprite->data[2] > 0)
+        sprite->data[2] = -1;
+    if (sprite->data[1] == 0 && sprite->data[2] < 0)
+        sprite->data[2] = 1;
+    sprite->data[3]++;
+    if (sprite->data[3] < 10 || sprite->data[3] > 0x50)
+        sprite->invisible = sprite->data[0] % 2;
+    else
+        sprite->invisible = FALSE;
+    if (sprite->data[3] > 0x5A)
+        move_anim_8072740(sprite);
+}
diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c
new file mode 100644
index 000000000..63a01a79e
--- /dev/null
+++ b/src/battle/anim/struggle.c
@@ -0,0 +1,52 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D2CC4(struct Sprite *);
+
+void sub_80D2C38(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[2] == 0)
+    {
+        move_anim_8072740(sprite);
+    }
+    else
+    {
+        if (gBattleAnimArgs[0] == 0)
+        {
+            sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
+            sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
+        }
+        else
+        {
+            sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2);
+            sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3);
+        }
+
+        if (gBattleAnimArgs[1] == 0)
+            sprite->pos1.x += 32;
+        else
+            sprite->pos1.x -= 32;
+
+        sprite->data[0] = gBattleAnimArgs[2];
+        sprite->data[1] = gBattleAnimArgs[1];
+        StartSpriteAnim(sprite, sprite->data[1]);
+        sprite->callback = sub_80D2CC4;
+    }
+}
+
+static void sub_80D2CC4(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        if (--sprite->data[0] != 0)
+            StartSpriteAnim(sprite, sprite->data[1]);
+        else
+            move_anim_8072740(sprite);
+    }
+}
diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c
new file mode 100644
index 000000000..15bee06ee
--- /dev/null
+++ b/src/battle/anim/swipe.c
@@ -0,0 +1,20 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "sprite.h"
+
+extern s16 gBattleAnimArgs[8];
+
+void sub_80D2BE8(struct Sprite *sprite)
+{
+    if (sprite->data[0] == 0)
+    {
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+        StartSpriteAnim(sprite, gBattleAnimArgs[2]);
+        sprite->data[0]++;
+    }
+    else if (sprite->animEnded)
+    {
+        move_anim_8072740(sprite);
+    }
+}
diff --git a/src/battle/anim/uproar.c b/src/battle/anim/uproar.c
new file mode 100644
index 000000000..03cc65bc0
--- /dev/null
+++ b/src/battle/anim/uproar.c
@@ -0,0 +1,25 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "sprite.h"
+#include "task.h"
+
+extern s16 gBattleAnimArgs[8];
+
+extern const union AffineAnimCmd gUnknown_083D7CA8[];
+
+void sub_80D2D3C(u8);
+
+void sub_80D2CF8(u8 taskId)
+{
+    u8 spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]);
+
+    sub_80798F4(&gTasks[taskId], spriteId, gUnknown_083D7CA8);
+    gTasks[taskId].func = sub_80D2D3C;
+}
+
+void sub_80D2D3C(u8 taskId)
+{
+    if (!sub_807992C(&gTasks[taskId]))
+        DestroyAnimVisualTask(taskId);
+}
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 42f360b69..8fea7f710 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -1435,7 +1435,7 @@ void sub_80798AC(u8 task) {
     sub_80797EC(&gTasks[task]);
 }
 
-void sub_80798F4(struct Task *task, u8 a2, void *a3) {
+void sub_80798F4(struct Task *task, u8 a2, const void *a3) {
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[9] = 0;
@@ -1564,7 +1564,7 @@ u16 sub_8079B10(u8 sprite) {
     return 0x40;
 }
 
-void sub_8079BF4(s16 *bottom, s16 *top, void *ptr) {
+void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr) {
     *bottom = ((intptr_t) ptr) & 0xffff;
     *top = (((intptr_t) ptr) >> 16) & 0xffff;
 }