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/rollout.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/battle/move_effects/rollout.asm')
| -rw-r--r-- | engine/battle/move_effects/rollout.asm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engine/battle/move_effects/rollout.asm b/engine/battle/move_effects/rollout.asm index f6966c48a..de4bfcaa6 100644 --- a/engine/battle/move_effects/rollout.asm +++ b/engine/battle/move_effects/rollout.asm @@ -1,7 +1,6 @@ MAX_ROLLOUT_COUNT EQU 5 - -BattleCommand_CheckCurl: ; 37718 +BattleCommand_CheckCurl: ; checkcurl ld de, wPlayerRolloutCount @@ -22,10 +21,8 @@ BattleCommand_CheckCurl: ; 37718 xor a ld [de], a ret -; 37734 - -BattleCommand_RolloutPower: ; 37734 +BattleCommand_RolloutPower: ; rolloutpower ld a, BATTLE_VARS_STATUS @@ -96,4 +93,3 @@ BattleCommand_RolloutPower: ; 37734 .done_damage ret -; 37791 |