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

Corrects battler partner identification in battle_ai_switch_items.c (#8071)

Browse Source
This commit is contained in:
grintoul 2025-10-28 18:23:41 +00:00 committed by GitHub
parent 96f6e99486
commit a9fc0b28c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_ai_switch_items.c
View File

@ -1124,7 +1124,7 @@ bool32 ShouldSwitch(u32 battler)
if (IsDoubleBattle())
{
u32 partner = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerAtPosition(battler)));
u32 partner = BATTLE_PARTNER(battler);
battlerIn1 = battler;
if (gAbsentBattlerFlags & (1u << partner))
battlerIn2 = battler;
@ -1275,7 +1275,7 @@ void ModifySwitchAfterMoveScoring(u32 battler)
if (IsDoubleBattle())
{
u32 partner = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerAtPosition(battler)));
u32 partner = BATTLE_PARTNER(battler);
battlerIn1 = battler;
if (gAbsentBattlerFlags & (1u << partner))
battlerIn2 = battler;
@ -1323,7 +1323,7 @@ bool32 IsSwitchinValid(u32 battler)
// Edge case: See if partner already chose to switch into the same mon
if (IsDoubleBattle())
{
u32 partner = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerAtPosition(battler)));
u32 partner = BATTLE_PARTNER(battler);
if (gBattleStruct->AI_monToSwitchIntoId[battler] == PARTY_SIZE) // Generic switch
{
if ((gAiLogicData->shouldSwitch & (1u << partner)) && gAiLogicData->monToSwitchInId[partner] == gAiLogicData->mostSuitableMonId[battler])