fix super mario galaxy 0x25E00040 error (ryubing/ryujinx!155 )

See merge request ryubing/ryujinx!155
UI: Settings → Interface Tab + General Settings (ryubing/ryujinx!154 )
2026-04-01 11:41:08 +00:00 · 2025-10-10 17:37:42 -05:00 · 2025-10-09 16:32:33 -05:00 · 2025-10-06 20:22:15 -05:00 · 2025-10-04 13:07:31 -05:00
10 changed files with 572 additions and 756 deletions
--- a/assets/locales.json
+++ b/assets/locales.json
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@@ -2868,8 +2868,8 @@
 0100BC0018138000,"Super Mario RPG™",gpu;audio;nvdec,ingame,2024-06-19 17:43:42
 ,"Super Mario World",homebrew,boots,2024-06-13 01:40:31
 010049900F546000,"Super Mario™ 3D All-Stars",services-horizon;slow;vulkan;amd-vendor-bug,ingame,2024-05-07 02:38:16
-010099C022B96000,"Super Mario Galaxy",slow;vulkan;amd-vendor-bug,ingame,2025-10-01 15:30:00
-0100FD8022DAA000,"Super Mario Galaxy 2",slow;vulkan;amd-vendor-bug,ingame,2025-10-01 15:30:00
+010099C022B96000,"Super Mario Galaxy",slow;vulkan;amd-vendor-bug;vulkan-vendor-bug,ingame,2025-10-01 15:30:00
+0100FD8022DAA000,"Super Mario Galaxy 2",slow;vulkan;amd-vendor-bug;vulkan-vendor-bug;deadlock,ingame,2025-10-04 18:50:00
 010028600EBDA000,"Super Mario™ 3D World + Bowser’s Fury",ldn-works,playable,2024-07-31 10:45:37
 01004F8006A78000,"Super Meat Boy",services,playable,2020-04-02 23:10:07
 01009C200D60E000,"Super Meat Boy Forever",gpu,boots,2021-04-26 14:25:39
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -83,8 +83,8 @@ namespace Ryujinx.Common
            "010049900F546002", // Super Mario Sunshine
            "0100a3900c3e2000", // Paper Mario: The Origami King
            "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
-            "010099C022B96000", // Super Mario Galaxy
-            "0100FD8022DAA000", // Super Mario Galaxy 2
+            "01009cC022b96000", // Super Mario Galaxy
+            "0100fd8022daa000", // Super Mario Galaxy 2

                          //Pikmin Franchise
            "0100aa80194b0000", // Pikmin 1
--- a/src/Ryujinx.Graphics.GAL/Format.cs
+++ b/src/Ryujinx.Graphics.GAL/Format.cs
@@ -149,6 +149,7 @@ namespace Ryujinx.Graphics.GAL
        B8G8R8A8Srgb,
        B10G10R10A2Unorm,
        X8UintD24Unorm,
+        A8B8G8R8Uint,
    }

    public static class FormatExtensions
--- a/src/Ryujinx.Graphics.Gpu/Image/FormatTable.cs
+++ b/src/Ryujinx.Graphics.Gpu/Image/FormatTable.cs
@@ -359,6 +359,7 @@ namespace Ryujinx.Graphics.Gpu.Image
            A2B10G10R10Sint     = (A2B10G10R10 << 21)  | (Sint << 27),    // 0x1e000000
            A2B10G10R10Uscaled  = (A2B10G10R10 << 21)  | (Uscaled << 27), // 0x2e000000
            A2B10G10R10Sscaled  = (A2B10G10R10 << 21)  | (Sscaled << 27), // 0x36000000
+            A8B8G8R8Uint        = (A8B8G8R8 << 21)     | (Uint << 27),    // 0x25E00040
        }

        private static readonly Dictionary<TextureFormat, FormatInfo> _textureFormats = new()
@@ -554,6 +555,7 @@ namespace Ryujinx.Graphics.Gpu.Image
            { VertexAttributeFormat.A2B10G10R10Sint,     Format.R10G10B10A2Sint     },
            { VertexAttributeFormat.A2B10G10R10Uscaled,  Format.R10G10B10A2Uscaled  },
            { VertexAttributeFormat.A2B10G10R10Sscaled,  Format.R10G10B10A2Sscaled  },
