ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the BattleScript from Inner Focus

Browse Source 
Any questions shall be directed to Mr. Junichi Masuda.
This commit is contained in:
LOuroboros 2021-04-02 22:52:21 -03:00
parent 480e6a1ffc
commit 4d773ef40c
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/battle_script_commands.c
View File

@ -2739,19 +2739,10 @@ void SetMoveEffect(bool32 primary, u32 certain)
} }
break; break;
case MOVE_EFFECT_FLINCH: case MOVE_EFFECT_FLINCH:
if (GetBattlerAbility(gEffectBattler) == ABILITY_INNER_FOCUS) if (gBattleMons[gEffectBattler].ability == ABILITY_INNER_FOCUS)
{
if (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)
{
gLastUsedAbility = ABILITY_INNER_FOCUS;
RecordAbilityBattle(gEffectBattler, ABILITY_INNER_FOCUS);
gBattlescriptCurrInstr = BattleScript_FlinchPrevention;
}
else
{ {
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
} }
}
else else
{ {
if (GetBattlerTurnOrderNum(gEffectBattler) > gCurrentTurnActionNumber) if (GetBattlerTurnOrderNum(gEffectBattler) > gCurrentTurnActionNumber)