diff --git a/PKHeX.Core/Game/GameStrings/MemoryStrings.cs b/PKHeX.Core/Game/GameStrings/MemoryStrings.cs index 69b151fc5..328738b44 100644 --- a/PKHeX.Core/Game/GameStrings/MemoryStrings.cs +++ b/PKHeX.Core/Game/GameStrings/MemoryStrings.cs @@ -56,7 +56,7 @@ namespace PKHeX.Core } public string[] GetMemoryQualities() => s.memories.Slice(2, 7); - public string[] GetMemoryFeelings() => s.memories.Slice(10, 24); + public string[] GetMemoryFeelings(int format) => format >= 8 ? s.memories.Slice(9, 25) : s.memories.Slice(10, 24); // empty line for 0 in gen8+ public List GetArgumentStrings(MemoryArgType memIndex) { diff --git a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs index 436bcd430..525a3e0f6 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs @@ -201,7 +201,7 @@ namespace PKHeX.WinForms } // Feeling Chooser - foreach (var q in strings.GetMemoryFeelings()) + foreach (var q in strings.GetMemoryFeelings(pkm.Format)) { CB_CTFeel.Items.Add(q); CB_OTFeel.Items.Add(q);