diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/effect_command_pointers.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm index bcd666c91..5dd6be786 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -78,7 +78,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand_Spite ; 35c0f dw BattleCommand_FalseSwipe ; 35c94 dw BattleCommand_HealBell ; 35cc9 - dw BattleCommand_KingsRock ; 36ac9 + dw BattleCommand_HeldFlinch ; 36ac9 dw BattleCommand_TripleKick ; 346b2 dw BattleCommand_KickCounter ; 346cd dw BattleCommand_Thief ; 37492 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 |