Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-24 17:30:29 -05:00
parent ef9090b9a0 70e6b5947b
commit b805d343f3
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
battle/effect_commands.asm
View File

@@ -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