diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /src/battle_anim_sound_tasks.c | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'src/battle_anim_sound_tasks.c')
| -rw-r--r-- | src/battle_anim_sound_tasks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index d74b743e8..f2740a1a5 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -178,7 +178,7 @@ void sub_80DD148(u8 taskId) gTasks[taskId].data[2] = pan; if (species != SPECIES_NONE) { - if (gBattleAnimArgs[1] == TASK_NONE) + if (gBattleAnimArgs[1] == TAIL_SENTINEL) PlayCry3(species, pan, 9); else PlayCry3(species, pan, 7); @@ -199,7 +199,7 @@ static void sub_80DD270(u8 taskId) { ++gTasks[taskId].data[9]; } - else if (gTasks[taskId].data[0] == TASK_NONE) + else if (gTasks[taskId].data[0] == TAIL_SENTINEL) { if (!IsCryPlaying()) { |