diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs index bca707451..1ad901904 100644 --- a/PKHeX.Core/Legality/Analysis.cs +++ b/PKHeX.Core/Legality/Analysis.cs @@ -294,7 +294,7 @@ private void UpdateChecks() } private string GetLegalityReport() { - if (!Parsed || pkm == null) + if (!Parsed || pkm == null || Info == null) return V189; var lines = new List(); @@ -323,7 +323,7 @@ private string GetLegalityReport() } private string GetVerboseLegalityReport() { - if (!Parsed || pkm == null) + if (!Parsed || pkm == null || Info == null) return V189; const string separator = "==="; diff --git a/PKHeX.Core/PKM/FormConverter.cs b/PKHeX.Core/PKM/FormConverter.cs index a0fa3cfbc..f5da804b6 100644 --- a/PKHeX.Core/PKM/FormConverter.cs +++ b/PKHeX.Core/PKM/FormConverter.cs @@ -444,7 +444,7 @@ private static string[] GetFormsGen7(int species, IReadOnlyList types, I } } - private static string[] GetFormsAlolan (int generation, IReadOnlyList types, IReadOnlyList forms, int species) + private static string[] GetFormsAlolan(int generation, IReadOnlyList types, IReadOnlyList forms, int species) { if (generation < 7) return new[] { "" }; diff --git a/PKHeX.Core/Resources/text/de/text_Forms_de.txt b/PKHeX.Core/Resources/text/de/text_Forms_de.txt index 5157542b5..8e7b2b906 100644 --- a/PKHeX.Core/Resources/text/de/text_Forms_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Forms_de.txt @@ -1061,3 +1061,8 @@ Entlarvte Original +Partner +Abend +Abend +Morgen +Ultra \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Species_de.txt b/PKHeX.Core/Resources/text/de/text_Species_de.txt index 27a20de1e..dd0f50326 100644 --- a/PKHeX.Core/Resources/text/de/text_Species_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Species_de.txt @@ -27,10 +27,10 @@ Pikachu Raichu Sandan Sandamer -Nidoran +Nidoran♀ Nidorina Nidoqueen -Nidoran +Nidoran♂ Nidorino Nidoking Piepi diff --git a/PKHeX.Core/Resources/text/en/text_Forms_en.txt b/PKHeX.Core/Resources/text/en/text_Forms_en.txt index 4ae5cab82..9e543bded 100644 Binary files a/PKHeX.Core/Resources/text/en/text_Forms_en.txt and b/PKHeX.Core/Resources/text/en/text_Forms_en.txt differ diff --git a/PKHeX.Core/Resources/text/en/text_Species_en.txt b/PKHeX.Core/Resources/text/en/text_Species_en.txt index 5f493d52d..19b5605ba 100644 --- a/PKHeX.Core/Resources/text/en/text_Species_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Species_en.txt @@ -27,10 +27,10 @@ Pikachu Raichu Sandshrew Sandslash -Nidoran +Nidoran♀ Nidorina Nidoqueen -Nidoran +Nidoran♂ Nidorino Nidoking Clefairy diff --git a/PKHeX.Core/Resources/text/es/text_Forms_es.txt b/PKHeX.Core/Resources/text/es/text_Forms_es.txt index 19d08369f..371ae36f6 100644 Binary files a/PKHeX.Core/Resources/text/es/text_Forms_es.txt and b/PKHeX.Core/Resources/text/es/text_Forms_es.txt differ diff --git a/PKHeX.Core/Resources/text/es/text_Species_es.txt b/PKHeX.Core/Resources/text/es/text_Species_es.txt index 95bb7dfc5..5f4da308a 100644 --- a/PKHeX.Core/Resources/text/es/text_Species_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Species_es.txt @@ -27,10 +27,10 @@ Pikachu Raichu Sandshrew Sandslash -Nidoran +Nidoran♀ Nidorina Nidoqueen -Nidoran +Nidoran♂ Nidorino Nidoking Clefairy diff --git a/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt b/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt index d03d6ae13..b3d7df7e4 100644 Binary files a/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt and b/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt differ diff --git a/PKHeX.Core/Resources/text/fr/text_Species_fr.txt b/PKHeX.Core/Resources/text/fr/text_Species_fr.txt index 95b6b3920..050d5d81d 100644 --- a/PKHeX.Core/Resources/text/fr/text_Species_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Species_fr.txt @@ -27,10 +27,10 @@ Pikachu Raichu Sabelette Sablaireau -Nidoran +Nidoran♀ Nidorina Nidoqueen -Nidoran +Nidoran♂ Nidorino Nidoking Mélofée diff --git a/PKHeX.Core/Resources/text/it/text_Forms_it.txt b/PKHeX.Core/Resources/text/it/text_Forms_it.txt index 12c3de6b2..48fe21a4f 100644 Binary files a/PKHeX.Core/Resources/text/it/text_Forms_it.txt and b/PKHeX.Core/Resources/text/it/text_Forms_it.txt differ diff --git a/PKHeX.Core/Resources/text/it/text_Species_it.txt b/PKHeX.Core/Resources/text/it/text_Species_it.txt index 5a749c8f1..a3e81d291 100644 --- a/PKHeX.Core/Resources/text/it/text_Species_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Species_it.txt @@ -27,10 +27,10 @@ Pikachu Raichu Sandshrew Sandslash -Nidoran +Nidoran♀ Nidorina Nidoqueen -Nidoran +Nidoran♂ Nidorino Nidoking Clefairy diff --git a/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt b/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt index 0dc15ff56..156506c95 100644 Binary files a/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt and b/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt differ diff --git a/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt b/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt index a2dd618d4..e1332275a 100644 Binary files a/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt and b/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt differ diff --git a/PKHeX.Core/Resources/text/ko/text_Species_ko.txt b/PKHeX.Core/Resources/text/ko/text_Species_ko.txt index ca7896921..4ab4c9596 100644 --- a/PKHeX.Core/Resources/text/ko/text_Species_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Species_ko.txt @@ -27,10 +27,10 @@ 라이츄 모래두지 고지 -니드런 +니드런♀ 니드리나 니드퀸 -니드런 +니드런♂ 니드리노 니드킹 삐삐 diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs index ba9a49246..ea167b98f 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs @@ -399,6 +399,11 @@ private void UpdateCountry(object sender, EventArgs e) } private void B_Fashion_Click(object sender, EventArgs e) { + if (SAV.USUM) + { + WinFormsUtil.Alert("Temporarily disabled, needs research for permissible values."); + return; + } var prompt = WinFormsUtil.Prompt(MessageBoxButtons.YesNo, "Modifying Fashion Items will clear existing data", "Continue?"); if (DialogResult.Yes != prompt) return;