Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1492 from Kurausukun/cgbsound 

Fix CgbSound Fakematches (Thanks to Revo)
This commit is contained in:
PikalaxALT 2021-08-11 19:55:44 -04:00 committed by GitHub
parent cc51627465 2e892c6961
commit c7fc6ac893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/m4a.c
View File

@ -906,7 +906,6 @@ void CgbSound(void)
{
s32 ch;
struct CgbChannel *channels;
s32 envelopeStepTimeAndDir;
s32 prevC15;
struct SoundInfo *soundInfo = SOUND_INFO_PTR;
vu8 *nrx0ptr;
@ -914,6 +913,7 @@ void CgbSound(void)
vu8 *nrx2ptr;
vu8 *nrx3ptr;
vu8 *nrx4ptr;
s32 envelopeStepTimeAndDir;
// Most comparision operations that cast to s8 perform 'and' by 0xFF.
int mask = 0xff;
@ -1198,8 +1198,8 @@ void CgbSound(void)
}
else
{
envelopeStepTimeAndDir &= 0xf;
*nrx2ptr = (channels->envelopeVolume << 4) + envelopeStepTimeAndDir;
u32 envMask = 0xF;
*nrx2ptr = (envelopeStepTimeAndDir & envMask) + (channels->envelopeVolume << 4);
*nrx4ptr = channels->n4 | 0x80;
if (ch == 1 && !(*nrx0ptr & 0x08))
*nrx4ptr = channels->n4 | 0x80;