Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PlayReportAnalyzer: Added Pokemon Scarlet and Violet #630

Merged
merged 5 commits into from
Feb 6, 2025
Merged

PlayReportAnalyzer: Added Pokemon Scarlet and Violet #630

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2b910b
Pokemon S/V Part 1
piplup55 Feb 6, 2025
0f97cc4
Pokemon S/V Part 2
piplup55 Feb 6, 2025
bbdafa0
Removed unused lines
piplup55 Feb 6, 2025
e54b190
Simplified Locations
piplup55 Feb 6, 2025
eb40a88
Balls
piplup55 Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions src/Ryujinx/Utilities/PlayReport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ public static class PlayReport
.AddSpec( // Global & China IDs
["0100152000022000", "010075100e8ec000"],
spec => spec.AddValueFormatter("To", MarioKart8Deluxe_Mode)
)
.AddSpec(
["0100a3d008c5c000", "01008f6008c5e000"],
spec => spec
.AddValueFormatter("area_no", PokemonSVArea)
.AddValueFormatter("team_circle", PokemonSVUnionCircle)
);

private static PlayReportFormattedValue BreathOfTheWild_MasterMode(PlayReportValue value)
Expand Down Expand Up @@ -81,5 +87,42 @@ 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)
=> value.StringValue switch
{
// Base Game Locations
"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",
"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_w12" => "Medali",
"a_w13" => "Tagtree Thicket",
"a_w14" => "East Area Three",
"a_w15" => "Artazon",
"a_w16" => "East Area Two",
"a_w18" => "Casseroya Lake",
"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
_ => PlayReportFormattedValue.ForceReset
};
}
}