summaryrefslogtreecommitdiff
path: root/src/normal.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/normal.c')
-rw-r--r--src/normal.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/normal.c b/src/normal.c
index 422b413c6..157af414a 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -260,8 +260,8 @@ const struct SpriteTemplate gPersistHitSplatSpriteTemplate =
// arg 4: duration
static void AnimConfusionDuck(struct Sprite *sprite)
{
- sprite->pos1.x += gBattleAnimArgs[0];
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->x += gBattleAnimArgs[0];
+ sprite->y += gBattleAnimArgs[1];
sprite->data[0] = gBattleAnimArgs[2];
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
@@ -281,8 +281,8 @@ static void AnimConfusionDuck(struct Sprite *sprite)
static void AnimConfusionDuckStep(struct Sprite *sprite)
{
- sprite->pos2.x = Cos(sprite->data[0], 30);
- sprite->pos2.y = Sin(sprite->data[0], 10);
+ sprite->x2 = Cos(sprite->data[0], 30);
+ sprite->y2 = Sin(sprite->data[0], 10);
if ((u16)sprite->data[0] < 128)
sprite->oam.priority = 1;
else
@@ -393,8 +393,8 @@ static void sub_80B9B5C(struct Sprite *sprite)
static void sub_80B9B8C(struct Sprite *sprite)
{
- sprite->pos1.x += gBattleAnimArgs[0];
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->x += gBattleAnimArgs[0];
+ sprite->y += gBattleAnimArgs[1];
sprite->data[0] = 0;
sprite->data[1] = 10;
sprite->data[2] = 8;
@@ -869,8 +869,8 @@ static void AnimHitSplatRandom(struct Sprite *sprite)
InitSpritePosToAnimAttacker(sprite, 0);
else
InitSpritePosToAnimTarget(sprite, FALSE);
- sprite->pos2.x += (Random() % 48) - 24;
- sprite->pos2.y += (Random() % 24) - 12;
+ sprite->x2 += (Random() % 48) - 24;
+ sprite->y2 += (Random() % 24) - 12;
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
}
@@ -878,10 +878,10 @@ static void AnimHitSplatRandom(struct Sprite *sprite)
static void AnimHitSplatOnMonEdge(struct Sprite *sprite)
{
sprite->data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
- sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x;
- sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + gSprites[sprite->data[0]].pos2.y;
- sprite->pos2.x = gBattleAnimArgs[1];
- sprite->pos2.y = gBattleAnimArgs[2];
+ sprite->x = gSprites[sprite->data[0]].x + gSprites[sprite->data[0]].x2;
+ sprite->y = gSprites[sprite->data[0]].y + gSprites[sprite->data[0]].y2;
+ sprite->x2 = gBattleAnimArgs[1];
+ sprite->y2 = gBattleAnimArgs[2];
StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = RunStoredCallbackWhenAffineAnimEnds;