diff options
Diffstat (limited to 'src/battle')
99 files changed, 1167 insertions, 1167 deletions
diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c index 13bdd997d..f37744968 100644 --- a/src/battle/anim/alert.c +++ b/src/battle/anim/alert.c @@ -46,7 +46,7 @@ void sub_80CF610(struct Sprite* sprite) { sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; if (GetBattlerSide(gBattleAnimAttacker) != 0) { sprite->hFlip = 1; diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c index 787691e6d..5eb44c015 100644 --- a/src/battle/anim/angel.c +++ b/src/battle/anim/angel.c @@ -40,20 +40,20 @@ void sub_80D2938(struct Sprite* sprite) s16 r5; if (sprite->data[0] == 0) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; } sprite->data[0]++; r5 = (sprite->data[0] * 10) & 0xFF; - sprite->pos2.x = Sin(r5, 0x50) >> 8; + sprite->x2 = Sin(r5, 0x50) >> 8; if (sprite->data[0] <= 0x4F) - sprite->pos2.y = (sprite->data[0] / 2) + (Cos(r5, 0x50) >> 8); + sprite->y2 = (sprite->data[0] / 2) + (Cos(r5, 0x50) >> 8); if (sprite->data[0] > 0x5A) { sprite->data[2]++; - sprite->pos2.x -= sprite->data[2] / 2; + sprite->x2 -= sprite->data[2] / 2; } if (sprite->data[0] > 0x64) diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c index e38c6f388..fed56cb68 100644 --- a/src/battle/anim/angel_kiss.c +++ b/src/battle/anim/angel_kiss.c @@ -28,8 +28,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7BD0 = static void sub_80D29CC(struct Sprite* sprite) { sprite->data[5]++; - sprite->pos2.x = Sin(sprite->data[3], 5); - sprite->pos2.y = sprite->data[5] / 2; + sprite->x2 = Sin(sprite->data[3], 5); + sprite->y2 = sprite->data[5] / 2; sprite->data[3] = (sprite->data[3] + 3) & 0xFF; if (sprite->data[5] > 20) sprite->invisible = sprite->data[5] % 2; @@ -49,16 +49,16 @@ void sub_80D2A38(struct Sprite* sprite) else { sprite->data[4] += sprite->data[1]; - sprite->pos2.x = sprite->data[4] >> 8; - sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]); + sprite->x2 = sprite->data[4] >> 8; + sprite->y2 = Sin(sprite->data[3], sprite->data[2]); sprite->data[3] = (sprite->data[3] + 3) & 0xFF; if (sprite->data[3] > 0x46) { sprite->callback = sub_80D29CC; - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[3] = Random() % 0xB4; } } diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c index 041d35803..7ba06de4f 100644 --- a/src/battle/anim/anger.c +++ b/src/battle/anim/anger.c @@ -49,10 +49,10 @@ void sub_80D09C0(struct Sprite* sprite) gBattleAnimArgs[1] *= -1; } - sprite->pos1.x = GetBattlerSpriteCoord(bank, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[2]; - if (sprite->pos1.y <= 7) - sprite->pos1.y = 8; + sprite->x = GetBattlerSpriteCoord(bank, 2) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[2]; + if (sprite->y <= 7) + sprite->y = 8; StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix); sprite->callback = sub_80785E4; diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c index b6f446de4..d66391f7d 100644 --- a/src/battle/anim/aurora.c +++ b/src/battle/anim/aurora.c @@ -71,9 +71,9 @@ void AnimAuroraRings(struct Sprite *sprite) else r6 = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r6; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; InitAnimLinearTranslation(sprite); sprite->callback = AnimGrowAuroraRings; diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c index be712e87a..7697a3935 100644 --- a/src/battle/anim/beta_beat_up.c +++ b/src/battle/anim/beta_beat_up.c @@ -40,11 +40,11 @@ void sub_80D6234(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) != 0) { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; } sprite->callback = sub_80D6278; diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c index f1baef38a..77e5e951f 100644 --- a/src/battle/anim/blow_kiss.c +++ b/src/battle/anim/blow_kiss.c @@ -29,9 +29,9 @@ void sub_80D1F58(struct Sprite* sprite) { InitAnimSpritePos(sprite, 1); sprite->data[0] = 0x5F; - 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->callback = sub_80D1FA4; @@ -41,7 +41,7 @@ static void sub_80D1FA4(struct Sprite* sprite) { if (TranslateAnimLinear(sprite) == 0) { - sprite->pos2.y += Sin(sprite->data[5], 14); + sprite->y2 += Sin(sprite->data[5], 14); sprite->data[5] = (sprite->data[5] + 4) & 0xFF; } else diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c index d1cee94d9..ebcafa45c 100644 --- a/src/battle/anim/bottle.c +++ b/src/battle/anim/bottle.c @@ -50,8 +50,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C48 = void sub_80CCF04(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 0xFFE8; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 0xFFE8; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; @@ -101,7 +101,7 @@ static void sub_80CCF70(struct Sprite* sprite) if (++sprite->data[1] > 2) { sprite->data[1] = 0; - sprite->pos1.y++; + sprite->y++; } if (++sprite->data[2] <= 29) @@ -148,10 +148,10 @@ static void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2) if ((sprite->data[3]) > 0x2F) sprite->data[4] += 2; - sprite->pos2.x = sprite->data[4] / 9; - sprite->pos2.y = sprite->data[4] / 14; - if (sprite->pos2.y < 0) - sprite->pos2.y *= -1; + sprite->x2 = sprite->data[4] / 9; + sprite->y2 = sprite->data[4] / 14; + if (sprite->y2 < 0) + sprite->y2 *= -1; sprite->data[3]++; if (sprite->data[3] > 0x3B) diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c index b57a2596e..179924162 100644 --- a/src/battle/anim/brace.c +++ b/src/battle/anim/brace.c @@ -43,13 +43,13 @@ void sub_80CDF0C(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2]; } sprite->data[0] = 0; @@ -62,10 +62,10 @@ static void sub_80CDF70(struct Sprite* sprite) if (++sprite->data[0] > sprite->data[1]) { sprite->data[0] = 0; - sprite->pos1.y--; + sprite->y--; } - sprite->pos1.y -= sprite->data[0]; + sprite->y -= sprite->data[0]; if (sprite->animEnded) DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c index d79cdcf77..974ddbab9 100644 --- a/src/battle/anim/breath.c +++ b/src/battle/anim/breath.c @@ -53,17 +53,17 @@ void sub_80D0930(struct Sprite* sprite) if (GetBattlerSide(gBattleAnimAttacker) == 0) { StartSpriteAnim(sprite, 0); - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + 32; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + 32; sprite->data[1] = 0x40; } else { StartSpriteAnim(sprite, 1); - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - 32; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - 32; sprite->data[1] = -0x40; } - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = 0x34; sprite->data[2] = 0; sprite->data[3] = 0; diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index 168a65d88..e6f544e83 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -58,13 +58,13 @@ void sub_80D31C8(struct Sprite* sprite) if (GetBattlerSide(gBattleAnimAttacker) != 0) { - 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]; } 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 = 1; @@ -75,9 +75,9 @@ void sub_80D31C8(struct Sprite* sprite) } 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); @@ -85,8 +85,8 @@ void sub_80D31C8(struct Sprite* sprite) newSpriteId = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); sprite->data[5] = newSpriteId; - 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[newSpriteId].data[0] = gBattleAnimArgs[2]; gSprites[newSpriteId].data[1] = gBattleAnimArgs[3]; @@ -108,8 +108,8 @@ static void sub_80D32E8(struct Sprite *sprite) sprite->data[0] = 1; TranslateAnimLinear(sprite); - sprite->pos2.x += Sin(index / 256, gSprites[spriteId].data[0]); - sprite->pos2.y += Cos(index / 256, gSprites[spriteId].data[1]); + sprite->x2 += Sin(index / 256, gSprites[spriteId].data[0]); + sprite->y2 += Cos(index / 256, gSprites[spriteId].data[1]); gSprites[spriteId].data[3] = gSprites[spriteId].data[2] + index; diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index e693541bc..e6a828e11 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -217,8 +217,8 @@ void sub_80DC824(struct Sprite *sprite) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } - sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; + sprite->x = sub_8077EE4(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; + sprite->y = sub_8077EE4(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; @@ -242,8 +242,8 @@ void sub_80DC8F4(struct Sprite *sprite) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } - sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; + sprite->x = sub_8077EE4(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; + sprite->y = sub_8077EE4(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); @@ -262,8 +262,8 @@ void sub_80DC9A0(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[1] = sprite->pos1.x; - sprite->data[3] = sprite->pos1.y; + sprite->data[1] = sprite->x; + sprite->data[3] = sprite->y; if (!gBattleAnimArgs[4]) { @@ -288,22 +288,22 @@ static void sub_80DCA38(struct Sprite *sprite) return; } - sprite->pos2.x += Sin(sprite->data[6], sprite->data[5]); + sprite->x2 += Sin(sprite->data[6], sprite->data[5]); sprite->data[6] = (sprite->data[6] + 13) & 0xFF; } // used in Move_STRING_SHOT void sub_80DCA70(struct Sprite *sprite) { - SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y); if (GetBattlerSide(gBattleAnimAttacker)) - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; else - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; if (!GetBattlerSide(gBattleAnimTarget)) - sprite->pos1.y += 8; + sprite->y += 8; sprite->callback = sub_80DCAEC; } @@ -406,7 +406,7 @@ void AnimTranslateStinger(struct Sprite *sprite) lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; - rot = ArcTan2Neg(lVarX - sprite->pos1.x, lVarY - sprite->pos1.y); + rot = ArcTan2Neg(lVarX - sprite->x, lVarY - sprite->y); rot += 0xC000; sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot); @@ -456,10 +456,10 @@ static void AnimMissileArcStep(struct Sprite *sprite) { s16 tempData[8]; u16 *data = sprite->data; - u16 x1 = sprite->pos1.x; - s16 x2 = sprite->pos2.x; - u16 y1 = sprite->pos1.y; - s16 y2 = sprite->pos2.y; + u16 x1 = sprite->x; + s16 x2 = sprite->x2; + u16 y1 = sprite->y; + s16 y2 = sprite->y2; int i; for (i = 0; i < 8; i++) @@ -470,8 +470,8 @@ static void AnimMissileArcStep(struct Sprite *sprite) if (!TranslateAnimArc(sprite)) { - u16 rotation = ArcTan2Neg(sprite->pos1.x + sprite->pos2.x - x2, - sprite->pos1.y + sprite->pos2.y - y2); + u16 rotation = ArcTan2Neg(sprite->x + sprite->x2 - x2, + sprite->y + sprite->y2 - y2); rotation += 0xC000; sub_8078FDC(sprite, FALSE, 0x100, 0x100, rotation); @@ -485,13 +485,13 @@ void sub_80DCE40(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 18; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 18; } StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix); diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c index 043e70563..9038cbc35 100644 --- a/src/battle/anim/bullet.c +++ b/src/battle/anim/bullet.c @@ -55,10 +55,10 @@ static void sub_80D0030(struct Sprite* sprite) u16 rand; s16* ptr; PlaySE12WithPanning(0xA6, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); - 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; ptr = &sprite->data[7]; for (i = 0; i < 8; i++) { @@ -76,11 +76,11 @@ static void sub_80D0030(struct Sprite* sprite) static void sub_80D00B4(struct Sprite* sprite) { sprite->data[0] += sprite->data[7]; - sprite->pos2.x = sprite->data[0] >> 8; + sprite->x2 = sprite->data[0] >> 8; if (sprite->data[7] & 1) - sprite->pos2.x = -sprite->pos2.x; + sprite->x2 = -sprite->x2; - sprite->pos2.y = Sin(sprite->data[1], sprite->data[6]); + sprite->y2 = Sin(sprite->data[1], sprite->data[6]); sprite->data[1] += 8; if (sprite->data[1] > 0x7E) { diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c index b7b4239df..84a3451ba 100644 --- a/src/battle/anim/copy_orb.c +++ b/src/battle/anim/copy_orb.c @@ -53,8 +53,8 @@ void sub_80CB4CC(struct Sprite* sprite) gBattleAnimArgs[0] = -a; } - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; sprite->invisible = TRUE; sprite->data[0]++; break; diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c index d45d6cd16..a64e94e09 100644 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -52,8 +52,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6EF0 = void sub_80CDFB0(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - 12; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - 12; sprite->data[0] = 0; sprite->data[1] = 2; sprite->data[2] = 0; diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index 32d09ddf2..8c5bfbef1 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -361,9 +361,9 @@ void sub_80D648C(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); sprite->data[0] = gBattleAnimArgs[3]; - 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); @@ -380,8 +380,8 @@ static void sub_80D6514(struct Sprite *sprite) { if (!TranslateAnimLinear(sprite)) { - sprite->pos2.x += Sin(sprite->data[7], sprite->data[5]); - sprite->pos2.y += Cos(sprite->data[7], sprite->data[5]); + sprite->x2 += Sin(sprite->data[7], sprite->data[5]); + sprite->y2 += Cos(sprite->data[7], sprite->data[5]); sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF; if (sprite->data[7] % 3 == 0) @@ -414,8 +414,8 @@ void sub_80D65DC(struct Sprite *sprite) if (!gMain.inBattle || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2]; sprite->data[3] = gBattleAnimArgs[0]; sprite->data[4] = gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[3]; @@ -435,8 +435,8 @@ void sub_80D6658(struct Sprite *sprite) if (!gMain.inBattle || GetBattlerSide(bank) == B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - sprite->pos1.x = GetBattlerSpriteCoord(bank, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(bank, 2) + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[1]; sprite->data[4] = gBattleAnimArgs[7] & 0x7FFF; sprite->data[5] = gBattleAnimArgs[2]; @@ -450,8 +450,8 @@ void sub_80D6658(struct Sprite *sprite) static void sub_80D672C(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[7], sprite->data[5]); - sprite->pos2.y = Cos(sprite->data[7], sprite->data[5]); + sprite->x2 = Sin(sprite->data[7], sprite->data[5]); + sprite->y2 = Cos(sprite->data[7], sprite->data[5]); sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF; if (sprite->data[7] % sprite->data[4] == 0) @@ -574,9 +574,9 @@ void sub_80D6A6C(struct Sprite *sprite) { u8 spriteId; - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; - spriteId = CreateSprite(&gBattleAnimSpriteTemplate_83D9950, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority); + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; + spriteId = CreateSprite(&gBattleAnimSpriteTemplate_83D9950, sprite->x + 32, sprite->y, sprite->subpriority); gSprites[spriteId].oam.tileNum += 8; gAnimVisualTaskCount++; gSprites[spriteId].callback = sub_80D6AF0; @@ -635,13 +635,13 @@ static void sub_80D6BB8(u8 taskId) if (spriteId != MAX_SPRITES) { struct Sprite *sprite = &gSprites[spriteId]; - sprite->pos1.x += gUnknown_083D9968[task->data[9]][0]; - sprite->pos1.y += gUnknown_083D9968[task->data[9]][1]; + sprite->x += gUnknown_083D9968[task->data[9]][0]; + sprite->y += gUnknown_083D9968[task->data[9]][1]; sprite->data[0] = 40 - task->data[8] * 5; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = task->data[14]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = task->data[15]; sprite->data[5] = taskId; @@ -692,13 +692,13 @@ void sub_80D6D18(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix); @@ -709,17 +709,17 @@ void sub_80D6D70(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } - sprite->pos2.x = gBattleAnimArgs[1]; - sprite->pos2.y = gBattleAnimArgs[2]; + sprite->x2 = gBattleAnimArgs[1]; + sprite->y2 = gBattleAnimArgs[2]; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->callback = sub_8078600; } @@ -727,8 +727,8 @@ void sub_80D6D70(struct Sprite *sprite) void sub_80D6DD8(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[6] = GetAnimBattlerSpriteId(0); sprite->data[7] = 16; @@ -747,9 +747,9 @@ static void sub_80D6E38(struct Sprite *sprite) sprite->data[0]++; break; case 1: - sprite->pos1.x += sprite->data[7]; - gSprites[sprite->data[6]].pos2.x += sprite->data[7]; - if ((u16)(sprite->pos1.x + 80) > 400) + sprite->x += sprite->data[7]; + gSprites[sprite->data[6]].x2 += sprite->data[7]; + if ((u16)(sprite->x + 80) > 400) { DestroySpriteAndMatrix(sprite); } @@ -777,7 +777,7 @@ void sub_80D6E9C(u8 taskId) task->data[13] = -2; } - gSprites[task->data[15]].pos2.x = task->data[14]; + gSprites[task->data[15]].x2 = task->data[14]; task->data[0]++; break; case 1: @@ -789,7 +789,7 @@ void sub_80D6E9C(u8 taskId) if (task->data[14]) { task->data[14] += task->data[13]; - gSprites[task->data[15]].pos2.x = task->data[14]; + gSprites[task->data[15]].x2 = task->data[14]; } else { @@ -935,8 +935,8 @@ void sub_80D727C(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); StartSpriteAffineAnim(sprite, 2); sprite->data[0]++; break; diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index b02f7b858..26125c70f 100644 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -40,7 +40,7 @@ void sub_80D0118(struct Sprite* sprite) { InitAnimSpritePos(sprite, 0); if (GetBattlerSide(gBattleAnimAttacker) == 0) - sprite->pos1.y += 16; + sprite->y += 16; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = gBattleAnimArgs[2]; diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index bae52d83f..f09ddfcf0 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -304,17 +304,17 @@ static void sub_80DFE90(struct Sprite *sprite) { sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; - 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[7] == 0) { sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; - 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; sprite->data[0]--; } - sprite->pos2.y += Sin(sprite->data[5], sprite->data[6]); + sprite->y2 += Sin(sprite->data[5], sprite->data[6]); sprite->data[5] = (sprite->data[5] + 3) & 0xFF; if (sprite->data[5] > 0x7F) { @@ -328,8 +328,8 @@ static void sub_80DFE90(struct Sprite *sprite) void sub_80DFF1C(struct Sprite *sprite) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]); sprite->data[0] = gBattleAnimArgs[3]; @@ -342,8 +342,8 @@ static void sub_80DFF58(struct Sprite *sprite) { sprite->data[4] += sprite->data[0]; sprite->data[5] += sprite->data[1]; - sprite->pos2.x = sprite->data[4] >> 8; - sprite->pos2.y = sprite->data[5] >> 8; + sprite->x2 = sprite->data[4] >> 8; + sprite->y2 = sprite->data[5] >> 8; if (++sprite->data[3] == sprite->data[2]) sprite->callback = sub_80DFF98; @@ -353,8 +353,8 @@ static void sub_80DFF98(struct Sprite *sprite) { sprite->data[4] -= sprite->data[0]; sprite->data[5] -= sprite->data[1]; - sprite->pos2.x = sprite->data[4] >> 8; - sprite->pos2.y = sprite->data[5] >> 8; + sprite->x2 = sprite->data[4] >> 8; + sprite->y2 = sprite->data[5] >> 8; if (--sprite->data[3] == 0) DestroySpriteAndMatrix(sprite); @@ -376,30 +376,30 @@ void sub_80DFFD0(struct Sprite *sprite) switch (gBattleAnimArgs[1]) { case 0: - sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 5) - 8; - sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2) + 8; + sprite->x = GetBattlerSpriteCoordAttr(bank, 5) - 8; + sprite->y = GetBattlerSpriteCoordAttr(bank, 2) + 8; break; case 1: - sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 5) - 14; - sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2) + 16; + sprite->x = GetBattlerSpriteCoordAttr(bank, 5) - 14; + sprite->y = GetBattlerSpriteCoordAttr(bank, 2) + 16; break; case 2: - sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 4) + 8; - sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2) + 8; + sprite->x = GetBattlerSpriteCoordAttr(bank, 4) + 8; + sprite->y = GetBattlerSpriteCoordAttr(bank, 2) + 8; StartSpriteAffineAnim(sprite, 1); xOffset = -20; break; case 3: - sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 4) + 14; - sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2) + 16; + sprite->x = GetBattlerSpriteCoordAttr(bank, 4) + 14; + sprite->y = GetBattlerSpriteCoordAttr(bank, 2) + 16; StartSpriteAffineAnim(sprite, 1); xOffset = -20; break; } sprite->data[0] = 32; - sprite->data[2] = sprite->pos1.x + xOffset; - sprite->data[4] = sprite->pos1.y + 12; + sprite->data[2] = sprite->x + xOffset; + sprite->data[4] = sprite->y + 12; sprite->data[5] = -12; InitAnimArcTranslation(sprite); @@ -821,8 +821,8 @@ void sub_80E09C4(u8 taskId) void sub_80E0A10(struct Sprite *sprite) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->callback = sub_8078600; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -883,8 +883,8 @@ void sub_80E0A4C(u8 taskId) LZDecompressVram(&gUnknown_08D1D410, subStruct.field_0); LoadCompressedPalette(&gUnknown_08D1D54C, subStruct.field_8 << 4, 32); - gBattle_BG1_X = -gSprites[spriteId].pos1.x + 96; - gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32; + gBattle_BG1_X = -gSprites[spriteId].x + 96; + gBattle_BG1_Y = -gSprites[spriteId].y + 32; paletteNum = 16 + gSprites[spriteId].oam.paletteNum; if (gBattleAnimArgs[1] == 0) diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index cc96cc455..b083241e0 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -42,8 +42,8 @@ void sub_80D2ABC(struct Sprite *sprite) { if (sprite->data[3] == 0) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) - 1; sprite->data[2] = 1; @@ -52,8 +52,8 @@ void sub_80D2ABC(struct Sprite *sprite) sprite->data[1] = (sprite->data[0] * 4) % 256; if (sprite->data[1] < 0) sprite->data[1] = 0; - sprite->pos2.x = Cos(sprite->data[1], 30 - sprite->data[0] / 4); - sprite->pos2.y = Sin(sprite->data[1], 10 - sprite->data[0] / 8); + sprite->x2 = Cos(sprite->data[1], 30 - sprite->data[0] / 4); + sprite->y2 = Sin(sprite->data[1], 10 - sprite->data[0] / 8); if (sprite->data[1] > 128 && sprite->data[2] > 0) sprite->data[2] = -1; if (sprite->data[1] == 0 && sprite->data[2] < 0) diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index d49f83952..dd4e0f4c1 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -199,17 +199,17 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB100 = void sub_80DF5A0(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; gBattleAnimArgs[4] = -gBattleAnimArgs[4]; } else - 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[3] = gBattleAnimArgs[4]; @@ -228,15 +228,15 @@ void sub_80DF63C(struct Sprite *sprite) sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos1.x -= gBattleAnimArgs[1]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x -= gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[2] -= gBattleAnimArgs[2]; sprite->data[4] += gBattleAnimArgs[3]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[2] += gBattleAnimArgs[2]; sprite->data[4] += gBattleAnimArgs[3]; StartSpriteAnim(sprite, 1); @@ -252,16 +252,16 @@ void sub_80DF6F0(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } sub_807867C(sprite, gBattleAnimArgs[1]); - sprite->pos1.y += gBattleAnimArgs[2]; + sprite->y += gBattleAnimArgs[2]; sprite->callback = sub_8078600; StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix); } @@ -281,8 +281,8 @@ void sub_80DF78C(struct Sprite *sprite) { u16 r5; u16 r0; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[4] = 0; sprite->data[5] = 1; sprite->data[6] = gBattleAnimArgs[0]; @@ -292,8 +292,8 @@ void sub_80DF78C(struct Sprite *sprite) sprite->data[7] = r5 / 2; else sprite->data[7] = r0 / 2; - sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]); - sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]); + sprite->x2 = Cos(sprite->data[6], sprite->data[7]); + sprite->y2 = Sin(sprite->data[6], sprite->data[7]); sprite->callback = sub_80DF81C; } @@ -303,8 +303,8 @@ static void sub_80DF81C(struct Sprite *sprite) { case 0: sprite->data[6] = (sprite->data[6] - sprite->data[5]) & 0xFF; - sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]); - sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]); + sprite->x2 = Cos(sprite->data[6], sprite->data[7]); + sprite->y2 = Sin(sprite->data[6], sprite->data[7]); if (++sprite->data[4] > 5) { sprite->data[4] = 0; @@ -321,8 +321,8 @@ static void sub_80DF81C(struct Sprite *sprite) sprite->data[6] = (sprite->data[6] - sprite->data[5]) & 0xFF; if (sprite->data[7] <= 0x95 && (sprite->data[7] += 8) > 0x95) sprite->data[7] = 0x96; - sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]); - sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]); + sprite->x2 = Cos(sprite->data[6], sprite->data[7]); + sprite->y2 = Sin(sprite->data[6], sprite->data[7]); if (++sprite->data[4] > 5) { sprite->data[4] = 0; @@ -426,12 +426,12 @@ void sub_80DFB28(struct Sprite *sprite) { int r6 = (gBattleAnimArgs[2] * 3) / 5; int i; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[4]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[4]; sprite->data[1] = Cos(gBattleAnimArgs[1], gBattleAnimArgs[2]); sprite->data[2] = Sin(gBattleAnimArgs[1], r6); - sprite->pos1.x += sprite->data[1] * gBattleAnimArgs[0]; - sprite->pos1.y += sprite->data[2] * gBattleAnimArgs[0]; + sprite->x += sprite->data[1] * gBattleAnimArgs[0]; + sprite->y += sprite->data[2] * gBattleAnimArgs[0]; sprite->data[3] = gBattleAnimArgs[3]; sprite->callback = sub_80DFBD8; for (i = 0; i <= 6; i++) @@ -442,8 +442,8 @@ static void sub_80DFBD8(struct Sprite *sprite) { sprite->data[4] += sprite->data[1]; sprite->data[5] += sprite->data[2]; - sprite->pos2.x = sprite->data[4] / 10; - sprite->pos2.y = sprite->data[5] / 10; + sprite->x2 = sprite->data[4] / 10; + sprite->y2 = sprite->data[5] / 10; if (++sprite->data[0] > sprite->data[3]) DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index a42d8617f..20fc15782 100644 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -120,8 +120,8 @@ static void sub_80D0D68(u8 taskId) void sub_80D0E30(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16; - sprite->pos1.y = sub_8077FC0(gBattleAnimTarget) + 16; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16; + sprite->y = sub_8077FC0(gBattleAnimTarget) + 16; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; @@ -152,7 +152,7 @@ static void sub_80D0E8C(struct Sprite* sprite) if (++sprite->data[1] > 3 && sprite->data[2] < sprite->data[5]) { sprite->data[1] = 0; - sprite->pos1.y -= 1; + sprite->y -= 1; sprite->data[2]++; if (sprite->data[2] % 10 == 0) PlaySE12WithPanning(0xCD, sprite->data[6]); @@ -168,7 +168,7 @@ static void sub_80D0E8C(struct Sprite* sprite) sprite->data[4] = -0x40 - sprite->data[4]; sprite->data[3] *= -1; } - sprite->pos2.x = sprite->data[4]; + sprite->x2 = sprite->data[4]; if (sprite->data[5] == sprite->data[2]) { sprite->data[1] = 0; diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c index b165a7f28..6e29ccc31 100644 --- a/src/battle/anim/energy_wave.c +++ b/src/battle/anim/energy_wave.c @@ -165,9 +165,9 @@ void sub_80D3554(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); 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); @@ -196,7 +196,7 @@ static void sub_80D35DC(struct Sprite *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; @@ -228,9 +228,9 @@ void sub_80D3698(struct Sprite *sprite) { u8 subpriority; - 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; subpriority = GetBattlerSubpriority(gBattleAnimAttacker); @@ -238,18 +238,18 @@ void sub_80D3698(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) == 0) { - sprite->pos2.x = 10; + sprite->x2 = 10; sprite->subpriority = subpriority + 2; } else { - sprite->pos2.x = -10; + sprite->x2 = -10; sprite->subpriority = subpriority - 2; } } else { - sprite->pos2.x = -10; + sprite->x2 = -10; sprite->subpriority = subpriority + 2; } diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index 27dc47c21..86e00d1f1 100644 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -72,7 +72,7 @@ void sub_80D15E0(u8 taskId) struct Task* task = &gTasks[taskId]; if (RunAffineAnimFromTaskData(task) == 0) { - gSprites[task->data[0]].pos2.y = 0; + gSprites[task->data[0]].y2 = 0; gSprites[task->data[0]].invisible = TRUE; DestroyAnimVisualTask(taskId); } @@ -109,7 +109,7 @@ void sub_80D16A0(u8 taskId) switch (task->data[0]) { case 0: - gSprites[task->data[15]].pos2.x += task->data[14]; + gSprites[task->data[15]].x2 += task->data[14]; task->data[1] = 0; task->data[2] = 0; task->data[3] = 0; @@ -121,14 +121,14 @@ void sub_80D16A0(u8 taskId) task->data[1] = 0; task->data[2]++; if (task->data[2] & 1) - gSprites[task->data[15]].pos2.x += 6; + gSprites[task->data[15]].x2 += 6; else - gSprites[task->data[15]].pos2.x -= 6; + gSprites[task->data[15]].x2 -= 6; if (++task->data[3] > 4) { if (task->data[2] & 1) - gSprites[task->data[15]].pos2.x -= 6; + gSprites[task->data[15]].x2 -= 6; task->data[0]++; } @@ -141,8 +141,8 @@ void sub_80D16A0(u8 taskId) task->data[0]++; break; case 3: - gSprites[task->data[15]].pos2.x += task->data[13]; - if (gSprites[task->data[15]].pos2.x == 0) + gSprites[task->data[15]].x2 += task->data[13]; + if (gSprites[task->data[15]].x2 == 0) DestroyAnimVisualTask(taskId); break; } @@ -257,8 +257,8 @@ void sub_80D1930(u8 taskId) { gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = 13; - gSprites[spriteId].pos2.x = gUnknown_083D7A00[task->data[2]][0]; - gSprites[spriteId].pos2.y = gUnknown_083D7A00[task->data[2]][1]; + gSprites[spriteId].x2 = gUnknown_083D7A00[task->data[2]][0]; + gSprites[spriteId].y2 = gUnknown_083D7A00[task->data[2]][1]; task->data[13]++; if (++task->data[2] > 3) { diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c index 2c3d973aa..87364c222 100644 --- a/src/battle/anim/evasion.c +++ b/src/battle/anim/evasion.c @@ -90,6 +90,6 @@ void sub_80CE974(struct Sprite* sprite) sprite->data[4] = gSineTable[sprite->data[0]] / 6; sprite->data[5] = gSineTable[sprite->data[0]] / 13; sprite->data[1] = (sprite->data[1] + sprite->data[5]) & 0xFF; - sprite->pos2.x = Sin(sprite->data[1], sprite->data[4]); + sprite->x2 = Sin(sprite->data[1], sprite->data[4]); } } diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index 450844453..d8b16f14d 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -436,7 +436,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA214 = void sub_080B08A0(struct Sprite *sprite) { sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = 15; sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -502,8 +502,8 @@ void sub_80D90F4(struct Sprite *sprite) gBattleAnimArgs[2] = Random() % 5; StartSpriteAnim(sprite, gBattleAnimArgs[2]); - sprite->pos1.x = GetBattlerSpriteCoord(bank, 2); - sprite->pos1.y = GetBattlerSpriteCoord(bank, 3); + sprite->x = GetBattlerSpriteCoord(bank, 2); + sprite->y = GetBattlerSpriteCoord(bank, 3); xMod = GetBattlerSpriteCoordAttr(bank, 1) / 2; yMod = GetBattlerSpriteCoordAttr(bank, 0) / 4; @@ -519,11 +519,11 @@ void sub_80D90F4(struct Sprite *sprite) if ((gBattlerPositions[bank] & 1) == 0) y += 0xFFF0; - sprite->pos1.x += x; - sprite->pos1.y += y; + sprite->x += x; + sprite->y += y; sprite->data[0] = gBattleAnimArgs[1]; - sprite->data[7] = CreateSprite(&gBasicHitSplatSpriteTemplate, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1); + sprite->data[7] = CreateSprite(&gBasicHitSplatSpriteTemplate, sprite->x, sprite->y, sprite->subpriority + 1); if (sprite->data[7] != 64) { StartSpriteAffineAnim(&gSprites[sprite->data[7]], 0); @@ -558,15 +558,15 @@ void sub_80D92D0(struct Sprite *sprite) if (gBattleAnimArgs[2] == 0) { - sprite->data[2] = sprite->pos1.x - 20; + sprite->data[2] = sprite->x - 20; } else { - sprite->data[2] = sprite->pos1.x + 20; + sprite->data[2] = sprite->x + 20; sprite->hFlip = 1; } - sprite->data[4] = sprite->pos1.y - 20; + sprite->data[4] = sprite->y - 20; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80D9328); } @@ -575,13 +575,13 @@ static void sub_80D9328(struct Sprite *sprite) { if (++sprite->data[5] == 11) { - sprite->data[2] = sprite->pos1.x - sprite->pos2.x; - sprite->data[4] = sprite->pos1.y - sprite->pos2.y; + sprite->data[2] = sprite->x - sprite->x2; + sprite->data[4] = sprite->y - sprite->y2; sprite->data[0] = 8; - 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->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -599,10 +599,10 @@ void sub_80D9378(struct Sprite *sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[3]; - sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; - sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sprite->pos1.y; + sprite->data[1] = sprite->x; + sprite->data[2] = sprite->x + gBattleAnimArgs[2]; + sprite->data[3] = sprite->y; + sprite->data[4] = sprite->y; InitAnimLinearTranslation(sprite); @@ -617,7 +617,7 @@ static void sub_80D9404(struct Sprite *sprite) { if (!TranslateAnimLinear(sprite)) { - sprite->pos2.y += Sin(sprite->data[7] >> 8, sprite->data[5]); + sprite->y2 += Sin(sprite->data[7] >> 8, sprite->data[5]); sprite->data[7] += sprite->data[6]; } else @@ -697,8 +697,8 @@ void sub_80D9540(struct Sprite *sprite) else { sprite->data[4] += sprite->data[1]; - sprite->pos2.x = sprite->data[4] >> 8; - sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]); + sprite->x2 = sprite->data[4] >> 8; + sprite->y2 = Sin(sprite->data[3], sprite->data[2]); sprite->data[3] = (sprite->data[3] + 3) & 0xFF; if (sprite->data[3] > 100) @@ -713,17 +713,17 @@ void sub_80D95D0(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } - sprite->pos1.x += gBattleAnimArgs[1]; - sprite->pos1.y += gBattleAnimArgs[2]; + sprite->x += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[2]; sprite->data[0] = 0; sprite->data[1] = gBattleAnimArgs[3]; @@ -751,9 +751,9 @@ static void sub_80D9640(struct Sprite *sprite) sprite->data[1] = 0; sprite->data[3]++; if (sprite->data[3] & 1) - sprite->pos2.x = 2; + sprite->x2 = 2; else - sprite->pos2.x = -2; + sprite->x2 = -2; } if (--sprite->data[2] == 0) @@ -766,13 +766,13 @@ void sub_80D96B8(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; } sprite->oam.tileNum += gBattleAnimArgs[1] * 16; @@ -806,8 +806,8 @@ void sub_80D96B8(struct Sprite *sprite) static void sub_80D97A0(struct Sprite *sprite) { - sprite->pos1.x += sprite->data[6]; - sprite->pos1.y += sprite->data[7]; + sprite->x += sprite->data[6]; + sprite->y += sprite->data[7]; if (++sprite->data[0] > 40) DestroyAnimSprite(sprite); @@ -817,8 +817,8 @@ void sub_80D97CC(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattlerAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattlerAttacker, 3); sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); sprite->data[7] = gBattleAnimTarget; } @@ -841,9 +841,9 @@ static void sub_80D986C(struct Sprite *sprite) REG_BLDCNT = 0; sprite->data[0] = 16; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = GetBattlerSpriteCoord(sprite->data[7], 2); - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = GetBattlerSpriteCoord(sprite->data[7], 3); InitAnimLinearTranslation(sprite); @@ -854,11 +854,11 @@ static void sub_80D986C(struct Sprite *sprite) void sub_80D98D8(struct Sprite *sprite) { - sprite->pos1.x = gBattleAnimArgs[0]; - sprite->pos1.y = 120; + sprite->x = gBattleAnimArgs[0]; + sprite->y = 120; sprite->data[0] = gBattleAnimArgs[3]; - sub_8079BF4(&sprite->data[4], &sprite->data[5], (void *)(sprite->pos1.y << 8)); + sub_8079BF4(&sprite->data[4], &sprite->data[5], (void *)(sprite->y << 8)); sprite->data[6] = gBattleAnimArgs[1]; sprite->oam.tileNum += gBattleAnimArgs[2] * 4; @@ -877,8 +877,8 @@ static void sub_80D9934(struct Sprite *sprite) sub_8079BF4(&sprite->data[4], &sprite->data[5], var0); var0 = (void *)(((intptr_t)var0) >> 8); - sprite->pos1.y = (intptr_t)var0; - if (sprite->pos1.y < -8) + sprite->y = (intptr_t)var0; + if (sprite->y < -8) DestroyAnimSprite(sprite); else sprite->data[0]--; @@ -892,8 +892,8 @@ static void sub_80D9934(struct Sprite *sprite) sprite->data[0] = pos2 - pos0; sprite->data[1] = pos3 - pos1; - sprite->data[2] = sprite->pos1.x << 4; - sprite->data[3] = sprite->pos1.y << 4; + sprite->data[2] = sprite->x << 4; + sprite->data[3] = sprite->y << 4; sprite->callback = sub_80D99F4; } @@ -905,11 +905,11 @@ static void sub_80D99F4(struct Sprite *sprite) sprite->data[2] += sprite->data[0]; sprite->data[3] += sprite->data[1]; - sprite->pos1.x = sprite->data[2] >> 4; - sprite->pos1.y = sprite->data[3] >> 4; + sprite->x = sprite->data[2] >> 4; + sprite->y = sprite->data[3] >> 4; - edgeX = sprite->pos1.x + 8; - if (edgeX > 256 || sprite->pos1.y < -8 || sprite->pos1.y > 120) + edgeX = sprite->x + 8; + if (edgeX > 256 || sprite->y < -8 || sprite->y > 120) DestroyAnimSprite(sprite); } @@ -919,8 +919,8 @@ void sub_80D9A38(struct Sprite *sprite) if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattlerAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattlerAttacker, 3); bank = gBattleAnimTarget; sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); } @@ -936,9 +936,9 @@ void sub_80D9A38(struct Sprite *sprite) sprite->oam.matrixNum |= 0x18; sprite->data[0] = 16; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = GetBattlerSpriteCoord(bank, 2); - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = GetBattlerSpriteCoord(bank, 3); InitAnimLinearTranslation(sprite); @@ -958,8 +958,8 @@ void sub_80D9B48(struct Sprite *sprite) { u8 turn; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[0]; sprite->data[3] = gBattleAnimArgs[1]; @@ -976,8 +976,8 @@ void sub_80D9B48(struct Sprite *sprite) } StartSpriteAnim(sprite, sprite->data[1]); - sprite->pos2.x = sprite->data[2]; - sprite->pos2.y = sprite->data[3]; + sprite->x2 = sprite->data[2]; + sprite->y2 = sprite->data[3]; sprite->callback = sub_80D9B24; } @@ -1006,7 +1006,7 @@ void sub_80D9C40(struct Sprite *sprite) if (sprite->affineAnimEnded) { sprite->data[1] = (sprite->data[1] + 40) & 0xFF; - sprite->pos2.x = Sin(sprite->data[1], 2); + sprite->x2 = Sin(sprite->data[1], 2); if (++sprite->data[0] > 40) { diff --git a/src/battle/anim/finger.c b/src/battle/anim/finger.c index 95e33ece5..5009f864b 100644 --- a/src/battle/anim/finger.c +++ b/src/battle/anim/finger.c @@ -166,10 +166,10 @@ void sub_80CF0BC(struct Sprite* sprite) else bank = gBattleAnimTarget; - sprite->pos1.x = GetBattlerSpriteCoord(bank, 0); - sprite->pos1.y = GetBattlerSpriteCoordAttr(bank, 2); - if (sprite->pos1.y <= 9) - sprite->pos1.y = 10; + sprite->x = GetBattlerSpriteCoord(bank, 0); + sprite->y = GetBattlerSpriteCoordAttr(bank, 2); + if (sprite->y <= 9) + sprite->y = 10; sprite->data[0] = 1; sprite->data[1] = 0; @@ -195,7 +195,7 @@ static void sub_80CF158(struct Sprite* sprite) { if (--sprite->data[0] == 0) { - sprite->pos2.x = 0; + sprite->x2 = 0; sprite->callback = sub_80CF088; return; } @@ -212,7 +212,7 @@ static void sub_80CF158(struct Sprite* sprite) sprite->subpriority = sprite->data[2]; temp = gSineTable[sprite->data[1]]; - sprite->pos2.x = (temp2 = temp >> 3) + (temp2 >> 1); + sprite->x2 = (temp2 = temp >> 3) + (temp2 >> 1); } void sub_80CF1C8(struct Sprite* sprite) diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c index 795f68d8d..9dec7510e 100644 --- a/src/battle/anim/fire.c +++ b/src/battle/anim/fire.c @@ -189,7 +189,7 @@ void sub_80D4F18(struct Sprite *sprite) { sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; @@ -204,14 +204,14 @@ void sub_80D4F5C(struct Sprite *sprite) if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x -= gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[2] = -gBattleAnimArgs[4]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[4]; } @@ -226,14 +226,14 @@ void sub_80D4FCC(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x -= gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[4]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[2] = -gBattleAnimArgs[4]; } @@ -248,8 +248,8 @@ static void sub_80D5038(struct Sprite *sprite) { if (++sprite->data[0] < sprite->data[4]) { - sprite->pos2.x += sprite->data[2]; - sprite->pos2.y += sprite->data[3]; + sprite->x2 += sprite->data[2]; + sprite->y2 += sprite->data[3]; } if (sprite->data[0] == sprite->data[1]) @@ -262,15 +262,15 @@ void sub_80D5074(struct Sprite *sprite) if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; sprite->subpriority = 8; } - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; @@ -288,8 +288,8 @@ static void sub_80D50E8(struct Sprite *sprite) if(sprite->data[5] > 10000) sprite->subpriority = 1; - sprite->pos2.x = Sin(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); - sprite->pos2.y = Cos(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); + sprite->x2 = Sin(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); + sprite->y2 = Cos(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8)); sprite->data[0] += sprite->data[2]; sprite->data[5] += sprite->data[4]; diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index 1d69b2c1c..6adc4f960 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -236,9 +236,9 @@ static void AnimFireRingStep1(struct Sprite *sprite) if (++sprite->data[0] == 0x12) { sprite->data[0] = 0x19; - 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); @@ -253,18 +253,18 @@ static void AnimFireRingStep2(struct Sprite *sprite) { sprite->data[0] = 0; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); - sprite->pos2.y = 0; - sprite->pos2.x = 0; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->y2 = 0; + sprite->x2 = 0; sprite->callback = AnimFireRingStep3; sprite->callback(sprite); } else { - sprite->pos2.x += Sin(sprite->data[7], 28); - sprite->pos2.y += Cos(sprite->data[7], 28); + sprite->x2 += Sin(sprite->data[7], 28); + sprite->y2 += Cos(sprite->data[7], 28); sprite->data[7] = (sprite->data[7] + 20) & 0xFF; } @@ -280,8 +280,8 @@ static void AnimFireRingStep3(struct Sprite *sprite) static void UpdateFireRingCircleOffset(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[7], 28); - sprite->pos2.y = Cos(sprite->data[7], 28); + sprite->x2 = Sin(sprite->data[7], 28); + sprite->y2 = Cos(sprite->data[7], 28); sprite->data[7] = (sprite->data[7] + 20) & 0xFF; } @@ -293,8 +293,8 @@ static void UpdateFireRingCircleOffset(struct Sprite *sprite) // arg 4: y delta void AnimFireCross(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]; @@ -331,8 +331,8 @@ static void sub_80D53F4(struct Sprite *sprite) static void sub_80D541C(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[1], sprite->data[2] >> 8); - sprite->pos2.y = Cos(sprite->data[1], sprite->data[2] >> 8); + sprite->x2 = Sin(sprite->data[1], sprite->data[2] >> 8); + sprite->y2 = Cos(sprite->data[1], sprite->data[2] >> 8); sprite->data[1] = (sprite->data[1] + 10) & 0xFF; sprite->data[2] += 0xD0; @@ -351,7 +351,7 @@ void sub_80D5470(u8 taskId) // initialize animation task for Move_ERUPTION? task->data[1] = 0; task->data[2] = 0; task->data[3] = 0; - task->data[4] = gSprites[task->data[15]].pos1.y; + task->data[4] = gSprites[task->data[15]].y; task->data[5] = GetBattlerSide(gBattleAnimAttacker); task->data[6] = 0; @@ -376,9 +376,9 @@ static void sub_80D54E0(u8 taskId) // animate Move_ERUPTION? task->data[1] = 0; if (++task->data[2] & 0x1) - gSprites[task->data[15]].pos2.x = 3; + gSprites[task->data[15]].x2 = 3; else - gSprites[task->data[15]].pos2.x = -3; + gSprites[task->data[15]].x2 = -3; } if (task->data[5]) @@ -386,14 +386,14 @@ static void sub_80D54E0(u8 taskId) // animate Move_ERUPTION? if (++task->data[3] > 4) { task->data[3] = 0; - gSprites[task->data[15]].pos1.y++; + gSprites[task->data[15]].y++; } } if(!sub_8079C74(task)) { sub_8079A64(task->data[15]); - gSprites[task->data[15]].pos2.x = 0; + gSprites[task->data[15]].x2 = 0; task->data[1] = 0; task->data[2] = 0; @@ -427,9 +427,9 @@ static void sub_80D54E0(u8 taskId) // animate Move_ERUPTION? task->data[1] = 0; if (++task->data[2] & 1) - gSprites[task->data[15]].pos2.y += 3; + gSprites[task->data[15]].y2 += 3; else - gSprites[task->data[15]].pos2.y -= 3; + gSprites[task->data[15]].y2 -= 3; } if (++task->data[3] > 0x18) @@ -440,7 +440,7 @@ static void sub_80D54E0(u8 taskId) // animate Move_ERUPTION? sub_8079C08(task, task->data[15], 0x180, 0xC0, 0x100, 0x100, 0x8); if (task->data[2] & 1) - gSprites[task->data[15]].pos2.y -= 3; + gSprites[task->data[15]].y2 -= 3; task->data[1] = 0; task->data[2] = 0; @@ -450,11 +450,11 @@ static void sub_80D54E0(u8 taskId) // animate Move_ERUPTION? break; case 5: if (task->data[5]) - gSprites[task->data[15]].pos1.y--; + gSprites[task->data[15]].y--; if (!sub_8079C74(task)) { - gSprites[task->data[15]].pos1.y = task->data[4]; + gSprites[task->data[15]].y = task->data[4]; sub_8078F40(task->data[15]); task->data[2] = 0; @@ -477,7 +477,7 @@ static void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3) s8 sign; u16 y = sub_80D5940(spriteId); - u16 x = gSprites[spriteId].pos1.x; + u16 x = gSprites[spriteId].x; if(!GetBattlerSide(gBattleAnimAttacker)) { @@ -523,7 +523,7 @@ void sub_80D58FC(struct Sprite *sprite) u16 sub_80D5940(u8 spriteId) { - u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY; + u16 var1 = gSprites[spriteId].y + gSprites[spriteId].y2 + gSprites[spriteId].centerToCornerVecY; if (GetBattlerSide(gBattleAnimAttacker) == 0) { @@ -541,8 +541,8 @@ void sub_80D5994(struct Sprite *sprite, s16 x, s16 y) { sprite->data[0] = 0; sprite->data[1] = 0; - sprite->data[2] = (u16)sprite->pos1.x * 8; - sprite->data[3] = (u16)sprite->pos1.y * 8; + sprite->data[2] = (u16)sprite->x * 8; + sprite->data[3] = (u16)sprite->y * 8; sprite->data[4] = x * 8; sprite->data[5] = y * 8; } @@ -559,18 +559,18 @@ static void sub_80D59B0(struct Sprite *sprite) } sprite->data[2] += sprite->data[4]; - sprite->pos1.x = sprite->data[2] >> 3; + sprite->x = sprite->data[2] >> 3; sprite->data[3] += sprite->data[5]; - sprite->pos1.y = sprite->data[3] >> 3; + sprite->y = sprite->data[3] >> 3; - if (sprite->pos1.x < -8 || sprite->pos1.x > 0xf8 || sprite->pos1.y < -8 || sprite->pos1.y > 120) + if (sprite->x < -8 || sprite->x > 0xf8 || sprite->y < -8 || sprite->y > 120) sprite->invisible = TRUE; } void sub_80D5A20(struct Sprite *sprite) { - sprite->pos1.x = gBattleAnimArgs[0]; - sprite->pos1.y = gBattleAnimArgs[1]; + sprite->x = gBattleAnimArgs[0]; + sprite->y = gBattleAnimArgs[1]; sprite->data[0] = 0; sprite->data[1] = 0; @@ -596,10 +596,10 @@ static void sub_80D5A74(struct Sprite *sprite) sprite->data[0]++; // fall through case 1: - sprite->pos1.y += 8; - if (sprite->pos1.y >= sprite->data[7]) + sprite->y += 8; + if (sprite->y >= sprite->data[7]) { - sprite->pos1.y = sprite->data[7]; + sprite->y = sprite->data[7]; sprite->data[0]++; } break; @@ -609,11 +609,11 @@ static void sub_80D5A74(struct Sprite *sprite) sprite->data[1] = 0; if ((++sprite->data[2] & 1) != 0) { - sprite->pos2.y = -3; + sprite->y2 = -3; } else { - sprite->pos2.y = 3; + sprite->y2 = 3; } } diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 588729ab5..9c5705c45 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -372,15 +372,15 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA65C = static void sub_80DA034(struct Sprite *sprite) { sub_8078764(sprite, FALSE); - sprite->pos1.y += 20; + sprite->y += 20; sprite->data[1] = 0xBF; sprite->callback = sub_80DA05C; sub_80DA05C(sprite); } static void sub_80DA05C(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[1], 0x20); - sprite->pos2.y = Cos(sprite->data[1], 0x8); + sprite->x2 = Sin(sprite->data[1], 0x20); + sprite->y2 = Cos(sprite->data[1], 0x8); sprite->data[1] = (sprite->data[1] + 5) & 0xFF; if (++sprite->data[0] == 0x47) { DestroyAnimSprite(sprite); @@ -435,9 +435,9 @@ static void sub_80DA16C(struct Sprite *sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; InitAnimLinearTranslation(sprite); sprite->callback = sub_80785E4; @@ -468,10 +468,10 @@ static void sub_80DA208(struct Sprite *sprite) gBattleAnimArgs[3] = -gBattleAnimArgs[3]; } - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[4]; if (gBattleAnimArgs[6] == 0) @@ -510,10 +510,10 @@ static void sub_80DA348(struct Sprite *sprite) else { sprite->data[2] += sprite->data[1]; - sprite->pos2.y -= (sprite->data[2] >> 8); + sprite->y2 -= (sprite->data[2] >> 8); } - if (sprite->pos1.y + sprite->pos2.y < -32) + if (sprite->y + sprite->y2 < -32) { DestroyAnimSprite(sprite); } @@ -523,20 +523,20 @@ static void sub_80DA38C(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { - sprite->pos1.x = 272; - sprite->pos1.y = -32; + sprite->x = 272; + sprite->y = -32; StartSpriteAffineAnim(sprite, 1); } else { - sprite->pos1.x = -32; - sprite->pos1.y = -32; + sprite->x = -32; + sprite->y = -32; } sprite->data[0] = gBattleAnimArgs[0]; - 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); @@ -550,13 +550,13 @@ static void sub_80DA410(struct Sprite *sprite) if (((u16) sprite->data[3] >> 8) > 200) { - sprite->pos1.x += sprite->pos2.x; - sprite->pos2.x = 0; + sprite->x += sprite->x2; + sprite->x2 = 0; sprite->data[3] &= 0xFF; } - //The below if statement relies on overflow when cast to unsigned whenever pos1.x and pos2.x add up to less than 32. - if ((u32) (sprite->pos1.x + sprite->pos2.x + 32) > 304 || sprite->pos1.y + sprite->pos2.y > 160) + //The below if statement relies on overflow when cast to unsigned whenever x and x2 add up to less than 32. + if ((u32) (sprite->x + sprite->x2 + 32) > 304 || sprite->y + sprite->y2 > 160) { gSprites[GetAnimBattlerSpriteId(0)].invisible = FALSE; DestroyAnimSprite(sprite); @@ -649,11 +649,11 @@ static void AnimFallingFeather(struct Sprite *sprite) if (GetBattlerSide(battler) == B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_HEIGHT) + gBattleAnimArgs[0]; + sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_HEIGHT) + gBattleAnimArgs[0]; sinVal = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_WIDTH); - sprite->pos1.y = sinVal + gBattleAnimArgs[1]; + sprite->y = sinVal + gBattleAnimArgs[1]; - data->unk8 = (u16)sprite->pos1.y << 8; + data->unk8 = (u16)sprite->y << 8; data->unkE_1 = (u16)(sinVal + gBattleAnimArgs[6]); data->unk0_0c = 1; @@ -694,10 +694,10 @@ static void AnimFallingFeather(struct Sprite *sprite) data->unk0_1 = data->unk2/64; - sprite->pos2.x = (gSineTable[data->unk2] * (s32)data->unkC[0]) >> 8; + sprite->x2 = (gSineTable[data->unk2] * (s32)data->unkC[0]) >> 8; matrixNum = sprite->oam.matrixNum; - sinIndex = ((-sprite->pos2.x >> 1) + data->unkA) & 0xFF; + sinIndex = ((-sprite->x2 >> 1) + data->unkA) & 0xFF; sinVal = gSineTable[sinIndex]; gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; @@ -807,10 +807,10 @@ static void DestroyAnimSpriteAfterTimer(struct Sprite *sprite) break; } - sprite->pos2.x = ((s32)(data->unkC[data->unk0_0b]) * gSineTable[data->unk2]) >> 8; + sprite->x2 = ((s32)(data->unkC[data->unk0_0b]) * gSineTable[data->unk2]) >> 8; matrixNum = sprite->oam.matrixNum; - sinIndex = ((-sprite->pos2.x >> 1) + data->unkA) & 0xFF; + sinIndex = ((-sprite->x2 >> 1) + data->unkA) & 0xFF; sinVal = gSineTable[sinIndex]; gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64]; @@ -818,13 +818,13 @@ static void DestroyAnimSpriteAfterTimer(struct Sprite *sprite) gOamMatrices[matrixNum].c = -sinVal; data->unk8 += data->unk6; - sprite->pos1.y = (s16)(data->unk8 >> 8); + sprite->y = (s16)(data->unk8 >> 8); if (data->unk4 & 0x8000) data->unk2 = (data->unk2 - (data->unk4 & 0x7FFF)) & 0xFF; else data->unk2 = (data->unk2 + (data->unk4 & 0x7FFF)) & 0xFF; // 080dacfe - if (sprite->pos1.y + sprite->pos2.y >= data->unkE_1) + if (sprite->y + sprite->y2 >= data->unkE_1) { sprite->data[0] = 0; sprite->callback = sub_80DA48C; @@ -834,8 +834,8 @@ static void DestroyAnimSpriteAfterTimer(struct Sprite *sprite) static void sub_80DAD30(struct Sprite *sprite) { sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = TranslateAnimSpriteToTargetMonLocation; } @@ -879,7 +879,7 @@ static void sub_80DAD84(struct Sprite * sprite) sprite->data[4] = gSineTable[sprite->data[1] & 0xff]; sprite->data[5] = -gSineTable[(sprite->data[1] & 0xff) + 64]; sprite->data[6] = 0; - sprite->pos2.x = sprite->pos2.y = 0; + sprite->x2 = sprite->y2 = 0; matrixNum = sprite->oam.matrixNum; sprite->data[1] = ((u16)sprite->data[1] >> 8); @@ -917,23 +917,23 @@ static void sub_80DAF0C(struct Sprite *sprite) if (++sprite->data[0] < 5) return; - sprite->pos2.x = (sprite->data[4] * sprite->data[6]) >> 8; - sprite->pos2.y = (sprite->data[5] * sprite->data[6]) >> 8; + sprite->x2 = (sprite->data[4] * sprite->data[6]) >> 8; + sprite->y2 = (sprite->data[5] * sprite->data[6]) >> 8; sprite->data[6] += sprite->data[3] & 0xff; if (sprite->data[6] < (sprite->data[2] & 0xff)) return; - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; + sprite->x += sprite->x2; + sprite->y += sprite->y2; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x2 = 0; + sprite->y2 = 0; memcpy(dataCpy, sprite->data, 16); memset(sprite->data, 0, 16); - data->unk8 = (u16)sprite->pos1.y << 8; + data->unk8 = (u16)sprite->y << 8; data->unk6 = dataCpy[3] >> 8; data->unk2 = 0; data->unkA = dataCpy[1]; @@ -985,16 +985,16 @@ static void sub_80DB000(struct Sprite *sprite) if ((!gBattleAnimArgs[2] && !GetBattlerSide(gBattleAnimAttacker)) || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gBattleAnimTarget))) { - sprite->pos1.x += 8; + sprite->x += 8; } SeekSpriteAnim(sprite, gBattleAnimArgs[4]); - sprite->pos1.x -= 32; + sprite->x -= 32; sprite->data[1] = 0x0ccc; arg = gBattleAnimArgs[4]; mult = 12; - sprite->pos2.x += mult * arg; + sprite->x2 += mult * arg; sprite->data[0] = arg; sprite->data[7] = gBattleAnimArgs[3]; sprite->callback = sub_80DB0A0; @@ -1002,12 +1002,12 @@ static void sub_80DB000(struct Sprite *sprite) static void sub_80DB0A0(struct Sprite *sprite) { - sprite->pos2.x += sprite->data[1] >> 8; + sprite->x2 += sprite->data[1] >> 8; if (++sprite->data[0] == 6) { sprite->data[0] = 0; - sprite->pos2.x = 0; + sprite->x2 = 0; StartSpriteAnim(sprite, 0); } @@ -1065,20 +1065,20 @@ static void sub_80DB1F4(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); - sprite->pos2.y = -sprite->pos1.y - 32; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->y2 = -sprite->y - 32; ++sprite->data[0]; break; case 1: - sprite->pos2.y += 10; - if (sprite->pos2.y >= 0) + sprite->y2 += 10; + if (sprite->y2 >= 0) { ++sprite->data[0]; } break; case 2: - sprite->pos2.y -= 10; - if (sprite->pos1.y + sprite->pos2.y < -32) + sprite->y2 -= 10; + if (sprite->y + sprite->y2 < -32) { gSprites[GetAnimBattlerSpriteId(0)].invisible = FALSE; DestroyAnimSprite(sprite); @@ -1101,10 +1101,10 @@ static void sub_80DB2D0(struct Sprite *sprite) { --sprite->data[0]; } - else if (sprite->pos1.y + sprite->pos2.y > -32) + else if (sprite->y + sprite->y2 > -32) { sprite->data[2] += sprite->data[1]; - sprite->pos2.y -= (sprite->data[2] >> 8); + sprite->y2 -= (sprite->data[2] >> 8); } else { @@ -1118,14 +1118,14 @@ static void sub_80DB2D0(struct Sprite *sprite) static void sub_80DB330(struct Sprite *sprite) { - sprite->pos2.y += sprite->data[2] >> 8; + sprite->y2 += sprite->data[2] >> 8; - if (sprite->pos1.y + sprite->pos2.y > -32) + if (sprite->y + sprite->y2 > -32) { sprite->invisible = FALSE; } - if (sprite->pos2.y > 0) + if (sprite->y2 > 0) { DestroyAnimSprite(sprite); } @@ -1141,13 +1141,13 @@ static void sub_80DB374(struct Sprite *sprite) case 0: if (!gBattleAnimArgs[0]) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } sprite->data[1] = 512; @@ -1174,7 +1174,7 @@ static void sub_80DB374(struct Sprite *sprite) t2 = 128; t2 = (64 - t2) / 2; - sprite->pos2.y = t2; + sprite->y2 = t2; if (sprite->data[2] == 24) { @@ -1219,13 +1219,13 @@ static void sub_80DB458(struct Sprite *sprite) if (gBattleAnimArgs[1] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32; } sprite->callback = sub_80DB508; @@ -1235,13 +1235,13 @@ static void sub_80DB508(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->pos2.x += sprite->data[0] >> 8; - sprite->pos2.y -= sprite->data[1] >> 8; + sprite->x2 += sprite->data[0] >> 8; + sprite->y2 -= sprite->data[1] >> 8; } else { - sprite->pos2.x -= sprite->data[0] >> 8; - sprite->pos2.y -= sprite->data[1] >> 8; + sprite->x2 -= sprite->data[0] >> 8; + sprite->y2 -= sprite->data[1] >> 8; } sprite->data[0] = sprite->data[0]; @@ -1290,19 +1290,19 @@ static void sub_80DB5E4(struct Sprite *sprite) s16 posx, posy; u16 rotation; - posx = sprite->pos1.x; - posy = sprite->pos1.y; + posx = sprite->x; + posy = 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[4] = sprite->pos1.x << 4; - sprite->data[5] = sprite->pos1.y << 4; + sprite->data[4] = sprite->x << 4; + sprite->data[5] = sprite->y << 4; - sprite->data[6] = ((posx - sprite->pos1.x) << 4) / 12; - sprite->data[7] = ((posy - sprite->pos1.y) << 4) / 12; + sprite->data[6] = ((posx - sprite->x) << 4) / 12; + sprite->data[7] = ((posy - sprite->y) << 4) / 12; - rotation = ArcTan2Neg(posx - sprite->pos1.x, posy - sprite->pos1.y); + rotation = ArcTan2Neg(posx - sprite->x, posy - sprite->y); rotation += 0xc000; sub_8078FDC(sprite, 1, 0x100, 0x100, rotation); @@ -1315,10 +1315,10 @@ static void sub_80DB6A0(struct Sprite *sprite) 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; - if ((u16) (sprite->pos1.x + 0x2d) > 0x14a || sprite->pos1.y > 0x9d || sprite->pos1.y < -0x2d) + if ((u16) (sprite->x + 0x2d) > 0x14a || sprite->y > 0x9d || sprite->y < -0x2d) { DestroySpriteAndMatrix(sprite); } diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c index 31998b830..2742542a4 100644 --- a/src/battle/anim/flying_hearts.c +++ b/src/battle/anim/flying_hearts.c @@ -27,8 +27,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AE0 = void sub_80D2064(struct Sprite* sprite) { - sprite->pos1.x = gBattleAnimArgs[0]; - sprite->pos1.y = 0xA0; + sprite->x = gBattleAnimArgs[0]; + sprite->y = 0xA0; sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[1]; sprite->callback = WaitAnimForDuration; @@ -39,10 +39,10 @@ static void sub_80D2094(struct Sprite* sprite) { s16 y; sprite->data[2] += sprite->data[1]; - sprite->pos2.y = -((u16)sprite->data[2] >> 8); - sprite->pos2.x = Sin(sprite->data[3], 4); + sprite->y2 = -((u16)sprite->data[2] >> 8); + sprite->x2 = Sin(sprite->data[3], 4); sprite->data[3] = (sprite->data[3] + 3) & 0xFF; - y = sprite->pos1.y + sprite->pos2.y; + y = sprite->y + sprite->y2; if (y <= 0x48) { sprite->invisible = sprite->data[3] % 2; diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c index 989cb598c..4723dc3cb 100644 --- a/src/battle/anim/flying_path.c +++ b/src/battle/anim/flying_path.c @@ -146,14 +146,14 @@ static void sub_80CBF5C(u8 taskId) task->data[0] = 0xFF; break; case 1: - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[0] = 10; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = task->data[6]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = task->data[7]; sprite->data[5] = sub_80CC338(sprite); task->data[4] += 2; @@ -172,14 +172,14 @@ static void sub_80CBF5C(u8 taskId) task->data[0] = 0xFF; break; case 3: - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[0] = 10; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = task->data[7] - ((task->data[11] / 2) + 10) * task->data[5]; sprite->data[5] = sub_80CC338(sprite); task->data[3] = 2; @@ -189,14 +189,14 @@ static void sub_80CBF5C(u8 taskId) task->data[0]++; break; case 5: - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[0] = 10; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = task->data[6] + ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; sprite->data[5] = sub_80CC338(sprite); task->data[4] -= 2; @@ -215,14 +215,14 @@ static void sub_80CBF5C(u8 taskId) task->data[0] = 0xFF; break; case 7: - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[0] = 10; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = task->data[6]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = task->data[7]; sprite->data[5] = sub_80CC338(sprite); task->data[4] += 2; @@ -233,14 +233,14 @@ static void sub_80CBF5C(u8 taskId) task->data[0]++; break; case 9: - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[0] = 10; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; sprite->data[5] = sub_80CC338(sprite); task->data[3] = 5; @@ -263,14 +263,14 @@ static void sub_80CBF5C(u8 taskId) break; case 11: { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[0] = 10; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = task->data[8]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = task->data[9]; sprite->data[5] = sub_80CC338(sprite); task->data[4] -= 2; @@ -309,7 +309,7 @@ static void sub_80CBF5C(u8 taskId) static s16 sub_80CC338(struct Sprite* sprite) { s16 var = 8; - if (sprite->data[4] < sprite->pos1.y) + if (sprite->data[4] < sprite->y) var = -var; return var; @@ -324,8 +324,8 @@ static void sub_80CC358(struct Task* task, u8 taskId) s16 spriteX; s16 spriteY; task->data[14] = 0; - spriteX = gSprites[task->data[2]].pos1.x + gSprites[task->data[2]].pos2.x; - spriteY = gSprites[task->data[2]].pos1.y + gSprites[task->data[2]].pos2.y; + spriteX = gSprites[task->data[2]].x + gSprites[task->data[2]].x2; + spriteY = gSprites[task->data[2]].y + gSprites[task->data[2]].y2; spriteId = CreateSprite(&gSpriteTemplate_83D6884, spriteX, spriteY, task->data[4]); if (spriteId != 0x40) { diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c index 7c70cc158..d57d8fd8d 100644 --- a/src/battle/anim/flying_petals.c +++ b/src/battle/anim/flying_petals.c @@ -123,13 +123,13 @@ void sub_80CC474(struct Sprite* sprite) { sprite->data[4] = 0; sprite->data[2] = gBattleAnimArgs[3]; - sprite->pos1.x = 0xFFF0; + sprite->x = 0xFFF0; } else { sprite->data[4] = 1; sprite->data[2] = -gBattleAnimArgs[3]; - sprite->pos1.x = 0x100; + sprite->x = 0x100; } sprite->data[1] = gBattleAnimArgs[1]; @@ -138,19 +138,19 @@ void sub_80CC474(struct Sprite* sprite) switch (gBattleAnimArgs[5]) { case 0: - sprite->pos1.y = gBattleAnimArgs[0]; + sprite->y = gBattleAnimArgs[0]; sprite->oam.priority = GetBattlerSpriteBGPriority(bank); break; case 1: - sprite->pos1.y = gBattleAnimArgs[0]; + sprite->y = gBattleAnimArgs[0]; sprite->oam.priority = GetBattlerSpriteBGPriority(bank) + 1; break; case 2: - sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[0]; sprite->oam.priority = GetBattlerSpriteBGPriority(bank); break; case 3: - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0]; GetAnimBattlerSpriteId(1); sprite->oam.priority = GetBattlerSpriteBGPriority(bank) + 1; break; @@ -163,17 +163,17 @@ static void sub_80CC580(struct Sprite* sprite) { int a = sprite->data[7]; sprite->data[7]++; - sprite->pos2.y = (sprite->data[1] * gSineTable[sprite->data[0]]) >> 8; - sprite->pos2.x = sprite->data[2] * a; + sprite->y2 = (sprite->data[1] * gSineTable[sprite->data[0]]) >> 8; + sprite->x2 = sprite->data[2] * a; sprite->data[0] = (sprite->data[3] * a) & 0xFF; if (sprite->data[4] == 0) { - if (sprite->pos2.x + sprite->pos1.x <= 0xF7) + if (sprite->x2 + sprite->x <= 0xF7) return; } else { - if (sprite->pos2.x + sprite->pos1.x > -16) + if (sprite->x2 + sprite->x > -16) return; } diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index ed5445c10..d7ac9882b 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -226,9 +226,9 @@ static void sub_80DDB6C(struct Sprite *sprite) { InitAnimSpritePos(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); sub_8078BD4(sprite); sprite->callback = sub_80DDBD8; @@ -248,8 +248,8 @@ static void sub_80DDBD8(struct Sprite *sprite) 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]; @@ -266,8 +266,8 @@ static void sub_80DDC4C(struct Sprite *sprite) s16 r0; sprite->data[0] = 1; TranslateAnimLinear(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; @@ -328,8 +328,8 @@ static void sub_80DDD58(struct Sprite *sprite) static void sub_80DDD78(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; @@ -337,7 +337,7 @@ static void sub_80DDD78(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); @@ -407,18 +407,18 @@ static void sub_80DDED0(u8 taskId) static void InitAnimShadowBall(struct Sprite *sprite) { u16 r5, r6; - r5 = sprite->pos1.x; - r6 = sprite->pos1.y; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + r5 = sprite->x; + r6 = sprite->y; + 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] = (((s16)r5 - sprite->pos1.x) << 4) / (gBattleAnimArgs[0] << 1); - sprite->data[7] = (((s16)r6 - sprite->pos1.y) << 4) / (gBattleAnimArgs[0] << 1); + sprite->data[4] = sprite->x << 4; + sprite->data[5] = sprite->y << 4; + sprite->data[6] = (((s16)r5 - sprite->x) << 4) / (gBattleAnimArgs[0] << 1); + sprite->data[7] = (((s16)r6 - sprite->y) << 4) / (gBattleAnimArgs[0] << 1); sprite->callback = AnimShadowBallStep; } @@ -429,8 +429,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; @@ -442,22 +442,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: @@ -649,7 +649,7 @@ static void sub_80DE3D4(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; @@ -771,8 +771,8 @@ static void sub_80DE7B8(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_80DE8D8; sprite->invisible = TRUE; } @@ -783,8 +783,8 @@ static void sub_80DE8D8(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; } @@ -1044,7 +1044,7 @@ static void sub_80DEF3C(struct Sprite *sprite) xDelta2 = 2; } - sprite->pos1.x += xDelta; + sprite->x += xDelta; sprite->data[1] = xDelta2; sprite->data[0] = 60; sprite->callback = sub_80DEF98; @@ -1060,12 +1060,12 @@ static void sub_80DEF98(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) { @@ -1122,13 +1122,13 @@ static void sub_80DF0B8(struct Sprite *sprite) u16 coeffB; u16 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) @@ -1281,7 +1281,7 @@ static void sub_80DF3D8(struct Sprite *sprite) 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) @@ -1291,7 +1291,7 @@ static void sub_80DF3D8(struct Sprite *sprite) 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]--; @@ -1309,7 +1309,7 @@ static void sub_80DF49C(struct Sprite *sprite) sprite->data[3] = gBattleAnimArgs[1]; sprite->callback = sub_80DF4F4; - gSprites[sprite->data[5]].pos1.y += 8; + gSprites[sprite->data[5]].y += 8; } static void sub_80DF4F4(struct Sprite *sprite) @@ -1317,17 +1317,17 @@ static void sub_80DF4F4(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; } } diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c index 894d857f0..ee997d58d 100644 --- a/src/battle/anim/glitter.c +++ b/src/battle/anim/glitter.c @@ -60,7 +60,7 @@ void sub_80CD140(struct Sprite* sprite) sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; @@ -78,21 +78,21 @@ void sub_80CD190(struct Sprite* sprite) if (IsDoubleBattle() && IsAnimBankSpriteVisible(bank ^ 2)) { - SetAverageBattlerPositions(bank, gBattleAnimArgs[6], &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(bank, gBattleAnimArgs[6], &sprite->x, &sprite->y); sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; } else { if (!gBattleAnimArgs[6]) { - sprite->pos1.x = GetBattlerSpriteCoord(bank, 0); - sprite->pos1.y = GetBattlerSpriteCoord(bank, 1) + gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(bank, 0); + sprite->y = GetBattlerSpriteCoord(bank, 1) + gBattleAnimArgs[1]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(bank, 2); - sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(bank, 2); + sprite->y = GetBattlerSpriteCoord(bank, 3) + gBattleAnimArgs[1]; } sub_807867C(sprite, gBattleAnimArgs[0]); diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c index 60d0a46ad..e62e06057 100644 --- a/src/battle/anim/grip.c +++ b/src/battle/anim/grip.c @@ -62,8 +62,8 @@ void sub_80D0178(struct Sprite* sprite) StartSpriteAnim(sprite, 1); } - sprite->pos1.x += r7; - sprite->pos1.y += r4; + sprite->x += r7; + sprite->y += r4; sprite->data[0] = 6; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r8; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + r6; diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index eebba4810..120901700 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -154,8 +154,8 @@ const struct SpriteTemplate gDigDirtMoundSpriteTemplate = // a boomerang. After hitting the target mon, it comes back to the user. static void AnimBonemerangProjectile(struct Sprite *sprite) { - 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] = 20; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); @@ -168,10 +168,10 @@ static void AnimBonemerangProjectileStep(struct Sprite *sprite) { if (TranslateAnimArc(sprite)) { - 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] = 20; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); @@ -247,16 +247,16 @@ static void AnimMudSportDirt(struct Sprite *sprite) sprite->oam.tileNum++; if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[1] > 0 ? 1 : -1; sprite->callback = AnimMudSportDirtRising; } else { - sprite->pos1.x = gBattleAnimArgs[1]; - sprite->pos1.y = gBattleAnimArgs[2]; - sprite->pos2.y = -gBattleAnimArgs[2]; + sprite->x = gBattleAnimArgs[1]; + sprite->y = gBattleAnimArgs[2]; + sprite->y2 = -gBattleAnimArgs[2]; sprite->callback = AnimMudSportDirtFalling; } } @@ -266,11 +266,11 @@ static void AnimMudSportDirtRising(struct Sprite *sprite) if (++sprite->data[1] > 1) { sprite->data[1] = 0; - sprite->pos1.x += sprite->data[0]; + sprite->x += sprite->data[0]; } - sprite->pos1.y -= 4; - if (sprite->pos1.y < -4) + sprite->y -= 4; + if (sprite->y < -4) DestroyAnimSprite(sprite); } @@ -279,10 +279,10 @@ static void AnimMudSportDirtFalling(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos2.y += 4; - if (sprite->pos2.y >= 0) + sprite->y2 += 4; + if (sprite->y2 >= 0) { - sprite->pos2.y = 0; + sprite->y2 = 0; sprite->data[0]++; } break; @@ -366,7 +366,7 @@ static void sub_80E1284(u8 taskId) else gBattle_BG2_Y = task->data[13] - task->data[5]; - gSprites[task->data[10]].pos2.x = 272 - gSprites[task->data[10]].pos1.x; + gSprites[task->data[10]].x2 = 272 - gSprites[task->data[10]].x; task->data[0]++; } break; @@ -385,8 +385,8 @@ static void sub_80E143C(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(0); gSprites[spriteId].invisible = TRUE; - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].x2 = 0; + gSprites[spriteId].y2 = 0; if (GetBattlerPosition_permutated(gBattleAnimAttacker) == 1) gBattle_BG1_Y = 0; @@ -417,8 +417,8 @@ static void sub_80E14DC(u8 taskId) case 0: task->data[10] = GetAnimBattlerSpriteId(0); gSprites[task->data[10]].invisible = FALSE; - gSprites[task->data[10]].pos2.x = 0; - gSprites[task->data[10]].pos2.y = 160 - gSprites[task->data[10]].pos1.y; + gSprites[task->data[10]].x2 = 0; + gSprites[task->data[10]].y2 = 160 - gSprites[task->data[10]].y; task->data[0]++; break; case 1: @@ -451,12 +451,12 @@ static void sub_80E1560(u8 taskId) task->data[0]++; break; case 2: - gSprites[task->data[10]].pos2.y = 96; + gSprites[task->data[10]].y2 = 96; task->data[0]++; break; case 3: - gSprites[task->data[10]].pos2.y -= 8; - if (gSprites[task->data[10]].pos2.y == 0) + gSprites[task->data[10]].y2 -= 8; + if (gSprites[task->data[10]].y2 == 0) { gScanlineEffect.state = 3; task->data[0]++; @@ -531,11 +531,11 @@ static void AnimFissureDirtPlumeParticle(struct Sprite *sprite) gBattleAnimArgs[2] *= -1; } - sprite->pos1.x = GetBattlerSpriteCoord(battler, 2) + xOffset; - sprite->pos1.y = sub_8077FC0(battler) + 30; + sprite->x = GetBattlerSpriteCoord(battler, 2) + xOffset; + sprite->y = sub_8077FC0(battler) + 30; sprite->data[0] = gBattleAnimArgs[5]; - sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; - sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[3]; + sprite->data[2] = sprite->x + gBattleAnimArgs[2]; + sprite->data[4] = sprite->y + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[4]; InitAnimArcTranslation(sprite); sprite->callback = AnimFissureDirtPlumeParticleStep; @@ -562,8 +562,8 @@ static void AnimDigDirtMound(struct Sprite *sprite) else battler = gBattleAnimTarget; - sprite->pos1.x = GetBattlerSpriteCoord(battler, 0) - 16 + (gBattleAnimArgs[1] * 32); - sprite->pos1.y = sub_8077FC0(battler) + 32; + sprite->x = GetBattlerSpriteCoord(battler, 0) - 16 + (gBattleAnimArgs[1] * 32); + sprite->y = sub_8077FC0(battler) + 32; sprite->oam.tileNum += gBattleAnimArgs[1] * 8; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); sprite->data[0] = gBattleAnimArgs[2]; @@ -697,7 +697,7 @@ static void sub_80E1A2C(u8 taskId) break; case 2: for (i = 0; i < task->data[13]; i++) - gSprites[task->data[9 + i]].pos2.x = 0; + gSprites[task->data[9 + i]].x2 = 0; DestroyAnimVisualTask(taskId); break; @@ -716,7 +716,7 @@ static void sub_80E1B10(struct Task *task) for (i = 0; i < task->data[13]; i++) { - gSprites[task->data[9 + i]].pos2.x = xOffset; + gSprites[task->data[9 + i]].x2 = xOffset; } } diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index 9f9685003..33cc9d61c 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -46,20 +46,20 @@ void sub_80D3014(struct Sprite *sprite) { if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { - SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); - sprite->pos1.y += 40; + SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->x, &sprite->y); + sprite->y += 40; StartSpriteAffineAnim(sprite, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 40; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 40; } sprite->data[0] = 13; - sprite->data[2] = sprite->pos1.x; - sprite->data[4] = sprite->pos1.y - 72; + sprite->data[2] = sprite->x; + sprite->data[4] = sprite->y - 72; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index e2de9a0ec..4ac6b7734 100644 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -64,12 +64,12 @@ void sub_80D0228(struct Sprite* sprite) StartSpriteAnim(sprite, gBattleAnimArgs[0]); } - sprite->pos1.x += r8; - sprite->pos1.y += r4; + sprite->x += r8; + sprite->y += r4; sprite->data[0] = 6; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + r9; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + r6; InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[0]; @@ -83,10 +83,10 @@ static void sub_80D02D0(struct Sprite* sprite) { SeekSpriteAnim(sprite, 0); sprite->animPaused = 1; - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 2; - sprite->pos2.y = -2; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 2; + sprite->y2 = -2; sprite->data[0] = sprite->data[6]; sprite->data[1] ^= 1; sprite->data[2] ^= 1; @@ -100,15 +100,15 @@ static void sub_80D0344(struct Sprite* sprite) { if (sprite->data[3]) { - sprite->pos2.x = -sprite->pos2.x; - sprite->pos2.y = -sprite->pos2.y; + sprite->x2 = -sprite->x2; + sprite->y2 = -sprite->y2; } sprite->data[3] ^= 1; if (++sprite->data[4] == 0x33) { - sprite->pos2.y = 0; - sprite->pos2.x = 0; + sprite->y2 = 0; + sprite->x2 = 0; sprite->data[4] = 0; sprite->data[3] = 0; sprite->animPaused = 0; diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c index 0f35d7508..0ec0c89bb 100644 --- a/src/battle/anim/heal.c +++ b/src/battle/anim/heal.c @@ -46,7 +46,7 @@ void sub_80CBAA4(struct Sprite* sprite) } sprite->data[0]++; - sprite->pos2.y = sprite->data[1] * sprite->data[0]; + sprite->y2 = sprite->data[1] * sprite->data[0]; if (sprite->animEnded) { DestroyAnimSprite(sprite); diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c index f9e6b5080..fa0d21362 100644 --- a/src/battle/anim/heart_1.c +++ b/src/battle/anim/heart_1.c @@ -29,8 +29,8 @@ void sub_80D1C80(struct Sprite* sprite) if (++sprite->data[0] == 1) InitAnimSpritePos(sprite, 0); - sprite->pos2.x = Sin(sprite->data[1], 8); - sprite->pos2.y = sprite->data[2] >> 8; + sprite->x2 = Sin(sprite->data[1], 8); + sprite->y2 = sprite->data[2] >> 8; sprite->data[1] = (sprite->data[1] + 7) & 0xFF; sprite->data[2] -= 0x80; if (sprite->data[0] == 0x3C) diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c index 63557c6e0..4da3b3839 100644 --- a/src/battle/anim/hidden_power_orbit.c +++ b/src/battle/anim/hidden_power_orbit.c @@ -53,8 +53,8 @@ const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate = // arg 1: initial wave offset void AnimOrbitFast(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->affineAnimPaused = 1; sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; @@ -70,8 +70,8 @@ static void AnimOrbitFastStep(struct Sprite* sprite) else sprite->subpriority = sprite->data[7] - 1; - sprite->pos2.x = Sin(sprite->data[1], sprite->data[2] >> 8); - sprite->pos2.y = Cos(sprite->data[1], sprite->data[3] >> 8); + sprite->x2 = Sin(sprite->data[1], sprite->data[2] >> 8); + sprite->y2 = Cos(sprite->data[1], sprite->data[3] >> 8); sprite->data[1] = (sprite->data[1] + 9) & 0xFF; switch (sprite->data[5]) { @@ -104,8 +104,8 @@ static void AnimOrbitFastStep(struct Sprite* sprite) // arg 0: initial wave offset void AnimOrbitScatter(struct Sprite* sprite) { - 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] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->callback = AnimOrbitScatterStep; @@ -113,8 +113,8 @@ void AnimOrbitScatter(struct Sprite* sprite) static void AnimOrbitScatterStep(struct Sprite* sprite) { - sprite->pos2.x += sprite->data[0]; - sprite->pos2.y += sprite->data[1]; - if (sprite->pos1.x + sprite->pos2.x + 16 > 0x110u || sprite->pos1.y + sprite->pos2.y > 0xA0 || sprite->pos1.y + sprite->pos2.y < -16) + sprite->x2 += sprite->data[0]; + sprite->y2 += sprite->data[1]; + if (sprite->x + sprite->x2 + 16 > 0x110u || sprite->y + sprite->y2 > 0xA0 || sprite->y + sprite->y2 < -16) DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c index 1b71ebd7a..7a4ec8f9a 100644 --- a/src/battle/anim/homing.c +++ b/src/battle/anim/homing.c @@ -53,25 +53,25 @@ void sub_80CC6CC(struct Sprite* sprite) sprite->data[0] = gBattleAnimArgs[4]; if (gBattleAnimArgs[1] == 0) { - sprite->pos1.x = gBattleAnimArgs[2] + a; - sprite->pos1.y = gBattleAnimArgs[3] + b; + sprite->x = gBattleAnimArgs[2] + a; + sprite->y = gBattleAnimArgs[3] + b; sprite->data[5] = a; sprite->data[6] = b; } else { - sprite->pos1.x = a; - sprite->pos1.y = b; + sprite->x = a; + sprite->y = b; sprite->data[5] = gBattleAnimArgs[2] + a; sprite->data[6] = gBattleAnimArgs[3] + b; } - x = sprite->pos1.x; + x = sprite->x; sprite->data[1] = x * 16; - y = sprite->pos1.y; + y = sprite->y; sprite->data[2] = y * 16; - sprite->data[3] = (sprite->data[5] - sprite->pos1.x) * 16 / gBattleAnimArgs[4]; - sprite->data[4] = (sprite->data[6] - sprite->pos1.y) * 16 / gBattleAnimArgs[4]; + sprite->data[3] = (sprite->data[5] - sprite->x) * 16 / gBattleAnimArgs[4]; + sprite->data[4] = (sprite->data[6] - sprite->y) * 16 / gBattleAnimArgs[4]; c = ArcTan2Neg(sprite->data[5] - x, sprite->data[6] - y); if (IsContest()) c -= 0x8000; @@ -87,8 +87,8 @@ static void sub_80CC7D4(struct Sprite* sprite) { sprite->data[1] += sprite->data[3]; sprite->data[2] += sprite->data[4]; - sprite->pos1.x = sprite->data[1] >> 4 ; - sprite->pos1.y = sprite->data[2] >> 4 ; + sprite->x = sprite->data[1] >> 4 ; + sprite->y = sprite->data[2] >> 4 ; sprite->data[0]--; } else diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index 4e3a74ffe..a9facf03a 100644 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -70,7 +70,7 @@ const struct SpriteTemplate gFallingItemBagTemplate = void sub_80CB7EC(struct Sprite* sprite, s16 c) { - s32 a = (sprite->pos1.x * 256) | sprite->pos1.y; + s32 a = (sprite->x * 256) | sprite->y; s32 b = (sprite->data[6] * 256) | sprite->data[7]; c *= 256; sprite->data[5] = a; @@ -104,8 +104,8 @@ bool8 sub_80CB814(struct Sprite* sprite) r0 = r2 - r10; var1 = r0 * r3 / r6; var2 = r4_2 * r3 / r6; - sprite->pos1.x = var1 + r10; - sprite->pos1.y = var2 + r9; + sprite->x = var1 + r10; + sprite->y = var2 + r9; if (++r3 == r6) return TRUE; @@ -136,10 +136,10 @@ void sub_80CB8E8(struct Sprite* sprite) sprite->data[0] = 0; } - sprite->pos2.y = Sin(sprite->data[0] + 128, 30 - sprite->data[1] * 8); + sprite->y2 = Sin(sprite->data[0] + 128, 30 - sprite->data[1] * 8); if (sub_80CB814(sprite)) { - sprite->pos2.y = 0; + sprite->y2 = 0; sprite->data[0] = 0; sprite->callback = sub_80CB8B8; } @@ -182,10 +182,10 @@ void sub_80CB9C4(struct Sprite* sprite) sprite->data[0] = zero; } - sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); + sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); if (sub_80CB814(sprite)) { - sprite->pos2.y = zero; + sprite->y2 = zero; sprite->data[0] = zero; DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index 83d67c94a..886ebff65 100644 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -68,15 +68,15 @@ static void sub_80CBB60(struct Sprite* sprite) sprite->data[0] = zero; } - sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); - if (sprite->pos2.y == 0) + sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); + if (sprite->y2 == 0) { PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); } if (sub_80CB814(sprite)) { - sprite->pos2.y = 0; + sprite->y2 = 0; sprite->data[0] = 0; sprite->callback = sub_80CB8B8; PlaySE12WithPanning(0x7D, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index 438c61f9f..8d2efc4cc 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -563,8 +563,8 @@ static void sub_80D7704(struct Sprite *sprite) 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; @@ -582,10 +582,10 @@ static void sub_80D7888(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] -= 1; } @@ -644,12 +644,12 @@ 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]; } StoreSpriteCallbackInData(sprite, AnimFlickerIceEffectParticle); @@ -679,8 +679,8 @@ static void AnimSwirlingSnowball_Step1(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); 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]) { @@ -709,16 +709,16 @@ static void AnimSwirlingSnowball_Step1(struct Sprite *sprite) sprite->data[0] = 1; sub_8078CE8(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]; @@ -731,10 +731,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) != 0 ? 20 : 65516; @@ -753,17 +753,17 @@ 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.y = 0; - sprite->pos2.x = 0; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->y2 = 0; + sprite->x2 = 0; sprite->data[4] = 0; sprite->data[3] = 0; sprite->callback = AnimSwirlingSnowball_End; @@ -775,9 +775,9 @@ static void AnimSwirlingSnowball_End(struct Sprite *sprite) sprite->data[0] = 1; sub_8078CE8(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); } @@ -799,8 +799,8 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite) InitAnimSpritePos(sprite, 1); 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]) { @@ -829,16 +829,16 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite) { sprite->data[0] = 1; sub_8078CE8(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]; @@ -855,13 +855,13 @@ static void AnimWiggleParticleTowardsTarget(struct Sprite *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); } } @@ -880,13 +880,13 @@ 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]++; @@ -918,13 +918,13 @@ 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->x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; } battler = gBattleAnimAttacker; @@ -937,13 +937,13 @@ 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->x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; } battler = gBattleAnimTarget; @@ -957,13 +957,13 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) 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); @@ -977,8 +977,8 @@ static void AnimSwirlingFogAnim(struct Sprite *sprite) { if (!TranslateAnimLinear(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]); @@ -1097,8 +1097,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, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = TranslateAnimSpriteToTargetMonLocation; } @@ -1219,21 +1219,21 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite) sprite->data[6] = 1; } - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); if (gBattleAnimArgs[7]) { - sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1]; + sprite->data[1] = sprite->x + gBattleAnimArgs[1]; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[3]; - sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2]; + sprite->data[3] = sprite->y + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 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, 0) + gBattleAnimArgs[3]; - sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2]; + sprite->data[3] = sprite->y + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[4]; sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8; } @@ -1258,7 +1258,7 @@ static void sub_80D8874(struct Sprite *sprite) case 0: TranslateAnimLinear(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 @@ -1267,12 +1267,12 @@ static void sub_80D8874(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 (!gMain.inBattle) sprite->data[5] = 80; @@ -1281,9 +1281,9 @@ static void sub_80D8874(struct Sprite *sprite) 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); } @@ -1291,8 +1291,8 @@ static void sub_80D8874(struct Sprite *sprite) case 1: TranslateAnimLinear(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 (gMain.inBattle) { u16 var0 = sprite->data[5] - 0x40; @@ -1317,9 +1317,9 @@ static void sub_80D8874(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 (!gMain.inBattle) sprite->data[2] = -0x10; else if (gBattlerPositions[gBattleAnimTarget] & 1) @@ -1328,7 +1328,7 @@ static void sub_80D8874(struct Sprite *sprite) sprite->data[2] = -0x10; sprite->data[7]++; - sprite->pos2.x = sprite->pos2.y = 0; + sprite->x2 = sprite->y2 = 0; sub_8078BD4(sprite); } break; @@ -1463,10 +1463,10 @@ static void AnimHailBegin(struct Sprite *sprite) { u8 spriteId; - sprite->pos1.x += 4; - sprite->pos1.y += 8; + sprite->x += 4; + sprite->y += 8; - if (sprite->pos1.x < sprite->data[3] && sprite->pos1.y < sprite->data[4]) + if (sprite->x < sprite->data[3] && sprite->y < sprite->data[4]) return; if (sprite->data[0] == 1 && sprite->data[5] == 0) @@ -1571,11 +1571,11 @@ static void AnimIceBallParticle(struct Sprite *sprite) 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->x2 = sprite->data[3] >> 8; - sprite->pos2.y = sprite->data[4] >> 8; + sprite->y2 = sprite->data[4] >> 8; if (++sprite->data[0] == 21) DestroyAnimSprite(sprite); diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c index ac7cbfb0f..3a49f8750 100644 --- a/src/battle/anim/kiss_fountain.c +++ b/src/battle/anim/kiss_fountain.c @@ -35,8 +35,8 @@ void sub_80D1FDC(struct Sprite* sprite) else { sprite->data[4] += sprite->data[1]; - sprite->pos2.x = sprite->data[4] >> 8; - sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]); + sprite->x2 = sprite->data[4] >> 8; + sprite->y2 = Sin(sprite->data[3], sprite->data[2]); sprite->data[3] = (sprite->data[3] + 3) & 0xFF; if (sprite->data[3] > 0x64) { diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index 5b4c75080..7aa3f8688 100644 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -117,8 +117,8 @@ const struct SpriteTemplate gSwiftStarSpriteTemplate = void sub_80CAED8(struct Sprite* sprite) { - 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] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[2]; @@ -146,8 +146,8 @@ static void sub_80CAF20(struct Sprite* sprite) else { sprite->data[2]--; - sprite->pos1.x += sprite->data[0]; - sprite->pos1.y += sprite->data[1]; + sprite->x += sprite->data[0]; + sprite->y += sprite->data[1]; } } @@ -155,18 +155,18 @@ static void sub_80CAF6C(struct Sprite* sprite) { if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos2.x = -Sin(sprite->data[0], 0x19); + sprite->x2 = -Sin(sprite->data[0], 0x19); } else { - sprite->pos2.x = Sin(sprite->data[0], 0x19); + sprite->x2 = Sin(sprite->data[0], 0x19); } sprite->data[0] = (sprite->data[0] + 2) & 0xFF; sprite->data[1]++; if (!(sprite->data[1] & 1)) { - sprite->pos2.y++; + sprite->y2++; } if (sprite->data[1] > 0x50) @@ -242,10 +242,10 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite) destroy = TRUE; } - if (sprite->pos1.x + sprite->pos2.x > 256 - || sprite->pos1.x + sprite->pos2.x < -16 - || sprite->pos1.y + sprite->pos2.y > 160 - || sprite->pos1.y + sprite->pos2.y < -16) + if (sprite->x + sprite->x2 > 256 + || sprite->x + sprite->x2 < -16 + || sprite->y + sprite->y2 > 160 + || sprite->y + sprite->y2 < -16) destroy = TRUE; if (destroy) @@ -262,10 +262,10 @@ void AnimMoveTwisterParticle(struct Sprite* sprite) { if (!IsContest() && IsDoubleBattle() == TRUE) { - SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->x, &sprite->y); } - sprite->pos1.y += 32; + sprite->y += 32; sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[2]; @@ -278,11 +278,11 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite) { if (sprite->data[1] == 0xFF) { - sprite->pos1.y -= 2; + sprite->y -= 2; } else if (sprite->data[1] > 0) { - sprite->pos1.y -= 2; + sprite->y -= 2; sprite->data[1] -= 2; } @@ -291,8 +291,8 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite) sprite->data[5] += sprite->data[2]; sprite->data[5] &= 0xFF; - sprite->pos2.x = Cos(sprite->data[5], sprite->data[3]); - sprite->pos2.y = Sin(sprite->data[5], 5); + sprite->x2 = Cos(sprite->data[5], sprite->data[3]); + sprite->y2 = Sin(sprite->data[5], 5); if (sprite->data[5] <= 0x7F) { sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) - 1; diff --git a/src/battle/anim/lunge.c b/src/battle/anim/lunge.c index da3eda56a..5d8a21928 100644 --- a/src/battle/anim/lunge.c +++ b/src/battle/anim/lunge.c @@ -239,7 +239,7 @@ void sub_80CDB60(u8 taskId) if (task->data[3]) { task->data[4] += task->data[5]; - gSprites[task->data[0]].pos2.x = task->data[4]; + gSprites[task->data[0]].x2 = task->data[4]; task->data[3]--; } else @@ -262,7 +262,7 @@ void sub_80CDB60(u8 taskId) else { task->data[3] = 8; - task->data[4] = gSprites[task->data[0]].pos2.x; + task->data[4] = gSprites[task->data[0]].x2; task->data[5] = (task->data[1] == 0) ? 0x2 : -0x2; task->data[6] = 1; task->data[2]++; @@ -278,9 +278,9 @@ void sub_80CDB60(u8 taskId) else { if (task->data[3] & 1) - gSprites[task->data[0]].pos2.x = task->data[4] + task->data[5]; + gSprites[task->data[0]].x2 = task->data[4] + task->data[5]; else - gSprites[task->data[0]].pos2.x = task->data[4] - task->data[5]; + gSprites[task->data[0]].x2 = task->data[4] - task->data[5]; task->data[6] = 1; task->data[3]--; @@ -288,7 +288,7 @@ void sub_80CDB60(u8 taskId) } else { - gSprites[task->data[0]].pos2.x = task->data[4]; + gSprites[task->data[0]].x2 = task->data[4]; task->data[3] = 12; task->data[2]++; } @@ -301,7 +301,7 @@ void sub_80CDB60(u8 taskId) else { task->data[3] = 3; - task->data[4] = gSprites[task->data[0]].pos2.x; + task->data[4] = gSprites[task->data[0]].x2; task->data[5] = (task->data[1] == 0) ? 8 : -8; task->data[2]++; } @@ -310,7 +310,7 @@ void sub_80CDB60(u8 taskId) if (task->data[3]) { task->data[4] += task->data[5]; - gSprites[task->data[0]].pos2.x = task->data[4]; + gSprites[task->data[0]].x2 = task->data[4]; task->data[3]--; } else diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c index 03af2f8e1..1f26438a6 100644 --- a/src/battle/anim/money.c +++ b/src/battle/anim/money.c @@ -72,7 +72,7 @@ void sub_80CFE9C(struct Sprite* sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; r6 += gBattleAnimArgs[2]; - var = ArcTan2Neg(r6 - sprite->pos1.x, r7 - sprite->pos1.y); + var = ArcTan2Neg(r6 - sprite->x, r7 - sprite->y); var += 0xC000; sub_8078FDC(sprite, 0, 0x100, 0x100, var); sprite->data[0] = gBattleAnimArgs[4]; @@ -85,18 +85,18 @@ void sub_80CFE9C(struct Sprite* sprite) void sub_80CFF50(struct Sprite* sprite) { sprite->data[2] = -16; - sprite->pos1.y += 8; + sprite->y += 8; sprite->callback = sub_80CFF68; } static void sub_80CFF68(struct Sprite* sprite) { sprite->data[0] += 0x80; - sprite->pos2.x = sprite->data[0] >> 8; + sprite->x2 = sprite->data[0] >> 8; if (GetBattlerSide(gBattleAnimAttacker) == 0) - sprite->pos2.x = -sprite->pos2.x; + sprite->x2 = -sprite->x2; - sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]); + sprite->y2 = Sin(sprite->data[1], sprite->data[2]); sprite->data[1] += 5; if (sprite->data[1] > 0x7E) { diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c index 30639a0e5..b1fec1bba 100644 --- a/src/battle/anim/moon.c +++ b/src/battle/anim/moon.c @@ -29,13 +29,13 @@ void sub_80CE30C(struct Sprite* sprite) { if (IsContest()) { - sprite->pos1.x = 0x30; - sprite->pos1.y = 0x28; + sprite->x = 0x30; + sprite->y = 0x28; } else { - sprite->pos1.x = gBattleAnimArgs[0]; - sprite->pos1.y = gBattleAnimArgs[1]; + sprite->x = gBattleAnimArgs[0]; + sprite->y = gBattleAnimArgs[1]; } sprite->oam.shape = 0; diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c index 1a58c4daf..2181757e5 100644 --- a/src/battle/anim/musical.c +++ b/src/battle/anim/musical.c @@ -225,9 +225,9 @@ void sub_80CEB0C(struct Sprite* sprite) b = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } - sprite->data[4] = sprite->pos1.x << 4; - sprite->data[5] = sprite->pos1.y << 4; - sub_80CEBC4(a - sprite->pos1.x, b - sprite->pos1.y, &sprite->data[6], &sprite->data[7], 0x28); + sprite->data[4] = sprite->x << 4; + sprite->data[5] = sprite->y << 4; + sub_80CEBC4(a - sprite->x, b - sprite->y, &sprite->data[6], &sprite->data[7], 0x28); sprite->callback = sub_80CEC1C; } @@ -257,11 +257,11 @@ static void sub_80CEC1C(struct Sprite* sprite) b = sprite->data[0] * 5 - ((sprite->data[0] * 5 / 256) << 8); 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->pos2.y = Sin(b, 15); - a = (u16)sprite->pos1.y; - c = (u16)sprite->pos1.x; + sprite->x = sprite->data[4] >> 4; + sprite->y = sprite->data[5] >> 4; + sprite->y2 = Sin(b, 15); + a = (u16)sprite->y; + c = (u16)sprite->x; if ((u32)((c + 16) << 16) > (0x110) << 16 || a < -16 || a > 0x80) { @@ -294,13 +294,13 @@ void sub_80CECE8(struct Sprite* sprite) *(u16*)&gBattleAnimArgs[1] = -a; } - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; StartSpriteAnim(sprite, gBattleAnimArgs[0]); sprite->data[2] = 0; sprite->data[3] = 0; - sprite->data[4] = sprite->pos1.x << 4; - sprite->data[5] = sprite->pos1.y << 4; + sprite->data[4] = sprite->x << 4; + sprite->data[5] = sprite->y << 4; sprite->data[6] = (gBattleAnimArgs[1] << 4) / 5; sprite->data[7] = (gBattleAnimArgs[2] << 7) / 5; sprite->callback = sub_80CED78; @@ -310,13 +310,13 @@ static void sub_80CED78(struct Sprite* sprite) { 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; if (sprite->data[0] > 5 && sprite->data[3] == 0) { sprite->data[2] = (sprite->data[2] + 16) & 0xFF; - sprite->pos2.x = Cos(sprite->data[2], 18); - sprite->pos2.y = Sin(sprite->data[2], 18); + sprite->x2 = Cos(sprite->data[2], 18); + sprite->y2 = Sin(sprite->data[2], 18); if (sprite->data[2] == 0) sprite->data[3] = 1; } @@ -341,8 +341,8 @@ void sub_80CEDF0(struct Sprite* sprite) a = -16; } - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + a; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 8; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + a; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 8; sprite->data[0] = 8; sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -356,7 +356,7 @@ void sub_80CEE60(struct Sprite* sprite) s16 a; u8 index; sub_8078650(sprite); - sprite->pos1.y += 8; + sprite->y += 8; StartSpriteAnim(sprite, gBattleAnimArgs[1]); index = IndexOfSpritePaletteTag(gUnknown_083D712C[gBattleAnimArgs[2]][0]); if (index != 0xFF) @@ -364,9 +364,9 @@ void sub_80CEE60(struct Sprite* sprite) a = (gBattleAnimArgs[0] == 0) ? 0xFFE0 : 0x20; sprite->data[0] = 40; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = a + sprite->data[1]; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = sprite->data[3] - 40; InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[3]; @@ -379,11 +379,11 @@ static void sub_80CEEE8(struct Sprite* sprite) { s16 a; a = Sin(sprite->data[5], 8); - if (sprite->pos2.x < 0) + if (sprite->x2 < 0) a = -a; - sprite->pos2.x += a; - sprite->pos2.y += Sin(sprite->data[5], 4); + sprite->x2 += a; + sprite->y2 += Sin(sprite->data[5], 4); sprite->data[5] = (sprite->data[5] + 8) & 0xFF; } else diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c index 65d962ace..580bee1b8 100644 --- a/src/battle/anim/noise.c +++ b/src/battle/anim/noise.c @@ -33,11 +33,11 @@ void sub_80D2D68(struct Sprite* sprite) gBattleAnimArgs[1] *= -1; } - sprite->pos1.x = GetBattlerSpriteCoord(slot, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(slot, 3) + gBattleAnimArgs[2]; + sprite->x = GetBattlerSpriteCoord(slot, 2) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(slot, 3) + gBattleAnimArgs[2]; sprite->data[0] = 0; - sprite->data[1] = (u16)sprite->pos1.x << 3; - sprite->data[2] = (u16)sprite->pos1.y << 3; + sprite->data[1] = (u16)sprite->x << 3; + sprite->data[2] = (u16)sprite->y << 3; var1 = gBattleAnimArgs[1] << 3; if (var1 < 0) @@ -58,8 +58,8 @@ static void sub_80D2E30(struct Sprite *sprite) sprite->data[1] += sprite->data[3]; sprite->data[2] += sprite->data[4]; - sprite->pos1.x = sprite->data[1] >> 3; - sprite->pos1.y = sprite->data[2] >> 3; + sprite->x = sprite->data[1] >> 3; + sprite->y = sprite->data[2] >> 3; if (++sprite->data[0] > 16) { diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 9be913b70..6ab501cf1 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -310,8 +310,8 @@ const u16 gUnknown_083DB568 = RGB(31, 31, 31); // arg 4: duration static void AnimConfusionDuck(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]; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { @@ -332,8 +332,8 @@ static void AnimConfusionDuck(struct Sprite *sprite) static void AnimConfusionDuckStep(struct Sprite *sprite) { - sprite->pos2.x = Cos(sprite->data[0], 30); - sprite->pos2.y = Sin(sprite->data[0], 10); + sprite->x2 = Cos(sprite->data[0], 30); + sprite->y2 = Sin(sprite->data[0], 10); if ((u16)sprite->data[0] < 128) sprite->oam.priority = 1; @@ -449,8 +449,8 @@ static void sub_80E1F0C(struct Sprite *sprite) static void sub_80E1F3C(struct Sprite *sprite) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = 0; sprite->data[1] = 10; sprite->data[2] = 8; @@ -904,8 +904,8 @@ static void sub_80E2870(struct Sprite *sprite) else sub_8078764(sprite, FALSE); - sprite->pos2.x += (Random() % 48) - 24; - sprite->pos2.y += (Random() % 24) - 12; + sprite->x2 += (Random() % 48) - 24; + sprite->y2 += (Random() % 24) - 12; StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix); sprite->callback = sub_80785E4; @@ -914,10 +914,10 @@ static void sub_80E2870(struct Sprite *sprite) static void sub_80E2908(struct Sprite *sprite) { sprite->data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x; - sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + gSprites[sprite->data[0]].pos2.y; - sprite->pos2.x = gBattleAnimArgs[1]; - sprite->pos2.y = gBattleAnimArgs[2]; + sprite->x = gSprites[sprite->data[0]].x + gSprites[sprite->data[0]].x2; + sprite->y = gSprites[sprite->data[0]].y + gSprites[sprite->data[0]].y2; + sprite->x2 = gBattleAnimArgs[1]; + sprite->y2 = gBattleAnimArgs[2]; StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix); sprite->callback = sub_80785E4; @@ -1248,8 +1248,8 @@ void sub_80E2F2C(u8 taskId) LZDecompressVram(&gUnknown_08D20A14, subStruct.field_0); LoadPalette(&gUnknown_083DB568, subStruct.field_8 * 16 + 1, 2); - gBattle_BG1_X = -gSprites[spriteId].pos1.x + 32; - gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32; + gBattle_BG1_X = -gSprites[spriteId].x + 32; + gBattle_BG1_Y = -gSprites[spriteId].y + 32; gTasks[taskId].data[0] = newSpriteId; gTasks[taskId].data[6] = var0; gTasks[taskId].func = sub_80E3194; diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c index c2b4e169c..6b80d4880 100644 --- a/src/battle/anim/note_spin.c +++ b/src/battle/anim/note_spin.c @@ -90,8 +90,8 @@ void sub_80D2EC8(struct Sprite *sprite) if (sprite->data[0] == 0) { - sprite->pos1.x = 120; - sprite->pos1.y = (gBattleAnimArgs[0] + (((u16)gBattleAnimArgs[0]) >> 31)) / 2 - 15; + sprite->x = 120; + sprite->y = (gBattleAnimArgs[0] + (((u16)gBattleAnimArgs[0]) >> 31)) / 2 - 15; StartSpriteAnim(sprite, gBattleAnimArgs[1]); @@ -107,9 +107,9 @@ void sub_80D2EC8(struct Sprite *sprite) sprite->data[6] = (sprite->data[6] + 10) & 0xFF; index &= var2; - sprite->pos2.x = Cos(index, 100); + sprite->x2 = Cos(index, 100); - sprite->pos2.y = sprite->data[1] + Sin(index, 10) + Cos(sprite->data[6], 4); + sprite->y2 = sprite->data[1] + Sin(index, 10) + Cos(sprite->data[6], 4); if (sprite->data[0] > sprite->data[5]) { @@ -137,7 +137,7 @@ static void sub_80D2F80(struct Sprite *sprite) static void sub_80D2FA4(struct Sprite *sprite) { sprite->data[3] += sprite->data[2]; - sprite->pos2.y = sprite->data[3]; + sprite->y2 = sprite->data[3]; sprite->data[2]++; diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index 3f72d9246..ad021900e 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -106,8 +106,8 @@ static void sub_80CAC44(struct Sprite* sprite) { u8 var1; - sprite->pos2.x = Sin(sprite->data[1], 32); - sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8); + sprite->x2 = Sin(sprite->data[1], 32); + sprite->y2 = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8); if ((u16)(sprite->data[1] - 0x40) < 0x80) { sprite->oam.priority = (GetBattlerSpriteBGPriority(gBattleAnimTarget) & 3); @@ -154,9 +154,9 @@ void sub_80CAD54(struct Sprite* sprite) { InitAnimSpritePos(sprite, 0); 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[1] = sprite->x; + sprite->data[2] = sprite->x; + sprite->data[3] = sprite->y; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; @@ -168,8 +168,8 @@ static void sub_80CADA8(struct Sprite* sprite) { if (!TranslateAnimLinear(sprite)) { - sprite->pos2.x += Sin(sprite->data[5], 32); - sprite->pos2.y += Cos(sprite->data[5], -5); + sprite->x2 += Sin(sprite->data[5], 32); + sprite->y2 += Cos(sprite->data[5], -5); if ((u16)(sprite->data[5] - 0x40) < 0x80) { sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) - 1; @@ -191,9 +191,9 @@ void sub_80CAE20(struct Sprite* sprite) { InitAnimSpritePos(sprite, 1); 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[1] = sprite->x; + sprite->data[2] = sprite->x; + sprite->data[3] = sprite->y; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; @@ -205,7 +205,7 @@ static void sub_80CAE74(struct Sprite* sprite) { if (!TranslateAnimLinear(sprite)) { - sprite->pos2.x += Sin(sprite->data[5], 8); + sprite->x2 += Sin(sprite->data[5], 8); if ((u16)(sprite->data[5] - 0x3B) < 5 || (u16)(sprite->data[5] - 0xBB) < 5) { sprite->oam.matrixNum ^= 8; diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index d0a5d26dc..4041c8e10 100644 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -215,9 +215,9 @@ void sub_80CA858(struct Sprite* sprite) { InitAnimSpritePos(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); InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[3]; @@ -241,8 +241,8 @@ static void sub_80CA8B4(struct Sprite* sprite) { sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 6; } - sprite->pos2.x += Sin(sprite->data[5], 5); - sprite->pos2.y += Cos(sprite->data[5], 14); + sprite->x2 += Sin(sprite->data[5], 5); + sprite->y2 += Cos(sprite->data[5], 14); sprite->data[5] = (sprite->data[5] + 15) & 0xFF; } } @@ -288,22 +288,22 @@ void sub_80CAA14(struct Sprite* sprite) u16 b; StartSpriteAnim(sprite, a & 7); - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos1.x -= 20; + sprite->x -= 20; } else { - sprite->pos1.x += 20; + sprite->x += 20; } b = Random(); sprite->data[0] = (b & 31) + 64; - 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); sub_8078D60(sprite); sprite->data[5] = Random() & 0xFF; @@ -320,7 +320,7 @@ static void sub_80CAACC(struct Sprite* sprite) } else { - sprite->pos2.y += Cos(sprite->data[5], 12); + sprite->y2 += Cos(sprite->data[5], 12); if (sprite->data[5] <= 0x7E) { sprite->subpriority = sprite->data[6]; diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c index 26350cbbe..0b0c96320 100644 --- a/src/battle/anim/osmose.c +++ b/src/battle/anim/osmose.c @@ -39,16 +39,16 @@ void sub_80CB768(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; sprite->data[3] = gBattleAnimArgs[4]; } sprite->data[0]++; - sprite->pos2.x = sprite->data[1] * sprite->data[0]; - sprite->pos2.y = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]); + sprite->x2 = sprite->data[1] * sprite->data[0]; + sprite->y2 = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]); if (sprite->data[0] > sprite->data[3]) DestroyAnimSprite(sprite); } diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c index 9ec5bffa6..01f4eca86 100644 --- a/src/battle/anim/poison.c +++ b/src/battle/anim/poison.c @@ -246,10 +246,10 @@ static void sub_80D9E78(struct Sprite *sprite) // same as sub_80D9DD4 void sub_80D9E94(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); @@ -272,17 +272,17 @@ static void sub_80D9EE8(struct Sprite *sprite) void sub_80D9F14(struct Sprite *sprite) { - SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y); if (GetBattlerSide(gBattleAnimAttacker)) 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; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -302,13 +302,13 @@ 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)) 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; @@ -317,9 +317,9 @@ 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); diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c index 58b34e0f3..480e4d399 100644 --- a/src/battle/anim/powder.c +++ b/src/battle/anim/powder.c @@ -70,8 +70,8 @@ const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = // arg 5: wave speed void AnimMovePowderParticle(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]; @@ -93,9 +93,9 @@ static void AnimMovePowderParticleStep(struct Sprite* sprite) if (sprite->data[0] > 0) { sprite->data[0]--; - sprite->pos2.y = sprite->data[2] >> 8; + sprite->y2 = sprite->data[2] >> 8; sprite->data[2] += sprite->data[1]; - sprite->pos2.x = Sin(sprite->data[5], sprite->data[3]); + sprite->x2 = Sin(sprite->data[5], sprite->data[3]); sprite->data[5] = (sprite->data[5] + sprite->data[4]) & 0xFF; } else diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index 8bff55f47..7fb0d9cd4 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -454,13 +454,13 @@ void sub_80DB74C(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { - sprite->pos1.x = 72; - sprite->pos1.y = 80; + sprite->x = 72; + sprite->y = 80; } else { - sprite->pos1.x = 176; - sprite->pos1.y = 40; + sprite->x = 176; + sprite->y = 40; } } else @@ -468,12 +468,12 @@ void sub_80DB74C(struct Sprite *sprite) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; } if (IsContest()) - sprite->pos1.y += 9; + sprite->y += 9; sprite->data[0] = 256 + IndexOfSpritePaletteTag(gBattleAnimArgs[2]) * 16; sprite->callback = sub_80DB88C; @@ -570,13 +570,13 @@ void sub_80DBA4C(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { - sprite->pos1.x = 72 - gBattleAnimArgs[0]; - sprite->pos1.y = gBattleAnimArgs[1] + 80; + sprite->x = 72 - gBattleAnimArgs[0]; + sprite->y = gBattleAnimArgs[1] + 80; } else { - sprite->pos1.x = gBattleAnimArgs[0] + 176; - sprite->pos1.y = gBattleAnimArgs[1] + 40; + sprite->x = gBattleAnimArgs[0] + 176; + sprite->y = gBattleAnimArgs[1] + 40; } } else @@ -598,20 +598,20 @@ void sub_80DBA4C(struct Sprite *sprite) void sub_80DBAF4(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { StartSpriteAnim(sprite, 1); - sprite->pos1.x -= 40; - sprite->pos1.y += 10; + sprite->x -= 40; + sprite->y += 10; sprite->data[1] = -1; } else { - sprite->pos1.x += 40; - sprite->pos1.y -= 10; + sprite->x += 40; + sprite->y -= 10; sprite->data[1] = 1; } @@ -629,12 +629,12 @@ void sub_80DBB70(struct Sprite *sprite) x = -x; } - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + x; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + y; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + x; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + y; - if (sprite->pos1.y < 16) + if (sprite->y < 16) { - sprite->pos1.y = 16; + sprite->y = 16; } StoreSpriteCallbackInData(sprite, sub_80DBC00); @@ -716,13 +716,13 @@ static void sub_80DBD58(u8 taskId) case 1: if (task->data[3] != 0) { - gSprites[task->data[0]].pos2.y -= 8; + gSprites[task->data[0]].y2 -= 8; task->data[3]--; } else { gSprites[task->data[0]].invisible = TRUE; - gSprites[task->data[0]].pos1.x = 272; + gSprites[task->data[0]].x = 272; sub_8078F40(task->data[0]); DestroyAnimVisualTask(taskId); } @@ -771,20 +771,20 @@ static void sub_80DBE98(u8 taskId) switch (task->data[2]) { case 0: - gSprites[spriteId].pos2.x = task->data[12]; - gSprites[spriteId].pos2.y = -task->data[12]; + gSprites[spriteId].x2 = task->data[12]; + gSprites[spriteId].y2 = -task->data[12]; break; case 1: - gSprites[spriteId].pos2.x = -task->data[12]; - gSprites[spriteId].pos2.y = task->data[12]; + gSprites[spriteId].x2 = -task->data[12]; + gSprites[spriteId].y2 = task->data[12]; break; case 2: - gSprites[spriteId].pos2.x = task->data[12]; - gSprites[spriteId].pos2.y = task->data[12]; + gSprites[spriteId].x2 = task->data[12]; + gSprites[spriteId].y2 = task->data[12]; break; case 3: - gSprites[spriteId].pos2.x = -task->data[12]; - gSprites[spriteId].pos2.y = -task->data[12]; + gSprites[spriteId].x2 = -task->data[12]; + gSprites[spriteId].y2 = -task->data[12]; break; } } @@ -838,8 +838,8 @@ void sub_80DC068(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - 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] = gBattleAnimArgs[1]; @@ -1115,11 +1115,11 @@ void sub_80DC700(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); if (IsContest()) - sprite->pos1.y += 12; + sprite->y += 12; sprite->data[1] = 8; REG_BLDCNT = 0x3F40; @@ -1149,7 +1149,7 @@ void sub_80DC700(struct Sprite *sprite) } sprite->data[3] += 896; - sprite->pos2.y -= sprite->data[3] >> 8; + sprite->y2 -= sprite->data[3] >> 8; sprite->data[3] &= 0xFF; break; case 3: diff --git a/src/battle/anim/rain.c b/src/battle/anim/rain.c index 421304be8..fdd0003da 100644 --- a/src/battle/anim/rain.c +++ b/src/battle/anim/rain.c @@ -76,8 +76,8 @@ static void MoveAnimRaindrop(struct Sprite *sprite) { if (++sprite->data[0] <= 13) { - sprite->pos2.x++; - sprite->pos2.y += 4; + sprite->x2++; + sprite->y2 += 4; } if (sprite->animEnded) diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index 999d10a59..dee7bb356 100644 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -293,7 +293,7 @@ void sub_80D10B8(struct Sprite* sprite) r9 = GetBattlerSpriteCoord(bankr7, r10) - gBattleAnimArgs[0]; if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2)) { - if (gSprites[gBattlerSpriteIds[bankr7]].pos1.x < gSprites[gBattlerSpriteIds[bankr7 ^ 2]].pos1.x) + if (gSprites[gBattlerSpriteIds[bankr7]].x < gSprites[gBattlerSpriteIds[bankr7 ^ 2]].x) sprite->subpriority = gSprites[gBattlerSpriteIds[bankr7 ^ 2]].subpriority + 1; else sprite->subpriority = gSprites[gBattlerSpriteIds[bankr7]].subpriority - 1; @@ -322,8 +322,8 @@ void sub_80D10B8(struct Sprite* sprite) sp0 -= gBattleAnimArgs[3]; sp1 += gBattleAnimArgs[4]; - sprite->pos1.x = sprite->data[1] = r9; - sprite->pos1.y = sprite->data[3] = r6; + sprite->x = sprite->data[1] = r9; + sprite->y = sprite->data[3] = r6; sprite->data[2] = sp0; sprite->data[4] = sp1; sprite->data[0] = gBattleAnimArgs[0]; @@ -359,17 +359,17 @@ void sub_80D1368(struct Sprite* sprite) static void sub_80D13AC(struct Sprite* sprite) { s16 add; - sprite->pos2.y -= (sprite->data[0] >> 8); - sprite->pos2.x = sprite->data[1] >> 8; + sprite->y2 -= (sprite->data[0] >> 8); + sprite->x2 = sprite->data[1] >> 8; sprite->data[0] -= 32; add = (GetBattlerSide(gBattleAnimAttacker)) ? -0xA0 : 0xA0; sprite->data[1] += add; - if (sprite->pos2.y > 0) + if (sprite->y2 > 0) { - sprite->pos1.y += sprite->pos2.y; - sprite->pos1.x += sprite->pos2.x; - sprite->pos2.y = 0; - sprite->pos2.x = 0; + sprite->y += sprite->y2; + sprite->x += sprite->x2; + sprite->y2 = 0; + sprite->x2 = 0; sprite->data[0] = 0; StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_80D1424; @@ -406,7 +406,7 @@ static void sub_80D144C(struct Sprite* sprite) static void sub_80D14C4(struct Sprite* sprite) { - sprite->pos2.y -= 2; + sprite->y2 -= 2; if (++sprite->data[0] == 9) { sprite->data[0] = 16; diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index a16be68e5..0af6de00b 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -321,10 +321,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE30 = void sub_80DCE9C(struct Sprite *sprite) { if (gBattleAnimArgs[3] != 0) - SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y); - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += 14; + sprite->x += gBattleAnimArgs[0]; + sprite->y += 14; StartSpriteAnim(sprite, gBattleAnimArgs[1]); AnimateSprite(sprite); @@ -343,7 +343,7 @@ void sub_80DCE9C(struct Sprite *sprite) static void sub_80DCF1C(struct Sprite *sprite) { - sprite->pos1.x += sprite->data[5]; + sprite->x += sprite->data[5]; sprite->data[0] = 192; sprite->data[1] = sprite->data[5]; @@ -362,17 +362,17 @@ void sub_80DCF60(struct Sprite *sprite) AnimateSprite(sprite); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; else - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[1] = sprite->pos1.x; - sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; - sprite->data[3] = sprite->pos1.y; - sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[3]; + sprite->data[1] = sprite->x; + sprite->data[2] = sprite->x + gBattleAnimArgs[2]; + sprite->data[3] = sprite->y; + sprite->data[4] = sprite->y + gBattleAnimArgs[3]; InitSpriteDataForLinearTranslation(sprite); sprite->data[3] = 0; @@ -400,8 +400,8 @@ void sub_80DCFE4(struct Sprite *sprite) static void sub_80DD02C(struct Sprite *sprite) { sprite->data[4] += sprite->data[1]; - sprite->pos2.y = -(sprite->data[4] >> 8); - sprite->pos2.x = Sin(sprite->data[5], sprite->data[3]); + sprite->y2 = -(sprite->data[4] >> 8); + sprite->x2 = Sin(sprite->data[5], sprite->data[3]); sprite->data[5] = (sprite->data[5] + sprite->data[2]) & 0xFF; if (--sprite->data[0] == -1) @@ -522,17 +522,17 @@ void AnimDirtParticleAcrossScreen(struct Sprite *sprite) { if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { - sprite->pos1.x = 304; + sprite->x = 304; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; sprite->data[5] = 1; sprite->oam.matrixNum = 8; } else { - sprite->pos1.x = -64; + sprite->x = -64; } - sprite->pos1.y = gBattleAnimArgs[0]; + sprite->y = gBattleAnimArgs[0]; SetSubspriteTables(sprite, gSubspriteTables_83DAD10); sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[2]; @@ -542,19 +542,19 @@ void AnimDirtParticleAcrossScreen(struct Sprite *sprite) { sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; - 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); sprite->data[3] &= 0xFF; sprite->data[4] &= 0xFF; if (sprite->data[5] == 0) { - if (sprite->pos1.x + sprite->pos2.x > 272) + if (sprite->x + sprite->x2 > 272) { sprite->callback = DestroyAnimSprite; } } - else if (sprite->pos1.x + sprite->pos2.x < -32) + else if (sprite->x + sprite->x2 < -32) { sprite->callback = DestroyAnimSprite; } @@ -573,8 +573,8 @@ void AnimRaiseSprite(struct Sprite *sprite) InitAnimSpritePos(sprite, 0); sprite->data[0] = gBattleAnimArgs[3]; - sprite->data[2] = sprite->pos1.x; - sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[2]; + sprite->data[2] = sprite->x; + sprite->data[4] = sprite->y + gBattleAnimArgs[2]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -644,8 +644,8 @@ static void sub_80DD604(u8 taskId) case 0: task->data[6] -= task->data[4]; task->data[7] -= task->data[5]; - gSprites[task->data[15]].pos2.x = task->data[6] >> 3; - gSprites[task->data[15]].pos2.y = task->data[7] >> 3; + gSprites[task->data[15]].x2 = task->data[6] >> 3; + gSprites[task->data[15]].y2 = task->data[7] >> 3; if (++task->data[9] == 10) { @@ -672,8 +672,8 @@ static void sub_80DD604(u8 taskId) task->data[0]++; } - gSprites[task->data[15]].pos2.x = task->data[6] >> 3; - gSprites[task->data[15]].pos2.y = task->data[7] >> 3; + gSprites[task->data[15]].x2 = task->data[6] >> 3; + gSprites[task->data[15]].y2 = task->data[7] >> 3; break; case 3: task->data[2] += task->data[4]; @@ -776,7 +776,7 @@ void sub_80DD8E8(struct Sprite *sprite) { StartSpriteAnim(sprite, gBattleAnimArgs[4]); - sprite->pos2.x = gBattleAnimArgs[0]; + sprite->x2 = gBattleAnimArgs[0]; sprite->data[2] = gBattleAnimArgs[1]; sprite->data[3] -= gBattleAnimArgs[2]; sprite->data[0] = 3; @@ -790,7 +790,7 @@ static void sub_80DD928(struct Sprite *sprite) sprite->invisible = FALSE; if (sprite->data[3] != 0) { - sprite->pos2.y = sprite->data[2] + sprite->data[3]; + sprite->y2 = sprite->data[2] + sprite->data[3]; sprite->data[3] += sprite->data[0]; sprite->data[0]++; if (sprite->data[3] > 0) @@ -817,10 +817,10 @@ void sub_80DD978(struct Sprite *sprite) void sub_80DD9A4(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[0]; sprite->data[2] = gBattleAnimArgs[1]; @@ -836,8 +836,8 @@ static void sub_80DD9FC(struct Sprite *sprite) sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; - sprite->pos2.x += sprite->data[3] / 40; - sprite->pos2.y -= Sin(sprite->data[0], sprite->data[5]); + sprite->x2 += sprite->data[3] / 40; + sprite->y2 -= Sin(sprite->data[0], sprite->data[5]); if (sprite->data[0] > 140) DestroyAnimSprite(sprite); diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index 245f201dd..e84702c24 100644 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -87,17 +87,17 @@ void sub_80CB59C(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); - sprite->pos2.x = gBattleAnimArgs[0]; - sprite->pos2.y = gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->x2 = gBattleAnimArgs[0]; + sprite->y2 = gBattleAnimArgs[1]; sprite->subpriority = gBattleAnimArgs[2] + 30; StartSpriteAnim(sprite, gBattleAnimArgs[3]); sprite->data[2] = gBattleAnimArgs[4]; sprite->data[0]++; - if ((sprite->pos1.y + sprite->pos2.y) > 120) + if ((sprite->y + sprite->y2) > 120) { - sprite->pos1.y += -120 + (sprite->pos2.y + sprite->pos1.y); + sprite->y += -120 + (sprite->y2 + sprite->y); } } sprite->callback = sub_80CB710; @@ -112,16 +112,16 @@ void sub_80CB620(struct Sprite *sprite) e1 -= p1; e2 -= p2; - sprite->pos1.x = p1 + e1 * gBattleAnimArgs[0] / 100; - sprite->pos1.y = p2 + e2 * gBattleAnimArgs[0] / 100; - sprite->pos2.x = gBattleAnimArgs[1]; - sprite->pos2.y = gBattleAnimArgs[2]; + sprite->x = p1 + e1 * gBattleAnimArgs[0] / 100; + sprite->y = p2 + e2 * gBattleAnimArgs[0] / 100; + sprite->x2 = gBattleAnimArgs[1]; + sprite->y2 = gBattleAnimArgs[2]; sprite->subpriority = gBattleAnimArgs[3] + 30; StartSpriteAnim(sprite, gBattleAnimArgs[4]); sprite->data[2] = gBattleAnimArgs[5]; sprite->callback = sub_80CB710; - gUnknown_03000728[0] = sprite->pos1.x; - gUnknown_03000728[1] = sprite->pos1.y; + gUnknown_03000728[0] = sprite->x; + gUnknown_03000728[1] = sprite->y; gUnknown_03000728[2] = e1; gUnknown_03000728[3] = e2; } diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 329e28f71..282f22657 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -53,8 +53,8 @@ const s8 gUnknown_083D6DDC[][2] = void sub_80CD3E0(struct Sprite* sprite) { - sprite->pos1.x -= 32; - sprite->pos1.y -= 32; + sprite->x -= 32; + sprite->y -= 32; sprite->data[0] = 20; sprite->callback = WaitAnimForDuration; StoreSpriteCallbackInData(sprite, sub_80CD408); @@ -70,13 +70,13 @@ static void sub_80CD408(struct Sprite* sprite) StoreSpriteCallbackInData(sprite, sub_80CD408); break; case 1: - 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] = 8; - sprite->data[2] = sprite->pos1.x + gUnknown_083D6DDC[sprite->data[5] >> 8][0]; - sprite->data[4] = sprite->pos1.y + gUnknown_083D6DDC[sprite->data[5] >> 8][1]; + sprite->data[2] = sprite->x + gUnknown_083D6DDC[sprite->data[5] >> 8][0]; + sprite->data[4] = sprite->y + gUnknown_083D6DDC[sprite->data[5] >> 8][1]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80CD4B8); sprite->data[5] += 0x100; @@ -135,10 +135,10 @@ static void sub_80CD4EC(struct Sprite* sprite) 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; sprite->data[0] = 6; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + a; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + b; @@ -202,25 +202,25 @@ void sub_80CD6CC(struct Sprite* sprite) sprite->oam.affineParam = gBattleAnimArgs[0]; if ((s16)sprite->oam.affineParam == 1) { - sprite->pos1.x -= 0x18; - sprite->pos1.y -= 0x18; + sprite->x -= 0x18; + sprite->y -= 0x18; } else if ((s16)sprite->oam.affineParam == 2) { - sprite->pos1.x -= 0x18; - sprite->pos1.y += 0x18; + sprite->x -= 0x18; + sprite->y += 0x18; sprite->oam.matrixNum = 16; } else if ((s16)sprite->oam.affineParam == 3) { - sprite->pos1.x += 0x18; - sprite->pos1.y -= 0x18; + sprite->x += 0x18; + sprite->y -= 0x18; sprite->oam.matrixNum = 8; } else { - sprite->pos1.x += 0x18; - sprite->pos1.y += 0x18; + sprite->x += 0x18; + sprite->y += 0x18; sprite->oam.matrixNum = 24; } diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c index 913e58bc4..cb4841177 100644 --- a/src/battle/anim/shadow_minimize.c +++ b/src/battle/anim/shadow_minimize.c @@ -91,7 +91,7 @@ void AnimTask_Minimize_Step(u8 taskId) break; case 5: sub_8078F40(task->data[0]); - gSprites[task->data[15]].pos2.y = 0; + gSprites[task->data[15]].y2 = 0; DestroyAnimVisualTask(taskId); break; } diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index 4babfee65..17bb8aa5d 100644 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -33,8 +33,8 @@ void sub_80CCD24(struct Sprite* sprite) gBattleAnimArgs[1] += 8; } - sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; + sprite->x = sub_8077EE4(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->y = sub_8077EE4(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; if (GetBattlerSide(gBattleAnimAttacker) == 0 || IsContest()) sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker) + 1; else @@ -53,7 +53,7 @@ static void sub_80CCE0C(struct Sprite* sprite) int a; int i; sprite->data[5] += 0x60; - sprite->pos2.x = -(sprite->data[5] >> 8); + sprite->x2 = -(sprite->data[5] >> 8); sprite->data[1]++; if (sprite->data[1] > 1) { diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c index c6dfd09cc..9b34b62cc 100644 --- a/src/battle/anim/shock.c +++ b/src/battle/anim/shock.c @@ -66,18 +66,18 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9874 = void sub_80D6294(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); if (GetBattlerSide(gBattleAnimAttacker) != 0) { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->pos1.y -= gBattleAnimArgs[1]; + sprite->x -= gBattleAnimArgs[0]; + sprite->y -= gBattleAnimArgs[1]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; } sprite->data[0] = 0; @@ -128,17 +128,17 @@ void sub_80D6328(struct Sprite *sprite) if (gBattleAnimArgs[5] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(slot, 0); - sprite->pos1.y = GetBattlerSpriteCoord(slot, 1); + sprite->x = GetBattlerSpriteCoord(slot, 0); + sprite->y = GetBattlerSpriteCoord(slot, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(slot, 2); - sprite->pos1.y = GetBattlerSpriteCoord(slot, 3); + sprite->x = GetBattlerSpriteCoord(slot, 2); + sprite->y = GetBattlerSpriteCoord(slot, 3); } - sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8; - sprite->pos2.y = (gSineTable[gBattleAnimArgs[0] + 64] * gBattleAnimArgs[1]) >> 8; + sprite->x2 = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8; + sprite->y2 = (gSineTable[gBattleAnimArgs[0] + 64] * gBattleAnimArgs[1]) >> 8; if (gBattleAnimArgs[6] & 1) { diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c index 34005d7be..bc4d9189d 100644 --- a/src/battle/anim/silhouette.c +++ b/src/battle/anim/silhouette.c @@ -34,10 +34,10 @@ void sub_80CB3A8(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(1); gTasks[taskId].data[10] += gTasks[taskId].data[0]; - gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8; + gSprites[spriteId].x2 = gTasks[taskId].data[10] >> 8; if (GetBattlerSide(gBattleAnimTarget)) { - gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; + gSprites[spriteId].x2 = -gSprites[spriteId].x2; } gTasks[taskId].data[11] += 16; @@ -59,8 +59,8 @@ void sub_80CB438(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(1); sub_8078F40(spriteId); - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].x2 = 0; + gSprites[spriteId].y2 = 0; gTasks[taskId].data[0]++; return; } diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c index e42a6c2ad..cb9aa293b 100644 --- a/src/battle/anim/slash.c +++ b/src/battle/anim/slash.c @@ -76,13 +76,13 @@ void sub_80CDD74(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2]; } sprite->data[0] = 0; @@ -93,16 +93,16 @@ void sub_80CDD74(struct Sprite* sprite) void sub_80CDDDC(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); StoreSpriteCallbackInData(sprite, sub_80CDE78); sprite->callback = sub_8078600; } void sub_80CDE24(struct Sprite* sprite) { - sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->x = sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); StartSpriteAnim(sprite, 1); sprite->data[0] = 0; sprite->data[1] = 0; diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c index 7e202b8bb..8dfdb68bb 100644 --- a/src/battle/anim/sleep.c +++ b/src/battle/anim/sleep.c @@ -75,14 +75,14 @@ void sub_80CD328(struct Sprite* sprite) sub_8078650(sprite); if (GetBattlerSide(gBattleAnimAttacker) == 0) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[3] = 1; } else { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x -= gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[3] = 0xFFFF; StartSpriteAffineAnim(sprite, 1); } @@ -92,8 +92,8 @@ void sub_80CD328(struct Sprite* sprite) static void sub_80CD394(struct Sprite* sprite) { - sprite->pos2.y = -(sprite->data[0] / 0x28); - sprite->pos2.x = sprite->data[4] / 10; + sprite->y2 = -(sprite->data[0] / 0x28); + sprite->x2 = sprite->data[4] / 10; sprite->data[4] += sprite->data[3] * 2; sprite->data[0] += sprite->data[1]; if (++sprite->data[1] > 0x3C) diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c index 7abb2cdcf..821a1c37e 100644 --- a/src/battle/anim/slice.c +++ b/src/battle/anim/slice.c @@ -55,23 +55,23 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6B40 = // arg 2: slice direction; 0 = right-to-left, 1 = left-to-right void AnimCuttingSlice(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); if (GetBattlerSide(gBattleAnimTarget) == 0) - sprite->pos1.y += 8; + sprite->y += 8; sprite->callback = AnimSliceStep; if (gBattleAnimArgs[2] == 0) { - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; } else { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; sprite->hFlip = 1; } - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[1] -= 0x400; sprite->data[2] += 0x400; sprite->data[5] = gBattleAnimArgs[2]; @@ -105,23 +105,23 @@ void sub_80CC9BC(struct Sprite* sprite) break; } - sprite->pos1.x = a; - sprite->pos1.y = b; + sprite->x = a; + sprite->y = b; if (GetBattlerSide(gBattleAnimTarget) == 0) - sprite->pos1.y += 8; + sprite->y += 8; sprite->callback = AnimSliceStep; if (gBattleAnimArgs[2] == 0) { - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; } else { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; sprite->hFlip = 1; } - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[1] -= 0x400; sprite->data[2] += 0x400; sprite->data[5] = gBattleAnimArgs[2]; @@ -139,8 +139,8 @@ static void AnimSliceStep(struct Sprite* sprite) sprite->data[1] -= 0x18; sprite->data[2] -= 0x18; - 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; sprite->data[0]++; if (sprite->data[0] == 20) { diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index cef255eda..2ece3c602 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -139,7 +139,7 @@ void AnimSonicBoomProjectile(struct Sprite* sprite) InitAnimSpritePos(sprite, 1); targetXPos = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; targetYPos = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; - rotation = ArcTan2Neg(targetXPos - sprite->pos1.x, targetYPos - sprite->pos1.y); + rotation = ArcTan2Neg(targetXPos - sprite->x, targetYPos - sprite->y); rotation += 0xF000; if (IsContest()) rotation -= 0x6000; @@ -178,14 +178,14 @@ void sub_80CF814(struct Sprite* sprite) sprite->data[1] += sprite->data[5]; sprite->data[2] += sprite->data[6]; if (1 & task->data[7]) - sprite->pos2.x = ((u16)sprite->data[1] >> 8) * -1; + sprite->x2 = ((u16)sprite->data[1] >> 8) * -1; else - sprite->pos2.x = (u16)sprite->data[1] >> 8; + sprite->x2 = (u16)sprite->data[1] >> 8; if (1 & task->data[8]) - sprite->pos2.y = ((u16)sprite->data[2] / 256u) * -1; + sprite->y2 = ((u16)sprite->data[2] / 256u) * -1; else - sprite->pos2.y = (u16)sprite->data[2] / 256u; + sprite->y2 = (u16)sprite->data[2] / 256u; if (sprite->data[0]-- <= 0) { @@ -204,33 +204,33 @@ void sub_80CF8B8(struct Sprite* sprite) sprite->data[1] += (-2 & task->data[7]); sprite->data[2] += (-2 & task->data[8]); if (1 & task->data[7]) - sprite->pos2.x = ((u16)sprite->data[1] >> 8) * -1; + sprite->x2 = ((u16)sprite->data[1] >> 8) * -1; else - sprite->pos2.x = (u16)sprite->data[1] >> 8; + sprite->x2 = (u16)sprite->data[1] >> 8; if (1 & task->data[8]) - sprite->pos2.y = ((u16)sprite->data[2] / 256u) * -1; + sprite->y2 = ((u16)sprite->data[2] / 256u) * -1; else - sprite->pos2.y = (u16)sprite->data[2] / 256u; + sprite->y2 = (u16)sprite->data[2] / 256u; if (sprite->data[0]-- <= 0) { sprite->data[0] = 8; task->data[5] = 4; a = sub_81174E0(0x1000); - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.y = 0; - sprite->pos2.x = 0; - if (task->data[11] >= sprite->pos1.x) - b = (task->data[11] - sprite->pos1.x) << 8; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->y2 = 0; + sprite->x2 = 0; + if (task->data[11] >= sprite->x) + b = (task->data[11] - sprite->x) << 8; else - b = (sprite->pos1.x - task->data[11]) << 8; + b = (sprite->x - task->data[11]) << 8; - if (task->data[12] >= sprite->pos1.y) - c = (task->data[12] - sprite->pos1.y) << 8; + if (task->data[12] >= sprite->y) + c = (task->data[12] - sprite->y) << 8; else - c = (sprite->pos1.y - task->data[12]) << 8; + c = (sprite->y - task->data[12]) << 8; sprite->data[2] = 0; sprite->data[1] = 0; diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c index 44b29e9db..50d01cbb2 100644 --- a/src/battle/anim/spit.c +++ b/src/battle/anim/spit.c @@ -38,16 +38,16 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7B60 = static void sub_80D287C(struct Sprite* sprite) { - sprite->pos2.x += sprite->data[0]; - sprite->pos2.y += sprite->data[1]; + sprite->x2 += sprite->data[0]; + sprite->y2 += sprite->data[1]; if (sprite->data[3]++ >= sprite->data[2]) DestroyAnimSprite(sprite); } void sub_80D28AC(struct Sprite* sprite) { - 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] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->data[2] = gBattleAnimArgs[1]; diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c index ad0fddd3f..0300c252e 100644 --- a/src/battle/anim/splash.c +++ b/src/battle/anim/splash.c @@ -52,7 +52,7 @@ void AnimTask_SplashStep(u8 taskId) case 0: RunAffineAnimFromTaskData(task); task->data[4] += 3; - gSprites[task->data[0]].pos2.y += task->data[4]; + gSprites[task->data[0]].y2 += task->data[4]; if (++task->data[3] > 7) { task->data[3] = 0; @@ -61,7 +61,7 @@ void AnimTask_SplashStep(u8 taskId) break; case 1: RunAffineAnimFromTaskData(task); - gSprites[task->data[0]].pos2.y += task->data[4]; + gSprites[task->data[0]].y2 += task->data[4]; if (++task->data[3] > 7) { task->data[3] = 0; @@ -71,7 +71,7 @@ void AnimTask_SplashStep(u8 taskId) case 2: if (task->data[4] != 0) { - gSprites[task->data[0]].pos2.y -= 2; + gSprites[task->data[0]].y2 -= 2; task->data[4] -= 2; } else @@ -82,7 +82,7 @@ void AnimTask_SplashStep(u8 taskId) { if (--task->data[2] == 0) { - gSprites[task->data[0]].pos2.y = 0; + gSprites[task->data[0]].y2 = 0; DestroyAnimVisualTask(taskId); } else diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c index c9a692318..100979204 100644 --- a/src/battle/anim/startle.c +++ b/src/battle/anim/startle.c @@ -25,15 +25,15 @@ void sub_80D1E38(u8 taskId) if (++gTasks[taskId].data[0] == 1) { PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(1), &gSpriteAffineAnim_83D7A98); - gSprites[spriteId].pos2.x = 4; + gSprites[spriteId].x2 = 4; } else { - gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; + gSprites[spriteId].x2 = -gSprites[spriteId].x2; if (RunAffineAnimFromTaskData(&gTasks[taskId]) == 0) { - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].x2 = 0; + gSprites[spriteId].y2 = 0; DestroyAnimVisualTask(taskId); } } @@ -46,15 +46,15 @@ void sub_80D1EC8(u8 taskId) if (++gTasks[taskId].data[0] == 1) { PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(0), &gSpriteAffineAnim_83D7A98); - gSprites[spriteId].pos2.x = 4; + gSprites[spriteId].x2 = 4; } else { - gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; + gSprites[spriteId].x2 = -gSprites[spriteId].x2; if (RunAffineAnimFromTaskData(&gTasks[taskId]) == 0) { - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].x2 = 0; + gSprites[spriteId].y2 = 0; DestroyAnimVisualTask(taskId); } } diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c index 303a39d29..ce27356cd 100644 --- a/src/battle/anim/strike.c +++ b/src/battle/anim/strike.c @@ -64,36 +64,36 @@ void sub_80CE670(struct Sprite* sprite) sprite->data[0] = 0; sprite->data[1] = gBattleAnimArgs[2]; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; - sprite->data[6] = sprite->pos1.x; - sprite->data[7] = sprite->pos1.y; + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[1]; + sprite->data[6] = sprite->x; + sprite->data[7] = sprite->y; if (IsContest() != 0) { sprite->oam.matrixNum = 8; - sprite->pos1.x += 40; - sprite->pos1.y += 20; - sprite->data[2] = sprite->pos1.x << 7; + sprite->x += 40; + sprite->y += 20; + sprite->data[2] = sprite->x << 7; sprite->data[3] = -0x1400 / sprite->data[1]; - sprite->data[4] = sprite->pos1.y << 7; + sprite->data[4] = sprite->y << 7; sprite->data[5] = -0xA00 / sprite->data[1]; } else if (GetBattlerSide(gBattleAnimAttacker) == 0) { - sprite->pos1.x -= 40; - sprite->pos1.y += 20; - sprite->data[2] = sprite->pos1.x << 7; + sprite->x -= 40; + sprite->y += 20; + sprite->data[2] = sprite->x << 7; sprite->data[3] = 0x1400 / sprite->data[1]; - sprite->data[4] = sprite->pos1.y << 7; + sprite->data[4] = sprite->y << 7; sprite->data[5] = -0xA00 / sprite->data[1]; } else { - sprite->pos1.x += 40; - sprite->pos1.y -= 20; - sprite->data[2] = sprite->pos1.x << 7; + sprite->x += 40; + sprite->y -= 20; + sprite->data[2] = sprite->x << 7; sprite->data[3] = -0x1400 / sprite->data[1]; - sprite->data[4] = sprite->pos1.y << 7; + sprite->data[4] = sprite->y << 7; sprite->data[5] = 0xA00 / sprite->data[1]; sprite->oam.matrixNum = 24; } @@ -105,12 +105,12 @@ static void sub_80CE798(struct Sprite* sprite) { sprite->data[2] += sprite->data[3]; sprite->data[4] += sprite->data[5]; - sprite->pos1.x = sprite->data[2] >> 7; - sprite->pos1.y = sprite->data[4] >> 7; + sprite->x = sprite->data[2] >> 7; + sprite->y = sprite->data[4] >> 7; if (--sprite->data[1] == 1) { - sprite->pos1.x = sprite->data[6]; - sprite->pos1.y = sprite->data[7]; + sprite->x = sprite->data[6]; + sprite->y = sprite->data[7]; } if (sprite->data[1] == 0) diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c index 578dd7618..65552d08c 100644 --- a/src/battle/anim/struggle.c +++ b/src/battle/anim/struggle.c @@ -55,19 +55,19 @@ void sub_80D2C38(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); } if (gBattleAnimArgs[1] == 0) - sprite->pos1.x += 32; + sprite->x += 32; else - sprite->pos1.x -= 32; + sprite->x -= 32; sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[1]; diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c index c10f561ae..f9ef843c2 100644 --- a/src/battle/anim/sunlight.c +++ b/src/battle/anim/sunlight.c @@ -32,8 +32,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D95B0 = void sub_80D517C(struct Sprite *sprite) { - sprite->pos1.x = 0; - sprite->pos1.y = 0; + sprite->x = 0; + sprite->y = 0; sprite->data[0] = 60; sprite->data[2] = 140; sprite->data[4] = 80; diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c index 09f9adbd6..b71ab7fd0 100644 --- a/src/battle/anim/swipe.c +++ b/src/battle/anim/swipe.c @@ -45,8 +45,8 @@ void sub_80D2BE8(struct Sprite *sprite) { if (sprite->data[0] == 0) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[0]++; } diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c index 7667355dd..6221ccbf2 100644 --- a/src/battle/anim/switch.c +++ b/src/battle/anim/switch.c @@ -79,7 +79,7 @@ void sub_80CBBF0(struct Sprite* sprite) if (!IsContest()) { sprite->data[1] = gBattleAnimArgs[1]; - sprite->pos1.x = 120; + sprite->x = 120; } else { @@ -90,14 +90,14 @@ void sub_80CBBF0(struct Sprite* sprite) b = a; sprite->data[1] = a - ((b >> 8) << 8); - sprite->pos1.x = 70; + sprite->x = 70; } - sprite->pos1.y = gBattleAnimArgs[0]; + sprite->y = gBattleAnimArgs[0]; sprite->data[2] = gBattleAnimArgs[0]; sprite->data[4] = 20; - sprite->pos2.x = Cos(sprite->data[1], 60); - sprite->pos2.y = Sin(sprite->data[1], 20); + sprite->x2 = Cos(sprite->data[1], 60); + sprite->y2 = Sin(sprite->data[1], 20); sprite->callback = sub_80CBC8C; if (sprite->data[1] > 0 && sprite->data[1] < 0xC0) sprite->subpriority = 31; @@ -121,7 +121,7 @@ static void sub_80CBC8C(struct Sprite* sprite) { sprite->data[2] += sprite->data[4] / 10; sprite->data[4] += 3; - sprite->pos1.y = sprite->data[2]; + sprite->y = sprite->data[2]; break; } break; @@ -165,8 +165,8 @@ static void sub_80CBCF8(struct Sprite* sprite) } } - sprite->pos2.x = Cos(sprite->data[1], 60); - sprite->pos2.y = Sin(sprite->data[1], 20); + sprite->x2 = Cos(sprite->data[1], 60); + sprite->y2 = Sin(sprite->data[1], 20); } } diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index a917a9693..74b9154d0 100644 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -48,8 +48,8 @@ void sub_80CF690(struct Sprite* sprite) static void sub_80CF6B4(struct Sprite* sprite) { sprite->data[0] = 6; - sprite->data[2] = sprite->pos1.x; - sprite->data[4] = sprite->pos1.y - 32; + sprite->data[2] = sprite->x; + sprite->data[4] = sprite->y - 32; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index ff5b62181..05609bb5a 100644 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.c @@ -72,11 +72,11 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7220 = void sub_80CEF44(u8 bank, struct Sprite* sprite) { if (GetBattlerSide(bank) == 0) - sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 5) + 8; + sprite->x = GetBattlerSpriteCoordAttr(bank, 5) + 8; else - sprite->pos1.x = GetBattlerSpriteCoordAttr(bank, 4) - 8; + sprite->x = GetBattlerSpriteCoordAttr(bank, 4) - 8; - sprite->pos1.y = GetBattlerSpriteCoord(bank, 3) - (s16)GetBattlerSpriteCoordAttr(bank, 0) / 4; + sprite->y = GetBattlerSpriteCoord(bank, 3) - (s16)GetBattlerSpriteCoordAttr(bank, 0) / 4; } void sub_80CEF9C(struct Sprite* sprite) diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c index f73c7e9bf..7632e2c1e 100644 --- a/src/battle/anim/thrashing.c +++ b/src/battle/anim/thrashing.c @@ -51,8 +51,8 @@ void sub_80D0AB8(u8 taskId) task->data[2] = 4; task->data[3] = 7; task->data[4] = 3; - task->data[5] = gSprites[task->data[0]].pos1.x; - task->data[6] = gSprites[task->data[0]].pos1.y; + task->data[5] = gSprites[task->data[0]].x; + task->data[6] = gSprites[task->data[0]].y; task->data[7] = 0; task->data[8] = 0; task->data[9] = 2; @@ -71,17 +71,17 @@ static void sub_80D0B3C(u8 taskId) task->data[8]++; if ((task->data[8] & 1) != 0) { - gSprites[task->data[0]].pos1.y += task->data[9]; + gSprites[task->data[0]].y += task->data[9]; } else { - gSprites[task->data[0]].pos1.y -= task->data[9]; + gSprites[task->data[0]].y -= task->data[9]; } } switch (task->data[1]) { case 0: - gSprites[task->data[0]].pos1.x += task->data[2]; + gSprites[task->data[0]].x += task->data[2]; if (--task->data[3] == 0) { task->data[3] = 14; @@ -89,7 +89,7 @@ static void sub_80D0B3C(u8 taskId) } break; case 1: - gSprites[task->data[0]].pos1.x -= task->data[2]; + gSprites[task->data[0]].x -= task->data[2]; if (--task->data[3] == 0) { task->data[3] = 7; @@ -97,7 +97,7 @@ static void sub_80D0B3C(u8 taskId) } break; case 2: - gSprites[task->data[0]].pos1.x += task->data[2]; + gSprites[task->data[0]].x += task->data[2]; if (--task->data[3] == 0) { if (--task->data[4] != 0) @@ -109,7 +109,7 @@ static void sub_80D0B3C(u8 taskId) { if ((task->data[8] & 1) != 0) { - gSprites[task->data[0]].pos1.y -= task->data[9]; + gSprites[task->data[0]].y -= task->data[9]; } DestroyAnimVisualTask(taskId); } diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index b15a5c4f1..ae9962f9e 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -43,14 +43,14 @@ void sub_80D61C8(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) != 0) { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; } - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->callback = sub_80D6218; } diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c index 2775eba97..6696b3daf 100644 --- a/src/battle/anim/tile.c +++ b/src/battle/anim/tile.c @@ -120,10 +120,10 @@ void sub_80CE09C(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; if (IsContest()) - sprite->pos1.y += 10; + sprite->y += 10; sprite->data[0]++; } diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c index dc26a7432..0d8eb3f2a 100644 --- a/src/battle/anim/twinkle.c +++ b/src/battle/anim/twinkle.c @@ -41,8 +41,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8 = void sub_80CE36C(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = gBattleAnimArgs[1]; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; + sprite->y = gBattleAnimArgs[1]; sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = 0; @@ -58,7 +58,7 @@ static void sub_80CE3B0(struct Sprite* sprite) sprite->data[1] = 0; if (sprite->data[2] <= 0x77) { - sprite->pos1.y++; + sprite->y++; sprite->data[2]++; } } diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c index b4af9fc00..d2a258e79 100644 --- a/src/battle/anim/unused_1.c +++ b/src/battle/anim/unused_1.c @@ -77,8 +77,8 @@ const struct SpriteTemplate gSpriteTemplate_83D6AF8 = void sub_80CC8C8(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[3] = gBattleAnimArgs[4]; diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index a1c1a0785..6b958676a 100644 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.c @@ -136,13 +136,13 @@ void sub_80CCC50(struct Sprite* sprite) { sprite->data[0] = gBattleAnimArgs[2]; if (GetBattlerSide(gBattleAnimAttacker) != 0) - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; else - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; StartSpriteAnim(sprite, gBattleAnimArgs[5]); sprite->data[1] = -gBattleAnimArgs[3]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[3] = gBattleAnimArgs[4]; sprite->callback = sub_80CCCB4; sub_80CCCB4(sprite); @@ -150,8 +150,8 @@ void sub_80CCC50(struct Sprite* sprite) static void sub_80CCCB4(struct Sprite* sprite) { - sprite->pos2.x = Cos(sprite->data[0], 100); - sprite->pos2.y = Sin(sprite->data[0], 20); + sprite->x2 = Cos(sprite->data[0], 100); + sprite->y2 = Sin(sprite->data[0], 20); if (sprite->data[0] <= 0x7F) sprite->subpriority = 0; else @@ -159,7 +159,7 @@ static void sub_80CCCB4(struct Sprite* sprite) sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; sprite->data[5] += 0x82; - sprite->pos2.y += sprite->data[5] >> 8; + sprite->y2 += sprite->data[5] >> 8; sprite->data[2]++; if (sprite->data[2] == sprite->data[3]) DestroyAnimSprite(sprite); diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c index 2ee1984a5..56f0d4a26 100644 --- a/src/battle/anim/unused_3.c +++ b/src/battle/anim/unused_3.c @@ -61,13 +61,13 @@ void sub_80CD274(struct Sprite* sprite) sub_8078650(sprite); if (GetBattlerSide(gBattleAnimAttacker) == 0) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; } else { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x -= gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 1); } @@ -78,8 +78,8 @@ static void sub_80CD2D4(struct Sprite* sprite) { if (++sprite->data[0] > 30) { - sprite->pos2.y = (30 - sprite->data[0]) / 3; - sprite->pos2.x = Sin(sprite->data[1] * 4, 3); + sprite->y2 = (30 - sprite->data[0]) / 3; + sprite->x2 = Sin(sprite->data[1] * 4, 3); sprite->data[1]++; } diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c index 9f7ce35ff..81d5ab256 100644 --- a/src/battle/anim/unused_5.c +++ b/src/battle/anim/unused_5.c @@ -27,7 +27,7 @@ void sub_80CF280(struct Sprite* sprite) { sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[4]; sprite->data[3] = gBattleAnimArgs[5]; diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c index 27957f27d..de00a4521 100644 --- a/src/battle/anim/unused_6.c +++ b/src/battle/anim/unused_6.c @@ -56,12 +56,12 @@ static void sub_80CF310(struct Sprite* sprite) switch (sprite->data[0]) { case 0: - sprite->pos2.y -= 3; + sprite->y2 -= 3; if (++sprite->data[1] == 6) sprite->data[0]++; break; case 1: - sprite->pos2.y += 3; + sprite->y2 += 3; if (--sprite->data[1] == 0) sprite->data[0]++; break; diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c index 5b4781842..eff87b442 100644 --- a/src/battle/anim/unused_7.c +++ b/src/battle/anim/unused_7.c @@ -28,12 +28,12 @@ const struct SpriteTemplate gSpriteTemplate_83D73AC = static void sub_80CF374(struct Sprite* sprite) { s16 temp; - gSprites[sprite->data[2]].pos2.x += sprite->data[1]; + gSprites[sprite->data[2]].x2 += sprite->data[1]; temp = sprite->data[1]; sprite->data[1] = -temp; if (sprite->data[0] == 0) { - gSprites[sprite->data[2]].pos2.x = 0; + gSprites[sprite->data[2]].x2 = 0; DestroySpriteAndMatrix(sprite); } @@ -43,19 +43,19 @@ static void sub_80CF374(struct Sprite* sprite) void sub_80CF3C4(struct Sprite* sprite) { u8 a; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); a = gBattlerSpriteIds[gBattleAnimTarget]; if (GetBattlerSide(gBattleAnimAttacker) != 0) { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; + sprite->x += gBattleAnimArgs[0]; } - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = a; diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c index 2a04d4d01..4602d5a9e 100644 --- a/src/battle/anim/unused_8.c +++ b/src/battle/anim/unused_8.c @@ -76,8 +76,8 @@ void sub_80CF458(struct Sprite* sprite) static void sub_80CF490(struct Sprite* sprite) { sprite->data[0] = sprite->data[1]; - sprite->data[2] = sprite->pos1.x; - sprite->data[4] = sprite->pos1.y + 15; + sprite->data[2] = sprite->x; + sprite->data[4] = sprite->y + 15; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80CF4B8); } diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index 135ed43cb..df230b320 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -227,8 +227,8 @@ void sub_80D37FC(struct Sprite *sprite) sub_8078764(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; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -252,10 +252,10 @@ void sub_80D3838(struct Sprite *sprite) static void sub_80D3874(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] == -1) { @@ -779,10 +779,10 @@ void sub_80D40A8(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); } @@ -792,7 +792,7 @@ void sub_80D40F4(u8 taskId) struct Task *task = &gTasks[taskId]; task->data[15] = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); - task->data[5] = gSprites[task->data[15]].pos1.y; + task->data[5] = gSprites[task->data[15]].y; task->data[1] = sub_80D4394(); PrepareBattlerSpriteForRotScale(task->data[15], ST_OAM_OBJ_NORMAL); task->func = sub_80D4150; @@ -813,18 +813,18 @@ void sub_80D4150(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 (sub_8079C74(task) == 0) { sub_8079A64(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]++; @@ -854,9 +854,9 @@ void sub_80D4150(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) { sub_8079C08(task, task->data[15], 384, 224, 0x100, 0x100, 8); @@ -867,11 +867,11 @@ void sub_80D4150(u8 taskId) } break; case 6: - gSprites[task->data[15]].pos1.y--; + gSprites[task->data[15]].y--; if (sub_8079C74(task) == 0) { sub_8078F40(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]++; } @@ -959,9 +959,9 @@ void sub_80D452C(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); @@ -1056,11 +1056,11 @@ void sub_80D47D0(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(&gBattleAnimSpriteTemplate_83DB4D8, sprite->pos1.x, sprite->pos1.y, 1); + sprite->data[1] = CreateSprite(&gBattleAnimSpriteTemplate_83DB4D8, sprite->x, sprite->y, 1); if (sprite->data[1] != MAX_SPRITES) { StartSpriteAffineAnim(&gSprites[sprite->data[1]], 3); @@ -1199,11 +1199,11 @@ void sub_80D4B3C(struct Sprite *sprite) { if (TranslateAnimArc(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 = sub_80D4BA4; @@ -1230,8 +1230,8 @@ void sub_80D4BA4(struct Sprite *sprite) void sub_80D4BF0(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]; @@ -1242,9 +1242,9 @@ void sub_80D4BF0(struct Sprite *sprite) void sub_80D4C18(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); } @@ -1253,8 +1253,8 @@ void sub_80D4C64(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); @@ -1274,11 +1274,11 @@ void sub_80D4CA4(struct Sprite *sprite) void sub_80D4CEC(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; @@ -1302,8 +1302,8 @@ void sub_80D4D64(struct Sprite *sprite, s32 xDiff, s32 yDiff) something = sprite->data[0] / 2; // regalloc acts strange here... - combinedX = sprite->pos1.x + sprite->pos2.x; - combinedY = sprite->pos1.y + sprite->pos2.y; + combinedX = sprite->x + sprite->x2; + combinedY = sprite->y + sprite->y2; // ...then goes back to normal right here. // Nothing but this appears to reproduce the behavior. diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index 8cfebc0dd..fe8a11cfb 100644 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -107,13 +107,13 @@ void sub_80CC82C(struct Sprite* sprite) { if (GetBattlerSide(gBattleAnimAttacker) != 0) { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x -= gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; } else { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; } sprite->callback = sub_8078600; @@ -127,5 +127,5 @@ void sub_80CC884(struct Sprite* sprite) sprite->callback = sub_80CC810; sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; } diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c index 9c7f62c12..bad238ceb 100644 --- a/src/battle/anim/wisp_fire.c +++ b/src/battle/anim/wisp_fire.c @@ -60,8 +60,8 @@ void sub_80D5CC0(struct Sprite *sprite) sprite->data[3] += 0xC0 * 2; sprite->data[4] += 0xA0; - sprite->pos2.x = Sin(sprite->data[1], sprite->data[3] >> 8); - sprite->pos2.y = Cos(sprite->data[1], sprite->data[4] >> 8); + sprite->x2 = Sin(sprite->data[1], sprite->data[3] >> 8); + sprite->y2 = Cos(sprite->data[1], sprite->data[4] >> 8); sprite->data[1] = (sprite->data[1] + 7) & 0xFF; @@ -119,7 +119,7 @@ static void sub_80D5E4C(u8 taskId) for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) { - gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + gSprites[task->data[task->data[3] + 14]].x2 = task->data[10] + task->data[11]; } if (++task->data[9] == 16) @@ -142,7 +142,7 @@ static void sub_80D5E4C(u8 taskId) for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) { - gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + gSprites[task->data[task->data[3] + 14]].x2 = task->data[10] + task->data[11]; } if (++task->data[9] == 96) @@ -167,7 +167,7 @@ static void sub_80D5E4C(u8 taskId) for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) { - gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + gSprites[task->data[task->data[3] + 14]].x2 = task->data[10] + task->data[11]; } if (++task->data[9] == 16) @@ -178,7 +178,7 @@ static void sub_80D5E4C(u8 taskId) case 3: for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) { - gSprites[task->data[task->data[3] + 14]].pos2.x = 0; + gSprites[task->data[task->data[3] + 14]].x2 = 0; } DestroyAnimVisualTask(taskId); @@ -219,14 +219,14 @@ void sub_80D60B4(u8 taskId) unk = gUnknown_083D97A4[gTasks[taskId].data[0] % 10]; if (gTasks[taskId].data[3] == 1) - gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk; + gSprites[spriteId].y2 = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk; else - gSprites[spriteId].pos2.x = gBattleAnimArgs[1] * unk; + gSprites[spriteId].x2 = gBattleAnimArgs[1] * unk; if (gTasks[taskId].data[0] == gTasks[taskId].data[1]) { - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].x2 = 0; + gSprites[spriteId].y2 = 0; DestroyAnimVisualTask(taskId); } } diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index 1c430d923..398bb0686 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -88,14 +88,14 @@ void sub_80D5B0C(struct Sprite *sprite) sprite->data[1] += 192; if (GetBattlerSide(gBattleAnimAttacker) != 0) { - sprite->pos2.y = -(sprite->data[1] >> 8); + sprite->y2 = -(sprite->data[1] >> 8); } else { - sprite->pos2.y = sprite->data[1] >> 8; + sprite->y2 = sprite->data[1] >> 8; } - sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]); + sprite->x2 = Sin(sprite->data[2], sprite->data[4]); sprite->data[2] = (sprite->data[2] + 4) & 0xFF; if (++sprite->data[3] == 1) @@ -105,20 +105,20 @@ void sub_80D5B0C(struct Sprite *sprite) } break; case 2: - sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]); + sprite->x2 = Sin(sprite->data[2], sprite->data[4]); sprite->data[2] = (sprite->data[2] + 4) & 0xFF; if (++sprite->data[3] == 31) { - 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] = 256; - 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); sub_8078BD4(sprite); @@ -135,7 +135,7 @@ static void sub_80D5C5C(struct Sprite *sprite) if (!TranslateAnimLinear(sprite)) { - sprite->pos2.x += Sin(sprite->data[5], 16); + sprite->x2 += Sin(sprite->data[5], 16); initialData5 = sprite->data[5]; sprite->data[5] = (sprite->data[5] + 4) & 0xFF; newData5 = sprite->data[5]; diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c index 6c26fb891..776cd57a4 100644 --- a/src/battle/anim/withdraw.c +++ b/src/battle/anim/withdraw.c @@ -38,7 +38,7 @@ void sub_80CF514(u8 taskId) if (gTasks[taskId].data[1] == 0) { gTasks[taskId].data[0] += 0xB0; - gSprites[a].pos2.y++; + gSprites[a].y2++; } else if (gTasks[taskId].data[1] == 1) { @@ -50,7 +50,7 @@ void sub_80CF514(u8 taskId) else { gTasks[taskId].data[0] -= 0xB0; - gSprites[a].pos2.y--; + gSprites[a].y2--; } sub_8078F9C(a); |