dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused BF battle types, clarify Ghost battle type flags

Browse Source
This commit is contained in:
GriffinR
2020-01-22 20:07:46 -05:00
parent d084a5ca84
commit e7cd8c59f4
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_ai_script_commands.c
+2 -2
View File
@@ -343,12 +343,12 @@ void BattleAI_SetupAIData(void)
}
else if (!(gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER)) && (gTrainerBattleOpponent_A != SECRET_BASE_OPPONENT))
{
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
if (gBattleTypeFlags & BATTLE_TYPE_WILD_SCRIPTED)
{
AI_THINKING_STRUCT->aiFlags = AI_SCRIPT_CHECK_BAD_MOVE;
return;
}
else if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
else if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY_FRLG)
{
AI_THINKING_STRUCT->aiFlags = (AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY);
return;