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

Merge branch 'master' into doc-banim

Browse Source
This commit is contained in:
GriffinR
2021-11-13 23:26:46 -05:00
committed by GitHub
parent 4c4fa1f25e 8d18d03c79
commit f42eafc85b
573 changed files with 5399 additions and 5181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pokeball.c
View File

@@ -641,7 +641,7 @@ static void SpriteCB_BallThrow_Shake(struct Sprite *sprite)
#define tCryTaskSpecies data[0]
#define tCryTaskPan data[1]
#define tCryTaskWantedCry data[2]
#define tCryTaskBattler data[3]
#define tCryTaskBattler data[3]
#define tCryTaskMonSpriteId data[4]
#define tCryTaskMonPtr1 data[5]
#define tCryTaskMonPtr2 data[6]
@@ -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, 0);
PlayCry_ByMode(species, pan, CRY_MODE_NORMAL);
else
PlayCry3(species, pan, 11);
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, 1);
PlayCry_ReleaseDouble(species, pan, CRY_MODE_DOUBLES);
else
PlayCry4(species, pan, 12);
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, 0);
PlayCry_ReleaseDouble(species, pan, CRY_MODE_NORMAL);
else
PlayCry4(species, pan, 11);
PlayCry_ReleaseDouble(species, pan, CRY_MODE_WEAK);
gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
DestroyTask(taskId);