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

Add missing uses of IsBattlerAlly (#6793)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-05-08 15:18:51 -04:00 committed by GitHub
parent da047dfd22
commit f3113eb865
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_ai_switch_items.c
View File

@ -2325,7 +2325,7 @@ static bool32 AiExpectsToFaintPlayer(u32 battler)
if (gAiBattleData->actionFlee || gAiBattleData->choiceWatch)
return FALSE; // AI not planning to use move
if (GetBattlerSide(target) != GetBattlerSide(battler)
if (!IsBattlerAlly(target, battler)
&& CanIndexMoveFaintTarget(battler, target, gAiBattleData->chosenMoveIndex[battler], AI_ATTACKING)
&& AI_IsFaster(battler, target, GetAIChosenMove(battler)))
{

2
src/battle_anim.c
View File

@ -2107,7 +2107,7 @@ static void Cmd_splitbgprio_foes(void)
sBattleAnimScriptPtr += 2;
// Apply only if the attacking the opposing side
if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget))
if (!IsBattlerAlly(gBattleAnimAttacker, gBattleAnimTarget))
{
if (wantedBattler != ANIM_ATTACKER)
battlerId = gBattleAnimTarget;

4
src/battle_main.c
View File

@ -3132,7 +3132,7 @@ void SwitchInClearSetData(u32 battler)
gStatuses4[battler] &= (STATUS4_MUD_SPORT | STATUS4_WATER_SPORT | STATUS4_INFINITE_CONFUSION);
for (i = 0; i < gBattlersCount; i++)
{
if (GetBattlerSide(battler) != GetBattlerSide(i)
if (!IsBattlerAlly(battler, i)
&& (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
&& (gDisableStructs[i].battlerWithSureHit == battler))
{
@ -3211,7 +3211,7 @@ void SwitchInClearSetData(u32 battler)
for (i = 0; i < gBattlersCount; i++)
{
if (i != battler && GetBattlerSide(i) != GetBattlerSide(battler))
if (i != battler && !IsBattlerAlly(i, battler))
gBattleStruct->lastTakenMove[i] = MOVE_NONE;
gBattleStruct->lastTakenMoveFrom[i][battler] = 0;

20
src/battle_script_commands.c
View File

@ -1837,7 +1837,7 @@ static void Cmd_ppreduce(void)
{
for (i = 0; i < gBattlersCount; i++)
{
if (GetBattlerSide(i) != GetBattlerSide(gBattlerAttacker) && IsBattlerAlive(i))
if (!IsBattlerAlly(i, gBattlerAttacker) && IsBattlerAlive(i))
ppToDeduct += (GetBattlerAbility(i) == ABILITY_PRESSURE);
}
}
@ -4338,7 +4338,7 @@ void SetMoveEffect(bool32 primary, bool32 certain)
u8 battler;
for (battler = 0; battler < MAX_BATTLERS_COUNT; ++battler)
{
if (GetBattlerSide(battler) != GetBattlerSide(gBattlerTarget))
if (!IsBattlerAlly(battler, gBattlerTarget))
continue;
if (!(gBattleMons[battler].status2 & STATUS2_WRAPPED))
{
@ -4628,7 +4628,7 @@ static void Cmd_tryfaintmon(void)
}
if ((gStatuses3[gBattlerTarget] & STATUS3_GRUDGE)
&& !(gHitMarker & HITMARKER_GRUDGE)
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)
&& !IsBattlerAlly(gBattlerAttacker, gBattlerTarget)
&& IsBattlerAlive(gBattlerAttacker)
&& gCurrentMove != MOVE_STRUGGLE)
{
@ -6071,7 +6071,7 @@ static u32 GetNextTarget(u32 moveTarget, bool32 excludeCurrent)
&& !(excludeCurrent && battler == gBattlerTarget)
&& IsBattlerAlive(battler)
&& !gBattleStruct->battlerState[gBattlerAttacker].targetsDone[battler]
&& (GetBattlerSide(battler) != GetBattlerSide(gBattlerAttacker) || moveTarget == MOVE_TARGET_FOES_AND_ALLY))
&& (!IsBattlerAlly(battler, gBattlerAttacker) || moveTarget == MOVE_TARGET_FOES_AND_ALLY))
break;
}
return battler;
@ -6431,7 +6431,7 @@ static void Cmd_moveend(void)
if (gBattleMons[gBattlerTarget].status2 & STATUS2_RAGE
&& IsBattlerAlive(gBattlerTarget)
&& gBattlerAttacker != gBattlerTarget
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)
&& !IsBattlerAlly(gBattlerAttacker, gBattlerTarget)
&& !(gBattleStruct->moveResultFlags[gBattlerTarget] & MOVE_RESULT_NO_EFFECT)
&& IsBattlerTurnDamaged(gBattlerTarget)
&& !IsBattleMoveStatus(gCurrentMove)
@ -6717,7 +6717,7 @@ static void Cmd_moveend(void)
// Set ShellTrap to activate after the attacker's turn if target was hit by a physical move.
if (GetMoveEffect(gChosenMoveByBattler[gBattlerTarget]) == EFFECT_SHELL_TRAP
&& gBattlerTarget != gBattlerAttacker
&& GetBattlerSide(gBattlerTarget) != GetBattlerSide(gBattlerAttacker)
&& !IsBattlerAlly(gBattlerTarget, gBattlerAttacker)
&& gProtectStructs[gBattlerTarget].physicalDmg
&& gProtectStructs[gBattlerTarget].physicalBattlerId == gBattlerAttacker
&& !TestIfSheerForceAffected(gBattlerAttacker, gCurrentMove))
@ -10131,7 +10131,7 @@ static void Cmd_various(void)
while (gBattleStruct->friskedBattler < gBattlersCount)
{
gBattlerTarget = gBattleStruct->friskedBattler++;
if (GetBattlerSide(battler) != GetBattlerSide(gBattlerTarget)
if (!IsBattlerAlly(battler, gBattlerTarget)
&& IsBattlerAlive(gBattlerTarget)
&& gBattleMons[gBattlerTarget].item != ITEM_NONE)
{
@ -10879,7 +10879,7 @@ static void Cmd_various(void)
case VARIOUS_JUMP_IF_TARGET_ALLY:
{
VARIOUS_ARGS(const u8 *jumpInstr);
if (GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
if (!IsBattlerAlly(gBattlerAttacker, gBattlerTarget))
gBattlescriptCurrInstr = cmd->nextInstr;
else
gBattlescriptCurrInstr = cmd->jumpInstr;
@ -14231,7 +14231,7 @@ static bool32 SetTargetToNextPursuiter(u32 battlerDef)
&& GetMoveEffect(gChosenMoveByBattler[battler]) == EFFECT_PURSUIT
&& IsBattlerAlive(battlerDef)
&& IsBattlerAlive(battler)
&& GetBattlerSide(battler) != GetBattlerSide(battlerDef)
&& !IsBattlerAlly(battler, battlerDef)
&& (B_PURSUIT_TARGET >= GEN_4 || gBattleStruct->moveTarget[battler] == battlerDef)
&& !IsGimmickSelected(battler, GIMMICK_Z_MOVE)
&& !IsGimmickSelected(battler, GIMMICK_DYNAMAX)
@ -15090,7 +15090,7 @@ static void Cmd_tryswapabilities(void)
}
else
{
if (GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
if (!IsBattlerAlly(gBattlerAttacker, gBattlerTarget))
gBattleScripting.abilityPopupOverwrite = gBattleMons[gBattlerAttacker].ability;
gLastUsedAbility = gBattleMons[gBattlerTarget].ability;
gBattleMons[gBattlerTarget].ability = gDisableStructs[gBattlerTarget].overwrittenAbility = gBattleMons[gBattlerAttacker].ability;

10
src/battle_util.c
View File

@ -316,7 +316,7 @@ bool32 HandleMoveTargetRedirection(void)
if (IsAffectedByFollowMe(gBattlerAttacker, side, gCurrentMove)
&& moveTarget == MOVE_TARGET_SELECTED
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget))
&& !IsBattlerAlly(gBattlerAttacker, gSideTimers[side].followmeTarget))
{
gBattleStruct->moveTarget[gBattlerAttacker] = gBattlerTarget = gSideTimers[side].followmeTarget; // follow me moxie fix
return TRUE;
@ -459,7 +459,7 @@ void HandleAction_UseMove(void)
{
gBattlerTarget = SetRandomTarget(gBattlerAttacker);
if (gAbsentBattlerFlags & (1u << gBattlerTarget)
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
&& !IsBattlerAlly(gBattlerAttacker, gBattlerTarget))
{
gBattlerTarget = GetPartnerBattler(gBattlerTarget);
}
@ -490,7 +490,7 @@ void HandleAction_UseMove(void)
gBattlerTarget = *(gBattleStruct->moveTarget + gBattlerAttacker);
if (!IsBattlerAlive(gBattlerTarget)
&& moveTarget != MOVE_TARGET_OPPONENTS_FIELD
&& (GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)))
&& (!IsBattlerAlly(gBattlerAttacker, gBattlerTarget)))
{
gBattlerTarget = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gBattlerTarget)));
}
@ -2352,7 +2352,7 @@ static void CancellerPsychicTerrain(u32 *effect)
&& GetChosenMovePriority(gBattlerAttacker, GetBattlerAbility(gBattlerAttacker)) > 0
&& GetMoveTarget(gCurrentMove) != MOVE_TARGET_ALL_BATTLERS
&& GetMoveTarget(gCurrentMove) != MOVE_TARGET_OPPONENTS_FIELD
&& GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget))
&& !IsBattlerAlly(gBattlerAttacker, gBattlerTarget))
{
CancelMultiTurnMoves(gBattlerAttacker, SKY_DROP_ATTACKCANCELLER_CHECK);
gBattlescriptCurrInstr = BattleScript_MoveUsedPsychicTerrainPrevents;
@ -2804,7 +2804,7 @@ static void ForewarnChooseMove(u32 battler)
// Put all moves
for (count = 0, i = 0; i < MAX_BATTLERS_COUNT; i++)
{
if (IsBattlerAlive(i) && GetBattlerSide(i) != GetBattlerSide(battler))
if (IsBattlerAlive(i) && !IsBattlerAlly(i, battler))
{
for (j = 0; j < MAX_MON_MOVES; j++)
{