From c2b910b88aa43f112de6d4c45ec51b5f501c3d72 Mon Sep 17 00:00:00 2001 From: Piplup Date: Thu, 6 Feb 2025 00:13:47 +0000 Subject: [PATCH 1/5] Pokemon S/V Part 1 --- src/Ryujinx/Utilities/PlayReport.cs | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/Ryujinx/Utilities/PlayReport.cs b/src/Ryujinx/Utilities/PlayReport.cs index f518fb9029..a5dfa0a83f 100644 --- a/src/Ryujinx/Utilities/PlayReport.cs +++ b/src/Ryujinx/Utilities/PlayReport.cs @@ -32,6 +32,13 @@ public static class PlayReport .AddSpec( // Global & China IDs ["0100152000022000", "010075100e8ec000"], spec => spec.AddValueFormatter("To", MarioKart8Deluxe_Mode) + ) + .AddSpec( + ["0100a3d008c5c000", "01008f6008c5e000"], + // TODO Rebase the repo on the latest + spec => spec + .AddValueFormatter("area_no", PokemonSVArea) + .AddValueFormatter("team_circle", PokemonSVUnionCircle) ); private static PlayReportFormattedValue BreathOfTheWild_MasterMode(PlayReportValue value) @@ -81,5 +88,29 @@ private static PlayReportFormattedValue MarioKart8Deluxe_Mode(PlayReportValue va "Race" => "Racing", _ => PlayReportFormattedValue.ForceReset }; + + private static PlayReportFormattedValue PokemonSVUnionCircle(PlayReportValue value) + => value.BoxedValue is 0 ? "Playing Alone" : "Playing in a group"; + + private static PlayReportFormattedValue PokemonSVArea(PlayReportValue value) + // TODO Finish this list + => value.StringValue switch + { + "a_w01" => "South Area One/Cabo Poco/Cabo Path/Los Platos", + "a_w02" => "Mesagoza", + "a_w03" => "The Pokemon League", + "a_w04" => "South Area Two", + "a_w05" => "South Area Four", + "a_w06" => "South Area Six/Alfornada", + "a_w07" => "South Area Five", + "a_w08" => "South Area Three", + "a_w09" => "West Area One", + "a_w10" => "Asado Desert", + "a_w11" => "West Area Two", + "a_w15" => "Artazon", + "a_w18" => "Casseroya Lake", + "a_w24" => "South Paldean Sea" + _ => value.StringValue + }; } } From 0f97cc49bdb6c5c5aa4b7dcf8e9c5dad2e8c0f90 Mon Sep 17 00:00:00 2001 From: Piplup Date: Thu, 6 Feb 2025 00:14:14 +0000 Subject: [PATCH 2/5] Pokemon S/V Part 2 --- src/Ryujinx/Utilities/PlayReport.cs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Ryujinx/Utilities/PlayReport.cs b/src/Ryujinx/Utilities/PlayReport.cs index a5dfa0a83f..af5446ac60 100644 --- a/src/Ryujinx/Utilities/PlayReport.cs +++ b/src/Ryujinx/Utilities/PlayReport.cs @@ -93,9 +93,9 @@ private static PlayReportFormattedValue PokemonSVUnionCircle(PlayReportValue val => value.BoxedValue is 0 ? "Playing Alone" : "Playing in a group"; private static PlayReportFormattedValue PokemonSVArea(PlayReportValue value) - // TODO Finish this list => value.StringValue switch { + // Base Game Locations "a_w01" => "South Area One/Cabo Poco/Cabo Path/Los Platos", "a_w02" => "Mesagoza", "a_w03" => "The Pokemon League", @@ -106,10 +106,23 @@ private static PlayReportFormattedValue PokemonSVArea(PlayReportValue value) "a_w08" => "South Area Three", "a_w09" => "West Area One", "a_w10" => "Asado Desert", - "a_w11" => "West Area Two", + "a_w11" => "West Area Two/Porto Marinada", + "a_w12" => "Medali", + "a_w13" => "Tagtree Thicket", + "a_w14" => "East Area Three", "a_w15" => "Artazon", + "a_w16" => "East Area Two/Levincia (North)", "a_w18" => "Casseroya Lake", - "a_w24" => "South Paldean Sea" + "a_w19" => "Glaseado Mountain", + "a_w20" => "North Area Three", + "a_w21" => "North Area One", + "a_w22" => "North Area Two", + "a_w23" => "The Great Crater of Paldea", + "a_w24" => "South Paldean Sea", + "a_w25" => "West Paldean Sea", + "a_w26" => "East Paldean Sea", + "a_w27" => "Nouth Paldean Sea" + //TODO DLC Locations _ => value.StringValue }; } From bbdafa004a7f29e1ca83c250bd766f988941428c Mon Sep 17 00:00:00 2001 From: Piplup Date: Thu, 6 Feb 2025 00:15:11 +0000 Subject: [PATCH 3/5] Removed unused lines --- src/Ryujinx/Utilities/PlayReport.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Ryujinx/Utilities/PlayReport.cs b/src/Ryujinx/Utilities/PlayReport.cs index af5446ac60..433e23391e 100644 --- a/src/Ryujinx/Utilities/PlayReport.cs +++ b/src/Ryujinx/Utilities/PlayReport.cs @@ -35,7 +35,6 @@ public static class PlayReport ) .AddSpec( ["0100a3d008c5c000", "01008f6008c5e000"], - // TODO Rebase the repo on the latest spec => spec .AddValueFormatter("area_no", PokemonSVArea) .AddValueFormatter("team_circle", PokemonSVUnionCircle) @@ -123,7 +122,7 @@ private static PlayReportFormattedValue PokemonSVArea(PlayReportValue value) "a_w26" => "East Paldean Sea", "a_w27" => "Nouth Paldean Sea" //TODO DLC Locations - _ => value.StringValue + _ => PlayReportFormattedValue.ForceReset }; } } From e54b190e798a83fb5efa412d14b98e12658cb32f Mon Sep 17 00:00:00 2001 From: Piplup Date: Thu, 6 Feb 2025 00:16:19 +0000 Subject: [PATCH 4/5] Simplified Locations --- src/Ryujinx/Utilities/PlayReport.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ryujinx/Utilities/PlayReport.cs b/src/Ryujinx/Utilities/PlayReport.cs index 433e23391e..4ba45349b7 100644 --- a/src/Ryujinx/Utilities/PlayReport.cs +++ b/src/Ryujinx/Utilities/PlayReport.cs @@ -95,22 +95,22 @@ private static PlayReportFormattedValue PokemonSVArea(PlayReportValue value) => value.StringValue switch { // Base Game Locations - "a_w01" => "South Area One/Cabo Poco/Cabo Path/Los Platos", + "a_w01" => "South Area One", "a_w02" => "Mesagoza", "a_w03" => "The Pokemon League", "a_w04" => "South Area Two", "a_w05" => "South Area Four", - "a_w06" => "South Area Six/Alfornada", + "a_w06" => "South Area Six", "a_w07" => "South Area Five", "a_w08" => "South Area Three", "a_w09" => "West Area One", "a_w10" => "Asado Desert", - "a_w11" => "West Area Two/Porto Marinada", + "a_w11" => "West Area Two", "a_w12" => "Medali", "a_w13" => "Tagtree Thicket", "a_w14" => "East Area Three", "a_w15" => "Artazon", - "a_w16" => "East Area Two/Levincia (North)", + "a_w16" => "East Area Two", "a_w18" => "Casseroya Lake", "a_w19" => "Glaseado Mountain", "a_w20" => "North Area Three", From eb40a880ca1559f9c4ed5986f3f0b2db5d14e681 Mon Sep 17 00:00:00 2001 From: Piplup <100526773+piplup55@users.noreply.github.com> Date: Thu, 6 Feb 2025 00:22:35 +0000 Subject: [PATCH 5/5] Balls Updated by the web UI (idk why i thought i would add this anyway) --- src/Ryujinx/Utilities/PlayReport.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ryujinx/Utilities/PlayReport.cs b/src/Ryujinx/Utilities/PlayReport.cs index 4ba45349b7..7ebf534820 100644 --- a/src/Ryujinx/Utilities/PlayReport.cs +++ b/src/Ryujinx/Utilities/PlayReport.cs @@ -120,7 +120,7 @@ private static PlayReportFormattedValue PokemonSVArea(PlayReportValue value) "a_w24" => "South Paldean Sea", "a_w25" => "West Paldean Sea", "a_w26" => "East Paldean Sea", - "a_w27" => "Nouth Paldean Sea" + "a_w27" => "Nouth Paldean Sea", //TODO DLC Locations _ => PlayReportFormattedValue.ForceReset };