diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionGroup/EvolutionOrigin.cs b/PKHeX.Core/Legality/Evolutions/EvolutionGroup/EvolutionOrigin.cs
index 4853874f9..18307f66c 100644
--- a/PKHeX.Core/Legality/Evolutions/EvolutionGroup/EvolutionOrigin.cs
+++ b/PKHeX.Core/Legality/Evolutions/EvolutionGroup/EvolutionOrigin.cs
@@ -5,7 +5,7 @@ namespace PKHeX.Core;
///
/// Details about the original encounter.
///
-/// Species the encounter originated as
+/// Most-evolved species the encounter originated as
/// Context the encounter originated in
/// Generation the encounter originated in
/// Minimum level the encounter originated at
diff --git a/PKHeX.Core/MysteryGifts/WA9.cs b/PKHeX.Core/MysteryGifts/WA9.cs
index a2fc4a3b0..f9b279f77 100644
--- a/PKHeX.Core/MysteryGifts/WA9.cs
+++ b/PKHeX.Core/MysteryGifts/WA9.cs
@@ -8,7 +8,7 @@ namespace PKHeX.Core;
/// Generation 9 Mystery Gift Template File
///
public sealed class WA9(Memory raw) : DataMysteryGift(raw), ILangNick, INature, IAlpha, IRibbonIndex, IMemoryOT,
- ILangNicknamedTemplate, IEncounterServerDate, IRelearn, IMetLevel, ISeedCorrelation64,
+ ILangNicknamedTemplate, IEncounterServerDate, IRelearn, IMetLevel, IEncounter9a,
IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IRibbonSetCommon7,
IRibbonSetCommon8, IRibbonSetMark8, IRibbonSetCommon9, IRibbonSetMark9, IEncounterMarkExtra
{
@@ -836,12 +836,13 @@ public bool IsMissingExtraMark(PKM pk, out RibbonIndex missing)
? SeedCorrelationResult.Success
: SeedCorrelationResult.Invalid;
- private GenerateParam9a GetParams(PersonalInfo9ZA pi)
+ public LumioseCorrelation Correlation => LumioseCorrelation.SkipTrainer;
+ public byte FlawlessIVCount => GetFlawlessIVCount(IV_HP);
+
+ public GenerateParam9a GetParams(PersonalInfo9ZA pi)
{
- const LumioseCorrelation correlation = LumioseCorrelation.SkipTrainer;
const byte rollCount = 1;
var hp = IV_HP;
- var flawless = GetFlawlessIVCount(hp);
var ivs = new IndividualValueSet((sbyte)hp, (sbyte)IV_ATK, (sbyte)IV_DEF, (sbyte)IV_SPE, (sbyte)IV_SPA, (sbyte)IV_SPD);
var sizeType = Scale == 256 ? SizeType9.RANDOM : SizeType9.VALUE;
var gender = Gender switch
@@ -851,7 +852,7 @@ private GenerateParam9a GetParams(PersonalInfo9ZA pi)
2 => PersonalInfo.RatioMagicGenderless,
_ => pi.Gender,
};
- return new GenerateParam9a(gender, flawless, rollCount, correlation, sizeType, (byte)Scale, Nature, Ability, Shiny, ivs);
+ return new GenerateParam9a(gender, FlawlessIVCount, rollCount, Correlation, sizeType, (byte)Scale, Nature, Ability, Shiny, ivs);
}
private static byte GetFlawlessIVCount(int hp)
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Fashion9.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Fashion9.cs
index 1e7333823..78ff7f7ff 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Fashion9.cs
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen9/SAV_Fashion9.cs
@@ -7,7 +7,7 @@ namespace PKHeX.WinForms;
public sealed partial class SAV_Fashion9 : Form
{
- private readonly IFashionBlockEditor[] _grids = [];
+ private readonly IFashionBlockEditor[] _grids;
private readonly SaveFile SAV;
private readonly SaveFile Origin;
@@ -28,7 +28,8 @@ private SAV_Fashion9(SaveFile sav)
TC_Features.Multiline = true;
// Create grids for each block
- if (SAV is SAV9SV sav9sv) {
+ if (SAV is SAV9SV sav9sv)
+ {
var accessor = sav9sv.Blocks;
_grids =
[
@@ -43,7 +44,8 @@ private SAV_Fashion9(SaveFile sav)
];
B_SetAllOwned.Visible = false;
- } else if (SAV is SAV9ZA sav9ZA)
+ }
+ else if (SAV is SAV9ZA sav9ZA)
{
var accessor = sav9ZA.Blocks;
_grids =
@@ -81,7 +83,6 @@ private SAV_Fashion9(SaveFile sav)
throw new ArgumentException("Invalid SaveFile Type");
}
-
// Translate headings
WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);