summaryrefslogtreecommitdiff
path: root/src/music_pre.c
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2020-11-17 22:57:16 -0600
committerSeth Barberee <seth.barberee@gmail.com>2020-11-17 22:57:16 -0600
commit1b46057bb8a3e8e04484c14eebf26f2f7126b940 (patch)
treefb3de0b85ce7e143c9e666e99d24593a65cd3930 /src/music_pre.c
parent6e33dcb93724d51d7f3db1eac0adbfb3cb4f4128 (diff)
doc a music function
Diffstat (limited to 'src/music_pre.c')
-rw-r--r--src/music_pre.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/music_pre.c b/src/music_pre.c
index e8caf12..54f60d3 100644
--- a/src/music_pre.c
+++ b/src/music_pre.c
@@ -118,7 +118,7 @@ void sub_800BDFC(u16 songIndex)
#ifndef NONMATCHING
NAKED
#endif
-void sub_800BE8C(u16 SongIndex, u16 r1)
+void FadeInNewBGM(u16 SongIndex, u16 speed)
{
#ifdef NONMATCHING
// TODO regswap memes
@@ -136,16 +136,16 @@ void sub_800BE8C(u16 SongIndex, u16 r1)
return;
}
- if((r1 > 0x80 << 1))
+ if((speed > 0x80 << 1))
{
- r1 = 0x10;
+ speed = 0x10;
}
else
{
- if(r1 >> 4 == 0)
+ if(speed >> 4 == 0)
{
- r1 = 1;
+ speed = 1;
}
}
@@ -160,7 +160,7 @@ void sub_800BE8C(u16 SongIndex, u16 r1)
m4aMPlayImmInit(&gUnknown_20008F0);
m4aMPlayVolumeControl(&gUnknown_20008F0, 0xFF, 0);
m4aSongNumStop(SongIndex);
- m4aMPlayFadeIn(&gUnknown_20008F0, r1);
+ m4aMPlayFadeIn(&gUnknown_20008F0, speed);
}
if(interrupt_flag)
EnableInterrupts();