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

Merge commit '384b8f127e6a18aef0a3' into pret-merge

Browse Source 
Conflicts:
	src/battle_anim_mons.c
This commit is contained in:
Hedara 2025-05-15 17:36:48 +02:00
commit a001e36f1c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/battle_anim_mons.c
View File

@ -1434,21 +1434,21 @@ static u8 UNUSED GetSpritePalIdxByPosition(u8 position)
// 2, 3 as some control variables
void AnimSpriteOnMonPos(struct Sprite *sprite)
{
bool8 var;
bool8 respectMonPicOffsets;
if (!sprite->data[0])
{
if (!gBattleAnimArgs[3])
var = TRUE;
respectMonPicOffsets = TRUE;
else
var = FALSE;
respectMonPicOffsets = FALSE;
if (gBattleAnimArgs[2] == 0)
InitSpritePosToAnimAttacker(sprite, var);
InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets);
else if (gBattleAnimArgs[2] == 1)
InitSpritePosToAnimTarget(sprite, var);
InitSpritePosToAnimTarget(sprite, respectMonPicOffsets);
else if (gBattleAnimArgs[2] == 2)
InitSpritePosToAnimAttackerPartner(sprite, var);
InitSpritePosToAnimAttackerPartner(sprite, respectMonPicOffsets);
sprite->data[0]++;
@ -1520,32 +1520,32 @@ static void AnimThrowProjectile_Step(struct Sprite *sprite)
void AnimTravelDiagonally(struct Sprite *sprite)
{
bool8 r4;
bool8 respectMonPicOffsets;
u8 battlerId, coordType;
if (!gBattleAnimArgs[6])
{
r4 = TRUE;
respectMonPicOffsets = TRUE;
coordType = BATTLER_COORD_Y_PIC_OFFSET;
}
else
{
r4 = FALSE;
respectMonPicOffsets = FALSE;
coordType = BATTLER_COORD_Y;
}
if (gBattleAnimArgs[5] == ANIM_ATTACKER)
{
InitSpritePosToAnimAttacker(sprite, r4);
InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets);
battlerId = gBattleAnimAttacker;
}
else
{
InitSpritePosToAnimTarget(sprite, r4);
InitSpritePosToAnimTarget(sprite, respectMonPicOffsets);
battlerId = gBattleAnimTarget;
}
if (GetBattlerSide(gBattleAnimAttacker))
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
InitSpritePosToAnimTarget(sprite, r4);
InitSpritePosToAnimTarget(sprite, respectMonPicOffsets);
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X_2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(battlerId, coordType) + gBattleAnimArgs[3];

8
src/battle_anim_water.c
View File

@ -959,7 +959,7 @@ static void AnimHydroCannonCharge_Step(struct Sprite *sprite)
// Flashing blue orbs move from the attacker to the target. Second stage of Hydro Cannon
static void AnimHydroCannonBeam(struct Sprite *sprite)
{
bool8 animType;
bool8 respectMonPicOffsets;
u8 coordType;
if (IsBattlerAlly(gBattleAnimAttacker, gBattleAnimTarget))
{
@ -968,14 +968,14 @@ static void AnimHydroCannonBeam(struct Sprite *sprite)
gBattleAnimArgs[0] *= -1;
}
if ((gBattleAnimArgs[5] & 0xFF00) == 0)
animType = TRUE;
respectMonPicOffsets = TRUE;
else
animType = FALSE;
respectMonPicOffsets = FALSE;
if ((u8)gBattleAnimArgs[5] == 0)
coordType = BATTLER_COORD_Y_PIC_OFFSET;
else
coordType = BATTLER_COORD_Y;
InitSpritePosToAnimAttacker(sprite, animType);
InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];