summaryrefslogtreecommitdiff
path: root/src/battle/anim/anger.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-25 17:50:27 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-25 17:50:27 -0500
commit605f8ac1141daf66d3428923e004f82f5a5e1594 (patch)
treea3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /src/battle/anim/anger.c
parente88e39d5fda1644f77e41fd652d4310612da7532 (diff)
parent659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff)
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/battle/anim/anger.c')
-rw-r--r--src/battle/anim/anger.c31
1 files changed, 28 insertions, 3 deletions
diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c
index 011aa68ce..a50404ddf 100644
--- a/src/battle/anim/anger.c
+++ b/src/battle/anim/anger.c
@@ -8,9 +8,34 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
+void sub_80D09C0(struct Sprite* sprite);
+
// anger (anger emotes, usually above the Pokemon's head, indicating annoyed emotions.)
// Used in Frustration, Rage, Swagger, Torment, and Taunt.
+const union AffineAnimCmd gSpriteAffineAnim_83D777C[] =
+{
+ AFFINEANIMCMD_FRAME(0xB, 0xB, 0, 8),
+ AFFINEANIMCMD_FRAME(0xFFF5, 0xFFF5, 0, 8),
+ AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7794[] =
+{
+ gSpriteAffineAnim_83D777C,
+};
+
+const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7798 =
+{
+ .tileTag = 10087,
+ .paletteTag = 10087,
+ .oam = &gOamData_837DF8C,
+ .anims = gDummySpriteAnimTable,
+ .images = NULL,
+ .affineAnims = gSpriteAffineAnimTable_83D7794,
+ .callback = sub_80D09C0,
+};
+
void sub_80D09C0(struct Sprite* sprite)
{
u8 bank;
@@ -19,13 +44,13 @@ void sub_80D09C0(struct Sprite* sprite)
else
bank = gAnimBankTarget;
- if (GetBankSide(bank) == 1)
+ if (GetBattlerSide(bank) == 1)
{
gBattleAnimArgs[1] *= -1;
}
- sprite->pos1.x = GetBankPosition(bank, 2) + gBattleAnimArgs[1];
- sprite->pos1.y = GetBankPosition(bank, 3) + gBattleAnimArgs[2];
+ sprite->pos1.x = GetBattlerSpriteCoord(bank, 2) + gBattleAnimArgs[1];
+ sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[2];
if (sprite->pos1.y <= 7)
sprite->pos1.y = 8;