+            { VertexAttributeFormat.A8B8G8R8Uint,        Format.A8B8G8R8Uint        },
        };
 #pragma warning restore IDE0055

--- a/src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs
+++ b/src/Ryujinx.Graphics.Vulkan/FormatCapabilities.cs
@@ -211,6 +211,9 @@ namespace Ryujinx.Graphics.Vulkan
                    case Format.R16G16B16Uint:
                        format = VkFormat.R16G16B16A16Uint;
                        break;
+                    case Format.A8B8G8R8Uint:
+                        format = VkFormat.A8B8G8R8UintPack32;
+                        break;
                    default:
                        Logger.Error?.Print(LogClass.Gpu, $"Format {srcFormat} is not supported by the host.");
                        break;
--- a/src/Ryujinx/UI/Helpers/Converters/GlyphValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/GlyphValueConverter.cs
@@ -14,6 +14,8 @@ namespace Ryujinx.Ava.UI.Helpers
            { Glyph.List, char.ConvertFromUtf32((int)Symbol.List) },
            { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
            { Glyph.Chip, char.ConvertFromUtf32(59748) },
+            { Glyph.Device, char.ConvertFromUtf32(0xE7F7) },
+            { Glyph.Bug, char.ConvertFromUtf32(0xEBE8) },
            { Glyph.Important, char.ConvertFromUtf32((int)Symbol.Important) },
        };

--- a/src/Ryujinx/UI/Helpers/Glyph.cs
+++ b/src/Ryujinx/UI/Helpers/Glyph.cs
@@ -5,6 +5,8 @@ namespace Ryujinx.Ava.UI.Helpers
        List,
        Grid,
        Chip,
+        Device,
+        Bug,
        Important,
    }
 }
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -27,13 +27,6 @@
                    Spacing="10">
                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
                    <StackPanel Margin="10,0,0,0" Orientation="Vertical">
-                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center"
-                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
-                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
-                            </StackPanel>
-                        </CheckBox>
                        <CheckBox
                            IsEnabled="{Binding !IsGameTitleNotNull}"
                            Opacity="{Binding PanelOpacity}"
@@ -62,6 +55,13 @@
                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                            </StackPanel>
                        </CheckBox>
+                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                            </StackPanel>
+                        </CheckBox>
                        <StackPanel
                            Margin="0, 15, 0, 0"
                            Orientation="Horizontal">
@@ -101,7 +101,7 @@
                                      HorizontalContentAlignment="Left"
                                      MinWidth="100">
                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
+                                    <TextBlock Text="{ext:Locale CommonOff}" />
                                </ComboBoxItem>
                                <ComboBoxItem>
                                    <TextBlock
@@ -123,7 +123,7 @@
                                      HorizontalContentAlignment="Left"
                                      MinWidth="100">
                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
+                                    <TextBlock Text="{ext:Locale Never}" />
                                </ComboBoxItem>
                                <ComboBoxItem>
                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
@@ -146,7 +146,7 @@
                                      HorizontalContentAlignment="Left"
                                      MinWidth="100">
                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
+                                    <TextBlock Text="{ext:Locale CommonAuto}" />
                                </ComboBoxItem>
                                <ComboBoxItem>
                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
@@ -198,14 +198,13 @@
                            <TextBox
                                Name="GameDirPathBox"
                                Margin="0"
-                                ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
+                                Watermark="{ext:Locale AddGameDirBoxTooltip}"
                                VerticalAlignment="Stretch" />
                            <Button
                                Name="AddGameDirButton"
                                Grid.Column="1"
                                MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
+                                Margin="10,0,0,0">
                                <TextBlock HorizontalAlignment="Center"
                                           Text="{ext:Locale SettingsTabGeneralAdd}" />
                            </Button>
@@ -213,8 +212,7 @@
                                Name="RemoveGameDirButton"
                                Grid.Column="2"
                                MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
+                                Margin="5,0,0,0"
                                Click="RemoveGameDirButton_OnClick">
                                <TextBlock HorizontalAlignment="Center"
                                           Text="{ext:Locale SettingsTabGeneralRemove}" />
@@ -252,14 +250,13 @@
                            <TextBox
                                Name="AutoloadDirPathBox"
                                Margin="0"
-                                ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
+                                Watermark="{ext:Locale AddGameDirBoxTooltip}"
                                VerticalAlignment="Stretch" />
                            <Button
                                Name="AddAutoloadDirButton"
                                Grid.Column="1"
                                MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
