diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-10 11:59:15 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-10 11:59:15 -0500 |
| commit | 342b7da5d36460bb5780ea60da4b6b5be46ddc38 (patch) | |
| tree | b1aedb56d575e2c880382bb9397916d99d270cc4 /src | |
| parent | c4169cfd290dcf7703b79debd66142b277af5613 (diff) | |
Fix CRY_MODE_ECHO
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_anim_sound_tasks.c | 6 | ||||
| -rw-r--r-- | src/sound.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 7180041b3..6b14d3863 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -312,7 +312,7 @@ static void SoundTask_PlayCryWithEcho_Step(u8 taskId) switch (gTasks[taskId].tState) { case 2: - PlayCry_DuckNoRestore(species, pan, CRY_MODE_ECHO_END); + PlayCry_DuckNoRestore(species, pan, CRY_MODE_ECHO_START); gTasks[taskId].tState++; break; case 1: @@ -329,9 +329,9 @@ static void SoundTask_PlayCryWithEcho_Step(u8 taskId) break; default: if (!gTasks[taskId].tLastCry) - PlayCry_DuckNoRestore(species, pan, CRY_MODE_ECHO_START); + PlayCry_DuckNoRestore(species, pan, CRY_MODE_ECHO_END); else - PlayCry_ByMode(species, pan, CRY_MODE_ECHO_START); + PlayCry_ByMode(species, pan, CRY_MODE_ECHO_END); DestroyAnimVisualTask(taskId); break; diff --git a/src/sound.c b/src/sound.c index c2a8c9e8c..ad9993b54 100644 --- a/src/sound.c +++ b/src/sound.c @@ -406,7 +406,7 @@ void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode) chorus = 20; volume = 90; break; - case CRY_MODE_ECHO_END: + case CRY_MODE_ECHO_START: length = 25; reverse = TRUE; release = 100; @@ -418,7 +418,7 @@ void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode) release = 200; pitch = 14440; break; - case CRY_MODE_ECHO_START: + case CRY_MODE_ECHO_END: release = 220; pitch = 15555; chorus = 192; |