From 665e94b0aaa654976692dfdb5775b251a6e767db Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 8 Nov 2017 22:56:42 -0800 Subject: [PATCH 1/2] misc cleanup add german forme names truncate some forme names fix nidoran gender symbols adds null check for invalid (caught error) pkm disables accessory giving (needs more research) --- PKHeX.Core/Legality/Analysis.cs | 6 +++--- PKHeX.Core/PKM/FormConverter.cs | 2 +- .../Resources/text/de/text_Forms_de.txt | 5 +++++ .../Resources/text/de/text_Species_de.txt | 4 ++-- .../Resources/text/en/text_Forms_en.txt | Bin 7126 -> 7068 bytes .../Resources/text/en/text_Species_en.txt | 4 ++-- .../Resources/text/es/text_Forms_es.txt | Bin 7402 -> 7384 bytes .../Resources/text/es/text_Species_es.txt | 4 ++-- .../Resources/text/fr/text_Forms_fr.txt | Bin 7352 -> 7334 bytes .../Resources/text/fr/text_Species_fr.txt | 4 ++-- .../Resources/text/it/text_Forms_it.txt | Bin 7550 -> 7534 bytes .../Resources/text/it/text_Species_it.txt | 4 ++-- .../Resources/text/ja/text_Forms_ja.txt | Bin 7918 -> 7908 bytes .../Resources/text/ko/text_Forms_ko.txt | Bin 7070 -> 7042 bytes .../Resources/text/ko/text_Species_ko.txt | 4 ++-- .../Save Editors/Gen7/SAV_Trainer7.cs | 5 +++++ 16 files changed, 26 insertions(+), 16 deletions(-) diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs index bca707451..5b9b7ff63 100644 --- a/PKHeX.Core/Legality/Analysis.cs +++ b/PKHeX.Core/Legality/Analysis.cs @@ -1,4 +1,4 @@ -#define SUPPRESS +//#define SUPPRESS using System; using System.Collections.Generic; @@ -294,7 +294,7 @@ namespace PKHeX.Core } private string GetLegalityReport() { - if (!Parsed || pkm == null) + if (!Parsed || pkm == null || Info == null) return V189; var lines = new List(); @@ -323,7 +323,7 @@ namespace PKHeX.Core } 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 @@ namespace PKHeX.Core } } - 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 4ae5cab82dd6c18339d643a38225b90f4426a478..9e543bdeddfe749704743bdf91e2bfd544445024 100644 GIT binary patch delta 58 ucmca+KF54Rmb4Ks0~dn}Ln%WsLpB2@JCUKBArCAb%8OWgbH+R5X#H p9LQ5(2xrIy(&<2*ATvT4au`a0dJ};%en7R!Kz2Su70|3i1^@y_6s`aO 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 19d08369fafe48d6a7249282935ab3e96b3e4ff6..371ae36f60b7519516fdddd7f024f77e99a64e99 100644 GIT binary patch delta 7 OcmaE5dBbwU4H*Csy93z( delta 26 hcmca%`O0#`4H+R_20w;WhGd2!hJ1!9hFpe31^{|`2Uh?9 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 d03d6ae13bf5130e18cada3b7b760c9355e1adfd..b3d7df7e4cc919bbe3283a7c6647b2ae6cd75ad7 100644 GIT binary patch delta 7 OcmdmCxy*9IG8q63{{uq+ delta 26 hcmZ2xxx;e9G8rLV20w;WhGd2!hJ1!9hFpe31^{fF2EhOT 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 12c3de6b20c8da92d587076a953ae95e5205e0a4..48fe21a4f01dbb37eb6fba64a7031b859797ac02 100644 GIT binary patch delta 7 Ocmexo_0DQTo-6;s$t delta 24 fcmaE7_0MWUo~(c$Ln=cuLlHwhLlr|VLm~qJYk&sp 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 0dc15ff566860d3526713cf52f6b3bd207693049..156506c95b30bb7f7d13eb699dc2ee618671e691 100644 GIT binary patch delta 7 OcmaE7`^0v`6FC48RRjM3 delta 18 acmaE2`_6X56FIK42I~#p8tgK-X8-_N00{a3 diff --git a/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt b/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt index a2dd618d4f971a31b21a2b27a14b02dc43b89188..e1332275a952f7ff20c629838a6d6833ef045e56 100644 GIT binary patch delta 38 ocmbPd-ekTZMOu!Rfr}yYn$5L{;~>_F1AF&CSUZmGxKy(p00E{B>;M1& delta 66 zcmZoNpJ%=yMcPV%Va2Ykhj%5m;=tZLApU|4GHXEm9mjTD Ss@blxG3P?ej*gQjb^-uLUmM~8 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 @@ namespace PKHeX.WinForms } 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; From 2af7b152a74c0be9fa5102763fb29f4ea56139a0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 8 Nov 2017 22:59:18 -0800 Subject: [PATCH 2/2] re-enable error suppression oops --- PKHeX.Core/Legality/Analysis.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Analysis.cs b/PKHeX.Core/Legality/Analysis.cs index 5b9b7ff63..1ad901904 100644 --- a/PKHeX.Core/Legality/Analysis.cs +++ b/PKHeX.Core/Legality/Analysis.cs @@ -1,4 +1,4 @@ -//#define SUPPRESS +#define SUPPRESS using System; using System.Collections.Generic;