diff options
author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/battle/move_effects/fury_cutter.asm | |
parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/battle/move_effects/fury_cutter.asm')
-rw-r--r-- | engine/battle/move_effects/fury_cutter.asm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/engine/battle/move_effects/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm index 91679368f..6aa6b7838 100644 --- a/engine/battle/move_effects/fury_cutter.asm +++ b/engine/battle/move_effects/fury_cutter.asm @@ -1,4 +1,4 @@ -BattleCommand_FuryCutter: ; 37792 +BattleCommand_FuryCutter: ; furycutter ld hl, wPlayerFuryCutterCount @@ -38,11 +38,7 @@ BattleCommand_FuryCutter: ; 37792 ld [hl], a ret -; 377be - - -ResetFuryCutterCount: ; 377be - +ResetFuryCutterCount: push hl ld hl, wPlayerFuryCutterCount @@ -57,5 +53,3 @@ ResetFuryCutterCount: ; 377be pop hl ret - -; 377ce |