diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
| commit | 4b36a9d2e1d6b6ac823fbb14e8f0ba750b0eecc2 (patch) | |
| tree | fcbbd0247503a200c4c1d8df690a676b49a09efd /battle/core.asm | |
| parent | e3ee39f3344107f666099448401d28b04c983cd6 (diff) | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/battle/core.asm b/battle/core.asm index 8c4ab73e4..bc8a37725 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -5998,7 +5998,7 @@ CheckPlayerHasUsableMoves: ; 3e786 swap a and $f ld b, a - ld d, $5 + ld d, NUM_MOVES + 1 xor a .loop dec d @@ -6011,7 +6011,9 @@ CheckPlayerHasUsableMoves: ; 3e786 jr .loop .done - and a ; This is probably a bug, and will result in a move with PP Up confusing the game. + ; Bug: this will result in a move with PP Up confusing the game. + ; Replace with "and $3f" to fix. + and a ret nz .force_struggle |