Merge branch 'master' into contest_link_80C2020

1 files changed, 28 insertions, 1 deletions

diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c
index 2ed073221..9cd04e61f 100644
--- a/src/battle/anim/thunder.c
+++ b/src/battle/anim/thunder.c
@@ -7,14 +7,41 @@ extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 extern u16 gBattleTypeFlags;
 
+void sub_80D61C8(struct Sprite *sprite);
 static void sub_80D6218(struct Sprite *);
 
 // thunder (positions the lightning bolts)
 // Used in Thunder, Thunder Punch, and Tri Attack.
 
+const union AnimCmd gSpriteAnim_83D97B4[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(16, 5),
+    ANIMCMD_FRAME(32, 8),
+    ANIMCMD_FRAME(48, 5),
+    ANIMCMD_FRAME(64, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gSpriteAnimTable_83D97CC[] =
+{
+    gSpriteAnim_83D97B4,
+};
+
+const struct SpriteTemplate gBattleAnimSpriteTemplate_83D97D0 =
+{
+    .tileTag = 10037,
+    .paletteTag = 10037,
+    .oam = &gOamData_837DF34,
+    .anims = gSpriteAnimTable_83D97CC,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80D61C8,
+};
+
 void sub_80D61C8(struct Sprite *sprite)
 {
-    if (GetBankSide(gAnimBankAttacker) != 0)
+    if (GetBattlerSide(gAnimBankAttacker) != 0)
     {
         sprite->pos1.x -= gBattleAnimArgs[0];
     }