+                                Margin="10,0,0,0">
                                <TextBlock HorizontalAlignment="Center"
                                           Text="{ext:Locale SettingsTabGeneralAdd}" />
                            </Button>
@@ -267,8 +264,7 @@
                                Name="RemoveAutoloadDirButton"
                                Grid.Column="2"
                                MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
+                                Margin="5,0,0,0"
                                Click="RemoveAutoloadDirButton_OnClick">
                                <TextBlock HorizontalAlignment="Center"
                                           Text="{ext:Locale SettingsTabGeneralRemove}" />
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
@@ -39,11 +39,11 @@
        <Grid Name="Pages" IsVisible="False" Grid.Row="3">
            <settings:SettingsUiView Name="UiPage" />
            <settings:SettingsInputView Name="InputPage" />
-            <settings:SettingsHotkeysView Name="HotkeysPage" />
            <settings:SettingsSystemView Name="SystemPage" />
            <settings:SettingsCPUView Name="CpuPage" />
            <settings:SettingsGraphicsView Name="GraphicsPage" />
            <settings:SettingsAudioView Name="AudioPage" />
+            <settings:SettingsHotkeysView Name="HotkeysPage" />
            <settings:SettingsNetworkView Name="NetworkPage" />
            <settings:SettingsLoggingView Name="LoggingPage" />
            <settings:SettingsDebugView Name="DebugPage" />
@@ -54,7 +54,7 @@
            IsSettingsVisible="False"
            Name="NavPanel"
            IsBackEnabled="False"
-            Margin="10,10,10,0"
+            Margin="10,0,10,0"
            VerticalAlignment="Stretch"
            HorizontalAlignment="Stretch"
            OpenPaneLength="200">
@@ -62,16 +62,17 @@
                <ui:NavigationViewItem
                    IsSelected="True"
                    Content="{ext:Locale SettingsTabGeneral}"
-                    Tag="UiPage"
-                    IconSource="New" />
+                    Tag="UiPage">
+                    <ui:NavigationViewItem.IconSource>
+                        <ui:FontIconSource
+                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
+                            Glyph="{helpers:GlyphValueConverter Device}" />
+                    </ui:NavigationViewItem.IconSource>
+                </ui:NavigationViewItem>
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabInput}"
                    Tag="InputPage"
                    IconSource="Games" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabHotkeys}"
-                    Tag="HotkeysPage"
-                    IconSource="Keyboard" />
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabSystem}"
                    Tag="SystemPage"
@@ -93,6 +94,10 @@
                    Content="{ext:Locale SettingsTabAudio}"
                    IconSource="Audio"
                    Tag="AudioPage" />
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabHotkeys}"
+                    Tag="HotkeysPage"
+                    IconSource="Keyboard" />
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabNetwork}"
                    Tag="NetworkPage"
@@ -103,8 +108,13 @@
                    IconSource="Document" />
                <ui:NavigationViewItem
                    Content="{ext:Locale SettingsTabDebug}"
-                    Tag="DebugPage"
-                    IconSource="Star" />
+                    Tag="DebugPage">
+                    <ui:NavigationViewItem.IconSource>
+                        <ui:FontIconSource
+                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
+                            Glyph="{helpers:GlyphValueConverter Bug}" />
+                    </ui:NavigationViewItem.IconSource>
+                </ui:NavigationViewItem>
                <ui:NavigationViewItem
                    IsVisible="{Binding ShowDirtyHacks}"
                    Content="Dirty Hacks"
Author	SHA1	Message	Date
Astell	4444ecae41	fix super mario galaxy 0x25E00040 error (ryubing/ryujinx!155 ) See merge request ryubing/ryujinx!155	2025-10-10 17:37:42 -05:00
Neo	4f5a236c21	UI: Settings → Interface Tab + General Settings (ryubing/ryujinx!154 ) See merge request ryubing/ryujinx!154	2025-10-09 16:32:33 -05:00
Lorenzo	db31ff15c7	it_IT translation update (ryubing/ryujinx!148 ) See merge request ryubing/ryujinx!148	2025-10-06 20:22:15 -05:00
Bluey Enjoyer	e70cd08c9a	cleanup work for my last MR/PR (ryubing/ryujinx!153 ) See merge request ryubing/ryujinx!153	2025-10-04 13:07:31 -05:00