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

Merge pull request #1547 from GriffinRichards/doc-sounddata

Browse Source 
Clean up sound, add CRY_MODE constants
This commit is contained in:
GriffinR
2021-11-13 15:54:40 -05:00
committed by GitHub
parent ef935f6f4a 57be596ce4
commit b14fe9dce3
345 changed files with 1238 additions and 1179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/roulette.c
+5 -5
View File
@@ -4449,13 +4449,13 @@ static void SetBallStuck(struct Sprite *sprite)
if (sRoulette->useTaillow)
{
if (sprite->sStuckOnWheelLeft)
PlayCry1(SPECIES_TAILLOW, -63);
PlayCry_Normal(SPECIES_TAILLOW, -63);
else
PlayCry1(SPECIES_TAILLOW, 63);
PlayCry_Normal(SPECIES_TAILLOW, 63);
}
else
{
PlayCry1(SPECIES_SHROOMISH, -63);
PlayCry_Normal(SPECIES_SHROOMISH, -63);
}
slotsToSkip = 2;
@@ -4719,9 +4719,9 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
{
m4aSongNumStartOrChange(SE_TAILLOW_WING_FLAP);
if (sRoulette->ball->sStuckOnWheelLeft == 0)
PlayCry1(SPECIES_TAILLOW, 63);
PlayCry_Normal(SPECIES_TAILLOW, 63);
else
PlayCry1(SPECIES_TAILLOW, -63);
PlayCry_Normal(SPECIES_TAILLOW, -63);
StartSpriteAnim(sprite, sRoulette->ball->sStuckOnWheelLeft + 2);
sprite->data[1] = 45;
sprite->callback = SpriteCB_Taillow_PickUpBall;