fix merge conflicts

1 files changed, 24 insertions, 0 deletions

diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c
new file mode 100755
index 000000000..27afcbc0c
--- /dev/null
+++ b/src/battle/anim/perceive.c
@@ -0,0 +1,24 @@
+#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;
+
+// perceive (shows a sparkle in a set of eyes, usually for heightened perception.)
+// Used in Glare, Tickle, and Scary Face.
+
+void sub_80D2904(struct Sprite* sprite)
+{
+    if (sprite->animEnded)
+        move_anim_8072740(sprite);
+}
+
+void sub_80D2920(struct Sprite* sprite)
+{
+    sub_80787B0(sprite, 1);
+    sprite->callback = sub_80D2904;
+}