fixing merge conflicts

1 files changed, 45 insertions, 0 deletions

diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c
new file mode 100755
index 000000000..19ea4297b
--- /dev/null
+++ b/src/battle/anim/brace.c
@@ -0,0 +1,45 @@
+#include "global.h"
+#include "rom_8077ABC.h"
+#include "trig.h"
+#include "battle_anim.h"
+#include "sound.h"
+
+extern s16 gBattleAnimArgs[];
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
+
+static void sub_80CDF70(struct Sprite* sprite);
+
+// brace (the Pokemon prepares to endure a hit)
+// Used in Endure.
+
+void sub_80CDF0C(struct Sprite* sprite)
+{
+    if (gBattleAnimArgs[0] == 0)
+    {
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[2];
+    }
+    else
+    {
+        sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0) + gBattleAnimArgs[1];
+        sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1) + gBattleAnimArgs[2];
+    }
+
+    sprite->data[0] = 0;
+    sprite->data[1] = gBattleAnimArgs[3];
+    sprite->callback = sub_80CDF70;
+}
+
+void sub_80CDF70(struct Sprite* sprite)
+{
+    if (++sprite->data[0] > sprite->data[1])
+    {
+        sprite->data[0] = 0;
+        sprite->pos1.y--;
+    }
+
+    sprite->pos1.y -= sprite->data[0];
+    if (sprite->animEnded)
+        DestroyAnimSprite(sprite);
+}