From 8854c7c60af5ecb691011c47c7f811deeebd8221 Mon Sep 17 00:00:00 2001
From: digant <diguardo@tiscali.it>
Date: Fri, 3 Jan 2025 15:09:10 +0100
Subject: [PATCH] update

---
 rpcs3/Emu/Audio/audio_utils.cpp               |  39 ++
 rpcs3/Emu/Audio/audio_utils.h                 |  14 +
 rpcs3/Emu/CMakeLists.txt                      |   2 +
 rpcs3/Emu/Cell/Modules/cellAudio.cpp          |   3 +-
 rpcs3/Emu/Cell/Modules/sceNp.cpp              |   4 +-
 rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp        |   9 +-
 rpcs3/Emu/Cell/Modules/sceNpTrophy.h          |   6 +
 rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp           |   9 +-
 rpcs3/Emu/RSX/GL/GLOverlays.cpp               |   2 +-
 .../HomeMenu/overlay_home_menu_main_menu.cpp  |  28 ++
 .../Trophies/overlay_trophy_list_dialog.cpp   | 356 ++++++++++++++++++
 .../Trophies/overlay_trophy_list_dialog.h     |  54 +++
 rpcs3/Emu/RSX/Overlays/overlay_controls.cpp   |  53 ++-
 rpcs3/Emu/RSX/Overlays/overlay_controls.h     |  15 +-
 .../RSX/Overlays/overlay_message_dialog.cpp   |   6 +-
 rpcs3/Emu/RSX/VK/VKOverlays.cpp               |   4 +-
 rpcs3/Emu/localized_string_id.h               |  15 +
 rpcs3/Input/sdl_pad_handler.cpp               |  10 +-
 rpcs3/emucore.vcxproj                         |   4 +
 rpcs3/emucore.vcxproj.filters                 |  15 +
 rpcs3/main.cpp                                |   1 +
 rpcs3/rpcs3qt/gs_frame.cpp                    |  16 +
 rpcs3/rpcs3qt/gui_application.cpp             |   3 +-
 rpcs3/rpcs3qt/localized_emu.h                 |  13 +
 rpcs3/rpcs3qt/shortcut_handler.cpp            |   2 +-
 rpcs3/rpcs3qt/shortcut_settings.cpp           |  46 ++-
 rpcs3/rpcs3qt/shortcut_settings.h             |   4 +
 rpcs3/rpcs3qt/trophy_manager_dialog.cpp       |   9 +-
 28 files changed, 680 insertions(+), 62 deletions(-)
 create mode 100644 rpcs3/Emu/Audio/audio_utils.cpp
 create mode 100644 rpcs3/Emu/Audio/audio_utils.h
 create mode 100644 rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
 create mode 100644 rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h

diff --git a/rpcs3/Emu/Audio/audio_utils.cpp b/rpcs3/Emu/Audio/audio_utils.cpp
new file mode 100644
index 0000000000..bcff7bf947
--- /dev/null
+++ b/rpcs3/Emu/Audio/audio_utils.cpp
@@ -0,0 +1,39 @@
+#include "stdafx.h"
+#include "audio_utils.h"
+#include "Emu/system_config.h"
+#include "Emu/System.h"
+#include "Emu/IdManager.h"
+#include "Emu/RSX/Overlays/overlay_message.h"
+
+namespace audio
+{
+	f32 get_volume()
+	{
+		return g_fxo->get<audio_fxo>().audio_muted ? 0.0f : g_cfg.audio.volume / 100.0f;
+	}
+
+	void toggle_mute()
+	{
+		audio_fxo& fxo = g_fxo->get<audio_fxo>();
+		fxo.audio_muted = !fxo.audio_muted;
+		Emu.GetCallbacks().update_emu_settings();
+
+		rsx::overlays::queue_message(fxo.audio_muted ? localized_string_id::AUDIO_MUTED : localized_string_id::AUDIO_UNMUTED, 3'000'000);
+	}
+
+	void change_volume(s32 delta)
+	{
+		// Ignore if muted
+		if (g_fxo->get<audio_fxo>().audio_muted) return;
+
+		const s32 old_volume = g_cfg.audio.volume;
+		const s32 new_volume = old_volume + delta;
+
+		if (old_volume == new_volume) return;
+
+		g_cfg.audio.volume.set(std::clamp<s32>(new_volume, g_cfg.audio.volume.min, g_cfg.audio.volume.max));
+		Emu.GetCallbacks().update_emu_settings();
+
+		rsx::overlays::queue_message(get_localized_string(localized_string_id::AUDIO_CHANGED, fmt::format("%d%%", g_cfg.audio.volume.get()).c_str()), 3'000'000);
+	}
+}
diff --git a/rpcs3/Emu/Audio/audio_utils.h b/rpcs3/Emu/Audio/audio_utils.h
new file mode 100644
index 0000000000..048776c1c1
--- /dev/null
+++ b/rpcs3/Emu/Audio/audio_utils.h
@@ -0,0 +1,14 @@
+#pragma once
+
+namespace audio
+{
+	struct audio_fxo
+	{
+		atomic_t<bool> audio_muted {false};
+	};
+
+	f32 get_volume();
+
+	void toggle_mute();
+	void change_volume(s32 delta);
+}
diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt
index 7846a5d5d3..4cd083ab90 100644
--- a/rpcs3/Emu/CMakeLists.txt
+++ b/rpcs3/Emu/CMakeLists.txt
@@ -125,6 +125,7 @@ target_sources(rpcs3_emu PRIVATE
 # Audio
 target_sources(rpcs3_emu PRIVATE
     Audio/audio_resampler.cpp
+    Audio/audio_utils.cpp
     Audio/AudioDumper.cpp
     Audio/AudioBackend.cpp
     Audio/Cubeb/CubebBackend.cpp
@@ -528,6 +529,7 @@ target_sources(rpcs3_emu PRIVATE
     RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp
     RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
     RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
+    RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
     RSX/Overlays/overlays.cpp
     RSX/Overlays/overlay_animated_icon.cpp
     RSX/Overlays/overlay_animation.cpp
diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/Emu/Cell/Modules/cellAudio.cpp
index 2e31d37b6b..ceeb02da63 100644
--- a/rpcs3/Emu/Cell/Modules/cellAudio.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellAudio.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
+#include "Emu/Audio/audio_utils.h"
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_process.h"
 #include "Emu/Cell/lv2/sys_event.h"
@@ -1041,7 +1042,7 @@ void cell_audio_thread::mix(float* out_buffer, s32 offset)
 	constexpr u32 out_channels = static_cast<u32>(channels);
 	constexpr u32 out_buffer_sz = out_channels * AUDIO_BUFFER_SAMPLES;
 
-	const float master_volume = g_cfg.audio.volume / 100.0f;
+	const float master_volume = audio::get_volume();
 
 	// Reset out_buffer
 	std::memset(out_buffer, 0, out_buffer_sz * sizeof(float));
diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp
index 55b8847934..fb9f46a365 100644
--- a/rpcs3/Emu/Cell/Modules/sceNp.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp
@@ -5214,7 +5214,7 @@ error_code sceNpProfileCallGui(vm::cptr<SceNpId> npid, vm::ptr<SceNpProfileResul
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
+		return SCE_NP_PROFILE_ERROR_NOT_INITIALIZED;
 	}
 
 	// TODO: SCE_NP_PROFILE_ERROR_BUSY
@@ -5240,7 +5240,7 @@ error_code sceNpProfileAbortGui()
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
+		return SCE_NP_FRIENDLIST_ERROR_NOT_INITIALIZED; // Not SCE_NP_PROFILE_ERROR_NOT_INITIALIZED !
 	}
 
 	return CELL_OK;
diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
index e7e9d308a0..3be0571052 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp
@@ -504,10 +504,17 @@ error_code sceNpTrophyCreateContext(vm::ptr<u32> context, vm::cptr<SceNpCommunic
 	}
 
 	// set trophy context parameters (could be passed to constructor through make_ptr call)
-	ctxt->trp_name = std::move(name);
+	ctxt->trp_name = name;
 	ctxt->read_only = !!(options & SCE_NP_TROPHY_OPTIONS_CREATE_CONTEXT_READ_ONLY);
 	*context = idm::last_id();
 
+	// set current trophy name for trophy list overlay
+	{
+		current_trophy_name& current_id = g_fxo->get<current_trophy_name>();
+		std::lock_guard lock(current_id.mtx);
+		current_id.name = std::move(name);
+	}
+
 	return CELL_OK;
 }
 
diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
index 565f7d0b5d..f97050c968 100644
--- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
+++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h
@@ -168,3 +168,9 @@ public:
 
 	virtual s32 ShowTrophyNotification(const SceNpTrophyDetails& trophy, const std::vector<uchar>& trophyIconBfr) = 0;
 };
