Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document battler side in anim code (#6780)

Browse Source
This commit is contained in:
Alex 2025-05-07 11:05:01 +02:00 committed by GitHub
parent 6fe5f6530a
commit 6a548a6034
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_anim_bug.c
View File

@ -290,7 +290,7 @@ static void AnimTranslateWebThread_Step(struct Sprite *sprite)
static void AnimStringWrap(struct Sprite *sprite)
{
SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
sprite->x -= gBattleAnimArgs[0];
else
sprite->x += gBattleAnimArgs[0];
@ -381,7 +381,7 @@ void AnimTranslateStinger(struct Sprite *sprite)
}
else
{
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@ -426,7 +426,7 @@ void AnimMissileArc(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];

10
src/battle_anim_effects_1.c
View File

@ -3268,7 +3268,7 @@ void AnimMovePowderParticle(struct Sprite *sprite)
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[3];
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
sprite->data[3] = -gBattleAnimArgs[4];
}
@ -3983,7 +3983,7 @@ static void AnimRazorLeafParticle_Step1(struct Sprite *sprite)
static void AnimRazorLeafParticle_Step2(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
sprite->x2 = -Sin(sprite->data[0], 25);
else
sprite->x2 = Sin(sprite->data[0], 25);
@ -5965,7 +5965,7 @@ static void AnimBowMon(struct Sprite *sprite)
static void AnimBowMon_Step1(struct Sprite *sprite)
{
sprite->data[0] = 6;
sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2;
sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) ? 2 : -2;
sprite->data[2] = 0;
sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
StoreSpriteCallbackInData6(sprite, AnimBowMon_Step1_Callback);
@ -5978,7 +5978,7 @@ static void AnimBowMon_Step1_Callback(struct Sprite *sprite)
{
sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
PrepareBattlerSpriteForRotScale(sprite->data[3], ST_OAM_OBJ_NORMAL);
sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 768 : -768;
sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) ? 768 : -768;
sprite->data[5] = 0;
}
@ -5995,7 +5995,7 @@ static void AnimBowMon_Step1_Callback(struct Sprite *sprite)
static void AnimBowMon_Step2(struct Sprite *sprite)
{
sprite->data[0] = 4;
sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3;
sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) ? -3 : 3;
sprite->data[2] = 0;
sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
StoreSpriteCallbackInData6(sprite, AnimBowMon_Step4);

4
src/battle_anim_effects_2.c
View File

@ -953,7 +953,7 @@ const struct SpriteTemplate gRedHeartRisingSpriteTemplate =
.callback = AnimRedHeartRising,
};
// New struct that's just a copy of 'gMagentaHeartSpriteTemplate', without need to make new anim tags
// New struct that's just a copy of 'gMagentaHeartSpriteTemplate', without need to make new anim tags
const struct SpriteTemplate gRedHeartCharmSpriteTemplate =
{
.tileTag = ANIM_TAG_RED_HEART,
@ -2726,7 +2726,7 @@ void AnimHyperVoiceRing(struct Sprite *sprite)
y = GetBattlerSpriteCoord(battler2, yCoordType);
}
if (GetBattlerSide(battler2))
if (GetBattlerSide(battler2) == B_SIDE_OPPONENT)
x += gBattleAnimArgs[3];
else
x -= gBattleAnimArgs[3];

6
src/battle_anim_fire.c
View File

@ -594,7 +594,7 @@ void AnimFirePlume(struct Sprite *sprite)
{
SetSpriteCoordsToAnimAttackerCoords(sprite);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
sprite->x -= gBattleAnimArgs[0];
sprite->y += gBattleAnimArgs[1];
@ -616,7 +616,7 @@ void AnimFirePlume(struct Sprite *sprite)
static void AnimLargeFlame(struct Sprite *sprite)
{
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
sprite->x -= gBattleAnimArgs[0];
sprite->y += gBattleAnimArgs[1];
@ -652,7 +652,7 @@ static void AnimUnusedSmallEmber(struct Sprite *sprite)
{
SetSpriteCoordsToAnimAttackerCoords(sprite);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
sprite->x -= gBattleAnimArgs[0];
}

4
src/battle_anim_mon_movement.c
View File

@ -1078,7 +1078,7 @@ void AnimTask_RotateMonToSideAndRestore(u8 taskId)
gTasks[taskId].data[2] = gBattleAnimArgs[0];
if (gBattleAnimArgs[2] == ANIM_ATTACKER)
{
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
}
@ -1176,7 +1176,7 @@ void SetupShakeBattlerBasedOnMovePowerOrDmg(u8 taskId, u8 animBattlerId)
// args[0] - 0 if scale on move power, 1 if scale on move damage
// args[1] - delay before starting anim
// args[2] - duration of anim (after anim starts from above counter)
// args[3] - 1 if do horizontal shake
// args[3] - 1 if do horizontal shake
// args[4] - 1 if do vertical shake
void AnimTask_ShakeTargetPartnerBasedOnMovePowerOrDmg(u8 taskId)
{

8
src/battle_anim_mons.c
View File

@ -1502,7 +1502,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
void AnimThrowProjectile(struct Sprite *sprite)
{
InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2];
@ -1543,7 +1543,7 @@ void AnimTravelDiagonally(struct Sprite *sprite)
InitSpritePosToAnimTarget(sprite, respectOffsets);
battlerId = gBattleAnimTarget;
}
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
InitSpritePosToAnimTarget(sprite, respectOffsets);
sprite->data[0] = gBattleAnimArgs[4];
@ -2193,7 +2193,7 @@ u8 CreateInvisibleSpriteCopy(int battlerId, u8 spriteId, int species)
void AnimTranslateLinearAndFlicker_Flipped(struct Sprite *sprite)
{
SetSpriteCoordsToAnimAttackerCoords(sprite);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
sprite->x -= gBattleAnimArgs[0];
gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@ -2238,7 +2238,7 @@ void AnimTranslateLinearAndFlicker(struct Sprite *sprite)
void AnimSpinningSparkle(struct Sprite *sprite)
{
SetSpriteCoordsToAnimAttackerCoords(sprite);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
sprite->x -= gBattleAnimArgs[0];
else
sprite->x += gBattleAnimArgs[0];

4
src/battle_anim_new.c
View File

@ -8096,7 +8096,7 @@ static void SpriteCB_PyroBallLaunch(struct Sprite *sprite)
{
InitSpritePositionForPyroBall(sprite);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
@ -8119,7 +8119,7 @@ static void SpriteCB_AcidLaunchSingleTarget(struct Sprite *sprite)
InitSpritePosToAnimTarget(sprite, TRUE);
l1 = sprite->x; l2 = sprite->y;
InitSpritePosToAnimAttacker(sprite, TRUE);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
gBattleAnimArgs[4] = -gBattleAnimArgs[4];
sprite->data[0] = gBattleAnimArgs[2];

2
src/battle_anim_poison.c
View File

@ -551,7 +551,7 @@ static void AnimAcidPoisonBubble(struct Sprite *sprite)
else
l1 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2), l2 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
gBattleAnimArgs[4] = -gBattleAnimArgs[4];
sprite->data[0] = gBattleAnimArgs[2];

2
src/battle_anim_psychic.c
View File

@ -493,7 +493,7 @@ static void AnimPsychoCut(struct Sprite *sprite)
}
else
{
if (GetBattlerSide(gBattleAnimAttacker))
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
gBattleAnimArgs[1] = -gBattleAnimArgs[1];