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_commands.asm | |
| parent | ef9090b9a07b3d727b1508957c76c899bbc39987 (diff) | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 8f148c883..66788bd6a 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3881,11 +3881,11 @@ BattleCommand_Counter: ; 35813 ld de, StringBuffer1 call GetMoveData - ld a, [StringBuffer1 + 2] + ld a, [StringBuffer1 + MOVE_POWER] and a ret z - ld a, [StringBuffer1 + 3] + ld a, [StringBuffer1 + MOVE_TYPE] cp SPECIAL ret nc @@ -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 |