atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add bs cap to switching

Browse source
This commit is contained in:
DizzyEggg 2019-06-28 09:30:35 +02:00
parent 48c801245c
commit c14cc798af
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/battle_ai_script_commands.c
View file

@ -421,6 +421,16 @@ u8 BattleAI_ChooseMoveOrAction(void)
return ret; return ret;
} }
static u32 GetTotalBaseStat(u32 species)
{
return gBaseStats[species].baseHP
+ gBaseStats[species].baseAttack
+ gBaseStats[species].baseDefense
+ gBaseStats[species].baseSpeed
+ gBaseStats[species].baseSpAttack
+ gBaseStats[species].baseSpDefense;
}
static u8 ChooseMoveOrAction_Singles(void) static u8 ChooseMoveOrAction_Singles(void)
{ {
u8 currentMoveArray[4]; u8 currentMoveArray[4];
@ -452,6 +462,7 @@ static u8 ChooseMoveOrAction_Singles(void)
// Consider switching if all moves are worthless to use. // Consider switching if all moves are worthless to use.
if (AI_THINKING_STRUCT->aiFlags & (AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_PREFER_BATON_PASS) if (AI_THINKING_STRUCT->aiFlags & (AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_PREFER_BATON_PASS)
&& CountUsablePartyMons(sBattler_AI) >= 1 && CountUsablePartyMons(sBattler_AI) >= 1
&& GetTotalBaseStat(gBattleMons[sBattler_AI].species) >= 310 // Mon is not weak.
&& gBattleMons[sBattler_AI].hp >= gBattleMons[sBattler_AI].maxHP / 2 && gBattleMons[sBattler_AI].hp >= gBattleMons[sBattler_AI].maxHP / 2
&& !(gBattleTypeFlags & BATTLE_TYPE_PALACE)) && !(gBattleTypeFlags & BATTLE_TYPE_PALACE))
{ {