diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-07 12:58:11 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-07 13:33:05 -0500 |
| commit | 54b254a829d973345b0d282b7a4ffd7458a5c7da (patch) | |
| tree | db16c5d0a7b31889ecbc49e28c1e8c79c41f9606 /src/pokeball.c | |
| parent | 4f825a6ee012c925b3da100b67d363676a03029d (diff) | |
Add CRY_MODE constants
Diffstat (limited to 'src/pokeball.c')
| -rw-r--r-- | src/pokeball.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pokeball.c b/src/pokeball.c index 11f03eefe..4e7386f4f 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -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] @@ -666,9 +666,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) break; case 1: if (ShouldPlayNormalMonCry(mon) == TRUE) - PlayCry3(species, pan, 0); + PlayCry3(species, pan, CRY_MODE_NORMAL); else - PlayCry3(species, pan, 11); + PlayCry3(species, pan, CRY_MODE_WEAK); gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE; DestroyTask(taskId); break; @@ -681,9 +681,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) if (gTasks[taskId].tCryTaskFrames == 0) { if (ShouldPlayNormalMonCry(mon) == TRUE) - PlayCry4(species, pan, 1); + PlayCry4(species, pan, CRY_MODE_DOUBLES); else - PlayCry4(species, pan, 12); + PlayCry4(species, pan, CRY_MODE_WEAK_DOUBLES); gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE; DestroyTask(taskId); @@ -720,9 +720,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) break; } if (ShouldPlayNormalMonCry(mon) == TRUE) - PlayCry4(species, pan, 0); + PlayCry4(species, pan, CRY_MODE_NORMAL); else - PlayCry4(species, pan, 11); + PlayCry4(species, pan, CRY_MODE_WEAK); gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE; DestroyTask(taskId); |