diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-07-21 00:41:56 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-07-21 00:41:56 -0600 |
| commit | 8aebc7ba56746b19d3338ab548ad0ab59d2012aa (patch) | |
| tree | 8d254ad7c603e72f4d231f5587ba32df2397fc36 /engine | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
| parent | 57fc81d44e1f26b8895d37c9d847400851a8f8b4 (diff) | |
Merge branch 'master' of hyperdriveguy/pokecrystal
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/move_effects/counter.asm | 1 | ||||
| -rw-r--r-- | engine/battle/move_effects/mirror_coat.asm | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/engine/battle/move_effects/counter.asm b/engine/battle/move_effects/counter.asm index f92e1b3ac..031c399a6 100644 --- a/engine/battle/move_effects/counter.asm +++ b/engine/battle/move_effects/counter.asm @@ -36,6 +36,7 @@ BattleCommand_Counter: cp SPECIAL ret nc + ; BUG: Move should fail with all non-damaging battle actions ld hl, wCurDamage ld a, [hli] or [hl] diff --git a/engine/battle/move_effects/mirror_coat.asm b/engine/battle/move_effects/mirror_coat.asm index 8743c389d..fb3a30d58 100644 --- a/engine/battle/move_effects/mirror_coat.asm +++ b/engine/battle/move_effects/mirror_coat.asm @@ -37,6 +37,7 @@ BattleCommand_MirrorCoat: cp SPECIAL ret c + ; BUG: Move should fail with all non-damaging battle actions ld hl, wCurDamage ld a, [hli] or [hl] |