diff options
| author | dannye <33dannye@gmail.com> | 2021-04-13 17:48:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-13 17:48:44 -0500 |
| commit | 3af309e80584a0e2567586613f406883118d88e3 (patch) | |
| tree | 9204f1351993e4679ad9ef91aa82ad1ebb4b8c4c /engine | |
| parent | Trim extra newlines from some files (diff) | |
| parent | The 'def_trainers' macro checks that trainers' event flag bits are correct (#... (diff) | |
| download | pokeyellow-3af309e80584a0e2567586613f406883118d88e3.tar.gz pokeyellow-3af309e80584a0e2567586613f406883118d88e3.tar.xz pokeyellow-3af309e80584a0e2567586613f406883118d88e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/animations.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 4110e8b6..56db1979 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -924,7 +924,7 @@ TradeJumpPokeball: cp $ff jr nz, .skipPlayingSound .playSound ; play sound if next move distance is 12 or this is the last one - ld a, SFX_BATTLE_18 + ld a, SFX_SWAP call PlaySound .skipPlayingSound push bc |