Merge branch 'master' into contest_link_80C2020

1 files changed, 33 insertions, 2 deletions

diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c
index 211e0e841..341f74372 100644
--- a/src/battle/anim/guard.c
+++ b/src/battle/anim/guard.c
@@ -8,9 +8,40 @@ extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 extern u16 gBattleTypeFlags;
 
+void sub_80D3014(struct Sprite *sprite);
+
 // guard (moves guard rings upwards)
 // Used in Safeguard.
 
+const union AffineAnimCmd gSpriteAffineAnim_83D7D4C[] =
+{
+    AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+    AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_83D7D5C[] =
+{
+    AFFINEANIMCMD_FRAME(0x200, 0x100, 0, 0),
+    AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7D6C[] =
+{
+    gSpriteAffineAnim_83D7D4C,
+    gSpriteAffineAnim_83D7D5C,
+};
+
+const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D74 =
+{
+    .tileTag = 10244,
+    .paletteTag = 10244,
+    .oam = &gOamData_837E13C,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gSpriteAffineAnimTable_83D7D6C,
+    .callback = sub_80D3014,
+};
+
 void sub_80D3014(struct Sprite *sprite)
 {
     if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
@@ -22,8 +53,8 @@ void sub_80D3014(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0);
-        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + 40;
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+        sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 40;
     }
 
     sprite->data[0] = 13;