summaryrefslogtreecommitdiff
path: root/src/poison.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/poison.c')
-rw-r--r--src/poison.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/poison.c b/src/poison.c
index ae458d561..1a617aeaf 100644
--- a/src/poison.c
+++ b/src/poison.c
@@ -230,10 +230,10 @@ static void sub_80B1728(struct Sprite *sprite)
static void AnimSludgeBombHitParticle(struct Sprite *sprite)
{
sprite->data[0] = gBattleAnimArgs[2];
- sprite->data[1] = sprite->pos1.x;
- sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[0];
- sprite->data[3] = sprite->pos1.y;
- sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[1];
+ sprite->data[1] = sprite->x;
+ sprite->data[2] = sprite->x + gBattleAnimArgs[0];
+ sprite->data[3] = sprite->y;
+ sprite->data[4] = sprite->y + gBattleAnimArgs[1];
InitSpriteDataForLinearTranslation(sprite);
sprite->data[5] = sprite->data[1] / gBattleAnimArgs[2];
sprite->data[6] = sprite->data[2] / gBattleAnimArgs[2];
@@ -251,14 +251,14 @@ static void sub_80B1798(struct Sprite *sprite)
static void AnimAcidPoisonDroplet(struct Sprite *sprite)
{
- SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
- sprite->pos1.x += gBattleAnimArgs[0];
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->x += gBattleAnimArgs[0];
+ sprite->y += gBattleAnimArgs[1];
sprite->data[0] = gBattleAnimArgs[4];
- sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
- sprite->data[4] = sprite->pos1.y + sprite->data[0];
+ sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+ sprite->data[4] = sprite->y + sprite->data[0];
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
@@ -277,12 +277,12 @@ static void AnimBubbleEffect(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+ SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
- sprite->pos1.x += gBattleAnimArgs[0];
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->x += gBattleAnimArgs[0];
+ sprite->y += gBattleAnimArgs[1];
}
sprite->callback = AnimBubbleEffectStep;
}
@@ -290,9 +290,9 @@ static void AnimBubbleEffect(struct Sprite *sprite)
static void AnimBubbleEffectStep(struct Sprite *sprite)
{
sprite->data[0] = (sprite->data[0] + 0xB) & 0xFF;
- sprite->pos2.x = Sin(sprite->data[0], 4);
+ sprite->x2 = Sin(sprite->data[0], 4);
sprite->data[1] += 0x30;
- sprite->pos2.y = -(sprite->data[1] >> 8);
+ sprite->y2 = -(sprite->data[1] >> 8);
if (sprite->affineAnimEnded)
DestroyAnimSprite(sprite);
}