diff options
| author | djevangelia <263709373+djevangelia@users.noreply.github.com> | 2026-07-12 16:59:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-12 14:59:10 +0000 |
| commit | 1003c462a886e6046071865d2091c6e742a2f4b7 (patch) | |
| tree | 1c4523995d68d919e1a82a5e722f725c2f5f3466 /soh/src/code/code_800EC960.c | |
| parent | e2daa80623cc9858751555751e50fadacc9853d7 (diff) | |
Decomp pull, some `z_player` and global changes (#6908)
Diffstat (limited to 'soh/src/code/code_800EC960.c')
| -rw-r--r-- | soh/src/code/code_800EC960.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index ac6cb0d36..a9950908f 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -1694,7 +1694,7 @@ void func_800ED848(u8 inputEnabled) { sOcarinaInpEnabled = inputEnabled; } -void Audio_OcaSetInstrument(u8 arg0) { +void AudioOcarina_SetInstrument(u8 arg0) { if (D_80130F10 == arg0) { return; } @@ -2191,14 +2191,14 @@ void func_800EE824(void) { D_80131C80++; } else { D_80131C80 = 3; - Audio_OcaSetInstrument(0); + AudioOcarina_SetInstrument(0); } D_80131C88 = 1200; } break; case 1: Audio_SetSoundBanksMute(0); - Audio_OcaSetInstrument(D_80131C84); + AudioOcarina_SetInstrument(D_80131C84); Audio_OcaSetSongPlayback(OCARINA_SONG_SCARECROW_LONG + 1, 1); D_80131C84++; D_80131C80++; @@ -4223,12 +4223,12 @@ void Audio_StepFreqLerp(FreqLerp* lerp) { } } -void func_800F47BC(void) { +void Audio_SetBgmVolumeOffDuringFanfare(void) { Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 1, 0, 10); Audio_SetVolScale(SEQ_PLAYER_BGM_SUB, 1, 0, 10); } -void func_800F47FC(void) { +void Audio_SetBgmVolumeOnDuringFanfare(void) { Audio_SetVolScale(SEQ_PLAYER_BGM_MAIN, 1, 0x7F, 3); Audio_SetVolScale(SEQ_PLAYER_BGM_SUB, 1, 0x7F, 3); } @@ -5122,7 +5122,7 @@ void func_800F6C34(void) { sAudioExtraFilter = 0; sAudioBaseFilter2 = 0; sAudioExtraFilter2 = 0; - Audio_OcaSetInstrument(0); + AudioOcarina_SetInstrument(0); sRiverFreqScaleLerp.remainingFrames = 0; sWaterfallFreqScaleLerp.remainingFrames = 0; sRiverFreqScaleLerp.value = 1.0f; |