From 64c8eead3c796a567507b8aeb2924f43f1f63ea5 Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Thu, 14 May 2026 15:12:23 +0200
Subject: [PATCH 01/11] Add New Menu and Strings

---
 bin/Icons/ui/home/256/usb-solid.png              | Bin 0 -> 4441 bytes
 bin/Icons/ui/home/32/usb-solid.png               | Bin 0 -> 509 bytes
 .../RSX/Overlays/HomeMenu/overlay_home_icons.cpp |   2 ++
 .../RSX/Overlays/HomeMenu/overlay_home_icons.h   |   1 +
 .../HomeMenu/overlay_home_menu_settings.cpp      |   8 ++++++++
 .../HomeMenu/overlay_home_menu_settings.h        |   5 +++++
 rpcs3/Emu/localized_string_id.h                  |   1 +
 rpcs3/rpcs3qt/localized_emu.h                    |   1 +
 8 files changed, 18 insertions(+)
 create mode 100644 bin/Icons/ui/home/256/usb-solid.png
 create mode 100644 bin/Icons/ui/home/32/usb-solid.png

diff --git a/bin/Icons/ui/home/256/usb-solid.png b/bin/Icons/ui/home/256/usb-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..0409972e1353efca4b430de423f95aabba82e7e8
GIT binary patch
literal 4441
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
B7A^n)

literal 0
HcmV?d00001

