mirror/BanjoRecomp
1
0
Fork 0
mirror of https://github.com/BanjoRecomp/BanjoRecomp synced 2026-07-07 12:03:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement bgm volume control and remove zelda low health beeps option

Browse Source
This commit is contained in:
Mr-Wiseguy
2025-12-18 02:39:11 -05:00
parent 4581c4c20b
commit c6c0428b39
4 changed files with 132 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/config_menu/sound.rml
+1 -33
View File
@@ -35,40 +35,11 @@
type="range"
min="0"
max="100"
style="flex: 1; margin: 0dp; nav-up: #main_volume_input; nav-down: #lhb_on;"
style="flex: 1; margin: 0dp; nav-up: #main_volume_input;"
data-value="bgm_volume"
/>
</div>
</div>
<div class="config-option" data-event-mouseover="set_cur_config_index(2)">
<label class="config-option__title">Low Health Beeps</label>
<div class="config-option__list">
<input
type="radio"
data-event-blur="set_cur_config_index(-1)"
data-event-focus="set_cur_config_index(2)"
name="lhb"
data-checked="low_health_beeps_enabled"
value="1"
id="lhb_on"
style="nav-up: #bgm_volume_input"
/>
<label class="config-option__tab-label" for="lhb_on">On</label>
<input
type="radio"
data-event-blur="set_cur_config_index(-1)"
data-event-focus="set_cur_config_index(2)"
name="lhb"
data-checked="low_health_beeps_enabled"
value="0"
id="lhb_off"
style="nav-up: #bgm_volume_input"
/>
<label class="config-option__tab-label" for="lhb_off">Off</label>
</div>
</div>
</div>
<!-- Descriptions -->
<div class="config__wrapper">
@@ -78,9 +49,6 @@
<p data-if="cur_config_index == 1">
Controls the overall volume of background music.
</p>
<p data-if="cur_config_index == 2">
Toggles whether or not the low-health beeping sound plays.
</p>
</div>
</div>
</form>
patches/sound_patches.c
+130
View File
@@ -0,0 +1,130 @@
#include "patches.h"
#include "music.h"
#include "time.h"
#include "core1/ml.h"
#include "../lib/bk-decomp/src/core1/musicplayer.h"
#include "sound.h"
extern MusicTrack D_80281720[6];
extern CoMusic *musicTracks;
extern int D_80276E34;
void func_8024FCE0(u8 arg0, s16 arg1);
bool func_80250074(u8);
void func_8024FC6C(u8 arg0);
void func_8025A7DC(enum comusic_e);
void func_8024FF34(void);
void func_802599B4(CoMusic *this);
// @recomp Patched to incorporate the bgm player volume in the setvol command for music tracks.
RECOMP_PATCH void musicTrack_setVolume(u8 arg0, s16 arg1) {
D_80281720[arg0].unk0 = arg1;
alCSPSetVol(&D_80281720[arg0].cseqp, (s16)(arg1 * recomp_get_bgm_volume()));
if (D_80281720[arg0].unk3 && arg1) {
func_8024FCE0(arg0, arg1);
} else if (!D_80281720[arg0].unk3 && arg1 == 0) {
if (func_80250074(arg0) == 0) {
func_8024FC6C(arg0);
}
}
}
// @recomp Patched to always set the volume of every music track in each update loop.
RECOMP_PATCH void coMusicPlayer_update(void) {
s32 temp_lo;
CoMusic *var_s0;
f32 dt;
dt = time_getDelta();
for (var_s0 = musicTracks; var_s0 < &musicTracks[MAX_MUSIC_STRUCT_COUNT]; var_s0++) {
if (var_s0->track_id >= 0) {
temp_lo = var_s0 - musicTracks;
var_s0->unk4 = ml_min_f(var_s0->unk4 + dt, 600.0f);
if ((var_s0->unk4 > 1.0f) && func_80250074(temp_lo)) {
func_8025A7DC(var_s0->track_id);
}
}
}
func_8024FF34();
if (!D_80276E34) {
// @recomp If there are no pending track updates, send a volume command for each track to incorporate the BGM volume.
for (var_s0 = musicTracks; var_s0 < &musicTracks[6]; var_s0++) {
temp_lo = var_s0 - musicTracks;
alCSPSetVol(&D_80281720[temp_lo].cseqp, (s16)(var_s0->volume * recomp_get_bgm_volume()));
}
return;
}
D_80276E34 = FALSE;
for (var_s0 = musicTracks; var_s0 < &musicTracks[6]; var_s0++) {
if (var_s0->track_id < 0) {
continue;
}
if (var_s0->unk12 != 0) {
temp_lo = var_s0 - musicTracks;
if (var_s0->unk0 > 0.0f) {
var_s0->unk0 -= time_getDelta();
D_80276E34 = TRUE;
// @recomp Send a volume command to incorporate the current BGM volume if the track's volume wasn't changed.
alCSPSetVol(&D_80281720[temp_lo].cseqp, (s16)(var_s0->volume * recomp_get_bgm_volume()));
continue;
}
if (var_s0->unk12 < 0) {
var_s0->volume += var_s0->unk12;
if (var_s0->unk15 && (var_s0->unkC == 0) && (var_s0->volume <= 0)) {
func_802599B4(var_s0);
continue;
} else {
if (var_s0->unkC >= var_s0->volume) {
var_s0->volume = var_s0->unkC;
var_s0->unk12 = 0;
} else {
D_80276E34 = TRUE;
}
musicTrack_setVolume(temp_lo, (s16)var_s0->volume);
}
continue;
}
if (var_s0->volume < var_s0->unkC) {
if (var_s0->volume == 0) {
var_s0->unk4 = 0.0f;
}
var_s0->volume += var_s0->unk12;
if (var_s0->volume >= var_s0->unkC) {
var_s0->volume = var_s0->unkC;
var_s0->unk12 = 0;
} else {
D_80276E34 = TRUE;
}
musicTrack_setVolume(temp_lo, (s16)var_s0->volume);
continue;
}
// @recomp Send a volume command to incorporate the current BGM volume if the track's volume wasn't changed.
alCSPSetVol(&D_80281720[temp_lo].cseqp, (s16)(var_s0->volume * recomp_get_bgm_volume()));
var_s0->unk12 = 0;
}
// @recomp Always set the volume of every music track in each update loop.
else {
temp_lo = var_s0 - musicTracks;
// @recomp Send a volume command to incorporate the current BGM volume if the track's volume wasn't changed.
alCSPSetVol(&D_80281720[temp_lo].cseqp, (s16)(var_s0->volume * recomp_get_bgm_volume()));
}
}
}
patches/syms.ld
+1
View File
@@ -37,3 +37,4 @@ recomp_abort = 0x8F000080;
recomp_get_target_aspect_ratio = 0x8F000084;
osExQueueDisplaylistEvent_recomp = 0x8F000088;
recomp_xxh3 = 0x8F00008C;
recomp_get_bgm_volume = 0x8F000090;
src/ui/ui_config.cpp
-3
View File
@@ -339,11 +339,9 @@ void banjo::set_analog_camera_invert_mode(banjo::CameraInvertMode mode) {
struct SoundOptionsContext {
std::atomic<int> main_volume; // Option to control the volume of all sound
std::atomic<int> bgm_volume;
std::atomic<int> low_health_beeps_enabled; // RmlUi doesn't seem to like "true"/"false" strings for setting variants so an int is used here instead.
void reset() {
bgm_volume = 100;
main_volume = 100;
low_health_beeps_enabled = (int)true;
}
SoundOptionsContext() {
reset();
@@ -848,7 +846,6 @@ public:
bind_atomic(constructor, sound_options_model_handle, "main_volume", &sound_options_context.main_volume);
bind_atomic(constructor, sound_options_model_handle, "bgm_volume", &sound_options_context.bgm_volume);
bind_atomic(constructor, sound_options_model_handle, "low_health_beeps_enabled", &sound_options_context.low_health_beeps_enabled);
}
void make_debug_bindings(Rml::Context* context) {