Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CRY_MODE_ECHO

This commit is contained in:
GriffinR 2021-11-10 11:59:15 -05:00
parent c4169cfd29
commit 342b7da5d3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/constants/sound.h
View File

@ -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

6
src/battle_anim_sound_tasks.c
View File

@ -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;

4
src/sound.c
View File

@ -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;