diff --git a/bin/Icons/ui/home/32/usb-solid.png b/bin/Icons/ui/home/32/usb-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f2c83225199a557056f651f49fb54774d6f66f
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SuSrBfR9J<@mOX1!K@^6cbCJcL;15XQ4+xe@6hssf5KD`+b`};I
z7QxEON>T(9La-GSti;Az1RE7%L`)k$QW(M_A&<olaoJ?uxp(&Ch08F9x$iu8KF&Q*
zAoZ#`U*b_Rc}v|?x75}&0B-wFcbfW~DquJO-U1cyr@*JV)Ma(0#G@J&OjDI?!7-_e
zz^$IprHI&@7yxhvIM>r3y27L0f`cLbu>*VqJ^&ryO%6cT7NkUT8Tc9zp9YPKh-YdC
zSdNIf9Piu}cn-V--m9~j?_?<#;9_c9!1*C#PXqg-23Sq)4)9{oAQfN%c$W*1Ep=PH
z-WNN{gevMI^}9Ng>su!e49xdx1w00B&`myH#s$znzDmy;a0QtA-z_Nx_(3<*_3I|^
z3%C#wpX*FsOX{M!+j|Ywl@vQWwu$>79`-`0Pt>O+p0$2P5phpF1YWDx=<a`~1fY@B
zw)$KBSXz*jKrE$ta5?}9;?=ZEvh0L2E`aGst<(qV&vY&Cr*u3qfV&=7dy)W~Cje|U
z@fzi_9ZnKp{e;*?L$CTuhp?TBl<jmN8-2`QIE*Ew?w`Ut00000NkvXXu0mjf{wUXX

literal 0
HcmV?d00001

diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp
index 4ef9dbea9a..1a734bd974 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp
@@ -51,6 +51,8 @@ namespace rsx::overlays::home_menu
 			return "sliders-solid.png";
 		case fa_icon::settings_gauge:
 			return "gauge-solid.png";
+		case fa_icon::usb:
+			return "usb-solid.png";
 		case fa_icon::bug:
 			return "bug-solid.png";
 		}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h
index 4b05b852e1..8e1717ca21 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h
@@ -25,6 +25,7 @@ namespace rsx::overlays::home_menu
 		gamepad,
 		settings_sliders,
 		settings_gauge,
+		usb,
 		bug,
 	};
 
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
index d8e60b7592..f6082a4206 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
@@ -19,6 +19,7 @@ namespace rsx
 			add_page(home_menu::fa_icon::settings, std::make_shared<home_menu_settings_advanced>(x, y, width, height, use_separators, nullptr));
 			add_page(home_menu::fa_icon::settings_sliders, std::make_shared<home_menu_settings_overlays>(x, y, width, height, use_separators, nullptr));
 			add_page(home_menu::fa_icon::settings_gauge, std::make_shared<home_menu_settings_performance_overlay>(x, y, width, height, use_separators, nullptr));
+			add_page(home_menu::fa_icon::usb, std::make_shared<home_menu_settings_usb_devices>(x, y, width, height, use_separators, nullptr));
 			add_page(home_menu::fa_icon::bug, std::make_shared<home_menu_settings_debug>(x, y, width, height, use_separators, nullptr));
 
 			// Select the first item
@@ -263,6 +264,13 @@ namespace rsx
 			apply_layout();
 		}
 
+		home_menu_settings_usb_devices::home_menu_settings_usb_devices(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
+			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_USB_DEVICES))
+		{
+
+			apply_layout();
+		}
+
 		home_menu_settings_debug::home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
 			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_DEBUG))
 		{
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h
index ba8b730d44..15a2ba969e 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h
@@ -344,6 +344,11 @@ namespace rsx
 			home_menu_settings_performance_overlay(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
 		};
 
+		struct home_menu_settings_usb_devices : public home_menu_settings_page
+		{
+			home_menu_settings_usb_devices(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
+		};
+
 		struct home_menu_settings_debug : public home_menu_settings_page
 		{
 			home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/Emu/localized_string_id.h
index c411f6e480..791c00afef 100644
--- a/rpcs3/Emu/localized_string_id.h
+++ b/rpcs3/Emu/localized_string_id.h
@@ -275,6 +275,7 @@ enum class localized_string_id
 	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE,
 	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY,
 	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_USE_WINDOW_SPACE,
+	HOME_MENU_SETTINGS_USB_DEVICES,
 	HOME_MENU_SETTINGS_DEBUG,
 	HOME_MENU_SETTINGS_DEBUG_OVERLAY,
 	HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY,
diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3qt/localized_emu.h
index ba4960aa73..3482d7b812 100644
--- a/rpcs3/rpcs3qt/localized_emu.h
+++ b/rpcs3/rpcs3qt/localized_emu.h
@@ -295,6 +295,7 @@ private:
 		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE: return tr("Font Size", "Performance Overlay");
 		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY: return tr("Opacity", "Performance Overlay");
 		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_USE_WINDOW_SPACE: return tr("Use Window Space", "Performance Overlay");
+		case localized_string_id::HOME_MENU_SETTINGS_USB_DEVICES: return tr("USB Devices");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG: return tr("Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY: return tr("Debug Overlay", "Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY: return tr("Input Debug Overlay", "Debug");

From 1d2561e97e5861f7fd2a39aa946aa1512d97dedc Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Sun, 17 May 2026 13:42:47 +0200
Subject: [PATCH 02/11] Start Skylander Overlay

---
 rpcs3/Emu/CMakeLists.txt                      |   1 +
 .../HomeMenu/overlay_home_menu_main_menu.cpp  |  16 ++
 .../HomeMenu/overlay_home_menu_settings.cpp   |   8 -
 .../HomeMenu/overlay_home_menu_settings.h     |   5 -
 .../USBDevices/overlay_skylander_dialog.cpp   | 142 ++++++++++++++++++
 .../USBDevices/overlay_skylander_dialog.h     |  35 +++++
 rpcs3/emucore.vcxproj                         |   2 +
 rpcs3/emucore.vcxproj.filters                 |   6 +
 8 files changed, 202 insertions(+), 13 deletions(-)
 create mode 100644 rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
 create mode 100644 rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h

diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt
index 045fa30769..6d1c5b954f 100644
--- a/rpcs3/Emu/CMakeLists.txt
+++ b/rpcs3/Emu/CMakeLists.txt
@@ -510,6 +510,7 @@ target_sources(rpcs3_emu PRIVATE
     RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
     RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
     RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
+    RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
     RSX/Overlays/overlays.cpp
     RSX/Overlays/overlay_animated_icon.cpp
     RSX/Overlays/overlay_animation.cpp
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 8f27e4172d..1e2f3909f8 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
@@ -5,6 +5,7 @@
 #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/USBDevices/overlay_skylander_dialog.h"
 #include "Emu/RSX/Overlays/overlay_manager.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
@@ -96,6 +97,21 @@ namespace rsx
 				});
 			}
 
+			add_item(home_menu::fa_icon::usb, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_USB_DEVICES), [](pad_button btn) -> page_navigation
+			{
+				if (btn != pad_button::cross) return page_navigation::stay;
+
+				rsx_log.notice("User selected devices in home menu");
+				Emu.CallFromMainThread([]()
+				{
+					if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+					{
+						manager->create<rsx::overlays::skylander_dialog>()->show();
+					}
+				});
+				return page_navigation::stay;
+			});
+
 			add_item(home_menu::fa_icon::screenshot, get_localized_string(localized_string_id::HOME_MENU_SCREENSHOT), [](pad_button btn) -> page_navigation
 			{
 				if (btn != pad_button::cross) return page_navigation::stay;
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
index f6082a4206..d8e60b7592 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
@@ -19,7 +19,6 @@ namespace rsx
 			add_page(home_menu::fa_icon::settings, std::make_shared<home_menu_settings_advanced>(x, y, width, height, use_separators, nullptr));
 			add_page(home_menu::fa_icon::settings_sliders, std::make_shared<home_menu_settings_overlays>(x, y, width, height, use_separators, nullptr));
 			add_page(home_menu::fa_icon::settings_gauge, std::make_shared<home_menu_settings_performance_overlay>(x, y, width, height, use_separators, nullptr));
-			add_page(home_menu::fa_icon::usb, std::make_shared<home_menu_settings_usb_devices>(x, y, width, height, use_separators, nullptr));
 			add_page(home_menu::fa_icon::bug, std::make_shared<home_menu_settings_debug>(x, y, width, height, use_separators, nullptr));
 
 			// Select the first item
@@ -264,13 +263,6 @@ namespace rsx
 			apply_layout();
 		}
 
-		home_menu_settings_usb_devices::home_menu_settings_usb_devices(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
-			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_USB_DEVICES))
-		{
-
-			apply_layout();
-		}
-
 		home_menu_settings_debug::home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent)
 			: home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_DEBUG))
 		{
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h
index 15a2ba969e..ba8b730d44 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h
@@ -344,11 +344,6 @@ namespace rsx
 			home_menu_settings_performance_overlay(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
 		};
 
-		struct home_menu_settings_usb_devices : public home_menu_settings_page
-		{
-			home_menu_settings_usb_devices(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
-		};
-
 		struct home_menu_settings_debug : public home_menu_settings_page
 		{
 			home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent);
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
new file mode 100644
index 0000000000..fb239cf022
--- /dev/null
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -0,0 +1,142 @@
+#include "stdafx.h"
+#include "../overlay_manager.h"
+#include "overlay_skylander_dialog.h"
+#include "Emu/System.h"
+#include "Emu/VFS.h"
+
+namespace rsx
+{
+	namespace overlays
+	{
+		static constexpr u16 trophy_list_y = 85;
+		static constexpr u16 trophy_list_h = 540;
+
+		skylander_dialog::skylander_dialog()
+		{
+			m_allow_input_on_pause = true;
+
+			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_description = std::make_unique<label>();
+			m_description->set_font("Arial", 20);
+			m_description->set_pos(20, 37);
+			m_description->set_text("Emulated Skylander Portal");
+			m_description->auto_resize();
+			m_description->back_color.a = 0.f;
+
+			m_show_hidden_trophies_button = std::make_unique<image_button>();
+			m_show_hidden_trophies_button->set_text(m_show_hidden_trophies ? localized_string_id::HOME_MENU_TROPHY_HIDE_HIDDEN_TROPHIES : localized_string_id::HOME_MENU_TROPHY_SHOW_HIDDEN_TROPHIES);
+			m_show_hidden_trophies_button->set_image_resource(resource_config::standard_image_resource::square);
+			m_show_hidden_trophies_button->set_size(120, 30);
+			m_show_hidden_trophies_button->set_pos(180, trophy_list_y + trophy_list_h + 20);
+			m_show_hidden_trophies_button->set_font("Arial", 16);
+
+			fade_animation.duration_sec = 0.15f;
+
+			return_code = selection_code::canceled;
+		}
+
+		void skylander_dialog::update(u64 timestamp_us)
+		{
+			if (fade_animation.active)
+			{
+				fade_animation.update(timestamp_us);
+			}
+		}
+
+		void skylander_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:
+				play_sound(sound_effect::cancel);
+				close_dialog = true;
+				break;
+			case pad_button::square:
+				break;
+			case pad_button::dpad_up:
+			case pad_button::ls_up:
+				break;
+			case pad_button::dpad_down:
+			case pad_button::ls_down:
+				break;
+			case pad_button::L1:
+				break;
+			case pad_button::R1:
+				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)
+			{
+				play_sound(sound_effect::cursor);
+			}
+		}
+
+		compiled_resource skylander_dialog::get_compiled()
+		{
+			if (!visible)
+			{
+				return {};
+			}
+
+			compiled_resource result;
+			result.add(m_dim_background->get_compiled());
+
+			result.add(m_description->get_compiled());
+			result.add(m_show_hidden_trophies_button->get_compiled());
+
+			fade_animation.apply(result);
+
+			return result;
+		}
+
+		void skylander_dialog::show()
+		{
+			visible = false;
+
+			fade_animation.current = color4f(0.f);
+			fade_animation.end = color4f(1.f);
+			fade_animation.active = true;
+
+			visible = true;
+
+			const auto notify = std::make_shared<atomic_t<u32>>(0);
+			auto& overlayman = g_fxo->get<display_manager>();
+
+			overlayman.attach_thread_input(
+				uid, "Skylander dialog",
+				[notify]()
+				{
+					*notify = true;
+					notify->notify_one();
+				});
+
+			while (!Emu.IsStopped() && !*notify)
+			{
+				notify->wait(0, atomic_wait_timeout{1'000'000});
+			}
+		}
+	} // namespace overlays
+} // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
new file mode 100644
index 0000000000..6b7a6b4b48
--- /dev/null
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "../overlays.h"
+#include "../overlay_list_view.hpp"
+
+namespace rsx
+{
+	namespace overlays
+	{
+		struct skylander_dialog : public user_interface
+		{
+		private:
+			std::unique_ptr<overlay_element> m_dim_background;
+			std::unique_ptr<list_view> m_list;
+			std::unique_ptr<label> m_description;
+			std::unique_ptr<image_button> m_show_hidden_trophies_button;
+
+			animation_color_interpolate fade_animation;
+
+			atomic_t<bool> m_list_dirty{true};
+			bool m_show_hidden_trophies = false;
+			bool m_show_hidden_trophies_last = false;
+
+		public:
+			skylander_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();
+		};
+	} // namespace overlays
+} // namespace rsx
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 770028936f..e05bcf8b63 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -167,6 +167,7 @@
     <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\Overlays\USBDevices\overlay_skylander_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Program\Assembler\FPASM.cpp" />
     <ClCompile Include="Emu\RSX\Program\Assembler\FPOpcodes.cpp" />
     <ClCompile Include="Emu\RSX\Program\Assembler\FPToCFG.cpp" />
@@ -743,6 +744,7 @@
     <ClInclude Include="Emu\RSX\Overlays\overlay_tabs.h" />
     <ClInclude Include="Emu\RSX\Overlays\overlay_video.h" />
     <ClInclude Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.h" />
+    <ClInclude Include="Emu\RSX\Overlays\USBDevices\overlay_skylander_dialog.h" />
     <ClInclude Include="Emu\RSX\Program\Assembler\CFG.h" />
     <ClInclude Include="Emu\RSX\Program\Assembler\FPASM.h" />
     <ClInclude Include="Emu\RSX\Program\Assembler\FPOpcodes.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 7280166c33..25a02be493 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1360,6 +1360,9 @@
     <ClCompile Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.cpp">
       <Filter>Emu\GPU\RSX\Overlays\Trophies</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\Overlays\USBDevices\overlay_skylander_dialog.cpp">
+      <Filter>Emu\GPU\RSX\Overlays\USBDevices</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\Audio\audio_utils.cpp">
       <Filter>Emu\Audio</Filter>
     </ClCompile>
@@ -2833,6 +2836,9 @@
     <ClInclude Include="Emu\RSX\Overlays\Trophies\overlay_trophy_list_dialog.h">
       <Filter>Emu\GPU\RSX\Overlays\Trophies</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\Overlays\USBDevices\overlay_skylander_dialog.h">
+      <Filter>Emu\GPU\RSX\Overlays\USBDevices</Filter>
+    </ClInclude>
     <ClInclude Include="Emu\Audio\audio_utils.h">
       <Filter>Emu\Audio</Filter>
     </ClInclude>

From 664cbbddab396e92b1e7446e886d609b3045c280 Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Sun, 17 May 2026 23:37:19 +0200
Subject: [PATCH 03/11] Dialog List Displaying

---
 .../USBDevices/overlay_skylander_dialog.cpp   | 122 +++++++++++++++---
 .../USBDevices/overlay_skylander_dialog.h     |   5 +-
 2 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index fb239cf022..affcd28d5a 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -8,8 +8,61 @@ namespace rsx
 {
 	namespace overlays
 	{
-		static constexpr u16 trophy_list_y = 85;
-		static constexpr u16 trophy_list_h = 540;
+		static constexpr u16 sky_list_y = 85;
+		static constexpr u16 sky_list_h = 540;
+
+		struct skylander_list_entry : horizontal_layout
+		{
+		private:
+			std::string name;
+
+		public:
+			skylander_list_entry();
+		};
+
+		skylander_list_entry::skylander_list_entry()
+		{
+			std::unique_ptr<overlay_element> label_text = std::make_unique<label>("None");
+			std::unique_ptr<overlay_element> label_load = std::make_unique<label>("Load");
+			std::unique_ptr<overlay_element> load_image = std::make_unique<image_view>(30, 30);
+			std::unique_ptr<overlay_element> label_clear = std::make_unique<label>("Clear");
+			std::unique_ptr<overlay_element> clear_image = std::make_unique<image_view>(30, 30);
+			std::unique_ptr<overlay_element> label_create = std::make_unique<label>("Create");
+			std::unique_ptr<overlay_element> create_image = std::make_unique<image_view>(30, 30);
+
+			label_text->set_size(130, 30);
+			label_text->set_font("Arial", 16);
+			label_text->set_wrap_text(true);
+			label_text->back_color.a = 0.f;
+
+			label_load->set_size(100, 30);
+			label_load->set_font("Arial", 16);
+			label_load->set_wrap_text(true);
+			label_load->back_color.a = 0.f;
+
+			label_clear->set_size(100, 30);
+			label_clear->set_font("Arial", 16);
+			label_clear->set_wrap_text(true);
+			label_clear->back_color.a = 0.f;
+
+			label_create->set_size(100, 30);
+			label_create->set_font("Arial", 16);
+			label_create->set_wrap_text(true);
+			label_create->back_color.a = 0.f;
+
+			static_cast<image_view*>(load_image.get())->set_image_resource(resource_config::standard_image_resource::cross);
+			static_cast<image_view*>(clear_image.get())->set_image_resource(resource_config::standard_image_resource::square);
+			static_cast<image_view*>(create_image.get())->set_image_resource(resource_config::standard_image_resource::triangle);
+
+			this->pack_padding = 15;
+			add_element(label_text);
+			add_element(load_image);
+			add_element(label_load);
+			add_element(clear_image);
+			add_element(label_clear);
+			add_element(create_image);
+			add_element(label_create);
+		}
 
 		skylander_dialog::skylander_dialog()
 		{
@@ -26,13 +79,6 @@ namespace rsx
 			m_description->auto_resize();
 			m_description->back_color.a = 0.f;
 
-			m_show_hidden_trophies_button = std::make_unique<image_button>();
-			m_show_hidden_trophies_button->set_text(m_show_hidden_trophies ? localized_string_id::HOME_MENU_TROPHY_HIDE_HIDDEN_TROPHIES : localized_string_id::HOME_MENU_TROPHY_SHOW_HIDDEN_TROPHIES);
-			m_show_hidden_trophies_button->set_image_resource(resource_config::standard_image_resource::square);
-			m_show_hidden_trophies_button->set_size(120, 30);
-			m_show_hidden_trophies_button->set_pos(180, trophy_list_y + trophy_list_h + 20);
-			m_show_hidden_trophies_button->set_font("Arial", 16);
-
 			fade_animation.duration_sec = 0.15f;
 
 			return_code = selection_code::canceled;
@@ -59,17 +105,22 @@ namespace rsx
 				play_sound(sound_effect::cancel);
 				close_dialog = true;
 				break;
+			case pad_button::cross:
+				// load
+				break;
 			case pad_button::square:
+				// clear
+				break;
+			case pad_button::triangle:
+				// create
 				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:
-				break;
-			case pad_button::L1:
-				break;
-			case pad_button::R1:
+				m_list->select_next();
 				break;
 			default:
 				rsx_log.trace("[ui] Button %d pressed", static_cast<u8>(button_press));
@@ -103,9 +154,15 @@ namespace rsx
 
 			compiled_resource result;
 			result.add(m_dim_background->get_compiled());
-
+			if (m_list_dirty.exchange(false))
+			{
+				reload();
+			}
+			if (m_list)
+			{
+				result.add(m_list->get_compiled());
+			}
 			result.add(m_description->get_compiled());
-			result.add(m_show_hidden_trophies_button->get_compiled());
 
 			fade_animation.apply(result);
 
@@ -138,5 +195,40 @@ namespace rsx
 				notify->wait(0, atomic_wait_timeout{1'000'000});
 			}
 		}
+
+		void skylander_dialog::reload()
+		{
+			s32 selected_index = 0;
+
+			std::vector<std::unique_ptr<overlay_element>> entries;
+			for (u8 sky_slot = 0; sky_slot < 8; ++sky_slot)
+			{
+				auto entry = std::make_unique<skylander_list_entry>();
+				entries.emplace_back(std::move(entry));
+			}
+
+			// Recreate list
+			if (m_list)
+			{
+				status_flags |= status_bits::invalidate_image_cache;
+			}
+
+			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, sky_list_h);
+			m_list->set_pos(20, sky_list_y);
+			m_list->set_cancel_only(true);
+
+			for (auto& entry : entries)
+			{
+				m_list->add_entry(entry);
+			}
+
+			if (!m_list->m_items.empty())
+			{
+				m_list->select_entry(selected_index);
+			}
+
+			m_description->set_text("Emulated Skylander Portal");
+			m_description->auto_resize();
+		}
 	} // namespace overlays
 } // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
index 6b7a6b4b48..b31508c19f 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
@@ -10,16 +10,15 @@ namespace rsx
 		struct skylander_dialog : public user_interface
 		{
 		private:
+			void reload();
+
 			std::unique_ptr<overlay_element> m_dim_background;
 			std::unique_ptr<list_view> m_list;
 			std::unique_ptr<label> m_description;
-			std::unique_ptr<image_button> m_show_hidden_trophies_button;
 
 			animation_color_interpolate fade_animation;
 
 			atomic_t<bool> m_list_dirty{true};
-			bool m_show_hidden_trophies = false;
-			bool m_show_hidden_trophies_last = false;
 
 		public:
 			skylander_dialog();

From 05068b6b9c88537ca48e1ef102bfe1aa913705e6 Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Mon, 18 May 2026 22:06:29 +0200
Subject: [PATCH 04/11] Display Loaded Skylanders in Overlay and Qt

---
 rpcs3/Emu/Io/Skylander.cpp                    | 494 ++++++++++++++++-
 rpcs3/Emu/Io/Skylander.h                      |  10 +-
 .../USBDevices/overlay_skylander_dialog.cpp   |  32 +-
 .../USBDevices/overlay_skylander_dialog.h     |  18 +
 rpcs3/rpcs3qt/skylander_dialog.cpp            | 500 +-----------------
 rpcs3/rpcs3qt/skylander_dialog.h              |   2 -
 6 files changed, 548 insertions(+), 508 deletions(-)

diff --git a/rpcs3/Emu/Io/Skylander.cpp b/rpcs3/Emu/Io/Skylander.cpp
index 974e9a887f..098c4b7c59 100644
--- a/rpcs3/Emu/Io/Skylander.cpp
+++ b/rpcs3/Emu/Io/Skylander.cpp
@@ -6,6 +6,489 @@ LOG_CHANNEL(skylander_log, "skylander");
 
 sky_portal g_skyportal;
 
+const std::map<const std::pair<const u16, const u16>, const std::string> list_skylanders = {
+    {{0, 0x0000}, "Whirlwind"},
+    {{0, 0x1801}, "Series 2 Whirlwind"},
+    {{0, 0x1C02}, "Polar Whirlwind"},
+    {{0, 0x2805}, "Horn Blast Whirlwind"},
+    {{0, 0x3810}, "Eon's Elite Whirlwind"},
+    {{1, 0x0000}, "Sonic Boom"},
+    {{1, 0x1801}, "Series 2 Sonic Boom"},
+    {{2, 0x0000}, "Warnado"},
+    {{2, 0x2206}, "LightCore Warnado"},
+    {{3, 0x0000}, "Lightning Rod"},
+    {{3, 0x1801}, "Series 2 Lightning Rod"},
+    {{4, 0x0000}, "Bash"},
+    {{4, 0x1801}, "Series 2 Bash"},
+    {{5, 0x0000}, "Terrafin"},
+    {{5, 0x1801}, "Series 2 Terrafin"},
+    {{5, 0x2805}, "Knockout Terrafin"},
+    {{5, 0x3810}, "Eon's Elite Terrafin"},
+    {{6, 0x0000}, "Dino Rang"},
+    {{6, 0x4810}, "Eon's Elite Dino Rang"},
+    {{7, 0x0000}, "Prism Break"},
+    {{7, 0x1801}, "Series 2 Prism Break"},
+    {{7, 0x2805}, "Hyper Beam Prism Break"},
+    {{7, 0x1206}, "LightCore Prism Break"},
+    {{8, 0x0000}, "Sunburn"},
+    {{9, 0x0000}, "Eruptor"},
+    {{9, 0x1801}, "Series 2 Eruptor"},
+    {{9, 0x2C02}, "Volcanic Eruptor"},
+    {{9, 0x2805}, "Lava Barf Eruptor"},
+    {{9, 0x1206}, "LightCore Eruptor"},
+    {{9, 0x3810}, "Eon's Elite Eruptor"},
+    {{10, 0x0000}, "Ignitor"},
+    {{10, 0x1801}, "Series 2 Ignitor"},
+    {{10, 0x1C03}, "Legendary Ignitor"},
+    {{11, 0x0000}, "Flameslinger"},
+    {{11, 0x1801}, "Series 2 Flameslinger"},
+    {{12, 0x0000}, "Zap"},
+    {{12, 0x1801}, "Series 2 Zap"},
+    {{13, 0x0000}, "Wham Shell"},
+    {{13, 0x2206}, "LightCore Wham Shell"},
+    {{14, 0x0000}, "Gill Grunt"},
+    {{14, 0x1801}, "Series 2 Gill Grunt"},
+    {{14, 0x2805}, "Anchors Away Gill Grunt"},
+    {{14, 0x3805}, "Tidal Wave Gill Grunt"},
+    {{14, 0x3810}, "Eon's Elite Gill Grunt"},
+    {{15, 0x0000}, "Slam Bam"},
+    {{15, 0x1801}, "Series 2 Slam Bam"},
+    {{15, 0x1C03}, "Legendary Slam Bam"},
+    {{15, 0x4810}, "Eon's Elite Slam Bam"},
+    {{16, 0x0000}, "Spyro"},
+    {{16, 0x1801}, "Series 2 Spyro"},
+    {{16, 0x2C02}, "Dark Mega Ram Spyro"},
+    {{16, 0x2805}, "Mega Ram Spyro"},
+    {{16, 0x3810}, "Eon's Elite Spyro"},
+    {{17, 0x0000}, "Voodood"},
+    {{17, 0x4810}, "Eon's Elite Voodood"},
+    {{18, 0x0000}, "Double Trouble"},
+    {{18, 0x1801}, "Series 2 Double Trouble"},
+    {{18, 0x1C02}, "Royal Double Trouble"},
+    {{19, 0x0000}, "Trigger Happy"},
+    {{19, 0x1801}, "Series 2 Trigger Happy"},
+    {{19, 0x2C02}, "Springtime Trigger Happy"},
+    {{19, 0x2805}, "Big Bang Trigger Happy"},
+    {{19, 0x3810}, "Eon's Elite Trigger Happy"},
+    {{20, 0x0000}, "Drobot"},
+    {{20, 0x1801}, "Series 2 Drobot"},
+    {{20, 0x1206}, "LightCore Drobot"},
+    {{21, 0x0000}, "Drill Sergeant"},
+    {{21, 0x1801}, "Series 2 Drill Sergeant"},
+    {{22, 0x0000}, "Boomer"},
+    {{22, 0x4810}, "Eon's Elite Boomer"},
+    {{23, 0x0000}, "Wrecking Ball"},
+    {{23, 0x1801}, "Series 2 Wrecking Ball"},
+    {{24, 0x0000}, "Camo"},
+    {{24, 0x2805}, "Thorn Horn Camo"},
+    {{25, 0x0000}, "Zook"},
+    {{25, 0x1801}, "Series 2 Zook"},
+    {{25, 0x4810}, "Eon's Elite Zook"},
+    {{26, 0x0000}, "Stealth Elf"},
+    {{26, 0x1801}, "Series 2 Stealth Elf"},
+    {{26, 0x2C02}, "Dark Stealth Elf"},
+    {{26, 0x1C03}, "Legendary Stealth Elf"},
+    {{26, 0x2805}, "Ninja Stealth Elf"},
+    {{26, 0x3810}, "Eon's Elite Stealth Elf"},
+    {{27, 0x0000}, "Stump Smash"},
+    {{27, 0x1801}, "Series 2 Stump Smash"},
+    {{28, 0x0000}, "Dark Spyro"},
+    {{29, 0x0000}, "Hex"},
+    {{29, 0x1801}, "Series 2 Hex"},
+    {{29, 0x1206}, "LightCore Hex"},
+    {{30, 0x0000}, "Chop Chop"},
+    {{30, 0x1801}, "Series 2 Chop Chop"},
+    {{30, 0x2805}, "Twin Blade Chop Chop"},
+    {{30, 0x3810}, "Eon's Elite Chop Chop"},
+    {{31, 0x0000}, "Ghost Roaster"},
+    {{31, 0x4810}, "Eon's Elite Ghost Roaster"},
+    {{32, 0x0000}, "Cynder"},
+    {{32, 0x1801}, "Series 2 Cynder"},
+    {{32, 0x2805}, "Phantom Cynder"},
+    {{100, 0x0000}, "Jet Vac"},
+    {{100, 0x1403}, "Legendary Jet Vac"},
+    {{100, 0x2805}, "Turbo Jet Vac"},
+    {{100, 0x3805}, "Full Blast Jet Vac"},
+    {{100, 0x1206}, "LightCore Jet Vac"},
+    {{101, 0x0000}, "Swarm"},
+    {{102, 0x0000}, "Crusher"},
+    {{102, 0x1602}, "Granite Crusher"},
+    {{103, 0x0000}, "Flashwing"},
+    {{103, 0x1402}, "Jade Flash Wing"},
+    {{103, 0x2206}, "LightCore Flashwing"},
+    {{104, 0x0000}, "Hot Head"},
+    {{105, 0x0000}, "Hot Dog"},
+    {{105, 0x1402}, "Molten Hot Dog"},
+    {{105, 0x2805}, "Fire Bone Hot Dog"},
+    {{106, 0x0000}, "Chill"},
+    {{106, 0x1603}, "Legendary Chill"},
+    {{106, 0x2805}, "Blizzard Chill"},
+    {{106, 0x1206}, "LightCore Chill"},
+    {{107, 0x0000}, "Thumpback"},
+    {{108, 0x0000}, "Pop Fizz"},
+    {{108, 0x1402}, "Punch Pop Fizz"},
+    {{108, 0x3C02}, "Love Potion Pop Fizz"},
+    {{108, 0x2805}, "Super Gulp Pop Fizz"},
+    {{108, 0x3805}, "Fizzy Frenzy Pop Fizz"},
+    {{108, 0x1206}, "LightCore Pop Fizz"},
+    {{109, 0x0000}, "Ninjini"},
+    {{109, 0x1602}, "Scarlet Ninjini"},
+    {{110, 0x0000}, "Bouncer"},
+    {{110, 0x1603}, "Legendary Bouncer"},
+    {{111, 0x0000}, "Sprocket"},
+    {{111, 0x2805}, "Heavy Duty Sprocket"},
+    {{112, 0x0000}, "Tree Rex"},
+    {{112, 0x1602}, "Gnarly Tree Rex"},
+    {{113, 0x0000}, "Shroomboom"},
+    {{113, 0x3805}, "Sure Shot Shroomboom"},
+    {{113, 0x1206}, "LightCore Shroomboom"},
+    {{114, 0x0000}, "Eye Brawl"},
+    {{115, 0x0000}, "Fright Rider"},
+    {{200, 0x0000}, "Anvil Rain"},
+    {{201, 0x0000}, "Hidden Treasure"},
+    {{201, 0x2000}, "Platinum Hidden Treasure"},
+    {{202, 0x0000}, "Healing Elixir"},
+    {{203, 0x0000}, "Ghost Pirate Swords"},
+    {{204, 0x0000}, "Time Twist Hourglass"},
+    {{205, 0x0000}, "Sky Iron Shield"},
+    {{206, 0x0000}, "Winged Boots"},
+    {{207, 0x0000}, "Sparx the Dragonfly"},
+    {{208, 0x1206}, "Dragonfire Cannon"},
+    {{208, 0x1602}, "Golden Dragonfire Cannon"},
+    {{209, 0x1206}, "Scorpion Striker"},
+    {{210, 0x3002}, "Biter's Bane"},
+    {{210, 0x3008}, "Sorcerous Skull"},
+    {{210, 0x300B}, "Axe of Illusion"},
+    {{210, 0x300E}, "Arcane Hourglass"},
+    {{210, 0x3012}, "Spell Slapper"},
+    {{210, 0x3014}, "Rune Rocket"},
+    {{211, 0x3001}, "Tidal Tiki"},
+    {{211, 0x3002}, "Wet Walter"},
+    {{211, 0x3006}, "Flood Flask"},
+    {{211, 0x3406}, "Legendary Flood Flask"},
+    {{211, 0x3007}, "Soaking Staff"},
+    {{211, 0x300B}, "Aqua Axe"},
+    {{211, 0x3016}, "Frost Helm"},
+    {{212, 0x3003}, "Breezy Bird"},
+    {{212, 0x3006}, "Drafty Decanter"},
+    {{212, 0x300D}, "Tempest Timer"},
+    {{212, 0x3010}, "Cloudy Cobra"},
+    {{212, 0x3011}, "Storm Warning"},
+    {{212, 0x3018}, "Cyclone Saber"},
+    {{213, 0x3004}, "Spirit Sphere"},
+    {{213, 0x3404}, "Legendary Spirit Sphere"},
+    {{213, 0x3008}, "Spectral Skull"},
+    {{213, 0x3408}, "Legendary Spectral Skull"},
+    {{213, 0x300B}, "Haunted Hatchet"},
+    {{213, 0x300C}, "Grim Gripper"},
+    {{213, 0x3010}, "Spooky Snake"},
+    {{213, 0x3017}, "Dream Piercer"},
+    {{214, 0x3000}, "Tech Totem"},
+    {{214, 0x3007}, "Automatic Angel"},
+    {{214, 0x3009}, "Factory Flower"},
+    {{214, 0x300C}, "Grabbing Gadget"},
+    {{214, 0x3016}, "Makers Mana"},
+    {{214, 0x301A}, "Topsy Techy"},
+    {{215, 0x3005}, "Eternal Flame"},
+    {{215, 0x3009}, "Fire Flower"},
+    {{215, 0x3011}, "Scorching Stopper"},
+    {{215, 0x3012}, "Searing Spinner"},
+    {{215, 0x3017}, "Spark Spear"},
+    {{215, 0x301B}, "Blazing Belch"},
+    {{216, 0x3000}, "Banded Boulder"},
+    {{216, 0x3003}, "Rock Hawk"},
+    {{216, 0x300A}, "Slag Hammer"},
+    {{216, 0x300E}, "Dust Of Time"},
+    {{216, 0x3013}, "Spinning Sandstorm"},
+    {{216, 0x301A}, "Rubble Trouble"},
+    {{217, 0x3003}, "Oak Eagle"},
+    {{217, 0x3005}, "Emerald Energy"},
+    {{217, 0x300A}, "Weed Whacker"},
+    {{217, 0x3010}, "Seed Serpent"},
+    {{217, 0x3018}, "Jade Blade"},
+    {{217, 0x301B}, "Shrub Shrieker"},
+    {{218, 0x3000}, "Dark Dagger"},
+    {{218, 0x3014}, "Shadow Spider"},
+    {{218, 0x301A}, "Ghastly Grimace"},
+    {{219, 0x3000}, "Shining Ship"},
+    {{219, 0x300F}, "Heavenly Hawk"},
+    {{219, 0x301B}, "Beam Scream"},
+    {{220, 0x301E}, "Kaos Trap"},
+    {{220, 0x351F}, "Ultimate Kaos Trap"},
+    {{230, 0x0000}, "Hand of Fate"},
+    {{230, 0x3403}, "Legendary Hand of Fate"},
+    {{231, 0x0000}, "Piggy Bank"},
+    {{232, 0x0000}, "Rocket Ram"},
+    {{233, 0x0000}, "Tiki Speaky"},
+    {{300, 0x0000}, "Dragon’s Peak"},
+    {{301, 0x0000}, "Empire of Ice"},
+    {{302, 0x0000}, "Pirate Seas"},
+    {{303, 0x0000}, "Darklight Crypt"},
+    {{304, 0x0000}, "Volcanic Vault"},
+    {{305, 0x0000}, "Mirror of Mystery"},
+    {{306, 0x0000}, "Nightmare Express"},
+    {{307, 0x0000}, "Sunscraper Spire"},
+    {{308, 0x0000}, "Midnight Museum"},
+    {{404, 0x0000}, "Legendary Bash"},
+    {{416, 0x0000}, "Legendary Spyro"},
+    {{419, 0x0000}, "Legendary Trigger Happy"},
+    {{430, 0x0000}, "Legendary Chop Chop"},
+    {{450, 0x0000}, "Gusto"},
+    {{451, 0x0000}, "Thunderbolt"},
+    {{452, 0x0000}, "Fling Kong"},
+    {{453, 0x0000}, "Blades"},
+    {{453, 0x3403}, "Legendary Blades"},
+    {{454, 0x0000}, "Wallop"},
+    {{455, 0x0000}, "Head Rush"},
+    {{455, 0x3402}, "Nitro Head Rush"},
+    {{456, 0x0000}, "Fist Bump"},
+    {{457, 0x0000}, "Rocky Roll"},
+    {{458, 0x0000}, "Wildfire"},
+    {{458, 0x3402}, "Dark Wildfire"},
+    {{459, 0x0000}, "Ka Boom"},
+    {{460, 0x0000}, "Trail Blazer"},
+    {{461, 0x0000}, "Torch"},
+    {{462, 0x0000}, "Snap Shot"},
+    {{462, 0x3402}, "Dark Snap Shot"},
+    {{463, 0x0000}, "Lob Star"},
+    {{463, 0x3402}, "Winterfest Lob-Star"},
+    {{464, 0x0000}, "Flip Wreck"},
+    {{465, 0x0000}, "Echo"},
+    {{466, 0x0000}, "Blastermind"},
+    {{467, 0x0000}, "Enigma"},
+    {{468, 0x0000}, "Deja Vu"},
+    {{468, 0x3403}, "Legendary Deja Vu"},
+    {{469, 0x0000}, "Cobra Candabra"},
+    {{469, 0x3402}, "King Cobra Cadabra"},
+    {{470, 0x0000}, "Jawbreaker"},
+    {{470, 0x3403}, "Legendary Jawbreaker"},
+    {{471, 0x0000}, "Gearshift"},
+    {{472, 0x0000}, "Chopper"},
+    {{473, 0x0000}, "Tread Head"},
+    {{474, 0x0000}, "Bushwack"},
+    {{474, 0x3403}, "Legendary Bushwack"},
+    {{475, 0x0000}, "Tuff Luck"},
+    {{476, 0x0000}, "Food Fight"},
+    {{476, 0x3402}, "Dark Food Fight"},
+    {{477, 0x0000}, "High Five"},
+    {{478, 0x0000}, "Krypt King"},
+    {{478, 0x3402}, "Nitro Krypt King"},
+    {{479, 0x0000}, "Short Cut"},
+    {{480, 0x0000}, "Bat Spin"},
+    {{481, 0x0000}, "Funny Bone"},
+    {{482, 0x0000}, "Knight Light"},
+    {{483, 0x0000}, "Spotlight"},
+    {{484, 0x0000}, "Knight Mare"},
+    {{485, 0x0000}, "Blackout"},
+    {{502, 0x0000}, "Bop"},
+    {{505, 0x0000}, "Terrabite"},
+    {{506, 0x0000}, "Breeze"},
+    {{508, 0x0000}, "Pet Vac"},
+    {{508, 0x3402}, "Power Punch Pet Vac"},
+    {{507, 0x0000}, "Weeruptor"},
+    {{507, 0x3402}, "Eggcellent Weeruptor"},
+    {{509, 0x0000}, "Small Fry"},
+    {{510, 0x0000}, "Drobit"},
+    {{519, 0x0000}, "Trigger Snappy"},
+    {{526, 0x3000}, "Whisper Elf"},
+    {{540, 0x3000}, "Barkley"},
+    {{540, 0x3402}, "Gnarly Barkley"},
+    {{541, 0x3000}, "Thumpling"},
+    {{514, 0x0000}, "Gill Runt"},
+    {{542, 0x3000}, "Mini-Jini"},
+    {{503, 0x0000}, "Spry"},
+    {{504, 0x0000}, "Hijinx"},
+    {{543, 0x1000}, "Eye Small"},
+    {{601, 0x0000}, "King Pen"},
+    {{602, 0x0000}, "Tri-Tip"},
+    {{603, 0x0000}, "Chopscotch"},
+    {{604, 0x0000}, "Boom Bloom"},
+    {{605, 0x0000}, "Pit Boss"},
+    {{606, 0x0000}, "Barbella"},
+    {{607, 0x0000}, "Air Strike"},
+    {{608, 0x0000}, "Ember"},
+    {{609, 0x0000}, "Ambush"},
+    {{610, 0x0000}, "Dr. Krankcase"},
+    {{611, 0x0000}, "Hood Sickle"},
+    {{612, 0x0000}, "Tae Kwon Crow"},
+    {{613, 0x0000}, "Golden Queen"},
+    {{614, 0x0000}, "Wolfgang"},
+    {{615, 0x0000}, "Pain-Yatta"},
+    {{616, 0x0000}, "Mysticat"},
+    {{617, 0x0000}, "Starcast"},
+    {{618, 0x0000}, "Buckshot"},
+    {{619, 0x0000}, "Aurora"},
+    {{620, 0x0000}, "Flare Wolf"},
+    {{621, 0x0000}, "Chompy Mage"},
+    {{622, 0x0000}, "Bad Juju"},
+    {{623, 0x0000}, "Grave Clobber"},
+    {{624, 0x0000}, "Blaster-Tron"},
+    {{625, 0x0000}, "Ro-Bow"},
+    {{626, 0x0000}, "Chain Reaction"},
+    {{627, 0x0000}, "Kaos"},
+    {{628, 0x0000}, "Wild Storm"},
+    {{629, 0x0000}, "Tidepool"},
+    {{630, 0x0000}, "Crash Bandicoot"},
+    {{631, 0x0000}, "Dr. Neo Cortex"},
+    {{1000, 0x0000}, "Boom Jet (Bottom)"},
+    {{1001, 0x0000}, "Free Ranger (Bottom)"},
+    {{1001, 0x2403}, "Legendary Free Ranger (Bottom)"},
+    {{1002, 0x0000}, "Rubble Rouser (Bottom)"},
+    {{1003, 0x0000}, "Doom Stone (Bottom)"},
+    {{1004, 0x0000}, "Blast Zone (Bottom)"},
+    {{1004, 0x2402}, "Dark Blast Zone (Bottom)"},
+    {{1005, 0x0000}, "Fire Kraken (Bottom)"},
+    {{1005, 0x2402}, "Jade Fire Kraken (Bottom)"},
+    {{1006, 0x0000}, "Stink Bomb (Bottom)"},
+    {{1007, 0x0000}, "Grilla Drilla (Bottom)"},
+    {{1008, 0x0000}, "Hoot Loop (Bottom)"},
+    {{1008, 0x2402}, "Enchanted Hoot Loop (Bottom)"},
+    {{1009, 0x0000}, "Trap Shadow (Bottom)"},
+    {{1010, 0x0000}, "Magna Charge (Bottom)"},
+    {{1010, 0x2402}, "Nitro Magna Charge (Bottom)"},
+    {{1011, 0x0000}, "Spy Rise (Bottom)"},
+    {{1012, 0x0000}, "Night Shift (Bottom)"},
+    {{1012, 0x2403}, "Legendary Night Shift (Bottom)"},
+    {{1013, 0x0000}, "Rattle Shake (Bottom)"},
+    {{1013, 0x2402}, "Quick Draw Rattle Shake (Bottom)"},
+    {{1014, 0x0000}, "Freeze Blade (Bottom)"},
+    {{1014, 0x2402}, "Nitro Freeze Blade (Bottom)"},
+    {{1015, 0x0000}, "Wash Buckler (Bottom)"},
+    {{1015, 0x2402}, "Dark Wash Buckler (Bottom)"},
+    {{2000, 0x0000}, "Boom Jet (Top)"},
+    {{2001, 0x0000}, "Free Ranger (Top)"},
+    {{2001, 0x2403}, "Legendary Free Ranger (Top)"},
+    {{2002, 0x0000}, "Rubble Rouser (Top)"},
+    {{2003, 0x0000}, "Doom Stone (Top)"},
+    {{2004, 0x0000}, "Blast Zone (Top)"},
+    {{2004, 0x2402}, "Dark Blast Zone (Top)"},
+    {{2005, 0x0000}, "Fire Kraken (Top)"},
+    {{2005, 0x2402}, "Jade Fire Kraken (Top)"},
+    {{2006, 0x0000}, "Stink Bomb (Top)"},
+    {{2007, 0x0000}, "Grilla Drilla (Top)"},
+    {{2008, 0x0000}, "Hoot Loop (Top)"},
+    {{2008, 0x2402}, "Enchanted Hoot Loop (Top)"},
+    {{2009, 0x0000}, "Trap Shadow (Top)"},
+    {{2010, 0x0000}, "Magna Charge (Top)"},
+    {{2010, 0x2402}, "Nitro Magna Charge (Top)"},
+    {{2011, 0x0000}, "Spy Rise (Top)"},
+    {{2012, 0x0000}, "Night Shift (Top)"},
+    {{2012, 0x2403}, "Legendary Night Shift (Top)"},
+    {{2013, 0x0000}, "Rattle Shake (Top)"},
+    {{2013, 0x2402}, "Quick Draw Rattle Shake (Top)"},
+    {{2014, 0x0000}, "Freeze Blade (Top)"},
+    {{2014, 0x2402}, "Nitro Freeze Blade (Top)"},
+    {{2015, 0x0000}, "Wash Buckler (Top)"},
+    {{2015, 0x2402}, "Dark Wash Buckler (Top)"},
+    {{3000, 0x0000}, "Scratch"},
+    {{3001, 0x0000}, "Pop Thorn"},
+    {{3002, 0x0000}, "Slobber Tooth"},
+    {{3002, 0x2402}, "Dark Slobber Tooth"},
+    {{3003, 0x0000}, "Scorp"},
+    {{3004, 0x0000}, "Fryno"},
+    {{3004, 0x3805}, "Hog Wild Fryno"},
+    {{3005, 0x0000}, "Smolderdash"},
+    {{3005, 0x2206}, "LightCore Smolderdash"},
+    {{3006, 0x0000}, "Bumble Blast"},
+    {{3006, 0x2402}, "Jolly Bumble Blast"},
+    {{3006, 0x2206}, "LightCore Bumble Blast"},
+    {{3007, 0x0000}, "Zoo Lou"},
+    {{3007, 0x2403}, "Legendary Zoo Lou"},
+    {{3008, 0x0000}, "Dune Bug"},
+    {{3009, 0x0000}, "Star Strike"},
+    {{3009, 0x2602}, "Enchanted Star Strike"},
+    {{3009, 0x2206}, "LightCore Star Strike"},
+    {{3010, 0x0000}, "Countdown"},
+    {{3010, 0x2402}, "Kickoff Countdown"},
+    {{3010, 0x2206}, "LightCore Countdown"},
+    {{3011, 0x0000}, "Wind Up"},
+    {{3012, 0x0000}, "Roller Brawl"},
+    {{3013, 0x0000}, "Grim Creeper"},
+    {{3013, 0x2603}, "Legendary Grim Creeper"},
+    {{3013, 0x2206}, "LightCore Grim Creeper"},
+    {{3014, 0x0000}, "Rip Tide"},
+    {{3015, 0x0000}, "Punk Shock"},
+    {{3200, 0x2000}, "Battle Hammer"},
+    {{3201, 0x2000}, "Sky Diamond"},
+    {{3202, 0x2000}, "Platinum Sheep"},
+    {{3203, 0x2000}, "Groove Machine"},
+    {{3204, 0x0000}, "UFO Hat"},
+    {{3300, 0x2000}, "Sheep Wreck Island"},
+    {{3301, 0x2000}, "Tower of Time"},
+    {{3302, 0x2206}, "Fiery Forge"},
+    {{3303, 0x2206}, "Arkeyan Crossbow"},
+    {{3220, 0x0000}, "Jet Stream"},
+    {{3221, 0x0000}, "Tomb Buggy"},
+    {{3222, 0x0000}, "Reef Ripper"},
+    {{3223, 0x0000}, "Burn Cycle"},
+    {{3224, 0x0000}, "Hot Streak"},
+    {{3224, 0x4402}, "Dark Hot Streak"},
+    {{3224, 0x4004}, "E3 Hot Streak"},
+    {{3224, 0x441E}, "Golden Hot Streak"},
+    {{3225, 0x0000}, "Shark Tank"},
+    {{3226, 0x0000}, "Thump Truck"},
+    {{3227, 0x0000}, "Crypt Crusher"},
+    {{3228, 0x0000}, "Stealth Stinger"},
+    {{3228, 0x4402}, "Nitro Stealth Stinger"},
+    {{3231, 0x0000}, "Dive Bomber"},
+    {{3231, 0x4402}, "Spring Ahead Dive Bomber"},
+    {{3232, 0x0000}, "Sky Slicer"},
+    //{{3233, 0x0000}, "Clown Cruiser (Nintendo Only)"},
+    //{{3233, 0x4402}, "Dark Clown Cruiser (Nintendo Only)"},
+    {{3234, 0x0000}, "Gold Rusher"},
+    {{3234, 0x4402}, "Power Blue Gold Rusher"},
+    {{3235, 0x0000}, "Shield Striker"},
+    {{3236, 0x0000}, "Sun Runner"},
+    {{3236, 0x4403}, "Legendary Sun Runner"},
+    {{3237, 0x0000}, "Sea Shadow"},
+    {{3237, 0x4402}, "Dark Sea Shadow"},
+    {{3238, 0x0000}, "Splatter Splasher"},
+    {{3238, 0x4402}, "Power Blue Splatter Splasher"},
+    {{3239, 0x0000}, "Soda Skimmer"},
+    {{3239, 0x4402}, "Nitro Soda Skimmer"},
+    //{{3240, 0x0000}, "Barrel Blaster (Nintendo Only)"},
+    //{{3240, 0x4402}, "Dark Barrel Blaster (Nintendo Only)"},
+    {{3241, 0x0000}, "Buzz Wing"},
+    {{3400, 0x0000}, "Fiesta"},
+    {{3400, 0x4515}, "Frightful Fiesta"},
+    {{3401, 0x0000}, "High Volt"},
+    {{3402, 0x0000}, "Splat"},
+    {{3402, 0x4502}, "Power Blue Splat"},
+    {{3406, 0x0000}, "Stormblade"},
+    {{3411, 0x0000}, "Smash Hit"},
+    {{3411, 0x4502}, "Steel Plated Smash Hit"},
+    {{3412, 0x0000}, "Spitfire"},
+    {{3412, 0x4502}, "Dark Spitfire"},
+    {{3413, 0x0000}, "Hurricane Jet Vac"},
+    {{3413, 0x4503}, "Legendary Hurricane Jet Vac"},
+    {{3414, 0x0000}, "Double Dare Trigger Happy"},
+    {{3414, 0x4502}, "Power Blue Double Dare Trigger Happy"},
+    {{3415, 0x0000}, "Super Shot Stealth Elf"},
+    {{3415, 0x4502}, "Dark Super Shot Stealth Elf"},
+    {{3416, 0x0000}, "Shark Shooter Terrafin"},
+    {{3417, 0x0000}, "Bone Bash Roller Brawl"},
+    {{3417, 0x4503}, "Legendary Bone Bash Roller Brawl"},
+    {{3420, 0x0000}, "Big Bubble Pop Fizz"},
+    {{3420, 0x450E}, "Birthday Bash Big Bubble Pop Fizz"},
+    {{3421, 0x0000}, "Lava Lance Eruptor"},
+    {{3422, 0x0000}, "Deep Dive Gill Grunt"},
+    //{{3423, 0x0000}, "Turbo Charge Donkey Kong (Nintendo Only)"},
+    //{{3423, 0x4502}, "Dark Turbo Charge Donkey Kong (Nintendo Only)"},
+    //{{3424, 0x0000}, "Hammer Slam Bowser (Nintendo Only)"},
+    //{{3424, 0x4502}, "Dark Hammer Slam Bowser (Nintendo Only)"},
+    {{3425, 0x0000}, "Dive-Clops"},
+    {{3425, 0x450E}, "Missile-Tow Dive-Clops"},
+    {{3426, 0x0000}, "Astroblast"},
+    {{3426, 0x4503}, "Legendary Astroblast"},
+    {{3427, 0x0000}, "Nightfall"},
+    {{3428, 0x0000}, "Thrillipede"},
+    {{3428, 0x450D}, "Eggcited Thrillipede"},
+    {{3500, 0x0000}, "Sky Trophy"},
+    {{3501, 0x0000}, "Land Trophy"},
+    {{3502, 0x0000}, "Sea Trophy"},
+    {{3503, 0x0000}, "Kaos Trophy"},
+};
+
 void skylander::save()
 {
 	if (!sky_file)
@@ -147,13 +630,15 @@ bool sky_portal::remove_skylander(u8 sky_num)
 		thesky.queued_status.push(2);
 		thesky.queued_status.push(0);
 		thesky.sky_file.close();
+		ui_skylanders[thesky.ui_slot] = std::nullopt;
+		thesky.ui_slot = 0xFF;
 		return true;
 	}
 
 	return false;
 }
 
-u8 sky_portal::load_skylander(u8* buf, fs::file in_file)
+u8 sky_portal::load_skylander(u8 ui_slot, u8* buf, fs::file in_file)
 {
 	std::lock_guard lock(sky_mutex);
 
@@ -180,6 +665,7 @@ u8 sky_portal::load_skylander(u8* buf, fs::file in_file)
 
 	ensure(found_slot != 0xFF);
 
+	ui_skylanders[ui_slot] = std::make_tuple(found_slot, reinterpret_cast<le_t<u16>&>(buf[0x10]), reinterpret_cast<le_t<u16>&>(buf[0x1C]));
 	skylander& thesky = skylanders[found_slot];
 	memcpy(thesky.data.data(), buf, thesky.data.size());
 	thesky.sky_file = std::move(in_file);
@@ -187,10 +673,16 @@ u8 sky_portal::load_skylander(u8* buf, fs::file in_file)
 	thesky.queued_status.push(3);
 	thesky.queued_status.push(1);
 	thesky.last_id = sky_serial;
+	thesky.ui_slot = ui_slot;
 
 	return found_slot;
 }
 
+std::optional<std::tuple<u8, u16, u16>> sky_portal::get_skylander(u8 ui_slot)
+{
+	return ui_skylanders[ui_slot];
+}
+
 usb_device_skylander::usb_device_skylander(const std::array<u8, 7>& location)
 	: usb_device_emulated(location)
 {
diff --git a/rpcs3/Emu/Io/Skylander.h b/rpcs3/Emu/Io/Skylander.h
index be67c8c3cc..6200c27cbd 100644
--- a/rpcs3/Emu/Io/Skylander.h
+++ b/rpcs3/Emu/Io/Skylander.h
@@ -2,6 +2,7 @@
 
 #include "Emu/Io/usb_device.h"
 #include "Utilities/mutex.h"
+#include <optional>
 #include <queue>
 
 struct skylander
@@ -11,9 +12,12 @@ struct skylander
 	std::queue<u8> queued_status;
 	std::array<u8, 0x40 * 0x10> data{};
 	u32 last_id = 0;
+	u8 ui_slot = 0xFF;
 	void save();
 };
 
+extern const std::map<const std::pair<const u16, const u16>, const std::string> list_skylanders;
+
 class sky_portal
 {
 public:
@@ -26,16 +30,18 @@ public:
 	void write_block(u8 sky_num, u8 block, const u8* to_write_buf, u8* reply_buf);
 
 	bool remove_skylander(u8 sky_num);
-	u8 load_skylander(u8* buf, fs::file in_file);
+	u8 load_skylander(u8 ui_slot, u8* buf, fs::file in_file);
+	std::optional<std::tuple<u8, u16, u16>> get_skylander(u8 ui_slot);
 
 protected:
 	shared_mutex sky_mutex;
 
-	bool activated       = true;
+	bool activated = true;
 	u8 interrupt_counter = 0;
 	u8 r = 0, g = 0, b = 0;
 
 	skylander skylanders[8];
+	std::optional<std::tuple<u8, u16, u16>> ui_skylanders[8];
 };
 
 extern sky_portal g_skyportal;
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index affcd28d5a..ad88023d68 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "../overlay_manager.h"
 #include "overlay_skylander_dialog.h"
+#include "Emu/Io/Skylander.h"
 #include "Emu/System.h"
 #include "Emu/VFS.h"
 
@@ -11,15 +12,6 @@ namespace rsx
 		static constexpr u16 sky_list_y = 85;
 		static constexpr u16 sky_list_h = 540;
 
-		struct skylander_list_entry : horizontal_layout
-		{
-		private:
-			std::string name;
-
-		public:
-			skylander_list_entry();
-		};
-
 		skylander_list_entry::skylander_list_entry()
 		{
 			std::unique_ptr<overlay_element> label_text = std::make_unique<label>("None");
@@ -55,7 +47,7 @@ namespace rsx
 			static_cast<image_view*>(create_image.get())->set_image_resource(resource_config::standard_image_resource::triangle);
 
 			this->pack_padding = 15;
-			add_element(label_text);
+			skylander_name = add_element(label_text);
 			add_element(load_image);
 			add_element(label_load);
 			add_element(clear_image);
@@ -160,6 +152,26 @@ namespace rsx
 			}
 			if (m_list)
 			{
+				if (!m_list->m_items.empty())
+				{
+					for (u8 sky_slot = 0; sky_slot < 8; sky_slot++)
+					{
+						if (const auto& slot_infos = g_skyportal.get_skylander(sky_slot))
+						{
+							auto entry = m_list->m_items[sky_slot].get();
+							const auto& [portal_slot, sky_id, sky_var] = slot_infos.value();
+							const auto found_sky = list_skylanders.find(std::make_pair(sky_id, sky_var));
+							if (found_sky != list_skylanders.cend())
+							{
+								entry->set_text(found_sky->second);
+							}
+							else
+							{
+								entry->set_text(fmt::format("Unknown (Id:%d Var:%d)", sky_id, sky_var));
+							}
+						}
+					}
+				}
 				result.add(m_list->get_compiled());
 			}
 			result.add(m_description->get_compiled());
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
index b31508c19f..bd12dcff97 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
@@ -7,6 +7,24 @@ namespace rsx
 {
 	namespace overlays
 	{
+		struct skylander_list_entry : horizontal_layout
+		{
+		private:
+			overlay_element* skylander_name = nullptr;
+
+		public:
+			skylander_list_entry();
+			void set_text(std::string_view text) override
+			{
+				rsx_log.notice("[ui] Setting skylander name to %s", text.data());
+				if (skylander_name)
+				{
+					static_cast<label*>(skylander_name)->set_text(text);
+					static_cast<label*>(skylander_name)->auto_resize();
+				}
+			}
+		};
+
 		struct skylander_dialog : public user_interface
 		{
 		private:
diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp
index 6623d27f03..617d8da6a8 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.cpp
+++ b/rpcs3/rpcs3qt/skylander_dialog.cpp
@@ -14,492 +14,8 @@
 #include <QCompleter>
 
 skylander_dialog* skylander_dialog::inst = nullptr;
-std::optional<std::tuple<u8, u16, u16>> skylander_dialog::sky_slots[UI_SKY_NUM];
 QString last_skylander_path;
 
-static const std::map<const std::pair<const u16, const u16>, const std::string> list_skylanders = {
-    {{0, 0x0000}, "Whirlwind"},
-    {{0, 0x1801}, "Series 2 Whirlwind"},
-    {{0, 0x1C02}, "Polar Whirlwind"},
-    {{0, 0x2805}, "Horn Blast Whirlwind"},
-    {{0, 0x3810}, "Eon's Elite Whirlwind"},
-    {{1, 0x0000}, "Sonic Boom"},
-    {{1, 0x1801}, "Series 2 Sonic Boom"},
-    {{2, 0x0000}, "Warnado"},
-    {{2, 0x2206}, "LightCore Warnado"},
-    {{3, 0x0000}, "Lightning Rod"},
-    {{3, 0x1801}, "Series 2 Lightning Rod"},
-    {{4, 0x0000}, "Bash"},
-    {{4, 0x1801}, "Series 2 Bash"},
-    {{5, 0x0000}, "Terrafin"},
-    {{5, 0x1801}, "Series 2 Terrafin"},
-    {{5, 0x2805}, "Knockout Terrafin"},
-    {{5, 0x3810}, "Eon's Elite Terrafin"},
-    {{6, 0x0000}, "Dino Rang"},
-    {{6, 0x4810}, "Eon's Elite Dino Rang"},
-    {{7, 0x0000}, "Prism Break"},
-    {{7, 0x1801}, "Series 2 Prism Break"},
-    {{7, 0x2805}, "Hyper Beam Prism Break"},
-    {{7, 0x1206}, "LightCore Prism Break"},
-    {{8, 0x0000}, "Sunburn"},
-    {{9, 0x0000}, "Eruptor"},
-    {{9, 0x1801}, "Series 2 Eruptor"},
-    {{9, 0x2C02}, "Volcanic Eruptor"},
-    {{9, 0x2805}, "Lava Barf Eruptor"},
-    {{9, 0x1206}, "LightCore Eruptor"},
-    {{9, 0x3810}, "Eon's Elite Eruptor"},
-    {{10, 0x0000}, "Ignitor"},
-    {{10, 0x1801}, "Series 2 Ignitor"},
-    {{10, 0x1C03}, "Legendary Ignitor"},
-    {{11, 0x0000}, "Flameslinger"},
-    {{11, 0x1801}, "Series 2 Flameslinger"},
-    {{12, 0x0000}, "Zap"},
-    {{12, 0x1801}, "Series 2 Zap"},
-    {{13, 0x0000}, "Wham Shell"},
-    {{13, 0x2206}, "LightCore Wham Shell"},
-    {{14, 0x0000}, "Gill Grunt"},
-    {{14, 0x1801}, "Series 2 Gill Grunt"},
-    {{14, 0x2805}, "Anchors Away Gill Grunt"},
-    {{14, 0x3805}, "Tidal Wave Gill Grunt"},
-    {{14, 0x3810}, "Eon's Elite Gill Grunt"},
-    {{15, 0x0000}, "Slam Bam"},
-    {{15, 0x1801}, "Series 2 Slam Bam"},
-    {{15, 0x1C03}, "Legendary Slam Bam"},
-    {{15, 0x4810}, "Eon's Elite Slam Bam"},
-    {{16, 0x0000}, "Spyro"},
-    {{16, 0x1801}, "Series 2 Spyro"},
-    {{16, 0x2C02}, "Dark Mega Ram Spyro"},
-    {{16, 0x2805}, "Mega Ram Spyro"},
-    {{16, 0x3810}, "Eon's Elite Spyro"},
-    {{17, 0x0000}, "Voodood"},
-    {{17, 0x4810}, "Eon's Elite Voodood"},
-    {{18, 0x0000}, "Double Trouble"},
-    {{18, 0x1801}, "Series 2 Double Trouble"},
-    {{18, 0x1C02}, "Royal Double Trouble"},
-    {{19, 0x0000}, "Trigger Happy"},
-    {{19, 0x1801}, "Series 2 Trigger Happy"},
-    {{19, 0x2C02}, "Springtime Trigger Happy"},
-    {{19, 0x2805}, "Big Bang Trigger Happy"},
-    {{19, 0x3810}, "Eon's Elite Trigger Happy"},
-    {{20, 0x0000}, "Drobot"},
-    {{20, 0x1801}, "Series 2 Drobot"},
-    {{20, 0x1206}, "LightCore Drobot"},
-    {{21, 0x0000}, "Drill Sergeant"},
-    {{21, 0x1801}, "Series 2 Drill Sergeant"},
-    {{22, 0x0000}, "Boomer"},
-    {{22, 0x4810}, "Eon's Elite Boomer"},
-    {{23, 0x0000}, "Wrecking Ball"},
-    {{23, 0x1801}, "Series 2 Wrecking Ball"},
-    {{24, 0x0000}, "Camo"},
-    {{24, 0x2805}, "Thorn Horn Camo"},
-    {{25, 0x0000}, "Zook"},
-    {{25, 0x1801}, "Series 2 Zook"},
-    {{25, 0x4810}, "Eon's Elite Zook"},
-    {{26, 0x0000}, "Stealth Elf"},
-    {{26, 0x1801}, "Series 2 Stealth Elf"},
-    {{26, 0x2C02}, "Dark Stealth Elf"},
-    {{26, 0x1C03}, "Legendary Stealth Elf"},
-    {{26, 0x2805}, "Ninja Stealth Elf"},
-    {{26, 0x3810}, "Eon's Elite Stealth Elf"},
-    {{27, 0x0000}, "Stump Smash"},
-    {{27, 0x1801}, "Series 2 Stump Smash"},
-    {{28, 0x0000}, "Dark Spyro"},
-    {{29, 0x0000}, "Hex"},
-    {{29, 0x1801}, "Series 2 Hex"},
-    {{29, 0x1206}, "LightCore Hex"},
-    {{30, 0x0000}, "Chop Chop"},
-    {{30, 0x1801}, "Series 2 Chop Chop"},
-    {{30, 0x2805}, "Twin Blade Chop Chop"},
-    {{30, 0x3810}, "Eon's Elite Chop Chop"},
-    {{31, 0x0000}, "Ghost Roaster"},
-    {{31, 0x4810}, "Eon's Elite Ghost Roaster"},
-    {{32, 0x0000}, "Cynder"},
-    {{32, 0x1801}, "Series 2 Cynder"},
-    {{32, 0x2805}, "Phantom Cynder"},
-    {{100, 0x0000}, "Jet Vac"},
-    {{100, 0x1403}, "Legendary Jet Vac"},
-    {{100, 0x2805}, "Turbo Jet Vac"},
-    {{100, 0x3805}, "Full Blast Jet Vac"},
-    {{100, 0x1206}, "LightCore Jet Vac"},
-    {{101, 0x0000}, "Swarm"},
-    {{102, 0x0000}, "Crusher"},
-    {{102, 0x1602}, "Granite Crusher"},
-    {{103, 0x0000}, "Flashwing"},
-    {{103, 0x1402}, "Jade Flash Wing"},
-    {{103, 0x2206}, "LightCore Flashwing"},
-    {{104, 0x0000}, "Hot Head"},
-    {{105, 0x0000}, "Hot Dog"},
-    {{105, 0x1402}, "Molten Hot Dog"},
-    {{105, 0x2805}, "Fire Bone Hot Dog"},
-    {{106, 0x0000}, "Chill"},
-    {{106, 0x1603}, "Legendary Chill"},
-    {{106, 0x2805}, "Blizzard Chill"},
-    {{106, 0x1206}, "LightCore Chill"},
-    {{107, 0x0000}, "Thumpback"},
-    {{108, 0x0000}, "Pop Fizz"},
-    {{108, 0x1402}, "Punch Pop Fizz"},
-    {{108, 0x3C02}, "Love Potion Pop Fizz"},
-    {{108, 0x2805}, "Super Gulp Pop Fizz"},
-    {{108, 0x3805}, "Fizzy Frenzy Pop Fizz"},
-    {{108, 0x1206}, "LightCore Pop Fizz"},
-    {{109, 0x0000}, "Ninjini"},
-    {{109, 0x1602}, "Scarlet Ninjini"},
-    {{110, 0x0000}, "Bouncer"},
-    {{110, 0x1603}, "Legendary Bouncer"},
-    {{111, 0x0000}, "Sprocket"},
-    {{111, 0x2805}, "Heavy Duty Sprocket"},
-    {{112, 0x0000}, "Tree Rex"},
-    {{112, 0x1602}, "Gnarly Tree Rex"},
-    {{113, 0x0000}, "Shroomboom"},
-    {{113, 0x3805}, "Sure Shot Shroomboom"},
-    {{113, 0x1206}, "LightCore Shroomboom"},
-    {{114, 0x0000}, "Eye Brawl"},
-    {{115, 0x0000}, "Fright Rider"},
-    {{200, 0x0000}, "Anvil Rain"},
-    {{201, 0x0000}, "Hidden Treasure"},
-    {{201, 0x2000}, "Platinum Hidden Treasure"},
-    {{202, 0x0000}, "Healing Elixir"},
-    {{203, 0x0000}, "Ghost Pirate Swords"},
-    {{204, 0x0000}, "Time Twist Hourglass"},
-    {{205, 0x0000}, "Sky Iron Shield"},
-    {{206, 0x0000}, "Winged Boots"},
-    {{207, 0x0000}, "Sparx the Dragonfly"},
-    {{208, 0x1206}, "Dragonfire Cannon"},
-    {{208, 0x1602}, "Golden Dragonfire Cannon"},
-    {{209, 0x1206}, "Scorpion Striker"},
-    {{210, 0x3002}, "Biter's Bane"},
-    {{210, 0x3008}, "Sorcerous Skull"},
-    {{210, 0x300B}, "Axe of Illusion"},
-    {{210, 0x300E}, "Arcane Hourglass"},
-    {{210, 0x3012}, "Spell Slapper"},
-    {{210, 0x3014}, "Rune Rocket"},
-    {{211, 0x3001}, "Tidal Tiki"},
-    {{211, 0x3002}, "Wet Walter"},
-    {{211, 0x3006}, "Flood Flask"},
-    {{211, 0x3406}, "Legendary Flood Flask"},
-    {{211, 0x3007}, "Soaking Staff"},
-    {{211, 0x300B}, "Aqua Axe"},
-    {{211, 0x3016}, "Frost Helm"},
-    {{212, 0x3003}, "Breezy Bird"},
-    {{212, 0x3006}, "Drafty Decanter"},
-    {{212, 0x300D}, "Tempest Timer"},
-    {{212, 0x3010}, "Cloudy Cobra"},
-    {{212, 0x3011}, "Storm Warning"},
-    {{212, 0x3018}, "Cyclone Saber"},
-    {{213, 0x3004}, "Spirit Sphere"},
-    {{213, 0x3404}, "Legendary Spirit Sphere"},
-    {{213, 0x3008}, "Spectral Skull"},
-    {{213, 0x3408}, "Legendary Spectral Skull"},
-    {{213, 0x300B}, "Haunted Hatchet"},
-    {{213, 0x300C}, "Grim Gripper"},
-    {{213, 0x3010}, "Spooky Snake"},
-    {{213, 0x3017}, "Dream Piercer"},
-    {{214, 0x3000}, "Tech Totem"},
-    {{214, 0x3007}, "Automatic Angel"},
-    {{214, 0x3009}, "Factory Flower"},
-    {{214, 0x300C}, "Grabbing Gadget"},
-    {{214, 0x3016}, "Makers Mana"},
-    {{214, 0x301A}, "Topsy Techy"},
-    {{215, 0x3005}, "Eternal Flame"},
-    {{215, 0x3009}, "Fire Flower"},
-    {{215, 0x3011}, "Scorching Stopper"},
-    {{215, 0x3012}, "Searing Spinner"},
-    {{215, 0x3017}, "Spark Spear"},
-    {{215, 0x301B}, "Blazing Belch"},
-    {{216, 0x3000}, "Banded Boulder"},
-    {{216, 0x3003}, "Rock Hawk"},
-    {{216, 0x300A}, "Slag Hammer"},
-    {{216, 0x300E}, "Dust Of Time"},
-    {{216, 0x3013}, "Spinning Sandstorm"},
-    {{216, 0x301A}, "Rubble Trouble"},
-    {{217, 0x3003}, "Oak Eagle"},
-    {{217, 0x3005}, "Emerald Energy"},
-    {{217, 0x300A}, "Weed Whacker"},
-    {{217, 0x3010}, "Seed Serpent"},
-    {{217, 0x3018}, "Jade Blade"},
-    {{217, 0x301B}, "Shrub Shrieker"},
-    {{218, 0x3000}, "Dark Dagger"},
-    {{218, 0x3014}, "Shadow Spider"},
-    {{218, 0x301A}, "Ghastly Grimace"},
-    {{219, 0x3000}, "Shining Ship"},
-    {{219, 0x300F}, "Heavenly Hawk"},
-    {{219, 0x301B}, "Beam Scream"},
-    {{220, 0x301E}, "Kaos Trap"},
-    {{220, 0x351F}, "Ultimate Kaos Trap"},
-    {{230, 0x0000}, "Hand of Fate"},
-    {{230, 0x3403}, "Legendary Hand of Fate"},
-    {{231, 0x0000}, "Piggy Bank"},
-    {{232, 0x0000}, "Rocket Ram"},
-    {{233, 0x0000}, "Tiki Speaky"},
-    {{300, 0x0000}, "Dragon’s Peak"},
-    {{301, 0x0000}, "Empire of Ice"},
-    {{302, 0x0000}, "Pirate Seas"},
-    {{303, 0x0000}, "Darklight Crypt"},
-    {{304, 0x0000}, "Volcanic Vault"},
-    {{305, 0x0000}, "Mirror of Mystery"},
-    {{306, 0x0000}, "Nightmare Express"},
-    {{307, 0x0000}, "Sunscraper Spire"},
-    {{308, 0x0000}, "Midnight Museum"},
-    {{404, 0x0000}, "Legendary Bash"},
-    {{416, 0x0000}, "Legendary Spyro"},
-    {{419, 0x0000}, "Legendary Trigger Happy"},
-    {{430, 0x0000}, "Legendary Chop Chop"},
-    {{450, 0x0000}, "Gusto"},
-    {{451, 0x0000}, "Thunderbolt"},
-    {{452, 0x0000}, "Fling Kong"},
-    {{453, 0x0000}, "Blades"},
-    {{453, 0x3403}, "Legendary Blades"},
-    {{454, 0x0000}, "Wallop"},
-    {{455, 0x0000}, "Head Rush"},
-    {{455, 0x3402}, "Nitro Head Rush"},
-    {{456, 0x0000}, "Fist Bump"},
-    {{457, 0x0000}, "Rocky Roll"},
-    {{458, 0x0000}, "Wildfire"},
-    {{458, 0x3402}, "Dark Wildfire"},
-    {{459, 0x0000}, "Ka Boom"},
-    {{460, 0x0000}, "Trail Blazer"},
-    {{461, 0x0000}, "Torch"},
-    {{462, 0x0000}, "Snap Shot"},
-    {{462, 0x3402}, "Dark Snap Shot"},
-    {{463, 0x0000}, "Lob Star"},
-    {{463, 0x3402}, "Winterfest Lob-Star"},
-    {{464, 0x0000}, "Flip Wreck"},
-    {{465, 0x0000}, "Echo"},
-    {{466, 0x0000}, "Blastermind"},
-    {{467, 0x0000}, "Enigma"},
-    {{468, 0x0000}, "Deja Vu"},
-    {{468, 0x3403}, "Legendary Deja Vu"},
-    {{469, 0x0000}, "Cobra Candabra"},
-    {{469, 0x3402}, "King Cobra Cadabra"},
-    {{470, 0x0000}, "Jawbreaker"},
-    {{470, 0x3403}, "Legendary Jawbreaker"},
-    {{471, 0x0000}, "Gearshift"},
-    {{472, 0x0000}, "Chopper"},
-    {{473, 0x0000}, "Tread Head"},
-    {{474, 0x0000}, "Bushwack"},
-    {{474, 0x3403}, "Legendary Bushwack"},
-    {{475, 0x0000}, "Tuff Luck"},
-    {{476, 0x0000}, "Food Fight"},
-    {{476, 0x3402}, "Dark Food Fight"},
-    {{477, 0x0000}, "High Five"},
-    {{478, 0x0000}, "Krypt King"},
-    {{478, 0x3402}, "Nitro Krypt King"},
-    {{479, 0x0000}, "Short Cut"},
-    {{480, 0x0000}, "Bat Spin"},
-    {{481, 0x0000}, "Funny Bone"},
-    {{482, 0x0000}, "Knight Light"},
-    {{483, 0x0000}, "Spotlight"},
-    {{484, 0x0000}, "Knight Mare"},
-    {{485, 0x0000}, "Blackout"},
-    {{502, 0x0000}, "Bop"},
-    {{505, 0x0000}, "Terrabite"},
-    {{506, 0x0000}, "Breeze"},
-    {{508, 0x0000}, "Pet Vac"},
-    {{508, 0x3402}, "Power Punch Pet Vac"},
-    {{507, 0x0000}, "Weeruptor"},
-    {{507, 0x3402}, "Eggcellent Weeruptor"},
-    {{509, 0x0000}, "Small Fry"},
-    {{510, 0x0000}, "Drobit"},
-    {{519, 0x0000}, "Trigger Snappy"},
-    {{526, 0x3000}, "Whisper Elf"},
-    {{540, 0x3000}, "Barkley"},
-    {{540, 0x3402}, "Gnarly Barkley"},
-    {{541, 0x3000}, "Thumpling"},
-    {{514, 0x0000}, "Gill Runt"},
-    {{542, 0x3000}, "Mini-Jini"},
-    {{503, 0x0000}, "Spry"},
-    {{504, 0x0000}, "Hijinx"},
-    {{543, 0x1000}, "Eye Small"},
-    {{601, 0x0000}, "King Pen"},
-    {{602, 0x0000}, "Tri-Tip"},
-    {{603, 0x0000}, "Chopscotch"},
-    {{604, 0x0000}, "Boom Bloom"},
-    {{605, 0x0000}, "Pit Boss"},
-    {{606, 0x0000}, "Barbella"},
-    {{607, 0x0000}, "Air Strike"},
-    {{608, 0x0000}, "Ember"},
-    {{609, 0x0000}, "Ambush"},
-    {{610, 0x0000}, "Dr. Krankcase"},
-    {{611, 0x0000}, "Hood Sickle"},
-    {{612, 0x0000}, "Tae Kwon Crow"},
-    {{613, 0x0000}, "Golden Queen"},
-    {{614, 0x0000}, "Wolfgang"},
-    {{615, 0x0000}, "Pain-Yatta"},
-    {{616, 0x0000}, "Mysticat"},
-    {{617, 0x0000}, "Starcast"},
-    {{618, 0x0000}, "Buckshot"},
-    {{619, 0x0000}, "Aurora"},
-    {{620, 0x0000}, "Flare Wolf"},
-    {{621, 0x0000}, "Chompy Mage"},
-    {{622, 0x0000}, "Bad Juju"},
-    {{623, 0x0000}, "Grave Clobber"},
-    {{624, 0x0000}, "Blaster-Tron"},
-    {{625, 0x0000}, "Ro-Bow"},
-    {{626, 0x0000}, "Chain Reaction"},
-    {{627, 0x0000}, "Kaos"},
-    {{628, 0x0000}, "Wild Storm"},
-    {{629, 0x0000}, "Tidepool"},
-    {{630, 0x0000}, "Crash Bandicoot"},
-    {{631, 0x0000}, "Dr. Neo Cortex"},
-    {{1000, 0x0000}, "Boom Jet (Bottom)"},
-    {{1001, 0x0000}, "Free Ranger (Bottom)"},
-    {{1001, 0x2403}, "Legendary Free Ranger (Bottom)"},
-    {{1002, 0x0000}, "Rubble Rouser (Bottom)"},
-    {{1003, 0x0000}, "Doom Stone (Bottom)"},
-    {{1004, 0x0000}, "Blast Zone (Bottom)"},
-    {{1004, 0x2402}, "Dark Blast Zone (Bottom)"},
-    {{1005, 0x0000}, "Fire Kraken (Bottom)"},
-    {{1005, 0x2402}, "Jade Fire Kraken (Bottom)"},
-    {{1006, 0x0000}, "Stink Bomb (Bottom)"},
-    {{1007, 0x0000}, "Grilla Drilla (Bottom)"},
-    {{1008, 0x0000}, "Hoot Loop (Bottom)"},
-    {{1008, 0x2402}, "Enchanted Hoot Loop (Bottom)"},
-    {{1009, 0x0000}, "Trap Shadow (Bottom)"},
-    {{1010, 0x0000}, "Magna Charge (Bottom)"},
-    {{1010, 0x2402}, "Nitro Magna Charge (Bottom)"},
-    {{1011, 0x0000}, "Spy Rise (Bottom)"},
-    {{1012, 0x0000}, "Night Shift (Bottom)"},
-    {{1012, 0x2403}, "Legendary Night Shift (Bottom)"},
-    {{1013, 0x0000}, "Rattle Shake (Bottom)"},
-    {{1013, 0x2402}, "Quick Draw Rattle Shake (Bottom)"},
-    {{1014, 0x0000}, "Freeze Blade (Bottom)"},
-    {{1014, 0x2402}, "Nitro Freeze Blade (Bottom)"},
-    {{1015, 0x0000}, "Wash Buckler (Bottom)"},
-    {{1015, 0x2402}, "Dark Wash Buckler (Bottom)"},
-    {{2000, 0x0000}, "Boom Jet (Top)"},
-    {{2001, 0x0000}, "Free Ranger (Top)"},
-    {{2001, 0x2403}, "Legendary Free Ranger (Top)"},
-    {{2002, 0x0000}, "Rubble Rouser (Top)"},
-    {{2003, 0x0000}, "Doom Stone (Top)"},
-    {{2004, 0x0000}, "Blast Zone (Top)"},
-    {{2004, 0x2402}, "Dark Blast Zone (Top)"},
-    {{2005, 0x0000}, "Fire Kraken (Top)"},
-    {{2005, 0x2402}, "Jade Fire Kraken (Top)"},
-    {{2006, 0x0000}, "Stink Bomb (Top)"},
-    {{2007, 0x0000}, "Grilla Drilla (Top)"},
-    {{2008, 0x0000}, "Hoot Loop (Top)"},
-    {{2008, 0x2402}, "Enchanted Hoot Loop (Top)"},
-    {{2009, 0x0000}, "Trap Shadow (Top)"},
-    {{2010, 0x0000}, "Magna Charge (Top)"},
-    {{2010, 0x2402}, "Nitro Magna Charge (Top)"},
-    {{2011, 0x0000}, "Spy Rise (Top)"},
-    {{2012, 0x0000}, "Night Shift (Top)"},
-    {{2012, 0x2403}, "Legendary Night Shift (Top)"},
-    {{2013, 0x0000}, "Rattle Shake (Top)"},
-    {{2013, 0x2402}, "Quick Draw Rattle Shake (Top)"},
-    {{2014, 0x0000}, "Freeze Blade (Top)"},
-    {{2014, 0x2402}, "Nitro Freeze Blade (Top)"},
-    {{2015, 0x0000}, "Wash Buckler (Top)"},
-    {{2015, 0x2402}, "Dark Wash Buckler (Top)"},
-    {{3000, 0x0000}, "Scratch"},
-    {{3001, 0x0000}, "Pop Thorn"},
-    {{3002, 0x0000}, "Slobber Tooth"},
-    {{3002, 0x2402}, "Dark Slobber Tooth"},
-    {{3003, 0x0000}, "Scorp"},
-    {{3004, 0x0000}, "Fryno"},
-    {{3004, 0x3805}, "Hog Wild Fryno"},
-    {{3005, 0x0000}, "Smolderdash"},
-    {{3005, 0x2206}, "LightCore Smolderdash"},
-    {{3006, 0x0000}, "Bumble Blast"},
-    {{3006, 0x2402}, "Jolly Bumble Blast"},
-    {{3006, 0x2206}, "LightCore Bumble Blast"},
-    {{3007, 0x0000}, "Zoo Lou"},
-    {{3007, 0x2403}, "Legendary Zoo Lou"},
-    {{3008, 0x0000}, "Dune Bug"},
-    {{3009, 0x0000}, "Star Strike"},
-    {{3009, 0x2602}, "Enchanted Star Strike"},
-    {{3009, 0x2206}, "LightCore Star Strike"},
-    {{3010, 0x0000}, "Countdown"},
-    {{3010, 0x2402}, "Kickoff Countdown"},
-    {{3010, 0x2206}, "LightCore Countdown"},
-    {{3011, 0x0000}, "Wind Up"},
-    {{3012, 0x0000}, "Roller Brawl"},
-    {{3013, 0x0000}, "Grim Creeper"},
-    {{3013, 0x2603}, "Legendary Grim Creeper"},
-    {{3013, 0x2206}, "LightCore Grim Creeper"},
-    {{3014, 0x0000}, "Rip Tide"},
-    {{3015, 0x0000}, "Punk Shock"},
-    {{3200, 0x2000}, "Battle Hammer"},
-    {{3201, 0x2000}, "Sky Diamond"},
-    {{3202, 0x2000}, "Platinum Sheep"},
-    {{3203, 0x2000}, "Groove Machine"},
-    {{3204, 0x0000}, "UFO Hat"},
-    {{3300, 0x2000}, "Sheep Wreck Island"},
-    {{3301, 0x2000}, "Tower of Time"},
-    {{3302, 0x2206}, "Fiery Forge"},
-    {{3303, 0x2206}, "Arkeyan Crossbow"},
-    {{3220, 0x0000}, "Jet Stream"},
-    {{3221, 0x0000}, "Tomb Buggy"},
-    {{3222, 0x0000}, "Reef Ripper"},
-    {{3223, 0x0000}, "Burn Cycle"},
-    {{3224, 0x0000}, "Hot Streak"},
-    {{3224, 0x4402}, "Dark Hot Streak"},
-    {{3224, 0x4004}, "E3 Hot Streak"},
-    {{3224, 0x441E}, "Golden Hot Streak"},
-    {{3225, 0x0000}, "Shark Tank"},
-    {{3226, 0x0000}, "Thump Truck"},
-    {{3227, 0x0000}, "Crypt Crusher"},
-    {{3228, 0x0000}, "Stealth Stinger"},
-    {{3228, 0x4402}, "Nitro Stealth Stinger"},
-    {{3231, 0x0000}, "Dive Bomber"},
-    {{3231, 0x4402}, "Spring Ahead Dive Bomber"},
-    {{3232, 0x0000}, "Sky Slicer"},
-    //{{3233, 0x0000}, "Clown Cruiser (Nintendo Only)"},
-    //{{3233, 0x4402}, "Dark Clown Cruiser (Nintendo Only)"},
-    {{3234, 0x0000}, "Gold Rusher"},
-    {{3234, 0x4402}, "Power Blue Gold Rusher"},
-    {{3235, 0x0000}, "Shield Striker"},
-    {{3236, 0x0000}, "Sun Runner"},
-    {{3236, 0x4403}, "Legendary Sun Runner"},
-    {{3237, 0x0000}, "Sea Shadow"},
-    {{3237, 0x4402}, "Dark Sea Shadow"},
-    {{3238, 0x0000}, "Splatter Splasher"},
-    {{3238, 0x4402}, "Power Blue Splatter Splasher"},
-    {{3239, 0x0000}, "Soda Skimmer"},
-    {{3239, 0x4402}, "Nitro Soda Skimmer"},
-    //{{3240, 0x0000}, "Barrel Blaster (Nintendo Only)"},
-    //{{3240, 0x4402}, "Dark Barrel Blaster (Nintendo Only)"},
-    {{3241, 0x0000}, "Buzz Wing"},
-    {{3400, 0x0000}, "Fiesta"},
-    {{3400, 0x4515}, "Frightful Fiesta"},
-    {{3401, 0x0000}, "High Volt"},
-    {{3402, 0x0000}, "Splat"},
-    {{3402, 0x4502}, "Power Blue Splat"},
-    {{3406, 0x0000}, "Stormblade"},
-    {{3411, 0x0000}, "Smash Hit"},
-    {{3411, 0x4502}, "Steel Plated Smash Hit"},
-    {{3412, 0x0000}, "Spitfire"},
-    {{3412, 0x4502}, "Dark Spitfire"},
-    {{3413, 0x0000}, "Hurricane Jet Vac"},
-    {{3413, 0x4503}, "Legendary Hurricane Jet Vac"},
-    {{3414, 0x0000}, "Double Dare Trigger Happy"},
-    {{3414, 0x4502}, "Power Blue Double Dare Trigger Happy"},
-    {{3415, 0x0000}, "Super Shot Stealth Elf"},
-    {{3415, 0x4502}, "Dark Super Shot Stealth Elf"},
-    {{3416, 0x0000}, "Shark Shooter Terrafin"},
-    {{3417, 0x0000}, "Bone Bash Roller Brawl"},
-    {{3417, 0x4503}, "Legendary Bone Bash Roller Brawl"},
-    {{3420, 0x0000}, "Big Bubble Pop Fizz"},
-    {{3420, 0x450E}, "Birthday Bash Big Bubble Pop Fizz"},
-    {{3421, 0x0000}, "Lava Lance Eruptor"},
-    {{3422, 0x0000}, "Deep Dive Gill Grunt"},
-    //{{3423, 0x0000}, "Turbo Charge Donkey Kong (Nintendo Only)"},
-    //{{3423, 0x4502}, "Dark Turbo Charge Donkey Kong (Nintendo Only)"},
-    //{{3424, 0x0000}, "Hammer Slam Bowser (Nintendo Only)"},
-    //{{3424, 0x4502}, "Dark Hammer Slam Bowser (Nintendo Only)"},
-    {{3425, 0x0000}, "Dive-Clops"},
-    {{3425, 0x450E}, "Missile-Tow Dive-Clops"},
-    {{3426, 0x0000}, "Astroblast"},
-    {{3426, 0x4503}, "Legendary Astroblast"},
-    {{3427, 0x0000}, "Nightfall"},
-    {{3428, 0x0000}, "Thrillipede"},
-    {{3428, 0x450D}, "Eggcited Thrillipede"},
-    {{3500, 0x0000}, "Sky Trophy"},
-    {{3501, 0x0000}, "Land Trophy"},
-    {{3502, 0x0000}, "Sea Trophy"},
-    {{3503, 0x0000}, "Kaos Trophy"},
-};
-
 u16 skylander_crc16(u16 init_value, const u8* buffer, u32 size)
 {
 	constexpr unsigned short CRC_CCITT_TABLE[256] = {
@@ -739,19 +255,21 @@ skylander_dialog::~skylander_dialog()
 
 skylander_dialog* skylander_dialog::get_dlg(QWidget* parent)
 {
-	if (inst == nullptr)
+	if (inst == nullptr) {
 		inst = new skylander_dialog(parent);
+	} else {
+		inst->update_edits();
+	}
 
 	return inst;
 }
 
 void skylander_dialog::clear_skylander(u8 slot)
 {
-	if (const auto& slot_infos = sky_slots[slot])
+	if (const auto& slot_infos = g_skyportal.get_skylander(slot))
 	{
 		const auto& [cur_slot, id, var] = slot_infos.value();
 		g_skyportal.remove_skylander(cur_slot);
-		sky_slots[slot] = {};
 		update_edits();
 	}
 }
@@ -796,11 +314,7 @@ void skylander_dialog::load_skylander_path(u8 slot, const QString& path)
 
 	clear_skylander(slot);
 
-	u16 sky_id  = reinterpret_cast<le_t<u16>&>(data[0x10]);
-	u16 sky_var = reinterpret_cast<le_t<u16>&>(data[0x1C]);
-
-	u8 portal_slot  = g_skyportal.load_skylander(data.data(), std::move(sky_file));
-	sky_slots[slot] = std::tuple(portal_slot, sky_id, sky_var);
+	g_skyportal.load_skylander(slot, data.data(), std::move(sky_file));
 
 	update_edits();
 }
@@ -810,7 +324,7 @@ void skylander_dialog::update_edits()
 	for (auto i = 0; i < UI_SKY_NUM; i++)
 	{
 		QString display_string;
-		if (const auto& sd = sky_slots[i])
+		if (const auto& sd = g_skyportal.get_skylander(i))
 		{
 			const auto& [portal_slot, sky_id, sky_var] = sd.value();
 			const auto found_sky = list_skylanders.find(std::make_pair(sky_id, sky_var));
diff --git a/rpcs3/rpcs3qt/skylander_dialog.h b/rpcs3/rpcs3qt/skylander_dialog.h
index bd4224d91b..3f91713546 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.h
+++ b/rpcs3/rpcs3qt/skylander_dialog.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <optional>
 #include "util/types.hpp"
 
 #include <QDialog>
@@ -42,7 +41,6 @@ protected:
 
 protected:
 	QLineEdit* edit_skylanders[UI_SKY_NUM]{};
-	static std::optional<std::tuple<u8, u16, u16>> sky_slots[UI_SKY_NUM];
 
 private:
 	static skylander_dialog* inst;

From 97693eecf19303467c8cff1942eb66fa1512e310 Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Mon, 18 May 2026 23:41:44 +0200
Subject: [PATCH 05/11] Add Remove + Better Name Label

---
 .../USBDevices/overlay_skylander_dialog.cpp   | 60 +++++++++++--------
 .../USBDevices/overlay_skylander_dialog.h     |  4 +-
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index ad88023d68..d617e9fc6d 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -12,9 +12,9 @@ namespace rsx
 		static constexpr u16 sky_list_y = 85;
 		static constexpr u16 sky_list_h = 540;
 
-		skylander_list_entry::skylander_list_entry()
+		skylander_list_entry::skylander_list_entry(std::string name)
 		{
-			std::unique_ptr<overlay_element> label_text = std::make_unique<label>("None");
+			std::unique_ptr<overlay_element> label_text = std::make_unique<label>(name);
 			std::unique_ptr<overlay_element> label_load = std::make_unique<label>("Load");
 			std::unique_ptr<overlay_element> load_image = std::make_unique<image_view>(30, 30);
 			std::unique_ptr<overlay_element> label_clear = std::make_unique<label>("Clear");
@@ -102,6 +102,7 @@ namespace rsx
 				break;
 			case pad_button::square:
 				// clear
+				clear_skylander(m_list->get_selected_index());
 				break;
 			case pad_button::triangle:
 				// create
@@ -152,26 +153,6 @@ namespace rsx
 			}
 			if (m_list)
 			{
-				if (!m_list->m_items.empty())
-				{
-					for (u8 sky_slot = 0; sky_slot < 8; sky_slot++)
-					{
-						if (const auto& slot_infos = g_skyportal.get_skylander(sky_slot))
-						{
-							auto entry = m_list->m_items[sky_slot].get();
-							const auto& [portal_slot, sky_id, sky_var] = slot_infos.value();
-							const auto found_sky = list_skylanders.find(std::make_pair(sky_id, sky_var));
-							if (found_sky != list_skylanders.cend())
-							{
-								entry->set_text(found_sky->second);
-							}
-							else
-							{
-								entry->set_text(fmt::format("Unknown (Id:%d Var:%d)", sky_id, sky_var));
-							}
-						}
-					}
-				}
 				result.add(m_list->get_compiled());
 			}
 			result.add(m_description->get_compiled());
@@ -210,13 +191,28 @@ namespace rsx
 
 		void skylander_dialog::reload()
 		{
-			s32 selected_index = 0;
+			s32 selected_index = m_list ? m_list->get_selected_index() : 0;
 
 			std::vector<std::unique_ptr<overlay_element>> entries;
 			for (u8 sky_slot = 0; sky_slot < 8; ++sky_slot)
 			{
-				auto entry = std::make_unique<skylander_list_entry>();
-				entries.emplace_back(std::move(entry));
+				if (const auto& slot_infos = g_skyportal.get_skylander(sky_slot))
+				{
+					const auto& [portal_slot, sky_id, sky_var] = slot_infos.value();
+					const auto found_sky = list_skylanders.find(std::make_pair(sky_id, sky_var));
+					if (found_sky != list_skylanders.cend())
+					{
+						entries.emplace_back(std::make_unique<skylander_list_entry>(found_sky->second));
+					}
+					else
+					{
+						entries.emplace_back(std::make_unique<skylander_list_entry>(fmt::format("Unknown (Id:%d Var:%d)", sky_id, sky_var)));
+					}
+				}
+				else
+				{
+					entries.emplace_back(std::make_unique<skylander_list_entry>("None"));
+				}
 			}
 
 			// Recreate list
@@ -242,5 +238,19 @@ namespace rsx
 			m_description->set_text("Emulated Skylander Portal");
 			m_description->auto_resize();
 		}
+
+		void skylander_dialog::clear_skylander(u8 sky_slot)
+		{
+			ensure(sky_slot < 8);
+
+			if (const auto& slot_infos = g_skyportal.get_skylander(sky_slot))
+			{
+				const auto& [cur_slot, id, var] = slot_infos.value();
+				if (g_skyportal.remove_skylander(cur_slot))
+				{
+					m_list_dirty = true;
+				}
+			}
+		}
 	} // namespace overlays
 } // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
index bd12dcff97..bebbf9beb2 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
@@ -13,10 +13,9 @@ namespace rsx
 			overlay_element* skylander_name = nullptr;
 
 		public:
-			skylander_list_entry();
+			skylander_list_entry(std::string name);
 			void set_text(std::string_view text) override
 			{
-				rsx_log.notice("[ui] Setting skylander name to %s", text.data());
 				if (skylander_name)
 				{
 					static_cast<label*>(skylander_name)->set_text(text);
@@ -29,6 +28,7 @@ namespace rsx
 		{
 		private:
 			void reload();
+			void clear_skylander(u8 sky_slot);
 
 			std::unique_ptr<overlay_element> m_dim_background;
 			std::unique_ptr<list_view> m_list;

From 4dd4d406840fde7c044a8aa87f7c6b144ff7e133 Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Tue, 19 May 2026 00:00:35 +0200
Subject: [PATCH 06/11] remove unnecessary

---
 .../USBDevices/overlay_skylander_dialog.cpp   |  4 ++--
 .../USBDevices/overlay_skylander_dialog.h     | 22 +++++--------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index d617e9fc6d..27a207dab2 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -12,7 +12,7 @@ namespace rsx
 		static constexpr u16 sky_list_y = 85;
 		static constexpr u16 sky_list_h = 540;
 
-		skylander_list_entry::skylander_list_entry(std::string name)
+		skylander_dialog::skylander_list_entry::skylander_list_entry(std::string name)
 		{
 			std::unique_ptr<overlay_element> label_text = std::make_unique<label>(name);
 			std::unique_ptr<overlay_element> label_load = std::make_unique<label>("Load");
@@ -47,7 +47,7 @@ namespace rsx
 			static_cast<image_view*>(create_image.get())->set_image_resource(resource_config::standard_image_resource::triangle);
 
 			this->pack_padding = 15;
-			skylander_name = add_element(label_text);
+			add_element(label_text);
 			add_element(load_image);
 			add_element(label_load);
 			add_element(clear_image);
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
index bebbf9beb2..abbc7f55eb 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
@@ -7,26 +7,16 @@ namespace rsx
 {
 	namespace overlays
 	{
-		struct skylander_list_entry : horizontal_layout
-		{
-		private:
-			overlay_element* skylander_name = nullptr;
-
-		public:
-			skylander_list_entry(std::string name);
-			void set_text(std::string_view text) override
-			{
-				if (skylander_name)
-				{
-					static_cast<label*>(skylander_name)->set_text(text);
-					static_cast<label*>(skylander_name)->auto_resize();
-				}
-			}
-		};
 
 		struct skylander_dialog : public user_interface
 		{
 		private:
+			struct skylander_list_entry : horizontal_layout
+			{
+			public:
+				skylander_list_entry(std::string name);
+			};
+
 			void reload();
 			void clear_skylander(u8 sky_slot);
 

From 29ffab52f7a9a55c8dfef402baf2a395a02f7cd9 Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Tue, 19 May 2026 23:15:55 +0200
Subject: [PATCH 07/11] Add Load Dialog Interface

---
 bin/Icons/ui/home/256/file-solid.png          | Bin 0 -> 3957 bytes
 bin/Icons/ui/home/256/folder-solid.png        | Bin 0 -> 3029 bytes
 bin/Icons/ui/home/32/file-solid.png           | Bin 0 -> 521 bytes
 bin/Icons/ui/home/32/folder-solid.png         | Bin 0 -> 442 bytes
 .../Overlays/HomeMenu/overlay_home_icons.cpp  |   4 +
 .../Overlays/HomeMenu/overlay_home_icons.h    |   2 +
 .../USBDevices/overlay_skylander_dialog.cpp   | 276 ++++++++++++++++++
 .../USBDevices/overlay_skylander_dialog.h     |  44 +++
 8 files changed, 326 insertions(+)
 create mode 100644 bin/Icons/ui/home/256/file-solid.png
 create mode 100644 bin/Icons/ui/home/256/folder-solid.png
 create mode 100644 bin/Icons/ui/home/32/file-solid.png
 create mode 100644 bin/Icons/ui/home/32/folder-solid.png

diff --git a/bin/Icons/ui/home/256/file-solid.png b/bin/Icons/ui/home/256/file-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..80695e037f893db5a451ffc6a7765410fc37b6f9
GIT binary patch
literal 3957
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

literal 0
HcmV?d00001

diff --git a/bin/Icons/ui/home/256/folder-solid.png b/bin/Icons/ui/home/256/folder-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..db081253ddf88e8c6237396e4a91900174ec0502
GIT binary patch
literal 3029
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
IDl$Fp-@#lnNB{r;

literal 0
HcmV?d00001

diff --git a/bin/Icons/ui/home/32/file-solid.png b/bin/Icons/ui/home/32/file-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab788c763d5880eab8d3c54304cc9c076d5f7705
GIT binary patch
literal 521
zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SyGcYrR9J=WmoaD*K@^6+w;bmp5hPeyNw7#ISBaHKiXe8@X$%Bg
zErY#S+1Oeuh=>?M6s#;_CD;Xv6e%pk!eC(xc(;Fwo5OM3x!K(;Yry-P-8XON%{On}
zEHg%lBxS%FunJrN`p%VkpA{v~55OHW+bxS*Ns{`KUaPtGC0(mJo|ORH2ktrZ6R-sw
zxEYSzv+%kUz!~5!aN4yU0yoX<O_SO0yP0fD%4_s}9Ax6Bq#LPzSzs>$XWjclGdrxo
z|1Gd{;6(}|1n})JU`oT1wh6@bssO%<DZZ)z6Ns0Rmg)k;0><=fiZ2IVNgC7vsH;@H
z%mL5C!fq2_lktye5BLmx0lxBQEnNgIMI%TWc-!boTV#@Md2z4$zBV&3P48olt^lG1
z-R3r&rf96LGVsp<qM8Am=o;t*?!Q@rMgX%V=wzG|y##Fn^r{Zx|1i$A2v9ASq+HT>
zcXD|rsh{qZjG0M#=3<T{o%j7^SF;Dex-)lx4d4gA4;86%!X&Fb;1sY7Ty||w&1@w_
zoJ)FpjLT_EA0^F)<NcKZ2hjs=GrpcL(7Ygrj8Df;fJbI_5Pon3jJRJ+5;C_E00000
LNkvXXu0mjf^f=!e

literal 0
HcmV?d00001

diff --git a/bin/Icons/ui/home/32/folder-solid.png b/bin/Icons/ui/home/32/folder-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..81b99ccc880db482448f49ecf7dcbd3a0faf9664
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SY)M2xR9J=Om#a<#K@^6+Gi)kIRYikBBavtn215{#)Z%y>9s+>{
zN5Ufz8p6d92q72*L6oN3AJLs=3ca^GBlwcZoZZ=-^Y59<o`J+zcp<3*Q~+0$ZqVE|
zvsNi8ByCH&mXvEW-;z!x)tBvjtLS`MZi+}PO~BO*&OHaq@}B`4bG&yXX$|NU#m|*d
zwYR%K8)%x@0|1iV=7_+e<dRM#xs2XykBtM4fk%_{4%C4ra0q+`;ex?1h8>LSd>pI5
z8L$c5W<kTHncYnmzc`Z43jwuIZ99hZU${`fuuzwU_vQSS8(V<KrC0%j3IaQ31oB}5
zQZO(F(kKY*eB@J+1SBDqfT8<968`NFxX|$9v655?aih`ySVu3Xi!Gr419X5tY*Zr(
z@V;6Z@C>X24N3RF2a{8>S#Uw^fEv&!?md~L9pHlaE20bR0w8Hm(o4j&{8iFE{5_mj
k=^a+eq+@1ZCHt739}A+^9dHh6Q~&?~07*qoM6N<$g1^YP?EnA(

literal 0
HcmV?d00001

diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp
index 1a734bd974..b41bb0860f 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.cpp
@@ -53,6 +53,10 @@ namespace rsx::overlays::home_menu
 			return "gauge-solid.png";
 		case fa_icon::usb:
 			return "usb-solid.png";
+		case fa_icon::file:
+			return "file-solid.png";
+		case fa_icon::folder:
+			return "folder-solid.png";
 		case fa_icon::bug:
 			return "bug-solid.png";
 		}
diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h
index 8e1717ca21..fb2475132a 100644
--- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h
+++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_icons.h
@@ -26,6 +26,8 @@ namespace rsx::overlays::home_menu
 		settings_sliders,
 		settings_gauge,
 		usb,
+		file,
+		folder,
 		bug,
 	};
 
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index 27a207dab2..8b118d5d4c 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -4,6 +4,7 @@
 #include "Emu/Io/Skylander.h"
 #include "Emu/System.h"
 #include "Emu/VFS.h"
+#include "Utilities/File.h"
 
 namespace rsx
 {
@@ -12,6 +13,8 @@ namespace rsx
 		static constexpr u16 sky_list_y = 85;
 		static constexpr u16 sky_list_h = 540;
 
+		static std::string last_skylander_path = "";
+
 		skylander_dialog::skylander_list_entry::skylander_list_entry(std::string name)
 		{
 			std::unique_ptr<overlay_element> label_text = std::make_unique<label>(name);
@@ -99,6 +102,7 @@ namespace rsx
 				break;
 			case pad_button::cross:
 				// load
+				load_skylander(m_list->get_selected_index());
 				break;
 			case pad_button::square:
 				// clear
@@ -252,5 +256,277 @@ namespace rsx
 				}
 			}
 		}
+
+		void skylander_dialog::load_skylander(u8 slot)
+		{
+			ensure(slot < 8);
+
+			Emu.CallFromMainThread([this, slot]()
+				{
+					if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+					{
+						manager->create<rsx::overlays::skylander_load_dialog>(slot)->show([this](s32 status)
+							{
+								if (status == selection_code::ok)
+									m_list_dirty = true;
+							});
+					}
+				});
+		}
+
+		skylander_load_dialog::skylander_file_list_entry::skylander_file_list_entry(skylander_file_type type, std::string file_name)
+			: file_name(file_name), type(type)
+		{
+			if (type == skylander_file_type::folder)
+			{
+				icon_data = rsx::overlays::resource_config::load_icon("home/32/folder-solid.png");
+			}
+			else
+			{
+				icon_data = rsx::overlays::resource_config::load_icon("home/32/file-solid.png");
+			}
+			std::unique_ptr<overlay_element> image = std::make_unique<image_view>(30, 30);
+			static_cast<image_view*>(image.get())->set_raw_image(icon_data.get());
+			std::unique_ptr<overlay_element> label_text = std::make_unique<label>(file_name);
+			label_text->set_size(400, 30);
+			label_text->set_font("Arial", 16);
+			label_text->set_wrap_text(true);
+			label_text->back_color.a = 0.f;
+
+			this->pack_padding = 15;
+			this->add_element(image);
+			this->add_element(label_text);
+		}
+
+		skylander_load_dialog::skylander_load_dialog(u8 slot) : slot(slot)
+		{
+			m_allow_input_on_pause = true;
+
+			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_description = std::make_unique<label>();
+			m_description->set_font("Arial", 20);
+			m_description->set_pos(20, 37);
+			m_description->set_text("Emulated Skylander Portal");
+			m_description->auto_resize();
+			m_description->back_color.a = 0.f;
+
+			fade_animation.duration_sec = 0.15f;
+
+			return_code = selection_code::canceled;
+		}
+
+		void skylander_load_dialog::update(u64 timestamp_us)
+		{
+			if (fade_animation.active)
+			{
+				fade_animation.update(timestamp_us);
+			}
+		}
+
+		void skylander_load_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:
+				play_sound(sound_effect::cancel);
+				close_dialog = true;
+				break;
+			case pad_button::cross:
+				// load
+				play_sound(sound_effect::accept);
+				if (m_list && !m_list->m_items.empty())
+				{
+					auto selected_entry = static_cast<const skylander_file_list_entry*>(m_list->get_selected_entry());
+					rsx_log.notice("Selected skylander file entry: %s (type: %d)", selected_entry->get_file_name(), static_cast<u8>(selected_entry->get_type()));
+					if (selected_entry->get_type() == skylander_file_type::folder)
+					{
+						if (selected_entry->get_file_name() == "..")
+						{
+							auto last_slash_pos = last_skylander_path.find_last_of('/', last_skylander_path.length() - 2);
+							if (last_slash_pos != std::string::npos)
+							{
+								last_skylander_path = last_skylander_path.substr(0, last_slash_pos + 1);
+							}
+						}
+						else
+						{
+							last_skylander_path += selected_entry->get_file_name() + "/";
+						}
+						m_list_dirty = true;
+					}
+					else if (selected_entry->get_type() == skylander_file_type::file)
+					{
+						rsx_log.notice("Loading skylander from file: %s", last_skylander_path + selected_entry->get_file_name());
+						fs::file sky_file(last_skylander_path + selected_entry->get_file_name(), fs::read + fs::write + fs::lock);
+						if (!sky_file)
+						{
+							rsx_log.error("Failed to open skylander file: %s", last_skylander_path + selected_entry->get_file_name());
+						}
+						std::array<u8, 0x40 * 0x10> data;
+						if (sky_file.read(data.data(), data.size()) != data.size())
+						{
+							rsx_log.error("Failed to read skylander file: %s", last_skylander_path + selected_entry->get_file_name());
+						}
+						if (const auto skylander = g_skyportal.get_skylander(slot))
+						{
+							const auto& [portal_slot, sky_id, sky_var] = skylander.value();
+							g_skyportal.remove_skylander(portal_slot);
+						}
+						g_skyportal.load_skylander(slot, data.data(), std::move(sky_file));
+						return_code = selection_code::ok;
+						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)
+			{
+				play_sound(sound_effect::cursor);
+			}
+		}
+
+		compiled_resource skylander_load_dialog::get_compiled()
+		{
+			if (!visible)
+			{
+				return {};
+			}
+
+			compiled_resource result;
+			result.add(m_dim_background->get_compiled());
+			if (m_list_dirty.exchange(false))
+			{
+				reload();
+			}
+			if (m_list)
+			{
+				result.add(m_list->get_compiled());
+			}
+			result.add(m_description->get_compiled());
+
+			fade_animation.apply(result);
+
+			return result;
+		}
+
+		void skylander_load_dialog::show(std::function<void(s32 status)> on_close)
+		{
+			visible = false;
+
+			this->on_close = std::move(on_close);
+
+			fade_animation.current = color4f(0.f);
+			fade_animation.end = color4f(1.f);
+			fade_animation.active = true;
+
+			visible = true;
+
+			const auto notify = std::make_shared<atomic_t<u32>>(0);
+			auto& overlayman = g_fxo->get<display_manager>();
+
+			overlayman.attach_thread_input(
+				uid, "Skylander load dialog",
+				[notify]()
+				{
+					*notify = true;
+					notify->notify_one();
+				});
+
+			while (!Emu.IsStopped() && !*notify)
+			{
+				notify->wait(0, atomic_wait_timeout{1'000'000});
+			}
+		}
+
+		void skylander_load_dialog::reload()
+		{
+			s32 selected_index = 0;
+
+			std::vector<std::unique_ptr<overlay_element>> entries;
+
+			std::string skylanders_dir = vfs::get("/dev_hdd0");
+
+			if (!last_skylander_path.empty())
+			{
+				skylanders_dir = last_skylander_path;
+			}
+			else
+			{
+				skylanders_dir = skylanders_dir.substr(0, skylanders_dir.find("dev_hdd0"));
+				last_skylander_path = skylanders_dir;
+			}
+
+			for (auto&& dir_entry : fs::dir{skylanders_dir})
+			{
+				if (dir_entry.is_directory)
+				{
+					entries.emplace_back(std::make_unique<skylander_file_list_entry>(skylander_file_type::folder, dir_entry.name));
+				}
+				else if (dir_entry.name.ends_with(".sky") || dir_entry.name.ends_with(".bin") || dir_entry.name.ends_with(".dump"))
+				{
+					entries.emplace_back(std::make_unique<skylander_file_list_entry>(skylander_file_type::file, dir_entry.name));
+				}
+			}
+			// Recreate list
+			if (m_list)
+			{
+				status_flags |= status_bits::invalidate_image_cache;
+			}
+
+			m_list = std::make_unique<list_view>(virtual_width - 2 * 20, sky_list_h);
+			m_list->set_pos(20, sky_list_y);
+			m_list->set_cancel_only(false);
+
+			for (auto& entry : entries)
+			{
+				m_list->add_entry(entry);
+			}
+
+			if (!m_list->m_items.empty())
+			{
+				m_list->select_entry(selected_index);
+			}
+
+			m_description->set_text("Select Skylander File");
+			m_description->auto_resize();
+		}
 	} // namespace overlays
 } // namespace rsx
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
index abbc7f55eb..d52666ac0d 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
@@ -19,6 +19,7 @@ namespace rsx
 
 			void reload();
 			void clear_skylander(u8 sky_slot);
