Smarter SwitchAI Mon Choices | HasBadOdds Switch Check

include/battle.h

@@ -306,7 +306,9 @@ struct AI_ThinkingStruct
     u32 aiFlags;
     u8 aiAction;
     u8 aiLogicId;
+    u8 mostSuitableMonId; // Stores result of GetMostSuitableMonToSwitchInto, which decides which generic mon the AI would switch into if they decide to switch. This can be overruled by specific mons found in ShouldSwitch; the final resulting mon is stored in AI_monToSwitchIntoId.
     struct AI_SavedBattleMon saved[MAX_BATTLERS_COUNT];
+    bool8 switchMon; // Because all available moves have no/little effect.
 };
 
 #define AI_MOVE_HISTORY_COUNT 3

include/battle_ai_switch_items.h

@@ -3,7 +3,7 @@
 
 void GetAIPartyIndexes(u32 battlerId, s32 *firstId, s32 *lastId);
 void AI_TrySwitchOrUseItem(void);
-u8 GetMostSuitableMonToSwitchInto(void);
+u8 GetMostSuitableMonToSwitchInto(bool8 switchAfterMonKOd);
 bool32 ShouldSwitch(void);
 
 #endif // GUARD_BATTLE_AI_SWITCH_ITEMS_H

include/battle_ai_util.h

@@ -171,7 +171,6 @@ bool32 ShouldUseWishAromatherapy(u8 battlerAtk, u8 battlerDef, u16 move);
 // party logic
 struct BattlePokemon *AllocSaveBattleMons(void);
 void FreeRestoreBattleMons(struct BattlePokemon *savedBattleMons);
-s32 AI_CalcPartyMonBestMoveDamage(u32 battlerAtk, u32 battlerDef, struct Pokemon *attackerMon, struct Pokemon *targetMon);
 s32 CountUsablePartyMons(u8 battlerId);
 bool32 IsPartyFullyHealedExceptBattler(u8 battler);
 bool32 PartyHasMoveSplit(u8 battlerId, u8 split);
@@ -186,4 +185,48 @@ void IncreaseSleepScore(u8 battlerAtk, u8 battlerDef, u16 move, s16 *score);
 void IncreaseConfusionScore(u8 battlerAtk, u8 battlerDef, u16 move, s16 *score);
 void IncreaseFrostbiteScore(u8 battlerAtk, u8 battlerDef, u16 move, s16 *score);
 
+struct SwitchinCandidate
+{
+    u16 species;
+    u16 attack;
+    u16 defense;
+    u16 speed;
+    u16 spAttack;
+    u16 spDefense;
+    u16 moves[MAX_MON_MOVES];
+    u32 hpIV:5;
+    u32 attackIV:5;
+    u32 defenseIV:5;
+    u32 speedIV:5;
+    u32 spAttackIV:5;
+    u32 spDefenseIV:5;
+    u32 abilityNum:2;
+    s8 statStages[NUM_BATTLE_STATS];
+    u16 ability;
+    u8 type1;
+    u8 type2;
+    u8 type3;
+    u8 pp[MAX_MON_MOVES];
+    u16 hp;
+    u8 level;
+    u8 friendship;
+    u16 maxHP;
+    u16 item;
+    u8 nickname[POKEMON_NAME_LENGTH + 1];
+    u8 ppBonuses;
+    u8 otName[PLAYER_NAME_LENGTH + 1];
+    u32 experience;
+    u32 personality;
+    u32 status1;
+    u32 status2;
+    u32 otId;
+    u8 metLevel;
+    bool8 hypotheticalStatus;
+};
+
+extern struct SwitchinCandidate switchinCandidate;
+
+void SwitchinCandidateToBattleMon(struct SwitchinCandidate *switchinCandidate, struct BattlePokemon *dst);
+s32 AI_CalcPartyMonDamage(u16 move, u8 battlerAtk, u8 battlerDef, struct SwitchinCandidate *switchinCandidate, bool8 isPartyMonAttacker);
+
 #endif //GUARD_BATTLE_AI_UTIL_H

include/constants/battle_ai.h

@@ -59,6 +59,8 @@
 #define AI_FLAG_SMART_SWITCHING       (1 << 15)  // AI includes a lot more switching checks
 #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.
 #define AI_FLAG_OMNISCIENT            (1 << 17)  // AI has full knowledge of player moves, abilities, hold items
+#define AI_FLAG_SMART_MON_CHOICES     (1 << 18)  // AI will make smarter decisions when choosing which mon to send out mid-battle. Pairs very well with AI_FLAG_SMART_SWITCHING.
+#define AI_FLAG_SMART_MON_CHOICES_KO  (1 << 19)  // AI will make smarter decisions when choosing which mon to send out after previous mon was KO'd. Functions just fine on its own, but pairs well with the other smart AI flags for more challenging AI overall.
 
 #define AI_FLAG_COUNT                       18
 

include/constants/items.h

@@ -607,6 +607,20 @@
 #define ITEM_UTILITY_UMBRELLA 513
 
 // Berries
+#if B_CONFUSE_BERRIES_HEAL >= GEN_8
+    #define CONFUSE_BERRY_HEAL_FRACTION 3
+#elif B_CONFUSE_BERRIES_HEAL == GEN_7
+    #define CONFUSE_BERRY_HEAL_FRACTION 2
+#else
+    #define CONFUSE_BERRY_HEAL_FRACTION 8
+#endif
+
+#if B_CONFUSE_BERRIES_HEAL >= GEN_7
+    #define CONFUSE_BERRY_HP_FRACTION 4
+#else
+    #define CONFUSE_BERRY_HP_FRACTION 2
+#endif
+
 #define ITEM_CHERI_BERRY 514
 #define ITEM_CHESTO_BERRY 515
 #define ITEM_PECHA_BERRY 516

src/battle_ai_main.c

@@ -185,10 +185,12 @@ void BattleAI_SetupAIData(u8 defaultScoreMoves)
     s32 i, move, dmg;
     u8 moveLimitations;
 
-    // Clear AI data but preserve the flags.
+    // Clear AI data but preserve the flags and most suitable mon (pre-calculated in HandleTurnActionSelectionState).
+    u8 mostSuitableMonId = AI_THINKING_STRUCT->mostSuitableMonId;
     u32 flags = AI_THINKING_STRUCT->aiFlags;
     memset(AI_THINKING_STRUCT, 0, sizeof(struct AI_ThinkingStruct));
     AI_THINKING_STRUCT->aiFlags = flags;
+    AI_THINKING_STRUCT->mostSuitableMonId = mostSuitableMonId;
 
     // Conditional score reset, unlike Ruby.
     for (i = 0; i < MAX_MON_MOVES; i++)
@@ -401,7 +403,7 @@ void GetAiLogicData(void)
 
 static bool32 AI_SwitchMonIfSuitable(u32 battlerId)
 {
-    u32 monToSwitchId = GetMostSuitableMonToSwitchInto();
+    u32 monToSwitchId = AI_THINKING_STRUCT->mostSuitableMonId;
     if (monToSwitchId != PARTY_SIZE)
     {
         AI_DATA->shouldSwitchMon |= gBitTable[battlerId];