summaryrefslogtreecommitdiff
path: root/src/water.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/water.c')
-rw-r--r--src/water.c122
1 files changed, 61 insertions, 61 deletions
diff --git a/src/water.c b/src/water.c
index eb7c13c8f..c39064d71 100644
--- a/src/water.c
+++ b/src/water.c
@@ -505,8 +505,8 @@ static void AnimRainDrop_Step(struct Sprite *sprite)
{
if (++sprite->data[0] < 14) // Was 13 in emerald
{
- sprite->pos2.x += 1;
- sprite->pos2.y += 4;
+ sprite->x2 += 1;
+ sprite->y2 += 4;
}
if (sprite->animEnded)
{
@@ -521,28 +521,28 @@ static void AnimWaterBubbleProjectile(struct Sprite *sprite)
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0];
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0];
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
sprite->animPaused = TRUE;
}
else
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
sprite->animPaused = TRUE;
}
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[6];
- sprite->data[1] = sprite->pos1.x;
+ sprite->data[1] = sprite->x;
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
- sprite->data[3] = sprite->pos1.y;
+ sprite->data[3] = sprite->y;
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
InitAnimLinearTranslation(sprite);
spriteId = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
sprite->data[5] = spriteId;
- sprite->pos1.x -= Sin((u8)gBattleAnimArgs[4], gBattleAnimArgs[2]);
- sprite->pos1.y -= Cos((u8)gBattleAnimArgs[4], gBattleAnimArgs[3]);
+ sprite->x -= Sin((u8)gBattleAnimArgs[4], gBattleAnimArgs[2]);
+ sprite->y -= Cos((u8)gBattleAnimArgs[4], gBattleAnimArgs[3]);
gSprites[spriteId].data[0] = gBattleAnimArgs[2];
gSprites[spriteId].data[1] = gBattleAnimArgs[3];
gSprites[spriteId].data[2] = gBattleAnimArgs[5];
@@ -560,8 +560,8 @@ static void AnimWaterBubbleProjectile_Step1(struct Sprite *sprite)
sprite->data[0] = 1;
AnimTranslateLinear(sprite);
- sprite->pos2.x += Sin(trigIndex >> 8, gSprites[otherSpriteId].data[0]);
- sprite->pos2.y += Cos(trigIndex >> 8, gSprites[otherSpriteId].data[1]);
+ sprite->x2 += Sin(trigIndex >> 8, gSprites[otherSpriteId].data[0]);
+ sprite->y2 += Cos(trigIndex >> 8, gSprites[otherSpriteId].data[1]);
gSprites[otherSpriteId].data[3] = trigIndex + gSprites[otherSpriteId].data[2];
if (--timer != 0)
{
@@ -598,9 +598,9 @@ static void AnimAuroraBeamRings(struct Sprite *sprite)
else
unkArg = gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
- sprite->data[1] = sprite->pos1.x;
+ sprite->data[1] = sprite->x;
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + unkArg;
- sprite->data[3] = sprite->pos1.y;
+ sprite->data[3] = sprite->y;
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
InitAnimLinearTranslation(sprite);
sprite->callback = AnimAuroraBeamRings_Step;
@@ -652,9 +652,9 @@ static void AnimToTargetInSinWave(struct Sprite *sprite)
InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = 30;
- sprite->data[1] = sprite->pos1.x;
+ sprite->data[1] = sprite->x;
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
- sprite->data[3] = sprite->pos1.y;
+ sprite->data[3] = sprite->y;
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
InitAnimLinearTranslation(sprite);
sprite->data[5] = 0xD200 / sprite->data[0];
@@ -677,7 +677,7 @@ static void AnimToTargetInSinWave_Step(struct Sprite *sprite)
{
if (AnimTranslateLinear(sprite))
DestroyAnimSprite(sprite);
- sprite->pos2.y += Sin(sprite->data[6] >> 8, sprite->data[7]);
+ sprite->y2 += Sin(sprite->data[6] >> 8, sprite->data[7]);
if ((sprite->data[6] + sprite->data[5]) >> 8 > 127)
{
sprite->data[6] = 0;
@@ -708,26 +708,26 @@ static void AnimHydroCannonCharge(struct Sprite *sprite)
{
u8 priority;
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
- sprite->pos2.y = -10;
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+ sprite->y2 = -10;
priority = GetBattlerSpriteSubpriority(gBattleAnimAttacker);
if (!IsContest())
{
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{
- sprite->pos2.x = 10;
+ sprite->x2 = 10;
sprite->subpriority = priority + 2;
}
else
{
- sprite->pos2.x = -10;
+ sprite->x2 = -10;
sprite->subpriority = priority - 2;
}
}
else
{
- sprite->pos2.x = -10;
+ sprite->x2 = -10;
sprite->subpriority = priority + 2;
}
sprite->callback = AnimHydroCannonCharge_Step;
@@ -773,8 +773,8 @@ static void AnimWaterGunDroplet(struct Sprite *sprite)
{
InitSpritePosToAnimTarget(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[4];
- sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
- sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4];
+ sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+ sprite->data[4] = sprite->y + gBattleAnimArgs[4];
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
@@ -792,9 +792,9 @@ static void AnimSmallBubblePair(struct Sprite *sprite)
static void AnimSmallBubblePair_Step(struct Sprite *sprite)
{
sprite->data[0] = (sprite->data[0] + 11) & 0xFF;
- sprite->pos2.x = Sin(sprite->data[0], 4);
+ sprite->x2 = Sin(sprite->data[0], 4);
sprite->data[1] += 48;
- sprite->pos2.y = -(sprite->data[1] >> 8);
+ sprite->y2 = -(sprite->data[1] >> 8);
if (sprite->data[7]-- == 0)
DestroyAnimSprite(sprite);
}
@@ -1032,10 +1032,10 @@ static void AnimSmallDriftingBubbles_Step(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);
}
@@ -1045,7 +1045,7 @@ void AnimTask_WaterSpoutLaunch(u8 taskId)
struct Task *task = &gTasks[taskId];
task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
- task->data[5] = gSprites[task->data[15]].pos1.y;
+ task->data[5] = gSprites[task->data[15]].y;
task->data[1] = GetWaterSpoutPowerForAnim();
PrepareBattlerSpriteForRotScale(task->data[15], ST_OAM_OBJ_NORMAL);
task->func = AnimTask_WaterSpoutLaunch_Step;
@@ -1066,18 +1066,18 @@ static void AnimTask_WaterSpoutLaunch_Step(u8 taskId)
task->data[3] = 0;
if (++task->data[4] & 1)
{
- gSprites[task->data[15]].pos2.x = 3;
- gSprites[task->data[15]].pos1.y++;
+ gSprites[task->data[15]].x2 = 3;
+ gSprites[task->data[15]].y++;
}
else
{
- gSprites[task->data[15]].pos2.x = -3;
+ gSprites[task->data[15]].x2 = -3;
}
}
if (BattleAnimHelper_RunSpriteSquash(task) == 0)
{
SetBattlerSpriteYOffsetFromYScale(task->data[15]);
- gSprites[task->data[15]].pos2.x = 0;
+ gSprites[task->data[15]].x2 = 0;
task->data[3] = 0;
task->data[4] = 0;
task->data[0]++;
@@ -1107,9 +1107,9 @@ static void AnimTask_WaterSpoutLaunch_Step(u8 taskId)
{
task->data[3] = 0;
if (++task->data[4] & 1)
- gSprites[task->data[15]].pos2.y += 2;
+ gSprites[task->data[15]].y2 += 2;
else
- gSprites[task->data[15]].pos2.y -= 2;
+ gSprites[task->data[15]].y2 -= 2;
if (task->data[4] == 10)
{
BattleAnimHelper_SetSpriteSquashParams(task, task->data[15], 384, 224, 0x100, 0x100, 8);
@@ -1120,11 +1120,11 @@ static void AnimTask_WaterSpoutLaunch_Step(u8 taskId)
}
break;
case 6:
- gSprites[task->data[15]].pos1.y--;
+ gSprites[task->data[15]].y--;
if (BattleAnimHelper_RunSpriteSquash(task) == 0)
{
ResetSpriteRotScale(task->data[15]);
- gSprites[task->data[15]].pos1.y = task->data[5];
+ gSprites[task->data[15]].y = task->data[5];
task->data[4] = 0;
task->data[0]++;
}
@@ -1214,9 +1214,9 @@ static void AnimSmallWaterOrb(struct Sprite *sprite)
case 1:
sprite->data[2] += sprite->data[4];
sprite->data[3] += sprite->data[5];
- sprite->pos1.x = sprite->data[2] >> 4;
- sprite->pos1.y = sprite->data[3] >> 4;
- if (sprite->pos1.x < -8 || sprite->pos1.x > 248 || sprite->pos1.y < -8 || sprite->pos1.y > 120)
+ sprite->x = sprite->data[2] >> 4;
+ sprite->y = sprite->data[3] >> 4;
+ if (sprite->x < -8 || sprite->x > 248 || sprite->y < -8 || sprite->y > 120)
{
gTasks[sprite->data[6]].data[sprite->data[7]]--;
DestroySprite(sprite);
@@ -1311,11 +1311,11 @@ static void AnimWaterSpoutRain(struct Sprite *sprite)
{
if (sprite->data[0] == 0)
{
- sprite->pos1.y += 8;
- if (sprite->pos1.y >= sprite->data[5])
+ sprite->y += 8;
+ if (sprite->y >= sprite->data[5])
{
gTasks[sprite->data[6]].data[10] = 1;
- sprite->data[1] = CreateSprite(&gWaterHitSplatSpriteTemplate, sprite->pos1.x, sprite->pos1.y, 1);
+ sprite->data[1] = CreateSprite(&gWaterHitSplatSpriteTemplate, sprite->x, sprite->y, 1);
if (sprite->data[1] != MAX_SPRITES)
{
StartSpriteAffineAnim(&gSprites[sprite->data[1]], 3);
@@ -1454,11 +1454,11 @@ static void AnimWaterSportDroplet(struct Sprite *sprite)
{
if (TranslateAnimHorizontalArc(sprite))
{
- sprite->pos1.x += sprite->pos2.x;
- sprite->pos1.y += sprite->pos2.y;
+ sprite->x += sprite->x2;
+ sprite->y += sprite->y2;
sprite->data[0] = 6;
- sprite->data[2] = (Random() & 0x1F) - 16 + sprite->pos1.x;
- sprite->data[4] = (Random() & 0x1F) - 16 + sprite->pos1.y;
+ sprite->data[2] = (Random() & 0x1F) - 16 + sprite->x;
+ sprite->data[4] = (Random() & 0x1F) - 16 + sprite->y;
sprite->data[5] = ~(Random() & 7);
InitAnimArcTranslation(sprite);
sprite->callback = AnimWaterSportDroplet_Step;
@@ -1485,8 +1485,8 @@ static void AnimWaterSportDroplet_Step(struct Sprite *sprite)
static void AnimWaterPulseBubble(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];
sprite->data[1] = gBattleAnimArgs[3];
sprite->data[2] = gBattleAnimArgs[4];
@@ -1497,9 +1497,9 @@ static void AnimWaterPulseBubble(struct Sprite *sprite)
static void AnimWaterPulseBubble_Step(struct Sprite *sprite)
{
sprite->data[4] -= sprite->data[0];
- sprite->pos2.y = sprite->data[4] / 10;
+ sprite->y2 = sprite->data[4] / 10;
sprite->data[5] = (sprite->data[5] + sprite->data[1]) & 0xFF;
- sprite->pos2.x = Sin(sprite->data[5], sprite->data[2]);
+ sprite->x2 = Sin(sprite->data[5], sprite->data[2]);
if (--sprite->data[3] == 0)
DestroyAnimSprite(sprite);
}
@@ -1508,8 +1508,8 @@ static void AnimWaterPulseRingBubble(struct Sprite *sprite)
{
sprite->data[3] += sprite->data[1];
sprite->data[4] += sprite->data[2];
- sprite->pos2.x = sprite->data[3] >> 7;
- sprite->pos2.y = sprite->data[4] >> 7;
+ sprite->x2 = sprite->data[3] >> 7;
+ sprite->y2 = sprite->data[4] >> 7;
if (--sprite->data[0] == 0)
{
FreeSpriteOamMatrix(sprite);
@@ -1529,11 +1529,11 @@ void AnimWaterPulseRing(struct Sprite *sprite)
static void AnimWaterPulseRing_Step(struct Sprite *sprite)
{
- int xDiff = sprite->data[1] - sprite->pos1.x;
- int yDiff = sprite->data[2] - sprite->pos1.y;
+ int xDiff = sprite->data[1] - sprite->x;
+ int yDiff = sprite->data[2] - sprite->y;
- sprite->pos2.x = (sprite->data[0] * xDiff) / sprite->data[3];
- sprite->pos2.y = (sprite->data[0] * yDiff) / sprite->data[3];
+ sprite->x2 = (sprite->data[0] * xDiff) / sprite->data[3];
+ sprite->y2 = (sprite->data[0] * yDiff) / sprite->data[3];
if (++sprite->data[5] == sprite->data[4])
{
sprite->data[5] = 0;
@@ -1553,8 +1553,8 @@ static void CreateWaterPulseRingBubbles(struct Sprite *sprite, s32 xDiff, s32 yD
u8 spriteId;
something = sprite->data[0] / 2;
- combinedX = sprite->pos1.x + sprite->pos2.x;
- combinedY = sprite->pos1.y + sprite->pos2.y;
+ combinedX = sprite->x + sprite->x2;
+ combinedY = sprite->y + sprite->y2;
if (yDiff < 0)
unusedVar *= -1; //Needed to Match
somethingRandomY = yDiff + (Random() % 10) - 5;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 07:58:46 +0000