+			void load_skylander(u8 sky_slot);
 
 			std::unique_ptr<overlay_element> m_dim_background;
 			std::unique_ptr<list_view> m_list;
@@ -38,5 +39,48 @@ namespace rsx
 
 			void show();
 		};
+		enum class skylander_file_type
+		{
+			folder,
+			file
+		};
+
+		struct skylander_load_dialog : public user_interface
+		{
+		private:
+			struct skylander_file_list_entry : horizontal_layout
+			{
+			private:
+				std::unique_ptr<image_info> icon_data;
+				std::string file_name;
+				skylander_file_type type;
+
+			public:
+				skylander_file_list_entry(skylander_file_type type, std::string file_name);
+				std::string get_file_name() const { return file_name; }
+				skylander_file_type get_type() const { return type; }
+			};
+			void reload();
+
+			u8 slot = 0xff;
+
+			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;
+
+			atomic_t<bool> m_list_dirty{true};
+
+		public:
+			skylander_load_dialog(u8 slot);
+
+			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(std::function<void(s32 status)> on_close);
+		};
 	} // namespace overlays
 } // namespace rsx

From dc1ef5d84437b2eb049a7ace10839245352515dd Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Wed, 20 May 2026 12:12:49 +0200
Subject: [PATCH 08/11] Initial Review Changes

