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/conversion.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/battle/move_effects/conversion.asm')
| -rw-r--r-- | engine/battle/move_effects/conversion.asm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm index d66d23a5e..f9307056c 100644 --- a/engine/battle/move_effects/conversion.asm +++ b/engine/battle/move_effects/conversion.asm @@ -1,4 +1,4 @@ -BattleCommand_Conversion: ; 3707f +BattleCommand_Conversion: ; conversion ld hl, wBattleMonMoves @@ -94,5 +94,3 @@ BattleCommand_Conversion: ; 3707f call AnimateCurrentMove ld hl, TransformedTypeText jp StdBattleTextBox - -; 3710e |