ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-29 14:53:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2022-09-18 00:50:21 -03:00 committed by GitHub
parent 5f74781a7d
commit 293a880238
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/battle_ai.h
View File

@ -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)

28
src/battle_ai_switch_items.c
View File

@ -109,9 +109,9 @@ static bool8 ShouldSwitchIfWonderGuard(void)
continue;
if (i == gBattlerPartyIndexes[gActiveBattler])
continue;
/*if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
&& i == (CalculateEnemyPartyCount()-1))
continue;*/
continue;
for (opposingBattler = GetBattlerAtPosition(opposingPosition), j = 0; j < MAX_MON_MOVES; j++)
{
@ -202,9 +202,9 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
continue;
if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2))
continue;
/*if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
&& i == (CalculateEnemyPartyCount()-1))
continue;*/
continue;
species = GetMonData(&party[i], MON_DATA_SPECIES);
@ -283,9 +283,9 @@ static bool8 ShouldSwitchIfGameStatePrompt(void)
for (i = firstId; i < lastId; i++)
{
/*if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
&& i == (CalculateEnemyPartyCount()-1))
break;*/
break;
//Look for mon in party that is able to be switched into and has ability that sets terrain
if (GetMonData(&party[i], MON_DATA_HP) != 0
@ -574,9 +574,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u16 flags, u8 moduloPercent)
continue;
if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2))
continue;
/*if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
&& i == (CalculateEnemyPartyCount()-1))
continue;*/
continue;
species = GetMonData(&party[i], MON_DATA_SPECIES);
@ -666,9 +666,9 @@ bool32 ShouldSwitch(void)
continue;
if (i == *(gBattleStruct->monToSwitchIntoId + battlerIn2))
continue;
/*if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
&& i == (CalculateEnemyPartyCount()-1))
continue;*/
continue;
availableToSwitch++;
}
@ -756,9 +756,9 @@ void AI_TrySwitchOrUseItem(void)
continue;
if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + battlerIn2))
continue;
/*if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_ACE_POKEMON
&& monToSwitchId == (CalculateEnemyPartyCount()-1))
continue;*/
continue;
break;
}
@ -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++;

6
src/battle_controller_opponent.c
View File

@ -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;
}