---
 rpcs3/Emu/Io/Skylander.cpp                    | 15 +--
 rpcs3/Emu/Io/Skylander.h                      | 12 ++-
 .../HomeMenu/overlay_home_menu_main_menu.cpp  | 24 +++--
 .../USBDevices/overlay_skylander_dialog.cpp   | 98 +++++++++----------
 .../USBDevices/overlay_skylander_dialog.h     | 20 +++-
 rpcs3/Emu/localized_string_id.h               |  5 +
 rpcs3/rpcs3qt/localized_emu.h                 |  6 +-
 rpcs3/rpcs3qt/skylander_dialog.cpp            | 12 ++-
 rpcs3/rpcs3qt/skylander_dialog.h              |  5 +-
 9 files changed, 111 insertions(+), 86 deletions(-)

diff --git a/rpcs3/Emu/Io/Skylander.cpp b/rpcs3/Emu/Io/Skylander.cpp
index 098c4b7c59..b4a0a1605f 100644
--- a/rpcs3/Emu/Io/Skylander.cpp
+++ b/rpcs3/Emu/Io/Skylander.cpp
@@ -630,7 +630,7 @@ bool sky_portal::remove_skylander(u8 sky_num)
 		thesky.queued_status.push(2);
 		thesky.queued_status.push(0);
 		thesky.sky_file.close();
