Merge remote-tracking branch 'RHH_origin/master' into RHH/dev_1.x

rh-hideout · Sep 18, 2022 · f3ac3e4 · f3ac3e4
2 parents 8bbe1b9 + 2c287b7
commit f3ac3e4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h
@@ -56,7 +56,7 @@
 #define AI_FLAG_STALL (1 << 13) // AI stalls battle and prefers secondary damage/trapping/etc. TODO not finished
 #define AI_FLAG_SCREENER (1 << 14) // AI prefers screening effects like reflect, mist, etc. TODO unfinished
 #define AI_FLAG_SMART_SWITCHING (1 << 15) // AI includes a lot more switching checks
-#define AI_FLAG_ACE_POKEMON (1 << 16) // AI has Ace Pokemon. The last Pokemon in the party will not used until last remaining.
+#define AI_FLAG_ACE_POKEMON (1 << 16) // AI has an Ace Pokemon. The last Pokemon in the party will not be used until it's the last one remaining.
 
 // 'other' ai logic flags
 #define AI_FLAG_ROAMING (1 << 29)

diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
@@ -957,8 +957,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
  || i == *(gBattleStruct->monToSwitchIntoId + battlerIn1)
  || i == *(gBattleStruct->monToSwitchIntoId + battlerIn2)
  || (GetMonAbility(&party[i]) == ABILITY_TRUANT && IsTruantMonVulnerable(gActiveBattler, opposingBattler)) // While not really invalid per say, not really wise to switch into this mon.
- || (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON 
- && i == (CalculateEnemyPartyCount()-1))) //Save Ace Pokemon for last
+ || ((AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON)
+ && i == (CalculateEnemyPartyCount() - 1))) //Save Ace Pokemon for last
  invalidMons |= gBitTable[i];
  else
  aliveCount++;

diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
@@ -1699,9 +1699,9 @@ static void OpponentHandleChoosePokemon(void)
  if (GetMonData(&gEnemyParty[chosenMonId], MON_DATA_HP) != 0
  && chosenMonId != gBattlerPartyIndexes[battler1]
  && chosenMonId != gBattlerPartyIndexes[battler2]
- && (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
- && (!(chosenMonId == (CalculateEnemyPartyCount()-1))
-  || CountAIAliveNonEggMonsExcept(PARTY_SIZE) == pokemonInBattle)))
+ && (!(AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON)
+ || chosenMonId != CalculateEnemyPartyCount() - 1
+ || CountAIAliveNonEggMonsExcept(PARTY_SIZE) == pokemonInBattle))
  {
  break;
  }