Merge branch 'master' into slot_machine

1 files changed, 56 insertions, 0 deletions

diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c
new file mode 100644
index 000000000..78953d96a
--- /dev/null
+++ b/src/battle/anim/noise.c
@@ -0,0 +1,56 @@
+#include "global.h"
+#include "rom_8077ABC.h"
+#include "battle_anim.h"
+
+extern s16 gBattleAnimArgs[8];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+static void sub_80D2E30(struct Sprite *);
+
+// noise (moving music note)
+// Used in Uproar.
+
+void sub_80D2D68(struct Sprite* sprite)
+{
+    int var1;
+    u8 slot = gBattleAnimArgs[0] == 0 ? gBattleAnimBankAttacker : gBattleAnimBankTarget;
+
+    if (GetBankSide(slot) == 1)
+    {
+        gBattleAnimArgs[1] *= -1;
+    }
+
+    sprite->pos1.x = sub_8077ABC(slot, 2)  + gBattleAnimArgs[1];
+    sprite->pos1.y = sub_8077ABC(slot, 3) + gBattleAnimArgs[2];
+    sprite->data[0] = 0;
+    sprite->data[1] = (u16)sprite->pos1.x << 3;
+    sprite->data[2] = (u16)sprite->pos1.y << 3;
+
+    var1 = gBattleAnimArgs[1] << 3;
+    if (var1 < 0)
+        var1 += 7;
+    sprite->data[3] = var1 >> 3;
+
+    var1 = gBattleAnimArgs[2] << 3;
+    if (var1 < 0)
+        var1 += 7;
+    sprite->data[4] = var1 >> 3;
+
+    sprite->oam.tileNum += gBattleAnimArgs[3] * 16;
+    sprite->callback = sub_80D2E30;
+}
+
+static void sub_80D2E30(struct Sprite *sprite)
+{
+    sprite->data[1] += sprite->data[3];
+    sprite->data[2] += sprite->data[4];
+
+    sprite->pos1.x = sprite->data[1] >> 3;
+    sprite->pos1.y = sprite->data[2] >> 3;
+
+    if (++sprite->data[0] > 16)
+    {
+        move_anim_8072740(sprite);
+    } 
+}