Merge branch 'master' into cable_car

1 files changed, 33 insertions, 0 deletions

diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c
new file mode 100755
index 000000000..538008be0
--- /dev/null
+++ b/src/battle/anim/alert.c
@@ -0,0 +1,33 @@
+#include "global.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+#include "battle_anim.h"
+#include "sound.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gBattleAnimBankAttacker;
+extern u8 gBattleAnimBankTarget;
+
+// alert (red thunder from the sides of a Pokemon, simulating more alert behavior.)
+// Used in Kinesis.
+
+void sub_80CF610(struct Sprite* sprite)
+{
+    sub_8078650(sprite);
+    sub_807867C(sprite, gBattleAnimArgs[0]);
+    sprite->pos1.y += gBattleAnimArgs[1];
+    if (GetBankSide(gBattleAnimBankAttacker) != 0)
+    {
+        sprite->hFlip = 1;
+        if (gBattleAnimArgs[2] != 0)
+            sprite->vFlip = 1;
+    }
+    else
+    {
+        if (gBattleAnimArgs[2] != 0)
+            sprite->vFlip = 1;
+    }
+
+    sprite->callback = sub_8078600;
+    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+}