diff options
| author | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
|---|---|---|
| committer | froggestspirit <froggestspirit@gmail.com> | 2021-09-06 10:32:14 -0400 |
| commit | 73554ec88d4f269b6146f6d1ab5d2742cb0a6f89 (patch) | |
| tree | fac5bee8a4ce4757816dbbe42265523478b78781 /src/battle_anim_sound_tasks.c | |
| parent | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (diff) | |
| parent | 63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/battle_anim_sound_tasks.c')
| -rw-r--r-- | src/battle_anim_sound_tasks.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 8fc93c3aa..39d6729e8 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -135,8 +135,10 @@ void SoundTask_PlayCryHighPitch(u8 taskId) { if (gBattleAnimArgs[0] == ANIM_ATTACKER) species = gContestResources->moveAnim->species; + #ifndef UBFIX else - DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. + DestroyAnimVisualTask(taskId); // UB: task gets destroyed twice. + #endif } else { @@ -179,8 +181,10 @@ void SoundTask_PlayDoubleCry(u8 taskId) { if (gBattleAnimArgs[0] == ANIM_ATTACKER) species = gContestResources->moveAnim->species; + #ifndef UBFIX else - DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task. + DestroyAnimVisualTask(taskId); // UB: task gets destroyed twice. + #endif } else { |