Merge branch 'master' into cable_car

1 files changed, 28 insertions, 0 deletions

diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c
new file mode 100755
index 000000000..b19304f17
--- /dev/null
+++ b/src/battle/anim/cyclone.c
@@ -0,0 +1,28 @@
+#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;
+
+// cyclone (creates a circling motion like a cyclone, usually a wind sprite.)
+// Used in Razor Wind.
+
+void sub_80D0118(struct Sprite* sprite)
+{
+    sub_80787B0(sprite, 0);
+    if (GetBankSide(gBattleAnimBankAttacker) == 0)
+        sprite->pos1.y += 16;
+
+    sprite->data[0] = gBattleAnimArgs[4];
+    sprite->data[1] = gBattleAnimArgs[2];
+    sprite->data[2] = gBattleAnimArgs[5];
+    sprite->data[3] = gBattleAnimArgs[6];
+    sprite->data[4] = gBattleAnimArgs[3];
+    sprite->callback = sub_8078114;
+    StoreSpriteCallbackInData(sprite, move_anim_8072740);
+    sprite->callback(sprite);
+}