diff options
| author | mid-kid <esteve.varela@gmail.com> | 2017-12-13 15:22:01 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2017-12-24 14:42:05 +0100 |
| commit | 21607bdd1fc4950ab711bcc2f507add524d9d07b (patch) | |
| tree | f4ce398c6fc05031a2bbb5dcf9c08650df354a8c /battle/effect_commands.asm | |
| parent | d787c66374df60fceb34fa5860c34bf56e476cbe (diff) | |
HELD_TRADE_EVOLVE -> HELD_FLINCH
This item effect effectively causes the target to flinch (sometimes).
It's not exclusive to trade evolve items in later generations either.
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 57e4c574f..2ed9a73c4 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -7184,7 +7184,7 @@ CheckOpponentWentFirst: ; 36abf ; 36ac9 -BattleCommand_KingsRock: ; 36ac9 +BattleCommand_HeldFlinch: ; 36ac9 ; kingsrock ld a, [AttackMissed] @@ -7193,7 +7193,7 @@ BattleCommand_KingsRock: ; 36ac9 call GetUserItem ld a, b - cp HELD_TRADE_EVOLVE ; Only King's Rock has this effect + cp HELD_FLINCH ret nz call CheckSubstituteOpp |