diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2020-11-17 22:57:16 -0600 |
|---|---|---|
| committer | Seth Barberee <seth.barberee@gmail.com> | 2020-11-17 22:57:16 -0600 |
| commit | 1b46057bb8a3e8e04484c14eebf26f2f7126b940 (patch) | |
| tree | fb3de0b85ce7e143c9e666e99d24593a65cd3930 | |
| parent | 6e33dcb93724d51d7f3db1eac0adbfb3cb4f4128 (diff) | |
doc a music function
| -rw-r--r-- | asm/code_80521D0.s | 2 | ||||
| -rw-r--r-- | src/code_80118A4.c | 6 | ||||
| -rw-r--r-- | src/music_pre.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index d6930c2..ee13c00 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -100197,7 +100197,7 @@ _08084030: ldr r0, _08084048 ands r0, r1 ldrh r1, [r4, 0x8] - bl sub_800BE8C + bl FadeInNewBGM _0808403A: ldrh r0, [r4, 0xA] strh r0, [r4, 0xC] diff --git a/src/code_80118A4.c b/src/code_80118A4.c index aedcb2e..eca4558 100644 --- a/src/code_80118A4.c +++ b/src/code_80118A4.c @@ -5,7 +5,7 @@ void nullsub_26(void); extern u8 sub_80023E4(u8); extern void sub_800BDFC(u16 r0); -extern void sub_800BE8C(u16 r0, u16 r1); +extern void FadeInNewBGM(u16 r0, u16 r1); extern void sub_800BF48(u16 r0); extern void sub_800BF80(void); extern void sub_800BFD0(u16 r0); @@ -158,9 +158,9 @@ void sub_80118F0(u16 r0) sub_800BDFC(r0); } -void sub_8011900(u16 r0, u16 r1) +void sub_8011900(u16 songIndex, u16 speed) { - sub_800BE8C(r0, r1); + FadeInNewBGM(songIndex, speed); } void sub_8011914(u16 r0) 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(); |