From 342b7da5d36460bb5780ea60da4b6b5be46ddc38 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 10 Nov 2021 11:59:15 -0500
Subject: [PATCH] Fix CRY_MODE_ECHO

---
 include/constants/sound.h     | 4 ++--
 src/battle_anim_sound_tasks.c | 6 +++---
 src/sound.c                   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/constants/sound.h b/include/constants/sound.h
index 40c3b7d58..dc434bcf8 100644
--- a/include/constants/sound.h
+++ b/include/constants/sound.h
@@ -24,9 +24,9 @@
 #define CRY_MODE_DOUBLES       1 // Shortened cry for double battles
 #define CRY_MODE_ENCOUNTER     2 // Used when starting a static encounter, or when a Pokémon is "aggressive"
 #define CRY_MODE_HIGH_PITCH    3 // Highest pitch mode, used exclusively by the move Howl
-#define CRY_MODE_ECHO_END      4 // For 2nd cry used by the move Hyper Voice. Played in reverse
+#define CRY_MODE_ECHO_START    4 // For 1st half of cry used by the move Hyper Voice. Played in reverse
 #define CRY_MODE_FAINT         5 // Used when a Pokémon faints
-#define CRY_MODE_ECHO_START    6 // For 1st cry used by the move Hyper Voice
+#define CRY_MODE_ECHO_END      6 // For 2nd half of cry used by the move Hyper Voice
 #define CRY_MODE_ROAR_1        7 // For 1st cry used by the move Roar
 #define CRY_MODE_ROAR_2        8 // For 2nd cry used by the move Roar
 #define CRY_MODE_GROWL_1       9 // For 1st cry used by the move Growl. Played in reverse
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;