From 1fe0b740adb6fee502393da37f495d87355c5a00 Mon Sep 17 00:00:00 2001 From: Parker B <20159000+jpburnett@users.noreply.github.com> Date: Sat, 25 May 2024 21:43:11 -0700 Subject: [PATCH] Update to address review comments. Fixed nav menuing, and removed recomp APIs. --- assets/config_menu/sound.rml | 4 ++-- patches/sound.h | 1 - src/game/recomp_api.cpp | 4 ---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/assets/config_menu/sound.rml b/assets/config_menu/sound.rml index aa92df0..badadce 100644 --- a/assets/config_menu/sound.rml +++ b/assets/config_menu/sound.rml @@ -18,7 +18,7 @@ type="range" min="0" max="100" - style="flex: 1; margin: 0dp; nav-up: #tab_sound; nav-down: #lhb_on;" + style="flex: 1; margin: 0dp; nav-up: #tab_sound; nav-down: #bgm_volume_input;" data-value="main_volume" /> @@ -35,7 +35,7 @@ type="range" min="0" max="100" - style="flex: 1; margin: 0dp; nav-up: #tab_sound; nav-down: #lhb_on;" + style="flex: 1; margin: 0dp; nav-up: #main_volume_input; nav-down: #lhb_on;" data-value="bgm_volume" /> diff --git a/patches/sound.h b/patches/sound.h index bbbd0ae..0e05637 100644 --- a/patches/sound.h +++ b/patches/sound.h @@ -3,7 +3,6 @@ #include "patch_helpers.h" -DECLARE_FUNC(float, recomp_get_main_volume); DECLARE_FUNC(float, recomp_get_bgm_volume); DECLARE_FUNC(u32, recomp_get_low_health_beeps_enabled); diff --git a/src/game/recomp_api.cpp b/src/game/recomp_api.cpp index 8c64f08..5563501 100644 --- a/src/game/recomp_api.cpp +++ b/src/game/recomp_api.cpp @@ -78,10 +78,6 @@ extern "C" void recomp_get_targeting_mode(uint8_t* rdram, recomp_context* ctx) { _return(ctx, static_cast(recomp::get_targeting_mode())); } -extern "C" void recomp_get_main_volume(uint8_t* rdram, recomp_context* ctx) { - _return(ctx, recomp::get_main_volume() / 100.0f); -} - extern "C" void recomp_get_bgm_volume(uint8_t* rdram, recomp_context* ctx) { _return(ctx, recomp::get_bgm_volume() / 100.0f); }