diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-11-05 14:23:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 14:23:11 -0500 |
| commit | 752fdc7c420a0b67ef830df5c92335dfcd610402 (patch) | |
| tree | 7f3cf0de49c19c8cd7b9ef3a45815295e16c566f /src | |
| parent | aa6947d5b11bd93fe36cb71377894a454287325b (diff) | |
| parent | 65a13c9f013dc48d9c7777dfc103b4a903eac759 (diff) | |
Merge pull request #810 from Kurausukun/match_m4a
Match FadeOutBody (ported from pokeemerald)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/m4a.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/libs/m4a.c b/src/libs/m4a.c index 66f563bd4..778abb268 100644 --- a/src/libs/m4a.c +++ b/src/libs/m4a.c @@ -645,28 +645,17 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) s32 i; struct MusicPlayerTrack *track; u16 fadeOV; -#ifdef NONMATCHING - u16 mask; -#else - register u16 mask asm("r2"); -#endif // NONMATCHING if (mplayInfo->fadeOI == 0) return; - - mplayInfo->fadeOC--; - mask = 0xFFFF; - - if (mplayInfo->fadeOC != 0) + if (--mplayInfo->fadeOC != 0) return; mplayInfo->fadeOC = mplayInfo->fadeOI; if (mplayInfo->fadeOV & FADE_IN) { - mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT); - - if ((u16)(mplayInfo->fadeOV & mask) >= (64 << FADE_VOL_SHIFT)) + if ((u16)(mplayInfo->fadeOV += (4 << FADE_VOL_SHIFT)) >= (64 << FADE_VOL_SHIFT)) { mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT); mplayInfo->fadeOI = 0; @@ -674,11 +663,8 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo) } else { - mplayInfo->fadeOV -= (4 << FADE_VOL_SHIFT); - - if ((s16)(mplayInfo->fadeOV & mask) <= 0) + if ((s16)(mplayInfo->fadeOV -= (4 << FADE_VOL_SHIFT)) <= 0) { - for (i = mplayInfo->trackCount, track = mplayInfo->tracks; i > 0; i--, track++) { u32 val; |