-		ui_skylanders[thesky.ui_slot] = std::nullopt;
+		::at32(ui_skylanders, thesky.ui_slot) = std::nullopt;
 		thesky.ui_slot = 0xFF;
 		return true;
 	}
@@ -646,7 +646,7 @@ u8 sky_portal::load_skylander(u8 ui_slot, u8* buf, fs::file in_file)
 	u8 found_slot  = 0xFF;
 
 	// mimics spot retaining on the portal
-	for (u8 i = 0; i < 8; i++)
+	for (u8 i = 0; i < MAX_SKYLANDERS; i++)
 	{
 		if ((skylanders[i].status & 1) == 0)
 		{
@@ -665,7 +665,7 @@ u8 sky_portal::load_skylander(u8 ui_slot, u8* buf, fs::file in_file)
 
 	ensure(found_slot != 0xFF);
 
-	ui_skylanders[ui_slot] = std::make_tuple(found_slot, reinterpret_cast<le_t<u16>&>(buf[0x10]), reinterpret_cast<le_t<u16>&>(buf[0x1C]));
+	::at32(ui_skylanders, ui_slot) = std::make_tuple(found_slot, reinterpret_cast<le_t<u16>&>(buf[0x10]), reinterpret_cast<le_t<u16>&>(buf[0x1C]));
 	skylander& thesky = skylanders[found_slot];
 	memcpy(thesky.data.data(), buf, thesky.data.size());
 	thesky.sky_file = std::move(in_file);
@@ -678,9 +678,10 @@ u8 sky_portal::load_skylander(u8 ui_slot, u8* buf, fs::file in_file)
 	return found_slot;
 }
 
-std::optional<std::tuple<u8, u16, u16>> sky_portal::get_skylander(u8 ui_slot)
+std::optional<std::tuple<u8, u16, u16>> sky_portal::get_skylander(u8 ui_slot) const
 {
-	return ui_skylanders[ui_slot];
+	//std::lock_guard lock(sky_mutex);
+	return ::at32(ui_skylanders, ui_slot);
 }
 
 usb_device_skylander::usb_device_skylander(const std::array<u8, 7>& location)
@@ -777,7 +778,7 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
 				ensure(buf_size == 3 || buf_size == 32);
 
 				const u8 sky_num = buf[1] & 0xF;
-				ensure(sky_num < 8);
+				ensure(sky_num < MAX_SKYLANDERS);
 				const u8 block = buf[2];
 				ensure(block < 0x40);
 
@@ -813,7 +814,7 @@ void usb_device_skylander::control_transfer(u8 bmRequestType, u8 bRequest, u16 w
 				ensure(buf_size == 19 || buf_size == 32);
 
 				const u8 sky_num = buf[1] & 0xF;
-				ensure(sky_num < 8);
+				ensure(sky_num < MAX_SKYLANDERS);
 				const u8 block = buf[2];
 				ensure(block < 0x40);
 
diff --git a/rpcs3/Emu/Io/Skylander.h b/rpcs3/Emu/Io/Skylander.h
index 6200c27cbd..540e222e02 100644
--- a/rpcs3/Emu/Io/Skylander.h
+++ b/rpcs3/Emu/Io/Skylander.h
@@ -5,6 +5,8 @@
 #include <optional>
 #include <queue>
 
+constexpr auto MAX_SKYLANDERS = 8;
+
 struct skylander
 {
 	fs::file sky_file;
@@ -31,17 +33,19 @@ public:
 
 	bool remove_skylander(u8 sky_num);
 	u8 load_skylander(u8 ui_slot, u8* buf, fs::file in_file);
-	std::optional<std::tuple<u8, u16, u16>> get_skylander(u8 ui_slot);
+	std::optional<std::tuple<u8, u16, u16>> get_skylander(u8 ui_slot) const;
+
+	bool is_active() const { return activated; }
 
 protected:
 	shared_mutex sky_mutex;
 
-	bool activated = true;
+	bool activated = false;
 	u8 interrupt_counter = 0;
 	u8 r = 0, g = 0, b = 0;
 
-	skylander skylanders[8];
-	std::optional<std::tuple<u8, u16, u16>> ui_skylanders[8];
+	std::array<skylander, MAX_SKYLANDERS> skylanders {};
+	std::array<std::optional<std::tuple<u8, u16, u16>>, MAX_SKYLANDERS> ui_skylanders {};
 };
 
 extern sky_portal g_skyportal;
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 1e2f3909f8..d9bc49bf88 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
@@ -10,6 +10,7 @@
 #include "Emu/System.h"
 #include "Emu/system_config.h"
 #include "Emu/Cell/Modules/sceNpTrophy.h"
+#include "Emu/Io/Skylander.h"
 
 extern atomic_t<bool> g_user_asked_for_recording;
 
@@ -97,20 +98,23 @@ namespace rsx
 				});
 			}
 
