dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Disambiguate cry functions

Browse Source
This commit is contained in:
GriffinR
2021-11-07 13:54:44 -05:00
parent 54b254a829
commit c4169cfd29
31 changed files with 125 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokeball.c
+9 -6
View File
@@ -665,10 +665,11 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
gTasks[taskId].tCryTaskState = wantedCry + 1;
break;
case 1:
// Play single cry
if (ShouldPlayNormalMonCry(mon) == TRUE)
PlayCry3(species, pan, CRY_MODE_NORMAL);
PlayCry_ByMode(species, pan, CRY_MODE_NORMAL);
else
PlayCry3(species, pan, CRY_MODE_WEAK);
PlayCry_ByMode(species, pan, CRY_MODE_WEAK);
gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
DestroyTask(taskId);
break;
@@ -680,10 +681,11 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
case 20:
if (gTasks[taskId].tCryTaskFrames == 0)
{
// Play first doubles cry
if (ShouldPlayNormalMonCry(mon) == TRUE)
PlayCry4(species, pan, CRY_MODE_DOUBLES);
PlayCry_ReleaseDouble(species, pan, CRY_MODE_DOUBLES);
else
PlayCry4(species, pan, CRY_MODE_WEAK_DOUBLES);
PlayCry_ReleaseDouble(species, pan, CRY_MODE_WEAK_DOUBLES);
gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
DestroyTask(taskId);
@@ -719,10 +721,11 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
gTasks[taskId].tCryTaskFrames--;
break;
}
// Play second doubles cry
if (ShouldPlayNormalMonCry(mon) == TRUE)
PlayCry4(species, pan, CRY_MODE_NORMAL);
PlayCry_ReleaseDouble(species, pan, CRY_MODE_NORMAL);
else
PlayCry4(species, pan, CRY_MODE_WEAK);
PlayCry_ReleaseDouble(species, pan, CRY_MODE_WEAK);
gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
DestroyTask(taskId);