InitSpritePosToAnimAttacker documentation

This commit is contained in:
Eduardo Quezada
2025-05-06 15:11:38 -04:00
parent c39ef1a030
commit 15e39339b9
2 changed files with 15 additions and 15 deletions
+11 -11
View File
@@ -1514,18 +1514,18 @@ static u8 UNUSED GetSpritePalIdxByPosition(u8 position)
void AnimSpriteOnMonPos(struct Sprite *sprite) void AnimSpriteOnMonPos(struct Sprite *sprite)
{ {
bool8 var; bool8 respectMonPicOffsets;
if (!sprite->data[0]) if (!sprite->data[0])
{ {
if (!gBattleAnimArgs[3]) if (!gBattleAnimArgs[3])
var = TRUE; respectMonPicOffsets = TRUE;
else else
var = FALSE; respectMonPicOffsets = FALSE;
if (!gBattleAnimArgs[2]) if (!gBattleAnimArgs[2])
InitSpritePosToAnimAttacker(sprite, var); InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets);
else else
InitSpritePosToAnimTarget(sprite, var); InitSpritePosToAnimTarget(sprite, respectMonPicOffsets);
sprite->data[0]++; sprite->data[0]++;
} }
@@ -1590,32 +1590,32 @@ static void AnimThrowProjectile_Step(struct Sprite *sprite)
void AnimTravelDiagonally(struct Sprite *sprite) void AnimTravelDiagonally(struct Sprite *sprite)
{ {
bool8 r4; bool8 respectMonPicOffsets;
u8 battlerId, coordType; u8 battlerId, coordType;
if (!gBattleAnimArgs[6]) if (!gBattleAnimArgs[6])
{ {
r4 = TRUE; respectMonPicOffsets = TRUE;
coordType = BATTLER_COORD_Y_PIC_OFFSET; coordType = BATTLER_COORD_Y_PIC_OFFSET;
} }
else else
{ {
r4 = FALSE; respectMonPicOffsets = FALSE;
coordType = BATTLER_COORD_Y; coordType = BATTLER_COORD_Y;
} }
if (gBattleAnimArgs[5] == ANIM_ATTACKER) if (gBattleAnimArgs[5] == ANIM_ATTACKER)
{ {
InitSpritePosToAnimAttacker(sprite, r4); InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets);
battlerId = gBattleAnimAttacker; battlerId = gBattleAnimAttacker;
} }
else else
{ {
InitSpritePosToAnimTarget(sprite, r4); InitSpritePosToAnimTarget(sprite, respectMonPicOffsets);
battlerId = gBattleAnimTarget; battlerId = gBattleAnimTarget;
} }
if (GetBattlerSide(gBattleAnimAttacker)) if (GetBattlerSide(gBattleAnimAttacker))
gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[2] = -gBattleAnimArgs[2];
InitSpritePosToAnimTarget(sprite, r4); InitSpritePosToAnimTarget(sprite, respectMonPicOffsets);
sprite->data[0] = gBattleAnimArgs[4]; sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; sprite->data[2] = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X_2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(battlerId, coordType) + gBattleAnimArgs[3]; sprite->data[4] = GetBattlerSpriteCoord(battlerId, coordType) + gBattleAnimArgs[3];
+4 -4
View File
@@ -753,7 +753,7 @@ static void AnimHydroCannonCharge_Step(struct Sprite *sprite)
// Flashing blue orbs move from the attacker to the target. Second stage of Hydro Cannon // Flashing blue orbs move from the attacker to the target. Second stage of Hydro Cannon
static void AnimHydroCannonBeam(struct Sprite *sprite) static void AnimHydroCannonBeam(struct Sprite *sprite)
{ {
bool8 animType; bool8 respectMonPicOffsets;
u8 coordType; u8 coordType;
if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
{ {
@@ -762,14 +762,14 @@ static void AnimHydroCannonBeam(struct Sprite *sprite)
gBattleAnimArgs[0] *= -1; gBattleAnimArgs[0] *= -1;
} }
if ((gBattleAnimArgs[5] & 0xFF00) == 0) if ((gBattleAnimArgs[5] & 0xFF00) == 0)
animType = TRUE; respectMonPicOffsets = TRUE;
else else
animType = FALSE; respectMonPicOffsets = FALSE;
if ((u8)gBattleAnimArgs[5] == 0) if ((u8)gBattleAnimArgs[5] == 0)
coordType = BATTLER_COORD_Y_PIC_OFFSET; coordType = BATTLER_COORD_Y_PIC_OFFSET;
else else
coordType = BATTLER_COORD_Y; coordType = BATTLER_COORD_Y;
InitSpritePosToAnimAttacker(sprite, animType); InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4]; sprite->data[0] = gBattleAnimArgs[4];