-			add_item(home_menu::fa_icon::usb, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_USB_DEVICES), [](pad_button btn) -> page_navigation
+			if (g_skyportal.is_active())
 			{
-				if (btn != pad_button::cross) return page_navigation::stay;
-
-				rsx_log.notice("User selected devices in home menu");
-				Emu.CallFromMainThread([]()
+				add_item(home_menu::fa_icon::usb, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_MANAGER), [](pad_button btn) -> page_navigation
 				{
-					if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+					if (btn != pad_button::cross) return page_navigation::stay;
+
+					rsx_log.notice("User selected devices in home menu");
+					Emu.CallFromMainThread([]()
 					{
-						manager->create<rsx::overlays::skylander_dialog>()->show();
-					}
+						if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+						{
+							manager->create<rsx::overlays::skylander_dialog>()->show();
+						}
+					});
+					return page_navigation::stay;
 				});
-				return page_navigation::stay;
-			});
+			}
 
 			add_item(home_menu::fa_icon::screenshot, get_localized_string(localized_string_id::HOME_MENU_SCREENSHOT), [](pad_button btn) -> page_navigation
 			{
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index 8b118d5d4c..8a09999a6b 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -15,48 +15,17 @@ namespace rsx
 
 		static std::string last_skylander_path = "";
 
-		skylander_dialog::skylander_list_entry::skylander_list_entry(std::string name)
+		skylander_dialog::skylander_list_entry::skylander_list_entry(std::string_view name)
 		{
 			std::unique_ptr<overlay_element> label_text = std::make_unique<label>(name);
-			std::unique_ptr<overlay_element> label_load = std::make_unique<label>("Load");
-			std::unique_ptr<overlay_element> load_image = std::make_unique<image_view>(30, 30);
-			std::unique_ptr<overlay_element> label_clear = std::make_unique<label>("Clear");
-			std::unique_ptr<overlay_element> clear_image = std::make_unique<image_view>(30, 30);
-			std::unique_ptr<overlay_element> label_create = std::make_unique<label>("Create");
-			std::unique_ptr<overlay_element> create_image = std::make_unique<image_view>(30, 30);
 
 			label_text->set_size(130, 30);
 			label_text->set_font("Arial", 16);
 			label_text->set_wrap_text(true);
 			label_text->back_color.a = 0.f;
 
-			label_load->set_size(100, 30);
-			label_load->set_font("Arial", 16);
-			label_load->set_wrap_text(true);
-			label_load->back_color.a = 0.f;
-
-			label_clear->set_size(100, 30);
-			label_clear->set_font("Arial", 16);
-			label_clear->set_wrap_text(true);
-			label_clear->back_color.a = 0.f;
-
-			label_create->set_size(100, 30);
-			label_create->set_font("Arial", 16);
-			label_create->set_wrap_text(true);
-			label_create->back_color.a = 0.f;
-
-			static_cast<image_view*>(load_image.get())->set_image_resource(resource_config::standard_image_resource::cross);
-			static_cast<image_view*>(clear_image.get())->set_image_resource(resource_config::standard_image_resource::square);
-			static_cast<image_view*>(create_image.get())->set_image_resource(resource_config::standard_image_resource::triangle);
-
 			this->pack_padding = 15;
 			add_element(label_text);
-			add_element(load_image);
-			add_element(label_load);
-			add_element(clear_image);
-			add_element(label_clear);
-			add_element(create_image);
-			add_element(label_create);
 		}
 
 		skylander_dialog::skylander_dialog()
@@ -70,10 +39,31 @@ namespace rsx
 			m_description = std::make_unique<label>();
 			m_description->set_font("Arial", 20);
 			m_description->set_pos(20, 37);
-			m_description->set_text("Emulated Skylander Portal");
+			m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_MANAGER));
 			m_description->auto_resize();
 			m_description->back_color.a = 0.f;
 
