summaryrefslogtreecommitdiff
path: root/src/ice.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ice.c')
-rw-r--r--src/ice.c178
1 files changed, 89 insertions, 89 deletions
diff --git a/src/ice.c b/src/ice.c
index fc3d80dea..80310a4af 100644
--- a/src/ice.c
+++ b/src/ice.c
@@ -541,8 +541,8 @@ static void sub_80AF108(struct Sprite *sprite)
sprite->data[2] = -sprite->data[2];
for (; (attackerX >= -32 && attackerX <= 272) && (attackerY >= -32 && attackerY <= 192); attackerX += sprite->data[1], attackerY += sprite->data[2])
;
- sprite->pos1.x = attackerX;
- sprite->pos1.y = attackerY;
+ sprite->x = attackerX;
+ sprite->y = attackerY;
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[1] = attackerX;
sprite->data[2] = targetX;
@@ -561,10 +561,10 @@ static void sub_80AF28C(struct Sprite *sprite)
{
sprite->data[5] += sprite->data[1];
sprite->data[6] += sprite->data[2];
- sprite->pos2.x = sprite->data[5];
- sprite->pos2.y = sprite->data[6];
- sprite->pos2.x += Sin(sprite->data[7], sprite->data[3]);
- sprite->pos2.y += Sin(sprite->data[7], sprite->data[3]);
+ sprite->x2 = sprite->data[5];
+ sprite->y2 = sprite->data[6];
+ sprite->x2 += Sin(sprite->data[7], sprite->data[3]);
+ sprite->y2 += Sin(sprite->data[7], sprite->data[3]);
sprite->data[7] = (sprite->data[7] + sprite->data[4]) & 0xFF;
--sprite->data[0];
}
@@ -621,11 +621,11 @@ static void AnimIceEffectParticle(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
+ SetAverageBattlerPositions(gBattleAnimTarget, 1, &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];
}
StoreSpriteCallbackInData6(sprite, AnimFlickerIceEffectParticle);
sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
@@ -652,8 +652,8 @@ static void AnimSwirlingSnowball_Step1(struct Sprite *sprite)
InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[4];
- sprite->data[1] = sprite->pos1.x;
- sprite->data[3] = sprite->pos1.y;
+ sprite->data[1] = sprite->x;
+ sprite->data[3] = sprite->y;
if (!gBattleAnimArgs[5])
{
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
@@ -676,14 +676,14 @@ static void AnimSwirlingSnowball_Step1(struct Sprite *sprite)
{
sprite->data[0] = 1;
AnimFastTranslateLinear(sprite);
- if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > 272
- || sprite->pos1.y + sprite->pos2.y > 160
- || sprite->pos1.y + sprite->pos2.y < -16)
+ if ((u32)(sprite->x + sprite->x2 + 16) > 272
+ || sprite->y + sprite->y2 > 160
+ || sprite->y + sprite->y2 < -16)
break;
}
- sprite->pos1.x += sprite->pos2.x;
- sprite->pos1.y += sprite->pos2.y;
- sprite->pos2.x = sprite->pos2.y = 0;
+ sprite->x += sprite->x2;
+ sprite->y += sprite->y2;
+ sprite->x2 = sprite->y2 = 0;
for (i = 0; i < 8; ++i)
sprite->data[i] = tempDataHolder[i];
sprite->callback = InitAndStartAnimFastLinearTranslationWithSpeed;
@@ -694,10 +694,10 @@ static void AnimSwirlingSnowball_Step2(struct Sprite *sprite)
{
s16 tempVar;
- sprite->pos1.x += sprite->pos2.x;
- sprite->pos1.y += sprite->pos2.y;
- sprite->pos2.y = 0;
- sprite->pos2.x = 0;
+ sprite->x += sprite->x2;
+ sprite->y += sprite->y2;
+ sprite->y2 = 0;
+ sprite->x2 = 0;
sprite->data[0] = 128;
tempVar = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 20 : -20;
sprite->data[3] = Sin(sprite->data[0], tempVar);
@@ -713,16 +713,16 @@ static void AnimSwirlingSnowball_Step3(struct Sprite *sprite)
if (sprite->data[5] <= 31)
{
- sprite->pos2.x = Sin(sprite->data[0], tempVar) - sprite->data[3];
- sprite->pos2.y = Cos(sprite->data[0], 15) - sprite->data[4];
+ sprite->x2 = Sin(sprite->data[0], tempVar) - sprite->data[3];
+ sprite->y2 = Cos(sprite->data[0], 15) - sprite->data[4];
sprite->data[0] = (sprite->data[0] + 16) & 0xFF;
sprite->data[5] += 1;
}
else
{
- sprite->pos1.x += sprite->pos2.x;
- sprite->pos1.y += sprite->pos2.y;
- sprite->pos2.x = sprite->pos2.y = 0;
+ sprite->x += sprite->x2;
+ sprite->y += sprite->y2;
+ sprite->x2 = sprite->y2 = 0;
sprite->data[3] = sprite->data[4] = 0;
sprite->callback = AnimSwirlingSnowball_End;
}
@@ -732,9 +732,9 @@ static void AnimSwirlingSnowball_End(struct Sprite *sprite)
{
sprite->data[0] = 1;
AnimFastTranslateLinear(sprite);
- if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > 272
- || sprite->pos1.y + sprite->pos2.y > 256
- || sprite->pos1.y + sprite->pos2.y < -16)
+ if ((u32)(sprite->x + sprite->x2 + 16) > 272
+ || sprite->y + sprite->y2 > 256
+ || sprite->y + sprite->y2 < -16)
DestroyAnimSprite(sprite);
}
@@ -755,8 +755,8 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite)
InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[4];
- sprite->data[1] = sprite->pos1.x;
- sprite->data[3] = sprite->pos1.y;
+ sprite->data[1] = sprite->x;
+ sprite->data[3] = sprite->y;
if (!gBattleAnimArgs[7])
{
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
@@ -780,15 +780,15 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite)
{
sprite->data[0] = 1;
AnimFastTranslateLinear(sprite);
- if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > 272
- || sprite->pos1.y + sprite->pos2.y > 160
- || sprite->pos1.y + sprite->pos2.y < -16)
+ if ((u32)(sprite->x + sprite->x2 + 16) > 272
+ || sprite->y + sprite->y2 > 160
+ || sprite->y + sprite->y2 < -16)
break;
}
- sprite->pos1.x += sprite->pos2.x;
- sprite->pos1.y += sprite->pos2.y;
- sprite->pos2.y = 0;
- sprite->pos2.x = 0;
+ sprite->x += sprite->x2;
+ sprite->y += sprite->y2;
+ sprite->y2 = 0;
+ sprite->x2 = 0;
for (i = 0; i < 8; ++i)
sprite->data[i] = tempDataHolder[i];
sprite->data[5] = gBattleAnimArgs[5];
@@ -802,13 +802,13 @@ static void AnimWiggleParticleTowardsTarget(struct Sprite *sprite)
AnimFastTranslateLinear(sprite);
if (sprite->data[0] == 0)
sprite->data[0] = 1;
- sprite->pos2.y += Sin(sprite->data[7], sprite->data[5]);
+ sprite->y2 += Sin(sprite->data[7], sprite->data[5]);
sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF;
if (sprite->data[0] == 1)
{
- if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > 272
- || sprite->pos1.y + sprite->pos2.y > 160
- || sprite->pos1.y + sprite->pos2.y < -16)
+ if ((u32)(sprite->x + sprite->x2 + 16) > 272
+ || sprite->y + sprite->y2 > 160
+ || sprite->y + sprite->y2 < -16)
DestroyAnimSprite(sprite);
}
}
@@ -827,11 +827,11 @@ static void AnimWaveFromCenterOfTarget(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+ SetAverageBattlerPositions(gBattleAnimTarget, 0, &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];
}
@@ -862,12 +862,12 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+ SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
- sprite->pos1.x -= gBattleAnimArgs[0];
+ sprite->x -= gBattleAnimArgs[0];
else
- sprite->pos1.x += gBattleAnimArgs[0];
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->x += gBattleAnimArgs[0];
+ sprite->y += gBattleAnimArgs[1];
}
battler = gBattleAnimAttacker;
}
@@ -879,12 +879,12 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
}
else
{
- SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+ SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
- sprite->pos1.x -= gBattleAnimArgs[0];
+ sprite->x -= gBattleAnimArgs[0];
else
- sprite->pos1.x += gBattleAnimArgs[0];
- sprite->pos1.y += gBattleAnimArgs[1];
+ sprite->x += gBattleAnimArgs[0];
+ sprite->y += gBattleAnimArgs[1];
}
battler = gBattleAnimTarget;
}
@@ -895,12 +895,12 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
tempVar = 0x40;
sprite->data[6] = tempVar;
if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
- sprite->pos1.y += 8;
+ sprite->y += 8;
sprite->data[0] = gBattleAnimArgs[3];
- sprite->data[1] = sprite->pos1.x;
- sprite->data[2] = sprite->pos1.x;
- sprite->data[3] = sprite->pos1.y;
- sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[2];
+ sprite->data[1] = sprite->x;
+ sprite->data[2] = sprite->x;
+ sprite->data[3] = sprite->y;
+ sprite->data[4] = sprite->y + gBattleAnimArgs[2];
InitAnimLinearTranslation(sprite);
sprite->data[5] = 64;
sprite->callback = AnimSwirlingFogAnim;
@@ -912,8 +912,8 @@ static void AnimSwirlingFogAnim(struct Sprite *sprite)
{
if (!AnimTranslateLinear(sprite))
{
- sprite->pos2.x += Sin(sprite->data[5], sprite->data[6]);
- sprite->pos2.y += Cos(sprite->data[5], -6);
+ sprite->x2 += Sin(sprite->data[5], sprite->data[6]);
+ sprite->y2 += Cos(sprite->data[5], -6);
if ((u16)(sprite->data[5] - 64) <= 0x7F)
sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]);
else
@@ -1019,8 +1019,8 @@ static void AnimTask_Haze2(u8 taskId)
// arg 5: ??? unknown (seems to vibrate target mon somehow)
static void AnimThrowMistBall(struct Sprite *sprite)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
sprite->callback = TranslateAnimSpriteToTargetMonLocation;
}
@@ -1127,21 +1127,21 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite)
sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1;
sprite->data[6] = 1;
}
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
if (gBattleAnimArgs[7])
{
- sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1];
+ sprite->data[1] = sprite->x + gBattleAnimArgs[1];
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[3];
- sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
+ sprite->data[3] = sprite->y + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[4];
sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8;
}
else
{
- sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1];
+ sprite->data[1] = sprite->x + gBattleAnimArgs[1];
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[3];
- sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
+ sprite->data[3] = sprite->y + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + gBattleAnimArgs[4];
sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8;
}
@@ -1163,7 +1163,7 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
case 0:
AnimTranslateLinear(sprite);
value = gSineTable[sprite->data[5]];
- sprite->pos2.x += value >> 4;
+ sprite->x2 += value >> 4;
if (sprite->data[6])
sprite->data[5] = (sprite->data[5] - 8) & 0xFF;
else
@@ -1171,12 +1171,12 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
if (sprite->data[0] <= 0)
{
sprite->data[0] = 80;
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X);
- sprite->data[1] = sprite->pos1.x;
- sprite->data[2] = sprite->pos1.x;
- sprite->pos1.y += sprite->pos2.y;
- sprite->data[3] = sprite->pos1.y;
- sprite->data[4] = sprite->pos1.y + 29;
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X);
+ sprite->data[1] = sprite->x;
+ sprite->data[2] = sprite->x;
+ sprite->y += sprite->y2;
+ sprite->data[3] = sprite->y;
+ sprite->data[4] = sprite->y + 29;
++sprite->data[7];
if (IsContest())
sprite->data[5] = 80;
@@ -1184,9 +1184,9 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
sprite->data[5] = 204;
else
sprite->data[5] = 80;
- sprite->pos2.y = 0;
+ sprite->y2 = 0;
value = gSineTable[sprite->data[5]];
- sprite->pos2.x = value >> 3;
+ sprite->x2 = value >> 3;
sprite->data[5] = (sprite->data[5] + 2) & 0xFF;
InitAnimLinearTranslation(sprite);
}
@@ -1194,8 +1194,8 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
case 1:
AnimTranslateLinear(sprite);
value = gSineTable[sprite->data[5]];
- sprite->pos2.x += value >> 3;
- sprite->pos2.y += (gSineTable[sprite->data[5] + 0x40] * -3) >> 8;
+ sprite->x2 += value >> 3;
+ sprite->y2 += (gSineTable[sprite->data[5] + 0x40] * -3) >> 8;
if (!IsContest())
{
u16 var0 = sprite->data[5] - 0x40;
@@ -1219,9 +1219,9 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
if (sprite->data[0] <= 0)
{
sprite->data[0] = 0x300;
- sprite->data[1] = sprite->pos1.x += sprite->pos2.x;
- sprite->data[3] = sprite->pos1.y += sprite->pos2.y;
- sprite->data[4] = sprite->pos1.y + 4;
+ sprite->data[1] = sprite->x += sprite->x2;
+ sprite->data[3] = sprite->y += sprite->y2;
+ sprite->data[4] = sprite->y + 4;
if (IsContest())
sprite->data[2] = -0x10;
else if (GET_BATTLER_SIDE2(gBattleAnimTarget) != B_SIDE_PLAYER)
@@ -1229,7 +1229,7 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
else
sprite->data[2] = -0x10;
++sprite->data[7];
- sprite->pos2.x = sprite->pos2.y = 0;
+ sprite->x2 = sprite->y2 = 0;
BattleAnim_InitLinearTranslationWithDuration(sprite);
}
break;
@@ -1362,9 +1362,9 @@ static void AnimHailBegin(struct Sprite *sprite)
{
u8 spriteId;
- sprite->pos1.x += 4;
- sprite->pos1.y += 8;
- if (sprite->pos1.x < sprite->data[3] && sprite->pos1.y < sprite->data[4])
+ sprite->x += 4;
+ sprite->y += 8;
+ if (sprite->x < sprite->data[3] && sprite->y < sprite->data[4])
return;
if (sprite->data[0] == 1 && sprite->data[5] == 0)
{
@@ -1455,10 +1455,10 @@ static void AnimIceBallParticle(struct Sprite *sprite)
sprite->data[3] += sprite->data[1];
sprite->data[4] += sprite->data[2];
if (sprite->data[1] & 1)
- sprite->pos2.x = -(sprite->data[3] >> 8);
+ sprite->x2 = -(sprite->data[3] >> 8);
else
- sprite->pos2.x = sprite->data[3] >> 8;
- sprite->pos2.y = sprite->data[4] >> 8;
+ sprite->x2 = sprite->data[3] >> 8;
+ sprite->y2 = sprite->data[4] >> 8;
if (++sprite->data[0] == 21)
DestroyAnimSprite(sprite);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 07:56:00 +0000