diff options
Diffstat (limited to 'src')
170 files changed, 2988 insertions, 3070 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); diff --git a/src/battle_anim.c b/src/battle_anim.c index ae4342847..2d28aeaa5 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1847,8 +1847,8 @@ static void ScriptCmd_monbg(void) spriteId = gBattlerSpriteIds[bank]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[0] = spriteId; - gTasks[taskId].data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - gTasks[taskId].data[2] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + gTasks[taskId].data[1] = gSprites[spriteId].x + gSprites[spriteId].x2; + gTasks[taskId].data[2] = gSprites[spriteId].y + gSprites[spriteId].y2; if (toBG_2 == 0) { gTasks[taskId].data[3] = gBattle_BG1_X; @@ -1878,8 +1878,8 @@ static void ScriptCmd_monbg(void) spriteId = gBattlerSpriteIds[bank]; taskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10); gTasks[taskId].data[0] = spriteId; - gTasks[taskId].data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - gTasks[taskId].data[2] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + gTasks[taskId].data[1] = gSprites[spriteId].x + gSprites[spriteId].x2; + gTasks[taskId].data[2] = gSprites[spriteId].y + gSprites[spriteId].y2; if (toBG_2 == 0) { gTasks[taskId].data[3] = gBattle_BG1_X; @@ -1939,10 +1939,10 @@ void MoveBattlerSpriteToBG(u8 bank, u8 toBG_2) REG_BG1CNT_BITFIELD.areaOverflowMode = 0; spriteId = gBattlerSpriteIds[bank]; - gBattle_BG1_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; + gBattle_BG1_X = -(gSprites[spriteId].x + gSprites[spriteId].x2) + 32; if (IsContest() && IsSpeciesNotUnown(EWRAM_19348[0]) != 0) gBattle_BG1_X--; - gBattle_BG1_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; + gBattle_BG1_Y = -(gSprites[spriteId].y + gSprites[spriteId].y2) + 32; gSprites[gBattlerSpriteIds[bank]].invisible = TRUE; REG_BG1HOFS = gBattle_BG1_X; @@ -1973,8 +1973,8 @@ void MoveBattlerSpriteToBG(u8 bank, u8 toBG_2) REG_BG2CNT_BITFIELD.areaOverflowMode = 0; spriteId = gBattlerSpriteIds[bank]; - gBattle_BG2_X = -(gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x) + 32; - gBattle_BG2_Y = -(gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) + 32; + gBattle_BG2_X = -(gSprites[spriteId].x + gSprites[spriteId].x2) + 32; + gBattle_BG2_Y = -(gSprites[spriteId].y + gSprites[spriteId].y2) + 32; gSprites[gBattlerSpriteIds[bank]].invisible = TRUE; REG_BG2HOFS = gBattle_BG2_X; @@ -2069,8 +2069,8 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) spriteId = gTasks[taskId].data[0]; palIndex = gTasks[taskId].data[6]; sub_8078914(&s); - x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x); - y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y); + x = gTasks[taskId].data[1] - (gSprites[spriteId].x + gSprites[spriteId].x2); + y = gTasks[taskId].data[2] - (gSprites[spriteId].y + gSprites[spriteId].y2); if (gTasks[taskId].data[5] == 0) { diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 3df51d5df..ab2e7aeca 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1183,8 +1183,8 @@ const union AffineAnimCmd gSlackOffSquishAffineAnimCmds[] = static void sub_812C144(struct Sprite *sprite) { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; if (gBattleAnimArgs[3] == 0) sprite->data[0] = gBattleAnimArgs[2]; @@ -1199,7 +1199,7 @@ static void sub_812C184(struct Sprite *sprite) { if (sprite->data[1] > 0) { - sprite->pos2.x = sprite->data[2] >> 8; + sprite->x2 = sprite->data[2] >> 8; sprite->data[2] += sprite->data[0]; sprite->invisible ^= 1; sprite->data[1]--; @@ -1255,7 +1255,7 @@ static void sub_812C2BC(struct Sprite *sprite) sub_8078764(sprite, TRUE); - rotation = ArcTan2Neg(sprite->pos1.x - x, sprite->pos1.y - y); + rotation = ArcTan2Neg(sprite->x - x, sprite->y - y); rotation += 0x6000; if (IsContest()) rotation += 0x4000; @@ -1318,23 +1318,23 @@ static void sub_812C450(struct Sprite *sprite) { case 0: case 1: - sprite->pos2.x = 1; - sprite->pos2.y = 0; + sprite->x2 = 1; + sprite->y2 = 0; break; case 2: case 3: - sprite->pos2.x = -1; - sprite->pos2.y = 0; + sprite->x2 = -1; + sprite->y2 = 0; break; case 4: case 5: - sprite->pos2.x = 0; - sprite->pos2.y = 1; + sprite->x2 = 0; + sprite->y2 = 1; break; case 6: default: - sprite->pos2.x = 0; - sprite->pos2.y = -1; + sprite->x2 = 0; + sprite->y2 = -1; break; } @@ -1473,7 +1473,7 @@ static void sub_812C80C(struct Sprite *sprite) { sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; sprite->callback = sub_8078600; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -1515,10 +1515,10 @@ static void sub_812C848(struct Sprite *sprite) var0 = (sprite->data[0] * 20) & 0xFF; sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; - sprite->pos2.x = (sprite->data[3] + (s32)((u32)sprite->data[3] >> 31)) >> 1; - sprite->pos2.y = Sin(var0 & 0xFF, 5) + ((s32)(sprite->data[4] + ((u32)sprite->data[4] >> 31)) >> 1); + sprite->x2 = (sprite->data[3] + (s32)((u32)sprite->data[3] >> 31)) >> 1; + sprite->y2 = Sin(var0 & 0xFF, 5) + ((s32)(sprite->data[4] + ((u32)sprite->data[4] >> 31)) >> 1); - if ((u16)(sprite->pos1.x + sprite->pos2.x) > 240) + if ((u16)(sprite->x + sprite->x2) > 240) DestroyAnimSprite(sprite); } @@ -1576,7 +1576,7 @@ static void sub_812CA04(struct Sprite *sprite) case 1: case 3: sprite->data[1] += 117; - sprite->pos2.x = sprite->data[1] >> 8; + sprite->x2 = sprite->data[1] >> 8; if (++sprite->data[2] == 21) { sprite->data[2] = 0; @@ -1585,7 +1585,7 @@ static void sub_812CA04(struct Sprite *sprite) break; case 2: sprite->data[1] -= 117; - sprite->pos2.x = sprite->data[1] >> 8; + sprite->x2 = sprite->data[1] >> 8; if (++sprite->data[2] == 41) { sprite->data[2] = 0; @@ -1617,23 +1617,23 @@ static void sub_812CAFC(struct Sprite *sprite) { if (gBattleAnimArgs[3] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->oam.tileNum += 16; if (gBattleAnimArgs[2] == 0) { sprite->oam.matrixNum = 8; - sprite->pos2.x = -12; + sprite->x2 = -12; sprite->data[1] = 2; } else { - sprite->pos2.x = 12; + sprite->x2 = 12; sprite->data[1] = -2; } @@ -1649,8 +1649,8 @@ static void sub_812CBB4(struct Sprite *sprite) { if (sprite->data[2] == 0) { - sprite->pos2.x += sprite->data[1]; - if (sprite->pos2.x == 0) + sprite->x2 += sprite->data[1]; + if (sprite->x2 == 0) { sprite->data[2]++; if (sprite->data[3] == 0) @@ -1661,8 +1661,8 @@ static void sub_812CBB4(struct Sprite *sprite) } else { - sprite->pos2.x -= sprite->data[1]; - if (abs(sprite->pos2.x) == 12) + sprite->x2 -= sprite->data[1]; + if (abs(sprite->x2) == 12) { sprite->data[0]--; sprite->data[2]--; @@ -1712,18 +1712,18 @@ static void sub_812CCE8(struct Sprite *sprite) int var0; if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1]; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } - sprite->pos2.y = gBattleAnimArgs[2]; + sprite->y2 = gBattleAnimArgs[2]; var0 = 0; - if (sprite->pos2.y > gBattleAnimArgs[3]) + if (sprite->y2 > gBattleAnimArgs[3]) var0 = 1; sprite->data[0] = var0; @@ -1737,17 +1737,17 @@ static void sub_812CCE8(struct Sprite *sprite) static void sub_812CD64(struct Sprite *sprite) { sprite->data[1] = (sprite->data[1] + sprite->data[2]) & 0xFF; - sprite->pos2.x = gSineTable[sprite->data[1]] >> 4; - sprite->pos2.y += sprite->data[3]; + sprite->x2 = gSineTable[sprite->data[1]] >> 4; + sprite->y2 += sprite->data[3]; if (sprite->data[0]) { - if (sprite->pos2.y < sprite->data[4]) + if (sprite->y2 < sprite->data[4]) DestroyAnimSprite(sprite); } else { - if (sprite->pos2.y > sprite->data[4]) + if (sprite->y2 > sprite->data[4]) DestroyAnimSprite(sprite); } } @@ -2039,10 +2039,10 @@ static void sub_812D294(struct Sprite *sprite) if (sprite->data[0] == 61) { StoreSpriteCallbackInData(sprite, DestroyAnimSprite); - 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] = 20; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); @@ -2072,8 +2072,8 @@ static void sub_812D3AC(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); PrepareBattlerSpriteForRotScale(spriteId, 0); sprite->data[1] = 256; sprite->data[2] = 256; @@ -2101,8 +2101,8 @@ static void sub_812D3AC(struct Sprite *sprite) } break; case 3: - sprite->pos2.y -= 6; - if (sprite->pos1.y + sprite->pos2.y < -32) + sprite->y2 -= 6; + if (sprite->y + sprite->y2 < -32) DestroyAnimSprite(sprite); break; } @@ -2111,11 +2111,11 @@ static void sub_812D3AC(struct Sprite *sprite) static void sub_812D4B4(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) - sprite->pos1.x = -16; + sprite->x = -16; else - sprite->pos1.x = 256; + sprite->x = 256; - sprite->pos1.y = 0; + sprite->y = 0; sprite->callback = sub_812D4EC; } @@ -2125,23 +2125,23 @@ static void sub_812D4EC(struct Sprite *sprite) sprite->data[0] += 72; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) - sprite->pos2.x = sprite->data[0] >> 4; + sprite->x2 = sprite->data[0] >> 4; else - sprite->pos2.x = -(sprite->data[0] >> 4); + sprite->x2 = -(sprite->data[0] >> 4); sprite->data[1] += 16; - sprite->pos2.y += sprite->data[1] >> 8; + sprite->y2 += sprite->data[1] >> 8; if (++sprite->data[2] % 3 == 0) { CreateSpriteAndAnimate( &gSpriteTemplate_8402500, - sprite->pos1.x + sprite->pos2.x, - sprite->pos1.y + sprite->pos2.y, + sprite->x + sprite->x2, + sprite->y + sprite->y2, sprite->subpriority + 1); } - newX = sprite->pos1.x + sprite->pos2.x + 32; + newX = sprite->x + sprite->x2 + 32; if (newX > 304) DestroyAnimSprite(sprite); } @@ -2161,7 +2161,7 @@ static void sub_812D588(struct Sprite *sprite) if (y > 3) y = -y; - sprite->pos2.y = y; + sprite->y2 = y; sprite->callback = sub_812D5E8; } @@ -2232,9 +2232,9 @@ static void sub_812D724(struct Sprite *sprite) sprite->data[0]++; break; case 1: - sprite->pos2.y -= sprite->data[1] >> 8; + sprite->y2 -= sprite->data[1] >> 8; sprite->data[1] -= 96; - if (sprite->pos1.y + sprite->pos2.y > sprite->data[2]) + if (sprite->y + sprite->y2 > sprite->data[2]) DestroyAnimSprite(sprite); break; } @@ -2490,13 +2490,13 @@ static void sub_812DEAC(struct Sprite *sprite) if (var0 > 31) var0 = 32 - var0; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + var0; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + var0; + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32; sprite->data[1] = gBattleAnimArgs[0]; sprite->data[2] = gBattleAnimArgs[1]; - spriteId1 = CreateSprite(&gBattleAnimSpriteTemplate_84025EC, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1); - spriteId2 = CreateSprite(&gBattleAnimSpriteTemplate_84025EC, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1); + spriteId1 = CreateSprite(&gBattleAnimSpriteTemplate_84025EC, sprite->x, sprite->y, sprite->subpriority + 1); + spriteId2 = CreateSprite(&gBattleAnimSpriteTemplate_84025EC, sprite->x, sprite->y, sprite->subpriority + 1); StartSpriteAnim(&gSprites[spriteId1], 1); StartSpriteAnim(&gSprites[spriteId2], 2); @@ -2523,15 +2523,15 @@ static void sub_812DFEC(struct Sprite *sprite) var0 = (u16)sprite->data[2] + (u16)sprite->data[3]; var1 = var0 >> 8; - sprite->pos2.y -= var1; + sprite->y2 -= var1; sprite->data[3] = var0 & 0xFF; - if (sprite->data[4] == 0 && sprite->pos2.y < -8) + if (sprite->data[4] == 0 && sprite->y2 < -8) { gSprites[sprite->data[6]].invisible = FALSE; sprite->data[4]++; } - if (sprite->data[4] == 1 && sprite->pos2.y < -16) + if (sprite->data[4] == 1 && sprite->y2 < -16) { gSprites[sprite->data[7]].invisible = FALSE; sprite->data[4]++; @@ -2561,7 +2561,7 @@ static void sub_812E0F8(struct Sprite *sprite) return; sprite->data[3] += sprite->data[2]; - sprite->pos2.y -= sprite->data[3] >> 8; + sprite->y2 -= sprite->data[3] >> 8; sprite->data[3] &= 0xFF; if (sprite->data[1]-- == 0) { @@ -2705,12 +2705,12 @@ static void sub_812E4F0(struct Sprite *sprite) sprite->data[2] += 128; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) - sprite->pos2.x = -(sprite->data[1] >> 8); + sprite->x2 = -(sprite->data[1] >> 8); else - sprite->pos2.x = sprite->data[1] >> 8; + sprite->x2 = sprite->data[1] >> 8; - sprite->pos2.y += sprite->data[2] >> 8; - if (sprite->pos2.y > 64) + sprite->y2 += sprite->data[2] >> 8; + if (sprite->y2 > 64) DestroyAnimSprite(sprite); } } @@ -2762,7 +2762,7 @@ static void sub_812E638(u8 taskId) switch (task->data[0]) { case 0: - gSprites[task->data[15]].pos2.x += task->data[5]; + gSprites[task->data[15]].x2 += task->data[5]; task->data[2] -= task->data[4]; obj_id_set_rotscale(task->data[15], 0x100, 0x100, task->data[2]); sub_8078F9C(task->data[15]); @@ -2773,7 +2773,7 @@ static void sub_812E638(u8 taskId) } break; case 1: - gSprites[task->data[15]].pos2.x -= task->data[5]; + gSprites[task->data[15]].x2 -= task->data[5]; task->data[2] += task->data[4]; obj_id_set_rotscale(task->data[15], 0x100, 0x100, task->data[2]); sub_8078F9C(task->data[15]); @@ -2784,7 +2784,7 @@ static void sub_812E638(u8 taskId) } break; case 2: - gSprites[task->data[15]].pos2.x += task->data[5]; + gSprites[task->data[15]].x2 += task->data[5]; task->data[2] -= task->data[4]; obj_id_set_rotscale(task->data[15], 0x100, 0x100, task->data[2]); sub_8078F9C(task->data[15]); @@ -2813,13 +2813,13 @@ static void sub_812E7A0(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { - sprite->pos1.x = 0; - sprite->pos1.y = gBattleAnimArgs[0]; + sprite->x = 0; + sprite->y = gBattleAnimArgs[0]; } else { - sprite->pos1.x = 240; - sprite->pos1.y = gBattleAnimArgs[0] - 30; + sprite->x = 240; + sprite->y = gBattleAnimArgs[0] - 30; } sprite->data[2] = gBattleAnimArgs[2]; @@ -2832,23 +2832,23 @@ static void sub_812E7F0(struct Sprite *sprite) sprite->data[0] += 3; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { - sprite->pos1.x += 5; - sprite->pos1.y -= 1; + sprite->x += 5; + sprite->y -= 1; - if (sprite->pos1.x > 240) + if (sprite->x > 240) DestroyAnimSprite(sprite); - sprite->pos2.y = Sin(sprite->data[0] & 0xFF, 16); + sprite->y2 = Sin(sprite->data[0] & 0xFF, 16); } else { - sprite->pos1.x -= 5; - sprite->pos1.y += 1; + sprite->x -= 5; + sprite->y += 1; - if (sprite->pos1.x < 0) + if (sprite->x < 0) DestroyAnimSprite(sprite); - sprite->pos2.y = Cos(sprite->data[0] & 0xFF, 16); + sprite->y2 = Cos(sprite->data[0] & 0xFF, 16); } } @@ -2922,7 +2922,7 @@ static void sub_812E8B4(u8 taskId) obj_id_set_rotscale(task->data[15], 0x100, 0x100, task->data[2]); sub_8078F9C(task->data[15]); - gSprites[task->data[15]].pos2.x = -(((temp = task->data[2]) >= 0 ? task->data[2] : temp + 63) >> 6); + gSprites[task->data[15]].x2 = -(((temp = task->data[2]) >= 0 ? task->data[2] : temp + 63) >> 6); if (++task->data[1] > 8) { @@ -2946,12 +2946,12 @@ static void sub_812EA4C(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); } - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[1] = 0x80; sprite->data[2] = 0x300; sprite->data[3] = gBattleAnimArgs[1]; @@ -2959,9 +2959,9 @@ static void sub_812EA4C(struct Sprite *sprite) } else { - sprite->pos2.x = sprite->data[1] >> 8; - sprite->pos2.y += sprite->data[2] >> 8; - if (sprite->data[4] == 0 && sprite->pos2.y > -sprite->data[3]) + sprite->x2 = sprite->data[1] >> 8; + sprite->y2 += sprite->data[2] >> 8; + if (sprite->data[4] == 0 && sprite->y2 > -sprite->data[3]) { sprite->data[4] = 1; sprite->data[2] = (-sprite->data[2] / 3) * 2; @@ -2999,17 +2999,17 @@ void sub_812EB10(u8 taskId) obj_id_set_rotscale(spriteId, 0xD0, 0x130, 0xF00); sub_8079A64(spriteId); if (IsContest() || GetBattlerSide(gTasks[taskId].data[11]) == B_SIDE_PLAYER) - gSprites[spriteId].pos2.y += 16; + gSprites[spriteId].y2 += 16; break; case 2: obj_id_set_rotscale(spriteId, 0xD0, 0x130, 0xF100); sub_8079A64(spriteId); if (IsContest() || GetBattlerSide(gTasks[taskId].data[11]) == B_SIDE_PLAYER) - gSprites[spriteId].pos2.y += 16; + gSprites[spriteId].y2 += 16; break; } - gSprites[spriteId].pos2.x = 2; + gSprites[spriteId].x2 = 2; gTasks[taskId].data[0]++; } else @@ -3018,14 +3018,14 @@ void sub_812EB10(u8 taskId) if (++gTasks[taskId].data[2] == 3) { gTasks[taskId].data[2] = 0; - gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; + gSprites[spriteId].x2 = -gSprites[spriteId].x2; } if (++gTasks[taskId].data[1] == 13) { sub_8078F40(spriteId); - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].x2 = 0; + gSprites[spriteId].y2 = 0; DestroyAnimVisualTask(taskId); } } @@ -3054,11 +3054,11 @@ static void sub_812EC78(struct Sprite *sprite) sprite->data[2] = gBattleAnimArgs[0]; if (sprite->data[2] == 0) - sprite->pos1.x = -8; + sprite->x = -8; else - sprite->pos1.x = 248; + sprite->x = 248; - sprite->pos1.y = 104; + sprite->y = 104; sprite->callback = sub_812ED24; } @@ -3066,13 +3066,13 @@ static void sub_812ED24(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] -= 22; @@ -3133,8 +3133,8 @@ static void sub_812EE00(struct Sprite *sprite) static void sub_812EEA4(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->callback = sub_812EEEC; @@ -3143,8 +3143,8 @@ static void sub_812EEA4(struct Sprite *sprite) static void sub_812EEEC(struct Sprite *sprite) { - 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; if ((u16)sprite->data[1] < 64 || sprite->data[1] > 195) @@ -3485,14 +3485,14 @@ static void sub_812F76C(u8 taskId) task->data[1] = 0; task->data[2]++; if (task->data[2] & 1) - gSprites[task->data[15]].pos2.x = 1; + gSprites[task->data[15]].x2 = 1; else - gSprites[task->data[15]].pos2.x = -1; + gSprites[task->data[15]].x2 = -1; } } else { - gSprites[task->data[15]].pos2.x = 0; + gSprites[task->data[15]].x2 = 0; } if (!RunAffineAnimFromTaskData(&gTasks[taskId])) @@ -3501,8 +3501,8 @@ static void sub_812F76C(u8 taskId) static void sub_812F804(struct Sprite *sprite, s16 b, s16 c, s16 d, s16 e, u16 f) { - sprite->pos1.x = b; - sprite->pos1.y = c; + sprite->x = b; + sprite->y = c; sprite->data[4] = b << 4; sprite->data[5] = c << 4; sprite->data[6] = ((d - b) << 4) / f; @@ -3513,18 +3513,18 @@ void sub_812F86C(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; } static void sub_812F88C(struct Sprite *sprite) { - s16 x = sprite->pos1.x; - s16 y = sprite->pos1.y; + s16 x = sprite->x; + s16 y = sprite->y; sub_8078650(sprite); StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]); - sub_812F804(sprite, sprite->pos1.x, sprite->pos1.y, x, y, 64); + sub_812F804(sprite, sprite->x, sprite->y, x, y, 64); sprite->data[0] = 0; sprite->callback = sub_812F8DC; } @@ -3536,7 +3536,7 @@ static void sub_812F8DC(struct Sprite *sprite) sprite->data[0]++; index = (sprite->data[0] * 8) & 0xFF; sub_812F86C(sprite); - sprite->pos2.y = Sin(index, 8); + sprite->y2 = Sin(index, 8); if (sprite->data[0] > 58) { if (++sprite->data[1] > 1) @@ -3557,8 +3557,8 @@ static void sub_812F948(struct Sprite *sprite) if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; - 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->callback = sub_80DA48C; } @@ -3596,14 +3596,14 @@ static void sub_812F9B0(u8 taskId) var0 = gTasks[taskId].data[7]; var1 = gTasks[taskId].data[8]; if (gTasks[taskId].data[2] & 0x8000) - gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] - (var0 >> 8); + gSprites[gTasks[taskId].data[15]].x2 = gTasks[taskId].data[9] - (var0 >> 8); else - gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] + (var0 >> 8); + gSprites[gTasks[taskId].data[15]].x2 = gTasks[taskId].data[9] + (var0 >> 8); if (gTasks[taskId].data[3] & 0x8000) - gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] - (var1 >> 8); + gSprites[gTasks[taskId].data[15]].y2 = gTasks[taskId].data[10] - (var1 >> 8); else - gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] + (var1 >> 8); + gSprites[gTasks[taskId].data[15]].y2 = gTasks[taskId].data[10] + (var1 >> 8); if (gTasks[taskId].data[0] < 1) { @@ -3646,14 +3646,14 @@ static void sub_812FAF8(u8 taskId) var0 = (gTasks[taskId].data[2] & 0x7FFF) + gTasks[taskId].data[7]; var1 = (gTasks[taskId].data[3] & 0x7FFF) + gTasks[taskId].data[8]; if (gTasks[taskId].data[2] & 0x8000) - gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] - (var0 >> 8); + gSprites[gTasks[taskId].data[15]].x2 = gTasks[taskId].data[9] - (var0 >> 8); else - gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] + (var0 >> 8); + gSprites[gTasks[taskId].data[15]].x2 = gTasks[taskId].data[9] + (var0 >> 8); if (gTasks[taskId].data[3] & 0x8000) - gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] - (var1 >> 8); + gSprites[gTasks[taskId].data[15]].y2 = gTasks[taskId].data[10] - (var1 >> 8); else - gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] + (var1 >> 8); + gSprites[gTasks[taskId].data[15]].y2 = gTasks[taskId].data[10] + (var1 >> 8); gTasks[taskId].data[7] = var0; gTasks[taskId].data[8] = var1; @@ -3801,8 +3801,8 @@ static void sub_812FEB8(u8 taskId, bool8 arg1) static void sub_812FF94(struct Sprite *sprite) { - sprite->pos1.x += sprite->data[1]; - sprite->pos1.y += sprite->data[2]; + sprite->x += sprite->data[1]; + sprite->y += sprite->data[2]; if (++sprite->data[0] > 6) { gTasks[sprite->data[3]].data[sprite->data[4]]--; @@ -3859,8 +3859,8 @@ static void sub_81300F4(struct Sprite *sprite) if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) 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 (gBattleAnimArgs[2] == 0) { sprite->data[0] = 640; @@ -3891,8 +3891,8 @@ static void sub_81301B4(struct Sprite *sprite) { sprite->data[6] += sprite->data[0]; sprite->data[7] += sprite->data[1]; - sprite->pos2.x = sprite->data[6] >> 8; - sprite->pos2.y = sprite->data[7] >> 8; + sprite->x2 = sprite->data[6] >> 8; + sprite->y2 = sprite->data[7] >> 8; if (++sprite->data[5] == 14) DestroyAnimSprite(sprite); } @@ -3955,21 +3955,21 @@ static void sub_81302E4(u8 taskId) if (task->data[7] == 0) { if (i == 0) - gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = -task->data[6]; + gSprites[spriteId].x2 = gSprites[spriteId].y2 = -task->data[6]; else - gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = task->data[6]; + gSprites[spriteId].x2 = gSprites[spriteId].y2 = task->data[6]; } else { if (i == 0) { - gSprites[spriteId].pos2.x = -task->data[6]; - gSprites[spriteId].pos2.y = task->data[6]; + gSprites[spriteId].x2 = -task->data[6]; + gSprites[spriteId].y2 = task->data[6]; } else { - gSprites[spriteId].pos2.x = task->data[6]; - gSprites[spriteId].pos2.y = -task->data[6]; + gSprites[spriteId].x2 = task->data[6]; + gSprites[spriteId].y2 = -task->data[6]; } } @@ -4030,8 +4030,8 @@ static void sub_81304DC(struct Sprite *sprite) static void sub_813051C(struct Sprite *sprite) { - 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]; sprite->data[0] = gBattleAnimArgs[4]; @@ -4121,15 +4121,15 @@ static void sub_81307B0(struct Sprite *sprite) sprite->oam.tileNum += 16; sprite->data[6] = gBattleAnimArgs[2]; sprite->data[7] = gBattleAnimArgs[1] == 0 ? -1 : 1; - sprite->pos1.y = GetBattlerSpriteCoord(battler, 3); + sprite->y = GetBattlerSpriteCoord(battler, 3); if (gBattleAnimArgs[1] == 0) { sprite->oam.matrixNum |= 0x8; - sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, 4) - 8; + sprite->x = GetBattlerSpriteCoordAttr(battler, 4) - 8; } else { - sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, 5) + 8; + sprite->x = GetBattlerSpriteCoordAttr(battler, 5) + 8; } sprite->callback = sub_813085C; @@ -4143,7 +4143,7 @@ static void sub_813085C(struct Sprite *sprite) if (++sprite->data[1] > 1) { sprite->data[1] = 0; - sprite->pos2.x += sprite->data[7]; + sprite->x2 += sprite->data[7]; if (++sprite->data[2] == 12) sprite->data[0]++; } @@ -4156,7 +4156,7 @@ static void sub_813085C(struct Sprite *sprite) } break; case 2: - sprite->pos2.x -= sprite->data[7] * 4; + sprite->x2 -= sprite->data[7] * 4; if (++sprite->data[1] == 6) { sprite->data[1] = 0; @@ -4164,7 +4164,7 @@ static void sub_813085C(struct Sprite *sprite) } break; case 3: - sprite->pos2.x += sprite->data[7] * 3; + sprite->x2 += sprite->data[7] * 3; if (++sprite->data[1] == 8) { if (--sprite->data[6]) @@ -4204,14 +4204,14 @@ static void sub_8130970(u8 taskId) { task->data[1] = 0; if (!(task->data[2] & 1)) - gSprites[task->data[15]].pos2.x = 2; + gSprites[task->data[15]].x2 = 2; else - gSprites[task->data[15]].pos2.x = -2; + gSprites[task->data[15]].x2 = -2; } if (!RunAffineAnimFromTaskData(task)) { - gSprites[task->data[15]].pos2.x = 0; + gSprites[task->data[15]].x2 = 0; if (--task->data[0]) { PrepareAffineAnimInTaskData(&gTasks[taskId], gTasks[taskId].data[15], &gUnknown_084029DC); @@ -4229,17 +4229,17 @@ static void sub_8130A2C(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 2); + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); + sprite->y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, 2); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->pos1.y = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 2); + sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->y = GetBattlerSpriteCoordAttr(gBattleAnimTarget, 2); } - if (sprite->pos1.y < 8) - sprite->pos1.y = 8; + if (sprite->y < 8) + sprite->y = 8; sprite->data[0] = 0; sprite->data[1] = gBattleAnimArgs[1]; @@ -4265,16 +4265,16 @@ static void sub_8130AEC(struct Sprite *sprite) if (gBattleAnimArgs[0] == 0) { sprite->oam.matrixNum |= 0x8; - sprite->pos1.x = 100; + sprite->x = 100; sprite->data[7] = 1; } else { - sprite->pos1.x = 140; + sprite->x = 140; sprite->data[7] = -1; } - sprite->pos1.y = 56; + sprite->y = 56; sprite->callback = sub_8130B38; } @@ -4283,9 +4283,9 @@ static void sub_8130B38(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.y -= sprite->data[7] * 2; + sprite->y -= sprite->data[7] * 2; if (sprite->data[1] & 1) - sprite->pos1.x -= sprite->data[7] * 2; + sprite->x -= sprite->data[7] * 2; if (++sprite->data[1] == 9) { @@ -4302,8 +4302,8 @@ static void sub_8130B38(struct Sprite *sprite) break; case 2: sprite->data[1]++; - sprite->pos1.y += sprite->data[7] * 3; - sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); + sprite->y += sprite->data[7] * 3; + sprite->x2 = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); if (sprite->data[1] == 12) { sprite->data[1] = 0; @@ -4319,15 +4319,15 @@ static void sub_8130B38(struct Sprite *sprite) break; case 4: sprite->data[1]++; - sprite->pos1.y -= sprite->data[7] * 3; - sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); + sprite->y -= sprite->data[7] * 3; + sprite->x2 = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); if (sprite->data[1] == 12) sprite->data[0]++; break; case 5: sprite->data[1]++; - sprite->pos1.y += sprite->data[7] * 3; - sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); + sprite->y += sprite->data[7] * 3; + sprite->x2 = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3); if (sprite->data[1] == 15) sprite->oam.tileNum += 16; @@ -4338,7 +4338,7 @@ static void sub_8130B38(struct Sprite *sprite) } break; case 6: - sprite->pos1.x += sprite->data[7] * 6; + sprite->x += sprite->data[7] * 6; if (++sprite->data[1] == 9) { sprite->data[1] = 0; @@ -4346,7 +4346,7 @@ static void sub_8130B38(struct Sprite *sprite) } break; case 7: - sprite->pos1.x += sprite->data[7] * 2; + sprite->x += sprite->data[7] * 2; if (++sprite->data[1] == 1) { sprite->data[1] = 0; @@ -4354,7 +4354,7 @@ static void sub_8130B38(struct Sprite *sprite) } break; case 8: - sprite->pos1.x -= sprite->data[7] * 3; + sprite->x -= sprite->data[7] * 3; if (++sprite->data[1] == 5) DestroyAnimSprite(sprite); break; @@ -4407,7 +4407,7 @@ static void sub_8130DBC(u8 taskId) } break; case 1: - gSprites[task->data[15]].pos2.x -= task->data[14] * 3; + gSprites[task->data[15]].x2 -= task->data[14] * 3; if (++task->data[1] == 6) { task->data[1] = 0; @@ -4415,7 +4415,7 @@ static void sub_8130DBC(u8 taskId) } break; case 2: - gSprites[task->data[15]].pos2.x += task->data[14] * 3; + gSprites[task->data[15]].x2 += task->data[14] * 3; if (++task->data[1] == 6) { task->data[1] = 0; @@ -4438,7 +4438,7 @@ static void sub_8130DBC(u8 taskId) } break; case 4: - gSprites[task->data[15]].pos2.x += task->data[14]; + gSprites[task->data[15]].x2 += task->data[14]; if (++task->data[1] == 3) { task->data[1] = 0; @@ -4453,7 +4453,7 @@ static void sub_8130DBC(u8 taskId) } break; case 6: - gSprites[task->data[15]].pos2.x -= task->data[14] * 4; + gSprites[task->data[15]].x2 -= task->data[14] * 4; if (++task->data[1] == 5) { task->data[1] = 0; @@ -4461,7 +4461,7 @@ static void sub_8130DBC(u8 taskId) } break; case 7: - gSprites[task->data[15]].pos2.x += task->data[14] * 4; + gSprites[task->data[15]].x2 += task->data[14] * 4; if (++task->data[1] == 5) { task->data[1] = 0; @@ -4469,7 +4469,7 @@ static void sub_8130DBC(u8 taskId) } break; case 8: - gSprites[task->data[15]].pos2.x = 0; + gSprites[task->data[15]].x2 = 0; DestroyAnimVisualTask(taskId); break; } @@ -4536,9 +4536,9 @@ static void sub_8130FE0(struct Sprite *sprite) else sprite->data[0] = 12; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = x; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = y; InitAnimLinearTranslation(sprite); sprite->data[5]++; @@ -4549,19 +4549,19 @@ static void sub_8130FE0(struct Sprite *sprite) switch (sprite->data[6]) { default: - 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] = 0; sprite->data[5]++; sprite->data[6]++; break; case 4: - 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[5] = 0; sprite->data[6]++; break; @@ -4599,14 +4599,14 @@ static void sub_8130FE0(struct Sprite *sprite) static void sub_81311E4(struct Sprite *sprite) { - sprite->pos2.x = ((sprite->data[2] - sprite->data[0]) * sprite->data[5]) / sprite->data[4]; - sprite->pos2.y = ((sprite->data[3] - sprite->data[1]) * sprite->data[5]) / sprite->data[4]; + sprite->x2 = ((sprite->data[2] - sprite->data[0]) * sprite->data[5]) / sprite->data[4]; + sprite->y2 = ((sprite->data[3] - sprite->data[1]) * sprite->data[5]) / sprite->data[4]; if (!(sprite->data[5] & 1)) { CreateSprite( &gSpriteTemplate_8402500, - sprite->pos1.x + sprite->pos2.x, - sprite->pos1.y + sprite->pos2.y, 5); + sprite->x + sprite->x2, + sprite->y + sprite->y2, 5); } if (sprite->data[5] == sprite->data[4]) @@ -4622,20 +4622,20 @@ static void sub_8131264(struct Sprite *sprite) if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER || IsContest()) { - sprite->data[0] = sprite->pos1.x - gBattleAnimArgs[0]; - sprite->data[2] = sprite->pos1.x - gBattleAnimArgs[2]; + sprite->data[0] = sprite->x - gBattleAnimArgs[0]; + sprite->data[2] = sprite->x - gBattleAnimArgs[2]; } else { - sprite->data[0] = sprite->pos1.x + gBattleAnimArgs[0]; - sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; + sprite->data[0] = sprite->x + gBattleAnimArgs[0]; + sprite->data[2] = sprite->x + gBattleAnimArgs[2]; } - sprite->data[1] = sprite->pos1.y + gBattleAnimArgs[1]; - sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[3]; + sprite->data[1] = sprite->y + gBattleAnimArgs[1]; + sprite->data[3] = sprite->y + gBattleAnimArgs[3]; sprite->data[4] = gBattleAnimArgs[4]; - sprite->pos1.x = sprite->data[0]; - sprite->pos1.y = sprite->data[1]; + sprite->x = sprite->data[0]; + sprite->y = sprite->data[1]; sprite->callback = sub_81311E4; } @@ -4688,22 +4688,22 @@ static void sub_8131408(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - gSprites[spriteId].pos2.y = -200; - gSprites[spriteId].pos2.x = 200; + gSprites[spriteId].y2 = -200; + gSprites[spriteId].x2 = 200; gSprites[spriteId].invisible = FALSE; gTasks[taskId].data[10] = 0; gTasks[taskId].data[0]++; break; case 1: gTasks[taskId].data[10] += 112; - gSprites[spriteId].pos2.y += gTasks[taskId].data[10] >> 8; - if (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y >= -32) - gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].y2 += gTasks[taskId].data[10] >> 8; + if (gSprites[spriteId].y + gSprites[spriteId].y2 >= -32) + gSprites[spriteId].x2 = 0; - if (gSprites[spriteId].pos2.y > 0) - gSprites[spriteId].pos2.y = 0; + if (gSprites[spriteId].y2 > 0) + gSprites[spriteId].y2 = 0; - if (gSprites[spriteId].pos2.y == 0) + if (gSprites[spriteId].y2 == 0) { PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); gTasks[taskId].data[10] -= 0x800; @@ -4715,17 +4715,17 @@ static void sub_8131408(u8 taskId) if (gTasks[taskId].data[10] < 0) gTasks[taskId].data[10] = 0; - gSprites[spriteId].pos2.y -= gTasks[taskId].data[10] >> 8; + gSprites[spriteId].y2 -= gTasks[taskId].data[10] >> 8; if (gTasks[taskId].data[10] == 0) gTasks[taskId].data[0]++; break; case 3: gTasks[taskId].data[10] += 112; - gSprites[spriteId].pos2.y += gTasks[taskId].data[10] >> 8; - if (gSprites[spriteId].pos2.y > 0) - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].y2 += gTasks[taskId].data[10] >> 8; + if (gSprites[spriteId].y2 > 0) + gSprites[spriteId].y2 = 0; - if (gSprites[spriteId].pos2.y == 0) + if (gSprites[spriteId].y2 == 0) { PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG)); DestroyAnimVisualTask(taskId); @@ -4749,8 +4749,8 @@ static void sub_8131564(struct Sprite *sprite) y2 = -96; } - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); - sprite->pos2.y = y2; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->y2 = y2; sprite->callback = sub_81315C8; } @@ -4759,32 +4759,32 @@ static void sub_81315C8(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos2.y += 10; - if (sprite->pos2.y >= 0) + sprite->y2 += 10; + if (sprite->y2 >= 0) { PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); - sprite->pos2.y = 0; + sprite->y2 = 0; sprite->data[0]++; } break; case 1: sprite->data[1] += 4; - sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3); + sprite->y2 = -(gSineTable[sprite->data[1]] >> 3); if (sprite->data[1] > 127) { PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->data[1] = 0; - sprite->pos2.y = 0; + sprite->y2 = 0; sprite->data[0]++; } break; case 2: sprite->data[1] += 6; - sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 4); + sprite->y2 = -(gSineTable[sprite->data[1]] >> 4); if (sprite->data[1] > 127) { sprite->data[1] = 0; - sprite->pos2.y = 0; + sprite->y2 = 0; sprite->data[0]++; } break; @@ -4834,8 +4834,8 @@ void sub_81316F8(u8 taskId) return; } - gSprites[spriteId2].pos2.x += 24; - gSprites[spriteId1].pos2.x -= 24; + gSprites[spriteId2].x2 += 24; + gSprites[spriteId1].x2 -= 24; gSprites[spriteId2].data[0] = 0; gSprites[spriteId1].data[0] = 0; gSprites[spriteId2].data[1] = 0; @@ -4877,7 +4877,7 @@ static void sub_8131838(struct Sprite *sprite) } sprite->data[4] = (sprite->data[4] + sprite->data[3]) & 0xFF; - sprite->pos2.x = Cos(sprite->data[4], sprite->data[5]); + sprite->x2 = Cos(sprite->data[4], sprite->data[5]); switch (sprite->data[0]) { case 0: @@ -4936,12 +4936,12 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); gTasks[taskId].data[1] += 0x800; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) - gSprites[spriteId].pos2.x += (gTasks[taskId].data[1] >> 8); + gSprites[spriteId].x2 += (gTasks[taskId].data[1] >> 8); else - gSprites[spriteId].pos2.x -= (gTasks[taskId].data[1] >> 8); + gSprites[spriteId].x2 -= (gTasks[taskId].data[1] >> 8); gTasks[taskId].data[1] &= 0xFF; - x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; + x = gSprites[spriteId].x + gSprites[spriteId].x2; if ((u16)(x + 32) > 304) { gTasks[taskId].data[1] = 0; @@ -4999,12 +4999,12 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) spriteId2 = gTasks[taskId].data[15]; gTasks[taskId].data[1] += 0x800; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) - gSprites[spriteId2].pos2.x -= (gTasks[taskId].data[1] >> 8); + gSprites[spriteId2].x2 -= (gTasks[taskId].data[1] >> 8); else - gSprites[spriteId2].pos2.x += (gTasks[taskId].data[1] >> 8); + gSprites[spriteId2].x2 += (gTasks[taskId].data[1] >> 8); gTasks[taskId].data[1] &= 0xFF; - x = gSprites[spriteId2].pos1.x + gSprites[spriteId2].pos2.x; + x = gSprites[spriteId2].x + gSprites[spriteId2].x2; if (gTasks[taskId].data[14] == 0) { if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) @@ -5036,9 +5036,9 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) spriteId2 = gTasks[taskId].data[15]; DestroySpriteAndFreeResources_(&gSprites[spriteId2]); if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) - gSprites[spriteId].pos2.x = -gSprites[spriteId].pos1.x - 32; + gSprites[spriteId].x2 = -gSprites[spriteId].x - 32; else - gSprites[spriteId].pos2.x = 272 - gSprites[spriteId].pos1.x; + gSprites[spriteId].x2 = 272 - gSprites[spriteId].x; gTasks[taskId].data[0]++; break; @@ -5047,19 +5047,19 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) gTasks[taskId].data[1] += 0x800; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { - gSprites[spriteId].pos2.x += (gTasks[taskId].data[1] >> 8); - if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x >= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X)) - gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].x2 += (gTasks[taskId].data[1] >> 8); + if (gSprites[spriteId].x2 + gSprites[spriteId].x >= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X)) + gSprites[spriteId].x2 = 0; } else { - gSprites[spriteId].pos2.x -= (gTasks[taskId].data[1] >> 8); - if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x <= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X)) - gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].x2 -= (gTasks[taskId].data[1] >> 8); + if (gSprites[spriteId].x2 + gSprites[spriteId].x <= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X)) + gSprites[spriteId].x2 = 0; } gTasks[taskId].data[1] = (u8)gTasks[taskId].data[1]; - if (gSprites[spriteId].pos2.x == 0) + if (gSprites[spriteId].x2 == 0) DestroyAnimVisualTask(taskId); break; } @@ -5740,7 +5740,7 @@ void sub_8131EB8(struct Sprite *sprite) if (gBattleAnimArgs[7] == -1) { PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(63)); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16; + sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16; sprite->data[0] = -32; sprite->data[7]++; sprite->invisible = FALSE; @@ -5753,7 +5753,7 @@ void sub_8131EB8(struct Sprite *sprite) } break; case 1: - sprite->pos2.y = Sin(sprite->data[1], sprite->data[0]); + sprite->y2 = Sin(sprite->data[1], sprite->data[0]); sprite->data[1] += 5; if (sprite->data[1] > 0x7F) { @@ -5764,9 +5764,9 @@ void sub_8131EB8(struct Sprite *sprite) sprite->data[2] += 0x100; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) - sprite->pos2.x -= (sprite->data[2] >> 8); + sprite->x2 -= (sprite->data[2] >> 8); else - sprite->pos2.x += (sprite->data[2] >> 8); + sprite->x2 += (sprite->data[2] >> 8); sprite->data[2] &= 0xFF; if (sprite->data[3] == 2) @@ -5797,15 +5797,15 @@ void AnimTask_SnatchPartnerMove(u8 taskId) break; case 1: spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; - gSprites[spriteId].pos2.x += gTasks[taskId].data[0]; + gSprites[spriteId].x2 += gTasks[taskId].data[0]; if (gTasks[taskId].data[0] > 0) { - if (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x >= gTasks[taskId].data[2]) + if (gSprites[spriteId].x + gSprites[spriteId].x2 >= gTasks[taskId].data[2]) gTasks[taskId].data[15]++; } else { - if (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x <= gTasks[taskId].data[2]) + if (gSprites[spriteId].x + gSprites[spriteId].x2 <= gTasks[taskId].data[2]) gTasks[taskId].data[15]++; } break; @@ -5815,22 +5815,22 @@ void AnimTask_SnatchPartnerMove(u8 taskId) break; case 3: spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; - gSprites[spriteId].pos2.x += gTasks[taskId].data[0]; + gSprites[spriteId].x2 += gTasks[taskId].data[0]; if (gTasks[taskId].data[0] < 0) { - if (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x <= gTasks[taskId].data[1]) + if (gSprites[spriteId].x + gSprites[spriteId].x2 <= gTasks[taskId].data[1]) gTasks[taskId].data[15]++; } else { - if (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x >= gTasks[taskId].data[1]) + if (gSprites[spriteId].x + gSprites[spriteId].x2 >= gTasks[taskId].data[1]) gTasks[taskId].data[15]++; } break; case 4: default: spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; - gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].x2 = 0; DestroyAnimVisualTask(taskId); break; } @@ -5843,8 +5843,8 @@ void AnimTask_TeeterDanceMovement(u8 taskId) struct Task *task = &gTasks[taskId]; task->data[3] = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER); task->data[4] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER ? 1 : -1; - task->data[6] = gSprites[task->data[3]].pos1.y; - task->data[5] = gSprites[task->data[3]].pos1.x; + task->data[6] = gSprites[task->data[3]].y; + task->data[5] = gSprites[task->data[3]].x; task->data[9] = 0; task->data[11] = 0; task->data[10] = 1; @@ -5860,23 +5860,23 @@ static void AnimTask_TeeterDanceMovementStep(u8 taskId) case 0: task->data[11] += 8; task->data[11] &= 0xFF; - gSprites[task->data[3]].pos2.x = gSineTable[task->data[11]] >> 5; + gSprites[task->data[3]].x2 = gSineTable[task->data[11]] >> 5; task->data[9] += 2; task->data[9] &= 0xFF; - gSprites[task->data[3]].pos1.x = (gSineTable[task->data[9]] >> 3) * task->data[4] + task->data[5]; + gSprites[task->data[3]].x = (gSineTable[task->data[9]] >> 3) * task->data[4] + task->data[5]; if (task->data[9] == 0) { - gSprites[task->data[3]].pos1.x = task->data[5]; + gSprites[task->data[3]].x = task->data[5]; task->data[0]++; } break; case 1: task->data[11] += 8; task->data[11] &= 0xFF; - gSprites[task->data[3]].pos2.x = gSineTable[task->data[11]] >> 5; + gSprites[task->data[3]].x2 = gSineTable[task->data[11]] >> 5; if (task->data[11] == 0) { - gSprites[task->data[3]].pos2.x = 0; + gSprites[task->data[3]].x2 = 0; task->data[0]++; } break; @@ -5900,8 +5900,8 @@ static void AnimKnockOffStrikeStep(struct Sprite *sprite) sprite->data[1] &= 0xFF; } - sprite->pos2.x = Cos(sprite->data[1], 20); - sprite->pos2.y = Sin(sprite->data[1], 20); + sprite->x2 = Cos(sprite->data[1], 20); + sprite->y2 = Sin(sprite->data[1], 20); if (sprite->animEnded) DestroyAnimSprite(sprite); @@ -5915,8 +5915,8 @@ void AnimKnockOffStrike(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x -= gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->data[0] = -11; sprite->data[1] = 192; StartSpriteAffineAnim(sprite, 1); @@ -5925,8 +5925,8 @@ void AnimKnockOffStrike(struct Sprite *sprite) { sprite->data[0] = 11; sprite->data[1] = 192; - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; } sprite->callback = AnimKnockOffStrikeStep; @@ -5936,10 +5936,10 @@ void AnimKnockOffStrike(struct Sprite *sprite) // No args. void AnimRecycle(struct Sprite *sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); - sprite->pos1.y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_TOP); - if (sprite->pos1.y < 16) - sprite->pos1.y = 16; + sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_TOP); + if (sprite->y < 16) + sprite->y = 16; sprite->data[6] = 0; sprite->data[7] = 16; @@ -6045,14 +6045,14 @@ static void AnimTask_SlackOffSquishStep(u8 taskId) task->data[1] = 0; task->data[2]++; if (!(task->data[2] & 1)) - gSprites[task->data[15]].pos2.x = -1; + gSprites[task->data[15]].x2 = -1; else - gSprites[task->data[15]].pos2.x = 1; + gSprites[task->data[15]].x2 = 1; } } else { - gSprites[task->data[15]].pos2.x = 0; + gSprites[task->data[15]].x2 = 0; } if (!RunAffineAnimFromTaskData(&gTasks[taskId])) diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index 23aea3218..e0172a133 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -108,8 +108,8 @@ void AnimTask_ShakeMon(u8 taskId) DestroyAnimVisualTask(taskId); return; } - gSprites[spriteId].pos2.x = gBattleAnimArgs[1]; - gSprites[spriteId].pos2.y = gBattleAnimArgs[2]; + gSprites[spriteId].x2 = gBattleAnimArgs[1]; + gSprites[spriteId].y2 = gBattleAnimArgs[2]; TASK.data[0] = spriteId; TASK.data[1] = gBattleAnimArgs[3]; TASK.data[2] = gBattleAnimArgs[4]; @@ -124,27 +124,27 @@ static void AnimTask_ShakeMonStep(u8 taskId) { if (TASK.data[3] == 0) { - if (SPRITE.pos2.x == 0) + if (SPRITE.x2 == 0) { - SPRITE.pos2.x = TASK.data[4]; + SPRITE.x2 = TASK.data[4]; } else { - SPRITE.pos2.x = 0; + SPRITE.x2 = 0; } - if (SPRITE.pos2.y == 0) + if (SPRITE.y2 == 0) { - SPRITE.pos2.y = TASK.data[5]; + SPRITE.y2 = TASK.data[5]; } else { - SPRITE.pos2.y = 0; + SPRITE.y2 = 0; } TASK.data[3] = TASK.data[2]; if (--TASK.data[1] == 0) { - SPRITE.pos2.x = 0; - SPRITE.pos2.y = 0; + SPRITE.x2 = 0; + SPRITE.y2 = 0; DestroyAnimVisualTask(taskId); return; } @@ -212,8 +212,8 @@ void AnimTask_ShakeMon2(u8 taskId) return; } - gSprites[sprite].pos2.x = gBattleAnimArgs[1]; - gSprites[sprite].pos2.y = gBattleAnimArgs[2]; + gSprites[sprite].x2 = gBattleAnimArgs[1]; + gSprites[sprite].y2 = gBattleAnimArgs[2]; TASK.data[0] = sprite; TASK.data[1] = gBattleAnimArgs[3]; TASK.data[2] = gBattleAnimArgs[4]; @@ -228,21 +228,21 @@ static void AnimTask_ShakeMon2Step(u8 taskId) { if (TASK.data[3] == 0) { - if (SPRITE.pos2.x == TASK.data[4]) - SPRITE.pos2.x = -TASK.data[4]; + if (SPRITE.x2 == TASK.data[4]) + SPRITE.x2 = -TASK.data[4]; else - SPRITE.pos2.x = TASK.data[4]; + SPRITE.x2 = TASK.data[4]; - if (SPRITE.pos2.y == TASK.data[5]) - SPRITE.pos2.y = -TASK.data[5]; + if (SPRITE.y2 == TASK.data[5]) + SPRITE.y2 = -TASK.data[5]; else - SPRITE.pos2.y = TASK.data[5]; + SPRITE.y2 = TASK.data[5]; TASK.data[3] = TASK.data[2]; if (--TASK.data[1] == 0) { - SPRITE.pos2.x = 0; - SPRITE.pos2.y = 0; + SPRITE.x2 = 0; + SPRITE.y2 = 0; DestroyAnimVisualTask(taskId); return; } @@ -270,8 +270,8 @@ void AnimTask_ShakeMonInPlace(u8 taskId) return; } - gSprites[spriteId].pos2.x += gBattleAnimArgs[1]; - gSprites[spriteId].pos2.y += gBattleAnimArgs[2]; + gSprites[spriteId].x2 += gBattleAnimArgs[1]; + gSprites[spriteId].y2 += gBattleAnimArgs[2]; TASK.data[0] = spriteId; TASK.data[1] = 0; TASK.data[2] = gBattleAnimArgs[3]; @@ -289,26 +289,26 @@ static void AnimTask_ShakeMonInPlaceStep(u8 taskId) { if (TASK.data[1] & 1) { - SPRITE.pos2.x += TASK.data[5]; - SPRITE.pos2.y += TASK.data[6]; + SPRITE.x2 += TASK.data[5]; + SPRITE.y2 += TASK.data[6]; } else { - SPRITE.pos2.x -= TASK.data[5]; - SPRITE.pos2.y -= TASK.data[6]; + SPRITE.x2 -= TASK.data[5]; + SPRITE.y2 -= TASK.data[6]; } TASK.data[3] = TASK.data[4]; if (++TASK.data[1] >= TASK.data[2]) { if (TASK.data[1] & 1) { - SPRITE.pos2.x += TASK.data[5] / 2; - SPRITE.pos2.y += TASK.data[6] / 2; + SPRITE.x2 += TASK.data[5] / 2; + SPRITE.y2 += TASK.data[6] / 2; } else { - SPRITE.pos2.x -= TASK.data[5] / 2; - SPRITE.pos2.y -= TASK.data[6] / 2; + SPRITE.x2 -= TASK.data[5] / 2; + SPRITE.y2 -= TASK.data[6] / 2; } DestroyAnimVisualTask(taskId); return; @@ -329,7 +329,7 @@ static void AnimTask_ShakeMonInPlaceStep(u8 taskId) void AnimTask_ShakeAndSinkMon(u8 taskId) { u8 sprite = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - gSprites[sprite].pos2.x = gBattleAnimArgs[1]; + gSprites[sprite].x2 = gBattleAnimArgs[1]; TASK.data[0] = sprite; TASK.data[1] = gBattleAnimArgs[1]; TASK.data[2] = gBattleAnimArgs[2]; @@ -348,15 +348,15 @@ static void AnimTask_ShakeAndSinkMonStep(u8 taskId) if (TASK.data[2] == TASK.data[8]++) { TASK.data[8] = 0; - if (gSprites[sprite].pos2.x == x) + if (gSprites[sprite].x2 == x) x = -x; - gSprites[sprite].pos2.x += x; + gSprites[sprite].x2 += x; } TASK.data[1] = x; TASK.data[9] += TASK.data[3]; - gSprites[sprite].pos2.y = TASK.data[9] >> 8; + gSprites[sprite].y2 = TASK.data[9] >> 8; if (--TASK.data[4] == 0) { DestroyAnimVisualTask(taskId); @@ -399,9 +399,9 @@ void AnimTask_TranslateMonElliptical(u8 taskId) static void sub_80A8488(u8 taskId) { u8 spriteId = TASK.data[0]; - gSprites[spriteId].pos2.x = Sin(TASK.data[5], TASK.data[1]); - gSprites[spriteId].pos2.y = -Cos(TASK.data[5], TASK.data[2]); - gSprites[spriteId].pos2.y += TASK.data[2]; + gSprites[spriteId].x2 = Sin(TASK.data[5], TASK.data[1]); + gSprites[spriteId].y2 = -Cos(TASK.data[5], TASK.data[2]); + gSprites[spriteId].y2 += TASK.data[2]; TASK.data[5] += TASK.data[4]; TASK.data[5] &= 0xff; @@ -410,8 +410,8 @@ static void sub_80A8488(u8 taskId) if (TASK.data[3] == 0) { - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].x2 = 0; + gSprites[spriteId].y2 = 0; DestroyAnimVisualTask(taskId); return; } @@ -503,16 +503,16 @@ static void SlideMonToOriginalPos(struct Sprite *sprite) monSpriteId = gBattlerSpriteIds[gBattleAnimTarget]; sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[1] = gSprites[monSpriteId].pos1.x + gSprites[monSpriteId].pos2.x; - sprite->data[2] = gSprites[monSpriteId].pos1.x; - sprite->data[3] = gSprites[monSpriteId].pos1.y + gSprites[monSpriteId].pos2.y; - sprite->data[4] = gSprites[monSpriteId].pos1.y; + sprite->data[1] = gSprites[monSpriteId].x + gSprites[monSpriteId].x2; + sprite->data[2] = gSprites[monSpriteId].x; + sprite->data[3] = gSprites[monSpriteId].y + gSprites[monSpriteId].y2; + sprite->data[4] = gSprites[monSpriteId].y; something = 0; InitSpriteDataForLinearTranslation(sprite); sprite->data[3] = something; sprite->data[4] = something; - sprite->data[5] = gSprites[monSpriteId].pos2.x; - sprite->data[6] = gSprites[monSpriteId].pos2.y; + sprite->data[5] = gSprites[monSpriteId].x2; + sprite->data[6] = gSprites[monSpriteId].y2; sprite->invisible = TRUE; if (gBattleAnimArgs[1] == 1) @@ -537,10 +537,10 @@ static void SlideMonToOriginalPosStep(struct Sprite *sprite) if (sprite->data[0] == 0) { if (lo < 2) - monSprite->pos2.x = 0; + monSprite->x2 = 0; if (lo == 2 || lo == 0) - monSprite->pos2.y = 0; + monSprite->y2 = 0; DestroyAnimSprite(sprite); } @@ -549,8 +549,8 @@ static void SlideMonToOriginalPosStep(struct Sprite *sprite) sprite->data[0]--; sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; - monSprite->pos2.x = (s8)(sprite->data[3] >> 8) + sprite->data[5]; - monSprite->pos2.y = (s8)(sprite->data[4] >> 8) + sprite->data[6]; + monSprite->x2 = (s8)(sprite->data[3] >> 8) + sprite->data[5]; + monSprite->y2 = (s8)(sprite->data[4] >> 8) + sprite->data[6]; } } @@ -582,10 +582,10 @@ static void SlideMonToOffset(struct Sprite *sprite) } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[1] = gSprites[monSpriteId].pos1.x; - sprite->data[2] = gSprites[monSpriteId].pos1.x + gBattleAnimArgs[1]; - sprite->data[3] = gSprites[monSpriteId].pos1.y; - sprite->data[4] = gSprites[monSpriteId].pos1.y + gBattleAnimArgs[2]; + sprite->data[1] = gSprites[monSpriteId].x; + sprite->data[2] = gSprites[monSpriteId].x + gBattleAnimArgs[1]; + sprite->data[3] = gSprites[monSpriteId].y; + sprite->data[4] = gSprites[monSpriteId].y + gBattleAnimArgs[2]; InitSpriteDataForLinearTranslation(sprite); sprite->data[3] = 0; sprite->data[4] = 0; @@ -618,13 +618,13 @@ static void sub_80A8818(struct Sprite *sprite) } } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; + sprite->data[1] = gSprites[spriteId].x + gSprites[spriteId].x2; sprite->data[2] = sprite->data[1] + gBattleAnimArgs[1]; - sprite->data[3] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + sprite->data[3] = gSprites[spriteId].y + gSprites[spriteId].y2; sprite->data[4] = sprite->data[3] + gBattleAnimArgs[2]; InitSpriteDataForLinearTranslation(sprite); - sprite->data[3] = gSprites[spriteId].pos2.x << 8; - sprite->data[4] = gSprites[spriteId].pos2.y << 8; + sprite->data[3] = gSprites[spriteId].x2 << 8; + sprite->data[4] = gSprites[spriteId].y2 << 8; sprite->data[5] = spriteId; sprite->data[6] = gBattleAnimArgs[5]; if (!gBattleAnimArgs[5]) @@ -641,8 +641,8 @@ static void sub_80A8818(struct Sprite *sprite) static void sub_80A88F0(struct Sprite *sprite) { - gSprites[sprite->data[5]].pos2.x = 0; - gSprites[sprite->data[5]].pos2.y = 0; + gSprites[sprite->data[5]].x2 = 0; + gSprites[sprite->data[5]].y2 = 0; DestroyAnimSprite(sprite); } @@ -680,8 +680,8 @@ static void AnimTask_WindUpLungePart1(u8 taskId) u8 spriteId; spriteId = TASK.data[0]; TASK.data[11] += TASK.data[1]; - gSprites[spriteId].pos2.x = TASK.data[11] >> 8; - gSprites[spriteId].pos2.y = Sin((u8)(TASK.data[10] >> 8), TASK.data[2]); + gSprites[spriteId].x2 = TASK.data[11] >> 8; + gSprites[spriteId].y2 = Sin((u8)(TASK.data[10] >> 8), TASK.data[2]); TASK.data[10] += TASK.data[7]; if (--TASK.data[3] == 0) { @@ -700,7 +700,7 @@ static void AnimTask_WindUpLungePart2(u8 taskId) { spriteId = TASK.data[0]; TASK.data[12] += TASK.data[5]; - gSprites[spriteId].pos2.x = (TASK.data[12] >> 8) + (TASK.data[11] >> 8); + gSprites[spriteId].x2 = (TASK.data[12] >> 8) + (TASK.data[11] >> 8); if (--TASK.data[6] == 0) { DestroyAnimVisualTask(taskId); @@ -755,8 +755,8 @@ void sub_80A8A80(u8 taskId) static void sub_80A8B3C(u8 taskId) { u8 spriteId = TASK.data[0]; - gSprites[spriteId].pos2.x += TASK.data[1]; - if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x + 0x20 > 0x130u) + gSprites[spriteId].x2 += TASK.data[1]; + if (gSprites[spriteId].x2 + gSprites[spriteId].x + 0x20 > 0x130u) { DestroyAnimVisualTask(taskId); return; @@ -808,17 +808,17 @@ static void AnimTask_SwayMonStep(u8 taskId) if (TASK.data[0] == 0) { - gSprites[spriteId].pos2.x = sineValue; + gSprites[spriteId].x2 = sineValue; } else { if (GetBattlerSide(TASK.data[5]) == B_SIDE_PLAYER) { - gSprites[spriteId].pos2.y = (sineValue >= 0) ? sineValue : -sineValue; + gSprites[spriteId].y2 = (sineValue >= 0) ? sineValue : -sineValue; } else { - gSprites[spriteId].pos2.y = (sineValue >= 0) ? -sineValue : sineValue; + gSprites[spriteId].y2 = (sineValue >= 0) ? -sineValue : sineValue; } } @@ -829,8 +829,8 @@ static void AnimTask_SwayMonStep(u8 taskId) TASK.data[12] ^= 1; if (--TASK.data[3] == 0) { - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].x2 = 0; + gSprites[spriteId].y2 = 0; DestroyAnimVisualTask(taskId); return; } @@ -1024,8 +1024,8 @@ void sub_80A9058(u8 taskId) TASK.data[10] = gBattleAnimArgs[3]; TASK.data[11] = gBattleAnimArgs[4]; TASK.data[7] = GetAnimBattlerSpriteId(1); - TASK.data[8] = gSprites[TASK.data[7]].pos2.x; - TASK.data[9] = gSprites[TASK.data[7]].pos2.y; + TASK.data[8] = gSprites[TASK.data[7]].x2; + TASK.data[9] = gSprites[TASK.data[7]].y2; TASK.data[0] = 0; TASK.data[1] = gBattleAnimArgs[1]; TASK.data[2] = gBattleAnimArgs[2]; @@ -1043,28 +1043,28 @@ static void sub_80A913C(u8 taskId) { if (task->data[12]) { - gSprites[task->data[7]].pos2.x = task->data[8] + task->data[13]; + gSprites[task->data[7]].x2 = task->data[8] + task->data[13]; } else { - gSprites[task->data[7]].pos2.x = task->data[8] - task->data[14]; + gSprites[task->data[7]].x2 = task->data[8] - task->data[14]; } } if (task->data[11]) { if (task->data[12]) { - gSprites[task->data[7]].pos2.y = task->data[15]; + gSprites[task->data[7]].y2 = task->data[15]; } else { - gSprites[task->data[7]].pos2.y = 0; + gSprites[task->data[7]].y2 = 0; } } if (!--task->data[2]) { - gSprites[task->data[7]].pos2.x = 0; - gSprites[task->data[7]].pos2.y = 0; + gSprites[task->data[7]].x2 = 0; + gSprites[task->data[7]].y2 = 0; DestroyAnimVisualTask(taskId); return; } diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 50a5323e3..23401b694 100755 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -401,8 +401,8 @@ void unref_sub_813F0F4(u8 taskId) LZDecompressVram(&gUnknown_08D2EDFC, subStruct.field_0); LoadCompressedPalette(gUnknown_08D2E150, subStruct.field_8 << 4, 32); - gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32; - gBattle_BG1_Y = -gSprites[spriteId3].pos1.y - 32; + gBattle_BG1_X = -gSprites[spriteId3].x + 32; + gBattle_BG1_Y = -gSprites[spriteId3].y - 32; gTasks[taskId].data[1] = 640; gTasks[taskId].data[0] = spriteId3; gTasks[taskId].data[2] = spriteId4; @@ -756,9 +756,9 @@ static void sub_813FD90(struct Sprite *sprite) { u16 temp = sprite->data[1]; u16 temp2 = sprite->data[2]; - sprite->data[1] = sprite->pos1.x; + sprite->data[1] = sprite->x; sprite->data[2] = temp; - sprite->data[3] = sprite->pos1.y; + sprite->data[3] = sprite->y; sprite->data[4] = temp2; sprite->data[5] = -40; InitAnimArcTranslation(sprite); @@ -780,10 +780,10 @@ static void sub_813FDC0(struct Sprite *sprite) else { StartSpriteAnim(sprite, 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; for (i = 0; i < 8; i++) { @@ -799,7 +799,7 @@ static void sub_813FDC0(struct Sprite *sprite) if (ballIndex2 < 0) return; - AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); + AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballIndex); sub_8141314(0, gBattleAnimTarget, 14, ballIndex); } } @@ -832,7 +832,7 @@ static void sub_813FEC8(struct Sprite *sprite) PrepareBattlerSpriteForRotScale(spriteId, 0); gTasks[taskId].data[10] = 256; gUnknown_03005F0C = 28; - gUnknown_03005F14 = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y); + gUnknown_03005F14 = (gSprites[spriteId].y + gSprites[spriteId].y2) - (sprite->y + sprite->y2); gUnknown_03005F10 = (u32)(gUnknown_03005F14 * 256) / 28; gTasks[taskId].data[2] = gUnknown_03005F10; gTasks[taskId].data[0]++; @@ -841,7 +841,7 @@ static void sub_813FEC8(struct Sprite *sprite) gTasks[taskId].data[10] += 0x20; obj_id_set_rotscale(spriteId, gTasks[taskId].data[10], gTasks[taskId].data[10], 0); gTasks[taskId].data[3] += gTasks[taskId].data[2]; - gSprites[spriteId].pos2.y = -gTasks[taskId].data[3] >> 8; + gSprites[spriteId].y2 = -gTasks[taskId].data[3] >> 8; if (gTasks[taskId].data[10] >= 0x480) gTasks[taskId].data[0]++; break; @@ -872,8 +872,8 @@ static void sub_8140014(struct Sprite *sprite) sprite->data[4] = 32; sprite->data[5] = 0; angle = 0; - sprite->pos1.y += Cos(angle, 32); - sprite->pos2.y = -Cos(angle, sprite->data[4]); + sprite->y += Cos(angle, 32); + sprite->y2 = -Cos(angle, sprite->data[4]); sprite->callback = sub_8140058; } } @@ -888,7 +888,7 @@ static void sub_8140058(struct Sprite *sprite) switch (sprite->data[3] & 0xFF) { case 0: - sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->y2 = -Cos(sprite->data[5], sprite->data[4]); sprite->data[5] += (sprite->data[3] >> 8) + 4; if (sprite->data[5] >= 64) { @@ -918,7 +918,7 @@ static void sub_8140058(struct Sprite *sprite) } break; case 1: - sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->y2 = -Cos(sprite->data[5], sprite->data[4]); sprite->data[5] -= (sprite->data[3] >> 8) + 4; if (sprite->data[5] <= 0) { @@ -931,8 +931,8 @@ static void sub_8140058(struct Sprite *sprite) if (lastBounce) { sprite->data[3] = 0; - sprite->pos1.y += Cos(64, 32); - sprite->pos2.y = 0; + sprite->y += Cos(64, 32); + sprite->y2 = 0; if (ewram17840.unk8 == 0) { sprite->data[5] = 0; @@ -970,7 +970,7 @@ static void sub_81401A0(struct Sprite *sprite) case 0: if ((s16)ewram17840.unkC > 0xFF) { - sprite->pos2.x += sprite->data[4]; + sprite->x2 += sprite->data[4]; ewram17840.unkC &= 0xFF; } else @@ -1008,7 +1008,7 @@ static void sub_81401A0(struct Sprite *sprite) case 2: if ((s16)ewram17840.unkC > 0xFF) { - sprite->pos2.x += sprite->data[4]; + sprite->x2 += sprite->data[4]; ewram17840.unkC &= 0xFF; } else @@ -1045,7 +1045,7 @@ static void sub_81401A0(struct Sprite *sprite) case 4: if ((s16)ewram17840.unkC > 0xFF) { - sprite->pos2.x += sprite->data[4]; + sprite->x2 += sprite->data[4]; ewram17840.unkC &= 0xFF; } else @@ -1219,7 +1219,7 @@ static void sub_81405F4(struct Sprite *sprite) if (ballIndex2 < 0) goto LABEL; - AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); + AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballIndex); sub_8141314(1, gBattleAnimTarget, 14, ballIndex); LABEL: @@ -1244,12 +1244,12 @@ static void sub_81406BC(struct Sprite *sprite) else { gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] -= 288; - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].y2 = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].data[1] >> 8; } if (sprite->animEnded && next) { - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = 0; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].y2 = 0; gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = ewram17840.unk9_1; sprite->data[0] = 0; sprite->callback = sub_81405C8; @@ -1262,10 +1262,10 @@ static void sub_81407B8(struct Sprite *sprite) { int i; - 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 < 6; i++) sprite->data[i] = 0; @@ -1276,13 +1276,13 @@ static void sub_81407F4(struct Sprite *sprite) { s16 var0 = sprite->data[0] + 0x800; s16 var1 = sprite->data[1] + 0x680; - sprite->pos2.x -= var1 >> 8; - sprite->pos2.y += var0 >> 8; + sprite->x2 -= var1 >> 8; + sprite->y2 += var0 >> 8; sprite->data[0] = (sprite->data[0] + 0x800) & 0xFF; sprite->data[1] = (sprite->data[1] + 0x680) & 0xFF; - if (sprite->pos1.y + sprite->pos2.y > 160 - || sprite->pos1.x + sprite->pos2.x < -8) + if (sprite->y + sprite->y2 > 160 + || sprite->x + sprite->x2 < -8) { sprite->data[0] = 0; sprite->callback = sub_81405C8; @@ -1361,8 +1361,8 @@ static void PokeBallOpenParticleAnimation_Step1(struct Sprite *sprite) static void PokeBallOpenParticleAnimation_Step2(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); - sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]); + sprite->x2 = Sin(sprite->data[0], sprite->data[1]); + sprite->y2 = Cos(sprite->data[0], sprite->data[1]); sprite->data[1] += 2; if (sprite->data[1] == 50) DestroyBallOpenAnimationParticle(sprite); @@ -1521,8 +1521,8 @@ void GreatBallOpenParticleAnimation(u8 taskId) static void FanOutBallOpenParticles_Step1(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); - sprite->pos2.y = Cos(sprite->data[0], sprite->data[2]); + sprite->x2 = Sin(sprite->data[0], sprite->data[1]); + sprite->y2 = Cos(sprite->data[0], sprite->data[2]); sprite->data[0] = (sprite->data[0] + sprite->data[4]) & 0xFF; sprite->data[1] += sprite->data[5]; sprite->data[2] += sprite->data[6]; @@ -1557,8 +1557,8 @@ void RepeatBallOpenParticleAnimation(u8 taskId) static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); - sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0], sprite->data[2])); + sprite->x2 = Sin(sprite->data[0], sprite->data[1]); + sprite->y2 = Cos(sprite->data[0], Sin(sprite->data[0], sprite->data[2])); sprite->data[0] = (sprite->data[0] + 6) & 0xFF; sprite->data[1]++; sprite->data[2]++; @@ -1633,8 +1633,8 @@ void PremierBallOpenParticleAnimation(u8 taskId) static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); - sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0] & 0x3F, sprite->data[2])); + sprite->x2 = Sin(sprite->data[0], sprite->data[1]); + sprite->y2 = Cos(sprite->data[0], Sin(sprite->data[0] & 0x3F, sprite->data[2])); sprite->data[0] = (sprite->data[0] + 10) & 0xFF; sprite->data[1]++; sprite->data[2]++; @@ -1759,12 +1759,12 @@ void sub_814151C(u8 taskId) gTasks[taskId].data[11] = gBattleAnimArgs[0]; gTasks[taskId].data[0] += 0x500; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) - gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8; + gSprites[spriteId].x2 += gTasks[taskId].data[0] >> 8; else - gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8; + gSprites[spriteId].x2 -= gTasks[taskId].data[0] >> 8; gTasks[taskId].data[0] &= 0xFF; - x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x + 32; + x = gSprites[spriteId].x + gSprites[spriteId].x2 + 32; if (x > 304) gTasks[taskId].data[10]++; break; @@ -1775,25 +1775,25 @@ void sub_814151C(u8 taskId) case 2: gTasks[taskId].data[0] += 0x500; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) - gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8; + gSprites[spriteId].x2 -= gTasks[taskId].data[0] >> 8; else - gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8; + gSprites[spriteId].x2 += gTasks[taskId].data[0] >> 8; gTasks[taskId].data[0] &= 0xFF; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { - if (gSprites[spriteId].pos2.x <= 0) + if (gSprites[spriteId].x2 <= 0) { - gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].x2 = 0; // done = FALSE; // fakematching--can't get the tail merge correct goto DONE; } } else { - if (gSprites[spriteId].pos2.x >= 0) + if (gSprites[spriteId].x2 >= 0) { - gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].x2 = 0; done = TRUE; } } @@ -1940,8 +1940,8 @@ static void sub_814191C(u8 taskId) else { gSprites[spriteId].callback = sub_8141B74; - gSprites[spriteId].pos2.x = -32; - gSprites[spriteId].pos2.y = 32; + gSprites[spriteId].x2 = -32; + gSprites[spriteId].y2 = 32; gSprites[spriteId].invisible = TRUE; if (gTasks[taskId].data[11] == 0) { @@ -1979,8 +1979,8 @@ static void sub_8141AD8(u8 taskId) static void sub_8141B20(struct Sprite *sprite) { - sprite->pos2.x = Sin(sprite->data[1], 24); - sprite->pos2.y = Cos(sprite->data[1], 24); + sprite->x2 = Sin(sprite->data[1], 24); + sprite->y2 = Cos(sprite->data[1], 24); sprite->data[1] += 12; if (sprite->data[1] > 0xFF) { @@ -1999,9 +1999,9 @@ static void sub_8141B74(struct Sprite *sprite) else { sprite->invisible = FALSE; - sprite->pos2.x += 5; - sprite->pos2.y -= 5; - if (sprite->pos2.x > 32) + sprite->x2 += 5; + sprite->y2 -= 5; + if (sprite->x2 > 32) { gTasks[sprite->data[0]].data[12]--; FreeSpriteOamMatrix(sprite); diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index c51c0f8d3..9f90365cf 100644 --- a/src/battle_anim_status_effects.c +++ b/src/battle_anim_status_effects.c @@ -85,7 +85,7 @@ u8 unref_sub_807B69C(u8 a, u8 b) gTasks[taskId].data[1] = 0x1F; for (i = 0; i < 10; i++) { - spriteId2 = CreateSprite(&gSpriteTemplate_83931F8, gSprites[spriteId1].pos1.x, gSprites[spriteId1].pos1.y + 32, 0); + spriteId2 = CreateSprite(&gSpriteTemplate_83931F8, gSprites[spriteId1].x, gSprites[spriteId1].y + 32, 0); gSprites[spriteId2].data[0] = i * 51; gSprites[spriteId2].data[1] = -256; gSprites[spriteId2].invisible = TRUE; @@ -98,7 +98,7 @@ u8 unref_sub_807B69C(u8 a, u8 b) gTasks[taskId].data[1] = 0x7C00; for (i = 0; i < 10; i++) { - spriteId2 = CreateSprite(&gSpriteTemplate_83931F8, gSprites[spriteId1].pos1.x, gSprites[spriteId1].pos1.y - 32, 0); + spriteId2 = CreateSprite(&gSpriteTemplate_83931F8, gSprites[spriteId1].x, gSprites[spriteId1].y - 32, 0); gSprites[spriteId2].data[0] = i * 51; gSprites[spriteId2].data[1] = 256; gSprites[spriteId2].invisible = TRUE; @@ -159,15 +159,15 @@ static void sub_807B870(struct Sprite *sprite) static void sub_807B8A4(struct Sprite *sprite) { - sprite->pos2.x = Cos(sprite->data[0], 32); - sprite->pos2.y = Sin(sprite->data[0], 8); + sprite->x2 = Cos(sprite->data[0], 32); + sprite->y2 = Sin(sprite->data[0], 8); if (sprite->data[0] < 128) sprite->subpriority = 29; else sprite->subpriority = 31; sprite->data[0] = (sprite->data[0] + 8) & 0xFF; sprite->data[5] += sprite->data[1]; - sprite->pos2.y += sprite->data[5] >> 8; + sprite->y2 += sprite->data[5] >> 8; sprite->data[2]++; if (sprite->data[2] == 52) { diff --git a/src/battle_bg.c b/src/battle_bg.c index f9b1e192c..97c463fa9 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -625,8 +625,8 @@ void InitLinkBattleVsScreen(u8 taskId) gSprites[gBattleStruct->unk1608B].oam.tileNum += 0x40; gSprites[gBattleStruct->unk1608A].data[0] = 0; gSprites[gBattleStruct->unk1608B].data[0] = 1; - gSprites[gBattleStruct->unk1608A].data[1] = gSprites[gBattleStruct->unk1608A].pos1.x; - gSprites[gBattleStruct->unk1608B].data[1] = gSprites[gBattleStruct->unk1608B].pos1.x; + gSprites[gBattleStruct->unk1608A].data[1] = gSprites[gBattleStruct->unk1608A].x; + gSprites[gBattleStruct->unk1608B].data[1] = gSprites[gBattleStruct->unk1608B].x; gSprites[gBattleStruct->unk1608A].data[2] = 0; gSprites[gBattleStruct->unk1608B].data[2] = 0; } diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 6826ac60d..4c86dbb92 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -374,7 +374,7 @@ void sub_8037840(void) void sub_8037A74(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded == TRUE - && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0) + && gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0) { if (!ewram17810[gActiveBattler].unk0_7) { @@ -1152,7 +1152,7 @@ void LinkOpponentHandleLoadPokeSprite(void) GetBattlerSpriteCoord(gActiveBattler, 2), sub_8077F68(gActiveBattler), GetBattlerSubpriority(gActiveBattler)); - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]); @@ -1253,7 +1253,7 @@ void LinkOpponentHandleTrainerThrow(void) &gCreatingSpriteTemplate, 176 + xOffset, 40 + 4 * (8 - gTrainerFrontPicCoords[gender].coords), GetBattlerSubpriority(gActiveBattler)); - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2; gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gSprites[gBattlerSpriteIds[gActiveBattler]].oam.tileNum; @@ -1273,7 +1273,7 @@ void LinkOpponentHandleTrainerSlideBack(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy); gBattlerControllerFuncs[gActiveBattler] = sub_80375B4; @@ -1625,7 +1625,7 @@ void LinkOpponentHandleTrainerBallThrow(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_803A3A8); taskId = CreateTask(sub_803A2C4, 5); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index ec6616962..21aead586 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -322,7 +322,7 @@ void sub_811DCA0(void) void sub_811DDE8(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded - && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0) + && gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0) LinkPartnerBufferExecCompleted(); } @@ -345,7 +345,7 @@ void bx_t3_healthbar_update(void) void sub_811DE98(void) { - if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > 160) + if (gSprites[gBattlerSpriteIds[gActiveBattler]].y + gSprites[gBattlerSpriteIds[gActiveBattler]].y2 > 160) { nullsub_9(GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES)); FreeOamMatrix(gSprites[gBattlerSpriteIds[gActiveBattler]].oam.matrixNum); @@ -1092,7 +1092,7 @@ void LinkPartnerHandleLoadPokeSprite(void) GetBattlerSpriteCoord(gActiveBattler, 2), sub_8077F68(gActiveBattler), GetBattlerSubpriority(gActiveBattler)); - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]); @@ -1193,7 +1193,7 @@ void LinkPartnerHandleTrainerThrow(void) 80 + xOffset, 80 + 4 * (8 - gTrainerBackPicCoords[gender].coords), GetBattlerSubpriority(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80313A0; gBattlerControllerFuncs[gActiveBattler] = sub_811DAE4; @@ -1209,7 +1209,7 @@ void LinkPartnerHandleTrainerSlideBack(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy); gBattlerControllerFuncs[gActiveBattler] = sub_811DB1C; @@ -1562,7 +1562,7 @@ void LinkPartnerHandleTrainerBallThrow(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_8030E38); diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 6154655ad..ae2082ec0 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -379,7 +379,7 @@ void sub_8032E2C(void) void sub_8033018(void) { if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded == TRUE - && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0) + && gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0) { if (!ewram17810[gActiveBattler].unk0_7) { @@ -1123,7 +1123,7 @@ void OpponentHandleLoadPokeSprite(void) GetBattlerSpriteCoord(gActiveBattler, 2), sub_8077F68(gActiveBattler), GetBattlerSubpriority(gActiveBattler)); - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = species; gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; @@ -1231,7 +1231,7 @@ void OpponentHandleTrainerThrow(void) 0xB0, 40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords), GetBattlerSubpriority(gActiveBattler)); - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2; gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gSprites[gBattlerSpriteIds[gActiveBattler]].oam.tileNum; @@ -1261,8 +1261,8 @@ void OpponentHandleTrainerSlide(void) 0xB0, 40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords), 0x1E); - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96; - gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = 96; + gSprites[gBattlerSpriteIds[gActiveBattler]].x += 32; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag); gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gSprites[gBattlerSpriteIds[gActiveBattler]].oam.tileNum; @@ -1277,7 +1277,7 @@ void OpponentHandleTrainerSlideBack(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy); gBattlerControllerFuncs[gActiveBattler] = sub_8032BBC; @@ -2031,7 +2031,7 @@ void OpponentHandleTrainerBallThrow(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_8035C10); taskId = CreateTask(sub_8035C44, 5); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 92a5172d0..f2f5cf38f 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -358,7 +358,7 @@ void PlayerBufferRunCommand(void) void bx_0802E404(void) { - if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0) + if (gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0) PlayerBufferExecCompleted(); } @@ -1481,7 +1481,7 @@ void sub_802DDC4(u8 taskId) void sub_802DE10(void) { - if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT) + if (gSprites[gBattlerSpriteIds[gActiveBattler]].y + gSprites[gBattlerSpriteIds[gActiveBattler]].y2 > DISPLAY_HEIGHT) { u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); @@ -2423,7 +2423,7 @@ void PlayerHandleTrainerThrow(void) (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80, GetBattlerSubpriority(gActiveBattler)); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80313A0; gBattlerControllerFuncs[gActiveBattler] = sub_802D204; @@ -2439,7 +2439,7 @@ void PlayerHandleTrainerSlide(void) (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80, 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -96; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80313A0; gBattlerControllerFuncs[gActiveBattler] = sub_802D23C; @@ -2450,7 +2450,7 @@ void PlayerHandleTrainerSlideBack(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy); StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); @@ -2907,7 +2907,7 @@ void PlayerHandleTrainerBallThrow(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_8030E38); diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 92dcffa5b..45b4f2845 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -401,7 +401,7 @@ void SafariHandleTrainerThrow(void) (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80, 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80313A0; gBattlerControllerFuncs[gActiveBattler] = sub_812B65C; diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 417706adf..be72d673e 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -1102,7 +1102,7 @@ void WallyHandleTrainerThrow(void) 80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords), 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 240; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = 240; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = -2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80313A0; gBattlerControllerFuncs[gActiveBattler] = sub_813741C; @@ -1117,7 +1117,7 @@ void WallyHandleTrainerSlide(void) 80, 80 + 4 * (8 - gTrainerBackPicCoords[2].coords), 30); gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler; - gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96; + gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -96; gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 2; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80313A0; gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2; @@ -1477,7 +1477,7 @@ void WallyHandleTrainerBallThrow(void) oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]); gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40; - gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y; + gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData(&gSprites[gBattlerSpriteIds[gActiveBattler]], sub_8030E38); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index cf31e7a08..f22863541 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -144,8 +144,8 @@ void sub_80313A0(struct Sprite *sprite) { if (!(gIntroSlideFlags & 1)) { - sprite->pos2.x += sprite->data[0]; - if (sprite->pos2.x == 0) + sprite->x2 += sprite->data[0]; + if (sprite->x2 == 0) sprite->callback = SpriteCallbackDummy; } } @@ -647,7 +647,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } - gSprites[gBattlerSpriteIds[a]].pos1.y = sub_8077F68(a); + gSprites[gBattlerSpriteIds[a]].y = sub_8077F68(a); } else { @@ -719,7 +719,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) gBattleSpriteInfo[a].transformedSpecies = species; gBattleMonForms[a] = gBattleMonForms[b]; } - gSprites[gBattlerSpriteIds[a]].pos1.y = sub_8077F68(a); + gSprites[gBattlerSpriteIds[a]].y = sub_8077F68(a); StartSpriteAnim(&gSprites[gBattlerSpriteIds[a]], gBattleMonForms[a]); } } @@ -769,9 +769,9 @@ void refresh_graphics_maybe(u8 a, u8 b, u8 spriteId) BattleLoadSubstituteSprite(a, b); StartSpriteAnim(&gSprites[spriteId], gBattleMonForms[a]); if (b == 0) - gSprites[spriteId].pos1.y = sub_8077F7C(a); + gSprites[spriteId].y = sub_8077F7C(a); else - gSprites[spriteId].pos1.y = sub_8077F68(a); + gSprites[spriteId].y = sub_8077F68(a); } void sub_80324BC(u8 a, u16 b) @@ -907,8 +907,8 @@ void sub_80328A4(struct Sprite *sprite) invisible = TRUE; if (gBattleSpriteInfo[r4].substituteSprite) invisible = TRUE; - sprite->pos1.x = r7->pos1.x; - sprite->pos2.x = r7->pos2.x; + sprite->x = r7->x; + sprite->x2 = r7->x2; sprite->invisible = invisible; } diff --git a/src/battle_interface.c b/src/battle_interface.c index d240a85f0..3d17bedd8 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -642,31 +642,31 @@ static void sub_8043CEC(struct Sprite *sprite) switch (sprite->data[6]) { case 0: - sprite->pos1.x = gSprites[r5].pos1.x + 16; - sprite->pos1.y = gSprites[r5].pos1.y; + sprite->x = gSprites[r5].x + 16; + sprite->y = gSprites[r5].y; break; case 1: - sprite->pos1.x = gSprites[r5].pos1.x + 16; - sprite->pos1.y = gSprites[r5].pos1.y; + sprite->x = gSprites[r5].x + 16; + sprite->y = gSprites[r5].y; break; default: case 2: - sprite->pos1.x = gSprites[r5].pos1.x + 8; - sprite->pos1.y = gSprites[r5].pos1.y; + sprite->x = gSprites[r5].x + 8; + sprite->y = gSprites[r5].y; break; } - sprite->pos2.x = gSprites[r5].pos2.x; - sprite->pos2.y = gSprites[r5].pos2.y; + sprite->x2 = gSprites[r5].x2; + sprite->y2 = gSprites[r5].y2; } static void sub_8043D5C(struct Sprite *sprite) { u8 data5 = sprite->data[5]; - sprite->pos1.x = gSprites[data5].pos1.x + 64; - sprite->pos1.y = gSprites[data5].pos1.y; - sprite->pos2.x = gSprites[data5].pos2.x; - sprite->pos2.y = gSprites[data5].pos2.y; + sprite->x = gSprites[data5].x + 64; + sprite->y = gSprites[data5].y; + sprite->x2 = gSprites[data5].x2; + sprite->y2 = gSprites[data5].y2; } void sub_8043D84(u8 a, u8 b, u32 c, u32 d, u32 e) @@ -694,8 +694,8 @@ void sub_8043DFC(u8 a) static void sub_8043E50(u8 spriteId, s16 x, s16 y) { - gSprites[spriteId].pos1.x = x; - gSprites[spriteId].pos1.y = y; + gSprites[spriteId].x = x; + gSprites[spriteId].y = y; } void unref_sub_8043E70(u8 a) @@ -1544,16 +1544,16 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) sp18 = CreateSprite(&gSpriteTemplate_820A7A4[r7], x, y, 10); SetSubspriteTables(&gSprites[sp18], gSubspriteTables_820A6E4); - gSprites[sp18].pos2.x = r8; + gSprites[sp18].x2 = r8; gSprites[sp18].data[0] = r5; if (r7 != 0) { - gSprites[sp18].pos1.x -= 96; + gSprites[sp18].x -= 96; gSprites[sp18].oam.matrixNum = 8; } else { - gSprites[sp18].pos1.x += 0x60; + gSprites[sp18].x += 0x60; } //_0804495A for (i = 0; i < 6; i++) //_08044970 @@ -1566,23 +1566,23 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) //_080449A0 if (r7 == 0) { - gSprites[sp[i]].pos2.x = 0; - gSprites[sp[i]].pos2.y = 0; + gSprites[sp[i]].x2 = 0; + gSprites[sp[i]].y2 = 0; } //_080449BE gSprites[sp[i]].data[0] = sp18; if (r7 == 0) { - gSprites[sp[i]].pos1.x += 10 * i + 24; + gSprites[sp[i]].x += 10 * i + 24; gSprites[sp[i]].data[1] = i * 7 + 10; - gSprites[sp[i]].pos2.x = 120; + gSprites[sp[i]].x2 = 120; } //_08044A18 else { - gSprites[sp[i]].pos1.x -= 10 * (5 - i) + 24; + gSprites[sp[i]].x -= 10 * (5 - i) + 24; gSprites[sp[i]].data[1] = (6 - i) * 7 + 10; - gSprites[sp[i]].pos2.x = -120; + gSprites[sp[i]].x2 = -120; } //_08044A56 gSprites[sp[i]].data[2] = r7; @@ -2403,17 +2403,17 @@ static void sub_8044F70(u8 taskId) static void sub_8045030(struct Sprite *sprite) { - if (sprite->pos2.x != 0) - sprite->pos2.x += sprite->data[0]; + if (sprite->x2 != 0) + sprite->x2 += sprite->data[0]; } static void sub_8045048(struct Sprite *sprite) { sprite->data[1] += 32; if (sprite->data[0] > 0) - sprite->pos2.x += sprite->data[1] >> 4; + sprite->x2 += sprite->data[1] >> 4; else - sprite->pos2.x -= sprite->data[1] >> 4; + sprite->x2 -= sprite->data[1] >> 4; sprite->data[1] &= 0xF; } @@ -2434,17 +2434,17 @@ static void sub_804507C(struct Sprite *sprite) sprite->data[3] = r2 & 0xFFF0; if (r3 != 0) { - sprite->pos2.x += r2 >> 4; - if (sprite->pos2.x > 0) - sprite->pos2.x = 0; + sprite->x2 += r2 >> 4; + if (sprite->x2 > 0) + sprite->x2 = 0; } else { - sprite->pos2.x -= r2 >> 4; - if (sprite->pos2.x < 0) - sprite->pos2.x = 0; + sprite->x2 -= r2 >> 4; + if (sprite->x2 < 0) + sprite->x2 = 0; } - if (sprite->pos2.x == 0) + if (sprite->x2 == 0) { pan = 63; if (r3 != 0) @@ -2472,11 +2472,11 @@ static void sub_8045110(struct Sprite *sprite) r2 += 56; sprite->data[3] = r2 & 0xFFF0; if (r0 != 0) - sprite->pos2.x += r2 >> 4; + sprite->x2 += r2 >> 4; else - sprite->pos2.x -= r2 >> 4; - if (sprite->pos2.x + sprite->pos1.x > 248 - || sprite->pos2.x + sprite->pos1.x < -8) + sprite->x2 -= r2 >> 4; + if (sprite->x2 + sprite->x > 248 + || sprite->x2 + sprite->x < -8) { sprite->invisible = TRUE; sprite->callback = SpriteCallbackDummy; @@ -2487,8 +2487,8 @@ void sub_8045180(struct Sprite *sprite) { u8 spriteId = sprite->data[0]; - sprite->pos2.x = gSprites[spriteId].pos2.x; - sprite->pos2.y = gSprites[spriteId].pos2.y; + sprite->x2 = gSprites[spriteId].x2; + sprite->y2 = gSprites[spriteId].y2; } /*static*/ void sub_80451A0(u8 a, struct Pokemon *pkmn) diff --git a/src/battle_main.c b/src/battle_main.c index e1ed2fbbe..6920b19bf 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1172,9 +1172,9 @@ void nullsub_36(struct Sprite *sprite) void sub_800FDB0(struct Sprite *sprite) { if (sprite->data[0] != 0) - sprite->pos1.x = sprite->data[1] + ((sprite->data[2] & 0xFF00) >> 8); + sprite->x = sprite->data[1] + ((sprite->data[2] & 0xFF00) >> 8); else - sprite->pos1.x = sprite->data[1] - ((sprite->data[2] & 0xFF00) >> 8); + sprite->x = sprite->data[1] - ((sprite->data[2] & 0xFF00) >> 8); sprite->data[2] += 0x180; if (sprite->affineAnimEnded) { @@ -2673,7 +2673,7 @@ void debug_sub_8012938(u8 taskId) ConvertIntToDecimalStringN(gBattleTextBuff1 + 4, gUnknown_Debug_2023B62[gCurrentMove - 1], 2, 3); Text_InitWindow(&gWindowTemplate_Contest_MoveDescription, gBattleTextBuff1, 162, 2, 37); Text_PrintWindow8002F44(&gWindowTemplate_Contest_MoveDescription); - gSprites[gTasks[taskId].data[1]].pos2.y = -gUnknown_Debug_2023B62[gCurrentMove - 1]; + gSprites[gTasks[taskId].data[1]].y2 = -gUnknown_Debug_2023B62[gCurrentMove - 1]; } void debug_sub_80129F8(u8 taskId) @@ -2686,8 +2686,8 @@ void debug_sub_80129F8(u8 taskId) gMonSpriteGfx_Sprite_ptr[1], gCurrentMove); LoadCompressedPalette(gMonPaletteTable[gCurrentMove].data, 272, 32); - gSprites[gTasks[taskId].data[1]].pos1.y = gMonFrontPicCoords[gCurrentMove].y_offset + 40; - gSprites[gTasks[taskId].data[1]].pos2.y = -gUnknown_Debug_2023B62[gCurrentMove - 1]; + gSprites[gTasks[taskId].data[1]].y = gMonFrontPicCoords[gCurrentMove].y_offset + 40; + gSprites[gTasks[taskId].data[1]].y2 = -gUnknown_Debug_2023B62[gCurrentMove - 1]; StartSpriteAnim(&gSprites[gTasks[taskId].data[1]], 0); } @@ -3067,8 +3067,8 @@ void sub_8010278(struct Sprite *sprite) { if ((gIntroSlideFlags & 1) == 0) { - sprite->pos2.x += 2; - if (sprite->pos2.x == 0) + sprite->x2 += 2; + if (sprite->x2 == 0) { sprite->callback = sub_80102AC; PlayCry1(sprite->data[2], 25); @@ -3169,7 +3169,7 @@ void sub_8010494(struct Sprite *sprite) if (sprite->data[4] == 0) { sprite->data[4] = 2; - sprite->pos2.y += 8; + sprite->y2 += 8; sprite->data[3]--; if (sprite->data[3] < 0) { @@ -3220,8 +3220,8 @@ void oac_poke_ally_(struct Sprite *sprite) { if ((gIntroSlideFlags & 1) == 0) { - sprite->pos2.x -= 2; - if (sprite->pos2.x == 0) + sprite->x2 -= 2; + if (sprite->x2 == 0) { sprite->callback = nullsub_86; sprite->data[1] = 0; @@ -3242,8 +3242,8 @@ void sub_80105EC(struct Sprite *sprite) { if ((gIntroSlideFlags & 1) == 0) { - sprite->pos2.x += sprite->data[1]; - sprite->pos2.y += sprite->data[2]; + sprite->x2 += sprite->data[1]; + sprite->y2 += sprite->data[2]; } } @@ -3282,8 +3282,8 @@ void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d) gSprites[spriteId].data[2] = d; gSprites[spriteId].data[3] = objectID; gSprites[spriteId].data[4] = b; - gSprites[objectID].pos2.x = 0; - gSprites[objectID].pos2.y = 0; + gSprites[objectID].x2 = 0; + gSprites[objectID].y2 = 0; } void dp11b_obj_free(u8 a, u8 b) @@ -3306,8 +3306,8 @@ void dp11b_obj_free(u8 a, u8 b) DestroySprite(&gSprites[ewram17810[a].unk3]); ewram17810[a].unk0_2 = 0; } - gSprites[r4].pos2.x = 0; - gSprites[r4].pos2.y = 0; + gSprites[r4].x2 = 0; + gSprites[r4].y2 = 0; } void objc_dp11b_pingpong(struct Sprite *sprite) @@ -3320,7 +3320,7 @@ void objc_dp11b_pingpong(struct Sprite *sprite) else var = sprite->data[0]; - gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2]; + gSprites[spriteId].y2 = Sin(var, sprite->data[2]) + sprite->data[2]; sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; } diff --git a/src/battle_transition.c b/src/battle_transition.c index b7aac2c65..06979a03a 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1041,10 +1041,10 @@ static void sub_811B720(struct Sprite* sprite) sprite->data[1]--; else { - if (sprite->pos1.x >= 0 && sprite->pos1.x <= 240) + if (sprite->x >= 0 && sprite->x <= 240) { - s16 posX = sprite->pos1.x >> 3; - s16 posY = sprite->pos1.y >> 3; + s16 posX = sprite->x >> 3; + s16 posY = sprite->y >> 3; if (posX != sprite->data[2]) { @@ -1061,8 +1061,8 @@ static void sub_811B720(struct Sprite* sprite) SOME_VRAM_STORE(ptr, posY + 1, posX, 0xF001); } } - sprite->pos1.x += arr0[sprite->data[0]]; - if (sprite->pos1.x < -15 || sprite->pos1.x > 255) + sprite->x += arr0[sprite->data[0]]; + if (sprite->x < -15 || sprite->x > 255) FieldEffectStop(sprite, FLDEFF_POKEBALL); } } @@ -1786,10 +1786,10 @@ static bool8 sub_811C938(struct Sprite* sprite) static bool8 sub_811C984(struct Sprite* sprite) { - sprite->pos1.x += sprite->data[1]; - if (sprite->data[7] && sprite->pos1.x < 133) + sprite->x += sprite->data[1]; + if (sprite->data[7] && sprite->x < 133) sprite->data[0]++; - else if (!sprite->data[7] && sprite->pos1.x > 103) + else if (!sprite->data[7] && sprite->x > 103) sprite->data[0]++; return FALSE; } @@ -1797,7 +1797,7 @@ static bool8 sub_811C984(struct Sprite* sprite) static bool8 sub_811C9B8(struct Sprite* sprite) { sprite->data[1] += sprite->data[2]; - sprite->pos1.x += sprite->data[1]; + sprite->x += sprite->data[1]; if (sprite->data[1] == 0) { sprite->data[0]++; @@ -1810,8 +1810,8 @@ static bool8 sub_811C9B8(struct Sprite* sprite) static bool8 sub_811C9E4(struct Sprite* sprite) { sprite->data[1] += sprite->data[2]; - sprite->pos1.x += sprite->data[1]; - if (sprite->pos1.x < -31 || sprite->pos1.x > 271) + sprite->x += sprite->data[1]; + if (sprite->x < -31 || sprite->x > 271) sprite->data[0]++; return FALSE; } @@ -1978,8 +1978,8 @@ static bool8 Phase2_Transition_WhiteFade_Func2(struct Task* task) for (i = 0, posY = 0; i < 8; i++, posY += 0x14) { sprite = &gSprites[CreateInvisibleSprite(sub_811CFD0)]; - sprite->pos1.x = 0xF0; - sprite->pos1.y = posY; + sprite->x = 0xF0; + sprite->y = posY; sprite->data[5] = arr1[i]; } sprite->data[6]++; @@ -2068,21 +2068,21 @@ static void sub_811CFD0(struct Sprite* sprite) else { u16 i; - u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->pos1.y]; - u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->pos1.y + 160]; + u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->y]; + u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->y + 160]; for (i = 0; i < 20; i++) { ptr1[i] = sprite->data[0] >> 8; - ptr2[i] = (u8)(sprite->pos1.x); + ptr2[i] = (u8)(sprite->x); } - if (sprite->pos1.x == 0 && sprite->data[0] == 0x1000) + if (sprite->x == 0 && sprite->data[0] == 0x1000) sprite->data[1] = 1; - sprite->pos1.x -= 16; + sprite->x -= 16; sprite->data[0] += 0x80; - if (sprite->pos1.x < 0) - sprite->pos1.x = 0; + if (sprite->x < 0) + sprite->x = 0; if (sprite->data[0] > 0x1000) sprite->data[0] = 0x1000; diff --git a/src/berry_blender.c b/src/berry_blender.c index b8897f964..504e094de 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -972,8 +972,8 @@ void sub_804E738(struct Sprite* sprite) else PlaySE(SE_BALL_TRAY_EXIT); } - sprite->pos1.x = sprite->data[1]; - sprite->pos1.y = sprite->data[2]; + sprite->x = sprite->data[1]; + sprite->y = sprite->data[2]; } void sub_804E794(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6) @@ -2666,8 +2666,8 @@ void sub_8051524(struct Sprite* sprite) { sprite->data[2] += sprite->data[0]; sprite->data[3] += sprite->data[1]; - sprite->pos2.x = sprite->data[2] / 8; - sprite->pos2.y = sprite->data[3] / 8; + sprite->x2 = sprite->data[2] / 8; + sprite->y2 = sprite->data[3] / 8; if (sprite->animEnded) DestroySprite(sprite); } @@ -2699,7 +2699,7 @@ static void sub_805156C(void) static void sub_8051650(struct Sprite* sprite) { sprite->data[0]++; - sprite->pos2.y = -(sprite->data[0] / 3); + sprite->y2 = -(sprite->data[0] / 3); if (sprite->animEnded) DestroySprite(sprite); } @@ -2707,9 +2707,9 @@ static void sub_8051650(struct Sprite* sprite) void sub_8051684(struct Sprite* sprite) { sprite->data[0]++; - sprite->pos2.y = -(sprite->data[0] * 2); - if (sprite->pos2.y < -12) - sprite->pos2.y = -12; + sprite->y2 = -(sprite->data[0] * 2); + if (sprite->y2 < -12) + sprite->y2 = -12; if (sprite->animEnded) DestroySprite(sprite); } @@ -2799,7 +2799,7 @@ static void sub_805181C(struct Sprite* sprite) } break; } - sprite->pos2.y = sprite->data[1]; + sprite->y2 = sprite->data[1]; } static void sub_80518CC(struct Sprite* sprite) @@ -2829,7 +2829,7 @@ static void sub_80518CC(struct Sprite* sprite) } break; } - sprite->pos2.y = sprite->data[1]; + sprite->y2 = sprite->data[1]; } static void sub_805194C(u16 a0, u16 a1) @@ -2953,8 +2953,8 @@ static bool8 sub_8051B8C(void) static void sub_8051C04(struct Sprite* sprite) { - sprite->pos2.x = -(gBerryBlenderData->field_144); - sprite->pos2.y = -(gBerryBlenderData->field_146); + sprite->x2 = -(gBerryBlenderData->field_144); + sprite->y2 = -(gBerryBlenderData->field_146); } /*static*/ void Blender_TrySettingRecord(void) diff --git a/src/cable_car.c b/src/cable_car.c index 3a661be34..9ea69a9b8 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -624,13 +624,13 @@ static void sub_8123CB8(struct Sprite *sprite) { if (gSpecialVar_0x8004 == 0) { - sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); - sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); } else { - sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); - sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); } } } @@ -641,18 +641,18 @@ static void sub_8123D98(struct Sprite *sprite) { if (gSpecialVar_0x8004 == 0) { - sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); - sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); } else { - sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); - sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); } switch (sprite->data[2]) { case 0: - sprite->pos2.y = 17; + sprite->y2 = 17; if (sprite->data[3] ++ > 9) { sprite->data[3] = 0; @@ -660,7 +660,7 @@ static void sub_8123D98(struct Sprite *sprite) } break; default: - sprite->pos2.y = 16; + sprite->y2 = 16; if (sprite->data[3] ++ > 9) { sprite->data[3] = 0; @@ -675,32 +675,32 @@ static void sub_8123EB8(struct Sprite *sprite) { if (sprite->data[0] == 0) { - sprite->pos1.x += 2 * sprite->centerToCornerVecX; - sprite->pos1.y += 16 + sprite->centerToCornerVecY; + sprite->x += 2 * sprite->centerToCornerVecX; + sprite->y += 16 + sprite->centerToCornerVecY; } if (++sprite->data[0] >= sprite->data[2]) { switch (sprite->data[1]) { case 0: - sprite->pos1.x++; + sprite->x++; if ((sprite->data[0] % 4) == 0) { - sprite->pos1.y++; + sprite->y++; } break; case 1: if ((sprite->data[0] % 2) != 0) { - sprite->pos1.x++; - if ((sprite->pos1.x % 4) == 0) + sprite->x++; + if ((sprite->x % 4) == 0) { - sprite->pos1.y++; + sprite->y++; } } break; } - if (sprite->pos1.y > 0xa0) + if (sprite->y > 0xa0) { DestroySprite(sprite); } @@ -711,31 +711,31 @@ static void sub_8123F44(struct Sprite *sprite) { if (sprite->data[0] == 0) { - sprite->pos1.y += 16 + sprite->centerToCornerVecY; + sprite->y += 16 + sprite->centerToCornerVecY; } if (++sprite->data[0] >= sprite->data[2]) { switch (sprite->data[1]) { case 0: - sprite->pos1.x--; + sprite->x--; if ((sprite->data[0] % 4) == 0) { - sprite->pos1.y--; + sprite->y--; } break; case 1: if ((sprite->data[0] % 2) != 0) { - sprite->pos1.x--; - if ((sprite->pos1.x % 4) == 0) + sprite->x--; + if ((sprite->x % 4) == 0) { - sprite->pos1.y--; + sprite->y--; } } break; } - if (sprite->pos1.y < 0x50) + if (sprite->y < 0x50) { DestroySprite(sprite); } @@ -851,18 +851,18 @@ static void LoadSprites(void) if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; - gSprites[spriteId].pos2.x = 0x08; - gSprites[spriteId].pos2.y = 0x10; + gSprites[spriteId].x2 = 0x08; + gSprites[spriteId].y2 = 0x10; gSprites[spriteId].data[0] = 0xc8; gSprites[spriteId].data[1] = 0x49; } spriteId = CreateSprite(&gSpriteTemplate_8401D40[0], 0xb0, 0x2b, 0x67); - gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20; + gSprites[spriteId].x2 = gSprites[spriteId].y2 = 0x20; gSprites[spriteId].data[0] = 0xb0; gSprites[spriteId].data[1] = 0x2b; spriteId = CreateSprite(&gSpriteTemplate_8401D40[1], 0xc8, 0x63, 0x65); - gSprites[spriteId].pos2.x = 8; - gSprites[spriteId].pos2.y = 4; + gSprites[spriteId].x2 = 8; + gSprites[spriteId].y2 = 4; gSprites[spriteId].data[0] = 0xc8; gSprites[spriteId].data[1] = 0x63; sCableCarPtr->unk_0002 = 7; @@ -875,18 +875,18 @@ static void LoadSprites(void) if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; - gSprites[spriteId].pos2.x = 0x08; - gSprites[spriteId].pos2.y = 0x10; + gSprites[spriteId].x2 = 0x08; + gSprites[spriteId].y2 = 0x10; gSprites[spriteId].data[0] = 0x80; gSprites[spriteId].data[1] = 0x27; } spriteId = CreateSprite(&gSpriteTemplate_8401D40[0], 0x68, 0x09, 0x67); - gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20; + gSprites[spriteId].x2 = gSprites[spriteId].y2 = 0x20; gSprites[spriteId].data[0] = 0x68; gSprites[spriteId].data[1] = 0x09; spriteId = CreateSprite(&gSpriteTemplate_8401D40[1], 0x80, 0x41, 0x65); - gSprites[spriteId].pos2.x = 8; - gSprites[spriteId].pos2.y = 4; + gSprites[spriteId].x2 = 8; + gSprites[spriteId].y2 = 4; gSprites[spriteId].data[0] = 0x80; gSprites[spriteId].data[1] = 0x41; sCableCarPtr->unk_0002 = 2; @@ -897,8 +897,8 @@ static void LoadSprites(void) for (i = 0; i < 9; i++) { spriteId = CreateSprite(&gSpriteTemplate_8401D40[2], 16 * i + 0x60, 8 * i - 8, 0x68); - gSprites[spriteId].pos2.x = 8; - gSprites[spriteId].pos2.y = 8; + gSprites[spriteId].x2 = 8; + gSprites[spriteId].y2 = 8; } if ((rval % 64) == 0) { @@ -906,15 +906,15 @@ static void LoadSprites(void) if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; - gSprites[spriteId].pos2.x = -gSprites[spriteId].centerToCornerVecX; - gSprites[spriteId].pos2.y = -gSprites[spriteId].centerToCornerVecY; + gSprites[spriteId].x2 = -gSprites[spriteId].centerToCornerVecX; + gSprites[spriteId].y2 = -gSprites[spriteId].centerToCornerVecY; if (gSpecialVar_0x8004 == 0) { if (rval % 2) { StartSpriteAnim(&gSprites[spriteId], 6); gSprites[spriteId].data[1] = 1; - gSprites[spriteId].pos1.y += 2; + gSprites[spriteId].y += 2; } else { @@ -928,7 +928,7 @@ static void LoadSprites(void) { StartSpriteAnim(&gSprites[spriteId], 7); gSprites[spriteId].data[1] = 1; - gSprites[spriteId].pos1.y += 2; + gSprites[spriteId].y += 2; } else { diff --git a/src/contest.c b/src/contest.c index 150c6dbbd..06fc71888 100644 --- a/src/contest.c +++ b/src/contest.c @@ -719,7 +719,7 @@ void debug_sub_80BA054(u8 taskId) gContestMons[gContestPlayerMonIndex].species, gContestMons[gContestPlayerMonIndex].otId, gContestMons[gContestPlayerMonIndex].personality); - gSprites[r6].pos2.x = 120; + gSprites[r6].x2 = 120; gSprites[r6].callback = SpriteCB_MonSlideIn; gTasks[taskId].data[2] = r6; gBattlerSpriteIds[gBattlerAttacker] = r6; @@ -932,7 +932,7 @@ void Task_DoAppeals(u8 taskId) gContestMons[sContest.currentContestant].species, gContestMons[sContest.currentContestant].otId, gContestMons[sContest.currentContestant].personality); - gSprites[spriteId].pos2.x = 120; + gSprites[spriteId].x2 = 120; gSprites[spriteId].callback = SpriteCB_MonSlideIn; gTasks[taskId].data[2] = spriteId; gBattlerSpriteIds[gBattlerAttacker] = spriteId; @@ -1594,9 +1594,9 @@ void Task_EndWaitForLink(u8 taskId) void SpriteCB_MonSlideIn(struct Sprite *sprite) { - if (sprite->pos2.x != 0) + if (sprite->x2 != 0) { - sprite->pos2.x -= 2; + sprite->x2 -= 2; } else { @@ -1610,8 +1610,8 @@ void SpriteCB_MonSlideIn(struct Sprite *sprite) void SpriteCB_MonSlideOut(struct Sprite *sprite) { - sprite->pos2.x -= 6; - if (sprite->pos1.x + sprite->pos2.x < -32) + sprite->x2 -= 6; + if (sprite->x + sprite->x2 < -32) { sprite->callback = SpriteCallbackDummy; sprite->invisible = TRUE; diff --git a/src/contest_2.c b/src/contest_2.c index 58da38acf..dcb25a361 100644 --- a/src/contest_2.c +++ b/src/contest_2.c @@ -1994,7 +1994,7 @@ void sub_80AFE78(u8 a) gSprites[spriteId].invisible = FALSE; gSprites[spriteId].data[0] = a; gSprites[spriteId].data[1] = r5; - if (gSprites[spriteId].data[1] > gSprites[spriteId].pos2.x) + if (gSprites[spriteId].data[1] > gSprites[spriteId].x2) gSprites[spriteId].data[2] = 1; else gSprites[spriteId].data[2] = -1; @@ -2026,14 +2026,14 @@ bool8 SlidersDoneUpdating(void) void sub_80AFF60(struct Sprite *sprite) { - if (sprite->pos2.x == sprite->data[1]) + if (sprite->x2 == sprite->data[1]) { eContestGfxState[sprite->data[0]].sliderUpdating = 0; sprite->callback = SpriteCallbackDummy; } else { - sprite->pos2.x += sprite->data[2]; + sprite->x2 += sprite->data[2]; } } @@ -2042,7 +2042,7 @@ void UpdateSliderHeartSpriteYPositions(void) s32 i; for (i = 0; i < 4; i++) - gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.y = sSliderHeartYPositions[gContestantTurnOrder[i]]; + gSprites[eContestGfxState[i].sliderHeartSpriteId].y = sSliderHeartYPositions[gContestantTurnOrder[i]]; } void SetBottomSliderHeartsInvisibility(bool8 a) @@ -2054,9 +2054,9 @@ void SetBottomSliderHeartsInvisibility(bool8 a) if (gContestantTurnOrder[i] > 1) { if (!a) - gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.x = 180; + gSprites[eContestGfxState[i].sliderHeartSpriteId].x = 180; else - gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.x = 256; + gSprites[eContestGfxState[i].sliderHeartSpriteId].x = 256; } } } @@ -3461,7 +3461,7 @@ void Task_ApplauseOverflowAnimation(u8 taskId) void SlideApplauseMeterIn(void) { CreateTask(Task_SlideApplauseMeterIn, 10); - gSprites[sContest.applauseMeterSpriteId].pos2.x = -70; + gSprites[sContest.applauseMeterSpriteId].x2 = -70; gSprites[sContest.applauseMeterSpriteId].invisible = FALSE; sContest.applauseMeterIsMoving = 1; } @@ -3471,11 +3471,11 @@ void Task_SlideApplauseMeterIn(u8 taskId) struct Sprite *sprite = &gSprites[sContest.applauseMeterSpriteId]; gTasks[taskId].data[10] += 1664; - sprite->pos2.x += gTasks[taskId].data[10] >> 8; + sprite->x2 += gTasks[taskId].data[10] >> 8; gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF; - if (sprite->pos2.x > 0) - sprite->pos2.x = 0; - if (sprite->pos2.x == 0) + if (sprite->x2 > 0) + sprite->x2 = 0; + if (sprite->x2 == 0) { sContest.applauseMeterIsMoving = 0; DestroyTask(taskId); @@ -3491,7 +3491,7 @@ void SlideApplauseMeterOut(void) else { CreateTask(Task_SlideApplauseMeterOut, 10); - gSprites[sContest.applauseMeterSpriteId].pos2.x = 0; + gSprites[sContest.applauseMeterSpriteId].x2 = 0; sContest.applauseMeterIsMoving = 1; } } @@ -3501,11 +3501,11 @@ void Task_SlideApplauseMeterOut(u8 taskId) struct Sprite *sprite = &gSprites[sContest.applauseMeterSpriteId]; gTasks[taskId].data[10] += 1664; - sprite->pos2.x -= gTasks[taskId].data[10] >> 8; + sprite->x2 -= gTasks[taskId].data[10] >> 8; gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF; - if (sprite->pos2.x < -70) - sprite->pos2.x = -70; - if (sprite->pos2.x == -70) + if (sprite->x2 < -70) + sprite->x2 = -70; + if (sprite->x2 == -70) { sprite->invisible = TRUE; sContest.applauseMeterIsMoving = 0; @@ -3551,7 +3551,7 @@ void Task_ShowAndUpdateApplauseMeter(u8 taskId) UNUSED void HideApplauseMeterNoAnim(void) { - gSprites[sContest.applauseMeterSpriteId].pos2.x = 0; + gSprites[sContest.applauseMeterSpriteId].x2 = 0; gSprites[sContest.applauseMeterSpriteId].invisible = FALSE; } @@ -3689,7 +3689,7 @@ void ShowHideNextTurnGfx(bool8 a) GetTurnOrderNumberGfx(i), (void *)(VRAM + 0x10000 + (gSprites[eContestGfxState[i].nextTurnSpriteId].oam.tileNum + 5) * 32), 64); - gSprites[eContestGfxState[i].nextTurnSpriteId].pos1.y = gUnknown_083CA33C[gContestantTurnOrder[i]]; + gSprites[eContestGfxState[i].nextTurnSpriteId].y = gUnknown_083CA33C[gContestantTurnOrder[i]]; gSprites[eContestGfxState[i].nextTurnSpriteId].invisible = FALSE; } else @@ -4037,10 +4037,10 @@ void SetBattleTargetSpritePosition(void) { struct Sprite *sprite = &gSprites[gBattlerSpriteIds[3]]; - sprite->pos2.x = 0; - sprite->pos2.y = 0; - sprite->pos1.x = GetBattlerSpriteCoord(3, 0); - sprite->pos1.y = GetBattlerSpriteCoord(3, 1); + sprite->x2 = 0; + sprite->y2 = 0; + sprite->x = GetBattlerSpriteCoord(3, 0); + sprite->y = GetBattlerSpriteCoord(3, 1); sprite->invisible = TRUE; } diff --git a/src/contest_link_util.c b/src/contest_link_util.c index 6f39e5fdb..fab8cd012 100644 --- a/src/contest_link_util.c +++ b/src/contest_link_util.c @@ -1282,10 +1282,10 @@ u16 sub_80C34AC(const u8 * string) void sub_80C34CC(s16 arg0, u16 y, u16 arg2, u16 arg3) { struct Sprite *sprite = &gSprites[eContestLink80C2020Struct2018000.unk_00]; - sprite->pos1.x = 272; - sprite->pos1.y = y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x = 272; + sprite->y = y; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[4] = arg0 + 32; sprite->data[5] = arg2; sprite->data[6] = arg3; @@ -1297,10 +1297,10 @@ void sub_80C34CC(s16 arg0, u16 y, u16 arg2, u16 arg3) void sub_80C3520(u16 arg0) { struct Sprite *sprite = &gSprites[eContestLink80C2020Struct2018000.unk_00]; - 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[6] = arg0; sprite->data[7] = 0; sprite->callback = sub_80C3630; @@ -1309,10 +1309,10 @@ void sub_80C3520(u16 arg0) void sub_80C3564(struct Sprite *sprite) { - sprite->pos1.x = 272; - sprite->pos1.y = 144; - sprite->pos2.y = 0; - sprite->pos2.x = 0; + sprite->x = 272; + sprite->y = 144; + sprite->y2 = 0; + sprite->x2 = 0; sprite->callback = SpriteCallbackDummy; eContestLink80C2020Struct2018000.unk_04 = 0; } @@ -1324,18 +1324,18 @@ void sub_80C3588(struct Sprite *sprite) s16 var0; var0 = (u16)sprite->data[7] + (u16)sprite->data[6]; - sprite->pos1.x -= var0 >> 8; + sprite->x -= var0 >> 8; sprite->data[7] = (sprite->data[6] + sprite->data[7]) & 0xFF; - if (sprite->pos1.x < sprite->data[4]) - sprite->pos1.x = sprite->data[4]; + if (sprite->x < sprite->data[4]) + sprite->x = sprite->data[4]; for (i = 0; i < 3; i++) { struct Sprite *sprite2 = &gSprites[sprite->data[i]]; - sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64; + sprite2->x = sprite->x + sprite->x2 + (i + 1) * 64; } - if (sprite->pos1.x == sprite->data[4]) + if (sprite->x == sprite->data[4]) sprite->callback = sub_80C35FC; } @@ -1355,15 +1355,15 @@ void sub_80C3630(struct Sprite *sprite) s16 var0; var0 = (u16)sprite->data[7] + (u16)sprite->data[6]; - sprite->pos1.x -= var0 >> 8; + sprite->x -= var0 >> 8; sprite->data[7] = (sprite->data[6] + sprite->data[7]) & 0xFF; for (i = 0; i < 3; i++) { struct Sprite *sprite2 = &gSprites[sprite->data[i]]; - sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64; + sprite2->x = sprite->x + sprite->x2 + (i + 1) * 64; } - if (sprite->pos1.x + sprite->pos2.x < -224) + if (sprite->x + sprite->x2 < -224) sub_80C3564(sprite); } @@ -1376,18 +1376,18 @@ void sub_80C3698(const u8 *text) sub_80C3158(text, eContestLink80C2020Struct2018000.unk_01); x = sub_80C34AC(text); sprite = &gSprites[eContestLink80C2020Struct2018000.unk_01]; - sprite->pos1.x = x + 32; - sprite->pos1.y = 80; + sprite->x = x + 32; + sprite->y = 80; sprite->invisible = FALSE; for (i = 0; i < 3; i++) { - gSprites[sprite->data[i]].pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64; - gSprites[sprite->data[i]].pos1.y = sprite->pos1.y; + gSprites[sprite->data[i]].x = sprite->x + sprite->x2 + (i + 1) * 64; + gSprites[sprite->data[i]].y = sprite->y; gSprites[sprite->data[i]].invisible = FALSE; } gBattle_WIN0H = 0x00F0; - gBattle_WIN0V = ((sprite->pos1.y - 16) << 8) | (sprite->pos1.y + 16); + gBattle_WIN0V = ((sprite->y - 16) << 8) | (sprite->y + 16); REG_WININ = WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR; } @@ -2003,12 +2003,12 @@ void sub_80C3C44(struct Sprite *sprite) else { s16 delta = (u16)sprite->data[1] + 0x600; - sprite->pos1.x -= delta >> 8; + sprite->x -= delta >> 8; sprite->data[1] = (sprite->data[1] + 0x600) & 0xFF; - if (sprite->pos1.x < 120) - sprite->pos1.x = 120; + if (sprite->x < 120) + sprite->x = 120; - if (sprite->pos1.x == 120) + if (sprite->x == 120) { sprite->callback = SpriteCallbackDummy; sprite->data[1] = 0; @@ -2020,9 +2020,9 @@ void sub_80C3C44(struct Sprite *sprite) void sub_80C3CB8(struct Sprite *sprite) { s16 delta = (u16)sprite->data[1] + 0x600; - sprite->pos1.x -= delta >> 8; + sprite->x -= delta >> 8; sprite->data[1] = (sprite->data[1] + 0x600) & 0xFF; - if (sprite->pos1.x < -32) + if (sprite->x < -32) { sprite->callback = SpriteCallbackDummy; sprite->invisible = TRUE; @@ -2055,16 +2055,16 @@ void sub_80C3DF0(struct Sprite *sprite) register s16 var0 asm("r1"); sprite->data[3] += sprite->data[0]; - sprite->pos2.x = Sin(sprite->data[3] >> 8, sprite->data[1]); + sprite->x2 = Sin(sprite->data[3] >> 8, sprite->data[1]); var0 = sprite->data[4] + sprite->data[2]; - sprite->pos1.x += var0 >> 8; + sprite->x += var0 >> 8; var0 = var0 & 0xFF; sprite->data[4] = var0; - sprite->pos1.y++; + sprite->y++; if (eContestLink80C2020Struct2018000.unk_09) sprite->invisible = TRUE; - if (sprite->pos1.x > 248 || sprite->pos1.y > 116) + if (sprite->x > 248 || sprite->y > 116) { DestroySprite(sprite); eContestLink80C2020Struct2018000.unk_07--; diff --git a/src/credits.c b/src/credits.c index 2d39765be..49bbf80bd 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1132,10 +1132,10 @@ static void SetBikeScene(u8 data, u8 taskIdA) case 0: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 272; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].x = 272; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].x = 272; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].y = 46; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(0, 0x2000, 0x20, 8); @@ -1143,10 +1143,10 @@ static void SetBikeScene(u8 data, u8 taskIdA) case 1: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].x = 120; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].x = 272; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].y = 46; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(0, 0x2000, 0x20, 8); @@ -1154,10 +1154,10 @@ static void SetBikeScene(u8 data, u8 taskIdA) case 2: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].x = 120; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].x = 272; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].y = 46; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(1, 0x2000, 0x200, 8); @@ -1165,10 +1165,10 @@ static void SetBikeScene(u8 data, u8 taskIdA) case 3: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 120; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = -32; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].x = 120; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].x = -32; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].y = 46; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(1, 0x2000, 0x200, 8); @@ -1176,10 +1176,10 @@ static void SetBikeScene(u8 data, u8 taskIdA) case 4: gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].invisible = FALSE; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.x = 88; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 152; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].x = 88; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].x = 152; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].y = 46; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].y = 46; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(2, 0x2000, 0x200, 8); @@ -1395,8 +1395,8 @@ static void SpriteCB_Player(struct Sprite *sprite) break; case 1: StartSpriteAnimIfDifferent(sprite, 1); - if (sprite->pos1.x > -32) - sprite->pos1.x -= 1; + if (sprite->x > -32) + sprite->x -= 1; break; case 2: StartSpriteAnimIfDifferent(sprite, 2); @@ -1406,13 +1406,13 @@ static void SpriteCB_Player(struct Sprite *sprite) break; case 4: StartSpriteAnimIfDifferent(sprite, 0); - if (sprite->pos1.x > 120) - sprite->pos1.x -= 1; + if (sprite->x > 120) + sprite->x -= 1; break; case 5: StartSpriteAnimIfDifferent(sprite, 0); - if (sprite->pos1.x > -32) - sprite->pos1.x -= 1; + if (sprite->x > -32) + sprite->x -= 1; break; } } @@ -1428,28 +1428,28 @@ static void SpriteCB_Rival(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos2.y = 0; + sprite->y2 = 0; StartSpriteAnimIfDifferent(sprite, 0); break; case 1: - if (sprite->pos1.x > 200) + if (sprite->x > 200) StartSpriteAnimIfDifferent(sprite, 1); else StartSpriteAnimIfDifferent(sprite, 2); - if (sprite->pos1.x > -32) - sprite->pos1.x -= 2; - sprite->pos2.y = -gUnknown_0203935A; + if (sprite->x > -32) + sprite->x -= 2; + sprite->y2 = -gUnknown_0203935A; break; case 2: sprite->data[7] += 1; StartSpriteAnimIfDifferent(sprite, 0); if ((sprite->data[7] & 3) == 0) - sprite->pos1.x += 1; + sprite->x += 1; break; case 3: StartSpriteAnimIfDifferent(sprite, 0); - if (sprite->pos1.x > -32) - sprite->pos1.x -= 1; + if (sprite->x > -32) + sprite->x -= 1; break; } } @@ -1488,15 +1488,15 @@ void SpriteCB_CreditsMon(struct Sprite *sprite) { case 1: if ((sprite->data[7] & 3) == 0) - sprite->pos1.y += 1; - sprite->pos1.x -= 2; + sprite->y += 1; + sprite->x -= 2; break; case 2: break; case 3: if ((sprite->data[7] & 3) == 0) - sprite->pos1.y += 1; - sprite->pos1.x += 2; + sprite->y += 1; + sprite->x += 2; break; } break; @@ -1583,7 +1583,7 @@ static u8 CreateCreditsMonSprite(u16 species, u16 x, u16 y, u16 position) gSprites[spriteId].invisible = TRUE; gSprites[spriteId].callback = SpriteCB_CreditsMon; - spriteId2 = CreateSprite(&gSpriteTemplate_840CAEC, gSprites[spriteId].pos1.x, gSprites[spriteId].pos1.y, 1); + spriteId2 = CreateSprite(&gSpriteTemplate_840CAEC, gSprites[spriteId].x, gSprites[spriteId].y, 1); gSprites[spriteId2].data[0] = spriteId; StartSpriteAnimIfDifferent(&gSprites[spriteId2], position); @@ -1604,8 +1604,8 @@ void SpriteCB_CreditsMonBg(struct Sprite *sprite) sprite->oam.objMode = gSprites[sprite->data[0]].oam.objMode; sprite->oam.affineMode = gSprites[sprite->data[0]].oam.affineMode; sprite->oam.matrixNum = gSprites[sprite->data[0]].oam.matrixNum; - sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; - sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; + sprite->x = gSprites[sprite->data[0]].x; + sprite->y = gSprites[sprite->data[0]].y; } static void DeterminePokemonToShow(void) diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index c099ecc87..635c225b6 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -682,8 +682,8 @@ void sub_80AA754(struct Sprite *sprite) sub_80AAD08(sprite, 1); break; } - sprite->pos1.x = gUnknown_083C9296[sprite->data[0] + sprite->data[1] * 2]; - sprite->pos1.y = gUnknown_083C92A8[sprite->data[1]]; + sprite->x = gUnknown_083C9296[sprite->data[0] + sprite->data[1] * 2]; + sprite->y = gUnknown_083C92A8[sprite->data[1]]; } static void sub_80AA8A0(struct Sprite *sprite, s8 var1, u8 var2) diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index fb6f3e7d2..da9aced98 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -452,7 +452,7 @@ void debug_80C3A50(u8 taskId) gSprites[spriteId].oam.priority = 0; gSprites[spriteId].oam.paletteNum = 0; FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(0)); - gSprites[spriteId].pos2.y = gPokedexEntries[natDexNum].trainerOffset; + gSprites[spriteId].y2 = gPokedexEntries[natDexNum].trainerOffset; SetOamMatrix(2, gPokedexEntries[natDexNum].trainerScale, 0, 0, gPokedexEntries[natDexNum].trainerScale); gTasks[taskId].data[3] = spriteId; gTasks[taskId].data[4] = gPokedexEntries[natDexNum].trainerOffset; @@ -464,7 +464,7 @@ void debug_80C3A50(u8 taskId) gSprites[spriteId2].oam.priority = 0; gSprites[spriteId2].oam.paletteNum = 0; FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(0)); - gSprites[spriteId2].pos2.y = gPokedexEntries[natDexNum].pokemonOffset; + gSprites[spriteId2].y2 = gPokedexEntries[natDexNum].pokemonOffset; SetOamMatrix(1, gPokedexEntries[natDexNum].pokemonScale, 0, 0, gPokedexEntries[natDexNum].pokemonScale); gTasks[taskId].data[2] = spriteId2; gTasks[taskId].data[5] = gPokedexEntries[natDexNum].pokemonOffset; @@ -912,14 +912,14 @@ void debug_80C3D2C(u8 taskId) SetOamMatrix(1, scale, 0, 0, scale); debug_80C68CC(scale, 1, 3, 4); debug_80C68CC(offset, 1, 7, 4); - gSprites[gTasks[taskId].data[2]].pos2.y = offset; + gSprites[gTasks[taskId].data[2]].y2 = offset; scale = gTasks[taskId].data[6]; offset = gTasks[taskId].data[4]; SetOamMatrix(2, scale, 0, 0, scale); debug_80C68CC(scale, 25, 3, 4); debug_80C68CC(offset, 25, 7, 4); - gSprites[gTasks[taskId].data[3]].pos2.y = offset; + gSprites[gTasks[taskId].data[3]].y2 = offset; REG_WIN0H = ((gTasks[taskId].data[8] * 64 + 0x38) << 8) + (gTasks[taskId].data[8] * 64 + 0x78); } @@ -3199,8 +3199,8 @@ void debug_80C7584(struct Sprite *sprite) shade = gUnknown_Debug_2038A20->unkC.b; break; } - sprite->pos2.x = 4 * shade; - sprite->pos2.y = 8 * sprite->data[0]; + sprite->x2 = 4 * shade; + sprite->y2 = 8 * sprite->data[0]; sprite->data[1]++; if (sprite->data[0] == gUnknown_Debug_2038A20->unkA && !(sprite->data[1] & 0x08)) sprite->invisible = TRUE; diff --git a/src/decoration.c b/src/decoration.c index c2d7096b4..35554c82a 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -2566,7 +2566,7 @@ void sub_81000C4(u8 taskId) gUnknown_020391A6 = gTasks[taskId].data[1] - 7; ScriptContext1_SetupScript(gUnknown_081A2F7B); } - gSprites[gUnknown_020391A8].pos1.y += 2; + gSprites[gUnknown_020391A8].y += 2; sub_810028C(taskId); } @@ -3241,8 +3241,8 @@ void sub_8100EEC(u8 taskId) gSprites[gUnknown_020391A8].data[7] = 0; gSprites[gUnknown_020391A8].invisible = FALSE; gSprites[gUnknown_020391A8].callback = sub_8101698; - gSprites[gUnknown_020391A9].pos1.x = 0x88; - gSprites[gUnknown_020391A9].pos1.y = 0x48; + gSprites[gUnknown_020391A9].x = 0x88; + gSprites[gUnknown_020391A9].y = 0x48; gTasks[taskId].data[10] = 0; gTasks[taskId].func = sub_8100494; } @@ -3345,8 +3345,8 @@ void sub_8101198(u8 x, u8 y) { gSprites[gUnknown_020391A8].invisible = TRUE; gSprites[gUnknown_020391A8].callback = SpriteCallbackDummy; - gSprites[gUnknown_020391A9].pos1.x = 0x88 + x * 16; - gSprites[gUnknown_020391A9].pos1.y = 0x48 + y * 16; + gSprites[gUnknown_020391A9].x = 0x88 + x * 16; + gSprites[gUnknown_020391A9].y = 0x48 + y * 16; } bool8 sub_8101200(u8 taskId, u8 decorIdx, struct UnkStruct_020391B4 *unk_020391B4) diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 70626b367..520aa5807 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -145,8 +145,8 @@ void sub_80E8268(void) u8 spriteId; spriteId = CreateSprite(&gSpriteTemplate_83DBBFC, 0, 0, 0); - gSprites[spriteId].pos1.y = gEasyChatStruct->unk8A * 8 + 8; - gSprites[spriteId].pos1.x = gEasyChatStruct->unk88 * 8 + 4; + gSprites[spriteId].y = gEasyChatStruct->unk8A * 8 + 8; + gSprites[spriteId].x = gEasyChatStruct->unk88 * 8 + 4; gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[1] = 0; gEasyChatStruct->unk98 = &gSprites[spriteId]; @@ -168,16 +168,16 @@ void sub_80E82BC(struct Sprite *sprite) if (r5 == gEasyChatStruct->unk84) { - sprite->pos1.y = 96; - sprite->pos1.x = (r4 * 7 + 3) * 8 + 4; + sprite->y = 96; + sprite->x = (r4 * 7 + 3) * 8 + 4; } else { - sprite->pos1.y = (gEasyChatStruct->unk8A + r5 * 2) * 8 + 8; - sprite->pos1.x = (gEasyChatStruct->unk88 + r7 + r4 * 11) * 8 + 4; + sprite->y = (gEasyChatStruct->unk8A + r5 * 2) * 8 + 8; + sprite->x = (gEasyChatStruct->unk88 + r7 + r4 * 11) * 8 + 4; } - sprite->pos2.x = -6; + sprite->x2 = -6; sprite->data[0] = 0; } else @@ -185,8 +185,8 @@ void sub_80E82BC(struct Sprite *sprite) if (++sprite->data[0] > 2) { sprite->data[0] = 0; - if (++sprite->pos2.x > 0) - sprite->pos2.x = -6; + if (++sprite->x2 > 0) + sprite->x2 = -6; } } } @@ -198,17 +198,17 @@ void sub_80E8398(u8 a) { case 0: gEasyChatStruct->unk98->data[1] = a; - gEasyChatStruct->unk98->pos2.x = a; + gEasyChatStruct->unk98->x2 = a; gEasyChatStruct->unk98->invisible = FALSE; break; case 1: gEasyChatStruct->unk98->data[1] = a; - gEasyChatStruct->unk98->pos2.x = 0; + gEasyChatStruct->unk98->x2 = 0; gEasyChatStruct->unk98->invisible = FALSE; break; case 2: gEasyChatStruct->unk98->data[1] = 1; - gEasyChatStruct->unk98->pos2.x = 0; + gEasyChatStruct->unk98->x2 = 0; gEasyChatStruct->unk98->invisible = TRUE; break; } @@ -434,24 +434,24 @@ void sub_80E85F8(struct Sprite *sprite) switch (sprite->data[2]) { case 0: - sprite->pos1.x = gEasyChatStruct->unk1A9 * 88 + 32; - sprite->pos1.y = (gEasyChatStruct->unk1A8 - gEasyChatStruct->unk1B5) * 16 + 96; + sprite->x = gEasyChatStruct->unk1A9 * 88 + 32; + sprite->y = (gEasyChatStruct->unk1A8 - gEasyChatStruct->unk1B5) * 16 + 96; break; case 1: #if ENGLISH - sprite->pos1.x = 216; + sprite->x = 216; #else - sprite->pos1.x = 214; + sprite->x = 214; #endif - sprite->pos1.y = gEasyChatStruct->unk1A8 * 16 + 96; + sprite->y = gEasyChatStruct->unk1A8 * 16 + 96; break; case 2: - sprite->pos1.x = 151; - sprite->pos1.y = 96; + sprite->x = 151; + sprite->y = 96; break; case 3: - sprite->pos1.x = gUnknown_083DBCC4[gEasyChatStruct->unk1A8][gEasyChatStruct->unk1A9] * 8 + 31; - sprite->pos1.y = (gEasyChatStruct->unk1A8 - gEasyChatStruct->unk1B5) * 16 + 96; + sprite->x = gUnknown_083DBCC4[gEasyChatStruct->unk1A8][gEasyChatStruct->unk1A9] * 8 + 31; + sprite->y = (gEasyChatStruct->unk1A8 - gEasyChatStruct->unk1B5) * 16 + 96; break; } } @@ -462,8 +462,8 @@ void sub_80E872C(struct Sprite *sprite) { if (gEasyChatStruct->unk96 != 0 && sprite->data[2] == 0) { - sprite->pos1.x = gEasyChatStruct->unk9C->pos1.x + 32; - sprite->pos1.y = gEasyChatStruct->unk9C->pos1.y; + sprite->x = gEasyChatStruct->unk9C->x + 32; + sprite->y = gEasyChatStruct->unk9C->y; } } @@ -474,18 +474,18 @@ void sub_80E8760(struct Sprite *sprite) switch (sprite->data[2]) { case 0: - sprite->pos1.x = gEasyChatStruct->unk9C->pos1.x + 64; - sprite->pos1.y = gEasyChatStruct->unk9C->pos1.y; + sprite->x = gEasyChatStruct->unk9C->x + 64; + sprite->y = gEasyChatStruct->unk9C->y; break; #if GERMAN case 1: - sprite->pos1.x = gEasyChatStruct->unk9C->pos1.x + 28; - sprite->pos1.y = gEasyChatStruct->unk9C->pos1.y; + sprite->x = gEasyChatStruct->unk9C->x + 28; + sprite->y = gEasyChatStruct->unk9C->y; break; #endif case 2: - sprite->pos1.x = gEasyChatStruct->unk9C->pos1.x + 21; - sprite->pos1.y = gEasyChatStruct->unk9C->pos1.y; + sprite->x = gEasyChatStruct->unk9C->x + 21; + sprite->y = gEasyChatStruct->unk9C->y; break; } } @@ -494,7 +494,7 @@ void sub_80E8760(struct Sprite *sprite) void sub_80E87A4(u8 a) { gEasyChatStruct->unkA8->data[1] = (a == 0); - gEasyChatStruct->unkA8->pos2.x = 0; + gEasyChatStruct->unkA8->x2 = 0; } void sub_80E87CC(u8 a) @@ -522,9 +522,9 @@ void sub_80E8860(struct Sprite *sprite) { if (gEasyChatStruct->unk1B9 != 0) { - sprite->pos1.x = gEasyChatStruct->unk99A5 * 88 + 44; - sprite->pos1.y = (gEasyChatStruct->unk99A4 - gEasyChatStruct->unk9A29) * 16 + 96; - sprite->pos2.x = -6; + sprite->x = gEasyChatStruct->unk99A5 * 88 + 44; + sprite->y = (gEasyChatStruct->unk99A4 - gEasyChatStruct->unk9A29) * 16 + 96; + sprite->x2 = -6; sprite->data[0] = 0; } else @@ -533,9 +533,9 @@ void sub_80E8860(struct Sprite *sprite) if (sprite->data[0] > 2) { sprite->data[0] = 0; - sprite->pos2.x++; - if (sprite->pos2.x > 0) - sprite->pos2.x = -6; + sprite->x2++; + if (sprite->x2 > 0) + sprite->x2 = -6; } } } @@ -586,7 +586,7 @@ void sub_80E8958(u8 animNum) for (i = 0; i < 2; i++) { - gEasyChatStruct->unkAC[i]->pos1.x = r9; + gEasyChatStruct->unkAC[i]->x = r9; gEasyChatStruct->unkAC[i]->invisible = FALSE; gEasyChatStruct->unkAC[i]->data[1] = 1; StartSpriteAnim(gEasyChatStruct->unkAC[i], animNum); diff --git a/src/egg_hatch.c b/src/egg_hatch.c index d6410391e..5e8a8d16e 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -593,7 +593,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite) else { sprite->data[1] = (sprite->data[1] + 20) & 0xFF; - sprite->pos2.x = Sin(sprite->data[1], 1); + sprite->x2 = Sin(sprite->data[1], 1); if (sprite->data[0] == 15) { PlaySE(SE_BALL); @@ -616,7 +616,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite) else { sprite->data[1] = (sprite->data[1] + 20) & 0xFF; - sprite->pos2.x = Sin(sprite->data[1], 2); + sprite->x2 = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { PlaySE(SE_BALL); @@ -637,13 +637,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite) sprite->callback = SpriteCB_Egg_3; sprite->data[0] = 0; species = GetMonData(&gPlayerParty[gEggHatchData->eggPartyID], MON_DATA_SPECIES); - gSprites[gEggHatchData->pokeSpriteID].pos2.x = 0; - gSprites[gEggHatchData->pokeSpriteID].pos2.y = gMonFrontPicCoords[species].y_offset; + gSprites[gEggHatchData->pokeSpriteID].x2 = 0; + gSprites[gEggHatchData->pokeSpriteID].y2 = gMonFrontPicCoords[species].y_offset; } else { sprite->data[1] = (sprite->data[1] + 20) & 0xFF; - sprite->pos2.x = Sin(sprite->data[1], 2); + sprite->x2 = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { PlaySE(SE_BALL); @@ -696,7 +696,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) if (sprite->data[0] == 8) BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, FADE_COLOR_WHITE); if (sprite->data[0] <= 9) - gSprites[gEggHatchData->pokeSpriteID].pos1.y -= 1; + gSprites[gEggHatchData->pokeSpriteID].y -= 1; if (sprite->data[0] > 40) sprite->callback = SpriteCallbackDummy; sprite->data[0]++; @@ -707,12 +707,12 @@ static void SpriteCB_EggShard(struct Sprite* sprite) sprite->data[4] += sprite->data[1]; sprite->data[5] += sprite->data[2]; - sprite->pos2.x = sprite->data[4] / 256; - sprite->pos2.y = sprite->data[5] / 256; + sprite->x2 = sprite->data[4] / 256; + sprite->y2 = sprite->data[5] / 256; sprite->data[2] += sprite->data[3]; - if (sprite->pos1.y + sprite->pos2.y > sprite->pos1.y + 20 && sprite->data[2] > 0) + if (sprite->y + sprite->y2 > sprite->y + 20 && sprite->data[2] > 0) DestroySprite(sprite); } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 2ccc15777..11bcfd664 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1319,11 +1319,11 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl return OBJECT_EVENTS_COUNT; } sprite = &gSprites[spriteId]; - sub_8060388(cameraDeltaX + objectEvent->currentCoords.x, cameraDeltaY + objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(cameraDeltaX + objectEvent->currentCoords.x, cameraDeltaY + objectEvent->currentCoords.y, &sprite->x, &sprite->y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); - sprite->pos1.x += 8; - sprite->pos1.y += 16 + sprite->centerToCornerVecY; + sprite->x += 8; + sprite->y += 16 + sprite->centerToCornerVecY; sprite->oam.paletteNum = graphicsInfo->paletteSlot; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = objectEventId; @@ -1471,7 +1471,7 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction) sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); - sprite->pos1.y += sprite->centerToCornerVecY; + sprite->y += sprite->centerToCornerVecY; sprite->oam.paletteNum = graphicsInfo->paletteSlot; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = b; @@ -1617,11 +1617,11 @@ void sub_805B75C(u8 objectEventId, s16 x, s16 y) if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; - sub_8060388(x + objectEvent->currentCoords.x, y + objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(x + objectEvent->currentCoords.x, y + objectEvent->currentCoords.y, &sprite->x, &sprite->y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); - sprite->pos1.x += 8; - sprite->pos1.y += 16 + sprite->centerToCornerVecY; + sprite->x += 8; + sprite->y += 16 + sprite->centerToCornerVecY; sprite->images = graphicsInfo->images; if (objectEvent->movementType == MOVEMENT_TYPE_PLAYER) { @@ -1689,11 +1689,11 @@ void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId) sprite->oam.paletteNum = graphicsInfo->paletteSlot; objectEvent->inanimate = graphicsInfo->inanimate; objectEvent->graphicsId = graphicsId; - sub_80603CC(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_80603CC(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->x, &sprite->y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); - sprite->pos1.x += 8; - sprite->pos1.y += 16 + sprite->centerToCornerVecY; + sprite->x += 8; + sprite->y += 16 + sprite->centerToCornerVecY; if (objectEvent->trackedByCamera) { CameraObjectReset1(); @@ -1847,8 +1847,8 @@ void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { sprite = &gSprites[gObjectEvents[objectEventId].spriteId]; - sprite->pos2.x = x; - sprite->pos2.y = y; + sprite->x2 = x; + sprite->y2 = y; } } @@ -1977,11 +1977,11 @@ void sub_805C058(struct ObjectEvent *objectEvent, s16 x, s16 y) const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); SetObjectEventCoords(objectEvent, x, y); - sub_80603CC(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_80603CC(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->x, &sprite->y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); - sprite->pos1.x += 8; - sprite->pos1.y += 16 + sprite->centerToCornerVecY; + sprite->x += 8; + sprite->y += 16 + sprite->centerToCornerVecY; sub_805B914(objectEvent); if (objectEvent->trackedByCamera) CameraObjectReset1(); @@ -2080,8 +2080,8 @@ static void ObjectCB_CameraObject(struct Sprite *sprite) static void CameraObject_0(struct Sprite *sprite) { - sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; - sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; + sprite->x = gSprites[sprite->data[0]].x; + sprite->y = gSprites[sprite->data[0]].y; sprite->invisible = TRUE; sprite->data[1] = 1; CameraObject_1(sprite); @@ -2089,19 +2089,19 @@ static void CameraObject_0(struct Sprite *sprite) static void CameraObject_1(struct Sprite *sprite) { - s16 x = gSprites[sprite->data[0]].pos1.x; - s16 y = gSprites[sprite->data[0]].pos1.y; + s16 x = gSprites[sprite->data[0]].x; + s16 y = gSprites[sprite->data[0]].y; - sprite->data[2] = x - sprite->pos1.x; - sprite->data[3] = y - sprite->pos1.y; - sprite->pos1.x = x; - sprite->pos1.y = y; + sprite->data[2] = x - sprite->x; + sprite->data[3] = y - sprite->y; + sprite->x = x; + sprite->y = y; } static void CameraObject_2(struct Sprite *sprite) { - sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; - sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; + sprite->x = gSprites[sprite->data[0]].x; + sprite->y = gSprites[sprite->data[0]].y; sprite->data[2] = 0; sprite->data[3] = 0; } @@ -2168,8 +2168,8 @@ u8 unref_sub_805C43C(struct Sprite *src, s16 x, s16 y, u8 subpriority) if (!gSprites[i].inUse) { gSprites[i] = *src; - gSprites[i].pos1.x = x; - gSprites[i].pos1.y = y; + gSprites[i].x = x; + gSprites[i].y = y; gSprites[i].subpriority = subpriority; break; } @@ -2186,8 +2186,8 @@ u8 CreateCopySpriteAt(struct Sprite *src, s16 x, s16 y, u8 subpriority) if (!gSprites[i].inUse) { gSprites[i] = *src; - gSprites[i].pos1.x = x; - gSprites[i].pos1.y = y; + gSprites[i].x = x; + gSprites[i].y = y; gSprites[i].subpriority = subpriority; return i; } @@ -7174,13 +7174,13 @@ static void UpdateObjectEventIsOffscreen(struct ObjectEvent *objectEvent, struct graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (sprite->coordOffsetEnabled) { - x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; - y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY; + x = sprite->x + sprite->x2 + sprite->centerToCornerVecX + gSpriteCoordOffsetX; + y = sprite->y + sprite->y2 + sprite->centerToCornerVecY + gSpriteCoordOffsetY; } else { - x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; - y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; + x = sprite->x + sprite->x2 + sprite->centerToCornerVecX; + y = sprite->y + sprite->y2 + sprite->centerToCornerVecY; } x2 = graphicsInfo->width + (s16)x; @@ -7602,7 +7602,7 @@ void ObjectEventUpdateZCoord(struct ObjectEvent *objEvent) void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) { s32 tmp = sprite->centerToCornerVecY; - u32 tmpa = *(u16 *)&sprite->pos1.y; + u32 tmpa = *(u16 *)&sprite->y; u32 tmpb = *(u16 *)&gSpriteCoordOffsetY; s32 tmp2 = (tmpa - tmp) + tmpb; u16 tmp3 = (0x10 - ((((u32)tmp2 + 8) & 0xFF) >> 4)) * 2; @@ -8003,32 +8003,32 @@ void UnfreezeObjectEvents(void) static void Step1(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += sDirectionToVectors[dir].x; - sprite->pos1.y += sDirectionToVectors[dir].y; + sprite->x += sDirectionToVectors[dir].x; + sprite->y += sDirectionToVectors[dir].y; } static void Step2(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += 2 * (u16) sDirectionToVectors[dir].x; - sprite->pos1.y += 2 * (u16) sDirectionToVectors[dir].y; + sprite->x += 2 * (u16) sDirectionToVectors[dir].x; + sprite->y += 2 * (u16) sDirectionToVectors[dir].y; } static void Step3(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += 2 * (u16) sDirectionToVectors[dir].x + (u16) sDirectionToVectors[dir].x; - sprite->pos1.y += 2 * (u16) sDirectionToVectors[dir].y + (u16) sDirectionToVectors[dir].y; + sprite->x += 2 * (u16) sDirectionToVectors[dir].x + (u16) sDirectionToVectors[dir].x; + sprite->y += 2 * (u16) sDirectionToVectors[dir].y + (u16) sDirectionToVectors[dir].y; } static void Step4(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += 4 * (u16) sDirectionToVectors[dir].x; - sprite->pos1.y += 4 * (u16) sDirectionToVectors[dir].y; + sprite->x += 4 * (u16) sDirectionToVectors[dir].x; + sprite->y += 4 * (u16) sDirectionToVectors[dir].y; } static void Step8(struct Sprite *sprite, u8 dir) { - sprite->pos1.x += 8 * (u16) sDirectionToVectors[dir].x; - sprite->pos1.y += 8 * (u16) sDirectionToVectors[dir].y; + sprite->x += 8 * (u16) sDirectionToVectors[dir].x; + sprite->y += 8 * (u16) sDirectionToVectors[dir].y; } static void oamt_npc_ministep_reset(struct Sprite *sprite, u8 direction, u8 a3) @@ -8181,7 +8181,7 @@ u8 sub_8064704(struct Sprite *sprite) if (sprite->data[4]) Step1(sprite, sprite->data[3]); - sprite->pos2.y = sub_80646C8(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); + sprite->y2 = sub_80646C8(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); sprite->data[6]++; @@ -8190,7 +8190,7 @@ u8 sub_8064704(struct Sprite *sprite) if (sprite->data[6] >= v5[sprite->data[4]]) { - sprite->pos2.y = 0; + sprite->y2 = 0; v2 = -1; } @@ -8206,7 +8206,7 @@ u8 sub_806478C(struct Sprite *sprite) if (sprite->data[4] && !(sprite->data[6] & 1)) Step1(sprite, sprite->data[3]); - sprite->pos2.y = sub_80646C8(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); + sprite->y2 = sub_80646C8(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); sprite->data[6]++; @@ -8215,7 +8215,7 @@ u8 sub_806478C(struct Sprite *sprite) if (sprite->data[6] >= v5[sprite->data[4]]) { - sprite->pos2.y = 0; + sprite->y2 = 0; v2 = -1; } @@ -8261,13 +8261,13 @@ void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible) if (sprite->coordOffsetEnabled) { - x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; - y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY; + x = sprite->x + sprite->x2 + sprite->centerToCornerVecX + gSpriteCoordOffsetX; + y = sprite->y + sprite->y2 + sprite->centerToCornerVecY + gSpriteCoordOffsetY; } else { - x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; - y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; + x = sprite->x + sprite->x2 + sprite->centerToCornerVecX; + y = sprite->y + sprite->y2 + sprite->centerToCornerVecY; } x2 = x - (sprite->centerToCornerVecX >> 1); @@ -8318,8 +8318,8 @@ void DoShadowFieldEffect(struct ObjectEvent *objectEvent) static void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - gFieldEffectArguments[0] = sprite->pos1.x; - gFieldEffectArguments[1] = sprite->pos1.y + (graphicsInfo->height >> 1) - 2; + gFieldEffectArguments[0] = sprite->x; + gFieldEffectArguments[1] = sprite->y + (graphicsInfo->height >> 1) - 2; gFieldEffectArguments[2] = 151; gFieldEffectArguments[3] = 3; FieldEffectStart(FLDEFF_RIPPLE); diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index d0f9d781d..ac19d9d3c 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -111,18 +111,18 @@ static void SetEvoSparklesMatrices(void) static void SpriteCB_PreEvoSparkleSet1(struct Sprite* sprite) { - if (sprite->pos1.y > 8) + if (sprite->y > 8) { u8 matrixNum; - sprite->pos1.y = 88 - (sprite->data[7] * sprite->data[7]) / 80; - sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4; - sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]); + sprite->y = 88 - (sprite->data[7] * sprite->data[7]) / 80; + sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4; + sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]); sprite->data[6] += 4; if (sprite->data[7] & 1) sprite->data[5]--; sprite->data[7]++; - if (sprite->pos2.y > 0) + if (sprite->y2 > 0) sprite->subpriority = 1; else sprite->subpriority = 20; @@ -151,11 +151,11 @@ static void CreatePreEvoSparkleSet1(u8 arg0) static void SpriteCB_PreEvoSparkleSet2(struct Sprite* sprite) { - if (sprite->pos1.y < 88) + if (sprite->y < 88) { - sprite->pos1.y = 8 + (sprite->data[7] * sprite->data[7]) / 5; - sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4; - sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]); + sprite->y = 8 + (sprite->data[7] * sprite->data[7]) / 5; + sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4; + sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]); sprite->data[5] = 8 + Sin((u8)(sprite->data[7] * 4), 40); sprite->data[7]++; } @@ -182,8 +182,8 @@ static void SpriteCB_PostEvoSparkleSet1(struct Sprite* sprite) { if (sprite->data[5] > 8) { - sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]); - sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]); + sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]); + sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]); sprite->data[5] -= sprite->data[3]; sprite->data[6] += 4; } @@ -210,13 +210,13 @@ static void CreatePostEvoSparkleSet1(u8 arg0, u8 arg1) static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite) { if (!(sprite->data[7] & 3)) - sprite->pos1.y++; + sprite->y++; if (sprite->data[6] < 128) { u8 matrixNum; - sprite->pos2.y = -Sin((u8)(sprite->data[6]), sprite->data[5]); - sprite->pos1.x = 120 + (sprite->data[3] * sprite->data[7]) / 3; + sprite->y2 = -Sin((u8)(sprite->data[6]), sprite->data[5]); + sprite->x = 120 + (sprite->data[3] * sprite->data[7]) / 3; sprite->data[6]++; matrixNum = 31 - (sprite->data[6] * 12 / 128); if (sprite->data[6] > 64) diff --git a/src/field_effect.c b/src/field_effect.c index 80f3d25d1..9c7698ca4 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -748,8 +748,8 @@ u8 CreatePokeballGlowSprite(s16 data6, s16 x, s16 y, u16 data5) struct Sprite *sprite; spriteId = CreateInvisibleSprite(SpriteCB_PokeballGlowEffect); sprite = &gSprites[spriteId]; - sprite->pos2.x = x; - sprite->pos2.y = y; + sprite->x2 = x; + sprite->y2 = y; sprite->data[5] = data5; sprite->data[6] = data6; sprite->data[7] = spriteId; @@ -767,7 +767,7 @@ void PokeballGlowEffect_0(struct Sprite *sprite) if (sprite->data[1] == 0 || (--sprite->data[1]) == 0) { sprite->data[1] = 25; - endSpriteId = CreateSpriteAtEnd(&gSpriteTemplate_839F208, gUnknown_0839F2A8[sprite->data[2]].x + sprite->pos2.x, gUnknown_0839F2A8[sprite->data[2]].y + sprite->pos2.y, 0); + endSpriteId = CreateSpriteAtEnd(&gSpriteTemplate_839F208, gUnknown_0839F2A8[sprite->data[2]].x + sprite->x2, gUnknown_0839F2A8[sprite->data[2]].y + sprite->y2, 0); gSprites[endSpriteId].oam.priority = 2; gSprites[endSpriteId].data[0] = sprite->data[7]; sprite->data[2]++; @@ -1077,7 +1077,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] s16 centerToCornerVecY; sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); - sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); + sprite->y2 = -(sprite->y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; @@ -1093,7 +1093,7 @@ bool8 sub_80868E4(struct Task *task) objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->pos2.y += task->data[1]; + sprite->y2 += task->data[1]; if (task->data[1] < 8) { task->data[2] += task->data[1]; @@ -1102,19 +1102,19 @@ bool8 sub_80868E4(struct Task *task) task->data[1] <<= 1; } } - if (task->data[3] == 0 && sprite->pos2.y >= -16) + if (task->data[3] == 0 && sprite->y2 >= -16) { task->data[3]++; objectEvent->fixedPriority = 0; sprite->subspriteMode = task->data[4]; objectEvent->triggerGroundEffectsOnMove = 1; } - if (sprite->pos2.y >= 0) + if (sprite->y2 >= 0) { PlaySE(SE_M_STRENGTH); objectEvent->triggerGroundEffectsOnStop = 1; objectEvent->landingJump = 1; - sprite->pos2.y = 0; + sprite->y2 = 0; task->data[0]++; } return FALSE; @@ -1255,8 +1255,8 @@ void sub_8086B98(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->pos2.x = Cos(0x84, task->data[2]); - sprite->pos2.y = Sin(0x94, task->data[2]); + sprite->x2 = Cos(0x84, task->data[2]); + sprite->y2 = Sin(0x94, task->data[2]); task->data[3]++; if (task->data[3] & 1) { @@ -1268,8 +1268,8 @@ void sub_8086BE4(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->pos2.x = Cos(0x7c, task->data[2]); - sprite->pos2.y = Sin(0x76, task->data[2]); + sprite->x2 = Cos(0x7c, task->data[2]); + sprite->y2 = Sin(0x76, task->data[2]); task->data[3]++; if (task->data[3] & 1) { @@ -1340,8 +1340,8 @@ bool8 sub_8086D70(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->pos2.x = Cos(0x84, task->data[1]); - sprite->pos2.y = Sin(0x94, task->data[1]); + sprite->x2 = Cos(0x84, task->data[1]); + sprite->y2 = Sin(0x94, task->data[1]); task->data[0]++; return FALSE; } @@ -1350,8 +1350,8 @@ bool8 sub_8086DB0(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->pos2.x = Cos(0x84, task->data[1]); - sprite->pos2.y = Sin(0x94, task->data[1]); + sprite->x2 = Cos(0x84, task->data[1]); + sprite->y2 = Sin(0x94, task->data[1]); task->data[2]++; if (task->data[2] & 1) { @@ -1359,8 +1359,8 @@ bool8 sub_8086DB0(struct Task *task) } if (task->data[1] == 0) { - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x2 = 0; + sprite->y2 = 0; task->data[0] = 5; } return FALSE; @@ -1370,8 +1370,8 @@ bool8 sub_8086E10(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->pos2.x = Cos(0x7c, task->data[1]); - sprite->pos2.y = Sin(0x76, task->data[1]); + sprite->x2 = Cos(0x7c, task->data[1]); + sprite->y2 = Sin(0x76, task->data[1]); task->data[0]++; return FALSE; } @@ -1380,8 +1380,8 @@ bool8 sub_8086E50(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->pos2.x = Cos(0x7c, task->data[1]); - sprite->pos2.y = Sin(0x76, task->data[1]); + sprite->x2 = Cos(0x7c, task->data[1]); + sprite->y2 = Sin(0x76, task->data[1]); task->data[2]++; if (task->data[2] & 1) { @@ -1389,8 +1389,8 @@ bool8 sub_8086E50(struct Task *task) } if (task->data[1] == 0) { - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x2 = 0; + sprite->y2 = 0; task->data[0]++; } return FALSE; @@ -1581,7 +1581,7 @@ bool8 sub_8087264(struct Task *task, struct ObjectEvent *objectEvent, struct Spr bool8 sub_8087298(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sprite->pos2.y = 0; + sprite->y2 = 0; task->data[3] = 1; gFieldEffectArguments[0] = objectEvent->currentCoords.x; gFieldEffectArguments[1] = objectEvent->currentCoords.y; @@ -1610,9 +1610,9 @@ bool8 sub_80872E4(struct Task *task, struct ObjectEvent *objectEvent, struct Spr if (task->data[2] > 6) { centerToCornerVecY = -(sprite->centerToCornerVecY << 1); - if (sprite->pos2.y > -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY)) + if (sprite->y2 > -(sprite->y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY)) { - sprite->pos2.y -= task->data[3]; + sprite->y2 -= task->data[3]; if (task->data[3] <= 7) { task->data[3]++; @@ -1622,7 +1622,7 @@ bool8 sub_80872E4(struct Task *task, struct ObjectEvent *objectEvent, struct Spr task->data[4] = 1; } } - if (task->data[5] == 0 && sprite->pos2.y < -0x10) + if (task->data[5] == 0 && sprite->y2 < -0x10) { task->data[5]++; objectEvent->fixedPriority = 1; @@ -2023,7 +2023,7 @@ static void TeleportFieldEffectTask3(struct Task *task) task->data[1] = 4; ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } - sprite->pos1.y -= task->data[3]; + sprite->y -= task->data[3]; task->data[4] += task->data[3]; if ((--task->data[2]) <= 0 && (task->data[2] = 4, task->data[3] < 8)) { @@ -2086,7 +2086,7 @@ void sub_8087E4C(struct Task *task) { sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); - sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); + sprite->y2 = -(sprite->y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; task->data[0]++; task->data[1] = 8; @@ -2102,7 +2102,7 @@ void sub_8087ED8(struct Task *task) u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; - if ((sprite->pos2.y += task->data[1]) >= -8) + if ((sprite->y2 += task->data[1]) >= -8) { if (task->data[13] == 0) { @@ -2118,7 +2118,7 @@ void sub_8087ED8(struct Task *task) sprite->subspriteMode = 2; } } - if (sprite->pos2.y >= -0x30 && task->data[1] > 1 && !(sprite->pos2.y & 1)) + if (sprite->y2 >= -0x30 && task->data[1] > 1 && !(sprite->y2 & 1)) { task->data[1]--; } @@ -2127,9 +2127,9 @@ void sub_8087ED8(struct Task *task) task->data[2] = 4; ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } - if (sprite->pos2.y >= 0) + if (sprite->y2 >= 0) { - sprite->pos2.y = 0; + sprite->y2 = 0; task->data[0]++; task->data[1] = 1; task->data[2] = 0; @@ -2537,9 +2537,9 @@ void sub_80888D4(struct Sprite *); void sub_8088890(struct Sprite *sprite) { - if ((sprite->pos1.x -= 20) <= 0x78) + if ((sprite->x -= 20) <= 0x78) { - sprite->pos1.x = 0x78; + sprite->x = 0x78; sprite->data[1] = 30; sprite->callback = sub_80888D4; if (sprite->data[6]) @@ -2564,12 +2564,12 @@ void sub_80888D4(struct Sprite *sprite) void sub_80888F0(struct Sprite *sprite) { - if (sprite->pos1.x < -0x40) + if (sprite->x < -0x40) { sprite->data[7] = 1; } else { - sprite->pos1.x -= 20; + sprite->x -= 20; } } @@ -2686,17 +2686,17 @@ u8 FldEff_NPCFlyOut(void) void sub_8088BC4(struct Sprite *sprite) { struct Sprite *npcSprite; - sprite->pos2.x = Cos(sprite->data[2], 0x8c); - sprite->pos2.y = Sin(sprite->data[2], 0x48); + sprite->x2 = Cos(sprite->data[2], 0x8c); + sprite->y2 = Sin(sprite->data[2], 0x48); sprite->data[2] = (sprite->data[2] + 4) & 0xff; if (sprite->data[0]) { npcSprite = &gSprites[sprite->data[1]]; npcSprite->coordOffsetEnabled = 0; - npcSprite->pos1.x = sprite->pos1.x + sprite->pos2.x; - npcSprite->pos1.y = sprite->pos1.y + sprite->pos2.y - 8; - npcSprite->pos2.x = 0; - npcSprite->pos2.y = 0; + npcSprite->x = sprite->x + sprite->x2; + npcSprite->y = sprite->y + sprite->y2 - 8; + npcSprite->x2 = 0; + npcSprite->y2 = 0; } if (sprite->data[2] >= 0x80) { @@ -2878,10 +2878,10 @@ void sub_8088FC0(u8 spriteId) struct Sprite *sprite; sprite = &gSprites[spriteId]; sprite->callback = sub_80890D8; - sprite->pos1.x = 0x78; - sprite->pos1.y = 0x00; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x = 0x78; + sprite->y = 0x00; + sprite->x2 = 0; + sprite->y2 = 0; memset(&sprite->data[0], 0, 8 * sizeof(u16) /* zero all data cells */); sprite->data[6] = 0x40; } @@ -2918,15 +2918,15 @@ void sub_8089018(struct Sprite *sprite) sprite->affineAnims = gSpriteAffineAnimTable_0839F44C; InitSpriteAffineAnim(sprite); StartSpriteAffineAnim(sprite, 0); - sprite->pos1.x = 0x76; - sprite->pos1.y = -0x30; + sprite->x = 0x76; + sprite->y = -0x30; sprite->data[0]++; sprite->data[1] = 0x40; sprite->data[2] = 0x100; } sprite->data[1] += (sprite->data[2] >> 8); - sprite->pos2.x = Cos(sprite->data[1], 0x78); - sprite->pos2.y = Sin(sprite->data[1], 0x78); + sprite->x2 = Cos(sprite->data[1], 0x78); + sprite->y2 = Sin(sprite->data[1], 0x78); if (sprite->data[2] < 0x800) { sprite->data[2] += 0x60; @@ -2944,17 +2944,17 @@ void sub_8089018(struct Sprite *sprite) void sub_80890D8(struct Sprite *sprite) { struct Sprite *sprite1; - sprite->pos2.x = Cos(sprite->data[2], 0x8c); - sprite->pos2.y = Sin(sprite->data[2], 0x48); + sprite->x2 = Cos(sprite->data[2], 0x8c); + sprite->y2 = Sin(sprite->data[2], 0x48); sprite->data[2] = (sprite->data[2] + 4) & 0xff; if (sprite->data[6] != 0x40) { sprite1 = &gSprites[sprite->data[6]]; sprite1->coordOffsetEnabled = 0; - sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x; - sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8; - sprite1->pos2.x = 0; - sprite1->pos2.y = 0; + sprite1->x = sprite->x + sprite->x2; + sprite1->y = sprite->y + sprite->y2 - 8; + sprite1->x2 = 0; + sprite1->y2 = 0; } if (sprite->data[2] >= 0x80) { @@ -2972,8 +2972,8 @@ void sub_808914C(struct Sprite *sprite) sprite->affineAnims = gSpriteAffineAnimTable_0839F44C; InitSpriteAffineAnim(sprite); StartSpriteAffineAnim(sprite, 1); - sprite->pos1.x = 0x5e; - sprite->pos1.y = -0x20; + sprite->x = 0x5e; + sprite->y = -0x20; sprite->data[0]++; sprite->data[1] = 0xf0; sprite->data[2] = 0x800; @@ -2982,8 +2982,8 @@ void sub_808914C(struct Sprite *sprite) sprite->data[1] += sprite->data[2] >> 8; sprite->data[3] += sprite->data[2] >> 8; sprite->data[1] &= 0xff; - sprite->pos2.x = Cos(sprite->data[1], 0x20); - sprite->pos2.y = Sin(sprite->data[1], 0x78); + sprite->x2 = Cos(sprite->data[1], 0x20); + sprite->y2 = Sin(sprite->data[1], 0x78); if (sprite->data[2] > 0x100) { sprite->data[2] -= sprite->data[4]; @@ -3070,10 +3070,10 @@ void sub_8089354(struct Task *task) objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sprite = &gSprites[objectEvent->spriteId]; sub_8088FFC(task->data[1], 0x40); - 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; task->data[0]++; task->data[2] = 0; } @@ -3102,7 +3102,7 @@ void sub_80893C0(struct Task *task) 8 }; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->pos2.y = unknown_0839F470[task->data[2]]; + sprite->y2 = unknown_0839F470[task->data[2]]; if ((++task->data[2]) >= 18) { task->data[0]++; @@ -3119,8 +3119,8 @@ void sub_8089414(struct Task *task) sprite = &gSprites[objectEvent->spriteId]; objectEvent->inanimate = 0; sub_805C058(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x2 = 0; + sprite->y2 = 0; sprite->coordOffsetEnabled = 1; sub_8059BF4(); ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 9ba7787e0..4f3680a2f 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -32,7 +32,7 @@ void InitObjectReflectionSprite(struct ObjectEvent *objectEvent, struct Sprite * { struct Sprite *reflectionSprite; - reflectionSprite = &gSprites[CreateCopySpriteAt(sprite, sprite->pos1.x, sprite->pos1.y, 0x98)]; + reflectionSprite = &gSprites[CreateCopySpriteAt(sprite, sprite->x, sprite->y, 0x98)]; reflectionSprite->callback = UpdateObjectReflectionSprite; reflectionSprite->oam.priority = 3; reflectionSprite->oam.paletteNum = gReflectionEffectPaletteMap[reflectionSprite->oam.paletteNum]; @@ -130,13 +130,13 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) reflectionSprite->subspriteTables = mainSprite->subspriteTables; reflectionSprite->subspriteTableNum = mainSprite->subspriteTableNum; reflectionSprite->invisible = mainSprite->invisible; - reflectionSprite->pos1.x = mainSprite->pos1.x; + reflectionSprite->x = mainSprite->x; // reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120 - reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2]; + reflectionSprite->y = mainSprite->y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2]; reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX; reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY; - reflectionSprite->pos2.x = mainSprite->pos2.x; - reflectionSprite->pos2.y = -mainSprite->pos2.y; + reflectionSprite->x2 = mainSprite->x2; + reflectionSprite->y2 = -mainSprite->y2; reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled; // Check if the reflection is not still. @@ -184,8 +184,8 @@ void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y) { sub_80603CC(x, y, &x2, &y2); sprite = &gSprites[spriteId]; - sprite->pos1.x = x2 + 8; - sprite->pos1.y = y2 + 8; + sprite->x = x2 + 8; + sprite->y = y2 + 8; sprite->invisible = FALSE; sprite->data[0] = x; sprite->data[1] = y; @@ -242,8 +242,8 @@ void UpdateShadowFieldEffect(struct Sprite *sprite) objectEvent = &gObjectEvents[objectEventId]; linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; - sprite->pos1.x = linkedSprite->pos1.x; - sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3]; + sprite->x = linkedSprite->x; + sprite->y = linkedSprite->y + sprite->data[3]; if (!objectEvent->active || !objectEvent->hasShadow || MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior) @@ -465,8 +465,8 @@ u32 FldEff_ShortGrass(void) sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; - sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].x; + sprite->data[4] = gSprites[objectEvent->spriteId].y; } return 0; } @@ -487,8 +487,8 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite) { graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; - y = linkedSprite->pos1.y; - x = linkedSprite->pos1.x; + y = linkedSprite->y; + x = linkedSprite->x; if (x != sprite->data[3] || y != sprite->data[4]) { sprite->data[3] = x; @@ -498,9 +498,9 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite) StartSpriteAnim(sprite, 0); } } - sprite->pos1.x = x; - sprite->pos1.y = y; - sprite->pos2.y = (graphicsInfo->height >> 1) - 8; + sprite->x = x; + sprite->y = y; + sprite->y2 = (graphicsInfo->height >> 1) - 8; sprite->subpriority = linkedSprite->subpriority - 1; sprite->oam.priority = linkedSprite->oam.priority; UpdateObjectEventSpriteVisibility(sprite, linkedSprite->invisible); @@ -613,7 +613,7 @@ u32 FldEff_Splash(void) sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->pos2.y = (graphicsInfo->height >> 1) - 4; + sprite->y2 = (graphicsInfo->height >> 1) - 4; PlaySE(SE_PUDDLE); } return 0; @@ -629,8 +629,8 @@ void UpdateSplashFieldEffect(struct Sprite *sprite) } else { - sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; - sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + sprite->x = gSprites[gObjectEvents[objectEventId].spriteId].x; + sprite->y = gSprites[gObjectEvents[objectEventId].spriteId].y; UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -694,7 +694,7 @@ u32 FldEff_FeetInFlowingWater(void) sprite->data[2] = gFieldEffectArguments[2]; sprite->data[3] = -1; sprite->data[4] = -1; - sprite->pos2.y = (graphicsInfo->height >> 1) - 4; + sprite->y2 = (graphicsInfo->height >> 1) - 4; StartSpriteAnim(sprite, 1); } return 0; @@ -714,8 +714,8 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) { objectEvent = &gObjectEvents[objectEventId]; linkedSprite = &gSprites[objectEvent->spriteId]; - sprite->pos1.x = linkedSprite->pos1.x; - sprite->pos1.y = linkedSprite->pos1.y; + sprite->x = linkedSprite->x; + sprite->y = linkedSprite->y; sprite->subpriority = linkedSprite->subpriority; UpdateObjectEventSpriteVisibility(sprite, FALSE); if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4]) @@ -764,8 +764,8 @@ u32 FldEff_HotSpringsWater(void) sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; - sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].x; + sprite->data[4] = gSprites[objectEvent->spriteId].y; } return 0; } @@ -784,8 +784,8 @@ void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite) { graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; - sprite->pos1.x = linkedSprite->pos1.x; - sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8; + sprite->x = linkedSprite->x; + sprite->y = (graphicsInfo->height >> 1) + linkedSprite->y - 8; sprite->subpriority = linkedSprite->subpriority - 1; UpdateObjectEventSpriteVisibility(sprite, FALSE); } @@ -1014,7 +1014,7 @@ static void sub_812800C(struct ObjectEvent *objectEvent, struct Sprite *sprite) u8 i; s16 x = objectEvent->currentCoords.x; s16 y = objectEvent->currentCoords.y; - s32 spriteY = sprite->pos2.y; + s32 spriteY = sprite->y2; if (spriteY == 0 && (x != sprite->data[6] || y != sprite->data[7])) { @@ -1041,7 +1041,7 @@ static void sub_81280A0(struct ObjectEvent *objectEvent, struct Sprite *linkedSp { if (((u16)(++ sprite->data[4]) & unk_8401E5A[sprite->data[5]]) == 0) { - sprite->pos2.y += sprite->data[3]; + sprite->y2 += sprite->data[3]; } if ((sprite->data[4] & 0x0F) == 0) { @@ -1051,14 +1051,14 @@ static void sub_81280A0(struct ObjectEvent *objectEvent, struct Sprite *linkedSp { if (sub_8127F70(sprite) == 0) { - linkedSprite->pos2.y = sprite->pos2.y; + linkedSprite->y2 = sprite->y2; } else { - linkedSprite->pos2.y = sprite->data[1] + sprite->pos2.y; + linkedSprite->y2 = sprite->data[1] + sprite->y2; } - sprite->pos1.x = linkedSprite->pos1.x; - sprite->pos1.y = linkedSprite->pos1.y + 8; + sprite->x = linkedSprite->x; + sprite->y = linkedSprite->y + 8; } } } @@ -1084,7 +1084,7 @@ static void sub_8128174(struct Sprite *sprite) oldSprite = &gSprites[sprite->data[0]]; if (((sprite->data[2]++) & 0x03) == 0) { - oldSprite->pos2.y += sprite->data[1]; + oldSprite->y2 += sprite->data[1]; } if ((sprite->data[2] & 0x0F) == 0) { @@ -1130,9 +1130,9 @@ u32 FldEff_SandPile(void) sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; - sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; - sprite->pos2.y = (graphicsInfo->height >> 1) - 2; + sprite->data[3] = gSprites[objectEvent->spriteId].x; + sprite->data[4] = gSprites[objectEvent->spriteId].y; + sprite->y2 = (graphicsInfo->height >> 1) - 2; SeekSpriteAnim(sprite, 2); } return 0; @@ -1150,8 +1150,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite) } else { - y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; - x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; + y = gSprites[gObjectEvents[objectEventId].spriteId].y; + x = gSprites[gObjectEvents[objectEventId].spriteId].x; if (x != sprite->data[3] || y != sprite->data[4]) { sprite->data[3] = x; @@ -1161,8 +1161,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite) StartSpriteAnim(sprite, 0); } } - sprite->pos1.x = x; - sprite->pos1.y = y; + sprite->x = x; + sprite->y = y; sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority; UpdateObjectEventSpriteVisibility(sprite, FALSE); } @@ -1188,7 +1188,7 @@ void UpdateBubblesFieldEffect(struct Sprite *sprite) { sprite->data[0] += 0x80; sprite->data[0] &= 0x100; - sprite->pos1.y -= sprite->data[0] >> 8; + sprite->y -= sprite->data[0] >> 8; UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->invisible || sprite->animEnded) { @@ -1269,8 +1269,8 @@ void UpdateDisguiseFieldEffect(struct Sprite *sprite) graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->invisible = linkedSprite->invisible; - sprite->pos1.x = linkedSprite->pos1.x; - sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16; + sprite->x = linkedSprite->x; + sprite->y = (graphicsInfo->height >> 1) + linkedSprite->y - 16; sprite->subpriority = linkedSprite->subpriority - 1; if (sprite->data[0] == 1) { @@ -1387,13 +1387,13 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) { graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); linkedSprite = &gSprites[objectEvent->spriteId]; - xhi = sprite->pos1.x + sprite->centerToCornerVecX; - var = sprite->pos1.x - sprite->centerToCornerVecX; - if (xhi < linkedSprite->pos1.x && var > linkedSprite->pos1.x) + xhi = sprite->x + sprite->centerToCornerVecX; + var = sprite->x - sprite->centerToCornerVecX; + if (xhi < linkedSprite->x && var > linkedSprite->x) { - lyhi = linkedSprite->pos1.y + linkedSprite->centerToCornerVecY; - var = linkedSprite->pos1.y; - ylo = sprite->pos1.y - sprite->centerToCornerVecY; + lyhi = linkedSprite->y + linkedSprite->centerToCornerVecY; + var = linkedSprite->y; + ylo = sprite->y - sprite->centerToCornerVecY; yhi = ylo + linkedSprite->centerToCornerVecY; if ((lyhi < yhi || lyhi < ylo) && var > yhi && sprite->subpriority <= linkedSprite->subpriority) { diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index c0c4aad5d..d30717d65 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1703,8 +1703,8 @@ static bool8 Fishing11(struct Task *task) ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); - gSprites[gPlayerAvatar.spriteId].pos2.x = 0; - gSprites[gPlayerAvatar.spriteId].pos2.y = 0; + gSprites[gPlayerAvatar.spriteId].x2 = 0; + gSprites[gPlayerAvatar.spriteId].y2 = 0; Menu_EraseScreen(); task->tFrameCounter++; return FALSE; @@ -1762,8 +1762,8 @@ static bool8 Fishing15(struct Task *task) ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); - gSprites[gPlayerAvatar.spriteId].pos2.x = 0; - gSprites[gPlayerAvatar.spriteId].pos2.y = 0; + gSprites[gPlayerAvatar.spriteId].x2 = 0; + gSprites[gPlayerAvatar.spriteId].y2 = 0; task->tStep++; } return FALSE; @@ -1794,8 +1794,8 @@ static void AlignFishingAnimationFrames(void) u8 animType; AnimateSprite(playerSprite); - playerSprite->pos2.x = 0; - playerSprite->pos2.y = 0; + playerSprite->x2 = 0; + playerSprite->y2 = 0; animCmdIndex = playerSprite->animCmdIndex; if (playerSprite->anims[playerSprite->animNum][animCmdIndex].type == -1) { @@ -1810,16 +1810,16 @@ static void AlignFishingAnimationFrames(void) animType = playerSprite->anims[playerSprite->animNum][animCmdIndex].type; if (animType == 1 || animType == 2 || animType == 3) { - playerSprite->pos2.x = 8; + playerSprite->x2 = 8; if (GetPlayerFacingDirection() == 3) - playerSprite->pos2.x = -8; + playerSprite->x2 = -8; } if (animType == 5) - playerSprite->pos2.y = -8; + playerSprite->y2 = -8; if (animType == 10 || animType == 11) - playerSprite->pos2.y = 8; + playerSprite->y2 = 8; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y); + sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->y2); } #if DEBUG diff --git a/src/field_weather_effects.c b/src/field_weather_effects.c index 56b802b83..33bfd81b1 100644 --- a/src/field_weather_effects.c +++ b/src/field_weather_effects.c @@ -192,7 +192,7 @@ void CreateCloudSprites(void) gWeatherPtr->sprites.s1.cloudSprites[i] = &gSprites[spriteId]; sprite = gWeatherPtr->sprites.s1.cloudSprites[i]; - sub_80603CC(gUnknown_0839A9C8[i].x + 7, gUnknown_0839A9C8[i].y + 7, &sprite->pos1.x, &sprite->pos1.y); + sub_80603CC(gUnknown_0839A9C8[i].x + 7, gUnknown_0839A9C8[i].y + 7, &sprite->x, &sprite->y); sprite->coordOffsetEnabled = TRUE; } else @@ -222,7 +222,7 @@ void sub_807E0F4(struct Sprite *sprite) { sprite->data[0] = (sprite->data[0] + 1) & 1; if (sprite->data[0] != 0) - sprite->pos1.x--; + sprite->x--; } //------------------------------------------------------------------------------ @@ -482,12 +482,12 @@ void sub_807E5C0(struct Sprite *sprite) { sprite->data[2] += gUnknown_0839AABC[gWeatherPtr->unknown_6DC][0]; sprite->data[3] += gUnknown_0839AABC[gWeatherPtr->unknown_6DC][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; if (sprite->data[5] != 0 - && (sprite->pos1.x >= -8 && sprite->pos1.x <= 248) - && sprite->pos1.y >= -16 && sprite->pos1.y <= 176) + && (sprite->x >= -8 && sprite->x <= 248) + && sprite->y >= -16 && sprite->y <= 176) sprite->invisible = FALSE; else sprite->invisible = TRUE; @@ -497,8 +497,8 @@ void sub_807E5C0(struct Sprite *sprite) { StartSpriteAnim(sprite, gWeatherPtr->unknown_6DC + 1); sprite->data[4] = 1; - sprite->pos1.x -= gSpriteCoordOffsetX; - sprite->pos1.y -= gSpriteCoordOffsetY; + sprite->x -= gSpriteCoordOffsetX; + sprite->y -= gSpriteCoordOffsetY; sprite->coordOffsetEnabled = TRUE; } } @@ -987,10 +987,10 @@ void sub_807EC40(struct Sprite *sprite) u16 r4 = ((sprite->data[4] * 5) & 7) * 30 + (Random() % 30); u16 r6; - sprite->pos1.y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); - sprite->pos1.x = r4 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); - sprite->data[0] = sprite->pos1.y * 128; - sprite->pos2.x = 0; + sprite->y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->x = r4 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + sprite->data[0] = sprite->y * 128; + sprite->x2 = 0; r6 = Random(); sprite->data[1] = (r6 & 3) * 5 + 64; sprite->data[7] = (r6 & 3) * 5 + 64; @@ -1007,8 +1007,8 @@ void sub_807ECEC(struct Sprite *sprite) { sprite->invisible = FALSE; sprite->callback = sub_807ED48; - sprite->pos1.y = 0xFA - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); - sprite->data[0] = sprite->pos1.y * 128; + sprite->y = 0xFA - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->data[0] = sprite->y * 128; gWeatherPtr->unknown_6E2 = 0; } } @@ -1019,30 +1019,30 @@ void sub_807ED48(struct Sprite *sprite) s16 r2; sprite->data[0] += sprite->data[1]; - sprite->pos1.y = sprite->data[0] >> 7; + sprite->y = sprite->data[0] >> 7; sprite->data[3] = (sprite->data[3] + sprite->data[2]) & 0xFF; - sprite->pos2.x = gSineTable[sprite->data[3]] / 64; + sprite->x2 = gSineTable[sprite->data[3]] / 64; - r3 = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF; + r3 = (sprite->x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF; if (r3 & 0x100) r3 = -0x100 | r3; // hmm... what is this? if (r3 < -3) - sprite->pos1.x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + sprite->x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); else if (r3 > 242) - sprite->pos1.x = -3 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); + sprite->x = -3 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); - r2 = (sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY) & 0xFF; + r2 = (sprite->y + sprite->centerToCornerVecY + gSpriteCoordOffsetY) & 0xFF; if (r2 > 163 && r2 < 171) { - sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); - sprite->data[0] = sprite->pos1.y * 128; + sprite->y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); + sprite->data[0] = sprite->y * 128; sprite->data[5] = 0; sprite->data[6] = 220; } else if (r2 > 242 && r2 < 250) { - sprite->pos1.y = 163; - sprite->data[0] = sprite->pos1.y * 128; + sprite->y = 163; + sprite->data[0] = sprite->y * 128; sprite->data[5] = 0; sprite->data[6] = 220; sprite->invisible = TRUE; @@ -1053,7 +1053,7 @@ void sub_807ED48(struct Sprite *sprite) if (sprite->data[5] == sprite->data[6]) { sub_807EC40(sprite); - sprite->pos1.y = 250; + sprite->y = 250; sprite->invisible = TRUE; sprite->callback = sub_807ECEC; } @@ -1372,12 +1372,12 @@ bool8 Fog1_Finish(void) static void Fog1SpriteCallback(struct Sprite *sprite) { - sprite->pos2.y = (u8)gSpriteCoordOffsetY; - sprite->pos1.x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->sprColumn * 64; - if (sprite->pos1.x > 0x10F) + sprite->y2 = (u8)gSpriteCoordOffsetY; + sprite->x = gWeatherPtr->fog1ScrollPosX + 32 + sprite->sprColumn * 64; + if (sprite->x > 0x10F) { - sprite->pos1.x = 480 + gWeatherPtr->fog1ScrollPosX - (4 - sprite->sprColumn) * 64; - sprite->pos1.x &= 0x1FF; + sprite->x = 480 + gWeatherPtr->fog1ScrollPosX - (4 - sprite->sprColumn) * 64; + sprite->x &= 0x1FF; } } @@ -1399,8 +1399,8 @@ static void CreateFog1Sprites(void) struct Sprite *sprite = &gSprites[spriteId]; sprite->sprColumn = i % 5; - sprite->pos1.x = (i % 5) * 64 + 32; - sprite->pos1.y = (i / 5) * 64 + 32; + sprite->x = (i % 5) * 64 + 32; + sprite->y = (i / 5) * 64 + 32; gWeatherPtr->sprites.s2.fog1Sprites[i] = sprite; } else @@ -1614,12 +1614,12 @@ void sub_807FAA8(struct Sprite *sprite) sprite->data[1] = 0; sprite->data[0]++; } - sprite->pos1.y = gSpriteCoordOffsetY + sprite->data[0]; - sprite->pos1.x = gWeatherPtr->unknown_6FC + 32 + sprite->data[2] * 64; - if (sprite->pos1.x > 271) + sprite->y = gSpriteCoordOffsetY + sprite->data[0]; + sprite->x = gWeatherPtr->unknown_6FC + 32 + sprite->data[2] * 64; + if (sprite->x > 271) { - sprite->pos1.x = gWeatherPtr->unknown_6FC + 0x1E0 - (4 - sprite->data[2]) * 64; - sprite->pos1.x &= 0x1FF; + sprite->x = gWeatherPtr->unknown_6FC + 0x1E0 - (4 - sprite->data[2]) * 64; + sprite->x &= 0x1FF; } } @@ -1815,12 +1815,12 @@ void DestroyFog2Sprites(void) void Fog2SpriteCallback(struct Sprite *sprite) { - sprite->pos2.y = gWeatherPtr->unknown_71A; - sprite->pos1.x = gWeatherPtr->unknown_718 + 32 + sprite->data[0] * 64; - if (sprite->pos1.x > 271) + sprite->y2 = gWeatherPtr->unknown_71A; + sprite->x = gWeatherPtr->unknown_718 + 32 + sprite->data[0] * 64; + if (sprite->x > 271) { - sprite->pos1.x = gWeatherPtr->unknown_718 + 0x1E0 - (4 - sprite->data[0]) * 64; - sprite->pos1.x &= 0x1FF; + sprite->x = gWeatherPtr->unknown_718 + 0x1E0 - (4 - sprite->data[0]) * 64; + sprite->x &= 0x1FF; } } @@ -2070,12 +2070,12 @@ void CreateSandstormSprites_2(void) void SandstormSpriteCallback1(struct Sprite *sprite) { - sprite->pos2.y = gWeatherPtr->unknown_710; - sprite->pos1.x = gWeatherPtr->unknown_70E + 32 + sprite->data[0] * 64; - if (sprite->pos1.x > 271) + sprite->y2 = gWeatherPtr->unknown_710; + sprite->x = gWeatherPtr->unknown_70E + 32 + sprite->data[0] * 64; + if (sprite->x > 271) { - sprite->pos1.x = gWeatherPtr->unknown_70E + 0x1E0 - (4 - sprite->data[0]) * 64; - sprite->pos1.x &= 0x1FF; + sprite->x = gWeatherPtr->unknown_70E + 0x1E0 - (4 - sprite->data[0]) * 64; + sprite->x &= 0x1FF; } } @@ -2092,15 +2092,15 @@ void SandstormSpriteCallback3(struct Sprite *sprite) u32 x; u32 y; - if (--sprite->pos1.y < -48) + if (--sprite->y < -48) { - sprite->pos1.y = 208; + sprite->y = 208; sprite->data[0] = 4; } x = sprite->data[0] * gSineTable[sprite->data[1]]; y = sprite->data[0] * gSineTable[sprite->data[1] + 64]; - sprite->pos2.x = x >> 8; - sprite->pos2.y = y >> 8; + sprite->x2 = x >> 8; + sprite->y2 = y >> 8; sprite->data[1] = (sprite->data[1] + 10) & 0xFF; if (++sprite->data[2] > 8) { @@ -2276,16 +2276,16 @@ void unc_0807DAB4(struct Sprite *sprite) sprite->data[0] = 0; if (sprite->data[1] == 0) { - if (++sprite->pos2.x > 4) + if (++sprite->x2 > 4) sprite->data[1] = 1; } else { - if (--sprite->pos2.x <= 0) + if (--sprite->x2 <= 0) sprite->data[1] = 0; } } - sprite->pos1.y -= 3; + sprite->y -= 3; if (++sprite->data[2] > 0x77) DestroySprite(sprite); } diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 7b16a5a9c..162dc4ff9 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -356,8 +356,8 @@ static void CutGrassSpriteCallback2(struct Sprite *sprite) u16 tempdata; u16 tempdata2; - sprite->pos2.x = Sin(sprite->data[2], sprite->data[0]); - sprite->pos2.y = Cos(sprite->data[2], sprite->data[0]); + sprite->x2 = Sin(sprite->data[2], sprite->data[0]); + sprite->y2 = Cos(sprite->data[2], sprite->data[0]); sprite->data[2] = (sprite->data[2] + 8) & 0xFF; sprite->data[0] += ((tempdata2 = sprite->data[3]) << 16 >> 18) + 1; // what? diff --git a/src/fldeff_recordmixing.c b/src/fldeff_recordmixing.c index 716447f9c..c6a660601 100644 --- a/src/fldeff_recordmixing.c +++ b/src/fldeff_recordmixing.c @@ -59,10 +59,10 @@ u8 CreateRecordMixingSprite(void) else { struct Sprite *sprite = &gSprites[spriteId]; - sub_8060388(16, 13, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(16, 13, &sprite->x, &sprite->y); sprite->coordOffsetEnabled = TRUE; - sprite->pos1.x += 16; - sprite->pos1.y += 2; + sprite->x += 16; + sprite->y += 2; } return spriteId; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index b3cc6d0ad..96012dc0e 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -722,8 +722,8 @@ static void sub_8142794(u8 taskID) gTasks[taskID].tFrameCount--; else { - if (gSprites[gTasks[taskID].tPlayerSpriteID].pos1.x != 160) - gSprites[gTasks[taskID].tPlayerSpriteID].pos1.x++; + if (gSprites[gTasks[taskID].tPlayerSpriteID].x != 160) + gSprites[gTasks[taskID].tPlayerSpriteID].x++; else { Menu_DrawStdWindowFrame(1, 2, 15, 9); @@ -1251,19 +1251,17 @@ static void sub_81435B8(void) static void sub_81435DC(struct Sprite* sprite) { - u32 spritePos = *(u32*)(&sprite->pos1); - u32 dataPos = *(u32*)(&sprite->data[1]); - if (spritePos != dataPos) + if (sprite->x != sprite->data[1] || sprite->y != sprite->data[2]) { - if (sprite->pos1.x < sprite->data[1]) - sprite->pos1.x += 15; - if (sprite->pos1.x > sprite->data[1]) - sprite->pos1.x -= 15; - - if (sprite->pos1.y < sprite->data[2]) - sprite->pos1.y += 10; - if (sprite->pos1.y > sprite->data[2]) - sprite->pos1.y -= 10; + if (sprite->x < sprite->data[1]) + sprite->x += 15; + if (sprite->x > sprite->data[1]) + sprite->x -= 15; + + if (sprite->y < sprite->data[2]) + sprite->y += 10; + if (sprite->y > sprite->data[2]) + sprite->y -= 10; } else { @@ -1326,19 +1324,19 @@ static u32 HallOfFame_LoadTrainerPic(u16 trainerPicID, s16 posX, s16 posY, u16 a static void sub_814386C(struct Sprite* sprite) { - if (sprite->pos2.y > 120) + if (sprite->y2 > 120) DestroySprite(sprite); else { u16 rand; u8 tableID; - sprite->pos2.y++; - sprite->pos2.y += sprite->data[1]; + sprite->y2++; + sprite->y2 += sprite->data[1]; tableID = sprite->data[0]; rand = (Random() % 4) + 8; - sprite->pos2.x = rand * gSineTable[tableID] / 256; + sprite->x2 = rand * gSineTable[tableID] / 256; sprite->data[0] += 4; } diff --git a/src/intro.c b/src/intro.c index 2c8b45e18..4ade0714f 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1678,8 +1678,8 @@ static void sub_813D158(struct Sprite *sprite) if (gSprites[sprite->data[7]].data[7] != 0) { sprite->invisible = TRUE; - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; + sprite->x += sprite->x2; + sprite->y += sprite->y2; StartSpriteAnim(sprite, 3); sprite->data[2] = 1024; sprite->data[3] = 8 * (sprite->data[1] & 3); @@ -1690,10 +1690,10 @@ static void sub_813D158(struct Sprite *sprite) } else { - sprite->pos2.x = gSprites[sprite->data[7]].pos2.x; - sprite->pos2.y = gSprites[sprite->data[7]].pos2.y; - sprite->pos1.x = gSprites[sprite->data[7]].pos1.x; - sprite->pos1.y = gSprites[sprite->data[7]].pos1.y; + sprite->x2 = gSprites[sprite->data[7]].x2; + sprite->y2 = gSprites[sprite->data[7]].y2; + sprite->x = gSprites[sprite->data[7]].x; + sprite->y = gSprites[sprite->data[7]].y; } } @@ -1705,12 +1705,12 @@ static void sub_813D208(struct Sprite *sprite) static void sub_813D220(struct Sprite *sprite) { - if (sprite->pos1.x <= 116) + if (sprite->x <= 116) { - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.y = 0; - sprite->pos1.x += 4; - sprite->pos2.x = -4; + sprite->y += sprite->y2; + sprite->y2 = 0; + sprite->x += 4; + sprite->x2 = -4; sprite->data[4] = 128; sprite->callback = sub_813D368; } @@ -1733,10 +1733,10 @@ static void sub_813D220(struct Sprite *sprite) sin1 = gSineTable[(u8)data4]; sin2 = gSineTable[(u8)(data4 + 64)]; sprite->data[4] += 2; - sprite->pos2.y = sin1 / 32; - sprite->pos1.x--; - if (sprite->pos1.x & 1) - sprite->pos1.y++; + sprite->y2 = sin1 / 32; + sprite->x--; + if (sprite->x & 1) + sprite->y++; temp = -sin2 / 16; data2 = sprite->data[2]; data3 = sprite->data[3]; @@ -1763,8 +1763,8 @@ static void sub_813D368(struct Sprite *sprite) sprite->data[4] -= 8; data4 = sprite->data[4]; - sprite->pos2.x = gSineTable[(u8)(data4 + 64)] / 64; - sprite->pos2.y = gSineTable[(u8)data4] / 64; + sprite->x2 = gSineTable[(u8)(data4 + 64)] / 64; + sprite->y2 = gSineTable[(u8)data4] / 64; } else { @@ -1781,8 +1781,8 @@ static void sub_813D414(struct Sprite *sprite) sprite->data[4] += 8; r2 = gSineTable[(u8)sprite->data[4]] / 16 + 64; - sprite->pos2.x = gSineTable[(u8)(r2 + 64)] / 64; - sprite->pos2.y = gSineTable[(u8)r2] / 64; + sprite->x2 = gSineTable[(u8)(r2 + 64)] / 64; + sprite->y2 = gSineTable[(u8)r2] / 64; } else { @@ -1792,16 +1792,16 @@ static void sub_813D414(struct Sprite *sprite) static void SpriteCB_WaterDropFall(struct Sprite *sprite) { - if (sprite->pos1.y < sprite->data[5]) + if (sprite->y < sprite->data[5]) { - sprite->pos1.y += 4; + sprite->y += 4; } else { sprite->data[7] = 1; sprite->invisible = TRUE; - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; + sprite->x += sprite->x2; + sprite->y += sprite->y2; StartSpriteAnim(sprite, 3); sprite->data[2] = 1024; sprite->data[3] = 8 * (sprite->data[1] & 3); @@ -1815,16 +1815,16 @@ static void SpriteCB_WaterDropFall(struct Sprite *sprite) //Duplicate function static void SpriteCB_WaterDropFall_2(struct Sprite *sprite) { - if (sprite->pos1.y < sprite->data[5]) + if (sprite->y < sprite->data[5]) { - sprite->pos1.y += 4; + sprite->y += 4; } else { sprite->data[7] = 1; sprite->invisible = TRUE; - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; + sprite->x += sprite->x2; + sprite->y += sprite->y2; StartSpriteAnim(sprite, 3); sprite->data[2] = 1024; sprite->data[3] = 8 * (sprite->data[1] & 3); @@ -1888,47 +1888,47 @@ static void sub_813D788(struct Sprite *sprite) { case 0: StartSpriteAnimIfDifferent(sprite, 0); - sprite->pos1.x--; + sprite->x--; break; case 1: StartSpriteAnimIfDifferent(sprite, 0); if (gIntroFrameCounter & 7) return; - sprite->pos1.x++; + sprite->x++; break; case 2: StartSpriteAnimIfDifferent(sprite, 2); - if (sprite->pos1.x <= 120 || (gIntroFrameCounter & 7)) - sprite->pos1.x++; + if (sprite->x <= 120 || (gIntroFrameCounter & 7)) + sprite->x++; break; case 3: StartSpriteAnimIfDifferent(sprite, 3); break; case 4: StartSpriteAnimIfDifferent(sprite, 0); - if (sprite->pos1.x > -32) - sprite->pos1.x -= 2; + if (sprite->x > -32) + sprite->x -= 2; break; } if (gIntroFrameCounter & 7) return; - if (sprite->pos2.y != 0) + if (sprite->y2 != 0) { - sprite->pos2.y = 0; + sprite->y2 = 0; } else { switch (Random() & 3) { case 0: - sprite->pos2.y = -1; + sprite->y2 = -1; break; case 1: - sprite->pos2.y = 1; + sprite->y2 = 1; break; case 2: case 3: - sprite->pos2.y = 0; + sprite->y2 = 0; break; } } @@ -1941,23 +1941,23 @@ static void sub_813D880(struct Sprite *sprite) case 0: break; case 1: - if (sprite->pos2.x + sprite->pos1.x < 304) - sprite->pos2.x += 8; + if (sprite->x2 + sprite->x < 304) + sprite->x2 += 8; else sprite->data[0] = 2; break; case 2: - if (sprite->pos2.x + sprite->pos1.x > 120) - sprite->pos2.x -= 1; + if (sprite->x2 + sprite->x > 120) + sprite->x2 -= 1; else sprite->data[0] = 3; break; case 3: - if (sprite->pos2.x > 0) - sprite->pos2.x -= 2; + if (sprite->x2 > 0) + sprite->x2 -= 2; break; } - sprite->pos2.y = Sin((u8)sprite->data[1], 8) - gUnknown_0203935A; + sprite->y2 = Sin((u8)sprite->data[1], 8) - gUnknown_0203935A; sprite->data[1] += 4; } @@ -2028,8 +2028,8 @@ static void sub_813DA64(struct Sprite *sprite) if (sprite->data[3] < 0x50) { - sprite->pos2.y = -Sin((u8)sprite->data[3], 0x78); - sprite->pos2.x = -Sin((u8)sprite->data[3], 0x8C); + sprite->y2 = -Sin((u8)sprite->data[3], 0x78); + sprite->x2 = -Sin((u8)sprite->data[3], 0x8C); if (sprite->data[3] > 64) sprite->oam.priority = 3; } @@ -2070,13 +2070,13 @@ static void sub_813DB9C(struct Sprite *sprite) sprite->data[0] = 1; //fall through case 1: - if (sprite->pos1.y > 96) + if (sprite->y > 96) { - sprite->pos1.y -= 4; + sprite->y -= 4; if (sprite->data[2] != 0) - sprite->pos1.x += 2; + sprite->x += 2; else - sprite->pos1.x -= 2; + sprite->x -= 2; } else { @@ -2108,16 +2108,16 @@ static void sub_813DB9C(struct Sprite *sprite) break; case 4: sprite->data[4]++; - if (sprite->pos1.y + sprite->pos2.y > -32 - && sprite->pos1.x + sprite->pos2.x > -64) + if (sprite->y + sprite->y2 > -32 + && sprite->x + sprite->x2 > -64) { u16 r2; - sprite->pos2.y = -(sprite->data[4] * sprite->data[4]) / 8; + sprite->y2 = -(sprite->data[4] * sprite->data[4]) / 8; if (sprite->data[2] != 0) - sprite->pos2.x += sprite->data[4]; + sprite->x2 += sprite->data[4]; else - sprite->pos2.x -= sprite->data[4]; + sprite->x2 -= sprite->data[4]; if (sprite->data[3] < 128) sprite->data[3] += 8; r2 = 256 - sprite->data[3]; @@ -2167,11 +2167,11 @@ static void sub_813DD58(struct Sprite *sprite) break; case 3: sprite->data[4]++; - sprite->pos2.y = sprite->data[4] * sprite->data[4] / 32; + sprite->y2 = sprite->data[4] * sprite->data[4] / 32; if (sprite->data[2] != 0) - sprite->pos2.x = sprite->data[4] / 4; + sprite->x2 = sprite->data[4] / 4; else - sprite->pos2.x = -(sprite->data[4] / 4); + sprite->x2 = -(sprite->data[4] / 4); break; } } @@ -2182,9 +2182,9 @@ static void sub_813DE70(struct Sprite *sprite) { case 0: default: - if (sprite->pos1.x > 40) + if (sprite->x > 40) { - sprite->pos1.x -= 4; + sprite->x -= 4; } else { @@ -2203,23 +2203,23 @@ static void sub_813DE70(struct Sprite *sprite) sprite->data[0]++; break; case 3: - if (sprite->pos1.y > 160) + if (sprite->y > 160) { sprite->invisible = TRUE; sprite->data[0] = 1; } else { - sprite->pos1.y += 2; - sprite->pos1.x--; + sprite->y += 2; + sprite->x--; } break; case 4: { s16 r4, r5; - r5 = gSprites[sprite->data[6]].pos1.x + gSprites[sprite->data[6]].pos2.x; - r4 = gSprites[sprite->data[6]].pos1.y + gSprites[sprite->data[6]].pos2.y; + r5 = gSprites[sprite->data[6]].x + gSprites[sprite->data[6]].x2; + r4 = gSprites[sprite->data[6]].y + gSprites[sprite->data[6]].y2; DestroySprite(&gSprites[sprite->data[6]]); sprite->data[6] = sub_813CE88(SPECIES_TORCHIC, r5, r4, 2, 1); gSprites[sprite->data[6]].callback = sub_813DD58; @@ -2228,8 +2228,8 @@ static void sub_813DE70(struct Sprite *sprite) gSprites[sprite->data[6]].data[2] = 1; sub_813E580(r5, r4); - r5 = gSprites[sprite->data[7]].pos1.x + gSprites[sprite->data[7]].pos2.x; - r4 = gSprites[sprite->data[7]].pos1.y + gSprites[sprite->data[7]].pos2.y; + r5 = gSprites[sprite->data[7]].x + gSprites[sprite->data[7]].x2; + r4 = gSprites[sprite->data[7]].y + gSprites[sprite->data[7]].y2; DestroySprite(&gSprites[sprite->data[7]]); sprite->data[7] = sub_813CE88(SPECIES_MUDKIP, r5, r4, 3, 1); gSprites[sprite->data[7]].callback = sub_813DD58; @@ -2260,19 +2260,19 @@ static void sub_813E10C(struct Sprite *sprite) { case 0: default: - if (sprite->pos2.x > -56) + if (sprite->x2 > -56) { - sprite->pos2.x -= 8; - sprite->pos2.y += 6; + sprite->x2 -= 8; + sprite->y2 += 6; } else { - sprite->data[6] = sprite->pos1.x; - sprite->data[7] = sprite->pos1.y; - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->data[6] = sprite->x; + sprite->data[7] = sprite->y; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[0] = 1; sprite->data[1] = 0; } @@ -2282,40 +2282,40 @@ static void sub_813E10C(struct Sprite *sprite) { if (sprite->data[1] & 2) { - sprite->pos2.x = -1; - sprite->pos2.y = 1; + sprite->x2 = -1; + sprite->y2 = 1; } else { - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x2 = 0; + sprite->y2 = 0; } } sprite->data[1]++; break; case 2: sprite->invisible = TRUE; - sprite->pos1.x = sprite->data[6]; - sprite->pos1.y = sprite->data[7]; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x = sprite->data[6]; + sprite->y = sprite->data[7]; + sprite->x2 = 0; + sprite->y2 = 0; break; case 3: sprite->invisible = FALSE; sprite->data[1]++; //fall through case 4: - if (sprite->pos2.x > -56) + if (sprite->x2 > -56) { - sprite->pos2.x -= 4; - sprite->pos2.y += 3; + sprite->x2 -= 4; + sprite->y2 += 3; } else { - 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] = 1; } break; @@ -2328,19 +2328,19 @@ static void sub_813E210(struct Sprite *sprite) { case 0: default: - if (sprite->pos2.x < 56) + if (sprite->x2 < 56) { - sprite->pos2.x += 8; - sprite->pos2.y -= 6; + sprite->x2 += 8; + sprite->y2 -= 6; } else { - sprite->data[6] = sprite->pos1.x; - sprite->data[7] = sprite->pos1.y; - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->data[6] = sprite->x; + sprite->data[7] = sprite->y; + sprite->x += sprite->x2; + sprite->y += sprite->y2; + sprite->x2 = 0; + sprite->y2 = 0; sprite->data[0] = 1; sprite->data[1] = 0; } @@ -2350,40 +2350,40 @@ static void sub_813E210(struct Sprite *sprite) { if (sprite->data[1] & 2) { - sprite->pos2.x = 1; - sprite->pos2.y = -1; + sprite->x2 = 1; + sprite->y2 = -1; } else { - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x2 = 0; + sprite->y2 = 0; } } sprite->data[1]++; break; case 2: sprite->invisible = TRUE; - sprite->pos1.x = sprite->data[6]; - sprite->pos1.y = sprite->data[7]; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x = sprite->data[6]; + sprite->y = sprite->data[7]; + sprite->x2 = 0; + sprite->y2 = 0; break; case 3: sprite->invisible = FALSE; sprite->data[1]++; //fall through case 4: - if (sprite->pos2.x < 56) + if (sprite->x2 < 56) { - sprite->pos2.x += 4; - sprite->pos2.y -= 3; + sprite->x2 += 4; + sprite->y2 -= 3; } else { - 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] = 1; } break; @@ -2407,11 +2407,11 @@ static void sub_813E30C(struct Sprite *sprite) sprite->data[4] = 36; //fall through case 10: - if (sprite->pos1.x <= 144) + if (sprite->x <= 144) { - sprite->pos1.x += 4; - sprite->pos1.y -= 1; - sprite->pos2.y = -Sin((u8)sprite->data[2], 24); + sprite->x += 4; + sprite->y -= 1; + sprite->y2 = -Sin((u8)sprite->data[2], 24); sprite->data[2] += 4; } sprite->data[3] -= sprite->data[4]; @@ -2428,11 +2428,11 @@ static void sub_813E30C(struct Sprite *sprite) sprite->data[4] = 36; //fall through case 20: - if (sprite->pos1.x <= 96) + if (sprite->x <= 96) { - sprite->pos1.x += 3; - sprite->pos1.y -= 1; - sprite->pos2.y = -Sin((u8)sprite->data[2], 24); + sprite->x += 3; + sprite->y -= 1; + sprite->y2 = -Sin((u8)sprite->data[2], 24); sprite->data[2] += 4; } sprite->data[3] -= sprite->data[4]; @@ -2463,8 +2463,8 @@ static void sub_813E4B8(struct Sprite *sprite) } sprite->data[2] += 2; r4 = Sin((u8)sprite->data[2], 40); - sprite->pos2.x = Cos((u8)(sprite->data[0] * 32), r4); - sprite->pos2.y = Sin((u8)(sprite->data[0] * 32), r4); + sprite->x2 = Cos((u8)(sprite->data[0] * 32), r4); + sprite->y2 = Sin((u8)(sprite->data[0] * 32), r4); if (sprite->data[0] == 0) { sprite->data[3] -= sprite->data[1]; @@ -2503,12 +2503,12 @@ static void sub_813E5E0(struct Sprite *sprite) if (sprite->data[7] < 12) sprite->data[7]++; sprite->data[6] += 4; - sprite->pos1.x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; + sprite->x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; //This useless '+ 0' is needed to make the asm match - sprite->pos1.y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; - sprite->pos2.y = gSineTable[(u8)(sprite->data[1] + 0)] * sprite->data[7] / 256; + sprite->y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; + sprite->y2 = gSineTable[(u8)(sprite->data[1] + 0)] * sprite->data[7] / 256; sprite->data[1] += 16; - if (sprite->pos1.y > sprite->data[2]) + if (sprite->y > sprite->data[2]) DestroySprite(sprite); } } @@ -2530,8 +2530,8 @@ static void sub_813E6C0(struct Sprite *sprite) sprite->invisible = TRUE; if (gSprites[sprite->data[0]].data[0] == 1 && !(sprite->data[7] & 3)) { - var1 = sprite->data[1] + gSprites[sprite->data[0]].pos1.x; - var2 = sprite->data[2] + gSprites[sprite->data[0]].pos1.y; + var1 = sprite->data[1] + gSprites[sprite->data[0]].x; + var2 = sprite->data[2] + gSprites[sprite->data[0]].y; for (i = 0; i < 3; i++) { u8 r3 = gSprites[sprite->data[0]].subpriority - 1; @@ -2582,10 +2582,10 @@ static void sub_813E804(struct Sprite *sprite) if (sprite->data[3] < 40) sprite->data[3] += 2; //This useless '+ 0' is needed to make the asm match - sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x + gSineTable[(u8)(sprite->data[1] + 64)] * sprite->data[3] / 256; - sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + gSprites[sprite->data[0]].pos2.y + gSineTable[(u8)(sprite->data[1] + 0)] * sprite->data[3] / 512; + sprite->x = gSprites[sprite->data[0]].x + gSprites[sprite->data[0]].x2 + gSineTable[(u8)(sprite->data[1] + 64)] * sprite->data[3] / 256; + sprite->y = gSprites[sprite->data[0]].y + gSprites[sprite->data[0]].y2 + gSineTable[(u8)(sprite->data[1] + 0)] * sprite->data[3] / 512; sprite->data[1] += 2; - sprite->pos2.y = gSineTable[(u8)(sprite->data[2] + 0)] / 32; + sprite->y2 = gSineTable[(u8)(sprite->data[2] + 0)] / 32; sprite->data[2] += 8; if ((sprite->data[1] & 0xFF) < 128) sprite->subpriority = gSprites[sprite->data[0]].subpriority - 1; @@ -2601,7 +2601,7 @@ static void sub_813E930(u8 a) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gSpriteTemplate_840B124, gSprites[a].pos1.x, gSprites[a].pos1.y, 0); + spriteId = CreateSprite(&gSpriteTemplate_840B124, gSprites[a].x, gSprites[a].y, 0); if (spriteId != 64) { gSprites[spriteId].data[0] = a; @@ -2624,8 +2624,8 @@ static void sub_813E980(struct Sprite *sprite) sprite->invisible = gSprites[sprite->data[0]].invisible; sprite->data[7]++; sprite->data[6] += 8; - sprite->pos1.x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; - sprite->pos1.y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; + sprite->x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; + sprite->y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; r0 = sprite->data[6] / 16; if (r0 > 9) r0 = 9; @@ -2655,8 +2655,8 @@ static void sub_813EA60(struct Sprite *sprite) r6 = (sprite->data[7] & 1); if (!r6) { - r1 = sprite->data[1] + gSprites[sprite->data[0]].pos1.x; - r2 = sprite->data[2] + gSprites[sprite->data[0]].pos1.y; + r1 = sprite->data[1] + gSprites[sprite->data[0]].x; + r2 = sprite->data[2] + gSprites[sprite->data[0]].y; spriteId = CreateSprite(&gSpriteTemplate_840B150, r1, r2, gSprites[sprite->data[0]].subpriority + 1); if (spriteId != 64) { @@ -2704,11 +2704,11 @@ static void sub_813EBBC(struct Sprite *sprite) sprite->invisible = gSprites[sprite->data[0]].invisible; sprite->data[7] += 1; sprite->data[6] += 8; - sprite->pos1.x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; - sprite->pos1.y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; - sprite->pos2.y = gSineTable[(u8)(sprite->data[1] + 0)] / 64; + sprite->x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; + sprite->y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; + sprite->y2 = gSineTable[(u8)(sprite->data[1] + 0)] / 64; sprite->data[1] += 16; - if (sprite->pos1.y < sprite->data[2]) + if (sprite->y < sprite->data[2]) DestroySprite(sprite); } } @@ -2733,8 +2733,8 @@ static void sub_813EC90(struct Sprite *sprite) r6 = sprite->data[7] & 1; if (!r6) { - r1 = sprite->data[1] + gSprites[sprite->data[0]].pos1.x; - r2 = sprite->data[2] + gSprites[sprite->data[0]].pos1.y; + r1 = sprite->data[1] + gSprites[sprite->data[0]].x; + r2 = sprite->data[2] + gSprites[sprite->data[0]].y; spriteId = CreateSprite(&gSpriteTemplate_840B1B0, r1, r2, gSprites[sprite->data[0]].subpriority + 1); if (spriteId != 64) { diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index d20049136..45f104f83 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -533,17 +533,17 @@ void sub_814910C(struct Sprite *sprite) } else { - s32 var = ((sprite->pos1.x << 16) | (u16)sprite->data[2]) + (u16)sprite->data[1]; - sprite->pos1.x = var >> 16; + s32 var = ((sprite->x << 16) | (u16)sprite->data[2]) + (u16)sprite->data[1]; + sprite->x = var >> 16; sprite->data[2] = var; - if (sprite->pos1.x > 255) sprite->pos1.x = 0xFFE0; + if (sprite->x > 255) sprite->x = 0xFFE0; if (sprite->data[0]) { - sprite->pos2.y = -(gUnknown_02039358 + gUnknown_0203935A); + sprite->y2 = -(gUnknown_02039358 + gUnknown_0203935A); } else { - sprite->pos2.y = -gUnknown_02039358; + sprite->y2 = -gUnknown_02039358; } } } @@ -590,10 +590,10 @@ void nullsub_82(struct Sprite *sprite) void sub_81492A0(struct Sprite* sprite) { sprite->invisible = gSprites[sprite->data[0]].invisible; - sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; - sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + 8; - sprite->pos2.x = gSprites[sprite->data[0]].pos2.x; - sprite->pos2.y = gSprites[sprite->data[0]].pos2.y; + sprite->x = gSprites[sprite->data[0]].x; + sprite->y = gSprites[sprite->data[0]].y + 8; + sprite->x2 = gSprites[sprite->data[0]].x2; + sprite->y2 = gSprites[sprite->data[0]].y2; } @@ -621,9 +621,9 @@ void nullsub_83(struct Sprite *sprite) void sub_81493C4(struct Sprite* sprite) { sprite->invisible = gSprites[sprite->data[0]].invisible; - sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; - sprite->pos2.x = gSprites[sprite->data[0]].pos2.x; - sprite->pos2.y = gSprites[sprite->data[0]].pos2.y; + sprite->y = gSprites[sprite->data[0]].y; + sprite->x2 = gSprites[sprite->data[0]].x2; + sprite->y2 = gSprites[sprite->data[0]].y2; } u8 intro_create_latios_sprite(s16 a, s16 b) diff --git a/src/item_menu.c b/src/item_menu.c index 54ad4518b..b05bf2e49 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -3922,7 +3922,7 @@ static void sub_80A79EC(struct Sprite *sprite) { sprite->animBeginning = TRUE; sprite->animNum = 0; - sprite->pos1.y -= 4; + sprite->y -= 4; sprite->data[0] = 4; sprite->data[3] = 1; sub_80A7AE4(sprite); @@ -3933,7 +3933,7 @@ static void sub_80A79EC(struct Sprite *sprite) { if (sprite->data[1] != 0) { - sprite->pos1.y++; + sprite->y++; sprite->data[0]--; } sprite->data[1] = (sprite->data[1] + 1) & 1; @@ -4310,7 +4310,7 @@ u8 CreateBerrySprite(u8 berryId, s16 x, s16 y) static void SpriteCB_BerrySprite(struct Sprite *sprite) { - sprite->pos2.y = -gBattle_BG1_Y; + sprite->y2 = -gBattle_BG1_Y; } void sub_80A7DD4(void) diff --git a/src/main_menu.c b/src/main_menu.c index 0e0e987d8..7748959ca 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -780,8 +780,8 @@ static void Task_NewGameSpeech2(u8 taskId) //Initialize Birch sprite u8 spriteId = gTasks[taskId].tBirchSpriteId; - gSprites[spriteId].pos1.x = 136; - gSprites[spriteId].pos1.y = 60; + gSprites[spriteId].x = 136; + gSprites[spriteId].y = 60; gSprites[spriteId].invisible = FALSE; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; StartSpriteFadeIn(taskId, 10); @@ -831,8 +831,8 @@ static void Task_NewGameSpeech6(u8 taskId) { u8 spriteId = gTasks[taskId].tAzurillSpriteId; - gSprites[spriteId].pos1.x = 104; - gSprites[spriteId].pos1.y = 72; + gSprites[spriteId].x = 104; + gSprites[spriteId].y = 72; gSprites[spriteId].invisible = FALSE; gSprites[spriteId].data[0] = 0; CreatePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF); @@ -928,8 +928,8 @@ static void Task_NewGameSpeech12(u8 taskId) //Initialize Brendan sprite u8 spriteId = gTasks[taskId].tBrendanSpriteId; - gSprites[spriteId].pos1.x = 180; - gSprites[spriteId].pos1.y = 60; + gSprites[spriteId].x = 180; + gSprites[spriteId].y = 60; gSprites[spriteId].invisible = FALSE; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; gTasks[taskId].tTrainerSpriteId = spriteId; @@ -1009,7 +1009,7 @@ static void Task_NewGameSpeech17(u8 taskId) if (gTasks[taskId].tSubtaskIsDone == FALSE) { - gSprites[spriteId].pos1.x += 4; //Move sprite right + gSprites[spriteId].x += 4; //Move sprite right } else { @@ -1020,8 +1020,8 @@ static void Task_NewGameSpeech17(u8 taskId) spriteId = gTasks[taskId].tMaySpriteId; else spriteId = gTasks[taskId].tBrendanSpriteId; - gSprites[spriteId].pos1.x = 240; - gSprites[spriteId].pos1.y = 60; + gSprites[spriteId].x = 240; + gSprites[spriteId].y = 60; gSprites[spriteId].invisible = FALSE; gTasks[taskId].tTrainerSpriteId = spriteId; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; @@ -1035,13 +1035,13 @@ static void Task_NewGameSpeech18(u8 taskId) { u8 spriteId = gTasks[taskId].tTrainerSpriteId; - if (gSprites[spriteId].pos1.x > 180) + if (gSprites[spriteId].x > 180) { - gSprites[spriteId].pos1.x -= 4; //Move sprite left + gSprites[spriteId].x -= 4; //Move sprite left } else { - gSprites[spriteId].pos1.x = 180; + gSprites[spriteId].x = 180; if (gTasks[taskId].tSubtaskIsDone) { gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL; @@ -1175,13 +1175,13 @@ static void Task_NewGameSpeech27(u8 taskId) //Fade in Birch and Azurill spriteId = (u8)gTasks[taskId].tBirchSpriteId; - gSprites[spriteId].pos1.x = 136; - gSprites[spriteId].pos1.y = 64; + gSprites[spriteId].x = 136; + gSprites[spriteId].y = 64; gSprites[spriteId].invisible = FALSE; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; spriteId = (u8)gTasks[taskId].tAzurillSpriteId; - gSprites[spriteId].pos1.x = 104; - gSprites[spriteId].pos1.y = 72; + gSprites[spriteId].x = 104; + gSprites[spriteId].y = 72; gSprites[spriteId].invisible = FALSE; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; @@ -1249,8 +1249,8 @@ static void Task_NewGameSpeech29(u8 taskId) spriteId = (u8)gTasks[taskId].tMaySpriteId; else spriteId = (u8)gTasks[taskId].tBrendanSpriteId; - gSprites[spriteId].pos1.x = 120; - gSprites[spriteId].pos1.y = 60; + gSprites[spriteId].x = 120; + gSprites[spriteId].y = 60; gSprites[spriteId].invisible = FALSE; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; gTasks[taskId].tTrainerSpriteId = spriteId; @@ -1377,8 +1377,8 @@ void CB_ContinueNewGameSpeechPart2() spriteId = gTasks[taskId].tBrendanSpriteId; } - gSprites[spriteId].pos1.x = 180; - gSprites[spriteId].pos1.y = 60; + gSprites[spriteId].x = 180; + gSprites[spriteId].y = 60; gSprites[spriteId].invisible = FALSE; gTasks[taskId].tTrainerSpriteId = spriteId; @@ -1413,8 +1413,8 @@ void nullsub_34(struct Sprite *sprite) void ShrinkPlayerSprite(struct Sprite *sprite) { - u32 y = (sprite->pos1.y << 16) + sprite->data[0] + 0xC000; - sprite->pos1.y = y >> 16; + u32 y = (sprite->y << 16) + sprite->data[0] + 0xC000; + sprite->y = y >> 16; sprite->data[0] = y; } diff --git a/src/menu_cursor.c b/src/menu_cursor.c index 254723f17..287c03a55 100644 --- a/src/menu_cursor.c +++ b/src/menu_cursor.c @@ -139,8 +139,8 @@ void MenuCursor_SetPos814A880(u8 a1, u8 a2) spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; - spr->pos1.x = a1; - spr->pos1.y = a2; + spr->x = a1; + spr->y = a2; } if (gUnknown_0203A3D1 != 0x40) @@ -149,8 +149,8 @@ void MenuCursor_SetPos814A880(u8 a1, u8 a2) spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; - spr->pos1.x = a1; - spr->pos1.y = a2; + spr->x = a1; + spr->y = a2; } return; @@ -747,8 +747,8 @@ void MenuCursor_SetPos814AD7C(u8 a1, u8 a2) spr->invisible = FALSE; spr->centerToCornerVecX = 0; spr->centerToCornerVecY = 0; - spr->pos1.x = a1; - spr->pos1.y = a2; + spr->x = a1; + spr->y = a2; } return; } diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 388d98ec7..87245fe81 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -391,7 +391,7 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].data[2] = -1; if (gVerticalScrollIndicatorIds[BOTTOM_ARROW] != 0xFF) { - gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].pos2.y = gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].pos2.y * -1; + gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].y2 = gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].y2 * -1; gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].data[3] = gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].data[3]; } else @@ -408,7 +408,7 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].data[2] = 1; if (gVerticalScrollIndicatorIds[TOP_ARROW] != 0xFF) { - gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].pos2.y = gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].pos2.y * -1; + gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].y2 = gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].y2 * -1; gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].data[3] = gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].data[3]; } else @@ -425,7 +425,7 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].data[0] = -1; if (gVerticalScrollIndicatorIds[RIGHT_ARROW] != 0xFF) { - gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].pos2.x = gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].pos2.x * -1; + gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].x2 = gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].x2 * -1; gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].data[1] = gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].data[1]; } else @@ -442,7 +442,7 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].data[0] = 1; if (gVerticalScrollIndicatorIds[LEFT_ARROW] != 0xFF) { - gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].pos2.x = gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].pos2.x * -1; + gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].x2 = gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].x2 * -1; gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].data[1] = gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].data[1]; } else @@ -487,11 +487,11 @@ static void sub_80F9834(struct Sprite *sprite) { if (sprite->data[1] == 0) { - sprite->pos2.x += sprite->data[0]; + sprite->x2 += sprite->data[0]; } if (sprite->data[3] == 0) { - sprite->pos2.y += sprite->data[2]; + sprite->y2 += sprite->data[2]; } sprite->data[1]++; sprite->data[3]++; @@ -503,13 +503,13 @@ static void sub_80F9834(struct Sprite *sprite) { sprite->data[3] = 0; } - if (sprite->pos2.x == 8 || sprite->pos2.x == -8) + if (sprite->x2 == 8 || sprite->x2 == -8) { - sprite->pos2.x = 0; + sprite->x2 = 0; } - if (sprite->pos2.y == 8 || sprite->pos2.y == -8) + if (sprite->y2 == 8 || sprite->y2 == -8) { - sprite->pos2.y = 0; + sprite->y2 = 0; } } @@ -533,8 +533,8 @@ static void ResetVerticalScrollIndicators(u8 id) { if (gVerticalScrollIndicatorIds[id] != 0xFF && id < 4) { - gSprites[gVerticalScrollIndicatorIds[id]].pos2.x = 0; - gSprites[gVerticalScrollIndicatorIds[id]].pos2.y = 0; + gSprites[gVerticalScrollIndicatorIds[id]].x2 = 0; + gSprites[gVerticalScrollIndicatorIds[id]].y2 = 0; gSprites[gVerticalScrollIndicatorIds[id]].data[1] = 0; gSprites[gVerticalScrollIndicatorIds[id]].data[3] = 0; } diff --git a/src/mon_markings.c b/src/mon_markings.c index dcdc54434..7b4055421 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -505,7 +505,7 @@ void sub_80F761C(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) } } - sMenu->menuWindowSprites[1]->pos1.y = y + 96; + sMenu->menuWindowSprites[1]->y = y + 96; sprTemplate.tileTag++; sprTemplate.paletteTag++; @@ -538,8 +538,8 @@ void sub_80F761C(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) sMenu->menuTextSprite->oam.shape = ST_OAM_H_RECTANGLE; sMenu->menuTextSprite->oam.size = 3; StartSpriteAnim(sMenu->menuTextSprite, 9); - sMenu->menuTextSprite->pos1.x = x + MENU_TEXT_SPRITE_X_OFFSET; - sMenu->menuTextSprite->pos1.y = y + 80; + sMenu->menuTextSprite->x = x + MENU_TEXT_SPRITE_X_OFFSET; + sMenu->menuTextSprite->y = y + 80; CalcCenterToCornerVec(sMenu->menuTextSprite, 1, 2, 0); } else @@ -567,7 +567,7 @@ void sub_80F78CC(struct Sprite *sprite) void sub_80F7908(struct Sprite *sprite) { - sprite->pos1.y = 16 * sMenu->cursorPos + sMenu->cursorBaseY; + sprite->y = 16 * sMenu->cursorPos + sMenu->cursorBaseY; } struct Sprite *sub_80F7920(u16 tileTag, u16 paletteTag, const u16 *palette) diff --git a/src/move_tutor_menu.c b/src/move_tutor_menu.c index e17a1d3ea..50dcb4f5e 100644 --- a/src/move_tutor_menu.c +++ b/src/move_tutor_menu.c @@ -364,7 +364,7 @@ static void MoveTutorMain(void) DrawLearnMoveMenuWindow(); DrawBattleMoveInfoHeaders(FALSE); DrawMoveSelectionWindow(); - gSprites[1].pos1.x = 0x48; + gSprites[1].x = 0x48; sMoveTutorMenu->redrawMoveInfoWindow = TRUE; BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP; @@ -381,7 +381,7 @@ static void MoveTutorMain(void) DrawMoveSelectionWindow(); sMoveTutorMenu->redrawMoveInfoWindow = TRUE; sMoveTutorMenu->state++; - gSprites[1].pos1.x = 0x48; + gSprites[1].x = 0x48; break; case 4: if (!ChangeToContestMoveInfoWindow()) @@ -391,7 +391,7 @@ static void MoveTutorMain(void) DrawContestMoveInfoHeaders(FALSE); DrawMoveSelectionWindow(); sMoveTutorMenu->redrawMoveInfoWindow = TRUE; - gSprites[1].pos1.x = 0x48; + gSprites[1].x = 0x48; sMoveTutorMenu->state++; break; case 6: @@ -567,7 +567,7 @@ static void MoveTutorMain(void) DrawBattleMoveInfoHeaders(TRUE); if (sMoveTutorMenu->showContestInfo == TRUE) { - gSprites[1].pos1.x = 0x48; + gSprites[1].x = 0x48; DrawContestMoveInfoHeaders(TRUE); } DrawMoveInfoWindow(sMoveTutorMenu->showContestInfo, 1); @@ -754,10 +754,10 @@ static void UpdateMoveTutorMenuCursorPosition(struct Sprite *sprite) case 0: break; case 1: - sprite->pos2.x = Sin(var, 3) * sprite->data[2]; + sprite->x2 = Sin(var, 3) * sprite->data[2]; break; case 2: - sprite->pos2.y = Sin(var, 1) * sprite->data[2]; + sprite->y2 = Sin(var, 1) * sprite->data[2]; break; } sprite->data[1]++; diff --git a/src/naming_screen.c b/src/naming_screen.c index eb0d5fd22..a1297d3ad 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1015,8 +1015,8 @@ static void SetCursorPos(s16 x, s16 y) { struct Sprite *cursorSprite = &gSprites[namingScreenDataPtr->cursorSpriteId]; - cursorSprite->pos1.x = CursorColToKeyboardCol(x) * 8 + 27; - cursorSprite->pos1.y = y * 16 + 80; + cursorSprite->x = CursorColToKeyboardCol(x) * 8 + 27; + cursorSprite->y = y * 16 + 80; cursorSprite->data[2] = cursorSprite->data[0]; cursorSprite->data[3] = cursorSprite->data[1]; cursorSprite->data[0] = x; @@ -1170,11 +1170,11 @@ static u8 sub_80B6B9C(struct Sprite *sprite) struct Sprite *r4 = &gSprites[sprite->data[6]]; struct Sprite *r5 = &gSprites[sprite->data[7]]; - r4->pos2.y++; - if (r4->pos2.y > 7) + r4->y2++; + if (r4->y2 > 7) { sprite->data[0]++; - r4->pos2.y = -4; + r4->y2 = -4; r4->invisible = TRUE; sub_80B6C48(((u8)sprite->data[1] + 1) % 3, r4, r5); } @@ -1186,10 +1186,10 @@ static u8 sub_80B6C08(struct Sprite *sprite) struct Sprite *r2 = &gSprites[sprite->data[6]]; r2->invisible = FALSE; - r2->pos2.y++; - if (r2->pos2.y >= 0) + r2->y2++; + if (r2->y2 >= 0) { - r2->pos2.y = 0; + r2->y2 = 0; sprite->data[0] = 1; } return 0; @@ -1245,7 +1245,7 @@ void sub_80B6D9C(struct Sprite *sprite) sprite->data[0] = 8; sprite->data[1] = (sprite->data[1] + 1) & 3; } - sprite->pos2.x = arr[sprite->data[1]]; + sprite->x2 = arr[sprite->data[1]]; } void sub_80B6DE8(struct Sprite *sprite) @@ -1256,13 +1256,13 @@ void sub_80B6DE8(struct Sprite *sprite) var = GetTextCaretPosition(); if (var != (u8)sprite->data[0]) { - sprite->pos2.y = 0; + sprite->y2 = 0; sprite->data[1] = 0; sprite->data[2] = 0; } else { - sprite->pos2.y = arr[sprite->data[1]]; + sprite->y2 = arr[sprite->data[1]]; sprite->data[2]++; if (sprite->data[2] > 8) { diff --git a/src/overworld.c b/src/overworld.c index 8bd3825b5..83a575eec 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -2745,8 +2745,8 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite) { struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[sprite->data[0]]; struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerObjEvent->objEventId]; - sprite->pos1.x = objEvent->initialCoords.x; - sprite->pos1.y = objEvent->initialCoords.y; + sprite->x = objEvent->initialCoords.x; + sprite->y = objEvent->initialCoords.y; SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation); if (!linkPlayerObjEvent->mode) diff --git a/src/party_menu.c b/src/party_menu.c index 1608ea5d6..e5e6d5291 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1356,8 +1356,8 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed) ewram1B000.unk261 = 2; - gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data[0]].x; - gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data[0]].y; + gSprites[spriteId].x = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data[0]].x; + gSprites[spriteId].y = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data[0]].y; } else { @@ -1380,8 +1380,8 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed) ewram1B000.unk261 = 2; - gSprites[spriteId].pos1.x = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data[0]].x; - gSprites[spriteId].pos1.y = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data[0]].y; + gSprites[spriteId].x = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data[0]].x; + gSprites[spriteId].y = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data[0]].y; } UpdateMonIconFrame_806DA44(taskId, gSprites[spriteId].data[0], 1); @@ -1683,8 +1683,8 @@ void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed) break; } - gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data[0]].x; - gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data[0]].y; + gSprites[spriteId].x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data[0]].x; + gSprites[spriteId].y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data[0]].y; newMenuIndex = gSprites[spriteId].data[0]; @@ -1721,8 +1721,8 @@ void SelectBattleTowerOKButton(u8 taskId) gSprites[spriteId].data[1] = 0; gSprites[spriteId].data[0] = 6; - gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][6].x; - gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][6].y; + gSprites[spriteId].x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][6].x; + gSprites[spriteId].y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][6].y; sub_806BB9C(2); @@ -1778,8 +1778,8 @@ void sub_806C9C4(u8 taskId, u8 spriteId) { u8 spriteId2 = sub_806CA00(taskId); - gSprites[spriteId].pos1.x = gSprites[spriteId2].pos1.x; - gSprites[spriteId].pos1.y = gSprites[spriteId2].pos1.y; + gSprites[spriteId].x = gSprites[spriteId2].x; + gSprites[spriteId].y = gSprites[spriteId2].y; gSprites[spriteId].data[0] = gSprites[spriteId2].data[0]; } @@ -1966,98 +1966,16 @@ void SwapValues_s16(s16 *a, s16 *b) *b = temp; } -// not really sure, but creates +4 -#ifdef NONMATCHING void sub_806CF04(void) { - SwapValues_s16(&gSprites[ewram01000.unk3].pos1.x, &gSprites[ewram01000.unk4].pos1.x); - SwapValues_s16(&gSprites[ewram01000.unk3].pos1.y, &gSprites[ewram01000.unk4].pos1.y); - SwapValues_s16(&gSprites[ewram01000.unk3].pos2.x, &gSprites[ewram01000.unk4].pos2.x); + SwapValues_s16(&gSprites[ewram01000.unk3].x, &gSprites[ewram01000.unk4].x); + SwapValues_s16(&gSprites[ewram01000.unk3].y, &gSprites[ewram01000.unk4].y); + SwapValues_s16(&gSprites[ewram01000.unk3].x2, &gSprites[ewram01000.unk4].x2); SwapValues_s16(&gSprites[ewram01000.unk3].data[0], &gSprites[ewram01000.unk4].data[0]); gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C; gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C; } -#else -NAKED -void sub_806CF04(void) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - ldr r4, _0806CF94 @ =gSharedMem + 0x1000\n\ - ldrb r1, [r4, 0x3]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - ldr r5, _0806CF98 @ =gSprites + 0x20\n\ - adds r0, r5\n\ - ldrb r2, [r4, 0x4]\n\ - lsls r1, r2, 4\n\ - adds r1, r2\n\ - lsls r1, 2\n\ - adds r1, r5\n\ - bl SwapValues_s16\n\ - ldrb r1, [r4, 0x3]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r3, r5, 0x2\n\ - adds r0, r3\n\ - ldrb r2, [r4, 0x4]\n\ - lsls r1, r2, 4\n\ - adds r1, r2\n\ - lsls r1, 2\n\ - adds r1, r3\n\ - bl SwapValues_s16\n\ - ldrb r1, [r4, 0x3]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r3, r5, 0x4\n\ - adds r0, r3\n\ - ldrb r2, [r4, 0x4]\n\ - lsls r1, r2, 4\n\ - adds r1, r2\n\ - lsls r1, 2\n\ - adds r1, r3\n\ - bl SwapValues_s16\n\ - ldrb r1, [r4, 0x3]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r3, r5, 0\n\ - adds r3, 0xE\n\ - adds r0, r3\n\ - ldrb r2, [r4, 0x4]\n\ - lsls r1, r2, 4\n\ - adds r1, r2\n\ - lsls r1, 2\n\ - adds r1, r3\n\ - bl SwapValues_s16\n\ - ldrb r1, [r4, 0x3]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - subs r5, 0x4\n\ - adds r0, r5\n\ - ldr r2, _0806CF9C @ =SpriteCB_sub_806D37C\n\ - str r2, [r0]\n\ - ldrb r1, [r4, 0x4]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r5\n\ - str r2, [r0]\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_0806CF94: .4byte gSharedMem + 0x1000\n\ -_0806CF98: .4byte gSprites + 0x20\n\ -_0806CF9C: .4byte SpriteCB_sub_806D37C\n\ - .syntax divided\n"); -} -#endif // NONMATCHING void sub_806CFA0(u8 taskId, u8 b) { @@ -2149,16 +2067,16 @@ void sub_806D198(u8 taskId) SetMonIconSpriteId(ewram01000.unk0, ewram01000.unk5, ewram01000.unk4); SetMonIconSpriteId(ewram01000.unk0, ewram01000.unk6, ewram01000.unk3); - gSprites[ewram01000.unk3].pos1.x = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk6].x; - gSprites[ewram01000.unk3].pos1.y = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk6].y; - gSprites[ewram01000.unk3].pos2.x = 0; - gSprites[ewram01000.unk3].pos2.y = 0; + gSprites[ewram01000.unk3].x = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk6].x; + gSprites[ewram01000.unk3].y = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk6].y; + gSprites[ewram01000.unk3].x2 = 0; + gSprites[ewram01000.unk3].y2 = 0; gSprites[ewram01000.unk3].callback = UpdateMonIconFrame_806DA38; - gSprites[ewram01000.unk4].pos1.x = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk5].x; - gSprites[ewram01000.unk4].pos1.y = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk5].y; - gSprites[ewram01000.unk4].pos2.x = 0; - gSprites[ewram01000.unk4].pos2.y = 0; + gSprites[ewram01000.unk4].x = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk5].x; + gSprites[ewram01000.unk4].y = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk5].y; + gSprites[ewram01000.unk4].x2 = 0; + gSprites[ewram01000.unk4].y2 = 0; gSprites[ewram01000.unk4].callback = UpdateMonIconFrame_806DA38; spriteId = GetMonIconSpriteId(ewram01000.unk0, gSprites[ewram01000.unk2].data[0]); @@ -2184,7 +2102,7 @@ void SpriteCB_sub_806D37C(struct Sprite *sprite) { UpdateMonIconFrame(sprite); - if (sprite->pos2.x == sprite->data[2]) + if (sprite->x2 == sprite->data[2]) { sprite->data[0] *= -1; sprite->data[2] = 0; @@ -2192,7 +2110,7 @@ void SpriteCB_sub_806D37C(struct Sprite *sprite) } else { - sprite->pos2.x += sprite->data[0]; + sprite->x2 += sprite->data[0]; } } @@ -2234,7 +2152,7 @@ void sub_806D4AC(u8 taskId, u16 species, u8 c) void sub_806D50C(u8 taskId, u8 monIndex) { - gSprites[GetMonIconSpriteId(taskId, monIndex)].pos1.x += 0xF0; + gSprites[GetMonIconSpriteId(taskId, monIndex)].x += 0xF0; } void PrintPartyMenuPromptText(u8 textId, u8 b) @@ -2409,9 +2327,9 @@ void UpdateMonIconFrame_806DA0C(struct Sprite *sprite) if (var1) { if (var1 & 1) - sprite->pos2.y = -3; + sprite->y2 = -3; else - sprite->pos2.y = 1; + sprite->y2 = 1; } } @@ -2427,7 +2345,7 @@ void UpdateMonIconFrame_806DA44(u8 taskId, u8 monIndex, u8 c) if (monIndex < PARTY_SIZE) { spriteId = GetMonIconSpriteId(taskId, monIndex); - gSprites[spriteId].pos2.y = 0; + gSprites[spriteId].y2 = 0; gSprites[spriteId].data[0] = 0; if (!c) @@ -2454,8 +2372,8 @@ void SpriteCB_HeldItemIcon(struct Sprite *sprite) else { sprite->invisible = FALSE; - sprite->pos1.x = gSprites[data7].pos1.x + gSprites[data7].pos2.x; - sprite->pos1.y = gSprites[data7].pos1.y + gSprites[data7].pos2.y; + sprite->x = gSprites[data7].x + gSprites[data7].x2; + sprite->y = gSprites[data7].y + gSprites[data7].y2; } } @@ -2467,8 +2385,8 @@ void CreateHeldItemIcon(u8 a, u8 b) subPriority = gSprites[a].subpriority; spriteId = CreateSprite(&gSpriteTemplate_837660C, 0xFA, 0xAA, subPriority - 1); - gSprites[spriteId].pos2.x = 4; - gSprites[spriteId].pos2.y = 10; + gSprites[spriteId].x2 = 4; + gSprites[spriteId].y2 = 10; gSprites[spriteId].callback = SpriteCB_HeldItemIcon; gSprites[spriteId].data[7] = a; @@ -2515,8 +2433,8 @@ void CreateHeldItemIcons_806DC34(u8 taskId) monIconSpriteId = GetMonIconSpriteId(taskId, i); heldItemSpriteId = CreateSprite(&gSpriteTemplate_837660C, 0xFA, 0xAA, 4); - gSprites[heldItemSpriteId].pos2.x = 4; - gSprites[heldItemSpriteId].pos2.y = 10; + gSprites[heldItemSpriteId].x2 = 4; + gSprites[heldItemSpriteId].y2 = 10; gSprites[heldItemSpriteId].data[7] = monIconSpriteId; gSprites[monIconSpriteId].data[7] = heldItemSpriteId; @@ -2536,8 +2454,8 @@ void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item) monIconSpriteId = GetMonIconSpriteId(taskId, monIndex); heldItemSpriteId = CreateSprite(&gSpriteTemplate_837660C, 0xFA, 0xAA, 4); - gSprites[heldItemSpriteId].pos2.x = 4; - gSprites[heldItemSpriteId].pos2.y = 10; + gSprites[heldItemSpriteId].x2 = 4; + gSprites[heldItemSpriteId].y2 = 10; gSprites[heldItemSpriteId].data[7] = monIconSpriteId; gSprites[monIconSpriteId].data[7] = heldItemSpriteId; @@ -2652,8 +2570,8 @@ void SpriteCB_UpdateHeldItemIconPosition(struct Sprite *sprite) { u8 spriteId = sprite->data[7]; - sprite->pos1.x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - sprite->pos1.y = gSprites[spriteId].pos1.y; + sprite->x = gSprites[spriteId].x + gSprites[spriteId].x2; + sprite->y = gSprites[spriteId].y; } u8 GetMonIconSpriteId(u8 taskId, u8 monIndex) diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c index 1bd87ea24..8b376a49a 100644 --- a/src/pc_screen_effect.c +++ b/src/pc_screen_effect.c @@ -227,8 +227,8 @@ static void sub_80C6078(void) static void sub_80C60CC(struct Sprite *sprite) { - sprite->pos1.x += sprite->data[0]; - if (sprite->pos1.x < -0x08 || sprite->pos1.x > 0xf8) + sprite->x += sprite->data[0]; + if (sprite->x < -0x08 || sprite->x > 0xf8) { DestroySprite(sprite); gUnknown_020387EC->unk0A++; @@ -246,23 +246,23 @@ static void sub_80C6130(struct Sprite *sprite) { if (sprite->data[4] == 0 && gUnknown_020387EC->unk0C == 1) { - sprite->pos1.x += sprite->data[0]; - if (sprite->pos1.x > -0x10 && sprite->pos1.x < 0x100) + sprite->x += sprite->data[0]; + if (sprite->x > -0x10 && sprite->x < 0x100) sprite->invisible = FALSE; if (sprite->data[1] > 0) { - if (sprite->pos1.x >= sprite->data[2]) + if (sprite->x >= sprite->data[2]) sprite->data[4] = 1; } else { - if (sprite->pos1.x <= sprite->data[2]) + if (sprite->x <= sprite->data[2]) sprite->data[4] = 1; } if (sprite->data[4]) { gUnknown_020387EC->unk0A++; - sprite->pos1.x = sprite->data[2]; + sprite->x = sprite->data[2]; } } } diff --git a/src/pokeball.c b/src/pokeball.c index 58c1bbaa9..34bb2bfbd 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -372,13 +372,13 @@ static void SendOutMonAnimation(u8 taskId) { case 0xFF: // Player's side gBattlerTarget = battler; - gSprites[spriteId].pos1.x = 24; - gSprites[spriteId].pos1.y = 68; + gSprites[spriteId].x = 24; + gSprites[spriteId].y = 68; gSprites[spriteId].callback = SendOutPlayerMonAnimation_Step0; break; case 0xFE: // Opponent's side - gSprites[spriteId].pos1.x = GetBattlerSpriteCoord(battler, 0); - gSprites[spriteId].pos1.y = GetBattlerSpriteCoord(battler, 1) + 24; + gSprites[spriteId].x = GetBattlerSpriteCoord(battler, 0); + gSprites[spriteId].y = GetBattlerSpriteCoord(battler, 1) + 24; gBattlerTarget = battler; gSprites[spriteId].data[0] = 0; gSprites[spriteId].callback = SendOutOpponentMonAnimation_Step0; @@ -418,13 +418,13 @@ static void objc_0804ABD4(struct Sprite *sprite) StartSpriteAnim(sprite, 1); sprite->affineAnimPaused = TRUE; - 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[5] = 0; r4 = ball_number_to_ball_processing_index(GetBattlerBall(r5)); - AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4); + AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 0x1C, r4); sprite->data[0] = sub_8141314(0, r5, 14, r4); sprite->data[6] = r5; sprite->data[7] = r8; @@ -466,7 +466,7 @@ static void sub_8046760(struct Sprite *sprite) else { gSprites[gBattlerSpriteIds[sprite->data[6]]].data[1] += 0x60; - gSprites[gBattlerSpriteIds[sprite->data[6]]].pos2.y = -gSprites[gBattlerSpriteIds[sprite->data[6]]].data[1] >> 8; + gSprites[gBattlerSpriteIds[sprite->data[6]]].y2 = -gSprites[gBattlerSpriteIds[sprite->data[6]]].data[1] >> 8; } } @@ -480,8 +480,8 @@ static void sub_80467F8(struct Sprite *sprite) sprite->data[3] = 0; sprite->data[4] = 32; sprite->data[5] = 0; - sprite->pos1.y += Cos(0, 32); - sprite->pos2.y = -Cos(0, sprite->data[4]); + sprite->y += Cos(0, 32); + sprite->y2 = -Cos(0, sprite->data[4]); sprite->callback = sub_804684C; } } @@ -494,7 +494,7 @@ static void sub_804684C(struct Sprite *sprite) switch (sprite->data[3] & 0xFF) { case 0: - sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->y2 = -Cos(sprite->data[5], sprite->data[4]); sprite->data[5] += 4 + (sprite->data[3] >> 8); if (sprite->data[5] >= 64) { @@ -520,7 +520,7 @@ static void sub_804684C(struct Sprite *sprite) } break; case 1: - sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->y2 = -Cos(sprite->data[5], sprite->data[4]); sprite->data[5] -= 4 + (sprite->data[3] >> 8); if (sprite->data[5] <= 0) { @@ -532,8 +532,8 @@ static void sub_804684C(struct Sprite *sprite) if (r5) { sprite->data[3] = 0; - sprite->pos1.y += Cos(64, 32); - sprite->pos2.y = 0; + sprite->y += Cos(64, 32); + sprite->y2 = 0; if (sprite->data[7] == 0) { sprite->callback = sub_8046C78; @@ -566,7 +566,7 @@ static void sub_8046984(struct Sprite *sprite) { case 0: case 2: - sprite->pos2.x += sprite->data[4]; + sprite->x2 += sprite->data[4]; sprite->data[5] += sprite->data[4]; sprite->affineAnimPaused = FALSE; if (sprite->data[5] > 3 || sprite->data[5] < -3) @@ -703,7 +703,7 @@ static void sub_8046C78(struct Sprite *sprite) StartSpriteAnim(sprite, 1); ballIndex = ball_number_to_ball_processing_index(GetBattlerBall(battler)); - AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex); + AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballIndex); sprite->data[0] = sub_8141314(1, sprite->data[6], 14, ballIndex); sprite->callback = sub_8046E9C; if (gMain.inBattle) @@ -784,14 +784,14 @@ static void sub_8046E9C(struct Sprite *sprite) else { gSprites[gBattlerSpriteIds[r4]].data[1] -= 288; - gSprites[gBattlerSpriteIds[r4]].pos2.y = gSprites[gBattlerSpriteIds[r4]].data[1] >> 8; + gSprites[gBattlerSpriteIds[r4]].y2 = gSprites[gBattlerSpriteIds[r4]].data[1] >> 8; } if (sprite->animEnded && r7) { s32 i; u32 r3; - gSprites[gBattlerSpriteIds[r4]].pos2.y = 0; + gSprites[gBattlerSpriteIds[r4]].y2 = 0; gDoingBattleAnim = 0; ewram17810[r4].unk0_3 = 0; FreeSpriteOamMatrix(sprite); @@ -868,7 +868,7 @@ static void SendOutPlayerMonAnimation_Step1(struct Sprite *sprite) r4 = sprite->data[0]; TranslateAnimLinear(sprite); sprite->data[7] += sprite->data[6] / 3; - sprite->pos2.y += Sin(HIBYTE(sprite->data[7]), sprite->data[5]); + sprite->y2 += Sin(HIBYTE(sprite->data[7]), sprite->data[5]); sprite->oam.affineParam += 0x100; if ((sprite->oam.affineParam >> 8) % 3 != 0) sprite->data[0] = r4; @@ -887,10 +887,10 @@ static void SendOutPlayerMonAnimation_Step1(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[6] = sprite->oam.affineParam & 0xFF; sprite->data[0] = 0; if (IsDoubleBattle() && ewram17840.unk9_0 && sprite->data[6] == GetBattlerAtPosition(2)) @@ -943,10 +943,10 @@ void CreatePokeballSprite(u8 a, u8 b, u8 x, u8 y, u8 e, u8 f, u8 g, u32 h) LoadCompressedObjectPalette(&sBallSpritePalettes[0]); spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, f); gSprites[spriteId].data[0] = a; - gSprites[spriteId].data[5] = gSprites[a].pos1.x; - gSprites[spriteId].data[6] = gSprites[a].pos1.y; - gSprites[a].pos1.x = x; - gSprites[a].pos1.y = y; + gSprites[spriteId].data[5] = gSprites[a].x; + gSprites[spriteId].data[6] = gSprites[a].y; + gSprites[a].x = x; + gSprites[a].y = y; gSprites[spriteId].data[1] = g; gSprites[spriteId].data[2] = b; gSprites[spriteId].data[3] = h; @@ -970,7 +970,7 @@ static void sub_80473D0(struct Sprite *sprite) else r5 = 0; StartSpriteAnim(sprite, 1); - sub_80472B0(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r5); + sub_80472B0(sprite->x, sprite->y - 5, sprite->oam.priority, r5); sprite->data[1] = sub_80472D8(1, r8, r4); sprite->callback = sub_804748C; gSprites[r7].invisible = FALSE; @@ -1000,24 +1000,24 @@ static void sub_804748C(struct Sprite *sprite) StartSpriteAffineAnim(&gSprites[r3], 0); r12 = TRUE; } - var1 = (sprite->data[5] - sprite->pos1.x) * sprite->data[7] / 128 + sprite->pos1.x; - var2 = (sprite->data[6] - sprite->pos1.y) * sprite->data[7] / 128 + sprite->pos1.y; - gSprites[r3].pos1.x = var1; - gSprites[r3].pos1.y = var2; + var1 = (sprite->data[5] - sprite->x) * sprite->data[7] / 128 + sprite->x; + var2 = (sprite->data[6] - sprite->y) * sprite->data[7] / 128 + sprite->y; + gSprites[r3].x = var1; + gSprites[r3].y = var2; if (sprite->data[7] < 128) { s16 sine = -(gSineTable[(u8)sprite->data[7]] / 8); sprite->data[7] += 4; - gSprites[r3].pos2.x = sine; - gSprites[r3].pos2.y = sine; + gSprites[r3].x2 = sine; + gSprites[r3].y2 = sine; } else { - gSprites[r3].pos1.x = sprite->data[5]; - gSprites[r3].pos1.y = sprite->data[6]; - gSprites[r3].pos2.x = 0; - gSprites[r3].pos2.y = 0; + gSprites[r3].x = sprite->data[5]; + gSprites[r3].y = sprite->data[6]; + gSprites[r3].x2 = 0; + gSprites[r3].y2 = 0; r6 = TRUE; } if (sprite->animEnded && r12 && r6) @@ -1055,7 +1055,7 @@ static void sub_8047638(struct Sprite *sprite) else r6 = 0; StartSpriteAnim(sprite, 1); - sub_80472B0(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r6); + sub_80472B0(sprite->x, sprite->y - 5, sprite->oam.priority, r6); sprite->data[1] = sub_80472D8(1, r8, r5); sprite->callback = sub_80476E0; StartSpriteAffineAnim(&gSprites[r7], 2); @@ -1086,7 +1086,7 @@ static void sub_80476E0(struct Sprite *sprite) else { gSprites[r1].data[1] += 96; - gSprites[r1].pos2.y = -gSprites[r1].data[1] >> 8; + gSprites[r1].y2 = -gSprites[r1].data[1] >> 8; } } @@ -1107,15 +1107,15 @@ void sub_804777C(u8 a) sprite->data[0] = 5; sprite->data[1] = 0; - sprite->pos2.x = 0x73; - sprite->pos2.y = 0; + sprite->x2 = 0x73; + sprite->y2 = 0; sprite->callback = sub_8047830; if (GetBattlerSide(a) != 0) { sprite->data[0] = -sprite->data[0]; sprite->data[1] = -sprite->data[1]; - sprite->pos2.x = -sprite->pos2.x; - sprite->pos2.y = -sprite->pos2.y; + sprite->x2 = -sprite->x2; + sprite->y2 = -sprite->y2; } gSprites[sprite->data[5]].callback(&gSprites[sprite->data[5]]); if (GetBattlerPosition(a) == 2) @@ -1134,9 +1134,9 @@ static void sub_804780C(struct Sprite *sprite) static void sub_8047830(struct Sprite *sprite) { - sprite->pos2.x -= sprite->data[0]; - sprite->pos2.y -= sprite->data[1]; - if (sprite->pos2.x == 0 && sprite->pos2.y == 0) + sprite->x2 -= sprite->data[0]; + sprite->y2 -= sprite->data[1]; + if (sprite->x2 == 0 && sprite->y2 == 0) sprite->callback = SpriteCallbackDummy; } @@ -1154,13 +1154,13 @@ static void oamc_804BEB4(struct Sprite *sprite) { u8 r1 = sprite->data[1]; - gSprites[r1].pos2.y = sprite->data[0]; + gSprites[r1].y2 = sprite->data[0]; sprite->data[0] = -sprite->data[0]; sprite->data[2]++; if (sprite->data[2] == 21) { - gSprites[r1].pos2.x = 0; - gSprites[r1].pos2.y = 0; + gSprites[r1].x2 = 0; + gSprites[r1].y2 = 0; DestroySprite(sprite); } } diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 6a5a6eaa1..b9f9e4f61 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -778,8 +778,8 @@ static u8 PokeblockFeed_CreatePokeSprite(struct Pokemon* mon) static void sub_8148044(u8 spriteID) { - gSprites[spriteID].pos1.x = 48; - gSprites[spriteID].pos1.y = 80; + gSprites[spriteID].x = 48; + gSprites[spriteID].y = 80; gSprites[spriteID].data[0] = -8; gSprites[spriteID].data[1] = 1; gSprites[spriteID].callback = sub_8148078; @@ -787,8 +787,8 @@ static void sub_8148044(u8 spriteID) static void sub_8148078(struct Sprite* sprite) { - sprite->pos1.x += 4; - sprite->pos1.y += sprite->data[0]; + sprite->x += 4; + sprite->y += sprite->data[0]; sprite->data[0] += sprite->data[1]; if (sprite->data[0] == 0) PlayCry1(sprite->data[2], 0); @@ -827,8 +827,8 @@ static u8 CreatePokeblockSprite(void) static void SpriteCB_ThrownPokeblock(struct Sprite* sprite) { - sprite->pos1.x -= 4; - sprite->pos1.y += sprite->data[0]; + sprite->x -= 4; + sprite->y += sprite->data[0]; sprite->data[0] += sprite->data[1]; if (sprite->data[0] == 10) DestroySprite(sprite); @@ -918,8 +918,8 @@ static bool8 sub_8148540(void) gUnknown_03005FA0[10] = Sin(gUnknown_03005FA0[0], gUnknown_03005FA0[2]); gUnknown_03005FA0[11] = Cos(gUnknown_03005FA0[0], gUnknown_03005FA0[3]); gUnknown_03005FA0[12] = gUnknown_03005FA0[4]; - gUnknown_03005FA0[13] = gPokeblockFeedPokeSprite->pos2.x; - gUnknown_03005FA0[14] = gPokeblockFeedPokeSprite->pos2.y; + gUnknown_03005FA0[13] = gPokeblockFeedPokeSprite->x2; + gUnknown_03005FA0[14] = gPokeblockFeedPokeSprite->y2; sub_8148710(); gUnknown_03005FA0[4] = gUnknown_03005FA0[12]; sub_814862C(); @@ -932,8 +932,8 @@ static bool8 sub_81485CC(void) { u16 var = gUnknown_03005FA0[12] - gUnknown_03005FA0[4]; - gPokeblockFeedPokeSprite->pos2.x = ePokeblockFeedMonAnimX[var]; - gPokeblockFeedPokeSprite->pos2.y = ePokeblockFeedMonAnimY[var]; + gPokeblockFeedPokeSprite->x2 = ePokeblockFeedMonAnimX[var]; + gPokeblockFeedPokeSprite->y2 = ePokeblockFeedMonAnimY[var]; if (--gUnknown_03005FA0[4] == 0) return TRUE; diff --git a/src/pokedex.c b/src/pokedex.c index 85d330d5c..3641ff2a1 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1628,8 +1628,8 @@ static void Task_PokedexMainScreenMenu(u8 taskId) static void Task_OpenInfoScreenAfterMonMovement(u8 taskId) { - if (gSprites[gPokedexView->selectedMonSpriteId].pos1.x == 48 - && gSprites[gPokedexView->selectedMonSpriteId].pos1.y == 56) + if (gSprites[gPokedexView->selectedMonSpriteId].x == 48 + && gSprites[gPokedexView->selectedMonSpriteId].y == 56) { gPokedexView->currentPageBackup = gPokedexView->currentPage; gTasks[taskId].data[0] = LoadInfoScreen(&gPokedexView->pokedexList[gPokedexView->selectedPokemon], gPokedexView->selectedMonSpriteId); @@ -1826,8 +1826,8 @@ static void Task_PokedexResultsScreenMenu(u8 taskId) static void Task_OpenSearchResultsInfoScreenAfterMonMovement(u8 taskId) { - if (gSprites[gPokedexView->selectedMonSpriteId].pos1.x == 48 - && gSprites[gPokedexView->selectedMonSpriteId].pos1.y == 56) + if (gSprites[gPokedexView->selectedMonSpriteId].x == 48 + && gSprites[gPokedexView->selectedMonSpriteId].y == 56) { gPokedexView->currentPageBackup = gPokedexView->currentPage; gTasks[taskId].data[0] = LoadInfoScreen(&gPokedexView->pokedexList[gPokedexView->selectedPokemon], gPokedexView->selectedMonSpriteId); @@ -2479,7 +2479,7 @@ static void UpdateSelectedMonSpriteId(void) { u16 spriteId = gPokedexView->monSpriteIds[i]; - if (gSprites[spriteId].pos2.x == 0 && gSprites[spriteId].pos2.y == 0 && spriteId != 0xFFFF) + if (gSprites[spriteId].x2 == 0 && gSprites[spriteId].y2 == 0 && spriteId != 0xFFFF) gPokedexView->selectedMonSpriteId = spriteId; } } @@ -2696,19 +2696,19 @@ static void SpriteCB_MoveMonForInfoScreen(struct Sprite *sprite) { sprite->oam.priority = 0; sprite->oam.affineMode = 0; - sprite->pos2.x = 0; - sprite->pos2.y = 0; - if (sprite->pos1.x != 48 || sprite->pos1.y != 56) + sprite->x2 = 0; + sprite->y2 = 0; + if (sprite->x != 48 || sprite->y != 56) { - if (sprite->pos1.x > 48) - sprite->pos1.x--; - if (sprite->pos1.x < 48) - sprite->pos1.x++; + if (sprite->x > 48) + sprite->x--; + if (sprite->x < 48) + sprite->x++; - if (sprite->pos1.y > 56) - sprite->pos1.y--; - if (sprite->pos1.y < 56) - sprite->pos1.y++; + if (sprite->y > 56) + sprite->y--; + if (sprite->y < 56) + sprite->y++; } else { @@ -2729,7 +2729,7 @@ static void SpriteCB_PokedexListMonSprite(struct Sprite *sprite) { u32 var; - sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256; + sprite->y2 = gSineTable[(u8)sprite->data[5]] * 76 / 256; var = 0x10000 / gSineTable[sprite->data[5] + 0x40]; if (var > 0xFFFF) var = 0xFFFF; @@ -2759,7 +2759,7 @@ static void SpriteCB_Scrollbar(struct Sprite *sprite) if (gPokedexView->currentPage != 0 && gPokedexView->currentPage != 3) DestroySprite(sprite); else - sprite->pos2.y = gPokedexView->selectedPokemon * 120 / (gPokedexView->pokemonListCount - 1); + sprite->y2 = gPokedexView->selectedPokemon * 120 / (gPokedexView->pokemonListCount - 1); } static void SpriteCB_ScrollArrow(struct Sprite *sprite) @@ -2788,7 +2788,7 @@ static void SpriteCB_ScrollArrow(struct Sprite *sprite) sprite->invisible = FALSE; r0 = sprite->data[2] - 128; } - sprite->pos2.y = gSineTable[r0] / 64; + sprite->y2 = gSineTable[r0] / 64; sprite->data[2] = sprite->data[2] + 8; if (gPokedexView->menuIsOpen == 0 && gPokedexView->menuY == 0 && sprite->invisible == 0) sprite->invisible = FALSE; @@ -2823,8 +2823,8 @@ static void SpriteCB_RotatingPokeBall(struct Sprite *sprite) val = gPokedexView->pokeBallRotation + (sprite->data[1] + 0x40); r3 = gSineTable[val]; r0 = gSineTable[val + 0x40]; - sprite->pos2.x = r0 * 40 / 256; - sprite->pos2.y = r3 * 40 / 256; + sprite->x2 = r0 * 40 / 256; + sprite->y2 = r3 * 40 / 256; } } @@ -2841,8 +2841,8 @@ static void SpriteCB_DexListStartMenuCursor(struct Sprite *sprite) if (gPokedexView->menuIsOpen != 0 && gPokedexView->menuY == r1) { sprite->invisible = FALSE; - sprite->pos2.y = gPokedexView->menuCursorPos * 16; - sprite->pos2.x = gSineTable[(u8)sprite->data[2]] / 64; + sprite->y2 = gPokedexView->menuCursorPos * 16; + sprite->x2 = gSineTable[(u8)sprite->data[2]] / 64; sprite->data[2] += 8; } else @@ -3389,7 +3389,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId) gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 1; gSprites[spriteId].oam.priority = 0; - gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset; + gSprites[spriteId].y2 = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset; SetOamMatrix(1, gPokedexEntries[sPokedexListItem->dexNum].trainerScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].trainerScale); LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, sizeof(sSizeScreenSilhouette_Pal)); gMain.state++; @@ -3399,7 +3399,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId) gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 2; gSprites[spriteId].oam.priority = 0; - gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset; + gSprites[spriteId].y2 = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset; SetOamMatrix(2, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale); LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, sizeof(sSizeScreenSilhouette_Pal)); gMain.state++; @@ -3930,15 +3930,15 @@ static void sub_8090B8C(u8 taskId) static void sub_8090C28(struct Sprite *sprite) { - if (sprite->pos1.x < 0x78) - sprite->pos1.x += 2; - if (sprite->pos1.x > 0x78) - sprite->pos1.x -= 2; + if (sprite->x < 0x78) + sprite->x += 2; + if (sprite->x > 0x78) + sprite->x -= 2; - if (sprite->pos1.y < 0x50) - sprite->pos1.y += 1; - if (sprite->pos1.y > 0x50) - sprite->pos1.y -= 1; + if (sprite->y < 0x50) + sprite->y += 1; + if (sprite->y > 0x50) + sprite->y -= 1; } static void sub_8090C68(void) @@ -5449,7 +5449,7 @@ static void SpriteCB_SearchParameterScrollArrow(struct Sprite *sprite) sprite->invisible = FALSE; } val = sprite->data[2] + sprite->data[1] * 128; - sprite->pos2.y = gSineTable[val] / 128; + sprite->y2 = gSineTable[val] / 128; sprite->data[2] += 8; } else diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index 914febd9c..749d7d802 100644 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -566,8 +566,8 @@ void SpriteCB_CryMeterNeedle(struct Sprite * sprite) SetOamMatrix(0, matrix.a, matrix.b, matrix.c, matrix.d); x = gSineTable[((gPokedexCryScreenPtr2->rotation + 0x7F) & 0xFF)]; y = gSineTable[((gPokedexCryScreenPtr2->rotation + 0x7F) & 0xFF) + 0x40]; - sprite->pos2.x = x * 24 / 256; - sprite->pos2.y = y * 24 / 256; + sprite->x2 = x * 24 / 256; + sprite->y2 = y * 24 / 256; } void SetCryMeterNeedleTarget(s8 offset) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index c1143495d..b589ffce5 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -669,12 +669,12 @@ void sub_80963D0(u8 curBox) r5 = 0; if (i & 2) { - gUnknown_02038478->unk_0004[i]->pos1.x = 0xc4; + gUnknown_02038478->unk_0004[i]->x = 0xc4; r5 = 2; } if (i & 1) { - gUnknown_02038478->unk_0004[i]->pos1.y = 0x70; + gUnknown_02038478->unk_0004[i]->y = 0x70; gUnknown_02038478->unk_0004[i]->oam.size = 0; r5++; } @@ -774,11 +774,11 @@ void sub_8096784(struct Sprite *sprite) if (++sprite->data[1] > 3) { sprite->data[1] = 0; - sprite->pos2.x += sprite->data[0]; + sprite->x2 += sprite->data[0]; if (++sprite->data[2] > 5) { sprite->data[2] = 0; - sprite->pos2.x = 0; + sprite->x2 = 0; } } } diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index e3f007bb3..d97470cef 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -1464,8 +1464,8 @@ void sub_8097F58(void) gPokemonStorageSystemPtr->unk_12ac = sub_80F7940(0x000d, 0xdace, 0); gPokemonStorageSystemPtr->unk_12ac->oam.priority = 0; gPokemonStorageSystemPtr->unk_12ac->subpriority = 1; - gPokemonStorageSystemPtr->unk_12ac->pos1.x = 0x28; - gPokemonStorageSystemPtr->unk_12ac->pos1.y = 0x95; + gPokemonStorageSystemPtr->unk_12ac->x = 0x28; + gPokemonStorageSystemPtr->unk_12ac->y = 0x95; gPokemonStorageSystemPtr->unk_12b8 = BG_CHAR_ADDR(4) + 32 * GetSpriteTileStartByTag(0x000d); } diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index cbac7a504..e9e7c4095 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -136,12 +136,12 @@ static void sub_8098E24(struct Sprite *sprite) if (sprite->data[1] != 0) { sprite->data[1]--; - sprite->pos1.x += sprite->data[2]; + sprite->x += sprite->data[2]; } else { gPokemonStorageSystemPtr->unk_1178--; - sprite->pos1.x = sprite->data[3]; + sprite->x = sprite->data[3]; sprite->callback = SpriteCallbackDummy; } } @@ -154,8 +154,8 @@ static void sub_8098E68(struct Sprite *sprite) } else { - sprite->pos1.x += sprite->data[2]; - sprite->data[5] = sprite->pos1.x + sprite->pos2.x; + sprite->x += sprite->data[2]; + sprite->data[5] = sprite->x + sprite->x2; if (sprite->data[5] < 0x45 || sprite->data[5] > 0xfb) sprite->callback = SpriteCallbackDummy; } @@ -296,7 +296,7 @@ void sub_8099200(bool8 a0) for (i = 0; i < count; i++) { // this routine assumes party_compaction has been called - gPokemonStorageSystemPtr->unk_1038[i]->pos1.y -= 0xa0; + gPokemonStorageSystemPtr->unk_1038[i]->y -= 0xa0; gPokemonStorageSystemPtr->unk_1038[i]->invisible = TRUE; } } @@ -344,8 +344,8 @@ static void sub_8099388(struct Sprite *sprite, u16 a1) r3 = 0x98; r4 = 24 * (a1 - 1) + 0x10; } - sprite->data[2] = sprite->pos1.x << 3; - sprite->data[3] = sprite->pos1.y << 3; + sprite->data[2] = sprite->x << 3; + sprite->data[3] = sprite->y << 3; sprite->data[4] = (r3 * 8 - sprite->data[2]) / 8; sprite->data[5] = (r4 * 8 - sprite->data[3]) / 8; sprite->data[6] = 8; @@ -358,21 +358,21 @@ static void sub_80993F4(struct Sprite *sprite) { sprite->data[2] += sprite->data[4]; sprite->data[3] += sprite->data[5]; - sprite->pos1.x = sprite->data[2] >> 3; - sprite->pos1.y = sprite->data[3] >> 3; + sprite->x = sprite->data[2] >> 3; + sprite->y = sprite->data[3] >> 3; sprite->data[6]--; } else { if (sprite->data[1] == 0) { - sprite->pos1.x = 0x68; - sprite->pos1.y = 0x40; + sprite->x = 0x68; + sprite->y = 0x40; } else { - sprite->pos1.x = 0x98; - sprite->pos1.y = (sprite->data[1] - 1) * 24 + 0x10; + sprite->x = 0x98; + sprite->y = (sprite->data[1] - 1) * 24 + 0x10; } sprite->callback = SpriteCallbackDummy; gPokemonStorageSystemPtr->unk_1038[sprite->data[1]] = sprite; @@ -398,8 +398,8 @@ void sub_80994A8(s16 y) if (gPokemonStorageSystemPtr->unk_1038[i]) { s16 yy; - gPokemonStorageSystemPtr->unk_1038[i]->pos1.y += y; - yy = gPokemonStorageSystemPtr->unk_1038[i]->pos1.y + gPokemonStorageSystemPtr->unk_1038[i]->pos2.y + gPokemonStorageSystemPtr->unk_1038[i]->centerToCornerVecY; + gPokemonStorageSystemPtr->unk_1038[i]->y += y; + yy = gPokemonStorageSystemPtr->unk_1038[i]->y + gPokemonStorageSystemPtr->unk_1038[i]->y2 + gPokemonStorageSystemPtr->unk_1038[i]->centerToCornerVecY; if (yy < -0x10 || yy > 0xb0) gPokemonStorageSystemPtr->unk_1038[i]->invisible = TRUE; else @@ -487,11 +487,11 @@ bool8 sub_809971C(void) gPokemonStorageSystemPtr->unk_1170++; if (gPokemonStorageSystemPtr->unk_1170 & 1) { - (*gPokemonStorageSystemPtr->unk_10c8)->pos1.y--; - gPokemonStorageSystemPtr->unk_1034->pos1.y++; + (*gPokemonStorageSystemPtr->unk_10c8)->y--; + gPokemonStorageSystemPtr->unk_1034->y++; } - (*gPokemonStorageSystemPtr->unk_10c8)->pos2.x = gSineTable[gPokemonStorageSystemPtr->unk_1170 * 8] / 16; - gPokemonStorageSystemPtr->unk_1034->pos2.x = -(gSineTable[gPokemonStorageSystemPtr->unk_1170 * 8] / 16); + (*gPokemonStorageSystemPtr->unk_10c8)->x2 = gSineTable[gPokemonStorageSystemPtr->unk_1170 * 8] / 16; + gPokemonStorageSystemPtr->unk_1034->x2 = -(gSineTable[gPokemonStorageSystemPtr->unk_1170 * 8] / 16); if (gPokemonStorageSystemPtr->unk_1170 == 8) { gPokemonStorageSystemPtr->unk_1034->oam.priority = (*gPokemonStorageSystemPtr->unk_10c8)->oam.priority; @@ -576,8 +576,8 @@ bool8 sub_8099990(void) static void sub_80999C4(struct Sprite *sprite) { - sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; - sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + gPokemonStorageSystemPtr->unk_11c0->pos2.y + 4; + sprite->x = gPokemonStorageSystemPtr->unk_11c0->x; + sprite->y = gPokemonStorageSystemPtr->unk_11c0->y + gPokemonStorageSystemPtr->unk_11c0->y2 + 4; } static u16 PSS_LoadSpeciesIconGfx(u16 a0) diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 42a1a5000..48fdf425a 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -713,7 +713,7 @@ void sub_809A5E8(struct Sprite *sprite) { if (sprite->data[2]) sprite->data[2]--; - else if ((sprite->pos1.x += sprite->data[0]) == sprite->data[1]) + else if ((sprite->x += sprite->data[0]) == sprite->data[1]) sprite->callback = SpriteCallbackDummy; } @@ -723,8 +723,8 @@ void sub_809A61C(struct Sprite *sprite) sprite->data[1]--; else { - sprite->pos1.x += sprite->data[0]; - sprite->data[2] = sprite->pos1.x + sprite->pos2.x; + sprite->x += sprite->data[0]; + sprite->data[2] = sprite->x + sprite->x2; if (sprite->data[2] < 0x40 || sprite->data[2] > 0x100) DestroySprite(sprite); } @@ -772,7 +772,7 @@ void sub_809A774(s8 a0) for (i = 0; i < 2; i++) { - gPokemonStorageSystemPtr->unk_0d00[i]->pos2.x = 0; + gPokemonStorageSystemPtr->unk_0d00[i]->x2 = 0; gPokemonStorageSystemPtr->unk_0d00[i]->data[0] = 2; } if (a0 < 0) @@ -799,8 +799,8 @@ void sub_809A810(void) for (i = 0; i < 2; i++) { - gPokemonStorageSystemPtr->unk_0d00[i]->pos1.x = 0x88 * i + 0x5c; - gPokemonStorageSystemPtr->unk_0d00[i]->pos2.x = 0; + gPokemonStorageSystemPtr->unk_0d00[i]->x = 0x88 * i + 0x5c; + gPokemonStorageSystemPtr->unk_0d00[i]->x2 = 0; gPokemonStorageSystemPtr->unk_0d00[i]->invisible = FALSE; } sub_809A860(TRUE); @@ -833,17 +833,17 @@ void sub_809A8C8(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos2.x = 0; + sprite->x2 = 0; break; case 1: if (++sprite->data[1] > 3) { sprite->data[1] = 0; - sprite->pos2.x += sprite->data[3]; + sprite->x2 += sprite->data[3]; if (++sprite->data[2] > 5) { sprite->data[2] = 0; - sprite->pos2.x = 0; + sprite->x2 = 0; } } break; @@ -851,18 +851,18 @@ void sub_809A8C8(struct Sprite *sprite) sprite->data[0] = 3; break; case 3: - sprite->pos1.x -= gPokemonStorageSystemPtr->unk_08b6; - if (sprite->pos1.x < 0x49 || sprite->pos1.x > 0xf7) + sprite->x -= gPokemonStorageSystemPtr->unk_08b6; + if (sprite->x < 0x49 || sprite->x > 0xf7) sprite->invisible = TRUE; if (--sprite->data[1] == 0) { - sprite->pos1.x = sprite->data[2]; + sprite->x = sprite->data[2]; sprite->invisible = FALSE; sprite->data[0] = 4; } break; case 4: - sprite->pos1.x -= gPokemonStorageSystemPtr->unk_08b6; + sprite->x -= gPokemonStorageSystemPtr->unk_08b6; break; } } @@ -967,35 +967,35 @@ bool8 sub_809AC00(void) { gPokemonStorageSystemPtr->unk_11c8 += gPokemonStorageSystemPtr->unk_11d0; gPokemonStorageSystemPtr->unk_11cc += gPokemonStorageSystemPtr->unk_11d4; - gPokemonStorageSystemPtr->unk_11c0->pos1.x = gPokemonStorageSystemPtr->unk_11c8 >> 8; - gPokemonStorageSystemPtr->unk_11c0->pos1.y = gPokemonStorageSystemPtr->unk_11cc >> 8; - if (gPokemonStorageSystemPtr->unk_11c0->pos1.x > 0x100) + gPokemonStorageSystemPtr->unk_11c0->x = gPokemonStorageSystemPtr->unk_11c8 >> 8; + gPokemonStorageSystemPtr->unk_11c0->y = gPokemonStorageSystemPtr->unk_11cc >> 8; + if (gPokemonStorageSystemPtr->unk_11c0->x > 0x100) { - tmp = gPokemonStorageSystemPtr->unk_11c0->pos1.x - 0x100; - gPokemonStorageSystemPtr->unk_11c0->pos1.x = tmp + 0x40; + tmp = gPokemonStorageSystemPtr->unk_11c0->x - 0x100; + gPokemonStorageSystemPtr->unk_11c0->x = tmp + 0x40; } - if (gPokemonStorageSystemPtr->unk_11c0->pos1.x < 0x40) + if (gPokemonStorageSystemPtr->unk_11c0->x < 0x40) { - tmp = 0x40 - gPokemonStorageSystemPtr->unk_11c0->pos1.x; - gPokemonStorageSystemPtr->unk_11c0->pos1.x = 0x100 - tmp; + tmp = 0x40 - gPokemonStorageSystemPtr->unk_11c0->x; + gPokemonStorageSystemPtr->unk_11c0->x = 0x100 - tmp; } - if (gPokemonStorageSystemPtr->unk_11c0->pos1.y > 0xb0) + if (gPokemonStorageSystemPtr->unk_11c0->y > 0xb0) { - tmp = gPokemonStorageSystemPtr->unk_11c0->pos1.y - 0xb0; - gPokemonStorageSystemPtr->unk_11c0->pos1.y = tmp - 0x10; + tmp = gPokemonStorageSystemPtr->unk_11c0->y - 0xb0; + gPokemonStorageSystemPtr->unk_11c0->y = tmp - 0x10; } - if (gPokemonStorageSystemPtr->unk_11c0->pos1.y < -0x10) + if (gPokemonStorageSystemPtr->unk_11c0->y < -0x10) { - tmp = -0x10 - gPokemonStorageSystemPtr->unk_11c0->pos1.y; - gPokemonStorageSystemPtr->unk_11c0->pos1.y = 0xb0 - tmp; + tmp = -0x10 - gPokemonStorageSystemPtr->unk_11c0->y; + gPokemonStorageSystemPtr->unk_11c0->y = 0xb0 - tmp; } if (gPokemonStorageSystemPtr->unk_11e3 && --gPokemonStorageSystemPtr->unk_11e3 == 0) gPokemonStorageSystemPtr->unk_11c0->vFlip = gPokemonStorageSystemPtr->unk_11c0->vFlip ? FALSE : TRUE; } else { - gPokemonStorageSystemPtr->unk_11c0->pos1.x = gPokemonStorageSystemPtr->unk_11d8; - gPokemonStorageSystemPtr->unk_11c0->pos1.y = gPokemonStorageSystemPtr->unk_11da; + gPokemonStorageSystemPtr->unk_11c0->x = gPokemonStorageSystemPtr->unk_11d8; + gPokemonStorageSystemPtr->unk_11c0->y = gPokemonStorageSystemPtr->unk_11da; sub_809AFB8(); } return TRUE; @@ -1027,33 +1027,33 @@ void sub_809AD94(void) switch (gPokemonStorageSystemPtr->unk_11de) { default: - r7 = gPokemonStorageSystemPtr->unk_11da - gPokemonStorageSystemPtr->unk_11c0->pos1.y; + r7 = gPokemonStorageSystemPtr->unk_11da - gPokemonStorageSystemPtr->unk_11c0->y; break; case -1: - r7 = gPokemonStorageSystemPtr->unk_11da - 0xc0 - gPokemonStorageSystemPtr->unk_11c0->pos1.y; + r7 = gPokemonStorageSystemPtr->unk_11da - 0xc0 - gPokemonStorageSystemPtr->unk_11c0->y; break; case 1: - r7 = gPokemonStorageSystemPtr->unk_11da + 0xc0 - gPokemonStorageSystemPtr->unk_11c0->pos1.y; + r7 = gPokemonStorageSystemPtr->unk_11da + 0xc0 - gPokemonStorageSystemPtr->unk_11c0->y; break; } switch (gPokemonStorageSystemPtr->unk_11df) { default: - r0 = gPokemonStorageSystemPtr->unk_11d8 - gPokemonStorageSystemPtr->unk_11c0->pos1.x; + r0 = gPokemonStorageSystemPtr->unk_11d8 - gPokemonStorageSystemPtr->unk_11c0->x; break; case -1: - r0 = gPokemonStorageSystemPtr->unk_11d8 - 0xc0 - gPokemonStorageSystemPtr->unk_11c0->pos1.x; + r0 = gPokemonStorageSystemPtr->unk_11d8 - 0xc0 - gPokemonStorageSystemPtr->unk_11c0->x; break; case 1: - r0 = gPokemonStorageSystemPtr->unk_11d8 + 0xc0 - gPokemonStorageSystemPtr->unk_11c0->pos1.x; + r0 = gPokemonStorageSystemPtr->unk_11d8 + 0xc0 - gPokemonStorageSystemPtr->unk_11c0->x; break; } r7 <<= 8; r0 <<= 8; gPokemonStorageSystemPtr->unk_11d0 = r0 / gPokemonStorageSystemPtr->unk_11dc; gPokemonStorageSystemPtr->unk_11d4 = r7 / gPokemonStorageSystemPtr->unk_11dc; - gPokemonStorageSystemPtr->unk_11c8 = gPokemonStorageSystemPtr->unk_11c0->pos1.x << 8; - gPokemonStorageSystemPtr->unk_11cc = gPokemonStorageSystemPtr->unk_11c0->pos1.y << 8; + gPokemonStorageSystemPtr->unk_11c8 = gPokemonStorageSystemPtr->unk_11c0->x << 8; + gPokemonStorageSystemPtr->unk_11cc = gPokemonStorageSystemPtr->unk_11c0->y << 8; } void sub_809AF18(u8 a0, u8 a1) @@ -1237,13 +1237,13 @@ bool8 sub_809B24C(void) bool8 sub_809B324(void) { - switch (gPokemonStorageSystemPtr->unk_11c0->pos2.y) + switch (gPokemonStorageSystemPtr->unk_11c0->y2) { default: - gPokemonStorageSystemPtr->unk_11c0->pos2.y++; + gPokemonStorageSystemPtr->unk_11c0->y2++; break; case 0: - gPokemonStorageSystemPtr->unk_11c0->pos2.y++; + gPokemonStorageSystemPtr->unk_11c0->y2++; break; case 8: return FALSE; @@ -1253,12 +1253,12 @@ bool8 sub_809B324(void) bool8 sub_809B358(void) { - switch (gPokemonStorageSystemPtr->unk_11c0->pos2.y) + switch (gPokemonStorageSystemPtr->unk_11c0->y2) { case 0: return FALSE; default: - gPokemonStorageSystemPtr->unk_11c0->pos2.y--; + gPokemonStorageSystemPtr->unk_11c0->y2--; break; } return TRUE; @@ -2323,8 +2323,8 @@ bool8 sub_809CAB0(void) void sub_809CB74(struct Sprite *sprite) { - sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; - sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + 20; + sprite->x = gPokemonStorageSystemPtr->unk_11c0->x; + sprite->y = gPokemonStorageSystemPtr->unk_11c0->y + 20; } void sub_809CB94(struct Pokemon *mon) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 32b40566c..9009bff59 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -4054,8 +4054,8 @@ static void SummaryScreen_DrawTypeIcon(u8 animNum, u8 x, u8 y, u8 d) StartSpriteAnim(&gSprites[ewram1A000[d]], animNum); gSprites[ewram1A000[d]].oam.paletteNum = sMoveTypeToOamPaletteNum[animNum]; - gSprites[ewram1A000[d]].pos1.x = x + 16; - gSprites[ewram1A000[d]].pos1.y = y + 8; + gSprites[ewram1A000[d]].x = x + 16; + gSprites[ewram1A000[d]].y = y + 8; sub_80A1918(d, 0); } @@ -4129,9 +4129,9 @@ static void sub_80A1BC0(struct Sprite *sprite) } if (sprite->data[0] == 9) - sprite->pos2.y = pssData.selectedMoveIndex * 16; + sprite->y2 = pssData.selectedMoveIndex * 16; else - sprite->pos2.y = pssData.switchMoveIndex * 16; + sprite->y2 = pssData.switchMoveIndex * 16; } #define shared1A009 ((u8 *)(gSharedMem + 0x1A009)) @@ -4219,8 +4219,8 @@ static void sub_80A1D84(struct Pokemon *mon) u8 markings = GetMonData(mon, MON_DATA_MARKINGS); StartSpriteAnim(sprite, markings); - gUnknown_020384F4->pos1.x = 60; - gUnknown_020384F4->pos1.y = 26; + gUnknown_020384F4->x = 60; + gUnknown_020384F4->y = 26; } } diff --git a/src/pokenav.c b/src/pokenav.c index 8b9040e12..8a498e954 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -2872,10 +2872,10 @@ void sub_80F21F8() void sub_80F2218(struct Sprite *sprite) { - sprite->pos1.x -= 8; - if (sprite->pos1.x <= sprite->data[2]) + sprite->x -= 8; + if (sprite->x <= sprite->data[2]) { - sprite->pos1.x = sprite->data[2]; + sprite->x = sprite->data[2]; sprite->callback = sub_80F22B0; } } @@ -2886,7 +2886,7 @@ void sub_80F2240(struct Sprite *sprite) { if (sprite->data[5]) { - sprite->pos1.x += sprite->data[4]; + sprite->x += sprite->data[4]; sprite->data[5] -= sprite->data[4]; } @@ -2895,8 +2895,8 @@ void sub_80F2240(struct Sprite *sprite) } else { - sprite->pos1.x += 8; - if (sprite->pos1.x >= sprite->data[3]) + sprite->x += 8; + if (sprite->x >= sprite->data[3]) sub_80F240C(sprite); } } @@ -2905,13 +2905,13 @@ void sub_80F22B0(struct Sprite *sprite) { if (sprite->data[0] == gPokenavStructPtr->unk6DAD) { - if (sprite->pos2.x > -16) - sprite->pos2.x -= 4; + if (sprite->x2 > -16) + sprite->x2 -= 4; } else { - if (sprite->pos2.x < 0) - sprite->pos2.x += 4; + if (sprite->x2 < 0) + sprite->x2 += 4; } } @@ -2927,7 +2927,7 @@ bool8 sub_80F22F8(void) if (!sprite) return TRUE; - if (sprite->pos2.x != 0 && sprite->pos2.x != -16) + if (sprite->x2 != 0 && sprite->x2 != -16) return FALSE; } } @@ -3283,11 +3283,11 @@ void sub_80F29B8(u8 arg0) #define sEndX sprite->data[1] void sub_80F2BBC(struct Sprite *sprite) { - s16 x = sprite->pos1.x; - sprite->pos1.x += sprite->data[0]; - if ((x <= sEndX && sprite->pos1.x >= sEndX) || (x >= sEndX && sprite->pos1.x <= sEndX)) + s16 x = sprite->x; + sprite->x += sprite->data[0]; + if ((x <= sEndX && sprite->x >= sEndX) || (x >= sEndX && sprite->x <= sEndX)) { - sprite->pos1.x = sEndX; + sprite->x = sEndX; if (sprite->data[3] == 4 && sprite->data[2] == 1) sprite->callback = sub_80F2C58; else @@ -3300,8 +3300,8 @@ void sub_80F2C14(struct Sprite *sprite) { u16 right; - sprite->pos1.x -= sprite->data[0]; - right = sprite->pos1.x + 32; + sprite->x -= sprite->data[0]; + right = sprite->x + 32; if (right > 304) { if (sprite->data[2] == 1) @@ -3394,7 +3394,7 @@ void sub_80F2DF4(void) void sub_80F2E00(struct Sprite *sprite) { - sprite->pos1.x = gPokenavStructPtr->unk8766 + 38; + sprite->x = gPokenavStructPtr->unk8766 + 38; } void sub_80F2E18(u8 arg0) @@ -3468,8 +3468,8 @@ void sub_80F2FB0(void) void sub_80F2FEC(struct Sprite *sprite) { - sprite->pos1.x = gPokenavStructPtr->unkD15A + 40; - sprite->pos1.y = 104; + sprite->x = gPokenavStructPtr->unkD15A + 40; + sprite->y = 104; } void sub_80F3008(u8 arg0) @@ -3547,7 +3547,7 @@ void sub_80F3130(void) void sub_80F3190(struct Sprite *sprite) { - sprite->pos1.y = gPokenavStructPtr->unk876C * 16 + 16; + sprite->y = gPokenavStructPtr->unk876C * 16 + 16; } void sub_80F31AC(struct Sprite *sprite) @@ -3569,12 +3569,12 @@ void sub_80F31AC(struct Sprite *sprite) sprite->data[0] = 0; if (++sprite->data[1] < 5) { - sprite->pos2.y += sprite->data[2]; + sprite->y2 += sprite->data[2]; } else { sprite->data[1] = 0; - sprite->pos2.y = 0; + sprite->y2 = 0; } } } @@ -3708,8 +3708,8 @@ void sub_80F35B4(void) sub_80F7404(); sprite = sub_80F7920(27, 21, gUnknown_083E4678); sprite->oam.priority = 3; - sprite->pos1.x = 192; - sprite->pos1.y = 32; + sprite->x = 192; + sprite->y = 32; sprite->callback = sub_80F363C; gPokenavStructPtr->unk76AC = sprite; } @@ -4077,17 +4077,17 @@ void sub_80F3E24(struct Sprite *sprite) { if (gPokenavStructPtr->unk8768) { - sprite->pos1.x = gPokenavStructPtr->unk8768->pos1.x - + gPokenavStructPtr->unk8768->pos2.x + sprite->x = gPokenavStructPtr->unk8768->x + + gPokenavStructPtr->unk8768->x2 + gUnknown_083E4794[sprite->data[0]][0]; - sprite->pos1.y = gPokenavStructPtr->unk8768->pos1.y - + gPokenavStructPtr->unk8768->pos2.y + sprite->y = gPokenavStructPtr->unk8768->y + + gPokenavStructPtr->unk8768->y2 + gUnknown_083E4794[sprite->data[0]][1]; } else { - sprite->pos1.x = gUnknown_083E4794[sprite->data[0]][0] + 40; - sprite->pos1.y = gUnknown_083E4794[sprite->data[0]][1] + 104; + sprite->x = gUnknown_083E4794[sprite->data[0]][0] + 40; + sprite->y = gUnknown_083E4794[sprite->data[0]][1] + 104; } } @@ -4225,8 +4225,8 @@ bool8 sub_80F4024(void) void sub_80F4138(struct Sprite *sprite) { - sprite->pos2.y = -gPokenavStructPtr->unk030C; - if (sprite->pos2.y <= -32) + sprite->y2 = -gPokenavStructPtr->unk030C; + if (sprite->y2 <= -32) { if (sprite->data[0] == 0) { diff --git a/src/region_map.c b/src/region_map.c index 8fdb6f18e..8bcd00835 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -495,8 +495,8 @@ void RegionMapDefaultZoomOffsetPlayerSprite(s16 a, s16 b) UpdateRegionMapVideoRegs(); if (gRegionMap->playerIconSprite != NULL) { - gRegionMap->playerIconSprite->pos2.x = -a; - gRegionMap->playerIconSprite->pos2.y = -b; + gRegionMap->playerIconSprite->x2 = -a; + gRegionMap->playerIconSprite->y2 = -b; } } @@ -868,8 +868,8 @@ static void SpriteCB_Cursor(struct Sprite *sprite) { if (gRegionMap->unk7A != 0) { - sprite->pos1.x += gRegionMap->cursorDeltaX * 2; - sprite->pos1.y += gRegionMap->cursorDeltaY * 2; + sprite->x += gRegionMap->cursorDeltaX * 2; + sprite->y += gRegionMap->cursorDeltaY * 2; gRegionMap->unk7A--; } } @@ -924,15 +924,15 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag) if (gRegionMap->zoomed == TRUE) { gRegionMap->cursorSprite->oam.size = 2; - gRegionMap->cursorSprite->pos1.x -= 8; - gRegionMap->cursorSprite->pos1.y -= 8; + gRegionMap->cursorSprite->x -= 8; + gRegionMap->cursorSprite->y -= 8; StartSpriteAnim(gRegionMap->cursorSprite, 1); } else { gRegionMap->cursorSprite->oam.size = 1; - gRegionMap->cursorSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4; - gRegionMap->cursorSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4; + gRegionMap->cursorSprite->x = gRegionMap->cursorPosX * 8 + 4; + gRegionMap->cursorSprite->y = gRegionMap->cursorPosY * 8 + 4; } gRegionMap->cursorSprite->data[1] = 2; gRegionMap->cursorSprite->data[2] = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101; @@ -1024,14 +1024,14 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag) gRegionMap->playerIconSprite = &gSprites[spriteId]; if (gRegionMap->zoomed == FALSE) { - gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 8 + 4; - gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 8 + 4; + gRegionMap->playerIconSprite->x = gRegionMap->unk74 * 8 + 4; + gRegionMap->playerIconSprite->y = gRegionMap->unk76 * 8 + 4; gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedOut; } else { - gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 16 - 48; - gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 16 - 66; + gRegionMap->playerIconSprite->x = gRegionMap->unk74 * 16 - 48; + gRegionMap->playerIconSprite->y = gRegionMap->unk76 * 16 - 66; gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedIn; } } @@ -1051,17 +1051,17 @@ static void sub_80FBE24(void) { if (gRegionMap->zoomed == TRUE) { - gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 16 - 48; - gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 16 - 66; + gRegionMap->playerIconSprite->x = gRegionMap->unk74 * 16 - 48; + gRegionMap->playerIconSprite->y = gRegionMap->unk76 * 16 - 66; gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedIn; gRegionMap->playerIconSprite->invisible = FALSE; } else { - gRegionMap->playerIconSprite->pos1.x = gRegionMap->unk74 * 8 + 4; - gRegionMap->playerIconSprite->pos1.y = gRegionMap->unk76 * 8 + 4; - gRegionMap->playerIconSprite->pos2.x = 0; - gRegionMap->playerIconSprite->pos2.y = 0; + gRegionMap->playerIconSprite->x = gRegionMap->unk74 * 8 + 4; + gRegionMap->playerIconSprite->y = gRegionMap->unk76 * 8 + 4; + gRegionMap->playerIconSprite->x2 = 0; + gRegionMap->playerIconSprite->y2 = 0; gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconZoomedOut; gRegionMap->playerIconSprite->invisible = FALSE; } @@ -1070,10 +1070,10 @@ static void sub_80FBE24(void) static void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite) { - sprite->pos2.x = -(gRegionMap->scrollX * 2); - sprite->pos2.y = -(gRegionMap->scrollY * 2); - sprite->data[0] = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; - sprite->data[1] = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; + sprite->x2 = -(gRegionMap->scrollX * 2); + sprite->y2 = -(gRegionMap->scrollY * 2); + sprite->data[0] = sprite->y + sprite->y2 + sprite->centerToCornerVecY; + sprite->data[1] = sprite->x + sprite->x2 + sprite->centerToCornerVecX; // Determine if sprite is on screen if (sprite->data[0] < -8 || sprite->data[0] > 0xA8 || sprite->data[1] < -8 || sprite->data[1] > 0xF8) diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 71f3fa0c8..ee207582b 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -160,36 +160,36 @@ void SpriteCB_ResetRtcCusor0(struct Sprite *sprite) sprite->invisible = FALSE; sprite->animNum = 1; sprite->animDelayCounter = 0; - sprite->pos1.x = 53; - sprite->pos1.y = 68; + sprite->x = 53; + sprite->y = 68; break; case 2: sprite->invisible = FALSE; sprite->animNum = 1; sprite->animDelayCounter = 0; - sprite->pos1.x = 86; - sprite->pos1.y = 68; + sprite->x = 86; + sprite->y = 68; break; case 3: sprite->invisible = FALSE; sprite->animNum = 1; sprite->animDelayCounter = 0; - sprite->pos1.x = 107; - sprite->pos1.y = 68; + sprite->x = 107; + sprite->y = 68; break; case 4: sprite->invisible = FALSE; sprite->animNum = 1; sprite->animDelayCounter = 0; - sprite->pos1.x = 128; - sprite->pos1.y = 68; + sprite->x = 128; + sprite->y = 68; break; case 5: sprite->invisible = FALSE; sprite->animNum = 2; sprite->animDelayCounter = 0; - sprite->pos1.x = 155; - sprite->pos1.y = 80; + sprite->x = 155; + sprite->y = 80; break; case 6: DestroySprite(sprite); @@ -210,29 +210,29 @@ void SpriteCB_ResetRtcCusor1(struct Sprite *sprite) sprite->invisible = FALSE; sprite->animNum = 0; sprite->animDelayCounter = 0; - sprite->pos1.x = 53; - sprite->pos1.y = 92; + sprite->x = 53; + sprite->y = 92; break; case 2: sprite->invisible = FALSE; sprite->animNum = 0; sprite->animDelayCounter = 0; - sprite->pos1.x = 86; - sprite->pos1.y = 92; + sprite->x = 86; + sprite->y = 92; break; case 3: sprite->invisible = FALSE; sprite->animNum = 0; sprite->animDelayCounter = 0; - sprite->pos1.x = 107; - sprite->pos1.y = 92; + sprite->x = 107; + sprite->y = 92; break; case 4: sprite->invisible = FALSE; sprite->animNum = 0; sprite->animDelayCounter = 0; - sprite->pos1.x = 128; - sprite->pos1.y = 92; + sprite->x = 128; + sprite->y = 92; break; case 5: sprite->invisible = TRUE; diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 89ef50037..9b3e818ac 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -466,8 +466,8 @@ void sub_8078114(struct Sprite *sprite) { if (sprite->data[3]) { - sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); - sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]); + sprite->x2 = Sin(sprite->data[0], sprite->data[1]); + sprite->y2 = Cos(sprite->data[0], sprite->data[1]); sprite->data[0] += sprite->data[2]; if (sprite->data[0] >= 0x100) sprite->data[0] -= 0x100; @@ -485,8 +485,8 @@ void sub_8078174(struct Sprite *sprite) { if (sprite->data[3]) { - sprite->pos2.x = Sin(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]); - sprite->pos2.y = Cos(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]); + sprite->x2 = Sin(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]); + sprite->y2 = Cos(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]); sprite->data[0] += sprite->data[2]; sprite->data[5] += sprite->data[4]; if (sprite->data[0] >= 0x100) @@ -505,8 +505,8 @@ void unref_sub_80781F0(struct Sprite *sprite) { if (sprite->data[3]) { - sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); - sprite->pos2.y = Cos(sprite->data[4], sprite->data[1]); + sprite->x2 = Sin(sprite->data[0], sprite->data[1]); + sprite->y2 = Cos(sprite->data[4], sprite->data[1]); sprite->data[0] += sprite->data[2]; sprite->data[4] += sprite->data[5]; if (sprite->data[0] >= 0x100) @@ -529,8 +529,8 @@ void sub_8078278(struct Sprite *sprite) { if (sprite->data[3]) { - sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); - sprite->pos2.y = Cos(sprite->data[0], sprite->data[4]); + sprite->x2 = Sin(sprite->data[0], sprite->data[1]); + sprite->y2 = Cos(sprite->data[0], sprite->data[4]); sprite->data[0] += sprite->data[2]; if (sprite->data[0] >= 0x100) sprite->data[0] -= 0x100; @@ -581,8 +581,8 @@ void TranslateSpriteOverDuration(struct Sprite *sprite) if (sprite->data[0] > 0) { sprite->data[0]--; - sprite->pos2.x += sprite->data[1]; - sprite->pos2.y += sprite->data[2]; + sprite->x2 += sprite->data[1]; + sprite->y2 += sprite->data[2]; } else { @@ -597,8 +597,8 @@ void sub_8078394(struct Sprite *sprite) sprite->data[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; } else { @@ -613,8 +613,8 @@ void sub_80783D0(struct Sprite *sprite) sprite->data[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; } else { @@ -625,8 +625,8 @@ void sub_80783D0(struct Sprite *sprite) void unref_sub_8078414(struct Sprite *sprite) { - sprite->data[1] = sprite->pos1.x + sprite->pos2.x; - sprite->data[3] = sprite->pos1.y + sprite->pos2.y; + sprite->data[1] = sprite->x + sprite->x2; + sprite->data[3] = sprite->y + sprite->y2; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->callback = sub_80782F8; @@ -637,8 +637,8 @@ void TranslateMonBGUntil(struct Sprite *sprite) if (sprite->data[0] > 0) { sprite->data[0]--; - gSprites[sprite->data[3]].pos2.x += sprite->data[1]; - gSprites[sprite->data[3]].pos2.y += sprite->data[2]; + gSprites[sprite->data[3]].x2 += sprite->data[1]; + gSprites[sprite->data[3]].y2 += sprite->data[2]; } else { @@ -655,8 +655,8 @@ void TranslateMonBGSubPixelUntil(struct Sprite *sprite) sprite->data[0]--; sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; - gSprites[sprite->data[5]].pos2.x = sprite->data[3] >> 8; - gSprites[sprite->data[5]].pos2.y = sprite->data[4] >> 8; + gSprites[sprite->data[5]].x2 = sprite->data[3] >> 8; + gSprites[sprite->data[5]].y2 = sprite->data[4] >> 8; } else { @@ -669,9 +669,9 @@ void sub_8078504(struct Sprite *sprite) if (sprite->data[0] > 0) { sprite->data[0]--; - sprite->pos2.x = sprite->data[2] >> 8; + sprite->x2 = sprite->data[2] >> 8; sprite->data[2] += sprite->data[1]; - sprite->pos2.y = sprite->data[4] >> 8; + sprite->y2 = sprite->data[4] >> 8; sprite->data[4] += sprite->data[3]; if (sprite->data[0] % sprite->data[5] == 0) { @@ -693,8 +693,8 @@ void DestroySpriteAndMatrix(struct Sprite *sprite) void unref_sub_8078588(struct Sprite *sprite) { - sprite->data[1] = sprite->pos1.x + sprite->pos2.x; - sprite->data[3] = sprite->pos1.y + sprite->pos2.y; + sprite->data[1] = sprite->x + sprite->x2; + sprite->data[3] = sprite->y + sprite->y2; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->callback = sub_80782F8; @@ -734,8 +734,8 @@ void sub_8078634(u8 task) void sub_8078650(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); } void sub_807867C(struct Sprite *sprite, s16 a2) @@ -745,25 +745,25 @@ void sub_807867C(struct Sprite *sprite, s16 a2) if (v1 > v2) { - sprite->pos1.x -= a2; + sprite->x -= a2; } else if (v1 < v2) { - sprite->pos1.x += a2; + sprite->x += a2; } else { if (GetBattlerSide(gBattleAnimAttacker) != 0) - sprite->pos1.x -= a2; + sprite->x -= a2; else - sprite->pos1.x += a2; + sprite->x += a2; } } void InitAnimArcTranslation(struct Sprite *sprite) { - sprite->data[1] = sprite->pos1.x; - sprite->data[3] = sprite->pos1.y; + sprite->data[1] = sprite->x; + sprite->data[3] = sprite->y; InitAnimLinearTranslation(sprite); sprite->data[6] = 0x8000 / sprite->data[0]; sprite->data[7] = 0; @@ -774,43 +774,43 @@ bool8 TranslateAnimArc(struct Sprite *sprite) if (TranslateAnimLinear(sprite)) return TRUE; sprite->data[7] += sprite->data[6]; - sprite->pos2.y += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]); + sprite->y2 += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]); return FALSE; } void oamt_add_pos2_onto_pos1(struct Sprite *sprite) { - 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; } void sub_8078764(struct Sprite *sprite, bool8 a2) { if (!a2) { - sprite->pos1.x = sub_8077EE4(gBattleAnimTarget, 0); - sprite->pos1.y = sub_8077EE4(gBattleAnimTarget, 1); + sprite->x = sub_8077EE4(gBattleAnimTarget, 0); + sprite->y = sub_8077EE4(gBattleAnimTarget, 1); } sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; } void InitAnimSpritePos(struct Sprite *sprite, u8 a2) { if (!a2) { - sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 0); - sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 1); + sprite->x = sub_8077EE4(gBattleAnimAttacker, 0); + sprite->y = sub_8077EE4(gBattleAnimAttacker, 1); } else { - sprite->pos1.x = sub_8077EE4(gBattleAnimAttacker, 2); - sprite->pos1.y = sub_8077EE4(gBattleAnimAttacker, 3); + sprite->x = sub_8077EE4(gBattleAnimAttacker, 2); + sprite->y = sub_8077EE4(gBattleAnimAttacker, 3); } sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->y += gBattleAnimArgs[1]; } u8 GetBattlerSide(u8 slot) @@ -934,8 +934,8 @@ void sub_80789D4(bool8 a1) void sub_8078A34(struct Sprite *sprite) { - sprite->data[1] = sprite->pos1.x; - sprite->data[3] = sprite->pos1.y; + sprite->data[1] = sprite->x; + sprite->data[3] = sprite->y; InitSpriteDataForLinearTranslation(sprite); sprite->callback = sub_80783D0; sprite->callback(sprite); @@ -981,8 +981,8 @@ void InitAnimLinearTranslation(struct Sprite *sprite) void StartAnimLinearTranslation(struct Sprite *sprite) { - sprite->data[1] = sprite->pos1.x; - sprite->data[3] = sprite->pos1.y; + sprite->data[1] = sprite->x; + sprite->data[3] = sprite->y; InitAnimLinearTranslation(sprite); sprite->callback = TranslateAnimLinearUntil; sprite->callback(sprite); @@ -1003,14 +1003,14 @@ bool8 TranslateAnimLinear(struct Sprite *sprite) y += v2; if (v1 & 1) - sprite->pos2.x = -(x >> 8); + sprite->x2 = -(x >> 8); else - sprite->pos2.x = x >> 8; + sprite->x2 = x >> 8; if (v2 & 1) - sprite->pos2.y = -(y >> 8); + sprite->y2 = -(y >> 8); else - sprite->pos2.y = y >> 8; + sprite->y2 = y >> 8; sprite->data[3] = x; sprite->data[4] = y; @@ -1033,8 +1033,8 @@ void sub_8078BD4(struct Sprite *sprite) void sub_8078C00(struct Sprite *sprite) { - sprite->data[1] = sprite->pos1.x; - sprite->data[3] = sprite->pos1.y; + sprite->data[1] = sprite->x; + sprite->data[3] = sprite->y; sub_8078BD4(sprite); sprite->callback = TranslateAnimLinearUntil; sprite->callback(sprite); @@ -1070,8 +1070,8 @@ void sub_8078C28(struct Sprite *sprite) void sub_8078CC0(struct Sprite *sprite) { - sprite->data[1] = sprite->pos1.x; - sprite->data[3] = sprite->pos1.y; + sprite->data[1] = sprite->x; + sprite->data[3] = sprite->y; sub_8078C28(sprite); sprite->callback = sub_8078D44; sprite->callback(sprite); @@ -1092,14 +1092,14 @@ bool8 sub_8078CE8(struct Sprite *sprite) y += v2; if (v1 & 1) - sprite->pos2.x = -(x >> 4); + sprite->x2 = -(x >> 4); else - sprite->pos2.x = x >> 4; + sprite->x2 = x >> 4; if (v2 & 1) - sprite->pos2.y = -(y >> 4); + sprite->y2 = -(y >> 4); else - sprite->pos2.y = y >> 4; + sprite->y2 = y >> 4; sprite->data[3] = x; sprite->data[4] = y; @@ -1122,8 +1122,8 @@ void sub_8078D60(struct Sprite *sprite) void sub_8078D8C(struct Sprite *sprite) { - sprite->data[1] = sprite->pos1.x; - sprite->data[3] = sprite->pos1.y; + sprite->data[1] = sprite->x; + sprite->data[3] = sprite->y; sub_8078D60(sprite); sprite->callback = sub_8078D44; sprite->callback(sprite); @@ -1189,7 +1189,7 @@ void sub_8078F9C(u8 sprite) if (c < 0) c = -c; - gSprites[sprite].pos2.y = c >> 3; + gSprites[sprite].y2 = c >> 3; } // related to obj_id_set_rotscale @@ -1713,7 +1713,7 @@ bool8 RunAffineAnimFromTaskData(struct Task *task) task->data[7]++; break; case 0x7fff: - gSprites[task->data[15]].pos2.y = 0; + gSprites[task->data[15]].y2 = 0; sub_8078F40(task->data[15]); return FALSE; } @@ -1729,7 +1729,7 @@ void sub_8079A64(u8 sprite) if (var2 > 0x80) var2 = 0x80; - gSprites[sprite].pos2.y = (var - var2) / 2; + gSprites[sprite].y2 = (var - var2) / 2; } void sub_8079AB8(u8 sprite, u8 sprite2) @@ -1740,7 +1740,7 @@ void sub_8079AB8(u8 sprite, u8 sprite2) if (var2 > 0x80) var2 = 0x80; - gSprites[sprite].pos2.y = (var - var2) / 2; + gSprites[sprite].y2 = (var - var2) / 2; } u16 sub_8079B10(u8 sprite) @@ -1830,7 +1830,7 @@ u8 sub_8079C74(struct Task *task) if (task->data[8]) sub_8079A64(task->data[15]); else - gSprites[task->data[15]].pos2.y = 0; + gSprites[task->data[15]].y2 = 0; return task->data[8]; } @@ -2172,15 +2172,15 @@ void sub_807A544(struct Sprite *sprite) sub_8078650(sprite); if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; sprite->hFlip = TRUE; } 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[3] = gBattleAnimArgs[4]; @@ -2193,14 +2193,14 @@ void sub_807A5C4(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker)) { - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] *= -1; } 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[3] = gBattleAnimArgs[4]; @@ -2216,10 +2216,10 @@ void sub_807A63C(struct Sprite *sprite) { sub_8078650(sprite); if (GetBattlerSide(gBattleAnimAttacker)) - sprite->pos1.x -= gBattleAnimArgs[0]; + sprite->x -= gBattleAnimArgs[0]; else - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; + sprite->x += gBattleAnimArgs[0]; + sprite->y += gBattleAnimArgs[1]; sprite->callback = sub_8078600; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -2235,7 +2235,7 @@ void sub_807A69C(u8 taskId) task->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -8 : 8; task->data[2] = 0; task->data[3] = 0; - gSprites[task->data[0]].pos2.x -= task->data[0]; + gSprites[task->data[0]].x2 -= task->data[0]; task->data[4] = AllocSpritePalette(10097); task->data[5] = 0; @@ -2258,7 +2258,7 @@ void sub_807A784(u8 taskId) { case 0: sub_807A850(task, taskId); - gSprites[task->data[0]].pos2.x += task->data[1]; + gSprites[task->data[0]].x2 += task->data[1]; if (++task->data[3] == 5) { task->data[3]--; @@ -2267,10 +2267,10 @@ void sub_807A784(u8 taskId) break; case 1: sub_807A850(task, taskId); - gSprites[task->data[0]].pos2.x -= task->data[1]; + gSprites[task->data[0]].x2 -= task->data[1]; if (--task->data[3] == 0) { - gSprites[task->data[0]].pos2.x = 0; + gSprites[task->data[0]].x2 = 0; task->data[2]++; } break; @@ -2294,7 +2294,7 @@ void sub_807A850(struct Task *task, u8 taskId) gSprites[sprite].data[0] = 8; gSprites[sprite].data[1] = taskId; gSprites[sprite].data[2] = sprite; - gSprites[sprite].pos2.x = gSprites[task->data[0]].pos2.x; + gSprites[sprite].x2 = gSprites[task->data[0]].x2; gSprites[sprite].callback = sub_807A8D4; task->data[5]++; } @@ -2312,8 +2312,8 @@ void sub_807A8D4(struct Sprite *sprite) // file_4 void sub_807A908(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->data[0] = 5; else @@ -2326,11 +2326,11 @@ void sub_807A960(struct Sprite *sprite) { sprite->data[2] += sprite->data[0]; sprite->data[3] += sprite->data[1]; - sprite->pos2.x = sprite->data[2] / 10; - sprite->pos2.y = sprite->data[3] / 10; + sprite->x2 = sprite->data[2] / 10; + sprite->y2 = sprite->data[3] / 10; if (sprite->data[1] < -20) sprite->data[1]++; - if (sprite->pos1.y + sprite->pos2.y < -32) + if (sprite->y + sprite->y2 < -32) DestroyAnimSprite(sprite); } @@ -2338,19 +2338,19 @@ void sub_807A9BC(struct Sprite *sprite) { int x; sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4]; - sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5]; + sprite->data[2] = sprite->x + gBattleAnimArgs[4]; + sprite->data[4] = sprite->y + gBattleAnimArgs[5]; if (!GetBattlerSide(gBattleAnimTarget)) { x = (u16)gBattleAnimArgs[4] + 30; - sprite->pos1.x += x; - sprite->pos1.y = gBattleAnimArgs[5] - 20; + sprite->x += x; + sprite->y = gBattleAnimArgs[5] - 20; } else { x = (u16)gBattleAnimArgs[4] - 30; - sprite->pos1.x += x; - sprite->pos1.y = gBattleAnimArgs[5] - 80; + sprite->x += x; + sprite->y = gBattleAnimArgs[5] - 80; } sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 16aac66be..cf4b4daf4 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -765,7 +765,7 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY) sprite->data[0] = gateId; sprite->coordOffsetEnabled = 1; - sub_8060388(x + deltaX, y + deltaY, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(x + deltaX, y + deltaY, &sprite->x, &sprite->y); RotatingGate_HideGatesOutsideViewport(sprite); StartSpriteAffineAnim(sprite, RotatingGate_GetGateOrientation(gateId)); @@ -815,8 +815,8 @@ static void RotatingGate_HideGatesOutsideViewport(struct Sprite *sprite) s16 y2; sprite->invisible = FALSE; - x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; - y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY; + x = sprite->x + sprite->x2 + sprite->centerToCornerVecX + gSpriteCoordOffsetX; + y = sprite->y + sprite->y2 + sprite->centerToCornerVecY + gSpriteCoordOffsetY; x2 = x + 0x40; // Dimensions of the rotating gate y2 = y + 0x40; diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c index b94b18c9c..1abdade7e 100644 --- a/src/roulette_gfx.c +++ b/src/roulette_gfx.c @@ -830,8 +830,8 @@ void sub_8117C60(u8 r0, u8 r1) else { gSprites[eRoulette->var3C[49 + i]].invisible = FALSE; - gSprites[eRoulette->var3C[49 + i]].pos1.x = (gUnknown_083F8C00[eRoulette->var0C[i]].var03 + 1) * 8 + 4; - gSprites[eRoulette->var3C[49 + i]].pos1.y = (gUnknown_083F8C00[eRoulette->var0C[i]].var04 + 1) * 8 + 3; + gSprites[eRoulette->var3C[49 + i]].x = (gUnknown_083F8C00[eRoulette->var0C[i]].var03 + 1) * 8 + 4; + gSprites[eRoulette->var3C[49 + i]].y = (gUnknown_083F8C00[eRoulette->var0C[i]].var04 + 1) * 8 + 3; } } } @@ -846,8 +846,8 @@ void sub_8117D68(u8 r0) else { gSprites[eRoulette->var3C[48]].invisible = FALSE; - gSprites[eRoulette->var3C[48]].pos1.x = (gUnknown_083F8C00[r0].var03 + 2) * 8; - gSprites[eRoulette->var3C[48]].pos1.y = (gUnknown_083F8C00[r0].var04 + 2) * 8; + gSprites[eRoulette->var3C[48]].x = (gUnknown_083F8C00[r0].var03 + 2) * 8; + gSprites[eRoulette->var3C[48]].y = (gUnknown_083F8C00[r0].var04 + 2) * 8; } } @@ -885,8 +885,8 @@ void sub_8117E98(struct Sprite *sprite) angle -= 360; sin = Sin2(angle); cos = Cos2(angle); - sprite->pos2.x = sin * sprite->data[1] >> 12; - sprite->pos2.y = -cos * sprite->data[1] >> 12; + sprite->x2 = sin * sprite->data[1] >> 12; + sprite->y2 = -cos * sprite->data[1] >> 12; matrixNum = sprite->oam.matrixNum; sin /= 16; gOamMatrices[matrixNum].d = cos /= 16; @@ -1040,7 +1040,7 @@ void sub_81182F8(u8 r0) void sub_81184CC(struct Sprite *sprite) { - sprite->pos2.x = eRoulette->var26; + sprite->x2 = eRoulette->var26; } void sub_81184D8(void) @@ -1156,12 +1156,12 @@ void sub_8118724(struct Sprite *sprite) sprite->data[4] = eRoulette->var94; sin = Sin2(sprite->data[3]); cos = Cos2(sprite->data[3]); - sprite->pos2.x = sin * sprite->data[4] >> 12; - sprite->pos2.y = -cos * sprite->data[4] >> 12; + sprite->x2 = sin * sprite->data[4] >> 12; + sprite->y2 = -cos * sprite->data[4] >> 12; if (IsSEPlaying()) { - m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xffff, sprite->pos2.x); - m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xffff, sprite->pos2.x); + m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xffff, sprite->x2); + m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xffff, sprite->x2); } } @@ -1173,9 +1173,9 @@ void sub_8118834(struct Sprite *sprite) sprite->data[3] -= 360; sin = Sin2(sprite->data[3]); cos = Cos2(sprite->data[3]); - sprite->pos2.x = sin * sprite->data[4] >> 12; - sprite->pos2.y = -cos * sprite->data[4] >> 12; - sprite->pos2.y += gSpriteCoordOffsetY; + sprite->x2 = sin * sprite->data[4] >> 12; + sprite->y2 = -cos * sprite->data[4] >> 12; + sprite->y2 += gSpriteCoordOffsetY; } void sub_811889C(struct Sprite *sprite) @@ -1274,9 +1274,9 @@ void sub_81189A8(struct Sprite *sprite) void sub_8118B30(struct Sprite *sprite) { - sprite->pos2.y = (s32)(((float)sprite->data[2]) * 0.05f * ((float)sprite->data[2])) - 45; + sprite->y2 = (s32)(((float)sprite->data[2]) * 0.05f * ((float)sprite->data[2])) - 45; sprite->data[2]++; - if (sprite->data[2] > 29 && sprite->pos2.y >= 0) + if (sprite->data[2] > 29 && sprite->y2 >= 0) { eRoulette->var7D = 255; eRoulette->var03_7 = FALSE; @@ -1295,11 +1295,11 @@ void sub_8118BD8(struct Sprite *sprite) { if (sprite->data[2]++ < 45) { - sprite->pos2.y--; + sprite->y2--; if (sprite->data[2] == 45) { if (gSprites[eRoulette->var3C[55]].animCmdIndex == 1) - sprite->pos2.y++; + sprite->y2++; } } else @@ -1309,9 +1309,9 @@ void sub_8118BD8(struct Sprite *sprite) if (gSprites[eRoulette->var3C[55]].animDelayCounter == 0) { if (gSprites[eRoulette->var3C[55]].animCmdIndex == 1) - sprite->pos2.y++; + sprite->y2++; else - sprite->pos2.y--; + sprite->y2--; } } else @@ -1727,8 +1727,8 @@ void sub_8119780(struct Sprite *sprite) { if (sprite->data[1]++ >= sprite->data[3]) { - sprite->pos1.x -= 2; - if (sprite->pos1.x < -16) + sprite->x -= 2; + if (sprite->x < -16) { if (!eRoulette->var03_6) eRoulette->var03_6 = TRUE; @@ -1773,7 +1773,7 @@ void sub_8119898(struct Sprite *sprite) float t; sprite->data[1]++; t = sprite->data[1]; - sprite->pos2.y = t * 0.039f * t; + sprite->y2 = t * 0.039f * t; eRoulette->var34 = gUnknown_083FA61E[(eRoulette->var01 - 1) / 2]; if (eRoulette->var01 < 19) eRoulette->var01++; @@ -1849,9 +1849,9 @@ void sub_8119A90(struct Sprite *sprite) void sub_8119AAC(struct Sprite *sprite) { - if (sprite->pos1.y > -16) + if (sprite->y > -16) { - sprite->pos1.y--; + sprite->y--; } else { @@ -1870,9 +1870,9 @@ void sub_8119B24(struct Sprite *sprite) if (sprite->data[1] >= 0) { sprite->data[1]--; - sprite->pos1.y--; + sprite->y--; if (sprite->data[1] == 0 && sprite->animCmdIndex == 1) - sprite->pos2.y++; + sprite->y2++; } else { @@ -1882,9 +1882,9 @@ void sub_8119B24(struct Sprite *sprite) if (sprite->animDelayCounter == 0) { if (sprite->animCmdIndex == 1) - sprite->pos2.y++; + sprite->y2++; else - sprite->pos2.y--; + sprite->y2--; } } else @@ -1912,10 +1912,10 @@ void sub_8119BCC(struct Sprite *sprite) }; if (sprite->data[1]-- > 7) { - sprite->pos1.x += t[eRoulette->var38->data[0]] * 2; + sprite->x += t[eRoulette->var38->data[0]] * 2; if (IsSEPlaying()) { - s8 u = -((116 - sprite->pos1.x) / 2); + s8 u = -((116 - sprite->x) / 2); m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xffff, u); m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xffff, u); } @@ -1924,8 +1924,8 @@ void sub_8119BCC(struct Sprite *sprite) { if (sprite->data[1] >= 0) { - sprite->pos1.x += t[eRoulette->var38->data[0]] * z[7 - sprite->data[1]][0]; - sprite->pos1.y += z[7 - sprite->data[1]][1]; + sprite->x += t[eRoulette->var38->data[0]] * z[7 - sprite->data[1]][0]; + sprite->y += z[7 - sprite->data[1]][1]; } else { @@ -1946,7 +1946,7 @@ void sub_8119D08(struct Sprite *sprite) s8 t[2] = {-1, 1}; //sign if (sprite->data[1]-- >= 0) { - sprite->pos1.x += t[eRoulette->var38->data[0]] * 2; + sprite->x += t[eRoulette->var38->data[0]] * 2; gSprites[sprite->data[6]].invisible ^= 1; } else diff --git a/src/slot_machine.c b/src/slot_machine.c index a1245cfb0..27965b0c2 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -3182,7 +3182,7 @@ static void sub_8104F18(struct Sprite *sprite) { sprite->data[2] = eSlotMachine->unk1C[sprite->data[0]] + sprite->data[1]; sprite->data[2] %= 120; - sprite->pos1.y = eSlotMachine->unk22[sprite->data[0]] + 28 + sprite->data[2]; + sprite->y = eSlotMachine->unk22[sprite->data[0]] + 28 + sprite->data[2]; sprite->sheetTileStart = GetSpriteTileStartByTag(GetTagOfReelSymbolOnScreenAtPos(sprite->data[0], sprite->data[2] / 24)); SetSpriteSheetFrameTileNum(sprite); } @@ -3253,12 +3253,12 @@ static void sub_810514C(void) static void sub_8105170(struct Sprite *sprite) { - sprite->pos2.y = sprite->pos2.x = 0; + sprite->y2 = sprite->x2 = 0; if (sprite->animNum == 4) { - sprite->pos2.y = sprite->pos2.x = 8; + sprite->y2 = sprite->x2 = 8; if ((sprite->animCmdIndex != 0 && sprite->animDelayCounter != 0) || (sprite->animCmdIndex == 0 && sprite->animDelayCounter == 0)) - sprite->pos2.y = -8; + sprite->y2 = -8; } } @@ -3318,7 +3318,7 @@ static void sub_810535C(struct Sprite *sprite) { s16 r0 = (u16)(eSlotMachine->unk14 + sprite->data[7]); r0 %= 40; - sprite->pos1.y = r0 + 59; + sprite->y = r0 + 59; StartSpriteAnimIfDifferent(sprite, sub_8102C48(r0 / 20)); } @@ -3407,15 +3407,15 @@ static void sub_810562C(struct Sprite *sprite) if (sprite->data[0] != 0) { sprite->data[0]--; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x2 = 0; + sprite->y2 = 0; sprite->invisible = TRUE; } else { sprite->invisible = FALSE; - sprite->pos2.x += sprite->data[1]; - sprite->pos2.y += sprite->data[2]; + sprite->x2 += sprite->data[1]; + sprite->y2 += sprite->data[2]; if (++sprite->data[3] >= 8) { sprite->data[0] = sprite->data[7]; @@ -3494,7 +3494,7 @@ static void sub_8105854(void) static void sub_8105894(struct Sprite *sprite) { - sprite->pos2.y = gSpriteCoordOffsetY; + sprite->y2 = gSpriteCoordOffsetY; } static void sub_81058A0(void) @@ -3523,8 +3523,8 @@ static void sub_810594C(struct Sprite *sprite) { sprite->data[0] -= 2; sprite->data[0] &= 0xff; - sprite->pos2.x = Cos(sprite->data[0], 20); - sprite->pos2.y = Sin(sprite->data[0], 6); + sprite->x2 = Cos(sprite->data[0], 20); + sprite->y2 = Sin(sprite->data[0], 6); sprite->subpriority = 0; if (sprite->data[0] >= 0x80) { @@ -3582,7 +3582,7 @@ static void sub_8105A38(struct Sprite *sprite) } sprite->data[1] &= 0xff; sprite->data[1] += 16; - sprite->pos2.y -= (sprite->data[1] >> 8); + sprite->y2 -= (sprite->data[1] >> 8); } u8 sub_8105ACC(void) @@ -3661,12 +3661,12 @@ static void sub_8105C6C(struct Sprite *sprite) sprite->subspriteTableNum ^= 1; sprite->data[1] = 0; } - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->x2 = 0; + sprite->y2 = 0; if (sprite->subspriteTableNum != 0) { - sprite->pos2.x = sp0[sprite->data[6]]; - sprite->pos2.y = sp8[sprite->data[6]]; + sprite->x2 = sp0[sprite->data[6]]; + sprite->y2 = sp8[sprite->data[6]]; } } @@ -3694,10 +3694,10 @@ static void sub_8105D3C(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.x += 4; - if (sprite->pos1.x >= 0xd0) + sprite->x += 4; + if (sprite->x >= 0xd0) { - sprite->pos1.x = 0xd0; + sprite->x = 0xd0; sprite->data[0]++; } break; @@ -3706,8 +3706,8 @@ static void sub_8105D3C(struct Sprite *sprite) sprite->data[0]++; break; case 2: - sprite->pos1.x += 4; - if (sprite->pos1.x >= 0x110) + sprite->x += 4; + if (sprite->x >= 0x110) sprite->data[0]++; break; case 3: @@ -3721,10 +3721,10 @@ static void sub_8105DA4(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos1.x -= 4; - if (sprite->pos1.x <= 0xd0) + sprite->x -= 4; + if (sprite->x <= 0xd0) { - sprite->pos1.x = 0xd0; + sprite->x = 0xd0; sprite->data[0]++; } break; @@ -3733,8 +3733,8 @@ static void sub_8105DA4(struct Sprite *sprite) sprite->data[0]++; break; case 2: - sprite->pos1.x -= 4; - if (sprite->pos1.x <= 0x90) + sprite->x -= 4; + if (sprite->x <= 0x90) sprite->data[0]++; break; case 3: @@ -3759,10 +3759,10 @@ static void sub_8105E08(struct Sprite *sprite) } break; case 2: - sprite->pos1.x += 4; - if (sprite->pos1.x >= 0xd0) + sprite->x += 4; + if (sprite->x >= 0xd0) { - sprite->pos1.x = 0xd0; + sprite->x = 0xd0; sprite->data[0]++; } break; @@ -3771,8 +3771,8 @@ static void sub_8105E08(struct Sprite *sprite) sprite->data[0]++; break; case 4: - sprite->pos1.x += 4; - if (sprite->pos1.x >= 0xf8) + sprite->x += 4; + if (sprite->x >= 0xf8) sprite->data[0]++; break; case 5: @@ -3790,10 +3790,10 @@ static void sub_8105EB4(struct Sprite *sprite) sprite->data[0]++; // fallthrough case 1: - sprite->pos1.y += 8; - if (sprite->pos1.y >= 0x70) + sprite->y += 8; + if (sprite->y >= 0x70) { - sprite->pos1.y = 0x70; + sprite->y = 0x70; sprite->data[1] = 16; sprite->data[0]++; } @@ -3801,7 +3801,7 @@ static void sub_8105EB4(struct Sprite *sprite) case 2: if (sprite->data[2] == 0) { - sprite->pos1.y -= sprite->data[1]; + sprite->y -= sprite->data[1]; sprite->data[1] = -sprite->data[1]; if (++sprite->data[3] >= 2) { @@ -3830,10 +3830,10 @@ static void sub_8105F54(struct Sprite *sprite) sprite->data[0]++; break; case 1: - sprite->pos1.y += 2; - if (sprite->pos1.y >= 0x30) + sprite->y += 2; + if (sprite->y >= 0x30) { - sprite->pos1.y = 0x30; + sprite->y = 0x30; sprite->data[0]++; sprite->data[7] = 0; } @@ -3910,8 +3910,8 @@ static void sub_81060FC(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - sprite->pos2.x = sp00[sprite->data[6]]; - sprite->pos2.y = sp10[sprite->data[6]]; + sprite->x2 = sp00[sprite->data[6]]; + sprite->y2 = sp10[sprite->data[6]]; sprite->data[1] = sp20[sprite->data[6]]; sprite->data[0]++; // fallthrough @@ -3920,17 +3920,17 @@ static void sub_81060FC(struct Sprite *sprite) sprite->data[0]++; break; case 2: - if (sprite->pos2.x > 0) - sprite->pos2.x -= 4; - else if (sprite->pos2.x < 0) - sprite->pos2.x += 4; + if (sprite->x2 > 0) + sprite->x2 -= 4; + else if (sprite->x2 < 0) + sprite->x2 += 4; - if (sprite->pos2.y > 0) - sprite->pos2.y -= 4; - else if (sprite->pos2.y < 0) - sprite->pos2.y += 4; + if (sprite->y2 > 0) + sprite->y2 -= 4; + else if (sprite->y2 < 0) + sprite->y2 += 4; - if (sprite->pos2.x == 0 && sprite->pos2.y == 0) + if (sprite->x2 == 0 && sprite->y2 == 0) sprite->data[0]++; break; } @@ -3945,8 +3945,8 @@ static void sub_81061C8(struct Sprite *sprite) sprite->data[0]++; sprite->data[1] = 12; } - sprite->pos2.x = Cos(sp0[sprite->data[6]], sprite->data[1]); - sprite->pos2.y = Sin(sp0[sprite->data[6]], sprite->data[1]); + sprite->x2 = Cos(sp0[sprite->data[6]], sprite->data[1]); + sprite->y2 = Sin(sp0[sprite->data[6]], sprite->data[1]); if (sprite->data[1] != 0) sprite->data[1]--; } diff --git a/src/sprite.c b/src/sprite.c index b26fe2d12..46d5b32aa 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -170,8 +170,10 @@ static const struct Sprite sDummySprite = .template = &gDummySpriteTemplate, .subspriteTables = NULL, .callback = SpriteCallbackDummy, - .pos1 = { 304, 160 }, - .pos2 = { 0, 0 }, + .x = 304, + .y = 160, + .x2 = 0, + .y2 = 0, .centerToCornerVecX = 0, .centerToCornerVecY = 0, .animNum = 0, @@ -359,13 +361,13 @@ static void UpdateOamCoords(void) { if (sprite->coordOffsetEnabled) { - sprite->oam.x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; - sprite->oam.y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY; + sprite->oam.x = sprite->x + sprite->x2 + sprite->centerToCornerVecX + gSpriteCoordOffsetX; + sprite->oam.y = sprite->y + sprite->y2 + sprite->centerToCornerVecY + gSpriteCoordOffsetY; } else { - sprite->oam.x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; - sprite->oam.y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; + sprite->oam.x = sprite->x + sprite->x2 + sprite->centerToCornerVecX; + sprite->oam.y = sprite->y + sprite->y2 + sprite->centerToCornerVecY; } } } @@ -565,8 +567,8 @@ static u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, sprite->affineAnims = template->affineAnims; sprite->template = template; sprite->callback = template->callback; - sprite->pos1.x = x; - sprite->pos1.y = y; + sprite->x = x; + sprite->y = y; CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); diff --git a/src/starter_choose.c b/src/starter_choose.c index 99d38bbe4..0a0b0577b 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -414,8 +414,8 @@ static void Task_StarterChoose2(u8 taskId) static void Task_StarterChoose3(u8 taskId) { if (gSprites[gTasks[taskId].tCircleSpriteId].affineAnimEnded && - gSprites[gTasks[taskId].tCircleSpriteId].pos1.x == STARTER_PKMN_POS_X && - gSprites[gTasks[taskId].tCircleSpriteId].pos1.y == STARTER_PKMN_POS_Y) + gSprites[gTasks[taskId].tCircleSpriteId].x == STARTER_PKMN_POS_X && + gSprites[gTasks[taskId].tCircleSpriteId].y == STARTER_PKMN_POS_Y) { gTasks[taskId].func = Task_StarterChoose4; } @@ -727,9 +727,9 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y) //Sprite callback static void sub_810A62C(struct Sprite *sprite) { - sprite->pos1.x = gUnknown_083F76E4[gTasks[sprite->data[0]].tStarterSelection][0]; - sprite->pos1.y = gUnknown_083F76E4[gTasks[sprite->data[0]].tStarterSelection][1]; - sprite->pos2.y = Sin(sprite->data[1], 8); + sprite->x = gUnknown_083F76E4[gTasks[sprite->data[0]].tStarterSelection][0]; + sprite->y = gUnknown_083F76E4[gTasks[sprite->data[0]].tStarterSelection][1]; + sprite->y2 = Sin(sprite->data[1], 8); sprite->data[1] = (u8)sprite->data[1] + 4; } @@ -746,12 +746,12 @@ static void sub_810A68C(struct Sprite *sprite) static void StarterPokemonSpriteAnimCallback(struct Sprite *sprite) { //Move sprite to upper center of screen - if (sprite->pos1.x > STARTER_PKMN_POS_X) - sprite->pos1.x -= 4; - if (sprite->pos1.x < STARTER_PKMN_POS_X) - sprite->pos1.x += 4; - if (sprite->pos1.y > STARTER_PKMN_POS_Y) - sprite->pos1.y -= 2; - if (sprite->pos1.y < STARTER_PKMN_POS_Y) - sprite->pos1.y += 2; + if (sprite->x > STARTER_PKMN_POS_X) + sprite->x -= 4; + if (sprite->x < STARTER_PKMN_POS_X) + sprite->x += 4; + if (sprite->y > STARTER_PKMN_POS_Y) + sprite->y -= 2; + if (sprite->y < STARTER_PKMN_POS_Y) + sprite->y += 2; } diff --git a/src/title_screen.c b/src/title_screen.c index b4aa9f8ed..833f76cec 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -369,7 +369,7 @@ void SpriteCallback_VersionBannerLeft(struct Sprite *sprite) if (task->data[1] != 0) { sprite->oam.objMode = 0; - sprite->pos1.y = VERSION_BANNER_Y_GOAL; + sprite->y = VERSION_BANNER_Y_GOAL; sprite->invisible = FALSE; } else @@ -379,8 +379,8 @@ void SpriteCallback_VersionBannerLeft(struct Sprite *sprite) if (task->data[5] < 64) { sprite->invisible = FALSE; - if (sprite->pos1.y != VERSION_BANNER_Y_GOAL) - sprite->pos1.y++; + if (sprite->y != VERSION_BANNER_Y_GOAL) + sprite->y++; REG_BLDALPHA = gUnknown_08393E64[task->data[5] / 2]; } } @@ -393,7 +393,7 @@ void SpriteCallback_VersionBannerRight(struct Sprite *sprite) if (task->data[1] != 0) { sprite->oam.objMode = 0; - sprite->pos1.y = VERSION_BANNER_Y_GOAL; + sprite->y = VERSION_BANNER_Y_GOAL; sprite->invisible = FALSE; } else @@ -401,8 +401,8 @@ void SpriteCallback_VersionBannerRight(struct Sprite *sprite) if (task->data[5] < 64) { sprite->invisible = FALSE; - if (sprite->pos1.y != VERSION_BANNER_Y_GOAL) - sprite->pos1.y++; + if (sprite->y != VERSION_BANNER_Y_GOAL) + sprite->y++; } } } @@ -556,13 +556,13 @@ static void CreateCopyrightBanner(s16 x, s16 y) void SpriteCallback_PokemonLogoShine(struct Sprite *sprite) { - if (gTasks[gUnknown_0202F7E4].data[1] == 0 && sprite->pos1.x < 272) + if (gTasks[gUnknown_0202F7E4].data[1] == 0 && sprite->x < 272) { if (sprite->data[0]) //Flash background { u16 backgroundColor; - if (sprite->pos1.x < DISPLAY_WIDTH / 2) + if (sprite->x < DISPLAY_WIDTH / 2) { //Brighten background color if (sprite->data[1] < 31) @@ -582,7 +582,7 @@ void SpriteCallback_PokemonLogoShine(struct Sprite *sprite) gPlttBufferFaded[0] = backgroundColor; gPlttBufferFaded[PLTT_BUFFER_INDEX] = backgroundColor; } - sprite->pos1.x += 4; + sprite->x += 4; } else { diff --git a/src/trade.c b/src/trade.c index 218471fe6..2659c8833 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1838,14 +1838,14 @@ static void TradeMenuMoveCursor(u8 *tradeMenuCursorPosition, u8 direction) if (newPosition == 12) // CANCEL { StartSpriteAnim(&gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx], 1); - gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].pos1.x = 0xe0; - gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].pos1.y = 0xa0; + gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].x = 0xe0; + gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].y = 0xa0; } else { StartSpriteAnim(&gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx], 0); - gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].pos1.x = gTradeMonSpriteCoords[newPosition][0] * 8 + 32; - gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].pos1.y = gTradeMonSpriteCoords[newPosition][1] * 8; + gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].x = gTradeMonSpriteCoords[newPosition][0] * 8 + 32; + gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].y = gTradeMonSpriteCoords[newPosition][1] * 8; } if (*tradeMenuCursorPosition != newPosition) { @@ -2278,10 +2278,10 @@ static void sub_8049ED4(u8 a0) break; case 3: sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15 * whichParty, 0, gTradePartyBoxTilemap, 15, 17, 0); - gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].pos1.x = (gTradeMonSpriteCoords[6 * whichParty + whichPokemon ][0] + gTradeMonSpriteCoords[6 * whichParty + whichPokemon + 1][0]) / 2 * 8 + 14; - gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].pos1.y = gTradeMonSpriteCoords[6 * whichParty + whichPokemon ][1] * 8 - 12; - gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].pos2.x = 0; - gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].pos2.y = 0; + gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].x = (gTradeMonSpriteCoords[6 * whichParty + whichPokemon ][0] + gTradeMonSpriteCoords[6 * whichParty + whichPokemon + 1][0]) / 2 * 8 + 14; + gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].y = gTradeMonSpriteCoords[6 * whichParty + whichPokemon ][1] * 8 - 12; + gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].x2 = 0; + gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].y2 = 0; stringLength = sub_804A2B4(string1 + 6, whichParty, whichPokemon); string1[0] = 0xFC; string1[1] = 0x06; @@ -3062,10 +3062,10 @@ static void sub_804A740(u8 whichParty) for (i = 0; i < gUnknown_03004824->partyCounts[whichParty]; i ++) { gSprites[gUnknown_03004824->partyIcons[whichParty][i]].invisible = FALSE; - gSprites[gUnknown_03004824->partyIcons[whichParty][i]].pos1.x = gTradeMonSpriteCoords[6 * whichParty + i][0] * 8 + 14; - gSprites[gUnknown_03004824->partyIcons[whichParty][i]].pos1.y = gTradeMonSpriteCoords[6 * whichParty + i][1] * 8 - 12; - gSprites[gUnknown_03004824->partyIcons[whichParty][i]].pos2.x = 0; - gSprites[gUnknown_03004824->partyIcons[whichParty][i]].pos2.y = 0; + gSprites[gUnknown_03004824->partyIcons[whichParty][i]].x = gTradeMonSpriteCoords[6 * whichParty + i][0] * 8 + 14; + gSprites[gUnknown_03004824->partyIcons[whichParty][i]].y = gTradeMonSpriteCoords[6 * whichParty + i][1] * 8 - 12; + gSprites[gUnknown_03004824->partyIcons[whichParty][i]].x2 = 0; + gSprites[gUnknown_03004824->partyIcons[whichParty][i]].y2 = 0; } } @@ -3397,7 +3397,7 @@ static void sub_804B07C(struct Sprite *sprite) static void sub_804B0BC(struct Sprite *sprite) { sprite->data[0] ++; - sprite->pos2.y ++; + sprite->y2 ++; if (sprite->data[0] == 10) DestroySprite(sprite); } @@ -3405,7 +3405,7 @@ static void sub_804B0BC(struct Sprite *sprite) static void sub_804B0E0(struct Sprite *sprite) { sprite->data[0] ++; - sprite->pos2.y --; + sprite->y2 --; if (sprite->data[0] == 10) DestroySprite(sprite); } @@ -4352,8 +4352,8 @@ static bool8 sub_804C29C(void) { case 0: gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].invisible = FALSE; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.x = -0xb4; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].x2 = -0xb4; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].y2 = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset; gUnknown_03004828->unk_00c4 ++; gUnknown_03004828->unk_0124 = GetCurrentMapMusic(); PlayBGM(MUS_EVOLUTION); @@ -4361,12 +4361,12 @@ static bool8 sub_804C29C(void) case 1: if (gUnknown_03004828->bg2hofs > 0) { - gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.x += 3; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].x2 += 3; gUnknown_03004828->bg2hofs -= 3; } else { - gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.x = 0; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].x2 = 0; gUnknown_03004828->bg2hofs = 0; gUnknown_03004828->unk_00c4 = 10; } @@ -4479,10 +4479,10 @@ static bool8 sub_804C29C(void) REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; break; case 200: - gSprites[gUnknown_03004828->unk_00ba].pos1.y -= 2; - gSprites[gUnknown_03004828->unk_00bb].pos1.y -= 2; + gSprites[gUnknown_03004828->unk_00ba].y -= 2; + gSprites[gUnknown_03004828->unk_00bb].y -= 2; sub_804C0F8(0); - if (gSprites[gUnknown_03004828->unk_00ba].pos1.y < -8) + if (gSprites[gUnknown_03004828->unk_00ba].y < -8) { gUnknown_03004828->unk_00c4 = 29; } @@ -4512,13 +4512,13 @@ static bool8 sub_804C29C(void) PlaySE(SE_WARP_OUT); gUnknown_03004828->unk_00c4 ++; } - gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3; - gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3; + gSprites[gUnknown_03004828->unk_00ba].y2 -= 3; + gSprites[gUnknown_03004828->unk_00bb].y2 += 3; break; case 33: - gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3; - gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3; - if (gSprites[gUnknown_03004828->unk_00ba].pos2.y <= -0x5a) + gSprites[gUnknown_03004828->unk_00ba].y2 -= 3; + gSprites[gUnknown_03004828->unk_00bb].y2 += 3; + if (gSprites[gUnknown_03004828->unk_00ba].y2 <= -0x5a) { gSprites[gUnknown_03004828->unk_00ba].data[1] = 1; gSprites[gUnknown_03004828->unk_00bb].data[1] = 1; @@ -4550,22 +4550,22 @@ static bool8 sub_804C29C(void) StartSpriteAffineAnim(&gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]], 0); } StartSpriteAffineAnim(&gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]], 0); - gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos1.x = 0x3c; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos1.x = 0xb4; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos1.y = 0xc0; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos1.y = -0x20; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].x = 0x3c; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].x = 0xb4; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].y = 0xc0; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].y = -0x20; gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].invisible = FALSE; gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].invisible = FALSE; gUnknown_03004828->unk_00c4 ++; break; case 38: - gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y -= 3; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.y += 3; - if (-0xa0 > gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y && gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y >= -0xa3) + gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].y2 -= 3; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].y2 += 3; + if (-0xa0 > gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].y2 && gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].y2 >= -0xa3) { PlaySE(SE_WARP_IN); } - if (gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y < -0xde) + if (gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].y2 < -0xde) { gSprites[gUnknown_03004828->unk_00ba].data[1] = 0; gSprites[gUnknown_03004828->unk_00bb].data[1] = 0; @@ -4576,9 +4576,9 @@ static bool8 sub_804C29C(void) } break; case 39: - gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3; - gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3; - if (gSprites[gUnknown_03004828->unk_00ba].pos2.y <= -0xde) + gSprites[gUnknown_03004828->unk_00ba].y2 -= 3; + gSprites[gUnknown_03004828->unk_00bb].y2 += 3; + if (gSprites[gUnknown_03004828->unk_00ba].y2 <= -0xde) { BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; @@ -4611,9 +4611,9 @@ static bool8 sub_804C29C(void) break; case 43: sub_804C0F8(1); - gSprites[gUnknown_03004828->unk_00ba].pos2.y += 3; - gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3; - if (gSprites[gUnknown_03004828->unk_00ba].pos2.y + gSprites[gUnknown_03004828->unk_00ba].pos1.y == 64) + gSprites[gUnknown_03004828->unk_00ba].y2 += 3; + gSprites[gUnknown_03004828->unk_00bb].y2 += 3; + if (gSprites[gUnknown_03004828->unk_00ba].y2 + gSprites[gUnknown_03004828->unk_00ba].y == 64) { gUnknown_03004828->unk_00c4 ++; } @@ -4719,10 +4719,10 @@ static bool8 sub_804C29C(void) } break; case 66: - gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos1.x = 0x78; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos1.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[1]].y_offset + 60; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.x = 0; - gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.y = 0; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].x = 0x78; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[1]].y_offset + 60; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].x2 = 0; + gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].y2 = 0; CreatePokeballSprite(gUnknown_03004828->pokePicSpriteIdxs[1], gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].oam.paletteNum, 0x78, 0x54, 2, 1, 0x14, 0xfffff); FreeSpriteOamMatrix(&gSprites[gUnknown_03004828->unk_0103]); DestroySprite(&gSprites[gUnknown_03004828->unk_0103]); @@ -4849,16 +4849,16 @@ static void sub_804D63C(void) static void sub_804D6BC(struct Sprite *sprite) { - sprite->pos1.y += sprite->data[0] / 10; + sprite->y += sprite->data[0] / 10; sprite->data[5] += sprite->data[1]; - sprite->pos1.x = sprite->data[5] / 10; - if (sprite->pos1.y > 0x4c) + sprite->x = sprite->data[5] / 10; + if (sprite->y > 0x4c) { - sprite->pos1.y = 0x4c; + sprite->y = 0x4c; sprite->data[0] = -(sprite->data[0] * sprite->data[2]) / 100; sprite->data[3] ++; } - if (sprite->pos1.x == 0x78) + if (sprite->x == 0x78) sprite->data[1] = 0; sprite->data[0] += sprite->data[4]; if (sprite->data[3] == 4) @@ -4870,7 +4870,7 @@ static void sub_804D6BC(struct Sprite *sprite) static void sub_804D738(struct Sprite *sprite) { - sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]]; + sprite->y2 += gTradeBallVerticalVelocityTable[sprite->data[0]]; if (sprite->data[0] == 22) PlaySE(SE_BALL_BOUNCE_1); if (++ sprite->data[0] == 44) @@ -4888,7 +4888,7 @@ static void sub_804D7AC(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 1); if (++ sprite->data[1] > 20) { - sprite->pos2.y -= gTradeBallVerticalVelocityTable[sprite->data[0]]; + sprite->y2 -= gTradeBallVerticalVelocityTable[sprite->data[0]]; if (++ sprite->data[0] == 23) { DestroySprite(sprite); @@ -4901,7 +4901,7 @@ static void sub_804D80C(struct Sprite *sprite) { if (sprite->data[2] == 0) { - if ((sprite->pos1.y += 4) > sprite->data[3]) + if ((sprite->y += 4) > sprite->data[3]) { sprite->data[2] ++; sprite->data[0] = 0x16; @@ -4916,7 +4916,7 @@ static void sub_804D80C(struct Sprite *sprite) PlaySE(SE_BALL_BOUNCE_3); if (sprite->data[0] == 0x6b) PlaySE(SE_BALL_BOUNCE_4); - sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]]; + sprite->y2 += gTradeBallVerticalVelocityTable[sprite->data[0]]; if (++sprite->data[0] == 0x6c) sprite->callback = SpriteCallbackDummy; } diff --git a/src/trainer_see.c b/src/trainer_see.c index 30d8d2794..0c9e90576 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -552,10 +552,10 @@ static void objc_exclamation_mark_probably(struct Sprite *sprite) { struct Sprite *objEventSprite = &gSprites[gObjectEvents[objEventId].spriteId]; sprite->data[4] += sprite->data[3]; - sprite->pos1.x = objEventSprite->pos1.x; - sprite->pos1.y = objEventSprite->pos1.y - 16; - sprite->pos2.x = objEventSprite->pos2.x; - sprite->pos2.y = objEventSprite->pos2.y + sprite->data[4]; + sprite->x = objEventSprite->x; + sprite->y = objEventSprite->y - 16; + sprite->x2 = objEventSprite->x2; + sprite->y2 = objEventSprite->y2 + sprite->data[4]; if (sprite->data[4]) sprite->data[3]++; else diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 8fff9edee..78b5db4a8 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -285,7 +285,7 @@ static void sub_8136294(void) break; case 13: sub_80F2E18(0); - gPokenavStructPtr->unk8768->pos2.y = 0xffd8; + gPokenavStructPtr->unk8768->y2 = 0xffd8; gUnknown_02039304->unk50++; break; case 14: @@ -857,9 +857,9 @@ static void sub_8137138(void) static void sub_81371DC(struct Sprite *sprite) { if (sprite->data[0] <= 5) - sprite->pos2.y -= 2; + sprite->y2 -= 2; else if (sprite->data[0] <= 11) - sprite->pos2.y += 2; + sprite->y2 += 2; if ((++sprite->data[0]) > 60) { DestroySprite(sprite); diff --git a/src/wallclock.c b/src/wallclock.c index 41142e5e2..85f9f1419 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -969,8 +969,8 @@ static void SpriteCB_MinuteHand(struct Sprite *sprite) if (y > 0x80) y |= 0xFF00; - sprite->pos2.x = x; - sprite->pos2.y = y; + sprite->x2 = x; + sprite->y2 = y; } static void SpriteCB_HourHand(struct Sprite *sprite) @@ -990,8 +990,8 @@ static void SpriteCB_HourHand(struct Sprite *sprite) if (y > 0x80) y |= 0xFF00; - sprite->pos2.x = x; - sprite->pos2.y = y; + sprite->x2 = x; + sprite->y2 = y; } static void SpriteCB_AMIndicator(struct Sprite *sprite) @@ -1010,8 +1010,8 @@ static void SpriteCB_AMIndicator(struct Sprite *sprite) if (sprite->data[1] > 75) sprite->data[1]--; } - sprite->pos2.x = Cos2(sprite->data[1]) * 30 / 4096; - sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 4096; + sprite->x2 = Cos2(sprite->data[1]) * 30 / 4096; + sprite->y2 = Sin2(sprite->data[1]) * 30 / 4096; } static void SpriteCB_PMIndicator(struct Sprite *sprite) @@ -1030,6 +1030,6 @@ static void SpriteCB_PMIndicator(struct Sprite *sprite) if (sprite->data[1] > 120) sprite->data[1]--; } - sprite->pos2.x = Cos2(sprite->data[1]) * 30 / 4096; - sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 4096; + sprite->x2 = Cos2(sprite->data[1]) * 30 / 4096; + sprite->y2 = Sin2(sprite->data[1]) * 30 / 4096; } |