+			m_load_button = std::make_unique<image_button>();
+			m_load_button->set_text(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_LOAD);
+			m_load_button->set_image_resource(resource_config::standard_image_resource::cross);
+			m_load_button->set_size(120, 30);
+			m_load_button->set_pos(180, sky_list_y + sky_list_h + 20);
+			m_load_button->set_font("Arial", 16);
+
+			m_clear_button = std::make_unique<image_button>();
+			m_clear_button->set_text(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_CLEAR);
+			m_clear_button->set_image_resource(resource_config::standard_image_resource::square);
+			m_clear_button->set_size(120, 30);
+			m_clear_button->set_pos(360, sky_list_y + sky_list_h + 20);
+			m_clear_button->set_font("Arial", 16);
+
+			m_create_button = std::make_unique<image_button>();
+			m_create_button->set_text(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_CREATE);
+			m_create_button->set_image_resource(resource_config::standard_image_resource::triangle);
+			m_create_button->set_size(120, 30);
+			m_create_button->set_pos(540, sky_list_y + sky_list_h + 20);
+			m_create_button->set_font("Arial", 16);
+
 			fade_animation.duration_sec = 0.15f;
 
 			return_code = selection_code::canceled;
@@ -160,6 +150,9 @@ namespace rsx
 				result.add(m_list->get_compiled());
 			}
 			result.add(m_description->get_compiled());
+			result.add(m_load_button->get_compiled());
+			result.add(m_clear_button->get_compiled());
+			result.add(m_create_button->get_compiled());
 
 			fade_animation.apply(result);
 
