summaryrefslogtreecommitdiff
path: root/src/battle/anim/noise.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/noise.c')
-rw-r--r--src/battle/anim/noise.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c
index 369650d82..6a6f6c10a 100644
--- a/src/battle/anim/noise.c
+++ b/src/battle/anim/noise.c
@@ -6,23 +6,35 @@ extern s16 gBattleAnimArgs[8];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
+void sub_80D2D68(struct Sprite* sprite);
static void sub_80D2E30(struct Sprite *);
// noise (moving music note)
// Used in Uproar.
+const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7CC8 =
+{
+ .tileTag = 10225,
+ .paletteTag = 10225,
+ .oam = &gOamData_837DF34,
+ .anims = gDummySpriteAnimTable,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = sub_80D2D68,
+};
+
void sub_80D2D68(struct Sprite* sprite)
{
int var1;
u8 slot = gBattleAnimArgs[0] == 0 ? gAnimBankAttacker : gAnimBankTarget;
- if (GetBankSide(slot) == 1)
+ if (GetBattlerSide(slot) == 1)
{
gBattleAnimArgs[1] *= -1;
}
- sprite->pos1.x = GetBankPosition(slot, 2) + gBattleAnimArgs[1];
- sprite->pos1.y = GetBankPosition(slot, 3) + gBattleAnimArgs[2];
+ sprite->pos1.x = GetBattlerSpriteCoord(slot, 2) + gBattleAnimArgs[1];
+ sprite->pos1.y = GetBattlerSpriteCoord(slot, 3) + gBattleAnimArgs[2];
sprite->data[0] = 0;
sprite->data[1] = (u16)sprite->pos1.x << 3;
sprite->data[2] = (u16)sprite->pos1.y << 3;