ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

THE BEAST IS SLAIN

Browse Source
This commit is contained in:
Kurausukun 2021-04-19 23:44:24 -04:00
parent c1da6b29bc
commit d542baf14b
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/m4a.c
View File

@ -887,18 +887,13 @@ void CgbModVol(struct CgbChannel *chan)
if ((soundInfo->mode & 1) || !CgbPan(chan))
{
chan->pan = 0xFF;
chan->envelopeGoal = (u32)(chan->rightVolume + chan->leftVolume) >> 4;
chan->envelopeGoal = (u32)(chan->leftVolume + chan->rightVolume);
chan->envelopeGoal /= 16;
}
else
{
// Force chan->rightVolume and chan->leftVolume to be read from memory again,
// even though there is no reason to do so.
// The command line option "-fno-gcse" achieves the same result as this.
#ifndef NONMATCHING
asm("" : : : "memory");
#endif
chan->envelopeGoal = (u32)(chan->rightVolume + chan->leftVolume) >> 4;
chan->envelopeGoal = (u32)(chan->leftVolume + chan->rightVolume);
chan->envelopeGoal /= 16;
if (chan->envelopeGoal > 15)
chan->envelopeGoal = 15;
}