Merge branch 'master' into contest_link_80C2020

1 files changed, 28 insertions, 2 deletions

diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c
index e26669f63..bfe0c8da2 100644
--- a/src/battle/anim/twinkle.c
+++ b/src/battle/anim/twinkle.c
@@ -8,14 +8,40 @@ extern s16 gBattleAnimArgs[];
 extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 
+void sub_80CE36C(struct Sprite* sprite);
 static void sub_80CE3B0(struct Sprite* sprite);
 
 // twinkle (a tiny twinkling star appears above the Pokemon and descends toward the Pokemon.)
 // Used in Moonlight.
 
+const union AnimCmd gSpriteAnim_83D6FE0[] =
+{
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(8, 8),
+    ANIMCMD_FRAME(12, 8),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gSpriteAnimTable_83D6FF4[] =
+{
+    gSpriteAnim_83D6FE0,
+};
+
+const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8 =
+{
+    .tileTag = 10195,
+    .paletteTag = 10195,
+    .oam = &gOamData_837DF2C,
+    .anims = gSpriteAnimTable_83D6FF4,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80CE36C,
+};
+
 void sub_80CE36C(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0];
     sprite->pos1.y = gBattleAnimArgs[1];
     sprite->data[0] = 0;
     sprite->data[1] = 0;
@@ -25,7 +51,7 @@ void sub_80CE36C(struct Sprite* sprite)
     sprite->callback = sub_80CE3B0;
 }
 
-void sub_80CE3B0(struct Sprite* sprite)
+static void sub_80CE3B0(struct Sprite* sprite)
 {
     if (++sprite->data[1] > 1)
     {