From 4a01c3233aa8758a9a56fa419642c8bc4590d09a Mon Sep 17 00:00:00 2001
From: "Marco Willems (M17.1)" <progreon@gmail.com>
Date: Thu, 4 Jan 2018 04:15:17 +0100
Subject: Decompiled poison.s

---
 src/battle/anim/poison.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 src/battle/anim/poison.c

(limited to 'src/battle/anim/poison.c')

diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c
new file mode 100644
index 000000000..c53fb2a8b
--- /dev/null
+++ b/src/battle/anim/poison.c
@@ -0,0 +1,115 @@
+#include "global.h"
+#include "battle_anim.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
+
+void sub_80D9DD4(struct Sprite *sprite);
+void sub_80D9E78(struct Sprite *sprite);
+void sub_80D9EE8(struct Sprite *sprite);
+void sub_80D9FF0(struct Sprite *sprite);
+
+void sub_80D9D70(struct Sprite *sprite) {
+    if (!gBattleAnimArgs[3]) {
+        StartSpriteAnim(sprite, 2);
+    }
+    sub_80787B0(sprite, 1);
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
+    sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
+    sprite->data[5] = -30;
+    sub_80786EC(sprite);
+    sprite->callback = sub_80D9DD4;
+}
+
+void sub_80D9DD4(struct Sprite *sprite) {
+    if (sub_8078718(sprite)) {
+        DestroyAnimSprite(sprite);
+    }
+}
+
+void sub_80D9DF0(struct Sprite *sprite) {
+    s16 l1, l2;
+    if (!gBattleAnimArgs[3]) {
+        StartSpriteAnim(sprite, 2);
+    }
+    sub_80787B0(sprite, 1);
+    sub_807A3FC(gAnimBankTarget, 1, &l1, &l2);
+    if (GetBankSide(gAnimBankAttacker)) {
+        gBattleAnimArgs[4] = -gBattleAnimArgs[4];
+    }
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->data[2] = l1 + gBattleAnimArgs[4];
+    sprite->data[4] = l2 + gBattleAnimArgs[5];
+    sprite->data[5] = -30;
+    sub_80786EC(sprite);
+    sprite->callback = sub_80D9E78;
+}
+
+void sub_80D9E78(struct Sprite *sprite) {
+    if (sub_8078718(sprite)) {
+        DestroyAnimSprite(sprite);
+    }
+}
+
+void sub_80D9E94(struct Sprite *sprite) {
+    sprite->data[0] = gBattleAnimArgs[2];
+    sprite->data[1] = sprite->pos1.x;
+    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[0];
+    sprite->data[3] = sprite->pos1.y;
+    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[1];
+    sub_8078A5C(sprite);
+    sprite->data[5] = sprite->data[1] / gBattleAnimArgs[2];
+    sprite->data[6] = sprite->data[2] / gBattleAnimArgs[2];
+    sprite->callback = sub_80D9EE8;
+}
+
+void sub_80D9EE8(struct Sprite *sprite) {
+    sub_8078394(sprite);
+    sprite->data[1] -= sprite->data[5];
+    sprite->data[2] -= sprite->data[6];
+    if (!sprite->data[0]) {
+        DestroyAnimSprite(sprite);
+    }
+}
+
+void sub_80D9F14(struct Sprite *sprite) {
+    sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+    if (GetBankSide(gAnimBankAttacker)) {
+        gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+    }
+    sprite->pos1.x += gBattleAnimArgs[0];
+    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
+    sprite->data[4] = sprite->pos1.y + sprite->data[0];
+    sprite->callback = sub_8078B34;
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
+}
+
+void sub_80D9F88(struct Sprite *sprite) {
+    if (!gBattleAnimArgs[2]) {
+        sub_8078764(sprite, TRUE);
+    } else {
+        sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+        if (GetBankSide(gAnimBankAttacker)) {
+            gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+        }
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
+    }
+    sprite->callback = sub_80D9FF0;
+}
+
+void sub_80D9FF0(struct Sprite *sprite) {
+    sprite->data[0] = (sprite->data[0] + 0xB) & 0xFF;
+    sprite->pos2.x = Sin(sprite->data[0], 4);
+    sprite->data[1] += 0x30;
+    sprite->pos2.y = -(sprite->data[1] >> 8);
+    if (sprite->affineAnimEnded) {
+        DestroyAnimSprite(sprite);
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 5588053754c2f1e293123cb1b793b867848f7c04 Mon Sep 17 00:00:00 2001
From: "Marco Willems (M17.1)" <progreon@gmail.com>
Date: Thu, 4 Jan 2018 23:05:01 +0100
Subject: Formatted to fit with the rest of the source code

---
 src/battle/anim/poison.c | 83 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 29 deletions(-)

(limited to 'src/battle/anim/poison.c')

diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c
index c53fb2a8b..f31c441fb 100644
--- a/src/battle/anim/poison.c
+++ b/src/battle/anim/poison.c
@@ -12,104 +12,129 @@ void sub_80D9E78(struct Sprite *sprite);
 void sub_80D9EE8(struct Sprite *sprite);
 void sub_80D9FF0(struct Sprite *sprite);
 
-void sub_80D9D70(struct Sprite *sprite) {
-    if (!gBattleAnimArgs[3]) {
+void sub_80D9D70(struct Sprite *sprite)
+{
+    if (!gBattleAnimArgs[3])
         StartSpriteAnim(sprite, 2);
-    }
+
     sub_80787B0(sprite, 1);
+
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
     sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
     sprite->data[5] = -30;
+
     sub_80786EC(sprite);
+
     sprite->callback = sub_80D9DD4;
 }
 
-void sub_80D9DD4(struct Sprite *sprite) {
-    if (sub_8078718(sprite)) {
+void sub_80D9DD4(struct Sprite *sprite) // same as sub_80D9E78
+{
+    if (sub_8078718(sprite))
         DestroyAnimSprite(sprite);
-    }
 }
 
-void sub_80D9DF0(struct Sprite *sprite) {
+void sub_80D9DF0(struct Sprite *sprite)
+{
     s16 l1, l2;
-    if (!gBattleAnimArgs[3]) {
+    if (!gBattleAnimArgs[3])
         StartSpriteAnim(sprite, 2);
-    }
+
     sub_80787B0(sprite, 1);
     sub_807A3FC(gAnimBankTarget, 1, &l1, &l2);
-    if (GetBankSide(gAnimBankAttacker)) {
+
+    if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[4] = -gBattleAnimArgs[4];
-    }
+
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[2] = l1 + gBattleAnimArgs[4];
     sprite->data[4] = l2 + gBattleAnimArgs[5];
     sprite->data[5] = -30;
+
     sub_80786EC(sprite);
+
     sprite->callback = sub_80D9E78;
 }
 
-void sub_80D9E78(struct Sprite *sprite) {
-    if (sub_8078718(sprite)) {
+void sub_80D9E78(struct Sprite *sprite) // same as sub_80D9DD4
+{
+    if (sub_8078718(sprite))
         DestroyAnimSprite(sprite);
-    }
 }
 
-void sub_80D9E94(struct Sprite *sprite) {
+void sub_80D9E94(struct Sprite *sprite)
+{
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = sprite->pos1.x;
     sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[0];
     sprite->data[3] = sprite->pos1.y;
     sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[1];
+
     sub_8078A5C(sprite);
+
     sprite->data[5] = sprite->data[1] / gBattleAnimArgs[2];
     sprite->data[6] = sprite->data[2] / gBattleAnimArgs[2];
+
     sprite->callback = sub_80D9EE8;
 }
 
-void sub_80D9EE8(struct Sprite *sprite) {
+void sub_80D9EE8(struct Sprite *sprite)
+{
     sub_8078394(sprite);
+
     sprite->data[1] -= sprite->data[5];
     sprite->data[2] -= sprite->data[6];
-    if (!sprite->data[0]) {
+
+    if (!sprite->data[0])
         DestroyAnimSprite(sprite);
-    }
 }
 
-void sub_80D9F14(struct Sprite *sprite) {
+void sub_80D9F14(struct Sprite *sprite)
+{
     sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
-    if (GetBankSide(gAnimBankAttacker)) {
+
+    if (GetBankSide(gAnimBankAttacker))
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
-    }
+
     sprite->pos1.x += gBattleAnimArgs[0];
     sprite->pos1.y += gBattleAnimArgs[1];
+
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
     sprite->data[4] = sprite->pos1.y + sprite->data[0];
+
     sprite->callback = sub_8078B34;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
-void sub_80D9F88(struct Sprite *sprite) {
-    if (!gBattleAnimArgs[2]) {
+void sub_80D9F88(struct Sprite *sprite)
+{
+    if (!gBattleAnimArgs[2])
+    {
         sub_8078764(sprite, TRUE);
-    } else {
+    }
+    else
+    {
         sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
-        if (GetBankSide(gAnimBankAttacker)) {
+
+        if (GetBankSide(gAnimBankAttacker))
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
-        }
+
         sprite->pos1.x += gBattleAnimArgs[0];
         sprite->pos1.y += gBattleAnimArgs[1];
     }
+
     sprite->callback = sub_80D9FF0;
 }
 
-void sub_80D9FF0(struct Sprite *sprite) {
+void sub_80D9FF0(struct Sprite *sprite)
+{
     sprite->data[0] = (sprite->data[0] + 0xB) & 0xFF;
     sprite->pos2.x = Sin(sprite->data[0], 4);
     sprite->data[1] += 0x30;
     sprite->pos2.y = -(sprite->data[1] >> 8);
-    if (sprite->affineAnimEnded) {
+
+    if (sprite->affineAnimEnded)
         DestroyAnimSprite(sprite);
-    }
 }
\ No newline at end of file
-- 
cgit v1.2.3