+
+struct current_trophy_name
+{
+	std::mutex mtx;
+	std::string name;
+};
diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp
index c391602bc3..5f06415ac7 100644
--- a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp
@@ -3,6 +3,7 @@
 #include "Emu/IdManager.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
+#include "Emu//Audio/audio_utils.h"
 #include "Emu//Cell/Modules/cellAudioOut.h"
 #include "util/video_provider.h"
 
@@ -1308,11 +1309,11 @@ rsxaudio_backend_thread::rsxaudio_backend_thread()
 {
 	new_emu_cfg = get_emu_cfg();
 
-	const u64 new_vol = g_cfg.audio.volume;
+	const f32 new_vol = audio::get_volume();
 
 	callback_cfg.atomic_op([&](callback_config& val)
 	{
-		val.target_volume = static_cast<u16>(new_vol / 100.0 * callback_config::VOL_NOMINAL);
+		val.target_volume = static_cast<u16>(new_vol * callback_config::VOL_NOMINAL);
 		val.initial_volume = val.current_volume;
 	});
 }
@@ -1332,11 +1333,11 @@ void rsxaudio_backend_thread::update_emu_cfg()
 {
 	std::unique_lock lock(state_update_m);
 	const emu_audio_cfg _new_emu_cfg = get_emu_cfg();
-	const u64 new_vol = g_cfg.audio.volume;
+	const f32 new_vol = audio::get_volume();
 
 	callback_cfg.atomic_op([&](callback_config& val)
 	{
-		val.target_volume = static_cast<u16>(new_vol / 100.0 * callback_config::VOL_NOMINAL);
+		val.target_volume = static_cast<u16>(new_vol * callback_config::VOL_NOMINAL);
 		val.initial_volume = val.current_volume;
 	});
 
diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.cpp b/rpcs3/Emu/RSX/GL/GLOverlays.cpp
index 4c1ca8ac09..5a2b8803f4 100644
--- a/rpcs3/Emu/RSX/GL/GLOverlays.cpp
+++ b/rpcs3/Emu/RSX/GL/GLOverlays.cpp
@@ -217,7 +217,7 @@ namespace gl
 	gl::texture_view* ui_overlay_renderer::load_simple_image(rsx::overlays::image_info* desc, bool temp_resource, u32 owner_uid)
 	{
 		auto tex = std::make_unique<gl::texture>(GL_TEXTURE_2D, desc->w, desc->h, 1, 1, GL_RGBA8);
-		tex->copy_from(desc->data, gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
+		tex->copy_from(desc->get_data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
 
 		GLenum remap[] = { GL_RED, GL_ALPHA, GL_BLUE, GL_GREEN };
 		auto view = std::make_unique<gl::texture_view>(tex.get(), remap);
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp
index 059326aff3..d02b3ffbe2 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp
@@ -4,9 +4,11 @@
 #include "overlay_home_menu_settings.h"
 #include "overlay_home_menu_savestate.h"
 #include "Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h"
+#include "Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h"
 #include "Emu/RSX/Overlays/overlay_manager.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
+#include "Emu/Cell/Modules/sceNpTrophy.h"
 
 extern atomic_t<bool> g_user_asked_for_recording;
 extern atomic_t<bool> g_user_asked_for_screenshot;
@@ -55,6 +57,32 @@ namespace rsx
 				return page_navigation::stay;
 			});
 
+			// get current trophy name for trophy list overlay
+			std::string trop_name;
+			{
+				current_trophy_name& current_id = g_fxo->get<current_trophy_name>();
+				std::lock_guard lock(current_id.mtx);
+				trop_name = current_id.name;
+			}
+			if (!trop_name.empty())
+			{
+				std::unique_ptr<overlay_element> trophies = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_TROPHIES));
+				add_item(trophies, [trop_name = std::move(trop_name)](pad_button btn) -> page_navigation
+				{
+					if (btn != pad_button::cross) return page_navigation::stay;
+
+					rsx_log.notice("User selected trophies in home menu");
+					Emu.CallFromMainThread([trop_name = std::move(trop_name)]()
+					{
+						if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+						{
+							manager->create<rsx::overlays::trophy_list_dialog>()->show(trop_name);
+						}
+					});
+					return page_navigation::stay;
+				});
+			}
+
 			std::unique_ptr<overlay_element> screenshot = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_SCREENSHOT));
 			add_item(screenshot, [](pad_button btn) -> page_navigation
 			{
diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
new file mode 100644
index 0000000000..8213b29a2d
--- /dev/null
+++ b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
@@ -0,0 +1,356 @@
+#include "stdafx.h"
+#include "../overlay_manager.h"
+#include "overlay_trophy_list_dialog.h"
+#include "Emu/Cell/Modules/sceNpTrophy.h"
+#include "Emu/System.h"
+#include "Emu/VFS.h"
+
+namespace rsx
+{
+	namespace overlays
+	{
+		trophy_list_dialog::trophy_list_entry::trophy_list_entry(const std::string& name, const std::string& description, const std::string& trophy_type, const std::string& icon_path, bool hidden, bool locked, bool platinum_relevant)
+		{
+			std::unique_ptr<overlay_element> image = std::make_unique<image_view>();
+			image->set_size(160, 110);
+			image->set_padding(36, 36, 11, 11); // Square image, 88x88
+
+			if (fs::exists(icon_path))
+			{
+				icon_data = std::make_unique<image_info>(icon_path.c_str(), hidden || locked);
+				static_cast<image_view*>(image.get())->set_raw_image(icon_data.get());
+			}
+			else
+			{
+				// Fallback
+				// TODO: use proper icon
+				static_cast<image_view*>(image.get())->set_image_resource(resource_config::standard_image_resource::square);
+			}
+
+			std::unique_ptr<overlay_element> text_stack  = std::make_unique<vertical_layout>();
+			std::unique_ptr<overlay_element> padding     = std::make_unique<spacer>();
+			std::unique_ptr<overlay_element> header_text = std::make_unique<label>(fmt::format("%s (%s%s)", (locked && !hidden) ? get_localized_string(localized_string_id::HOME_MENU_TROPHY_LOCKED_TITLE, name.c_str()) : name, trophy_type, platinum_relevant ? " - " + get_localized_string(localized_string_id::HOME_MENU_TROPHY_PLATINUM_RELEVANT) : ""));
+			std::unique_ptr<overlay_element> subtext     = std::make_unique<label>(description);
+
+			padding->set_size(1, 1);
+			header_text->set_size(800, 40);
+			header_text->set_font("Arial", 16);
+			header_text->set_wrap_text(true);
+
+			subtext->set_size(800, 0);
+			subtext->set_font("Arial", 14);
+			subtext->set_wrap_text(true);
+			static_cast<label*>(subtext.get())->auto_resize(true);
+
+			// Make back color transparent for text
+			header_text->back_color.a = 0.f;
+			subtext->back_color.a     = 0.f;
+
+			static_cast<vertical_layout*>(text_stack.get())->pack_padding = 5;
+			static_cast<vertical_layout*>(text_stack.get())->add_element(padding);
+			static_cast<vertical_layout*>(text_stack.get())->add_element(header_text);
+			static_cast<vertical_layout*>(text_stack.get())->add_element(subtext);
+
+			if (text_stack->h > image->h)
+			{
+				std::unique_ptr<overlay_element> padding2 = std::make_unique<spacer>();
+				padding2->set_size(1, 5);
+				static_cast<vertical_layout*>(text_stack.get())->add_element(padding2);
+			}
+
+			// Pack
+			this->pack_padding = 15;
+			add_element(image);
+			add_element(text_stack);
+		}
+
+		trophy_list_dialog::trophy_list_dialog()
+		{
+			m_dim_background = std::make_unique<overlay_element>();
+			m_dim_background->set_size(virtual_width, virtual_height);
+			m_dim_background->back_color.a = 0.9f;
+
+			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, 540);
+			m_list->set_pos(20, 85);
+			m_list->set_cancel_only(true);
+
+			m_description = std::make_unique<label>();
+			m_description->set_font("Arial", 20);
+			m_description->set_pos(20, 37);
+			m_description->set_text("Select trophy"); // Fallback. I don't think this will ever be used, so I won't localize it.
+			m_description->auto_resize();
+			m_description->back_color.a = 0.f;
+
+			fade_animation.duration_sec = 0.15f;
+
+			return_code = selection_code::canceled;
+		}
+
+		void trophy_list_dialog::update(u64 timestamp_us)
+		{
+			if (fade_animation.active)
+			{
+				fade_animation.update(timestamp_us);
+			}
+		}
+
+		void trophy_list_dialog::on_button_pressed(pad_button button_press, bool is_auto_repeat)
+		{
+			if (fade_animation.active) return;
+
+			bool close_dialog = false;
+
+			switch (button_press)
+			{
+			case pad_button::circle:
+				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cancel.wav");
+				close_dialog = true;
+				break;
+			case pad_button::dpad_up:
+			case pad_button::ls_up:
+				m_list->select_previous();
+				break;
+			case pad_button::dpad_down:
+			case pad_button::ls_down:
+				m_list->select_next();
+				break;
+			case pad_button::L1:
+				m_list->select_previous(10);
+				break;
+			case pad_button::R1:
+				m_list->select_next(10);
+				break;
+			default:
+				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
+				break;
+			}
+
+			if (close_dialog)
+			{
+				fade_animation.current = color4f(1.f);
+				fade_animation.end = color4f(0.f);
+				fade_animation.active = true;
+
+				fade_animation.on_finish = [this]
+				{
+					close(true, true);
+				};
+			}
+			// Play a sound unless this is a fast auto repeat which would induce a nasty noise
+			else if (!is_auto_repeat || m_auto_repeat_ms_interval >= m_auto_repeat_ms_interval_default)
+			{
+				Emu.GetCallbacks().play_sound(fs::get_config_dir() + "sounds/snd_cursor.wav");
+			}
+		}
+
+		compiled_resource trophy_list_dialog::get_compiled()
+		{
+			if (!visible)
+			{
+				return {};
+			}
+
+			compiled_resource result;
+			result.add(m_dim_background->get_compiled());
+			result.add(m_list->get_compiled());
+			result.add(m_description->get_compiled());
+
+			fade_animation.apply(result);
+
+			return result;
+		}
+
+		void trophy_list_dialog::show(const std::string& trop_name)
+		{
+			visible = false;
+
+			std::unique_ptr<trophy_data> data = load_trophies(trop_name);
+			ensure(data && data->trop_usr);
+
+			rsx_log.trace("Populating Trophy List Overlay with %s %s", data->game_name, data->path);
+
+			std::vector<std::unique_ptr<overlay_element>> entries;
+
+			const int all_trophies = data->trop_usr->GetTrophiesCount();
+			const int unlocked_trophies = data->trop_usr->GetUnlockedTrophiesCount();
+			const int percentage = (all_trophies > 0) ? (100 * unlocked_trophies / all_trophies) : 0;
+
+			std::shared_ptr<rXmlNode> trophy_base = data->trop_config.GetRoot();
+			if (!trophy_base)
+			{
+				rsx_log.error("Populating Trophy List Overlay failed (root is null): %s %s", data->game_name, data->path);
+			}
+
+			const std::string hidden_title = get_localized_string(localized_string_id::HOME_MENU_TROPHY_HIDDEN_TITLE);
+			const std::string hidden_description = get_localized_string(localized_string_id::HOME_MENU_TROPHY_HIDDEN_DESCRIPTION);
+
+			for (std::shared_ptr<rXmlNode> n = trophy_base ? trophy_base->GetChildren() : nullptr; n; n = n->GetNext())
+			{
+				// Only show trophies.
+				if (n->GetName() != "trophy")
+				{
+					continue;
+				}
+
+				// Get data (stolen graciously from sceNpTrophy.cpp)
+				SceNpTrophyDetails details{};
+
+				// Get trophy id
+				const s32 trophy_id = atoi(n->GetAttribute("id").c_str());
+				details.trophyId = trophy_id;
+
+				// Get platinum link id (we assume there only exists one platinum trophy per game for now)
+				const s32 platinum_link_id = atoi(n->GetAttribute("pid").c_str());
+				const bool platinum_relevant = platinum_link_id >= 0;
+
+				// Get trophy type
+				std::string trophy_type;
+
+				switch (n->GetAttribute("ttype")[0])
+				{
+				case 'B': details.trophyGrade = SCE_NP_TROPHY_GRADE_BRONZE;   trophy_type = get_localized_string(localized_string_id::HOME_MENU_TROPHY_GRADE_BRONZE); break;
+				case 'S': details.trophyGrade = SCE_NP_TROPHY_GRADE_SILVER;   trophy_type = get_localized_string(localized_string_id::HOME_MENU_TROPHY_GRADE_SILVER); break;
+				case 'G': details.trophyGrade = SCE_NP_TROPHY_GRADE_GOLD;     trophy_type = get_localized_string(localized_string_id::HOME_MENU_TROPHY_GRADE_GOLD); break;
+				case 'P': details.trophyGrade = SCE_NP_TROPHY_GRADE_PLATINUM; trophy_type = get_localized_string(localized_string_id::HOME_MENU_TROPHY_GRADE_PLATINUM); break;
+				default: rsx_log.warning("Unknown trophy grade %s", n->GetAttribute("ttype")); break;
+				}
+
+				// Get hidden state
+				const bool hidden = n->GetAttribute("hidden")[0] == 'y';
+				details.hidden = hidden;
+
+				// Get name and detail
+				if (hidden)
+				{
+					strcpy_trunc(details.name, hidden_title);
+					strcpy_trunc(details.description, hidden_description);
+				}
+				else
+				{
+					for (std::shared_ptr<rXmlNode> n2 = n->GetChildren(); n2; n2 = n2->GetNext())
+					{
+						const std::string name = n2->GetName();
+						if (name == "name")
+						{
+							strcpy_trunc(details.name, n2->GetNodeContent());
+						}
+						else if (name == "detail")
+						{
+							strcpy_trunc(details.description, n2->GetNodeContent());
+						}
+					}
+				}
+
+				const bool unlocked = data->trop_usr->GetTrophyUnlockState(trophy_id);
+				const auto icon_path_it = data->trophy_image_paths.find(trophy_id);
+
+				std::unique_ptr<overlay_element> entry = std::make_unique<trophy_list_entry>(details.name, details.description, trophy_type, icon_path_it != data->trophy_image_paths.cend() ? icon_path_it->second : "", hidden, !unlocked, platinum_relevant);
+				entries.emplace_back(std::move(entry));
+			}
+
+			for (auto& entry : entries)
+			{
+				m_list->add_entry(entry);
+			}
+
+			if (!m_list->m_items.empty())
+			{
+				m_list->select_entry(0);
+			}
+
+			m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_TROPHY_LIST_TITLE, fmt::format("%d%% (%d/%d)", percentage, unlocked_trophies, all_trophies).c_str()));
+			m_description->auto_resize();
+
+			fade_animation.current = color4f(0.f);
+			fade_animation.end = color4f(1.f);
+			fade_animation.active = true;
+
+			this->on_close = std::move(on_close);
+			visible = true;
+
+			const auto notify = std::make_shared<atomic_t<u32>>(0);
+			auto& overlayman = g_fxo->get<display_manager>();
+
+			overlayman.attach_thread_input(
+				uid, "Trophy list dialog",
+				[notify]() { *notify = true; notify->notify_one(); }
+			);
+
+			while (!Emu.IsStopped() && !*notify)
+			{
+				notify->wait(0, atomic_wait_timeout{1'000'000});
+			}
+		}
+
+		std::unique_ptr<trophy_data> trophy_list_dialog::load_trophies(const std::string& trop_name) const
+		{
+			// Populate GameTrophiesData
+			std::unique_ptr<trophy_data> game_trophy_data = std::make_unique<trophy_data>();
+			game_trophy_data->trop_usr = std::make_unique<TROPUSRLoader>();
+
+			const std::string trophy_path = "/dev_hdd0/home/" + Emu.GetUsr() + "/trophy/" + trop_name;
+			const std::string vfs_path = vfs::get(trophy_path + "/");
+
+			if (vfs_path.empty())
+			{
+				rsx_log.error("Failed to load trophy database for %s. Path empty!", trop_name);
+				return game_trophy_data;
+			}
+
+			game_trophy_data->path = vfs_path;
+			const std::string tropusr_path = trophy_path + "/TROPUSR.DAT";
+			const std::string tropconf_path = trophy_path + "/TROPCONF.SFM";
+			const bool success = game_trophy_data->trop_usr->Load(tropusr_path, tropconf_path).success;
+
+			fs::file config(vfs::get(tropconf_path));
+
+			if (!success || !config)
+			{
+				rsx_log.error("Failed to load trophy database for %s", trop_name);
+				return game_trophy_data;
+			}
+
+			const u32 trophy_count = game_trophy_data->trop_usr->GetTrophiesCount();
+
+			if (trophy_count == 0)
+			{
+				rsx_log.error("Warning game %s in trophy folder %s usr file reports zero trophies. Cannot load in trophy manager.", game_trophy_data->game_name, game_trophy_data->path);
+				return game_trophy_data;
+			}
+
+			for (u32 trophy_id = 0; trophy_id < trophy_count; ++trophy_id)
+			{
+				// A trophy icon has 3 digits from 000 to 999, for example TROP001.PNG
+				game_trophy_data->trophy_image_paths[trophy_id] = fmt::format("%sTROP%03d.PNG", game_trophy_data->path, trophy_id);
+			}
+
+			// Get game name
+			pugi::xml_parse_result res = game_trophy_data->trop_config.Read(config.to_string());
+			if (!res)
+			{
+				rsx_log.error("Failed to read trophy xml: %s", tropconf_path);
+				return game_trophy_data;
+			}
+
+			std::shared_ptr<rXmlNode> trophy_base = game_trophy_data->trop_config.GetRoot();
+			if (!trophy_base)
+			{
+				rsx_log.error("Failed to read trophy xml (root is null): %s", tropconf_path);
+				return game_trophy_data;
+			}
+
+			for (std::shared_ptr<rXmlNode> n = trophy_base->GetChildren(); n; n = n->GetNext())
+			{
+				if (n->GetName() == "title-name")
+				{
+					game_trophy_data->game_name = n->GetNodeContent();
+					break;
+				}
+			}
+
+			config.release();
+
+			return game_trophy_data;
+		}
+	} // namespace overlays
+} // namespace RSX
diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h
new file mode 100644
index 0000000000..4696481747
--- /dev/null
+++ b/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "../overlays.h"
+#include "../overlay_list_view.hpp"
+
+#include "Loader/TROPUSR.h"
+
+class TROPUSRLoader;
+
+namespace rsx
+{
+	namespace overlays
+	{
+		struct trophy_data
+		{
+			std::unique_ptr<TROPUSRLoader> trop_usr;
+			trophy_xml_document trop_config;
+			std::unordered_map<int, std::string> trophy_image_paths;
+			std::string game_name;
+			std::string path;
+		};
+
+		struct trophy_list_dialog : public user_interface
+		{
+		private:
+			struct trophy_list_entry : horizontal_layout
+			{
+			private:
+				std::unique_ptr<image_info> icon_data;
+
+			public:
+				trophy_list_entry(const std::string& name, const std::string& description, const std::string& trophy_type, const std::string& icon_path, bool hidden, bool locked, bool platinum_relevant);
+			};
+
+			std::unique_ptr<trophy_data> load_trophies(const std::string& trop_name) const;
+
+			std::unique_ptr<overlay_element> m_dim_background;
+			std::unique_ptr<list_view> m_list;
+			std::unique_ptr<label> m_description;
+
+			animation_color_interpolate fade_animation;
+
+		public:
+			trophy_list_dialog();
+
+			void update(u64 timestamp_us) override;
+			void on_button_pressed(pad_button button_press, bool is_auto_repeat) override;
+
+			compiled_resource get_compiled() override;
+
+			void show(const std::string& trop_name);
+		};
+	}
+}
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
index 31d2a55295..480967c0c0 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
@@ -53,7 +53,7 @@ namespace rsx
 			return result;
 		}
 
