diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_anim.c | 14 | ||||
| -rw-r--r-- | src/battle_anim_80A5C6C.c | 116 | ||||
| -rwxr-xr-x | src/battle_anim_8170478.c | 4 | ||||
| -rw-r--r-- | src/battle_anim_effects_1.c | 609 | ||||
| -rwxr-xr-x | src/battle_anim_effects_2.c | 38 | ||||
| -rwxr-xr-x | src/battle_anim_effects_3.c | 44 | ||||
| -rw-r--r-- | src/bug.c | 8 | ||||
| -rw-r--r-- | src/dragon.c | 4 | ||||
| -rw-r--r-- | src/electric.c | 10 | ||||
| -rw-r--r-- | src/fight.c | 30 | ||||
| -rw-r--r-- | src/fire.c | 20 | ||||
| -rw-r--r-- | src/ghost.c | 20 | ||||
| -rw-r--r-- | src/ground.c | 10 | ||||
| -rw-r--r-- | src/normal.c | 20 | ||||
| -rw-r--r-- | src/poison.c | 8 | ||||
| -rw-r--r-- | src/pokeball.c | 2 | ||||
| -rw-r--r-- | src/rock.c | 8 | ||||
| -rw-r--r-- | src/water.c | 22 |
18 files changed, 542 insertions, 445 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 88c548208..1e1219800 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1671,7 +1671,11 @@ static void ScriptCmd_createsprite(void) if (subpriority < 3) subpriority = 3; - CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gBattleAnimTarget, 2), GetBattlerSpriteCoord(gBattleAnimTarget, 3), subpriority); + CreateSpriteAndAnimate( + template, + GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2), + GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET), + subpriority); gAnimVisualTaskCount++; } @@ -3029,12 +3033,12 @@ static void ScriptCmd_doublebattle_2D(void) { if (wantedBattler == ANIM_ATTACKER) { - r4 = sub_80A8364(gBattleAnimAttacker); + r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); } else { - r4 = sub_80A8364(gBattleAnimTarget); + r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } if (spriteId != 0xFF) @@ -3064,12 +3068,12 @@ static void ScriptCmd_doublebattle_2E(void) { if (wantedBattler == ANIM_ATTACKER) { - r4 = sub_80A8364(gBattleAnimAttacker); + r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); } else { - r4 = sub_80A8364(gBattleAnimTarget); + r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c index 15a4d2b63..e17dde078 100644 --- a/src/battle_anim_80A5C6C.c +++ b/src/battle_anim_80A5C6C.c @@ -568,7 +568,7 @@ void TranslateSpriteOverDuration(struct Sprite *sprite) } } -void TranslateAnimLinearSimple(struct Sprite *sprite) +void AnimTranslateLinearSimple(struct Sprite *sprite) { if (sprite->data[0] > 0) { @@ -716,7 +716,9 @@ void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite) sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); } -void sub_80A6864(struct Sprite *sprite, s16 xOffset) +// Sets the initial x offset of the anim sprite depending on the horizontal orientation +// of the two involved mons. +void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 xOffset) { u16 attackerX = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X); u16 targetX = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X); @@ -749,7 +751,7 @@ void InitAnimArcTranslation(struct Sprite *sprite) bool8 TranslateAnimArc(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) return TRUE; sprite->data[7] += sprite->data[6]; sprite->pos2.y += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]); @@ -758,7 +760,7 @@ bool8 TranslateAnimArc(struct Sprite *sprite) bool8 sub_80A6934(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) return TRUE; sprite->data[7] += sprite->data[6]; sprite->pos2.x += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]); @@ -773,18 +775,20 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite) sprite->pos2.y = 0; } -void sub_80A6980(struct Sprite *sprite, bool8 a2) +void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets) { - if (!a2) + // Battle anim sprites are automatically created at the anim target's center, which + // is why there is no else clause for the "respectMonPicOffsets" check. + if (!respectMonPicOffsets) { sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_X); sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_Y); } - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; } -void InitAnimSpritePos(struct Sprite *sprite, u8 respectMonPicOffsets) +void InitSpritePosToAnimAttacker(struct Sprite *sprite, u8 respectMonPicOffsets) { if (!respectMonPicOffsets) { @@ -796,7 +800,7 @@ void InitAnimSpritePos(struct Sprite *sprite, u8 respectMonPicOffsets) sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); } - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; } @@ -917,7 +921,7 @@ void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused) unk->tilesOffset = 0; unk->unkC = 0; } - else if (sub_80A8364(gBattleAnimAttacker) == 1) + else if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) { unk->unk8 = 8; unk->bgId = 1; @@ -1058,7 +1062,7 @@ void sub_80A6F14(struct Sprite *sprite) sprite->callback(sprite); } -bool8 TranslateAnimLinear(struct Sprite *sprite) +bool8 AnimTranslateLinear(struct Sprite *sprite) { u16 v1, v2, x, y; @@ -1090,14 +1094,14 @@ bool8 TranslateAnimLinear(struct Sprite *sprite) void sub_80A6F98(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) SetCallbackToStoredInData6(sprite); } void sub_80A6FB4(struct Sprite *sprite) { sub_8039E9C(sprite); - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) SetCallbackToStoredInData6(sprite); } @@ -1117,14 +1121,14 @@ void sub_80A7000(struct Sprite *sprite) sprite->callback(sprite); } -void sub_80A7028(struct Sprite *sprite) +static void InitAnimFastLinearTranslation(struct Sprite *sprite) { - int x = sprite->data[2] - sprite->data[1]; - int y = sprite->data[4] - sprite->data[3]; - bool8 x_sign = x < 0; - bool8 y_sign = y < 0; - u16 x2 = abs(x) << 4; - u16 y2 = abs(y) << 4; + int xDiff = sprite->data[2] - sprite->data[1]; + int yDiff = sprite->data[4] - sprite->data[3]; + bool8 x_sign = xDiff < 0; + bool8 y_sign = yDiff < 0; + u16 x2 = abs(xDiff) << 4; + u16 y2 = abs(yDiff) << 4; x2 /= sprite->data[0]; y2 /= sprite->data[0]; @@ -1145,16 +1149,16 @@ void sub_80A7028(struct Sprite *sprite) sprite->data[3] = 0; } -void sub_80A70C0(struct Sprite *sprite) +void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sub_80A7028(sprite); + InitAnimFastLinearTranslation(sprite); sprite->callback = sub_80A7144; sprite->callback(sprite); } -bool8 sub_80A70E8(struct Sprite *sprite) +bool8 AnimFastTranslateLinear(struct Sprite *sprite) { u16 v1, v2, x, y; @@ -1186,22 +1190,22 @@ bool8 sub_80A70E8(struct Sprite *sprite) void sub_80A7144(struct Sprite *sprite) { - if (sub_80A70E8(sprite)) + if (AnimFastTranslateLinear(sprite)) SetCallbackToStoredInData6(sprite); } -void sub_80A7160(struct Sprite *sprite) +void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite) { - int v1 = abs(sprite->data[2] - sprite->data[1]) << 4; - sprite->data[0] = v1 / sprite->data[0]; - sub_80A7028(sprite); + int xDiff = abs(sprite->data[2] - sprite->data[1]) << 4; + sprite->data[0] = xDiff / sprite->data[0]; + InitAnimFastLinearTranslation(sprite); } void sub_80A718C(struct Sprite *sprite) { sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; - sub_80A7160(sprite); + InitAnimFastLinearTranslationWithSpeed(sprite); sprite->callback = sub_80A7144; sprite->callback(sprite); } @@ -1471,9 +1475,9 @@ void sub_80A77C8(struct Sprite *sprite) else var = FALSE; if (!gBattleAnimArgs[2]) - InitAnimSpritePos(sprite, var); + InitSpritePosToAnimAttacker(sprite, var); else - sub_80A6980(sprite, var); + InitSpritePosToAnimTarget(sprite, var); sprite->data[0]++; } @@ -1506,7 +1510,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) else coordType = BATTLER_COORD_Y; - InitAnimSpritePos(sprite, v1); + InitSpritePosToAnimAttacker(sprite, v1); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; @@ -1519,7 +1523,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) void sub_80A78AC(struct Sprite *sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -1553,17 +1557,17 @@ void sub_80A7938(struct Sprite *sprite) } if (!gBattleAnimArgs[5]) { - InitAnimSpritePos(sprite, r4); + InitSpritePosToAnimAttacker(sprite, r4); battlerId = gBattleAnimAttacker; } else { - sub_80A6980(sprite, r4); + InitSpritePosToAnimTarget(sprite, r4); battlerId = gBattleAnimTarget; } if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - sub_80A6980(sprite, r4); + InitSpritePosToAnimTarget(sprite, r4); sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(battlerId, attributeId) + gBattleAnimArgs[3]; @@ -2006,7 +2010,7 @@ u8 GetBattlerSpriteSubpriority(u8 battlerId) return subpriority; } -u8 sub_80A8328(u8 battlerId) +u8 GetBattlerSpriteBGPriority(u8 battlerId) { u8 position = GetBattlerPosition(battlerId); @@ -2018,7 +2022,7 @@ u8 sub_80A8328(u8 battlerId) return GetAnimBgAttribute(1, BG_ANIM_PRIORITY); } -u8 sub_80A8364(u8 battlerId) +u8 GetBattlerSpriteBGPriorityRank(u8 battlerId) { if (!IsContest()) { @@ -2229,36 +2233,38 @@ s16 sub_80A861C(u8 battlerId, u8 a2) } } -void SetAverageBattlerPositions(u8 battlerId, bool8 a2, s16 *x, s16 *y) +void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y) { - u8 v1, v2; - s16 v3, v4; - s16 v5, v6; + u8 xCoordType, yCoordType; + s16 battlerX, battlerY; + s16 partnerX, partnerY; - if (!a2) + if (!respectMonPicOffsets) { - v1 = 0; - v2 = 1; + xCoordType = BATTLER_COORD_X; + yCoordType = BATTLER_COORD_Y; } else { - v1 = 2; - v2 = 3; + xCoordType = BATTLER_COORD_X_2; + yCoordType = BATTLER_COORD_Y_PIC_OFFSET; } - v3 = GetBattlerSpriteCoord(battlerId, v1); - v4 = GetBattlerSpriteCoord(battlerId, v2); + + battlerX = GetBattlerSpriteCoord(battlerId, xCoordType); + battlerY = GetBattlerSpriteCoord(battlerId, yCoordType); if (IsDoubleBattle() && !IsContest()) { - v5 = GetBattlerSpriteCoord(BATTLE_PARTNER(battlerId), v1); - v6 = GetBattlerSpriteCoord(BATTLE_PARTNER(battlerId), v2); + partnerX = GetBattlerSpriteCoord(BATTLE_PARTNER(battlerId), xCoordType); + partnerY = GetBattlerSpriteCoord(BATTLE_PARTNER(battlerId), yCoordType); } else { - v5 = v3; - v6 = v4; + partnerX = battlerX; + partnerY = battlerY; } - *x = (v3 + v5) / 2; - *y = (v4 + v6) / 2; + + *x = (battlerX + partnerX) / 2; + *y = (battlerY + partnerY) / 2; } u8 sub_80A89C8(int battlerId, u8 spriteId, int species) diff --git a/src/battle_anim_8170478.c b/src/battle_anim_8170478.c index 34898899c..32214b58d 100755 --- a/src/battle_anim_8170478.c +++ b/src/battle_anim_8170478.c @@ -1971,7 +1971,7 @@ void sub_8172D98(u8 taskId) switch (gTasks[taskId].data[15]) { case 0: - if (sub_80A8364(gBattleAnimAttacker) == B_POSITION_OPPONENT_LEFT) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == B_POSITION_OPPONENT_LEFT) SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); else SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); @@ -2188,7 +2188,7 @@ void sub_81732E4(u8 taskId) static void sub_817330C(struct Sprite *sprite) { - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, 0); sprite->data[0] = 30; sprite->data[2] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 0) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), 1) + gBattleAnimArgs[3]; diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 3b1b49e34..e37d2b5b8 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -19,28 +19,28 @@ EWRAM_DATA s16 gUnknown_0203A0F8[4] = {0}; void AnimMovePowderParticle(struct Sprite *); -void sub_80FE8E0(struct Sprite *); -void sub_80FE930(struct Sprite *); -void sub_80FE988(struct Sprite *); -void sub_80FEAD8(struct Sprite *); -void sub_80FEB44(struct Sprite *); -void sub_80FED28(struct Sprite *); -void sub_80FEE78(struct Sprite *); -void sub_80FEF44(struct Sprite *); -void sub_80FEFFC(struct Sprite *); +void AnimPowerAbsorptionOrb(struct Sprite *); +void AnimSolarbeamBigOrb(struct Sprite *); +void AnimSolarbeamSmallOrb(struct Sprite *); +void AnimAbsorptionOrb(struct Sprite *); +void AnimHyperBeamOrb(struct Sprite *); +void AnimSporeParticle(struct Sprite *); +void AnimPetalDanceBigFlower(struct Sprite *); +void AnimPetalDanceSmallFlower(struct Sprite *); +void AnimRazorLeafParticle(struct Sprite *); void AnimLeechSeed(struct Sprite *); void AnimTranslateLinearSingleSineWave(struct Sprite *); void AnimMoveTwisterParticle(struct Sprite *); -void sub_80FF374(struct Sprite *); -void sub_80FF698(struct Sprite *); -void sub_80FF768(struct Sprite *); -void sub_80FF7EC(struct Sprite *); -void sub_80FF934(struct Sprite *); -void sub_80FFB18(struct Sprite *); -void sub_80FFBF4(struct Sprite *); -void sub_80FFC70(struct Sprite *); -void sub_80FFCB4(struct Sprite *); -void sub_80FFDBC(struct Sprite *); +void AnimConstrictBinding(struct Sprite *); +void AnimMimicOrb(struct Sprite *); +void AnimIngrainRoot(struct Sprite *); +void AnimFrenzyPlantRoot(struct Sprite *); +void AnimIngrainOrb(struct Sprite *); +void AnimPresent(struct Sprite *); +void AnimKnockOffItem(struct Sprite *); +void AnimPresentHealParticle(struct Sprite *); +void AnimItemSteal(struct Sprite *); +void AnimTrickBag(struct Sprite *); void sub_8100640(struct Sprite *); void sub_8100898(struct Sprite *); void sub_81009F8(struct Sprite *); @@ -79,27 +79,27 @@ void sub_8103208(struct Sprite *); void sub_8103284(struct Sprite *); void sub_8103390(struct Sprite *); static void AnimMovePowderParticleStep(struct Sprite *); -static void sub_80FE9E4(struct Sprite *); -static void sub_80FEB28(struct Sprite *); -static void sub_80FEBFC(struct Sprite *); +static void AnimSolarbeamSmallOrbStep(struct Sprite *); +static void AnimAbsorptionOrbStep(struct Sprite *); +static void AnimHyperBeamOrbStep(struct Sprite *); static void AnimLeechSeedStep(struct Sprite *); static void AnimLeechSeedSprouts(struct Sprite *); -static void sub_80FED74(struct Sprite *); -static void sub_80FEECC(struct Sprite *); -static void sub_80FEF98(struct Sprite *); -static void sub_80FF044(struct Sprite *); -static void sub_80FF090(struct Sprite *); +static void AnimSporeParticleStep(struct Sprite *); +static void AnimPetalDanceBigFlowerStep(struct Sprite *); +static void AnimPetalDanceSmallFlowerStep(struct Sprite *); +static void AnimRazorLeafParticleStep1(struct Sprite *); +static void AnimRazorLeafParticleStep2(struct Sprite *); static void AnimTranslateLinearSingleSineWaveStep(struct Sprite *); static void AnimMoveTwisterParticleStep(struct Sprite *); -static void sub_80FF3B0(struct Sprite *); -static void sub_80FF3EC(struct Sprite *); +static void AnimConstrictBindingStep1(struct Sprite *); +static void AnimConstrictBindingStep2(struct Sprite *); static void sub_80FF53C(u8); static void sub_80FF5CC(u8); -static void sub_80FFD2C(struct Sprite *); -static void sub_80FF8DC(struct Sprite *); -static void sub_80FFE58(struct Sprite *); -static void sub_80FFEC4(struct Sprite *); -static void sub_80FFF7C(struct Sprite *); +static void AnimItemStealStep(struct Sprite *); +static void AnimRootFlickerOut(struct Sprite *); +static void AnimTrickBagStep1(struct Sprite *); +static void AnimTrickBagStep2(struct Sprite *); +static void AnimTrickBagStep3(struct Sprite *); static void sub_8100128(u8); static s16 sub_8100504(struct Sprite *); static void sub_8100524(struct Task *, u8); @@ -285,7 +285,7 @@ const union AffineAnimCmd *const gUnknown_085921DC[] = { gUnknown_085921CC, }; -const struct SpriteTemplate gUnknown_085921E0 = +const struct SpriteTemplate gPowerAbsorptionOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, @@ -293,10 +293,10 @@ const struct SpriteTemplate gUnknown_085921E0 = .anims = gUnknown_085921C8, .images = NULL, .affineAnims = gUnknown_085921DC, - .callback = sub_80FE8E0, + .callback = AnimPowerAbsorptionOrb, }; -const struct SpriteTemplate gUnknown_085921F8 = +const struct SpriteTemplate gSolarbeamBigOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, @@ -304,10 +304,10 @@ const struct SpriteTemplate gUnknown_085921F8 = .anims = gUnknown_085921A8, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FE930, + .callback = AnimSolarbeamBigOrb, }; -const struct SpriteTemplate gUnknown_08592210 = +const struct SpriteTemplate gSolarbeamSmallOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, @@ -315,7 +315,7 @@ const struct SpriteTemplate gUnknown_08592210 = .anims = gUnknown_085921C4, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FE988, + .callback = AnimSolarbeamSmallOrb, }; const union AffineAnimCmd gUnknown_08592228[] = { @@ -328,7 +328,7 @@ const union AffineAnimCmd *const gUnknown_08592240[] = { gUnknown_08592228, }; -const struct SpriteTemplate gUnknown_08592244 = +const struct SpriteTemplate gStockpileAbsorptionOrbSpriteTemplate = { .tileTag = ANIM_TAG_GRAY_ORB, .paletteTag = ANIM_TAG_GRAY_ORB, @@ -336,7 +336,7 @@ const struct SpriteTemplate gUnknown_08592244 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08592240, - .callback = sub_80FE8E0, + .callback = AnimPowerAbsorptionOrb, }; const union AffineAnimCmd gUnknown_0859225C[] = { @@ -348,7 +348,7 @@ const union AffineAnimCmd *const gUnknown_0859226C[] = { gUnknown_0859225C, }; -const struct SpriteTemplate gUnknown_08592270 = +const struct SpriteTemplate gAbsorptionOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, @@ -356,10 +356,10 @@ const struct SpriteTemplate gUnknown_08592270 = .anims = gUnknown_085921C8, .images = NULL, .affineAnims = gUnknown_0859226C, - .callback = sub_80FEAD8, + .callback = AnimAbsorptionOrb, }; -const struct SpriteTemplate gUnknown_08592288 = +const struct SpriteTemplate gHyperBeamOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, @@ -367,7 +367,7 @@ const struct SpriteTemplate gUnknown_08592288 = .anims = gUnknown_085921A8, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEB44, + .callback = AnimHyperBeamOrb, }; const union AnimCmd gUnknown_085922A0[] = @@ -418,7 +418,7 @@ const union AnimCmd *const gUnknown_085922E4[] = gUnknown_085922DC, }; -const struct SpriteTemplate gUnknown_085922EC = +const struct SpriteTemplate gSporeParticleSpriteTemplate = { .tileTag = ANIM_TAG_SPORE, .paletteTag = ANIM_TAG_SPORE, @@ -426,7 +426,7 @@ const struct SpriteTemplate gUnknown_085922EC = .anims = gUnknown_085922E4, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FED28, + .callback = AnimSporeParticle, }; const union AnimCmd gUnknown_08592304[] = @@ -451,7 +451,7 @@ const union AnimCmd *const gUnknown_08592318[] = gUnknown_0859230C, }; -const struct SpriteTemplate gUnknown_0859231C = +const struct SpriteTemplate gPetalDanceBigFlowerSpriteTemplate = { .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, @@ -459,10 +459,10 @@ const struct SpriteTemplate gUnknown_0859231C = .anims = gUnknown_08592314, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEE78, + .callback = AnimPetalDanceBigFlower, }; -const struct SpriteTemplate gUnknown_08592334 = +const struct SpriteTemplate gPetalDanceSmallFlowerSpriteTemplate = { .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, @@ -470,7 +470,7 @@ const struct SpriteTemplate gUnknown_08592334 = .anims = gUnknown_08592318, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEF44, + .callback = AnimPetalDanceSmallFlower, }; const union AnimCmd gUnknown_0859234C[] = @@ -502,7 +502,7 @@ const union AnimCmd *const gUnknown_08592388[] = gUnknown_08592378, }; -const struct SpriteTemplate gUnknown_08592390 = +const struct SpriteTemplate gRazorLeafParticleSpriteTemplate = { .tileTag = ANIM_TAG_LEAF, .paletteTag = ANIM_TAG_LEAF, @@ -510,10 +510,10 @@ const struct SpriteTemplate gUnknown_08592390 = .anims = gUnknown_08592388, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FEFFC, + .callback = AnimRazorLeafParticle, }; -const struct SpriteTemplate gUnknown_085923A8 = +const struct SpriteTemplate gTwisterLeafParticleSpriteTemplate = { .tileTag = ANIM_TAG_LEAF, .paletteTag = ANIM_TAG_LEAF, @@ -538,7 +538,7 @@ const union AnimCmd *const gUnknown_085923D4[] = gUnknown_085923C0, }; -const struct SpriteTemplate gUnknown_085923D8 = +const struct SpriteTemplate gRazorLeafCutterSpriteTemplate = { .tileTag = ANIM_TAG_RAZOR_LEAF, .paletteTag = ANIM_TAG_RAZOR_LEAF, @@ -594,14 +594,14 @@ const union AnimCmd *const gUnknown_08592444[] = }; const union AffineAnimCmd gUnknown_0859244C[] = { - AFFINEANIMCMD_FRAME(256, 256, 0, 0), + AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(-11, 0, 0, 6), AFFINEANIMCMD_FRAME(11, 0, 0, 6), AFFINEANIMCMD_END, }; const union AffineAnimCmd gUnknown_0859246C[] = { - AFFINEANIMCMD_FRAME(-256, 256, 0, 0), + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(11, 0, 0, 6), AFFINEANIMCMD_FRAME(-11, 0, 0, 6), AFFINEANIMCMD_END, @@ -612,7 +612,7 @@ const union AffineAnimCmd *const gUnknown_0859248C[] = { gUnknown_0859246C, }; -const struct SpriteTemplate gUnknown_08592494 = +const struct SpriteTemplate gConstrictBindingSpriteTemplate = { .tileTag = ANIM_TAG_TENDRILS, .paletteTag = ANIM_TAG_TENDRILS, @@ -620,7 +620,7 @@ const struct SpriteTemplate gUnknown_08592494 = .anims = gUnknown_08592444, .images = NULL, .affineAnims = gUnknown_0859248C, - .callback = sub_80FF374, + .callback = AnimConstrictBinding, }; const union AffineAnimCmd gUnknown_085924AC[] = { @@ -639,7 +639,7 @@ const union AffineAnimCmd *const gUnknown_085924D4[] = { gUnknown_085924C4, }; -const struct SpriteTemplate gUnknown_085924DC = +const struct SpriteTemplate gMimicOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, @@ -647,7 +647,7 @@ const struct SpriteTemplate gUnknown_085924DC = .anims = gUnknown_085921C8, .images = NULL, .affineAnims = gUnknown_085924D4, - .callback = sub_80FF698, + .callback = AnimMimicOrb, }; const union AnimCmd gUnknown_085924F4[] = @@ -692,7 +692,7 @@ const union AnimCmd *const gUnknown_0859253C[] = gUnknown_0859252C, }; -const struct SpriteTemplate gUnknown_0859254C = +const struct SpriteTemplate gIngrainRootSpriteTemplate = { .tileTag = ANIM_TAG_ROOTS, .paletteTag = ANIM_TAG_ROOTS, @@ -700,10 +700,10 @@ const struct SpriteTemplate gUnknown_0859254C = .anims = gUnknown_0859253C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FF768, + .callback = AnimIngrainRoot, }; -const struct SpriteTemplate gUnknown_08592564 = +const struct SpriteTemplate gFrenzyPlantRootSpriteTemplate = { .tileTag = ANIM_TAG_ROOTS, .paletteTag = ANIM_TAG_ROOTS, @@ -711,7 +711,7 @@ const struct SpriteTemplate gUnknown_08592564 = .anims = gUnknown_0859253C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FF7EC, + .callback = AnimFrenzyPlantRoot, }; const union AnimCmd gUnknown_0859257C[] = @@ -726,7 +726,7 @@ const union AnimCmd *const gUnknown_08592588[] = gUnknown_0859257C, }; -const struct SpriteTemplate gUnknown_0859258C = +const struct SpriteTemplate gIngrainOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, @@ -734,7 +734,7 @@ const struct SpriteTemplate gUnknown_0859258C = .anims = gUnknown_08592588, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FF934, + .callback = AnimIngrainOrb, }; const union AnimCmd gUnknown_085925A4[] = @@ -770,7 +770,7 @@ const union AffineAnimCmd *const gUnknown_08592608[] = { gUnknown_085925D0, }; -const struct SpriteTemplate gUnknown_08592610 = +const struct SpriteTemplate gPresentSpriteTemplate = { .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, @@ -778,10 +778,10 @@ const struct SpriteTemplate gUnknown_08592610 = .anims = gUnknown_085925AC, .images = NULL, .affineAnims = gUnknown_08592608, - .callback = sub_80FFB18, + .callback = AnimPresent, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_8592628 = +const struct SpriteTemplate gKnockOffItemSpriteTemplate = { .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, @@ -789,7 +789,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8592628 = .anims = gUnknown_085925AC, .images = NULL, .affineAnims = gUnknown_08592608, - .callback = sub_80FFBF4, + .callback = AnimKnockOffItem, }; const union AnimCmd gUnknown_08592640[] = @@ -806,7 +806,7 @@ const union AnimCmd *const gUnknown_08592654[] = gUnknown_08592640, }; -const struct SpriteTemplate gUnknown_08592658 = +const struct SpriteTemplate gPresentHealParticleSpriteTemplate = { .tileTag = ANIM_TAG_GREEN_SPARKLE, .paletteTag = ANIM_TAG_GREEN_SPARKLE, @@ -814,10 +814,10 @@ const struct SpriteTemplate gUnknown_08592658 = .anims = gUnknown_08592654, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80FFC70, + .callback = AnimPresentHealParticle, }; -const struct SpriteTemplate gUnknown_08592670 = +const struct SpriteTemplate gItemStealSpriteTemplate = { .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, @@ -825,7 +825,7 @@ const struct SpriteTemplate gUnknown_08592670 = .anims = gUnknown_085925AC, .images = NULL, .affineAnims = gUnknown_08592608, - .callback = sub_80FFCB4, + .callback = AnimItemSteal, }; const union AffineAnimCmd gUnknown_08592688[] = { @@ -851,7 +851,7 @@ const union AffineAnimCmd *const gUnknown_085926D8[] = { gUnknown_085925D0, }; -const struct SpriteTemplate gUnknown_085926E8 = +const struct SpriteTemplate gTrickBagSpriteTemplate = { .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, @@ -859,7 +859,7 @@ const struct SpriteTemplate gUnknown_085926E8 = .anims = gUnknown_085925AC, .images = NULL, .affineAnims = gUnknown_085926D8, - .callback = sub_80FFDBC, + .callback = AnimTrickBag, }; const s8 gUnknown_08592700[][3] = @@ -2219,44 +2219,59 @@ static void AnimMovePowderParticleStep(struct Sprite* sprite) } } -void sub_80FE8E0(struct Sprite* sprite) +// Moves an energy orb towards the center of the mon. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: duration +void AnimPowerAbsorptionOrb(struct Sprite* sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); } -void sub_80FE930(struct Sprite* sprite) +// Moves an orb in a straight line towards the target mon. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: duration +// arg 3: sprite anim number +void AnimSolarbeamBigOrb(struct Sprite* sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, TRUE); StartSpriteAnim(sprite, gBattleAnimArgs[3]); sprite->data[0] = gBattleAnimArgs[2]; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -void sub_80FE988(struct Sprite* sprite) +// Moves a small orb in a wavy pattern towards the target mon. +// The small orb "circles" the big orbs in AnimSolarbeamBigOrb. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: duration +// arg 3: initial wave offset +void AnimSolarbeamSmallOrb(struct Sprite* sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[3]; - sprite->callback = sub_80FE9E4; + sprite->callback = AnimSolarbeamSmallOrbStep; sprite->callback(sprite); } -static void sub_80FE9E4(struct Sprite* sprite) +static void AnimSolarbeamSmallOrbStep(struct Sprite* sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) { DestroySprite(sprite); } @@ -2273,10 +2288,12 @@ static void sub_80FE9E4(struct Sprite* sprite) } } -void sub_80FEA58(u8 taskId) +// Creates 15 small secondary orbs used in the solarbeam anim effect. +// There is a 7-frame delay between each of them. +// No args. +void AnimTask_CreateSmallSolarbeamOrbs(u8 taskId) { - gTasks[taskId].data[0]--; - if (gTasks[taskId].data[0] == -1) + if (--gTasks[taskId].data[0] == -1) { gTasks[taskId].data[1]++; gTasks[taskId].data[0] = 6; @@ -2284,63 +2301,66 @@ void sub_80FEA58(u8 taskId) gBattleAnimArgs[1] = 0; gBattleAnimArgs[2] = 80; gBattleAnimArgs[3] = 0; - CreateSpriteAndAnimate(&gUnknown_08592210, 0, 0, GetBattlerSpriteSubpriority(gBattleAnimTarget) + 1); + CreateSpriteAndAnimate(&gSolarbeamSmallOrbSpriteTemplate, 0, 0, GetBattlerSpriteSubpriority(gBattleAnimTarget) + 1); } if (gTasks[taskId].data[1] == 15) DestroyAnimVisualTask(taskId); } -void sub_80FEAD8(struct Sprite* sprite) +// Moves an orb from the target mon to the attacking mon in an arc-like fashion. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: wave amplitude +// arg 3: wave period (lower means faster wave) +void AnimAbsorptionOrb(struct Sprite* sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[3]; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); sprite->data[5] = gBattleAnimArgs[2]; InitAnimArcTranslation(sprite); - sprite->callback = sub_80FEB28; + sprite->callback = AnimAbsorptionOrbStep; } -static void sub_80FEB28(struct Sprite* sprite) +static void AnimAbsorptionOrbStep(struct Sprite* sprite) { if (TranslateAnimArc(sprite)) DestroyAnimSprite(sprite); } -void sub_80FEB44(struct Sprite* sprite) +// Moves an orb in a wave-like fashion towards the target mon. The wave's +// properties and the sprite anim are randomly determined. +void AnimHyperBeamOrb(struct Sprite* sprite) { - u16 a = Random2(); - u16 b; + u16 speed; + u16 animNum = Random2(); - StartSpriteAnim(sprite, a & 7); - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); - if (GetBattlerSide(gBattleAnimAttacker)) - { + StartSpriteAnim(sprite, animNum % 8); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos1.x -= 20; - } else - { sprite->pos1.x += 20; - } - b = Random2(); - sprite->data[0] = (b & 31) + 64; + speed = Random2(); + sprite->data[0] = (speed & 31) + 64; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); - sub_80A7160(sprite); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); + InitAnimFastLinearTranslationWithSpeed(sprite); sprite->data[5] = Random2() & 0xFF; sprite->data[6] = sprite->subpriority; - sprite->callback = sub_80FEBFC; + sprite->callback = AnimHyperBeamOrbStep; sprite->callback(sprite); } -static void sub_80FEBFC(struct Sprite* sprite) +static void AnimHyperBeamOrbStep(struct Sprite* sprite) { - if (sub_80A70E8(sprite)) + if (AnimFastTranslateLinear(sprite)) { DestroyAnimSprite(sprite); } @@ -2352,7 +2372,8 @@ static void sub_80FEBFC(struct Sprite* sprite) else sprite->subpriority = sprite->data[6] + 1; - sprite->data[5] = (sprite->data[5] + 24) & 0xFF; + sprite->data[5] += 24; + sprite->data[5] &= 0xFF; } } @@ -2366,13 +2387,13 @@ static void sub_80FEBFC(struct Sprite* sprite) // arg 5: wave amplitude void AnimLeechSeed(struct Sprite* sprite) { - InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gBattleAnimAttacker)) + InitSpritePosToAnimAttacker(sprite, TRUE); + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); sprite->callback = AnimLeechSeedStep; @@ -2398,42 +2419,54 @@ static void AnimLeechSeedSprouts(struct Sprite* sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -void sub_80FED28(struct Sprite* sprite) +// Moves a spore particle in a halo around the target mon. +// The sprite's priority is updated to give the effect of going +// behind the mon's sprite. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: initial wave offset +// arg 3: duration +// arg 4: blend (0 = off, 1 = on) +void AnimSporeParticle(struct Sprite* sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); StartSpriteAnim(sprite, gBattleAnimArgs[4]); if (gBattleAnimArgs[4] == 1) sprite->oam.objMode = ST_OAM_OBJ_BLEND; sprite->data[0] = gBattleAnimArgs[3]; sprite->data[1] = gBattleAnimArgs[2]; - sprite->callback = sub_80FED74; + sprite->callback = AnimSporeParticleStep; sprite->callback(sprite); } -static void sub_80FED74(struct Sprite* sprite) +static void AnimSporeParticleStep(struct Sprite* sprite) { sprite->pos2.x = Sin(sprite->data[1], 32); sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8); if ((u16)(sprite->data[1] - 0x40) < 0x80) { - sprite->oam.priority = (sub_80A8328(gBattleAnimTarget) & 3); + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); } else { - u8 priority = sub_80A8328(gBattleAnimTarget) + 1; + u8 priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) + 1; if (priority > 3) priority = 3; sprite->oam.priority = priority; } - sprite->data[1] = (sprite->data[1] + 2) & 0xFF; + sprite->data[1] += 2; + sprite->data[1] &= 0xFF; if (--sprite->data[0] == -1) DestroyAnimSprite(sprite); } -void sub_80FEE1C(u8 taskId) +// In a double battle, Updates the mon sprite background priorities to allow +// the circling effect controlled by AnimSporeParticle. +// No args. +void AnimTask_SporeDoubleBattle(u8 taskId) { if (IsContest() || !IsDoubleBattle()) { @@ -2441,7 +2474,7 @@ void sub_80FEE1C(u8 taskId) } else { - if (sub_80A8364(gBattleAnimTarget) == 1) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimTarget) == 1) SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 3); else SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 1); @@ -2450,23 +2483,29 @@ void sub_80FEE1C(u8 taskId) } } -void sub_80FEE78(struct Sprite* sprite) +// Rotates a big flower around the attacking mon, and slowly floats +// downward. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: target y pixel offset +// arg 3: duration +void AnimPetalDanceBigFlower(struct Sprite* sprite) { - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, FALSE); 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] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2]; InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; - sprite->callback = sub_80FEECC; + sprite->callback = AnimPetalDanceBigFlowerStep; sprite->callback(sprite); } -static void sub_80FEECC(struct Sprite* sprite) +static void AnimPetalDanceBigFlowerStep(struct Sprite* sprite) { - if (!TranslateAnimLinear(sprite)) + if (!AnimTranslateLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[5], 32); sprite->pos2.y += Cos(sprite->data[5], -5); @@ -2483,9 +2522,14 @@ static void sub_80FEECC(struct Sprite* sprite) } } -void sub_80FEF44(struct Sprite* sprite) +// Slowly floats a small flower downard, while swaying from right to left. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: target y pixel offset +// arg 3: duration +void AnimPetalDanceSmallFlower(struct Sprite* sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[3]; sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x; @@ -2493,19 +2537,20 @@ void sub_80FEF44(struct Sprite* sprite) sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2]; InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; - sprite->callback = sub_80FEF98; + sprite->callback = AnimPetalDanceSmallFlowerStep; sprite->callback(sprite); } -static void sub_80FEF98(struct Sprite* sprite) +static void AnimPetalDanceSmallFlowerStep(struct Sprite* sprite) { - if (!TranslateAnimLinear(sprite)) + if (!AnimTranslateLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[5], 8); if ((u16)(sprite->data[5] - 59) < 5 || (u16)(sprite->data[5] - 187) < 5) - sprite->oam.matrixNum ^= 0x8; + sprite->oam.matrixNum ^= 0x8; // horizontal flip - sprite->data[5] = (sprite->data[5] + 5) & 0xFF; + sprite->data[5] += 5; + sprite->data[5] &= 0xFF; } else { @@ -2513,17 +2558,21 @@ static void sub_80FEF98(struct Sprite* sprite) } } -void sub_80FEFFC(struct Sprite* sprite) +// Shoots a leaf upward, then floats it downward while swaying back and forth. +// arg 0: upward x delta per frame +// arg 1: upward y delta per frame +// arg 2: upward duration +void AnimRazorLeafParticle(struct Sprite* sprite) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[2]; - sprite->callback = sub_80FF044; + sprite->callback = AnimRazorLeafParticleStep1; } -static void sub_80FF044(struct Sprite* sprite) +static void AnimRazorLeafParticleStep1(struct Sprite* sprite) { if (!sprite->data[2]) { @@ -2535,11 +2584,11 @@ static void sub_80FF044(struct Sprite* sprite) } else { - sprite->data[0] = sprite->data[1] & 1; - sprite->data[1] = sprite->data[1] & 1; - sprite->data[2] = sprite->data[1] & 1; + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; } - sprite->callback = sub_80FF090; + sprite->callback = AnimRazorLeafParticleStep2; } else { @@ -2549,14 +2598,15 @@ static void sub_80FF044(struct Sprite* sprite) } } -static void sub_80FF090(struct Sprite* sprite) +static void AnimRazorLeafParticleStep2(struct Sprite* sprite) { if (GetBattlerSide(gBattleAnimAttacker)) sprite->pos2.x = -Sin(sprite->data[0], 25); else sprite->pos2.x = Sin(sprite->data[0], 25); - sprite->data[0] = (sprite->data[0] + 2) & 0xFF; + sprite->data[0] += 2; + sprite->data[0] &= 0xFF; sprite->data[1]++; if (!(sprite->data[1] & 1)) sprite->pos2.y++; @@ -2577,19 +2627,19 @@ static void sub_80FF090(struct Sprite* sprite) // arg 6: target between double battle opponents (boolean) void AnimTranslateLinearSingleSineWave(struct Sprite* sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, TRUE); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; if (!gBattleAnimArgs[6]) { - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; } else { - SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]); + SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->data[2], &sprite->data[4]); sprite->data[2] += gBattleAnimArgs[2]; sprite->data[4] += gBattleAnimArgs[3]; } @@ -2676,38 +2726,45 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite) sprite->pos2.x = Cos(sprite->data[5], sprite->data[3]); sprite->pos2.y = Sin(sprite->data[5], 5); if (sprite->data[5] < 0x80) - sprite->oam.priority = sub_80A8328(gBattleAnimTarget) - 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) - 1; else - sprite->oam.priority = sub_80A8328(gBattleAnimTarget) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) + 1; if (--sprite->data[0] == 0) DestroyAnimSprite(sprite); } -void sub_80FF374(struct Sprite* sprite) +// Squeezes a constricting "rope" several times via affine animations. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: affine anim num +// arg 3: num squeezes +void AnimConstrictBinding(struct Sprite* sprite) { - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->affineAnimPaused = 1; StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]); sprite->data[6] = gBattleAnimArgs[2]; sprite->data[7] = gBattleAnimArgs[3]; - sprite->callback = sub_80FF3B0; + sprite->callback = AnimConstrictBindingStep1; } -static void sub_80FF3B0(struct Sprite* sprite) +static void AnimConstrictBindingStep1(struct Sprite* sprite) { + u8 spriteId; + if ((u16)gBattleAnimArgs[7] == 0xFFFF) { sprite->affineAnimPaused = 0; - GetAnimBattlerSpriteId(1); + spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); sprite->data[0] = 0x100; - sprite->callback = sub_80FF3EC; + sprite->callback = AnimConstrictBindingStep2; } } -static void sub_80FF3EC(struct Sprite* sprite) +static void AnimConstrictBindingStep2(struct Sprite* sprite) { - GetAnimBattlerSpriteId(1); + u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); if (!sprite->data[2]) sprite->data[0] += 11; else @@ -2739,23 +2796,23 @@ void sub_80FF458(u8 taskId) { PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_BLEND); gTasks[taskId].data[14] = gSprites[spriteId].oam.priority; - gSprites[spriteId].oam.priority = sub_80A8328(gBattleAnimTarget); + gSprites[spriteId].oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_DEF_PARTNER); gTasks[taskId].data[15] = gSprites[spriteId].oam.priority; - gSprites[spriteId].oam.priority = sub_80A8328(BATTLE_PARTNER(gBattleAnimTarget)); + gSprites[spriteId].oam.priority = GetBattlerSpriteBGPriority(BATTLE_PARTNER(gBattleAnimTarget)); gTasks[taskId].data[0] = gBattleAnimArgs[0]; gTasks[taskId].data[1] = gBattleAnimArgs[1]; - gTasks[taskId].data[11] = 256; + gTasks[taskId].data[11] = 0x100; gTasks[taskId].func = sub_80FF53C; } } static void sub_80FF53C(u8 taskId) { - u8 spriteId = GetAnimBattlerSpriteId(1); + u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); gTasks[taskId].data[10] += gTasks[taskId].data[0]; gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8; - if (GetBattlerSide(gBattleAnimTarget)) + if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; gTasks[taskId].data[11] += 16; @@ -2796,7 +2853,10 @@ static void sub_80FF5CC(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_80FF698(struct Sprite* sprite) +// Moves an orb from the target mon to the attacking mon. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +void AnimMimicOrb(struct Sprite* sprite) { switch (sprite->data[0]) { @@ -2804,8 +2864,8 @@ void sub_80FF698(struct Sprite* sprite) if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) gBattleAnimArgs[0] *= -1; - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + gBattleAnimArgs[1]; sprite->invisible = 1; sprite->data[0]++; break; @@ -2815,21 +2875,27 @@ void sub_80FF698(struct Sprite* sprite) { ChangeSpriteAffineAnim(sprite, 1); sprite->data[0] = 25; - sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); - sprite->callback = sub_80A70C0; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); + sprite->callback = InitAndRunAnimFastLinearTranslation; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); break; } } } -void sub_80FF768(struct Sprite* sprite) +// Animates a root that flickers away after some time. +// arg 0: x pixel offset +// arg 1: y pixel offset +// arg 2: sprite subpriority offset +// arg 3: sprite anim num +// arg 4: duration +void AnimIngrainRoot(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y); sprite->pos2.x = gBattleAnimArgs[0]; sprite->pos2.y = gBattleAnimArgs[1]; sprite->subpriority = gBattleAnimArgs[2] + 30; @@ -2839,33 +2905,40 @@ void sub_80FF768(struct Sprite* sprite) if (sprite->pos1.y + sprite->pos2.y > 120) sprite->pos1.y += sprite->pos2.y + sprite->pos1.y - 120; } - sprite->callback = sub_80FF8DC; + sprite->callback = AnimRootFlickerOut; } -void sub_80FF7EC(struct Sprite *sprite) +// Places a root on the path to the target mon that flickers away after some time. +// arg 0: percent along the path to the target mon +// arg 1: x pixel offset +// arg 2: y pixel offset +// arg 3: sprite subpriority offset +// arg 4: sprite anum num +// arg 5: duration +void AnimFrenzyPlantRoot(struct Sprite *sprite) { - s16 p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - s16 p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); - s16 e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); - s16 e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 3); + s16 attackerX = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); + s16 attackerY = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); + s16 targetX = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); + s16 targetY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); - e1 -= p1; - e2 -= p2; - sprite->pos1.x = p1 + e1 * gBattleAnimArgs[0] / 100; - sprite->pos1.y = p2 + e2 * gBattleAnimArgs[0] / 100; + targetX -= attackerX; + targetY -= attackerY; + sprite->pos1.x = attackerX + targetX * gBattleAnimArgs[0] / 100; + sprite->pos1.y = attackerY + targetY * gBattleAnimArgs[0] / 100; sprite->pos2.x = gBattleAnimArgs[1]; sprite->pos2.y = gBattleAnimArgs[2]; sprite->subpriority = gBattleAnimArgs[3] + 30; StartSpriteAnim(sprite, gBattleAnimArgs[4]); sprite->data[2] = gBattleAnimArgs[5]; - sprite->callback = sub_80FF8DC; + sprite->callback = AnimRootFlickerOut; gUnknown_0203A0F8[0] = sprite->pos1.x; gUnknown_0203A0F8[1] = sprite->pos1.y; - gUnknown_0203A0F8[2] = e1; - gUnknown_0203A0F8[3] = e2; + gUnknown_0203A0F8[2] = targetX; + gUnknown_0203A0F8[3] = targetY; } -static void sub_80FF8DC(struct Sprite* sprite) +static void AnimRootFlickerOut(struct Sprite* sprite) { if (++sprite->data[0] > (sprite->data[2] - 10)) sprite->invisible = sprite->data[0] % 2; @@ -2874,7 +2947,13 @@ static void sub_80FF8DC(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_80FF934(struct Sprite* sprite) +// Moves an orb in a fast wavy path. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: horizontal velocity +// arg 3: wave amplitude +// arg 4: duration +void AnimIngrainOrb(struct Sprite* sprite) { if (!sprite->data[0]) { @@ -2892,11 +2971,11 @@ void sub_80FF934(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_80FF9B8(struct Sprite* sprite, s16 c) +static void sub_80FF9B8(struct Sprite* sprite, s16 c) { - s32 a = (sprite->pos1.x * 256) | sprite->pos1.y; - s32 b = (sprite->data[6] * 256) | sprite->data[7]; - c *= 256; + int a = (sprite->pos1.x << 8) | sprite->pos1.y; + int b = (sprite->data[6] << 8) | sprite->data[7]; + c <<= 8; sprite->data[5] = a; sprite->data[6] = b; sprite->data[7] = c; @@ -2961,24 +3040,24 @@ static void sub_80FFAB4(struct Sprite* sprite) } } -void sub_80FFB18(struct Sprite* sprite) +void AnimPresent(struct Sprite* sprite) { - s16 e1; - s16 e2; - InitAnimSpritePos(sprite, 0); - e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 0); - e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + s16 targetX; + s16 targetY; + InitSpritePosToAnimAttacker(sprite, FALSE); + targetX = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X); + targetY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y); if (BATTLE_PARTNER(gBattleAnimAttacker) == gBattleAnimTarget) { - sprite->data[6] = e1; - sprite->data[7] = e2 + 10; + sprite->data[6] = targetX; + sprite->data[7] = targetY + 10; sub_80FF9B8(sprite, 60); sprite->data[3] = 1; } else { - sprite->data[6] = e1; - sprite->data[7] = e2 + 10; + sprite->data[6] = targetX; + sprite->data[7] = targetY + 10; sub_80FF9B8(sprite, 60); sprite->data[3] = 3; } @@ -3007,37 +3086,42 @@ static void sub_80FFB90(struct Sprite* sprite) } } -void sub_80FFBF4(struct Sprite* sprite) +void AnimKnockOffItem(struct Sprite* sprite) { - s16 e = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + s16 targetY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y); if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) { sprite->data[6] = 0; - sprite->data[7] = e + 10; + sprite->data[7] = targetY + 10; sub_80FF9B8(sprite, 40); sprite->data[3] = 3; - sprite->data[4] = 0x3C; + sprite->data[4] = 60; sprite->callback = sub_80FFAB4; } else { sprite->data[6] = 255; - sprite->data[7] = e + 10; + sprite->data[7] = targetY + 10; if (IsContest()) sprite->data[6] = 0; sub_80FF9B8(sprite, 40); sprite->data[3] = 3; - sprite->data[4] = 0x3C; + sprite->data[4] = 60; sprite->callback = sub_80FFB90; } } -void sub_80FFC70(struct Sprite* sprite) +// Animates a heal particle upward. +// arg 0: initial x pixel offset +// arg 1: initial y pixel offset +// arg 2: vertical velocity +// arg 3: unused +void AnimPresentHealParticle(struct Sprite* sprite) { - if (sprite->data[0] == 0) + if (!sprite->data[0]) { - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->data[1] = gBattleAnimArgs[2]; } @@ -3047,33 +3131,33 @@ void sub_80FFC70(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_80FFCB4(struct Sprite* sprite) +void AnimItemSteal(struct Sprite* sprite) { - s16 p1; - s16 p2; - sub_80A6980(sprite, FALSE); - p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); - p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + s16 attackerX; + s16 attackerY; + InitSpritePosToAnimTarget(sprite, FALSE); + attackerX = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X); + attackerY = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y); if (BATTLE_PARTNER(gBattleAnimTarget) == gBattleAnimAttacker) { - sprite->data[6] = p1; - sprite->data[7] = p2 + 10; + sprite->data[6] = attackerX; + sprite->data[7] = attackerY + 10; sub_80FF9B8(sprite, 60); sprite->data[3] = 1; } else { - sprite->data[6] = p1; - sprite->data[7] = p2 + 10; + sprite->data[6] = attackerX; + sprite->data[7] = attackerY + 10; sub_80FF9B8(sprite, 60); sprite->data[3] = 3; } sprite->data[4] = 60; - sprite->callback = sub_80FFD2C; + sprite->callback = AnimItemStealStep; } -static void sub_80FFD2C(struct Sprite* sprite) +static void AnimItemStealStep(struct Sprite* sprite) { int zero; sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); @@ -3097,7 +3181,10 @@ static void sub_80FFD2C(struct Sprite* sprite) } } -void sub_80FFDBC(struct Sprite* sprite) +// Moves a bag in a circular motion. +// arg 0: y position +// arg 1: initial wave offset +void AnimTrickBag(struct Sprite* sprite) { int a; int b; @@ -3126,7 +3213,7 @@ void sub_80FFDBC(struct Sprite* sprite) sprite->data[4] = 20; sprite->pos2.x = Cos(sprite->data[1], 60); sprite->pos2.y = Sin(sprite->data[1], 20); - sprite->callback = sub_80FFE58; + sprite->callback = AnimTrickBagStep1; if (sprite->data[1] > 0 && sprite->data[1] < 192) sprite->subpriority = 31; else @@ -3134,7 +3221,7 @@ void sub_80FFDBC(struct Sprite* sprite) } } -static void sub_80FFE58(struct Sprite* sprite) +static void AnimTrickBagStep1(struct Sprite* sprite) { switch (sprite->data[3]) { @@ -3158,20 +3245,20 @@ static void sub_80FFE58(struct Sprite* sprite) { sprite->data[0] = 0; sprite->data[2] = 0; - sprite->callback = sub_80FFEC4; + sprite->callback = AnimTrickBagStep2; } break; } } -static void sub_80FFEC4(struct Sprite* sprite) +static void AnimTrickBagStep2(struct Sprite* sprite) { if (sprite->data[2] == gUnknown_08592700[sprite->data[0]][1]) { if (gUnknown_08592700[sprite->data[0]][2] == 127) { sprite->data[0] = 0; - sprite->callback = sub_80FFF7C; + sprite->callback = AnimTrickBagStep3; } sprite->data[2] = 0; @@ -3194,7 +3281,7 @@ static void sub_80FFEC4(struct Sprite* sprite) } } -static void sub_80FFF7C(struct Sprite* sprite) +static void AnimTrickBagStep3(struct Sprite* sprite) { if (sprite->data[0] > 20) DestroyAnimSprite(sprite); @@ -3493,20 +3580,20 @@ void sub_8100640(struct Sprite* sprite) { case 0: sprite->pos1.y = gBattleAnimArgs[0]; - sprite->oam.priority = sub_80A8328(battler); + sprite->oam.priority = GetBattlerSpriteBGPriority(battler); break; case 1: sprite->pos1.y = gBattleAnimArgs[0]; - sprite->oam.priority = sub_80A8328(battler) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1; break; case 2: sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[0]; - sprite->oam.priority = sub_80A8328(battler); + sprite->oam.priority = GetBattlerSpriteBGPriority(battler); break; case 3: sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0]; GetAnimBattlerSpriteId(ANIM_TARGET); - sprite->oam.priority = sub_80A8328(battler) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1; break; } @@ -3665,7 +3752,7 @@ void sub_8100A50(struct Sprite* sprite) StartSpriteAnim(sprite, 1); sprite->callback = sub_81009DC; - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; } @@ -3858,9 +3945,9 @@ void sub_8100EF0(struct Sprite* sprite) sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimAttacker, 0) + gBattleAnimArgs[0]; sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || IsContest()) - sprite->oam.priority = sub_80A8328(gBattleAnimAttacker) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker) + 1; else - sprite->oam.priority = sub_80A8328(gBattleAnimAttacker); + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = (IndexOfSpritePaletteTag(ANIM_TAG_PROTECT) << 4) + 0x100; @@ -4028,13 +4115,13 @@ void sub_810130C(struct Sprite* sprite) if (!gBattleAnimArgs[2]) SetSpriteCoordsToAnimAttackerCoords(sprite); - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = TranslateAnimLinearSimple; + sprite->callback = AnimTranslateLinearSimple; } void sub_810135C(struct Sprite* sprite) @@ -4048,7 +4135,7 @@ void sub_810135C(struct Sprite* sprite) if (IsDoubleBattle() && IsBattlerSpriteVisible(BATTLE_PARTNER(battler))) { SetAverageBattlerPositions(battler, gBattleAnimArgs[6], &sprite->pos1.x, &sprite->pos1.y); - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; } else @@ -4064,14 +4151,14 @@ void sub_810135C(struct Sprite* sprite) sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[1]; } - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); } sprite->data[0] = gBattleAnimArgs[5]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = TranslateAnimLinearSimple; + sprite->callback = AnimTranslateLinearSimple; } void sub_8101440(struct Sprite* sprite) @@ -4782,7 +4869,7 @@ void sub_81022D4(u8 taskId) void sub_810234C(struct Sprite* sprite) { - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->animPaused = 1; sprite->data[0] = gBattleAnimArgs[2]; sprite->callback = sub_810237C; @@ -5094,7 +5181,7 @@ void sub_81029B4(u8 taskId) } task->func = sub_8102AE0; - if (sub_80A8364(gBattleAnimAttacker) == 1) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); @@ -5105,7 +5192,7 @@ static void sub_8102AE0(u8 taskId) struct Task* task = &gTasks[taskId]; if (!task->data[3]) { - if (sub_80A8364(gBattleAnimAttacker) == 1) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); @@ -5345,7 +5432,7 @@ void sub_8103028(struct Sprite* sprite) static void sub_81030B0(struct Sprite* sprite) { - if (TranslateAnimLinear(sprite) == 0) + if (AnimTranslateLinear(sprite) == 0) { s16 xDiff; xDiff = Sin(sprite->data[5], 8); diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 244823d13..8acbf62d4 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1257,7 +1257,7 @@ const struct SpriteTemplate gUnknown_08593C64 = void sub_8103448(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[4]; @@ -1339,7 +1339,7 @@ void sub_810358C(struct Sprite *sprite) void sub_8103620(struct Sprite *sprite) { - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[4]; @@ -1451,7 +1451,7 @@ void Anim_KinesisZapEnergy(struct Sprite *sprite) // arg 1: y pixel offset void Anim_SwordsDanceBlade(struct Sprite *sprite) { - InitAnimSpritePos(sprite, FALSE); + InitSpritePosToAnimAttacker(sprite, FALSE); sprite->callback = RunStoredCallbackWhenAffineAnimEnds; StoreSpriteCallbackInData6(sprite, Anim_SwordsDanceBladeStep); } @@ -1489,7 +1489,7 @@ void AnimSonicBoomProjectile(struct Sprite *sprite) gBattleAnimArgs[3] = -gBattleAnimArgs[3]; } - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); targetXPos = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; targetYPos = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; rotation = ArcTan2Neg(targetXPos - sprite->pos1.x, targetYPos - sprite->pos1.y); @@ -1732,7 +1732,7 @@ void sub_8103CF0(u8 taskId) void sub_8103FE8(struct Sprite *sprite) { - InitAnimSpritePos(sprite, FALSE); + InitSpritePosToAnimAttacker(sprite, FALSE); sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(gUnknown_085934A0.paletteTag) << 4); sprite->callback = sub_8104018; } @@ -1828,7 +1828,7 @@ void sub_8104088(struct Sprite *sprite) s16 r7; u16 var; - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); r6 = GetBattlerSpriteCoord(gBattleAnimTarget, 2); r7 = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) @@ -1872,7 +1872,7 @@ static void sub_8104154(struct Sprite *sprite) void sub_81041C4(struct Sprite *sprite) { - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = 20; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); @@ -1931,7 +1931,7 @@ static void sub_81042A0(struct Sprite *sprite) // arg 6: duration void Anim_RazorWindTornado(struct Sprite *sprite) { - InitAnimSpritePos(sprite, FALSE); + InitSpritePosToAnimAttacker(sprite, FALSE); if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) sprite->pos1.y += 16; @@ -2009,7 +2009,7 @@ void Anim_GuillotinePincer(struct Sprite *sprite) static void Anim_GuillotinePincerStep1(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite) && sprite->animEnded) + if (AnimTranslateLinear(sprite) && sprite->animEnded) { SeekSpriteAnim(sprite, 0); sprite->animPaused = 1; @@ -2049,7 +2049,7 @@ static void Anim_GuillotinePincerStep2(struct Sprite *sprite) static void Anim_GuillotinePincerStep3(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) DestroyAnimSprite(sprite); } @@ -2318,7 +2318,7 @@ void Anim_BreathPuff(struct Sprite *sprite) sprite->data[3] = 0; sprite->data[4] = 0; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = TranslateAnimLinearSimple; + sprite->callback = AnimTranslateLinearSimple; } // Animates an "angry" mark above a mon's head. @@ -2448,7 +2448,7 @@ void sub_8104E74(u8 taskId) task->data[5] = 0; task->data[15] = sub_80A861C(gBattleAnimTarget, 0); - if (sub_80A8364(gBattleAnimTarget) == 1) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimTarget) == 1) { task->data[6] = gBattle_BG1_X; params.dmaDest = (u16 *)REG_ADDR_BG1HOFS; @@ -2628,7 +2628,7 @@ void sub_81051C4(struct Sprite *sprite) void sub_8105284(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) { FreeSpriteOamMatrix(sprite); DestroyAnimSprite(sprite); @@ -2736,7 +2736,7 @@ void sub_81054E8(struct Sprite *sprite) void sub_8105538(struct Sprite *sprite) { s16 r1; - InitAnimSpritePos(sprite, FALSE); + InitSpritePosToAnimAttacker(sprite, FALSE); r1 = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? -160 : 160; sprite->data[0] = 0x380; sprite->data[1] = r1; @@ -3098,7 +3098,7 @@ static void sub_8105D88(struct Sprite *sprite, u8 a, u8 b) void sub_8105DE8(struct Sprite *sprite) { - InitAnimSpritePos(sprite, FALSE); + InitSpritePosToAnimAttacker(sprite, FALSE); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; @@ -3113,7 +3113,7 @@ void sub_8105DE8(struct Sprite *sprite) void sub_8105E60(struct Sprite *sprite) { if (++sprite->data[0] == 1) - InitAnimSpritePos(sprite, FALSE); + InitSpritePosToAnimAttacker(sprite, FALSE); sprite->pos2.x = Sin(sprite->data[1], 8); sprite->pos2.y = sprite->data[2] >> 8; @@ -3218,7 +3218,7 @@ void sub_81060B0(u8 taskId) void sub_8106140(struct Sprite *sprite) { - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = 95; sprite->data[1] = sprite->pos1.x; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); @@ -3230,7 +3230,7 @@ void sub_8106140(struct Sprite *sprite) static void sub_810618C(struct Sprite *sprite) { - if (!TranslateAnimLinear(sprite)) + if (!AnimTranslateLinear(sprite)) { sprite->pos2.y += Sin(sprite->data[5], 14); sprite->data[5] = (sprite->data[5] + 4) & 0xFF; @@ -3550,7 +3550,7 @@ static void sub_810699C(struct Sprite *sprite) void sub_81069B8(struct Sprite *sprite) { - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->callback = sub_810699C; } diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 5f65cb31f..d887eeabf 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1225,7 +1225,7 @@ void sub_815A254(struct Sprite *sprite) u8 x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); u8 y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); rotation = ArcTan2Neg(sprite->pos1.x - x, sprite->pos1.y - y); rotation += 0x6000; @@ -1406,7 +1406,7 @@ void sub_815A6C4(struct Sprite *sprite) u16 x; u16 y; - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &x, &y); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) @@ -1444,7 +1444,7 @@ static void sub_815A76C(struct Sprite *sprite) void sub_815A7B0(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; sprite->callback = RunStoredCallbackWhenAnimEnds; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); @@ -1458,7 +1458,7 @@ void sub_815A7EC(struct Sprite *sprite) if (sprite->data[0] == 0) { SetSpriteCoordsToAnimAttackerCoords(sprite); - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); if (!IsContest()) { if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) @@ -1528,7 +1528,7 @@ void sub_815A934(struct Sprite *sprite) SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H); SetGpuReg(REG_OFFSET_WIN0V, gBattle_WIN0V); - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->oam.objMode = ST_OAM_OBJ_WINDOW; sprite->invisible = 1; @@ -1745,12 +1745,12 @@ void sub_815ADB0(u8 taskId) if (!gBattleAnimArgs[0]) { var0 = GetBattlerYCoordWithElevation(gBattleAnimAttacker); - toBG2 = sub_80A8364(gBattleAnimAttacker); + toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); } else { var0 = GetBattlerYCoordWithElevation(gBattleAnimTarget); - toBG2 = sub_80A8364(gBattleAnimTarget); + toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); } task->data[0] = var0 + 36; @@ -2000,7 +2000,7 @@ static void sub_815B23C(struct Sprite *sprite) void sub_815B27C(struct Sprite *sprite) { if (sprite->data[0] == 0) - InitAnimSpritePos(sprite, FALSE); + InitSpritePosToAnimAttacker(sprite, FALSE); if (++sprite->data[0] < 40) { @@ -2204,7 +2204,7 @@ void sub_815B70C(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - InitAnimSpritePos(sprite, FALSE); + InitSpritePosToAnimAttacker(sprite, FALSE); sprite->data[1] = 0x900; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0]++; @@ -2246,7 +2246,7 @@ void sub_815B7D0(u8 taskId) { case 0: SetGpuReg(REG_OFFSET_MOSAIC, 0); - if (sub_80A8364(gBattleAnimAttacker) == 1) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) SetAnimBgAttribute(1, BG_ANIM_MOSAIC, 1); else SetAnimBgAttribute(2, BG_ANIM_MOSAIC, 1); @@ -2326,7 +2326,7 @@ void sub_815B7D0(u8 taskId) break; case 4: SetGpuReg(REG_OFFSET_MOSAIC, 0); - if (sub_80A8364(gBattleAnimAttacker) == 1) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) SetAnimBgAttribute(1, BG_ANIM_MOSAIC, 0); else SetAnimBgAttribute(2, BG_ANIM_MOSAIC, 0); @@ -2666,7 +2666,7 @@ void sub_815C400(struct Sprite *sprite) { if (sprite->data[0] == 0) { - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, 0); sprite->data[0]++; } else if (sprite->data[0]++ > 20) @@ -3064,7 +3064,7 @@ void sub_815CC94(struct Sprite *sprite) SetGpuReg(REG_OFFSET_WIN0V, gBattle_WIN0V); sprite->data[0] = gBattleAnimArgs[2]; - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->oam.objMode = ST_OAM_OBJ_WINDOW; sprite->invisible = 1; sprite->callback = sub_815CD0C; @@ -3166,7 +3166,7 @@ void sub_815CED8(u8 taskId) otId = gContestResources->field_18->unkC; species = gContestResources->field_18->unk2; xOffset = 20; - priority = sub_80A8328(gBattleAnimAttacker); + priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); } else { @@ -3188,7 +3188,7 @@ void sub_815CED8(u8 taskId) } xOffset = 20; - priority = sub_80A8328(gBattleAnimAttacker); + priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); } else { @@ -3208,7 +3208,7 @@ void sub_815CED8(u8 taskId) } xOffset = -20; - priority = sub_80A8328(gBattleAnimAttacker); + priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); } } @@ -3290,7 +3290,7 @@ void sub_815D240(u8 taskId) task->data[14] = task->data[13] + 66; task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); - if (sub_80A8364(battler) == 1) + if (GetBattlerSpriteBGPriorityRank(battler) == 1) { scanlineParams.dmaDest = ®_BG1HOFS; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1); @@ -3333,7 +3333,7 @@ static void sub_815D398(u8 taskId) s16 var3; task = &gTasks[taskId]; - if (sub_80A8364(task->data[5]) == 1) + if (GetBattlerSpriteBGPriorityRank(task->data[5]) == 1) { bgX = gBattle_BG1_X; bgY = gBattle_BG1_Y; @@ -4009,7 +4009,7 @@ void sub_815E444(struct Sprite *sprite) sprite->data[4] = gBattleAnimArgs[3]; sprite->data[0] = gBattleAnimArgs[4]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = sub_80A70C0; + sprite->callback = InitAndRunAnimFastLinearTranslation; } void sub_815E47C(u8 taskId) @@ -4452,7 +4452,7 @@ void sub_815EE84(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[7] = gBattleAnimAttacker; } else @@ -4463,7 +4463,7 @@ void sub_815EE84(struct Sprite *sprite) if (GetBattlerSide(sprite->data[7]) == B_SIDE_OPPONENT) sprite->oam.matrixNum = 8; - sprite->oam.priority = sub_80A8328(sprite->data[7]); + sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]); sprite->oam.objMode = ST_OAM_OBJ_BLEND; sprite->callback = sub_815EF08; } @@ -4517,7 +4517,7 @@ static void sub_815EF08(struct Sprite *sprite) sprite->data[5]++; break; case 1: - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) { switch (sprite->data[6]) { @@ -252,7 +252,7 @@ void sub_81104E4(struct Sprite *sprite) if (IsContest()) gBattleAnimArgs[2] /= 2; - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; @@ -274,7 +274,7 @@ void sub_81104E4(struct Sprite *sprite) static void sub_811057C(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) { DestroyAnimSprite(sprite); return; @@ -389,7 +389,7 @@ void AnimTranslateStinger(struct Sprite *sprite) } } - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; @@ -414,7 +414,7 @@ void AnimTranslateStinger(struct Sprite *sprite) // arg 5: wave amplitude void AnimMissileArc(struct Sprite *sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; diff --git a/src/dragon.c b/src/dragon.c index 156d10ce1..68577988e 100644 --- a/src/dragon.c +++ b/src/dragon.c @@ -251,7 +251,7 @@ void sub_81131B4(struct Sprite *sprite) sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); } - sub_80A6864(sprite, gBattleAnimArgs[1]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[1]); sprite->pos1.y += gBattleAnimArgs[2]; sprite->callback = RunStoredCallbackWhenAnimEnds; StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); @@ -329,7 +329,7 @@ void sub_81133E8(u8 taskId) struct Task *task = &gTasks[taskId]; u16 i; u8 r1; - if (sub_80A8364(gBattleAnimAttacker) == 1) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) { sp.dmaDest = ®_BG1HOFS; task->data[2] = gBattle_BG1_X; diff --git a/src/electric.c b/src/electric.c index 5d772e042..ed495fa59 100644 --- a/src/electric.c +++ b/src/electric.c @@ -556,7 +556,7 @@ static void sub_810A308(struct Sprite *sprite) sprite->pos2.y = (gSineTable[gBattleAnimArgs[0] + 64] * gBattleAnimArgs[1]) >> 8; if (gBattleAnimArgs[6] & 1) - sprite->oam.priority = sub_80A8328(battler) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1; matrixNum = sprite->oam.matrixNum; sineVal = gSineTable[gBattleAnimArgs[2]]; @@ -571,7 +571,7 @@ static void sub_810A308(struct Sprite *sprite) static void sub_810A46C(struct Sprite *sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); sprite->data[0] = gBattleAnimArgs[3]; sprite->data[1] = sprite->pos1.x; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); @@ -588,7 +588,7 @@ static void sub_810A46C(struct Sprite *sprite) static void sub_810A4F4(struct Sprite *sprite) { - if (!TranslateAnimLinear(sprite)) + if (!AnimTranslateLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[7], sprite->data[5]); sprite->pos2.y += Cos(sprite->data[7], sprite->data[5]); @@ -665,7 +665,7 @@ static void sub_810A6EC(struct Sprite *sprite) static void sub_810A75C(struct Sprite *sprite) { - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->oam.tileNum += gBattleAnimArgs[3] * 4; if (gBattleAnimArgs[3] == 1) @@ -1073,7 +1073,7 @@ void sub_810AB78(u8 taskId) static void sub_810AC8C(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) { gTasks[sprite->data[5]].data[7]--; DestroySprite(sprite); diff --git a/src/fight.c b/src/fight.c index fb1c01b78..b7ca2e87a 100644 --- a/src/fight.c +++ b/src/fight.c @@ -416,7 +416,7 @@ const struct SpriteTemplate gUnknown_08596104 = void unc_080B08A0(struct Sprite *sprite) { - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; sprite->data[0] = 15; sprite->callback = WaitAnimForDuration; @@ -459,9 +459,9 @@ void AnimBasicFistOrFoot(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[4]); if (gBattleAnimArgs[3] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[2]; sprite->callback = WaitAnimForDuration; @@ -534,7 +534,7 @@ static void sub_810D0B8(struct Sprite *sprite) void sub_810D10C(struct Sprite *sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = 30; if (gBattleAnimArgs[2] == 0) @@ -574,7 +574,7 @@ void sub_810D1B4(struct Sprite *sprite) if (BATTLE_PARTNER(gBattleAnimAttacker) == gBattleAnimTarget && GetBattlerPosition(gBattleAnimTarget) < B_POSITION_PLAYER_RIGHT) gBattleAnimArgs[0] *= -1; - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; @@ -596,7 +596,7 @@ void sub_810D1B4(struct Sprite *sprite) static void sub_810D240(struct Sprite *sprite) { - if (!TranslateAnimLinear(sprite)) + if (!AnimTranslateLinear(sprite)) { sprite->pos2.y += Sin(sprite->data[7] >> 8, sprite->data[5]); sprite->data[7] += sprite->data[6]; @@ -615,7 +615,7 @@ static void sub_810D240(struct Sprite *sprite) // arg 3: spin duration void AnimSpinningKickOrPunch(struct Sprite *sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[0] = gBattleAnimArgs[3]; @@ -639,7 +639,7 @@ static void AnimSpinningKickOrPunchFinish(struct Sprite *sprite) // arg 2: initial wait duration void AnimStompFoot(struct Sprite *sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[2]; sprite->callback = AnimStompFootStep; @@ -670,7 +670,7 @@ void sub_810D37C(struct Sprite *sprite) { if (sprite->data[0] == 0) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; sprite->data[0]++; @@ -800,12 +800,12 @@ void sub_810D608(struct Sprite *sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3); - sprite->oam.priority = sub_80A8328(gBattleAnimAttacker); + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); sprite->data[7] = gBattleAnimTarget; } else { - sprite->oam.priority = sub_80A8328(gBattleAnimTarget); + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); sprite->data[7] = gBattleAnimAttacker; } @@ -903,12 +903,12 @@ void sub_810D874(struct Sprite *sprite) sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3); battler = gBattleAnimTarget; - sprite->oam.priority = sub_80A8328(gBattleAnimAttacker); + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); } else { battler = gBattleAnimAttacker; - sprite->oam.priority = sub_80A8328(gBattleAnimTarget); + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); } if (IsContest()) @@ -965,9 +965,9 @@ void sub_810D984(struct Sprite *sprite) void sub_810DA10(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, 0); else - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); if (IsContest()) { diff --git a/src/fire.c b/src/fire.c index 18ec7b95c..2d8a0fbe5 100644 --- a/src/fire.c +++ b/src/fire.c @@ -472,14 +472,14 @@ static void sub_8108EC8(struct Sprite *sprite) static void sub_8108F08(struct Sprite *sprite) { - sub_80A6864(sprite, gBattleAnimArgs[0]); + SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; - sprite->callback = TranslateAnimLinearSimple; + sprite->callback = AnimTranslateLinearSimple; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } @@ -644,7 +644,7 @@ static void sub_8109200(struct Sprite *sprite) //void AnimFireRing(struct Sprite *sprite) void AnimFireRing(struct Sprite *sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); sprite->data[7] = gBattleAnimArgs[2]; sprite->data[0] = 0; @@ -672,7 +672,7 @@ static void AnimFireRingStep1(struct Sprite *sprite) static void AnimFireRingStep2(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) { sprite->data[0] = 0; @@ -731,7 +731,7 @@ static void AnimFireCross(struct Sprite *sprite) static void sub_81093A4(struct Sprite *sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); sprite->data[1] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[3]; @@ -1054,7 +1054,7 @@ static void sub_8109AFC(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, 0); StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[7] = gBattleAnimArgs[2]; @@ -1067,7 +1067,7 @@ static void sub_8109AFC(struct Sprite *sprite) sprite->data[4] = -4; } - sprite->oam.priority = sub_80A8328(gBattleAnimTarget); + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); sprite->data[0]++; break; case 1: @@ -1119,7 +1119,7 @@ static void sub_8109C4C(struct Sprite *sprite) s16 initialData5; s16 newData5; - if (!TranslateAnimLinear(sprite)) + if (!AnimTranslateLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[5], 16); initialData5 = sprite->data[5]; @@ -1157,9 +1157,9 @@ void sub_8109CB0(struct Sprite *sprite) if (!IsContest()) { if (sprite->data[1] < 64 || sprite->data[1] > 195) - sprite->oam.priority = sub_80A8328(gBattleAnimTarget); + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); else - sprite->oam.priority = sub_80A8328(gBattleAnimTarget) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) + 1; } else { diff --git a/src/ghost.c b/src/ghost.c index d4f6512a8..a755783b7 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -217,7 +217,7 @@ const struct SpriteTemplate gUnknown_08596E48 = static void sub_811160C(struct Sprite *sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); @@ -235,7 +235,7 @@ static void sub_8111674(struct Sprite *sprite) s16 r0; s16 r2; sub_8111764(sprite); - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) { sprite->callback = sub_81116E8; return; @@ -258,7 +258,7 @@ static void sub_81116E8(struct Sprite *sprite) s16 r2; s16 r0; sprite->data[0] = 1; - TranslateAnimLinear(sprite); + AnimTranslateLinear(sprite); sprite->pos2.x += Sin(sprite->data[5], 10); sprite->pos2.y += Cos(sprite->data[5], 15); @@ -313,7 +313,7 @@ static void sub_8111764(struct Sprite *sprite) static void sub_81117F4(struct Sprite *sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->callback = sub_8111814; sprite->callback(sprite); } @@ -461,7 +461,7 @@ static void AnimShadowBallStep(struct Sprite *sprite) static void sub_8111B9C(struct Sprite *sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->callback = sub_8111BB4; } @@ -536,7 +536,7 @@ void sub_8111C50(u8 taskId) gSprites[task->data[0]].data[3] = 0; gSprites[task->data[0]].data[4] = 0; StoreSpriteCallbackInData6(&gSprites[task->data[0]], SpriteCallbackDummy); - gSprites[task->data[0]].callback = TranslateAnimLinearSimple; + gSprites[task->data[0]].callback = AnimTranslateLinearSimple; task->func = sub_8111D78; } @@ -590,7 +590,7 @@ static void sub_8111E78(u8 taskId) { s16 startLine; struct Task *task = &gTasks[taskId]; - u8 position = sub_80A8364(gBattleAnimTarget); + u8 position = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); switch (task->data[15]) { @@ -698,7 +698,7 @@ static void sub_81120DC(u8 taskId) static void sub_8112170(u8 taskId) { struct Task *task = &gTasks[taskId]; - u8 position = sub_80A8364(gBattleAnimTarget); + u8 position = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); switch (task->data[15]) { @@ -1026,7 +1026,7 @@ static void sub_81129F0(struct Sprite *sprite) s16 xDelta; s16 xDelta2; - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { xDelta = 24; @@ -1170,7 +1170,7 @@ void sub_8112C6C(u8 taskId) task->data[10] = GetBattlerYCoordWithElevation(gBattleAnimAttacker); task->data[11] = (sub_80A861C(gBattleAnimAttacker, 1) / 2) + 8; task->data[7] = 0; - task->data[5] = sub_80A8328(gBattleAnimAttacker); + task->data[5] = GetBattlerSpriteBGPriority(gBattleAnimAttacker); task->data[6] = GetBattlerSpriteSubpriority(gBattleAnimAttacker) - 2; task->data[3] = 0; task->data[4] = 16; diff --git a/src/ground.c b/src/ground.c index 77acd3919..807205ad8 100644 --- a/src/ground.c +++ b/src/ground.c @@ -183,7 +183,7 @@ static void AnimBonemerangProjectileEnd(struct Sprite *sprite) // arg 4: duration void AnimBoneHitProjectile(struct Sprite *sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; @@ -205,7 +205,7 @@ void AnimDirtScatter(struct Sprite *sprite) u8 targetXPos, targetYPos; s16 xOffset, yOffset; - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); targetXPos = GetBattlerSpriteCoord2(gBattleAnimTarget, 2); targetYPos = GetBattlerSpriteCoord2(gBattleAnimTarget, 3); @@ -306,7 +306,7 @@ static void sub_8114CFC(u8 taskId) { case 0: task->data[10] = GetAnimBattlerSpriteId(0); - task->data[11] = sub_80A8364(gBattleAnimAttacker); + task->data[11] = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); if (task->data[11] == 1) { task->data[12] = gBattle_BG1_X; @@ -375,7 +375,7 @@ static void sub_8114EB4(u8 taskId) gSprites[spriteId].pos2.x = 0; gSprites[spriteId].pos2.y = 0; - if (sub_80A8364(gBattleAnimAttacker) == 1) + if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) gBattle_BG1_Y = 0; else gBattle_BG2_Y = 0; @@ -422,7 +422,7 @@ static void sub_8114FD8(u8 taskId) { case 0: task->data[10] = GetAnimBattlerSpriteId(0); - task->data[11] = sub_80A8364(gBattleAnimAttacker); + task->data[11] = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); if (task->data[11] == 1) task->data[12] = gBattle_BG1_X; else diff --git a/src/normal.c b/src/normal.c index e20f74588..95c99d29e 100644 --- a/src/normal.c +++ b/src/normal.c @@ -880,9 +880,9 @@ void sub_8116388(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->callback = RunStoredCallbackWhenAffineAnimEnds; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); @@ -892,9 +892,9 @@ static void sub_81163D0(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[4]; sprite->callback = RunStoredCallbackWhenAffineAnimEnds; @@ -916,9 +916,9 @@ void sub_8116458(struct Sprite *sprite) StartSpriteAffineAnim(sprite, gBattleAnimArgs[1]); if (gBattleAnimArgs[0] == 0) - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, 0); else - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->pos2.x += (Random2() % 48) - 24; sprite->pos2.y += (Random2() % 24) - 12; @@ -942,9 +942,9 @@ void sub_81164F0(struct Sprite *sprite) void sub_8116560(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[3]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); @@ -955,9 +955,9 @@ void sub_81165A8(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->callback = sub_81165E4; } diff --git a/src/poison.c b/src/poison.c index c52299e3a..a72aab111 100644 --- a/src/poison.c +++ b/src/poison.c @@ -194,7 +194,7 @@ void sub_810DBAC(struct Sprite *sprite) if (!gBattleAnimArgs[3]) StartSpriteAnim(sprite, 2); - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); @@ -218,7 +218,7 @@ void sub_810DC2C(struct Sprite *sprite) if (!gBattleAnimArgs[3]) StartSpriteAnim(sprite, 2); - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); SetAverageBattlerPositions(gBattleAnimTarget, 1, &l1, &l2); if (GetBattlerSide(gBattleAnimAttacker)) @@ -258,7 +258,7 @@ void sub_810DCD0(struct Sprite *sprite) static void sub_810DD24(struct Sprite *sprite) { - TranslateAnimLinearSimple(sprite); + AnimTranslateLinearSimple(sprite); sprite->data[1] -= sprite->data[5]; sprite->data[2] -= sprite->data[6]; @@ -295,7 +295,7 @@ void AnimBubbleEffect(struct Sprite *sprite) { if (!gBattleAnimArgs[2]) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); } else { diff --git a/src/pokeball.c b/src/pokeball.c index 82d2f2cea..aa29b020f 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -922,7 +922,7 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 4); } r4 = sprite->data[0]; - TranslateAnimLinear(sprite); + AnimTranslateLinear(sprite); sprite->data[7] += sprite->sBattler / 3; sprite->pos2.y += Sin(HIBYTE(sprite->data[7]), sprite->data[5]); sprite->oam.affineParam += 0x100; diff --git a/src/rock.c b/src/rock.c index 20d4ea738..ff3840fb3 100644 --- a/src/rock.c +++ b/src/rock.c @@ -367,16 +367,16 @@ void sub_8110AB4(struct Sprite *sprite) sprite->data[3] = 0; sprite->data[4] = 0; - sprite->callback = TranslateAnimLinearSimple; + sprite->callback = AnimTranslateLinearSimple; StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); } void sub_8110B38(struct Sprite *sprite) { if (gBattleAnimArgs[6] == 0) - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, 0); else - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->data[0] = gBattleAnimArgs[3]; sprite->data[1] = gBattleAnimArgs[2]; @@ -555,7 +555,7 @@ void AnimDirtParticleAcrossScreen(struct Sprite *sprite) void AnimRaiseSprite(struct Sprite *sprite) { StartSpriteAnim(sprite, gBattleAnimArgs[4]); - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, 0); sprite->data[0] = gBattleAnimArgs[3]; sprite->data[2] = sprite->pos1.x; diff --git a/src/water.c b/src/water.c index fd31b324a..42ab1d67f 100644 --- a/src/water.c +++ b/src/water.c @@ -563,7 +563,7 @@ void sub_8107380(struct Sprite *sprite) u16 trigIndex = gSprites[otherSpriteId].data[3]; sprite->data[0] = 1; - TranslateAnimLinear(sprite); + AnimTranslateLinear(sprite); sprite->pos2.x += Sin(trigIndex >> 8, gSprites[otherSpriteId].data[0]); sprite->pos2.y += Cos(trigIndex >> 8, gSprites[otherSpriteId].data[1]); gSprites[otherSpriteId].data[3] = trigIndex + gSprites[otherSpriteId].data[2]; @@ -596,7 +596,7 @@ void sub_810744C(struct Sprite *sprite) { s16 unkArg; - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) unkArg = -gBattleAnimArgs[2]; else @@ -619,7 +619,7 @@ void sub_81074E4(struct Sprite *sprite) StartSpriteAnim(sprite, 1); sprite->affineAnimPaused = FALSE; } - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) DestroyAnimSprite(sprite); } @@ -727,7 +727,7 @@ void sub_81075EC(struct Sprite *sprite) { u16 retArg; - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = 30; sprite->data[1] = sprite->pos1.x; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); @@ -752,7 +752,7 @@ void sub_81075EC(struct Sprite *sprite) void sub_8107674(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) DestroyAnimSprite(sprite); sprite->pos2.y += Sin(sprite->data[6] >> 8, sprite->data[7]); if ((sprite->data[6] + sprite->data[5]) >> 8 > 127) @@ -833,7 +833,7 @@ void sub_81077C0(struct Sprite *sprite) coordType = 3; else coordType = 1; - InitAnimSpritePos(sprite, animType); + InitSpritePosToAnimAttacker(sprite, animType); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -845,7 +845,7 @@ void sub_81077C0(struct Sprite *sprite) void sub_8107894(struct Sprite *sprite) { - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4]; @@ -856,9 +856,9 @@ void sub_8107894(struct Sprite *sprite) void sub_81078D0(struct Sprite *sprite) { if (gBattleAnimArgs[3]) - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); else - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[7] = gBattleAnimArgs[2]; sprite->callback = sub_810790C; } @@ -1887,7 +1887,7 @@ void sub_8108034(struct Sprite *sprite) s16 randData2; sprite->oam.tileNum += 8; - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); randData = (Random2() & 0xFF) | 256; randData2 = (Random2() & 0x1FF); if (randData2 > 255) @@ -2387,7 +2387,7 @@ void sub_8108C54(struct Sprite *sprite) void sub_8108C94(struct Sprite *sprite) { - InitAnimSpritePos(sprite, TRUE); + InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[3] = gBattleAnimArgs[2]; |