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

Removed BattleScript_FlinchPrevention

Browse source 
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
This commit is contained in:
LOuroboros 2021-06-07 19:10:34 -03:00
parent 4d773ef40c
commit 8726107d42
3 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/battle_scripts_1.s
View file

@ -7056,14 +7056,6 @@ BattleScript_ObliviousPreventsAttraction::
waitmessage 0x40 waitmessage 0x40
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_FlinchPrevention::
pause 0x20
copybyte gBattlerAbility, gBattlerTarget
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXPREVENTSFLINCHING
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_OwnTempoPrevents:: BattleScript_OwnTempoPrevents::
pause 0x20 pause 0x20
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp

1
include/battle_scripts.h
View file

@ -166,7 +166,6 @@ extern const u8 BattleScript_BRNPrevention[];
extern const u8 BattleScript_PRLZPrevention[]; extern const u8 BattleScript_PRLZPrevention[];
extern const u8 BattleScript_PSNPrevention[]; extern const u8 BattleScript_PSNPrevention[];
extern const u8 BattleScript_ObliviousPreventsAttraction[]; extern const u8 BattleScript_ObliviousPreventsAttraction[];
extern const u8 BattleScript_FlinchPrevention[];
extern const u8 BattleScript_OwnTempoPrevents[]; extern const u8 BattleScript_OwnTempoPrevents[];
extern const u8 BattleScript_SoundproofProtected[]; extern const u8 BattleScript_SoundproofProtected[];
extern const u8 BattleScript_AbilityNoSpecificStatLoss[]; extern const u8 BattleScript_AbilityNoSpecificStatLoss[];

2
src/battle_script_commands.c
View file

@ -2739,7 +2739,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
} }
break; break;
case MOVE_EFFECT_FLINCH: case MOVE_EFFECT_FLINCH:
if (gBattleMons[gEffectBattler].ability == ABILITY_INNER_FOCUS) if (GetBattlerAbility(gEffectBattler) == ABILITY_INNER_FOCUS)
{ {
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
} }