diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/battle/core.asm b/battle/core.asm index eb73f77a2..f41bc2a15 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -6048,7 +6048,7 @@ CheckPlayerHasUsableMoves: ; 3e786 jr .loop .done - and a + and a ; This is probably a bug, and will result in a move with PP Up confusing the game. ret nz .force_struggle diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 5c1214cb7..32d247e8c 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -1541,11 +1541,6 @@ BattleCheckTypeMatchup: ; 347c8 and a jr z, CheckTypeMatchup ld hl, BattleMonType1 - - ; fallthrough -; 347d3 - - CheckTypeMatchup: ; 347d3 push hl push de |