diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-07 13:54:44 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-07 14:26:09 -0500 |
| commit | c4169cfd290dcf7703b79debd66142b277af5613 (patch) | |
| tree | 4142cd4e843d863532a2dfe81f82877b26d9cbb0 /src/pokeball.c | |
| parent | 54b254a829d973345b0d282b7a4ffd7458a5c7da (diff) | |
Disambiguate cry functions
Diffstat (limited to 'src/pokeball.c')
| -rw-r--r-- | src/pokeball.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/pokeball.c b/src/pokeball.c index 4e7386f4f..a0800d38f 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -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); |