-		image_info::image_info(const char* filename)
+		image_info::image_info(const char* filename, bool grayscaled)
 		{
 			fs::file f(filename, fs::read + fs::isfile);
 
@@ -64,12 +64,12 @@ namespace rsx
 			}
 
 			const std::vector<u8> bytes = f.to_vector<u8>();
-			load_data(bytes);
+			load_data(bytes, grayscaled);
 		}
 
-		image_info::image_info(const std::vector<u8>& bytes)
+		image_info::image_info(const std::vector<u8>& bytes, bool grayscaled)
 		{
-			load_data(bytes);
+			load_data(bytes, grayscaled);
 		}
 
 		image_info::~image_info()
@@ -77,9 +77,30 @@ namespace rsx
 			if (data) stbi_image_free(data);
 		}
 
-		void image_info::load_data(const std::vector<u8>& bytes)
+		void image_info::load_data(const std::vector<u8>& bytes, bool grayscaled)
 		{
-			data = stbi_load_from_memory(bytes.data(), ::narrow<int>(bytes.size()), &w, &h, &bpp, STBI_rgb_alpha);
+			data = stbi_load_from_memory(bytes.data(), ::narrow<int>(bytes.size()), &w, &h, &bpp, grayscaled ? STBI_grey_alpha : STBI_rgb_alpha);
+			channels = grayscaled ? 2 : 4;
+
+			if (data && grayscaled)
+			{
+				data_grey.resize(4 * w * h);
+
+				for (usz i = 0, n = 0; i < data_grey.size(); i += 4, n += 2)
+				{
+					const u8 grey = data[n];
+					const u8 alpha = data[n + 1];
+
+					data_grey[i + 0] = grey;
+					data_grey[i + 1] = grey;
+					data_grey[i + 2] = grey;
+					data_grey[i + 3] = alpha;
+				}
+			}
+			else
+			{
+				data_grey.clear();
+			}
 		}
 
 		resource_config::resource_config()
