summaryrefslogtreecommitdiff
path: root/src/battle_anim_mon_movement.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_anim_mon_movement.c')
-rw-r--r--src/battle_anim_mon_movement.c154
1 files changed, 77 insertions, 77 deletions
diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c
index b9c4c7b30..31857c4dc 100644
--- a/src/battle_anim_mon_movement.c
+++ b/src/battle_anim_mon_movement.c
@@ -99,8 +99,8 @@ void AnimTask_ShakeMon(u8 taskId)
DestroyAnimVisualTask(taskId);
return;
}
- gSprites[spriteId].pos2.x = gBattleAnimArgs[1];
- gSprites[spriteId].pos2.y = gBattleAnimArgs[2];
+ gSprites[spriteId].x2 = gBattleAnimArgs[1];
+ gSprites[spriteId].y2 = gBattleAnimArgs[2];
gTasks[taskId].data[0] = spriteId;
gTasks[taskId].data[1] = gBattleAnimArgs[3];
gTasks[taskId].data[2] = gBattleAnimArgs[4];
@@ -115,27 +115,27 @@ static void AnimTask_ShakeMon_Step(u8 taskId)
{
if (gTasks[taskId].data[3] == 0)
{
- if (gSprites[gTasks[taskId].data[0]].pos2.x == 0)
+ if (gSprites[gTasks[taskId].data[0]].x2 == 0)
{
- gSprites[gTasks[taskId].data[0]].pos2.x = gTasks[taskId].data[4];
+ gSprites[gTasks[taskId].data[0]].x2 = gTasks[taskId].data[4];
}
else
{
- gSprites[gTasks[taskId].data[0]].pos2.x = 0;
+ gSprites[gTasks[taskId].data[0]].x2 = 0;
}
- if (gSprites[gTasks[taskId].data[0]].pos2.y == 0)
+ if (gSprites[gTasks[taskId].data[0]].y2 == 0)
{
- gSprites[gTasks[taskId].data[0]].pos2.y = gTasks[taskId].data[5];
+ gSprites[gTasks[taskId].data[0]].y2 = gTasks[taskId].data[5];
}
else
{
- gSprites[gTasks[taskId].data[0]].pos2.y = 0;
+ gSprites[gTasks[taskId].data[0]].y2 = 0;
}
gTasks[taskId].data[3] = gTasks[taskId].data[2];
if (--gTasks[taskId].data[1] == 0)
{
- gSprites[gTasks[taskId].data[0]].pos2.x = 0;
- gSprites[gTasks[taskId].data[0]].pos2.y = 0;
+ gSprites[gTasks[taskId].data[0]].x2 = 0;
+ gSprites[gTasks[taskId].data[0]].y2 = 0;
DestroyAnimVisualTask(taskId);
return;
}
@@ -203,8 +203,8 @@ void AnimTask_ShakeMon2(u8 taskId)
return;
}
- gSprites[spriteId].pos2.x = gBattleAnimArgs[1];
- gSprites[spriteId].pos2.y = gBattleAnimArgs[2];
+ gSprites[spriteId].x2 = gBattleAnimArgs[1];
+ gSprites[spriteId].y2 = gBattleAnimArgs[2];
gTasks[taskId].data[0] = spriteId;
gTasks[taskId].data[1] = gBattleAnimArgs[3];
gTasks[taskId].data[2] = gBattleAnimArgs[4];
@@ -219,21 +219,21 @@ static void AnimTask_ShakeMon2_Step(u8 taskId)
{
if (gTasks[taskId].data[3] == 0)
{
- if (gSprites[gTasks[taskId].data[0]].pos2.x == gTasks[taskId].data[4])
- gSprites[gTasks[taskId].data[0]].pos2.x = -gTasks[taskId].data[4];
+ if (gSprites[gTasks[taskId].data[0]].x2 == gTasks[taskId].data[4])
+ gSprites[gTasks[taskId].data[0]].x2 = -gTasks[taskId].data[4];
else
- gSprites[gTasks[taskId].data[0]].pos2.x = gTasks[taskId].data[4];
+ gSprites[gTasks[taskId].data[0]].x2 = gTasks[taskId].data[4];
- if (gSprites[gTasks[taskId].data[0]].pos2.y == gTasks[taskId].data[5])
- gSprites[gTasks[taskId].data[0]].pos2.y = -gTasks[taskId].data[5];
+ if (gSprites[gTasks[taskId].data[0]].y2 == gTasks[taskId].data[5])
+ gSprites[gTasks[taskId].data[0]].y2 = -gTasks[taskId].data[5];
else
- gSprites[gTasks[taskId].data[0]].pos2.y = gTasks[taskId].data[5];
+ gSprites[gTasks[taskId].data[0]].y2 = gTasks[taskId].data[5];
gTasks[taskId].data[3] = gTasks[taskId].data[2];
if (--gTasks[taskId].data[1] == 0)
{
- gSprites[gTasks[taskId].data[0]].pos2.x = 0;
- gSprites[gTasks[taskId].data[0]].pos2.y = 0;
+ gSprites[gTasks[taskId].data[0]].x2 = 0;
+ gSprites[gTasks[taskId].data[0]].y2 = 0;
DestroyAnimVisualTask(taskId);
return;
}
@@ -261,8 +261,8 @@ void AnimTask_ShakeMonInPlace(u8 taskId)
return;
}
- gSprites[spriteId].pos2.x += gBattleAnimArgs[1];
- gSprites[spriteId].pos2.y += gBattleAnimArgs[2];
+ gSprites[spriteId].x2 += gBattleAnimArgs[1];
+ gSprites[spriteId].y2 += gBattleAnimArgs[2];
gTasks[taskId].data[0] = spriteId;
gTasks[taskId].data[1] = 0;
gTasks[taskId].data[2] = gBattleAnimArgs[3];
@@ -280,26 +280,26 @@ static void AnimTask_ShakeMonInPlace_Step(u8 taskId)
{
if (gTasks[taskId].data[1] & 1)
{
- gSprites[gTasks[taskId].data[0]].pos2.x += gTasks[taskId].data[5];
- gSprites[gTasks[taskId].data[0]].pos2.y += gTasks[taskId].data[6];
+ gSprites[gTasks[taskId].data[0]].x2 += gTasks[taskId].data[5];
+ gSprites[gTasks[taskId].data[0]].y2 += gTasks[taskId].data[6];
}
else
{
- gSprites[gTasks[taskId].data[0]].pos2.x -= gTasks[taskId].data[5];
- gSprites[gTasks[taskId].data[0]].pos2.y -= gTasks[taskId].data[6];
+ gSprites[gTasks[taskId].data[0]].x2 -= gTasks[taskId].data[5];
+ gSprites[gTasks[taskId].data[0]].y2 -= gTasks[taskId].data[6];
}
gTasks[taskId].data[3] = gTasks[taskId].data[4];
if (++gTasks[taskId].data[1] >= gTasks[taskId].data[2])
{
if (gTasks[taskId].data[1] & 1)
{
- gSprites[gTasks[taskId].data[0]].pos2.x += gTasks[taskId].data[5] / 2;
- gSprites[gTasks[taskId].data[0]].pos2.y += gTasks[taskId].data[6] / 2;
+ gSprites[gTasks[taskId].data[0]].x2 += gTasks[taskId].data[5] / 2;
+ gSprites[gTasks[taskId].data[0]].y2 += gTasks[taskId].data[6] / 2;
}
else
{
- gSprites[gTasks[taskId].data[0]].pos2.x -= gTasks[taskId].data[5] / 2;
- gSprites[gTasks[taskId].data[0]].pos2.y -= gTasks[taskId].data[6] / 2;
+ gSprites[gTasks[taskId].data[0]].x2 -= gTasks[taskId].data[5] / 2;
+ gSprites[gTasks[taskId].data[0]].y2 -= gTasks[taskId].data[6] / 2;
}
DestroyAnimVisualTask(taskId);
return;
@@ -320,7 +320,7 @@ static void AnimTask_ShakeMonInPlace_Step(u8 taskId)
void AnimTask_ShakeAndSinkMon(u8 taskId)
{
u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
- gSprites[spriteId].pos2.x = gBattleAnimArgs[1];
+ gSprites[spriteId].x2 = gBattleAnimArgs[1];
gTasks[taskId].data[0] = spriteId;
gTasks[taskId].data[1] = gBattleAnimArgs[1];
gTasks[taskId].data[2] = gBattleAnimArgs[2];
@@ -339,15 +339,15 @@ static void AnimTask_ShakeAndSinkMon_Step(u8 taskId)
if (gTasks[taskId].data[2] == gTasks[taskId].data[8]++)
{
gTasks[taskId].data[8] = 0;
- if (gSprites[spriteId].pos2.x == x)
+ if (gSprites[spriteId].x2 == x)
x = -x;
- gSprites[spriteId].pos2.x += x;
+ gSprites[spriteId].x2 += x;
}
gTasks[taskId].data[1] = x;
gTasks[taskId].data[9] += gTasks[taskId].data[3];
- gSprites[spriteId].pos2.y = gTasks[taskId].data[9] >> 8;
+ gSprites[spriteId].y2 = gTasks[taskId].data[9] >> 8;
if (--gTasks[taskId].data[4] == 0)
{
DestroyAnimVisualTask(taskId);
@@ -390,9 +390,9 @@ void AnimTask_TranslateMonElliptical(u8 taskId)
static void AnimTask_TranslateMonElliptical_Step(u8 taskId)
{
u8 spriteId = gTasks[taskId].data[0];
- gSprites[spriteId].pos2.x = Sin(gTasks[taskId].data[5], gTasks[taskId].data[1]);
- gSprites[spriteId].pos2.y = -Cos(gTasks[taskId].data[5], gTasks[taskId].data[2]);
- gSprites[spriteId].pos2.y += gTasks[taskId].data[2];
+ gSprites[spriteId].x2 = Sin(gTasks[taskId].data[5], gTasks[taskId].data[1]);
+ gSprites[spriteId].y2 = -Cos(gTasks[taskId].data[5], gTasks[taskId].data[2]);
+ gSprites[spriteId].y2 += gTasks[taskId].data[2];
gTasks[taskId].data[5] += gTasks[taskId].data[4];
gTasks[taskId].data[5] &= 0xff;
@@ -401,8 +401,8 @@ static void AnimTask_TranslateMonElliptical_Step(u8 taskId)
if (gTasks[taskId].data[3] == 0)
{
- gSprites[spriteId].pos2.x = 0;
- gSprites[spriteId].pos2.y = 0;
+ gSprites[spriteId].x2 = 0;
+ gSprites[spriteId].y2 = 0;
DestroyAnimVisualTask(taskId);
return;
}
@@ -493,15 +493,15 @@ static void SlideMonToOriginalPos(struct Sprite *sprite)
monSpriteId = gBattlerSpriteIds[gBattleAnimTarget];
sprite->data[0] = gBattleAnimArgs[2];
- sprite->data[1] = gSprites[monSpriteId].pos1.x + gSprites[monSpriteId].pos2.x;
- sprite->data[2] = gSprites[monSpriteId].pos1.x;
- sprite->data[3] = gSprites[monSpriteId].pos1.y + gSprites[monSpriteId].pos2.y;
- sprite->data[4] = gSprites[monSpriteId].pos1.y;
+ sprite->data[1] = gSprites[monSpriteId].x + gSprites[monSpriteId].x2;
+ sprite->data[2] = gSprites[monSpriteId].x;
+ sprite->data[3] = gSprites[monSpriteId].y + gSprites[monSpriteId].y2;
+ sprite->data[4] = gSprites[monSpriteId].y;
InitSpriteDataForLinearTranslation(sprite);
sprite->data[3] = 0;
sprite->data[4] = 0;
- sprite->data[5] = gSprites[monSpriteId].pos2.x;
- sprite->data[6] = gSprites[monSpriteId].pos2.y;
+ sprite->data[5] = gSprites[monSpriteId].x2;
+ sprite->data[6] = gSprites[monSpriteId].y2;
sprite->invisible = TRUE;
if (gBattleAnimArgs[1] == 1)
@@ -526,10 +526,10 @@ static void SlideMonToOriginalPos_Step(struct Sprite *sprite)
if (sprite->data[0] == 0)
{
if (lo < 2)
- monSprite->pos2.x = 0;
+ monSprite->x2 = 0;
if (lo == 2 || lo == 0)
- monSprite->pos2.y = 0;
+ monSprite->y2 = 0;
DestroyAnimSprite(sprite);
}
@@ -538,8 +538,8 @@ static void SlideMonToOriginalPos_Step(struct Sprite *sprite)
sprite->data[0]--;
sprite->data[3] += sprite->data[1];
sprite->data[4] += sprite->data[2];
- monSprite->pos2.x = (s8)(sprite->data[3] >> 8) + sprite->data[5];
- monSprite->pos2.y = (s8)(sprite->data[4] >> 8) + sprite->data[6];
+ monSprite->x2 = (s8)(sprite->data[3] >> 8) + sprite->data[5];
+ monSprite->y2 = (s8)(sprite->data[4] >> 8) + sprite->data[6];
}
}
@@ -571,10 +571,10 @@ static void SlideMonToOffset(struct Sprite *sprite)
}
sprite->data[0] = gBattleAnimArgs[4];
- sprite->data[1] = gSprites[monSpriteId].pos1.x;
- sprite->data[2] = gSprites[monSpriteId].pos1.x + gBattleAnimArgs[1];
- sprite->data[3] = gSprites[monSpriteId].pos1.y;
- sprite->data[4] = gSprites[monSpriteId].pos1.y + gBattleAnimArgs[2];
+ sprite->data[1] = gSprites[monSpriteId].x;
+ sprite->data[2] = gSprites[monSpriteId].x + gBattleAnimArgs[1];
+ sprite->data[3] = gSprites[monSpriteId].y;
+ sprite->data[4] = gSprites[monSpriteId].y + gBattleAnimArgs[2];
InitSpriteDataForLinearTranslation(sprite);
sprite->data[3] = 0;
sprite->data[4] = 0;
@@ -605,13 +605,13 @@ static void SlideMonToOffsetAndBack(struct Sprite *sprite)
}
}
sprite->data[0] = gBattleAnimArgs[4];
- sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+ sprite->data[1] = gSprites[spriteId].x + gSprites[spriteId].x2;
sprite->data[2] = sprite->data[1] + gBattleAnimArgs[1];
- sprite->data[3] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
+ sprite->data[3] = gSprites[spriteId].y + gSprites[spriteId].y2;
sprite->data[4] = sprite->data[3] + gBattleAnimArgs[2];
InitSpriteDataForLinearTranslation(sprite);
- sprite->data[3] = gSprites[spriteId].pos2.x << 8;
- sprite->data[4] = gSprites[spriteId].pos2.y << 8;
+ sprite->data[3] = gSprites[spriteId].x2 << 8;
+ sprite->data[4] = gSprites[spriteId].y2 << 8;
sprite->data[5] = spriteId;
sprite->data[6] = gBattleAnimArgs[5];
if (!gBattleAnimArgs[5])
@@ -628,8 +628,8 @@ static void SlideMonToOffsetAndBack(struct Sprite *sprite)
static void SlideMonToOffsetAndBack_End(struct Sprite *sprite)
{
- gSprites[sprite->data[5]].pos2.x = 0;
- gSprites[sprite->data[5]].pos2.y = 0;
+ gSprites[sprite->data[5]].x2 = 0;
+ gSprites[sprite->data[5]].y2 = 0;
DestroyAnimSprite(sprite);
}
@@ -667,8 +667,8 @@ static void AnimTask_WindUpLunge_Step1(u8 taskId)
u8 spriteId;
spriteId = gTasks[taskId].data[0];
gTasks[taskId].data[11] += gTasks[taskId].data[1];
- gSprites[spriteId].pos2.x = gTasks[taskId].data[11] >> 8;
- gSprites[spriteId].pos2.y = Sin((u8)(gTasks[taskId].data[10] >> 8), gTasks[taskId].data[2]);
+ gSprites[spriteId].x2 = gTasks[taskId].data[11] >> 8;
+ gSprites[spriteId].y2 = Sin((u8)(gTasks[taskId].data[10] >> 8), gTasks[taskId].data[2]);
gTasks[taskId].data[10] += gTasks[taskId].data[7];
if (--gTasks[taskId].data[3] == 0)
{
@@ -687,7 +687,7 @@ static void AnimTask_WindUpLunge_Step2(u8 taskId)
{
spriteId = gTasks[taskId].data[0];
gTasks[taskId].data[12] += gTasks[taskId].data[5];
- gSprites[spriteId].pos2.x = (gTasks[taskId].data[12] >> 8) + (gTasks[taskId].data[11] >> 8);
+ gSprites[spriteId].x2 = (gTasks[taskId].data[12] >> 8) + (gTasks[taskId].data[11] >> 8);
if (--gTasks[taskId].data[6] == 0)
{
DestroyAnimVisualTask(taskId);
@@ -741,8 +741,8 @@ void AnimTask_SlideOffScreen(u8 taskId)
static void AnimTask_SlideOffScreen_Step(u8 taskId)
{
u8 spriteId = gTasks[taskId].data[0];
- gSprites[spriteId].pos2.x += gTasks[taskId].data[1];
- if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x + 0x20 > 0x130u)
+ gSprites[spriteId].x2 += gTasks[taskId].data[1];
+ if (gSprites[spriteId].x2 + gSprites[spriteId].x + 0x20 > 0x130u)
{
DestroyAnimVisualTask(taskId);
return;
@@ -794,17 +794,17 @@ static void AnimTask_SwayMonStep(u8 taskId)
if (gTasks[taskId].data[0] == 0)
{
- gSprites[spriteId].pos2.x = sineValue;
+ gSprites[spriteId].x2 = sineValue;
}
else
{
if (GetBattlerSide(gTasks[taskId].data[5]) == B_SIDE_PLAYER)
{
- gSprites[spriteId].pos2.y = (sineValue >= 0) ? sineValue : -sineValue;
+ gSprites[spriteId].y2 = (sineValue >= 0) ? sineValue : -sineValue;
}
else
{
- gSprites[spriteId].pos2.y = (sineValue >= 0) ? -sineValue : sineValue;
+ gSprites[spriteId].y2 = (sineValue >= 0) ? -sineValue : sineValue;
}
}
@@ -815,8 +815,8 @@ static void AnimTask_SwayMonStep(u8 taskId)
gTasks[taskId].data[12] ^= 1;
if (--gTasks[taskId].data[3] == 0)
{
- gSprites[spriteId].pos2.x = 0;
- gSprites[spriteId].pos2.y = 0;
+ gSprites[spriteId].x2 = 0;
+ gSprites[spriteId].y2 = 0;
DestroyAnimVisualTask(taskId);
return;
}
@@ -1011,8 +1011,8 @@ void AnimTask_ShakeTargetBasedOnMovePowerOrDmg(u8 taskId)
gTasks[taskId].data[10] = gBattleAnimArgs[3];
gTasks[taskId].data[11] = gBattleAnimArgs[4];
gTasks[taskId].data[7] = GetAnimBattlerSpriteId(ANIM_TARGET);
- gTasks[taskId].data[8] = gSprites[gTasks[taskId].data[7]].pos2.x;
- gTasks[taskId].data[9] = gSprites[gTasks[taskId].data[7]].pos2.y;
+ gTasks[taskId].data[8] = gSprites[gTasks[taskId].data[7]].x2;
+ gTasks[taskId].data[9] = gSprites[gTasks[taskId].data[7]].y2;
gTasks[taskId].data[0] = 0;
gTasks[taskId].data[1] = gBattleAnimArgs[1];
gTasks[taskId].data[2] = gBattleAnimArgs[2];
@@ -1030,28 +1030,28 @@ static void AnimTask_ShakeTargetBasedOnMovePowerOrDmg_Step(u8 taskId)
{
if (task->data[12])
{
- gSprites[task->data[7]].pos2.x = task->data[8] + task->data[13];
+ gSprites[task->data[7]].x2 = task->data[8] + task->data[13];
}
else
{
- gSprites[task->data[7]].pos2.x = task->data[8] - task->data[14];
+ gSprites[task->data[7]].x2 = task->data[8] - task->data[14];
}
}
if (task->data[11])
{
if (task->data[12])
{
- gSprites[task->data[7]].pos2.y = task->data[15];
+ gSprites[task->data[7]].y2 = task->data[15];
}
else
{
- gSprites[task->data[7]].pos2.y = 0;
+ gSprites[task->data[7]].y2 = 0;
}
}
if (!--task->data[2])
{
- gSprites[task->data[7]].pos2.x = 0;
- gSprites[task->data[7]].pos2.y = 0;
+ gSprites[task->data[7]].x2 = 0;
+ gSprites[task->data[7]].y2 = 0;
DestroyAnimVisualTask(taskId);
return;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 18:47:53 +0000