Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-15 08:47:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1 from kwsch/master

Browse source 
Update from upstream repo kwsch/PKHeX
This commit is contained in:
Matt 2017-11-09 02:02:42 -05:00 committed by GitHub
commit 800a6b32b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKHeX.Core/Legality/Analysis.cs
View file

@ -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<string>();
@ -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 = "===";

2
PKHeX.Core/PKM/FormConverter.cs
View file

@ -444,7 +444,7 @@ namespace PKHeX.Core
}
}
private static string[] GetFormsAlolan (int generation, IReadOnlyList<string> types, IReadOnlyList<string> forms, int species)
private static string[] GetFormsAlolan(int generation, IReadOnlyList<string> types, IReadOnlyList<string> forms, int species)
{
if (generation < 7)
return new[] { "" };

5
PKHeX.Core/Resources/text/de/text_Forms_de.txt
View file

@ -1061,3 +1061,8 @@ Entlarvte
Original
Partner
Abend
Abend
Morgen
Ultra

4
PKHeX.Core/Resources/text/de/text_Species_de.txt
View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sandan
Sandamer
Nidoran
Nidoran♀
Nidorina
Nidoqueen
Nidoran
Nidoran♂
Nidorino
Nidoking
Piepi

BIN
PKHeX.Core/Resources/text/en/text_Forms_en.txt
View file

Binary file not shown.

4
PKHeX.Core/Resources/text/en/text_Species_en.txt
View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sandshrew
Sandslash
Nidoran
Nidoran♀
Nidorina
Nidoqueen
Nidoran
Nidoran♂
Nidorino
Nidoking
Clefairy

BIN
PKHeX.Core/Resources/text/es/text_Forms_es.txt
View file

Binary file not shown.

4
PKHeX.Core/Resources/text/es/text_Species_es.txt
View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sandshrew
Sandslash
Nidoran
Nidoran♀
Nidorina
Nidoqueen
Nidoran
Nidoran♂
Nidorino
Nidoking
Clefairy

BIN
PKHeX.Core/Resources/text/fr/text_Forms_fr.txt
View file

Binary file not shown.

4
PKHeX.Core/Resources/text/fr/text_Species_fr.txt
View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sabelette
Sablaireau
Nidoran
Nidoran♀
Nidorina
Nidoqueen
Nidoran
Nidoran♂
Nidorino
Nidoking
Mélofée

BIN
PKHeX.Core/Resources/text/it/text_Forms_it.txt
View file

Binary file not shown.

4
PKHeX.Core/Resources/text/it/text_Species_it.txt
View file

@ -27,10 +27,10 @@ Pikachu
Raichu
Sandshrew
Sandslash
Nidoran
Nidoran♀
Nidorina
Nidoqueen
Nidoran
Nidoran♂
Nidorino
Nidoking
Clefairy

BIN
PKHeX.Core/Resources/text/ja/text_Forms_ja.txt
View file

Binary file not shown.

BIN
PKHeX.Core/Resources/text/ko/text_Forms_ko.txt
View file

Binary file not shown.

4
PKHeX.Core/Resources/text/ko/text_Species_ko.txt
View file

@ -27,10 +27,10 @@
라이츄
모래두지
고지
니드런
니드런♀
니드리나
니드퀸
니드런
니드런♂
니드리노
니드킹
삐삐

5
PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.cs
View file

@ -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;