@@ -114,7 +135,7 @@ namespace rsx
 
 #if !defined(_WIN32) && !defined(__APPLE__) && defined(DATADIR)
 				// Check the DATADIR if defined
-				if (info->data == nullptr)
+				if (info->get_data() == nullptr)
 				{
 					const std::string data_dir (DATADIR);
 					const std::string image_data = data_dir + "/Icons/ui/" + res;
@@ -122,7 +143,7 @@ namespace rsx
 				}
 #endif
 
-				if (info->data == nullptr)
+				if (info->get_data() == nullptr)
 				{
 					// Resource was not found in the DATADIR or config dir, try and grab from relative path (linux)
 					std::string src = "Icons/ui/" + res;
@@ -130,12 +151,12 @@ namespace rsx
 #ifndef _WIN32
 					// Check for Icons in ../share/rpcs3 for AppImages,
 					// in rpcs3.app/Contents/Resources for App Bundles, and /usr/bin.
-					if (info->data == nullptr)
+					if (info->get_data() == nullptr)
 					{
 						char result[ PATH_MAX ];
 #if defined(__APPLE__)
 						u32 bufsize = PATH_MAX;
-						bool success = _NSGetExecutablePath( result, &bufsize ) == 0;
+						const bool success = _NSGetExecutablePath( result, &bufsize ) == 0;
 #elif defined(KERN_PROC_PATHNAME)
 						usz bufsize = PATH_MAX;
 						int mib[] = {
@@ -150,13 +171,13 @@ namespace rsx
 							-1,
 #endif
 						};
-						bool success = sysctl(mib, sizeof(mib)/sizeof(mib[0]), result, &bufsize, NULL, 0) >= 0;
+						const bool success = sysctl(mib, sizeof(mib)/sizeof(mib[0]), result, &bufsize, NULL, 0) >= 0;
 #elif defined(__linux__)
-						bool success = readlink( "/proc/self/exe", result, PATH_MAX ) >= 0;
+						const bool success = readlink( "/proc/self/exe", result, PATH_MAX ) >= 0;
 #elif defined(__sun)
-						bool success = readlink( "/proc/self/path/a.out", result, PATH_MAX ) >= 0;
+						const bool success = readlink( "/proc/self/path/a.out", result, PATH_MAX ) >= 0;
 #else
-						bool success = readlink( "/proc/curproc/file", result, PATH_MAX ) >= 0;
+						const bool success = readlink( "/proc/curproc/file", result, PATH_MAX ) >= 0;
 #endif
 						if (success)
 						{
@@ -168,7 +189,7 @@ namespace rsx
 #endif
 							info = std::make_unique<image_info>(src.c_str());
 							// Check if the icons are in the same directory as the executable (local builds)
-							if (info->data == nullptr)
+							if (info->get_data() == nullptr)
 							{
 								src = executablePath + "/Icons/ui/" + res;
 								info = std::make_unique<image_info>(src.c_str());
@@ -176,7 +197,7 @@ namespace rsx
 						}
 					}
 #endif
-					if (info->data != nullptr)
+					if (info->get_data())
 					{
 						// Install the image to config dir
 						fs::create_path(fs::get_parent_dir(image_path));
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
index 3f824009a8..f6d36ceaad 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
@@ -33,16 +33,21 @@ namespace rsx
 
 		struct image_info
 		{
-			int w = 0, h = 0;
-			int bpp = 0;
+		private:
 			u8* data = nullptr;
+			std::vector<u8> data_grey;
+
+		public:
+			int w = 0, h = 0, channels = 0;
+			int bpp = 0;
 
 			image_info(image_info&) = delete;
-			image_info(const char* filename);
-			image_info(const std::vector<u8>& bytes);
+			image_info(const char* filename, bool grayscaled = false);
+			image_info(const std::vector<u8>& bytes, bool grayscaled = false);
 			~image_info();
 
-			void load_data(const std::vector<u8>& bytes);
+			void load_data(const std::vector<u8>& bytes, bool grayscaled = false);
+			const u8* get_data() const { return channels == 4 ? data : data_grey.empty() ? nullptr : data_grey.data(); }
 		};
 
 		struct resource_config
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
index b5318f4c86..3d8fc99e40 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
@@ -92,7 +92,7 @@ namespace rsx
 
 			update_custom_background();
 
-			if (background_image && background_image->data)
+			if (background_image && background_image->get_data())
 			{
 				result.add(background_poster.get_compiled());
 			}
@@ -359,11 +359,11 @@ namespace rsx
 					if (const auto picture_path = Emu.GetBackgroundPicturePath(); fs::exists(picture_path))
 					{
 						background_image = std::make_unique<image_info>(picture_path.c_str());
-						dirty |= !!background_image->data;
+						dirty |= !!background_image->get_data();
 					}
 				}
 
-				if (dirty && background_image && background_image->data)
+				if (dirty && background_image && background_image->get_data())
 				{
 					const f32 color              = (100 - background_darkening_strength) / 100.f;
 					background_poster.fore_color = color4f(color, color, color, 1.);
diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.cpp b/rpcs3/Emu/RSX/VK/VKOverlays.cpp
index b46b8be4a3..fd7dc1b0cc 100644
--- a/rpcs3/Emu/RSX/VK/VKOverlays.cpp
+++ b/rpcs3/Emu/RSX/VK/VKOverlays.cpp
@@ -435,7 +435,7 @@ namespace vk
 
 		for (const auto &res : configuration.texture_raw_data)
 		{
-			upload_simple_texture(dev, cmd, upload_heap, storage_key++, res->w, res->h, 1, false, false, res->data, -1);
+			upload_simple_texture(dev, cmd, upload_heap, storage_key++, res->w, res->h, 1, false, false, res->get_data(), -1);
 		}
 
 		configuration.free_resources();
@@ -516,7 +516,7 @@ namespace vk
 			return found->second.get();
 
 		return upload_simple_texture(cmd.get_command_pool().get_owner(), cmd, upload_heap, key, desc->w, desc->h, 1,
-				false, true, desc->data, owner_uid);
+				false, true, desc->get_data(), owner_uid);
 	}
 
 	std::vector<VkPushConstantRange> ui_overlay_renderer::get_push_constants()
diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/Emu/localized_string_id.h
index 2e560284d6..21437762bb 100644
--- a/rpcs3/Emu/localized_string_id.h
+++ b/rpcs3/Emu/localized_string_id.h
@@ -271,6 +271,20 @@ enum class localized_string_id
 	HOME_MENU_SAVESTATE_AND_EXIT,
 	HOME_MENU_RELOAD_SAVESTATE,
 	HOME_MENU_RECORDING,
+	HOME_MENU_TROPHIES,
+	HOME_MENU_TROPHY_LIST_TITLE,
+	HOME_MENU_TROPHY_LOCKED_TITLE,
+	HOME_MENU_TROPHY_HIDDEN_TITLE,
+	HOME_MENU_TROPHY_HIDDEN_DESCRIPTION,
+	HOME_MENU_TROPHY_PLATINUM_RELEVANT,
+	HOME_MENU_TROPHY_GRADE_BRONZE,
+	HOME_MENU_TROPHY_GRADE_SILVER,
+	HOME_MENU_TROPHY_GRADE_GOLD,
+	HOME_MENU_TROPHY_GRADE_PLATINUM,
+
+	AUDIO_MUTED,
+	AUDIO_UNMUTED,
+	AUDIO_CHANGED,
 
 	PROGRESS_DIALOG_PROGRESS,
 	PROGRESS_DIALOG_PROGRESS_ANALYZING,
@@ -293,6 +307,7 @@ enum class localized_string_id
 	EMULATION_PAUSED_RESUME_WITH_START,
 	EMULATION_RESUMING,
 	EMULATION_FROZEN,
+
 	SAVESTATE_FAILED_DUE_TO_VDEC,
 	SAVESTATE_FAILED_DUE_TO_SAVEDATA,
 	SAVESTATE_FAILED_DUE_TO_SPU,
diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/Input/sdl_pad_handler.cpp
index 28e10e285d..aaf95331f1 100644
--- a/rpcs3/Input/sdl_pad_handler.cpp
+++ b/rpcs3/Input/sdl_pad_handler.cpp
@@ -4,6 +4,7 @@
 #include "sdl_pad_handler.h"
 #include "Emu/system_utils.hpp"
 #include "Emu/system_config.h"
+#include "Emu/System.h"
 
 #include <mutex>
 
@@ -262,7 +263,14 @@ bool sdl_pad_handler::Init()
 	if (m_is_init)
 		return true;
 
-	if (!sdl_instance::get_instance().initialize())
+	bool instance_success;
+
+	Emu.BlockingCallFromMainThread([&instance_success]()
+	{
+		instance_success = sdl_instance::get_instance().initialize();
+	});
+
+	if (!instance_success)
 		return false;
 
 	if (g_cfg.io.load_sdl_mappings)
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 728fe97bed..3da2dc1872 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -58,6 +58,7 @@
     <ClCompile Include="Crypto\decrypt_binaries.cpp" />
     <ClCompile Include="Crypto\unzip.cpp" />
     <ClCompile Include="Emu\Audio\audio_resampler.cpp" />
+    <ClCompile Include="Emu\Audio\audio_utils.cpp" />
     <ClCompile Include="Emu\Audio\FAudio\FAudioBackend.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -137,6 +138,7 @@
     <ClCompile Include="Emu\RSX\Overlays\overlay_utils.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\Shaders\shader_loading_dialog_native.cpp" />
+    <ClCompile Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Program\ProgramStateCache.cpp" />
     <ClCompile Include="Emu\RSX\Program\program_util.cpp" />
     <ClCompile Include="Emu\RSX\Program\SPIRVCommon.cpp" />
@@ -529,6 +531,7 @@
     <ClInclude Include="Crypto\unzip.h" />
     <ClInclude Include="Emu\Audio\audio_resampler.h" />
     <ClInclude Include="Emu\Audio\audio_device_enumerator.h" />
+    <ClInclude Include="Emu\Audio\audio_utils.h" />
     <ClInclude Include="Emu\Audio\FAudio\FAudioBackend.h">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClInclude>
@@ -664,6 +667,7 @@
     <ClInclude Include="Emu\RSX\Overlays\overlay_manager.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_media_list_dialog.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_progress_bar.hpp" />
+    <ClInclude Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.h" />
     <ClInclude Include="Emu\RSX\Program\GLSLTypes.h" />
     <ClInclude Include="Emu\RSX\Program\ProgramStateCache.h" />
     <ClInclude Include="Emu\RSX\Program\program_util.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 87d65fbb51..90df56b77e 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -127,6 +127,9 @@
     <Filter Include="Emu\GPU\RSX\Utils">
       <UniqueIdentifier>{0e218fca-53a6-4066-a412-4e0659d6ff0b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Emu\GPU\RSX\Overlays\Trophies">
+      <UniqueIdentifier>{caf84300-5c45-4340-bd9a-8ac859409351}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Crypto\aes.cpp">
@@ -1318,6 +1321,12 @@
     <ClCompile Include="Emu\RSX\Core\RSXDrawCommands.cpp">
       <Filter>Emu\GPU\RSX\Core</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.cpp">
+      <Filter>Emu\GPU\RSX\Overlays\Trophies</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Audio\audio_utils.cpp">
+      <Filter>Emu\Audio</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -2668,6 +2677,12 @@
     <ClInclude Include="Emu\RSX\Core\RSXDriverState.h">
       <Filter>Emu\GPU\RSX\Core</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.h">
+      <Filter>Emu\GPU\RSX\Overlays\Trophies</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Audio\audio_utils.h">
+      <Filter>Emu\Audio</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl">
diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp
index 261ed1de99..404fa66eb9 100644
--- a/rpcs3/main.cpp
+++ b/rpcs3/main.cpp
@@ -636,6 +636,7 @@ int main(int argc, char** argv)
 			if (i > 0) utf8_args += " ";
 			utf8_args += '\'' + wchar_to_utf8(arg_list[i]) + '\'';
 		}
+		LocalFree(arg_list);
 		sys_log.notice("argv_utf8: %s", utf8_args);
 	}
 #endif
diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp
index dd94f41857..8af0b84757 100644
--- a/rpcs3/rpcs3qt/gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gs_frame.cpp
@@ -10,6 +10,7 @@
 #include "Emu/system_config.h"
 #include "Emu/system_progress.hpp"
 #include "Emu/IdManager.h"
+#include "Emu/Audio/audio_utils.h"
 #include "Emu/Cell/Modules/cellScreenshot.h"
 #include "Emu/Cell/Modules/cellVideoOut.h"
 #include "Emu/Cell/Modules/cellAudio.h"
@@ -358,6 +359,21 @@ void gs_frame::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKey
 		pad::g_home_menu_requested = true;
 		break;
 	}
+	case gui::shortcuts::shortcut::gw_mute_unmute:
+	{
+		audio::toggle_mute();
+		break;
+	}
+	case gui::shortcuts::shortcut::gw_volume_up:
+	{
+		audio::change_volume(5);
+		break;
+	}
+	case gui::shortcuts::shortcut::gw_volume_down:
+	{
+		audio::change_volume(-5);
+		break;
+	}
 	default:
 	{
 		break;
diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp
index fd5a50e326..0a3ff110ce 100644
--- a/rpcs3/rpcs3qt/gui_application.cpp
+++ b/rpcs3/rpcs3qt/gui_application.cpp
@@ -18,6 +18,7 @@
 #include "_discord_utils.h"
 #endif
 
+#include "Emu/Audio/audio_utils.h"
 #include "Emu/Io/Null/null_camera_handler.h"
 #include "Emu/Io/Null/null_music_handler.h"
 #include "Emu/vfs_config.h"
@@ -621,7 +622,7 @@ void gui_application::InitializeCallbacks()
 				// Create a new sound effect. Re-using the same object seems to be broken for some users starting with Qt 6.6.3.
 				std::unique_ptr<QSoundEffect> sound_effect = std::make_unique<QSoundEffect>();
 				sound_effect->setSource(QUrl::fromLocalFile(QString::fromStdString(path)));
-				sound_effect->setVolume(g_cfg.audio.volume * 0.01f);
+				sound_effect->setVolume(audio::get_volume());
 				sound_effect->play();
 
 				m_sound_effects.push_back(std::move(sound_effect));
diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3qt/localized_emu.h
index 9dbc9ee3f3..8ea21f6d03 100644
--- a/rpcs3/rpcs3qt/localized_emu.h
+++ b/rpcs3/rpcs3qt/localized_emu.h
@@ -292,6 +292,19 @@ private:
 		case localized_string_id::HOME_MENU_SAVESTATE_AND_EXIT: return tr("Save Emulation State And Exit");
 		case localized_string_id::HOME_MENU_RELOAD_SAVESTATE: return tr("Reload Last Emulation State");
 		case localized_string_id::HOME_MENU_RECORDING: return tr("Start/Stop Recording");
+		case localized_string_id::HOME_MENU_TROPHIES: return tr("Trophies");
+		case localized_string_id::HOME_MENU_TROPHY_LIST_TITLE: return tr("Trophy Progress: %0").arg(std::forward<Args>(args)...);
+		case localized_string_id::HOME_MENU_TROPHY_LOCKED_TITLE: return tr("Locked trophy: %0").arg(std::forward<Args>(args)...);
+		case localized_string_id::HOME_MENU_TROPHY_HIDDEN_TITLE: return tr("Hidden trophy");
+		case localized_string_id::HOME_MENU_TROPHY_HIDDEN_DESCRIPTION: return tr("This trophy is hidden");
+		case localized_string_id::HOME_MENU_TROPHY_PLATINUM_RELEVANT: return tr("Platinum relevant");
+		case localized_string_id::HOME_MENU_TROPHY_GRADE_BRONZE: return tr("Bronze", "Trophy type");
+		case localized_string_id::HOME_MENU_TROPHY_GRADE_SILVER: return tr("Silver", "Trophy type");
+		case localized_string_id::HOME_MENU_TROPHY_GRADE_GOLD: return tr("Gold", "Trophy type");
+		case localized_string_id::HOME_MENU_TROPHY_GRADE_PLATINUM: return tr("Platinum", "Trophy type");
+		case localized_string_id::AUDIO_MUTED: return tr("Audio muted", "Audio");
+		case localized_string_id::AUDIO_UNMUTED: return tr("Audio unmuted", "Audio");
+		case localized_string_id::AUDIO_CHANGED: return tr("Volume changed to %0", "Audio").arg(std::forward<Args>(args)...);
 		case localized_string_id::PROGRESS_DIALOG_PROGRESS: return tr("Progress:");
 		case localized_string_id::PROGRESS_DIALOG_PROGRESS_ANALYZING: return tr("Progress: analyzing...");
 		case localized_string_id::PROGRESS_DIALOG_REMAINING: return tr("remaining");
diff --git a/rpcs3/rpcs3qt/shortcut_handler.cpp b/rpcs3/rpcs3qt/shortcut_handler.cpp
index a6b9bf8413..9d70aa0262 100644
--- a/rpcs3/rpcs3qt/shortcut_handler.cpp
+++ b/rpcs3/rpcs3qt/shortcut_handler.cpp
@@ -20,7 +20,7 @@ shortcut_handler::shortcut_handler(gui::shortcuts::shortcut_handler_id handler_i
 
 		const QKeySequence key_sequence = sc_settings.get_key_sequence(info, gui_settings);
 		QShortcut* shortcut = new QShortcut(key_sequence, parent);
-		shortcut->setAutoRepeat(false);
+		shortcut->setAutoRepeat(info.allow_auto_repeat);
 
 		shortcut_key_info key_info{};
 		key_info.shortcut = shortcut;
diff --git a/rpcs3/rpcs3qt/shortcut_settings.cpp b/rpcs3/rpcs3qt/shortcut_settings.cpp
index d8f376cfeb..bca0fd57a9 100644
--- a/rpcs3/rpcs3qt/shortcut_settings.cpp
+++ b/rpcs3/rpcs3qt/shortcut_settings.cpp
@@ -29,6 +29,9 @@ void fmt_class_string<shortcut>::format(std::string& out, u64 arg)
 		case shortcut::gw_frame_limit: return "gw_frame_limit";
 		case shortcut::gw_toggle_mouse_and_keyboard: return "gw_toggle_mouse_and_keyboard";
 		case shortcut::gw_home_menu: return "gw_home_menu";
+		case shortcut::gw_mute_unmute: return "gw_mute_unmute";
+		case shortcut::gw_volume_up: return "gw_volume_up";
+		case shortcut::gw_volume_down: return "gw_volume_down";
 		case shortcut::count: return "count";
 		}
 
@@ -53,26 +56,29 @@ void fmt_class_string<shortcut_handler_id>::format(std::string& out, u64 arg)
 
 shortcut_settings::shortcut_settings()
 	: shortcut_map({
-		{ shortcut::mw_start, shortcut_info{ "main_window_start", tr("Start"), "Ctrl+E", shortcut_handler_id::main_window } },
-		{ shortcut::mw_stop, shortcut_info{ "main_window_stop", tr("Stop"), "Ctrl+S", shortcut_handler_id::main_window } },
-		{ shortcut::mw_pause, shortcut_info{ "main_window_pause", tr("Pause"), "Ctrl+P", shortcut_handler_id::main_window } },
-		{ shortcut::mw_restart, shortcut_info{ "main_window_restart", tr("Restart"), "Ctrl+R", shortcut_handler_id::main_window } },
-		{ shortcut::mw_toggle_fullscreen, shortcut_info{ "main_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::main_window } },
-		{ shortcut::mw_exit_fullscreen, shortcut_info{ "main_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::main_window } },
-		{ shortcut::mw_refresh, shortcut_info{ "main_window_refresh", tr("Refresh"), "Ctrl+F5", shortcut_handler_id::main_window } },
-		{ shortcut::gw_toggle_fullscreen, shortcut_info{ "game_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::game_window } },
-		{ shortcut::gw_exit_fullscreen, shortcut_info{ "game_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::game_window } },
-		{ shortcut::gw_log_mark, shortcut_info{ "game_window_log_mark", tr("Add Log Mark"), "Alt+L", shortcut_handler_id::game_window } },
-		{ shortcut::gw_mouse_lock, shortcut_info{ "game_window_mouse_lock", tr("Mouse lock"), "Ctrl+L", shortcut_handler_id::game_window } },
-		{ shortcut::gw_toggle_recording, shortcut_info{ "game_window_toggle_recording", tr("Start/Stop Recording"), "F11", shortcut_handler_id::game_window } },
-		{ shortcut::gw_screenshot, shortcut_info{ "game_window_screenshot", tr("Screenshot"), "F12", shortcut_handler_id::game_window } },
-		{ shortcut::gw_pause_play, shortcut_info{ "game_window_pause_play", tr("Pause/Play"), "Ctrl+P", shortcut_handler_id::game_window } },
-		{ shortcut::gw_savestate, shortcut_info{ "game_window_savestate", tr("Savestate"), "Ctrl+S", shortcut_handler_id::game_window } },
-		{ shortcut::gw_restart, shortcut_info{ "game_window_restart", tr("Restart"), "Ctrl+R", shortcut_handler_id::game_window } },
-		{ shortcut::gw_rsx_capture, shortcut_info{ "game_window_rsx_capture", tr("RSX Capture"), "Alt+C", shortcut_handler_id::game_window } },
-		{ shortcut::gw_frame_limit, shortcut_info{ "game_window_frame_limit", tr("Toggle Framelimit"), "Ctrl+F10", shortcut_handler_id::game_window } },
-		{ shortcut::gw_toggle_mouse_and_keyboard, shortcut_info{ "game_window_toggle_mouse_and_keyboard", tr("Toggle Keyboard"), "Ctrl+F11", shortcut_handler_id::game_window } },
-		{ shortcut::gw_home_menu, shortcut_info{ "gw_home_menu", tr("Open Home Menu"), "Shift+F10", shortcut_handler_id::game_window } },
+		{ shortcut::mw_start, shortcut_info{ "main_window_start", tr("Start"), "Ctrl+E", shortcut_handler_id::main_window, false } },
+		{ shortcut::mw_stop, shortcut_info{ "main_window_stop", tr("Stop"), "Ctrl+S", shortcut_handler_id::main_window, false } },
+		{ shortcut::mw_pause, shortcut_info{ "main_window_pause", tr("Pause"), "Ctrl+P", shortcut_handler_id::main_window, false } },
+		{ shortcut::mw_restart, shortcut_info{ "main_window_restart", tr("Restart"), "Ctrl+R", shortcut_handler_id::main_window, false } },
+		{ shortcut::mw_toggle_fullscreen, shortcut_info{ "main_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::main_window, false } },
+		{ shortcut::mw_exit_fullscreen, shortcut_info{ "main_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::main_window, false } },
+		{ shortcut::mw_refresh, shortcut_info{ "main_window_refresh", tr("Refresh"), "Ctrl+F5", shortcut_handler_id::main_window, false } },
+		{ shortcut::gw_toggle_fullscreen, shortcut_info{ "game_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_exit_fullscreen, shortcut_info{ "game_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_log_mark, shortcut_info{ "game_window_log_mark", tr("Add Log Mark"), "Alt+L", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_mouse_lock, shortcut_info{ "game_window_mouse_lock", tr("Mouse lock"), "Ctrl+L", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_toggle_recording, shortcut_info{ "game_window_toggle_recording", tr("Start/Stop Recording"), "F11", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_screenshot, shortcut_info{ "game_window_screenshot", tr("Screenshot"), "F12", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_pause_play, shortcut_info{ "game_window_pause_play", tr("Pause/Play"), "Ctrl+P", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_savestate, shortcut_info{ "game_window_savestate", tr("Savestate"), "Ctrl+S", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_restart, shortcut_info{ "game_window_restart", tr("Restart"), "Ctrl+R", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_rsx_capture, shortcut_info{ "game_window_rsx_capture", tr("RSX Capture"), "Alt+C", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_frame_limit, shortcut_info{ "game_window_frame_limit", tr("Toggle Framelimit"), "Ctrl+F10", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_toggle_mouse_and_keyboard, shortcut_info{ "game_window_toggle_mouse_and_keyboard", tr("Toggle Keyboard"), "Ctrl+F11", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_home_menu, shortcut_info{ "gw_home_menu", tr("Open Home Menu"), "Shift+F10", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_mute_unmute, shortcut_info{ "gw_mute_unmute", tr("Mute/Unmute Audio"), "Shift+M", shortcut_handler_id::game_window, false } },
+		{ shortcut::gw_volume_up, shortcut_info{ "gw_volume_up", tr("Volume Up"), "Shift++", shortcut_handler_id::game_window, true } },
+		{ shortcut::gw_volume_down, shortcut_info{ "gw_volume_down", tr("Volume Down"), "Shift+-", shortcut_handler_id::game_window, true } },
 	})
 {
 }
diff --git a/rpcs3/rpcs3qt/shortcut_settings.h b/rpcs3/rpcs3qt/shortcut_settings.h
index c47f8ff3a9..4e119c4f21 100644
--- a/rpcs3/rpcs3qt/shortcut_settings.h
+++ b/rpcs3/rpcs3qt/shortcut_settings.h
@@ -37,6 +37,9 @@ namespace gui
 			gw_frame_limit,
 			gw_toggle_mouse_and_keyboard,
 			gw_home_menu,
+			gw_mute_unmute,
+			gw_volume_up,
+			gw_volume_down,
 
 			count
 		};
@@ -49,6 +52,7 @@ struct shortcut_info
 	QString localized_name;
 	QString key_sequence;
 	gui::shortcuts::shortcut_handler_id handler_id{};
+	bool allow_auto_repeat = false;
 };
 
 class shortcut_settings : public QObject
diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
index 981a7a3408..72a1e2d42c 100644
--- a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
+++ b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp
@@ -420,7 +420,7 @@ bool trophy_manager_dialog::LoadTrophyFolderToDB(const std::string& trop_name)
 	std::unique_ptr<GameTrophiesData> game_trophy_data = std::make_unique<GameTrophiesData>();
 
 	game_trophy_data->path = vfs_path;
-	game_trophy_data->trop_usr.reset(new TROPUSRLoader());
+	game_trophy_data->trop_usr = std::make_unique<TROPUSRLoader>();
 	const std::string tropusr_path = trophy_path + "/TROPUSR.DAT";
 	const std::string tropconf_path = trophy_path + "/TROPCONF.SFM";
 	const bool success = game_trophy_data->trop_usr->Load(tropusr_path, tropconf_path).success;
@@ -1114,7 +1114,7 @@ void trophy_manager_dialog::PopulateTrophyTable()
 
 	const int all_trophies = data->trop_usr->GetTrophiesCount();
 	const int unlocked_trophies = data->trop_usr->GetUnlockedTrophiesCount();
-	const int percentage = 100 * unlocked_trophies / all_trophies;
+	const int percentage = (all_trophies > 0) ? (100 * unlocked_trophies / all_trophies) : 0;
 
 	m_game_progress->setText(tr("Progress: %1% (%2/%3)").arg(percentage).arg(unlocked_trophies).arg(all_trophies));
 
@@ -1172,11 +1172,12 @@ void trophy_manager_dialog::PopulateTrophyTable()
 		// Get name and detail
 		for (std::shared_ptr<rXmlNode> n2 = n->GetChildren(); n2; n2 = n2->GetNext())
 		{
-			if (n2->GetName() == "name")
+			const std::string name = n2->GetName();
+			if (name == "name")
 			{
 				strcpy_trunc(details.name, n2->GetNodeContent());
 			}
-			if (n2->GetName() == "detail")
+			else if (name == "detail")
 			{
 				strcpy_trunc(details.description, n2->GetNodeContent());
 			}