summaryrefslogtreecommitdiff
path: root/src/ghost.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ghost.c')
-rw-r--r--src/ghost.c98
1 files changed, 49 insertions, 49 deletions
diff --git a/src/ghost.c b/src/ghost.c
index c8ddf3c12..e0ed006b8 100644
--- a/src/ghost.c
+++ b/src/ghost.c
@@ -222,9 +222,9 @@ static void AnimConfuseRayBallBounce(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, 1);
sprite->data[0] = gBattleAnimArgs[2];
- 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);
BattleAnim_InitLinearTranslationWithDuration(sprite);
sprite->callback = sub_80B52D0;
@@ -243,8 +243,8 @@ static void sub_80B52D0(struct Sprite *sprite)
sprite->callback = sub_80B5344;
return;
}
- sprite->pos2.x += Sin(sprite->data[5], 10);
- sprite->pos2.y += Cos(sprite->data[5], 15);
+ sprite->x2 += Sin(sprite->data[5], 10);
+ sprite->y2 += Cos(sprite->data[5], 15);
r2 = sprite->data[5];
sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
r0 = sprite->data[5];
@@ -261,8 +261,8 @@ static void sub_80B5344(struct Sprite *sprite)
sprite->data[0] = 1;
AnimTranslateLinear(sprite);
- sprite->pos2.x += Sin(sprite->data[5], 10);
- sprite->pos2.y += Cos(sprite->data[5], 15);
+ sprite->x2 += Sin(sprite->data[5], 10);
+ sprite->y2 += Cos(sprite->data[5], 15);
r2 = sprite->data[5];
sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
r0 = sprite->data[5];
@@ -317,8 +317,8 @@ static void sub_80B5470(struct Sprite *sprite)
{
u16 temp1;
- sprite->pos2.x = Sin(sprite->data[0], 32);
- sprite->pos2.y = Cos(sprite->data[0], 8);
+ sprite->x2 = Sin(sprite->data[0], 32);
+ sprite->y2 = Cos(sprite->data[0], 8);
temp1 = sprite->data[0] - 65;
if (temp1 <= 130)
sprite->oam.priority = 2;
@@ -326,7 +326,7 @@ static void sub_80B5470(struct Sprite *sprite)
sprite->oam.priority = 1;
sprite->data[0] = (sprite->data[0] + 19) & 0xFF;
sprite->data[2] += 80;
- sprite->pos2.y += sprite->data[2] >> 8;
+ sprite->y2 += sprite->data[2] >> 8;
sprite->data[7] += 1;
if (sprite->data[7] == 61)
DestroyAnimSprite(sprite);
@@ -395,19 +395,19 @@ static void sub_80B55C8(u8 taskId)
// arg 2: duration step 3 (center -> target)
static void AnimShadowBall(struct Sprite *sprite)
{
- s16 oldPosX = sprite->pos1.x;
- s16 oldPosY = sprite->pos1.y;
+ s16 oldPosX = sprite->x;
+ s16 oldPosY = sprite->y;
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
sprite->data[0] = 0;
sprite->data[1] = gBattleAnimArgs[0];
sprite->data[2] = gBattleAnimArgs[1];
sprite->data[3] = gBattleAnimArgs[2];
- sprite->data[4] = sprite->pos1.x << 4;
- sprite->data[5] = sprite->pos1.y << 4;
- sprite->data[6] = ((oldPosX - sprite->pos1.x) << 4) / (gBattleAnimArgs[0] << 1);
- sprite->data[7] = ((oldPosY - sprite->pos1.y) << 4) / (gBattleAnimArgs[0] << 1);
+ sprite->data[4] = sprite->x << 4;
+ sprite->data[5] = sprite->y << 4;
+ sprite->data[6] = ((oldPosX - sprite->x) << 4) / (gBattleAnimArgs[0] << 1);
+ sprite->data[7] = ((oldPosY - sprite->y) << 4) / (gBattleAnimArgs[0] << 1);
sprite->callback = AnimShadowBallStep;
}
@@ -418,8 +418,8 @@ static void AnimShadowBallStep(struct Sprite *sprite)
case 0:
sprite->data[4] += sprite->data[6];
sprite->data[5] += sprite->data[7];
- sprite->pos1.x = sprite->data[4] >> 4;
- sprite->pos1.y = sprite->data[5] >> 4;
+ sprite->x = sprite->data[4] >> 4;
+ sprite->y = sprite->data[5] >> 4;
sprite->data[1] -= 1;
if (sprite->data[1] > 0)
break;
@@ -431,22 +431,22 @@ static void AnimShadowBallStep(struct Sprite *sprite)
break;
sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
- sprite->data[4] = sprite->pos1.x << 4;
- sprite->data[5] = sprite->pos1.y << 4;
- sprite->data[6] = ((sprite->data[1] - sprite->pos1.x) << 4) / sprite->data[3];
- sprite->data[7] = ((sprite->data[2] - sprite->pos1.y) << 4) / sprite->data[3];
+ sprite->data[4] = sprite->x << 4;
+ sprite->data[5] = sprite->y << 4;
+ sprite->data[6] = ((sprite->data[1] - sprite->x) << 4) / sprite->data[3];
+ sprite->data[7] = ((sprite->data[2] - sprite->y) << 4) / sprite->data[3];
sprite->data[0] += 1;
break;
case 2:
sprite->data[4] += sprite->data[6];
sprite->data[5] += sprite->data[7];
- sprite->pos1.x = sprite->data[4] >> 4;
- sprite->pos1.y = sprite->data[5] >> 4;
+ sprite->x = sprite->data[4] >> 4;
+ sprite->y = sprite->data[5] >> 4;
sprite->data[3] -= 1;
if (sprite->data[3] > 0)
break;
- sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+ sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+ sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
sprite->data[0] += 1;
break;
case 3:
@@ -648,7 +648,7 @@ static void sub_80B5AD4(u8 taskId)
++task->data[15];
break;
case 2:
- startLine = gSprites[task->data[13]].pos1.y + gSprites[task->data[13]].pos2.y - 32;
+ startLine = gSprites[task->data[13]].y + gSprites[task->data[13]].y2 - 32;
if (startLine < 0)
startLine = 0;
if (position == 1)
@@ -762,8 +762,8 @@ static void AnimDestinyBondWhiteShadow(struct Sprite *sprite)
sprite->data[6] = battler2Y;
sprite->data[7] = sprite->data[4] / 2;
sprite->oam.priority = 2;
- sprite->pos1.x = battler1X;
- sprite->pos1.y = battler1Y;
+ sprite->x = battler1X;
+ sprite->y = battler1Y;
sprite->callback = sub_80B5FE0;
sprite->invisible = TRUE;
}
@@ -774,8 +774,8 @@ static void sub_80B5FE0(struct Sprite *sprite)
{
sprite->data[0] += sprite->data[2];
sprite->data[1] += sprite->data[3];
- sprite->pos1.x = sprite->data[0] >> 4;
- sprite->pos1.y = sprite->data[1] >> 4;
+ sprite->x = sprite->data[0] >> 4;
+ sprite->y = sprite->data[1] >> 4;
if (--sprite->data[4] == 0)
sprite->data[0] = 0;
}
@@ -1020,7 +1020,7 @@ static void AnimCurseNail(struct Sprite *sprite)
xDelta = -24;
xDelta2 = 2;
}
- sprite->pos1.x += xDelta;
+ sprite->x += xDelta;
sprite->data[1] = xDelta2;
sprite->data[0] = 60;
sprite->callback = sub_80B66A8;
@@ -1036,12 +1036,12 @@ static void sub_80B66A8(struct Sprite *sprite)
}
else
{
- sprite->pos2.x += sprite->data[1];
- var0 = sprite->pos2.x + 7;
+ sprite->x2 += sprite->data[1];
+ var0 = sprite->x2 + 7;
if (var0 > 14)
{
- sprite->pos1.x += sprite->pos2.x;
- sprite->pos2.x = 0;
+ sprite->x += sprite->x2;
+ sprite->x2 = 0;
sprite->oam.tileNum += 8;
if (++sprite->data[2] == 3)
{
@@ -1097,12 +1097,12 @@ static void AnimGhostStatusSprite(struct Sprite *sprite)
{
u16 coeffB, coeffA;
- sprite->pos2.x = Sin(sprite->data[0], 12);
+ sprite->x2 = Sin(sprite->data[0], 12);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
- sprite->pos2.x = -sprite->pos2.x;
+ sprite->x2 = -sprite->x2;
sprite->data[0] = (sprite->data[0] + 6) & 0xFF;
sprite->data[1] += 0x100;
- sprite->pos2.y = -(sprite->data[1] >> 8);
+ sprite->y2 = -(sprite->data[1] >> 8);
++sprite->data[7];
if (sprite->data[7] == 1)
{
@@ -1244,7 +1244,7 @@ static void AnimGrudgeFlame(struct Sprite *sprite)
else
sprite->data[2] -= 2;
sprite->data[2] &= 0xFF;
- sprite->pos2.x = Sin(sprite->data[2], sprite->data[3]);
+ sprite->x2 = Sin(sprite->data[2], sprite->data[3]);
index = sprite->data[2] - 65;
if (index < 127)
sprite->oam.priority = gTasks[sprite->data[0]].data[5] + 1;
@@ -1252,7 +1252,7 @@ static void AnimGrudgeFlame(struct Sprite *sprite)
sprite->oam.priority = gTasks[sprite->data[0]].data[5];
++sprite->data[5];
sprite->data[6] = (sprite->data[5] * 8) & 0xFF;
- sprite->pos2.y = Sin(sprite->data[6], 7);
+ sprite->y2 = Sin(sprite->data[6], 7);
if (gTasks[sprite->data[0]].data[8])
{
--gTasks[sprite->data[0]].data[7];
@@ -1351,7 +1351,7 @@ static void sub_80B6BE4(u8 taskId)
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
break;
case 6:
- y = gSprites[task->data[4]].pos1.y + gSprites[task->data[4]].pos2.y - 0x20;
+ y = gSprites[task->data[4]].y + gSprites[task->data[4]].y2 - 0x20;
if (y < 0)
y = 0;
if (rank == 1)
@@ -1456,7 +1456,7 @@ static void sub_80B7158(struct Sprite *sprite)
sprite->data[2] = gBattleAnimArgs[0];
sprite->data[3] = gBattleAnimArgs[1];
sprite->callback = sub_80B71B0;
- gSprites[sprite->data[5]].pos1.y += 8;
+ gSprites[sprite->data[5]].y += 8;
}
static void sub_80B71B0(struct Sprite *sprite)
@@ -1464,17 +1464,17 @@ static void sub_80B71B0(struct Sprite *sprite)
if (sprite->data[3])
{
--sprite->data[3];
- gSprites[sprite->data[5]].pos2.x = Sin(sprite->data[0], sprite->data[1]);
- gSprites[sprite->data[5]].pos2.y = Cos(sprite->data[0], sprite->data[1]);
+ gSprites[sprite->data[5]].x2 = Sin(sprite->data[0], sprite->data[1]);
+ gSprites[sprite->data[5]].y2 = Cos(sprite->data[0], sprite->data[1]);
sprite->data[0] += sprite->data[2];
if (sprite->data[0] > 255)
sprite->data[0] -= 256;
}
else
{
- gSprites[sprite->data[5]].pos2.x = 0;
- gSprites[sprite->data[5]].pos2.y = 0;
- gSprites[sprite->data[5]].pos1.y -= 8;
+ gSprites[sprite->data[5]].x2 = 0;
+ gSprites[sprite->data[5]].y2 = 0;
+ gSprites[sprite->data[5]].y -= 8;
sprite->callback = DestroySpriteAndMatrix;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 07:49:09 +0000