@@ -195,10 +188,10 @@ namespace rsx
 
 		void skylander_dialog::reload()
 		{
-			s32 selected_index = m_list ? m_list->get_selected_index() : 0;
+			const s32 selected_index = m_list ? m_list->get_selected_index() : 0;
 
 			std::vector<std::unique_ptr<overlay_element>> entries;
-			for (u8 sky_slot = 0; sky_slot < 8; ++sky_slot)
+			for (u8 sky_slot = 0; sky_slot < MAX_SKYLANDERS; ++sky_slot)
 			{
 				if (const auto& slot_infos = g_skyportal.get_skylander(sky_slot))
 				{
@@ -239,13 +232,13 @@ namespace rsx
 				m_list->select_entry(selected_index);
 			}
 
-			m_description->set_text("Emulated Skylander Portal");
+			m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_MANAGER));
 			m_description->auto_resize();
 		}
 
 		void skylander_dialog::clear_skylander(u8 sky_slot)
 		{
-			ensure(sky_slot < 8);
+			ensure(sky_slot < MAX_SKYLANDERS);
 
 			if (const auto& slot_infos = g_skyportal.get_skylander(sky_slot))
 			{
@@ -259,7 +252,7 @@ namespace rsx
 
 		void skylander_dialog::load_skylander(u8 slot)
 		{
-			ensure(slot < 8);
+			ensure(slot < MAX_SKYLANDERS);
 
 			Emu.CallFromMainThread([this, slot]()
 				{
@@ -274,7 +267,7 @@ namespace rsx
 				});
 		}
 
-		skylander_load_dialog::skylander_file_list_entry::skylander_file_list_entry(skylander_file_type type, std::string file_name)
+		skylander_load_dialog::skylander_file_list_entry::skylander_file_list_entry(skylander_file_type type, const std::string& file_name)
 			: file_name(file_name), type(type)
 		{
 			if (type == skylander_file_type::folder)
@@ -285,9 +278,11 @@ namespace rsx
 			{
 				icon_data = rsx::overlays::resource_config::load_icon("home/32/file-solid.png");
 			}
-			std::unique_ptr<overlay_element> image = std::make_unique<image_view>(30, 30);
-			static_cast<image_view*>(image.get())->set_raw_image(icon_data.get());
-			std::unique_ptr<overlay_element> label_text = std::make_unique<label>(file_name);
+			auto image = std::make_unique<image_view>(30, 30);
+			image->set_raw_image(icon_data.get());
+			image->set_padding(4, 4, 4, 4);
+
+			auto label_text = std::make_unique<label>(file_name);
 			label_text->set_size(400, 30);
 			label_text->set_font("Arial", 16);
 			label_text->set_wrap_text(true);
@@ -309,7 +304,7 @@ namespace rsx
 			m_description = std::make_unique<label>();
 			m_description->set_font("Arial", 20);
 			m_description->set_pos(20, 37);
-			m_description->set_text("Emulated Skylander Portal");
+			m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_LOAD));
 			m_description->auto_resize();
 			m_description->back_color.a = 0.f;
 
@@ -344,13 +339,13 @@ namespace rsx
 				play_sound(sound_effect::accept);
 				if (m_list && !m_list->m_items.empty())
 				{
-					auto selected_entry = static_cast<const skylander_file_list_entry*>(m_list->get_selected_entry());
+					const auto selected_entry = static_cast<const skylander_file_list_entry*>(m_list->get_selected_entry());
 					rsx_log.notice("Selected skylander file entry: %s (type: %d)", selected_entry->get_file_name(), static_cast<u8>(selected_entry->get_type()));
 					if (selected_entry->get_type() == skylander_file_type::folder)
 					{
 						if (selected_entry->get_file_name() == "..")
 						{
-							auto last_slash_pos = last_skylander_path.find_last_of('/', last_skylander_path.length() - 2);
+							const auto last_slash_pos = last_skylander_path.find_last_of('/', last_skylander_path.length() - 2);
 							if (last_slash_pos != std::string::npos)
 							{
 								last_skylander_path = last_skylander_path.substr(0, last_slash_pos + 1);
@@ -364,16 +359,17 @@ namespace rsx
 					}
 					else if (selected_entry->get_type() == skylander_file_type::file)
 					{
-						rsx_log.notice("Loading skylander from file: %s", last_skylander_path + selected_entry->get_file_name());
-						fs::file sky_file(last_skylander_path + selected_entry->get_file_name(), fs::read + fs::write + fs::lock);
+						std::string full_path = last_skylander_path + selected_entry->get_file_name();
+						rsx_log.notice("Loading skylander from file: %s", full_path);
+						fs::file sky_file(full_path, fs::read + fs::write + fs::lock);
 						if (!sky_file)
 						{
-							rsx_log.error("Failed to open skylander file: %s", last_skylander_path + selected_entry->get_file_name());
+							rsx_log.error("Failed to open skylander file: %s", full_path);
 						}
 						std::array<u8, 0x40 * 0x10> data;
 						if (sky_file.read(data.data(), data.size()) != data.size())
 						{
-							rsx_log.error("Failed to read skylander file: %s", last_skylander_path + selected_entry->get_file_name());
+							rsx_log.error("Failed to read skylander file: %s", full_path);
 						}
 						if (const auto skylander = g_skyportal.get_skylander(slot))
 						{
@@ -478,7 +474,7 @@ namespace rsx
 
 		void skylander_load_dialog::reload()
 		{
-			s32 selected_index = 0;
+			const s32 selected_index = 0;
 
 			std::vector<std::unique_ptr<overlay_element>> entries;
 
@@ -525,7 +521,7 @@ namespace rsx
 				m_list->select_entry(selected_index);
 			}
 
-			m_description->set_text("Select Skylander File");
+			m_description->set_text(get_localized_string(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_LOAD));
 			m_description->auto_resize();
 		}
 	} // namespace overlays
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
index d52666ac0d..ea96c6bb5a 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
@@ -7,14 +7,13 @@ namespace rsx
 {
 	namespace overlays
 	{
-
 		struct skylander_dialog : public user_interface
 		{
 		private:
 			struct skylander_list_entry : horizontal_layout
 			{
 			public:
-				skylander_list_entry(std::string name);
+				skylander_list_entry(std::string_view name);
 			};
 
 			void reload();
@@ -24,6 +23,9 @@ namespace rsx
 			std::unique_ptr<overlay_element> m_dim_background;
 			std::unique_ptr<list_view> m_list;
 			std::unique_ptr<label> m_description;
+			std::unique_ptr<image_button> m_load_button;
+			std::unique_ptr<image_button> m_clear_button;
+			std::unique_ptr<image_button> m_create_button;
 
 			animation_color_interpolate fade_animation;
 
@@ -39,6 +41,7 @@ namespace rsx
 
 			void show();
 		};
+
 		enum class skylander_file_type
 		{
 			folder,
@@ -56,10 +59,17 @@ namespace rsx
 				skylander_file_type type;
 
 			public:
-				skylander_file_list_entry(skylander_file_type type, std::string file_name);
-				std::string get_file_name() const { return file_name; }
-				skylander_file_type get_type() const { return type; }
+				skylander_file_list_entry(skylander_file_type type, const std::string& file_name);
+				const std::string get_file_name() const
+				{
+					return file_name;
+				}
+				skylander_file_type get_type() const
+				{
+					return type;
+				}
 			};
+
 			void reload();
 
 			u8 slot = 0xff;
diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/Emu/localized_string_id.h
index 791c00afef..0a092a84b9 100644
--- a/rpcs3/Emu/localized_string_id.h
+++ b/rpcs3/Emu/localized_string_id.h
@@ -276,6 +276,11 @@ enum class localized_string_id
 	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY,
 	HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_USE_WINDOW_SPACE,
 	HOME_MENU_SETTINGS_USB_DEVICES,
+	HOME_MENU_SETTINGS_SKYLANDER_CLEAR,
+	HOME_MENU_SETTINGS_SKYLANDER_CREATE,
+	HOME_MENU_SETTINGS_SKYLANDER_LOAD,
+	HOME_MENU_SETTINGS_SKYLANDER_LOAD_FILE,
+	HOME_MENU_SETTINGS_SKYLANDER_MANAGER,
 	HOME_MENU_SETTINGS_DEBUG,
 	HOME_MENU_SETTINGS_DEBUG_OVERLAY,
 	HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY,
diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3qt/localized_emu.h
index 3482d7b812..b41dfbe0ff 100644
--- a/rpcs3/rpcs3qt/localized_emu.h
+++ b/rpcs3/rpcs3qt/localized_emu.h
@@ -295,7 +295,11 @@ private:
 		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE: return tr("Font Size", "Performance Overlay");
 		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY: return tr("Opacity", "Performance Overlay");
 		case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_USE_WINDOW_SPACE: return tr("Use Window Space", "Performance Overlay");
-		case localized_string_id::HOME_MENU_SETTINGS_USB_DEVICES: return tr("USB Devices");
+		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_CLEAR: return tr("Clear Skylander");
+		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_CREATE: return tr("Create Skylander");
+		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_LOAD: return tr("Load Skylander");
+		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_LOAD_FILE: return tr("Select Skylander File");
+		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_MANAGER: return tr("Skylander Manager");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG: return tr("Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY: return tr("Debug Overlay", "Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY: return tr("Input Debug Overlay", "Debug");
diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp
index 617d8da6a8..8efa15abe0 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.cpp
+++ b/rpcs3/rpcs3qt/skylander_dialog.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "Utilities/File.h"
 #include "skylander_dialog.h"
-#include "Emu/Io/Skylander.h"
 
 #include <QLabel>
 #include <QGroupBox>
@@ -212,7 +211,7 @@ skylander_dialog::skylander_dialog(QWidget* parent)
 	QGroupBox* group_skylanders = new QGroupBox(tr("Active Portal Skylanders:"));
 	QVBoxLayout* vbox_group     = new QVBoxLayout();
 
-	for (auto i = 0; i < UI_SKY_NUM; i++)
+	for (auto i = 0; i < MAX_SKYLANDERS; i++)
 	{
 		if (i != 0)
 		{
@@ -255,9 +254,12 @@ skylander_dialog::~skylander_dialog()
 
 skylander_dialog* skylander_dialog::get_dlg(QWidget* parent)
 {
-	if (inst == nullptr) {
+	if (inst == nullptr)
+	{
 		inst = new skylander_dialog(parent);
-	} else {
+	}
+	else
+	{
 		inst->update_edits();
 	}
 
@@ -321,7 +323,7 @@ void skylander_dialog::load_skylander_path(u8 slot, const QString& path)
 
 void skylander_dialog::update_edits()
 {
-	for (auto i = 0; i < UI_SKY_NUM; i++)
+	for (auto i = 0; i < MAX_SKYLANDERS; i++)
 	{
 		QString display_string;
 		if (const auto& sd = g_skyportal.get_skylander(i))
diff --git a/rpcs3/rpcs3qt/skylander_dialog.h b/rpcs3/rpcs3qt/skylander_dialog.h
index 3f91713546..8bff7dc9df 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.h
+++ b/rpcs3/rpcs3qt/skylander_dialog.h
@@ -1,12 +1,11 @@
 #pragma once
 
 #include "util/types.hpp"
+#include "Emu/Io/Skylander.h"
 
 #include <QDialog>
 #include <QLineEdit>
 
-constexpr auto UI_SKY_NUM = 8;
-
 class skylander_creator_dialog : public QDialog
 {
 	Q_OBJECT
@@ -40,7 +39,7 @@ protected:
 	void update_edits();
 
 protected:
-	QLineEdit* edit_skylanders[UI_SKY_NUM]{};
+	QLineEdit* edit_skylanders[MAX_SKYLANDERS]{};
 
 private:
 	static skylander_dialog* inst;

From 85fe88bcc85d1ff124f511d0bf969d961702795b Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Wed, 20 May 2026 22:06:16 +0200
Subject: [PATCH 09/11] Tidyups and Review changes

---
 rpcs3/Emu/Io/Skylander.cpp                                | 4 ++--
 rpcs3/Emu/Io/Skylander.h                                  | 2 +-
 .../RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp  | 6 +++---
 .../RSX/Overlays/USBDevices/overlay_skylander_dialog.h    | 2 +-
 rpcs3/Emu/localized_string_id.h                           | 2 ++
 rpcs3/rpcs3qt/localized_emu.h                             | 2 ++
 rpcs3/rpcs3qt/skylander_dialog.cpp                        | 8 ++++----
 rpcs3/rpcs3qt/skylander_dialog.h                          | 2 +-
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/rpcs3/Emu/Io/Skylander.cpp b/rpcs3/Emu/Io/Skylander.cpp
index b4a0a1605f..d9f188f92a 100644
--- a/rpcs3/Emu/Io/Skylander.cpp
+++ b/rpcs3/Emu/Io/Skylander.cpp
@@ -558,7 +558,7 @@ void sky_portal::get_status(u8* reply_buf)
 
 	u16 status = 0;
 
-	for (int i = 7; i >= 0; i--)
+	for (int i = MAX_SKYLANDERS - 1; i >= 0; i--)
 	{
 		auto& s = skylanders[i];
 
@@ -680,7 +680,7 @@ u8 sky_portal::load_skylander(u8 ui_slot, u8* buf, fs::file in_file)
 
 std::optional<std::tuple<u8, u16, u16>> sky_portal::get_skylander(u8 ui_slot) const
 {
-	//std::lock_guard lock(sky_mutex);
+	std::lock_guard lock(sky_mutex);
 	return ::at32(ui_skylanders, ui_slot);
 }
 
diff --git a/rpcs3/Emu/Io/Skylander.h b/rpcs3/Emu/Io/Skylander.h
index 540e222e02..9f2a1a72f2 100644
--- a/rpcs3/Emu/Io/Skylander.h
+++ b/rpcs3/Emu/Io/Skylander.h
@@ -38,7 +38,7 @@ public:
 	bool is_active() const { return activated; }
 
 protected:
-	shared_mutex sky_mutex;
+	mutable shared_mutex sky_mutex;
 
 	bool activated = false;
 	u8 interrupt_counter = 0;
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index 8a09999a6b..2e2924a4ab 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -203,12 +203,12 @@ namespace rsx
 					}
 					else
 					{
-						entries.emplace_back(std::make_unique<skylander_list_entry>(fmt::format("Unknown (Id:%d Var:%d)", sky_id, sky_var)));
+						entries.emplace_back(std::make_unique<skylander_list_entry>(get_localized_string(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_UNKNOWN) + fmt::format(" (Id:%d Var:%d)", sky_id, sky_var)));
 					}
 				}
 				else
 				{
-					entries.emplace_back(std::make_unique<skylander_list_entry>("None"));
+					entries.emplace_back(std::make_unique<skylander_list_entry>(get_localized_string(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_NO_SKYLANDER)));
 				}
 			}
 
@@ -359,7 +359,7 @@ namespace rsx
 					}
 					else if (selected_entry->get_type() == skylander_file_type::file)
 					{
-						std::string full_path = last_skylander_path + selected_entry->get_file_name();
+						const std::string full_path = last_skylander_path + selected_entry->get_file_name();
 						rsx_log.notice("Loading skylander from file: %s", full_path);
 						fs::file sky_file(full_path, fs::read + fs::write + fs::lock);
 						if (!sky_file)
diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
index ea96c6bb5a..59fac8affb 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.h
@@ -60,7 +60,7 @@ namespace rsx
 
 			public:
 				skylander_file_list_entry(skylander_file_type type, const std::string& file_name);
-				const std::string get_file_name() const
+				const std::string& get_file_name() const
 				{
 					return file_name;
 				}
diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/Emu/localized_string_id.h
index 0a092a84b9..b2e87d57e5 100644
--- a/rpcs3/Emu/localized_string_id.h
+++ b/rpcs3/Emu/localized_string_id.h
@@ -281,6 +281,8 @@ enum class localized_string_id
 	HOME_MENU_SETTINGS_SKYLANDER_LOAD,
 	HOME_MENU_SETTINGS_SKYLANDER_LOAD_FILE,
 	HOME_MENU_SETTINGS_SKYLANDER_MANAGER,
+	HOME_MENU_SETTINGS_SKYLANDER_NO_SKYLANDER,
+	HOME_MENU_SETTINGS_SKYLANDER_UNKNOWN,
 	HOME_MENU_SETTINGS_DEBUG,
 	HOME_MENU_SETTINGS_DEBUG_OVERLAY,
 	HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY,
diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3qt/localized_emu.h
index b41dfbe0ff..6559d847bd 100644
--- a/rpcs3/rpcs3qt/localized_emu.h
+++ b/rpcs3/rpcs3qt/localized_emu.h
@@ -300,6 +300,8 @@ private:
 		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_LOAD: return tr("Load Skylander");
 		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_LOAD_FILE: return tr("Select Skylander File");
 		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_MANAGER: return tr("Skylander Manager");
+		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_NO_SKYLANDER: return tr("None");
+		case localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_UNKNOWN: return tr("Unknown");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG: return tr("Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY: return tr("Debug Overlay", "Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY: return tr("Input Debug Overlay", "Debug");
diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp
index 8efa15abe0..86c9e49fda 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.cpp
+++ b/rpcs3/rpcs3qt/skylander_dialog.cpp
@@ -220,8 +220,8 @@ skylander_dialog::skylander_dialog(QWidget* parent)
 
 		QHBoxLayout* hbox_skylander = new QHBoxLayout();
 		QLabel* label_skyname       = new QLabel(QString(tr("Skylander %1")).arg(i + 1));
-		edit_skylanders[i]          = new QLineEdit();
-		edit_skylanders[i]->setEnabled(false);
+		::at32(edit_skylanders, i)  = new QLineEdit();
+		::at32(edit_skylanders, i)->setEnabled(false);
 
 		QPushButton* clear_btn  = new QPushButton(tr("Clear"));
 		QPushButton* create_btn = new QPushButton(tr("Create"));
@@ -232,7 +232,7 @@ skylander_dialog::skylander_dialog(QWidget* parent)
 		connect(load_btn, &QAbstractButton::clicked, this, [this, i]() { load_skylander(i); });
 
 		hbox_skylander->addWidget(label_skyname);
-		hbox_skylander->addWidget(edit_skylanders[i]);
+		hbox_skylander->addWidget(::at32(edit_skylanders, i));
 		hbox_skylander->addWidget(clear_btn);
 		hbox_skylander->addWidget(create_btn);
 		hbox_skylander->addWidget(load_btn);
@@ -344,6 +344,6 @@ void skylander_dialog::update_edits()
 			display_string = tr("None");
 		}
 
-		edit_skylanders[i]->setText(display_string);
+		::at32(edit_skylanders, i)->setText(display_string);
 	}
 }
diff --git a/rpcs3/rpcs3qt/skylander_dialog.h b/rpcs3/rpcs3qt/skylander_dialog.h
index 8bff7dc9df..b423c6f8c8 100644
--- a/rpcs3/rpcs3qt/skylander_dialog.h
+++ b/rpcs3/rpcs3qt/skylander_dialog.h
@@ -39,7 +39,7 @@ protected:
 	void update_edits();
 
 protected:
-	QLineEdit* edit_skylanders[MAX_SKYLANDERS]{};
+	std::array<QLineEdit*, MAX_SKYLANDERS> edit_skylanders{};
 
 private:
 	static skylander_dialog* inst;

From a40fd923afe890604945714fd963368764eedb9c Mon Sep 17 00:00:00 2001
From: Joshua de Reeper <joshua@dereeper.co.nz>
Date: Wed, 20 May 2026 23:09:57 +0200
Subject: [PATCH 10/11] Close Dialog Early for invalid file

---
 .../Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index 2e2924a4ab..1aa9464df1 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -365,11 +365,15 @@ namespace rsx
 						if (!sky_file)
 						{
 							rsx_log.error("Failed to open skylander file: %s", full_path);
+							close_dialog = true;
+							break;
 						}
 						std::array<u8, 0x40 * 0x10> data;
 						if (sky_file.read(data.data(), data.size()) != data.size())
 						{
 							rsx_log.error("Failed to read skylander file: %s", full_path);
+							close_dialog = true;
+							break;
 						}
 						if (const auto skylander = g_skyportal.get_skylander(slot))
 						{

From c4b6b6674f05f946c31b05e8f43a1732cbcd389e Mon Sep 17 00:00:00 2001
From: deReeperJosh <joshua@dereeper.co.nz>
Date: Mon, 1 Jun 2026 14:36:04 +0200
Subject: [PATCH 11/11] Comment out create button

---
 .../USBDevices/overlay_skylander_dialog.cpp        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
index 1aa9464df1..2eacd55350 100644
--- a/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/USBDevices/overlay_skylander_dialog.cpp
@@ -57,12 +57,12 @@ namespace rsx
 			m_clear_button->set_pos(360, sky_list_y + sky_list_h + 20);
 			m_clear_button->set_font("Arial", 16);
 
-			m_create_button = std::make_unique<image_button>();
-			m_create_button->set_text(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_CREATE);
-			m_create_button->set_image_resource(resource_config::standard_image_resource::triangle);
-			m_create_button->set_size(120, 30);
-			m_create_button->set_pos(540, sky_list_y + sky_list_h + 20);
-			m_create_button->set_font("Arial", 16);
+			// m_create_button = std::make_unique<image_button>();
+			// m_create_button->set_text(localized_string_id::HOME_MENU_SETTINGS_SKYLANDER_CREATE);
+			// m_create_button->set_image_resource(resource_config::standard_image_resource::triangle);
+			// m_create_button->set_size(120, 30);
+			// m_create_button->set_pos(540, sky_list_y + sky_list_h + 20);
+			// m_create_button->set_font("Arial", 16);
 
 			fade_animation.duration_sec = 0.15f;
 
@@ -152,7 +152,7 @@ namespace rsx
 			result.add(m_description->get_compiled());
 			result.add(m_load_button->get_compiled());
 			result.add(m_clear_button->get_compiled());
-			result.add(m_create_button->get_compiled());
+			// result.add(m_create_button->get_compiled());
 
 			fade_animation.apply(result);