diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 17:30:29 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 17:30:29 -0500 |
| commit | b805d343f36019ae9fdf5d248d78a0d9b12f25d7 (patch) | |
| tree | e296a2d4a3805aee0340ad05eb61da9ce7ed7db6 /battle/effect_command_pointers.asm | |
| parent | ef9090b9a07b3d727b1508957c76c899bbc39987 (diff) | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'battle/effect_command_pointers.asm')
| -rw-r--r-- | battle/effect_command_pointers.asm | 2 |
1 files changed, 1 insertions, 1 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 |