Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-09 08:25:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from kwsch/master

Browse Source 
Update
This commit is contained in:
ajtudela
2016-09-11 11:40:41 +02:00
committed by GitHub
parent c3b7601adf f7afb88052
commit b02e216255
17 changed files with 563 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX/Legality/Tables3.cs
View File

@@ -7,7 +7,7 @@ public static partial class Legal
// PKHeX Valid Array Storage
#region RS
internal static readonly ushort[] Pouch_Items_RS = {
12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 254, 255, 256, 257, 258
13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 254, 255, 256, 257, 258
};
internal static readonly ushort[] Pouch_Key_RS = {
259, 260, 261, 262, 263, 264, 265, 266, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288

78
PKHeX/MainWindow/Main.Designer.cs generated
View File

@@ -157,7 +157,6 @@ public void InitializeComponent()
this.FLP_HackedStats = new System.Windows.Forms.FlowLayoutPanel();
this.CHK_HackedStats = new System.Windows.Forms.CheckBox();
this.FLP_StatsHeaderRight = new System.Windows.Forms.FlowLayoutPanel();
this.Label_IVs = new System.Windows.Forms.Label();
this.Label_EVs = new System.Windows.Forms.Label();
this.Label_Stats = new System.Windows.Forms.Label();
this.FLP_HP = new System.Windows.Forms.FlowLayoutPanel();
@@ -411,9 +410,9 @@ public void InitializeComponent()
this.B_OpenOPowers = new System.Windows.Forms.Button();
this.B_OpenEventFlags = new System.Windows.Forms.Button();
this.B_OpenPokedex = new System.Windows.Forms.Button();
this.B_LinkInfo = new System.Windows.Forms.Button();
this.B_OpenLinkInfo = new System.Windows.Forms.Button();
this.B_OpenBerryField = new System.Windows.Forms.Button();
this.B_Pokeblocks = new System.Windows.Forms.Button();
this.B_OpenPokeblocks = new System.Windows.Forms.Button();
this.B_OpenSecretBase = new System.Windows.Forms.Button();
this.B_OpenPokepuffs = new System.Windows.Forms.Button();
this.B_OpenSuperTraining = new System.Windows.Forms.Button();
@@ -427,6 +426,7 @@ public void InitializeComponent()
this.mnuLSave = new System.Windows.Forms.ToolStripMenuItem();
this.PB_Legal = new System.Windows.Forms.PictureBox();
this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel();
this.Label_IVs = new System.Windows.Forms.Label();
this.tabMain.SuspendLayout();
this.Tab_Main.SuspendLayout();
this.FLP_Main.SuspendLayout();
@@ -2088,16 +2088,6 @@ public void InitializeComponent()
this.FLP_StatsHeaderRight.Size = new System.Drawing.Size(162, 21);
this.FLP_StatsHeaderRight.TabIndex = 123;
//
// Label_IVs
//
this.Label_IVs.Location = new System.Drawing.Point(0, 0);
this.Label_IVs.Margin = new System.Windows.Forms.Padding(0);
this.Label_IVs.Name = "Label_IVs";
this.Label_IVs.Size = new System.Drawing.Size(30, 21);
this.Label_IVs.TabIndex = 26;
this.Label_IVs.Text = "IVs";
this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// Label_EVs
//
this.Label_EVs.Location = new System.Drawing.Point(30, 0);
@@ -3572,7 +3562,7 @@ public void InitializeComponent()
this.Menu_ExportMAIN.Name = "Menu_ExportMAIN";
this.Menu_ExportMAIN.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
this.Menu_ExportMAIN.ShowShortcutKeys = false;
this.Menu_ExportMAIN.Size = new System.Drawing.Size(130, 22);
this.Menu_ExportMAIN.Size = new System.Drawing.Size(142, 22);
this.Menu_ExportMAIN.Text = "&Export main";
this.Menu_ExportMAIN.Click += new System.EventHandler(this.clickExportSAV);
//
@@ -3582,8 +3572,8 @@ public void InitializeComponent()
this.Menu_ExportBAK.Name = "Menu_ExportBAK";
this.Menu_ExportBAK.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B)));
this.Menu_ExportBAK.ShowShortcutKeys = false;
this.Menu_ExportBAK.Size = new System.Drawing.Size(130, 22);
this.Menu_ExportBAK.Text = "Export &BAK";
this.Menu_ExportBAK.Size = new System.Drawing.Size(142, 22);
this.Menu_ExportBAK.Text = "Export &Backup";
this.Menu_ExportBAK.Click += new System.EventHandler(this.clickExportSAVBAK);
//
// Menu_Exit
@@ -3729,7 +3719,7 @@ public void InitializeComponent()
this.Menu_Database.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.Menu_Database.ShowShortcutKeys = false;
this.Menu_Database.Size = new System.Drawing.Size(182, 22);
this.Menu_Database.Text = "PK6 &Database";
this.Menu_Database.Text = "PKM &Database";
this.Menu_Database.Click += new System.EventHandler(this.mainMenuDatabase);
//
// Menu_MGDatabase
@@ -5231,9 +5221,9 @@ public void InitializeComponent()
this.FLP_SAVtools.Controls.Add(this.B_OpenOPowers);
this.FLP_SAVtools.Controls.Add(this.B_OpenEventFlags);
this.FLP_SAVtools.Controls.Add(this.B_OpenPokedex);
this.FLP_SAVtools.Controls.Add(this.B_LinkInfo);
this.FLP_SAVtools.Controls.Add(this.B_OpenLinkInfo);
this.FLP_SAVtools.Controls.Add(this.B_OpenBerryField);
this.FLP_SAVtools.Controls.Add(this.B_Pokeblocks);
this.FLP_SAVtools.Controls.Add(this.B_OpenPokeblocks);
this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase);
this.FLP_SAVtools.Controls.Add(this.B_OpenPokepuffs);
this.FLP_SAVtools.Controls.Add(this.B_OpenSuperTraining);
@@ -5315,15 +5305,15 @@ public void InitializeComponent()
this.B_OpenPokedex.UseVisualStyleBackColor = true;
this.B_OpenPokedex.Click += new System.EventHandler(this.B_OpenPokedex_Click);
//
// B_LinkInfo
// B_OpenLinkInfo
//
this.B_LinkInfo.Location = new System.Drawing.Point(96, 61);
this.B_LinkInfo.Name = "B_LinkInfo";
this.B_LinkInfo.Size = new System.Drawing.Size(87, 23);
this.B_LinkInfo.TabIndex = 23;
this.B_LinkInfo.Text = "Link Data";
this.B_LinkInfo.UseVisualStyleBackColor = true;
this.B_LinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click);
this.B_OpenLinkInfo.Location = new System.Drawing.Point(96, 61);
this.B_OpenLinkInfo.Name = "B_OpenLinkInfo";
this.B_OpenLinkInfo.Size = new System.Drawing.Size(87, 23);
this.B_OpenLinkInfo.TabIndex = 23;
this.B_OpenLinkInfo.Text = "Link Data";
this.B_OpenLinkInfo.UseVisualStyleBackColor = true;
this.B_OpenLinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click);
//
// B_OpenBerryField
//
@@ -5335,16 +5325,16 @@ public void InitializeComponent()
this.B_OpenBerryField.UseVisualStyleBackColor = true;
this.B_OpenBerryField.Click += new System.EventHandler(this.B_OpenBerryField_Click);
//
// B_Pokeblocks
// B_OpenPokeblocks
//
this.B_Pokeblocks.Location = new System.Drawing.Point(3, 90);
this.B_Pokeblocks.Name = "B_Pokeblocks";
this.B_Pokeblocks.Size = new System.Drawing.Size(87, 23);
this.B_Pokeblocks.TabIndex = 22;
this.B_Pokeblocks.Text = "Pokéblocks";
this.B_Pokeblocks.UseVisualStyleBackColor = true;
this.B_Pokeblocks.Visible = false;
this.B_Pokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click);
this.B_OpenPokeblocks.Location = new System.Drawing.Point(3, 90);
this.B_OpenPokeblocks.Name = "B_OpenPokeblocks";
this.B_OpenPokeblocks.Size = new System.Drawing.Size(87, 23);
this.B_OpenPokeblocks.TabIndex = 22;
this.B_OpenPokeblocks.Text = "Pokéblocks";
this.B_OpenPokeblocks.UseVisualStyleBackColor = true;
this.B_OpenPokeblocks.Visible = false;
this.B_OpenPokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click);
//
// B_OpenSecretBase
//
@@ -5476,6 +5466,16 @@ public void InitializeComponent()
this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.L_UpdateAvailable.Visible = false;
//
// Label_IVs
//
this.Label_IVs.Location = new System.Drawing.Point(0, 0);
this.Label_IVs.Margin = new System.Windows.Forms.Padding(0);
this.Label_IVs.Name = "Label_IVs";
this.Label_IVs.Size = new System.Drawing.Size(30, 21);
this.Label_IVs.TabIndex = 29;
this.Label_IVs.Text = "IVs";
this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// Main
//
this.AllowDrop = true;
@@ -5756,7 +5756,6 @@ public void InitializeComponent()
private System.Windows.Forms.Label Label_HiddenPowerPrefix;
private System.Windows.Forms.Label Label_Stats;
private System.Windows.Forms.Label Label_EVs;
private System.Windows.Forms.Label Label_IVs;
private System.Windows.Forms.Label Label_Total;
private System.Windows.Forms.Label Label_SPE;
private System.Windows.Forms.Label Label_SPD;
@@ -6008,11 +6007,11 @@ public void InitializeComponent()
private System.Windows.Forms.FlowLayoutPanel FLP_SAVtools;
private System.Windows.Forms.GroupBox GB_SAVtools;
private System.Windows.Forms.PictureBox PB_Mark1;
private System.Windows.Forms.Button B_Pokeblocks;
private System.Windows.Forms.Button B_OpenPokeblocks;
private System.Windows.Forms.ToolStripMenuItem Menu_BatchEditor;
private System.Windows.Forms.Button BTN_Medals;
private System.Windows.Forms.FlowLayoutPanel FLP_PKMEditors;
private System.Windows.Forms.Button B_LinkInfo;
private System.Windows.Forms.Button B_OpenLinkInfo;
private System.Windows.Forms.Button B_CGearSkin;
private System.Windows.Forms.LinkLabel L_UpdateAvailable;
private System.Windows.Forms.Label L_MetTimeOfDay;
@@ -6097,6 +6096,7 @@ public void InitializeComponent()
private System.Windows.Forms.MaskedTextBox TB_Smart;
private System.Windows.Forms.MaskedTextBox TB_Tough;
private System.Windows.Forms.MaskedTextBox TB_Sheen;
private System.Windows.Forms.Label Label_IVs;
}
}

68
PKHeX/MainWindow/Main.cs
View File

@@ -835,7 +835,18 @@ private void loadSAV(SaveFile sav, string path)
GB_SUBE.Visible = SAV.HasSUBE;
PB_Locked.Visible = SAV.HasBattleBox && SAV.BattleBoxLocked;
PAN_Box.Visible = CB_BoxSelect.Visible = B_BoxLeft.Visible = B_BoxRight.Visible = SAV.HasBox;
if (!SAV.HasBox && tabBoxMulti.TabPages.Contains(Tab_Box))
{
tabBoxMulti.TabPages.Remove(Tab_Box);
tabBoxMulti.TabPages.Remove(Tab_Other);
}
else if (SAV.HasBox && !tabBoxMulti.TabPages.Contains(Tab_Box))
{
tabBoxMulti.TabPages.Insert(0, Tab_Box);
tabBoxMulti.TabPages.Insert(2, Tab_Other);
// force update -- re-added tab may be untranslated
Util.TranslateInterface(this, curlanguage);
}
Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_Report.Enabled = Menu_Modify.Enabled = B_SaveBoxBin.Enabled = SAV.HasBox;
if (path != null) // Actual save file
@@ -854,10 +865,10 @@ private void loadSAV(SaveFile sav, string path)
B_OpenOPowers.Visible = SAV.HasOPower;
B_OpenPokedex.Visible = SAV.HasPokeDex;
B_OpenBerryField.Visible = SAV.HasBerryField && SAV.XY;
B_Pokeblocks.Visible = SAV.HasPokeBlock;
B_OpenPokeblocks.Visible = SAV.HasPokeBlock;
B_JPEG.Visible = SAV.HasJPEG;
B_OpenEventFlags.Visible = SAV.HasEvents;
B_LinkInfo.Visible = SAV.HasLink;
B_OpenLinkInfo.Visible = SAV.HasLink;
B_CGearSkin.Visible = SAV.Generation == 5;
}
@@ -921,7 +932,7 @@ private void loadSAV(SaveFile sav, string path)
FLP_SpD.Visible = false;
Label_SPA.Visible = false;
Label_SPC.Visible = true;
TB_HPIV.ReadOnly = true;
TB_HPIV.Enabled = false;
MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV };
foreach (var ctrl in evControls)
{
@@ -934,8 +945,8 @@ private void loadSAV(SaveFile sav, string path)
FLP_SpD.Visible = true;
Label_SPA.Visible = true;
Label_SPC.Visible = false;
TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = true;
TB_HPIV.ReadOnly = true;
TB_SPDEV.Enabled = TB_SPDIV.Enabled = false;
TB_HPIV.Enabled = false;
MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV };
foreach (var ctrl in evControls)
{
@@ -948,8 +959,8 @@ private void loadSAV(SaveFile sav, string path)
FLP_SpD.Visible = true;
Label_SPA.Visible = true;
Label_SPC.Visible = false;
TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = false;
TB_HPIV.ReadOnly = false;
TB_SPDEV.Enabled = TB_SPDIV.Enabled = true;
TB_HPIV.Enabled = true;
MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV };
foreach (var ctrl in evControls)
{
@@ -1087,15 +1098,16 @@ private void InitializeStrings()
if (CB_MainLanguage.SelectedIndex < 8)
curlanguage = lang_val[CB_MainLanguage.SelectedIndex];
string l = curlanguage;
// Past Generation strings
g3items = Util.getStringList("ItemsG3", "en");
g2items = Util.getStringList("ItemsG2", "en");
g1items = Util.getStringList("ItemsG1", "en");
metRSEFRLG_00000 = Util.getStringList("rsefrlg_00000", "en");
metGSC_00000 = Util.getStringList("gsc_00000", "en");
g3items = Util.getStringListFallback("ItemsG3", l, "en");
g2items = Util.getStringListFallback("ItemsG2", l, "en");
g1items = Util.getStringListFallback("ItemsG1", l, "en");
metRSEFRLG_00000 = Util.getStringListFallback("rsefrlg_00000", l, "en");
metGSC_00000 = Util.getStringListFallback("gsc_00000", l, "en");
// Current Generation strings
string l = curlanguage;
natures = Util.getStringList("natures", l);
types = Util.getStringList("types", l);
abilitylist = Util.getAbilitiesList(l);
@@ -1448,7 +1460,7 @@ private void setAbilityList()
formnum = CB_Form.SelectedIndex;
int[] abils = SAV.Personal.getAbilities(species, formnum);
if (abils[1] == 0)
if (abils[1] == 0 && SAV.Generation != 3)
abils[1] = abils[0];
string[] abilIdentifier = {" (1)", " (2)", " (H)"};
List<string> ability_list = abils.Where(a => a != 0).Select((t, i) => abilitylist[t] + abilIdentifier[i]).ToList();
@@ -1776,7 +1788,7 @@ private void updateIVs(object sender, EventArgs e)
if (SAV.Generation < 3)
{
TB_HPIV.Text = pkm.IV_HP.ToString("00");
TB_HPIV.Text = pkm.IV_HP.ToString();
TB_SPDIV.Text = TB_SPAIV.Text;
if (SAV.Generation == 2)
{
@@ -2129,7 +2141,7 @@ private void updateSpecies(object sender, EventArgs e)
updateLegality();
}
private IEnumerable<ComboItem> getLocationList(GameVersion Version, int SaveFormat, bool egg)
private List<ComboItem> getLocationList(GameVersion Version, int SaveFormat, bool egg)
{
if (egg)
{
@@ -2154,33 +2166,33 @@ private IEnumerable<ComboItem> getLocationList(GameVersion Version, int SaveForm
case GameVersion.R:
case GameVersion.S:
if (SaveFormat == 3)
return metGen3.OrderByDescending(loc => loc.Value <= 87); // Ferry
return metGen3.OrderByDescending(loc => loc.Value <= 87).ToList(); // Ferry
break;
case GameVersion.E:
if (SaveFormat == 3)
return metGen3.OrderByDescending(loc => loc.Value <= 87 || (loc.Value >= 196 && loc.Value <= 212)); // Trainer Hill
return metGen3.OrderByDescending(loc => loc.Value <= 87 || (loc.Value >= 196 && loc.Value <= 212)).ToList(); // Trainer Hill
break;
case GameVersion.FR:
case GameVersion.LG:
if (SaveFormat == 3)
return metGen3.OrderByDescending(loc => loc.Value > 87 && loc.Value < 197); // Celadon Dept.
return metGen3.OrderByDescending(loc => loc.Value > 87 && loc.Value < 197).ToList(); // Celadon Dept.
break;
case GameVersion.D:
case GameVersion.P:
if (SaveFormat == 4 || (SaveFormat >= 5 && egg))
return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)); // Battle Park
return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)).ToList(); // Battle Park
break;
case GameVersion.Pt:
if (SaveFormat == 4 || (SaveFormat >= 5 && egg))
return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)); // Rock Peak Ruins
return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)).ToList(); // Rock Peak Ruins
break;
case GameVersion.HG:
case GameVersion.SS:
if (SaveFormat == 4 || (SaveFormat >= 5 && egg))
return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)); // Celadon Dept.
return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)).ToList(); // Celadon Dept.
break;
case GameVersion.B:
@@ -2189,27 +2201,27 @@ private IEnumerable<ComboItem> getLocationList(GameVersion Version, int SaveForm
case GameVersion.B2:
case GameVersion.W2:
return metGen5.Take(3).Concat(metGen5.Skip(3).OrderByDescending(loc => loc.Value <= 116)); // Abyssal Ruins
return metGen5.Take(3).Concat(metGen5.Skip(3).OrderByDescending(loc => loc.Value <= 116)).ToList(); // Abyssal Ruins
case GameVersion.X:
case GameVersion.Y:
return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value <= 168)); // Unknown Dungeon
return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value <= 168)).ToList(); // Unknown Dungeon
case GameVersion.OR:
case GameVersion.AS:
return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value > 168 && loc.Value <= 354)); // Secret Base
return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value > 168 && loc.Value <= 354)).ToList(); // Secret Base
}
// Currently on a future game, return corresponding list for generation
if (Version <= GameVersion.CXD && SaveFormat == 4)
return metGen4.Where(loc => loc.Value == 0x37) // Pal Park to front
.Concat(metGen4.Take(4))
.Concat(metGen4.Skip(4).Where(loc => loc.Value != 0x37));
.Concat(metGen4.Skip(4).Where(loc => loc.Value != 0x37)).ToList();
if (Version < GameVersion.X && SaveFormat >= 5) // PokéTransfer to front
return metGen5.Where(loc => loc.Value == 30001)
.Concat(metGen5.Take(3))
.Concat(metGen5.Skip(3).Where(loc => loc.Value != 30001));
.Concat(metGen5.Skip(3).Where(loc => loc.Value != 30001)).ToList();
return metGen6;
}

787
PKHeX/MainWindow/Main.resx
View File

File diff suppressed because it is too large Load Diff

2
PKHeX/MainWindow/MainPK4.cs
View File

@@ -137,8 +137,6 @@ private void populateFieldsPK4()
if (abil < 0)
CB_Ability.SelectedIndex = 0;
else if (abil == 2)
CB_Ability.SelectedIndex = 2;
else if (abils[0] == abils[1] || abils[1] == 0)
CB_Ability.SelectedIndex = pk4.PIDAbility;
else

5
PKHeX/PKHeX.csproj
View File

@@ -454,6 +454,11 @@
<None Include="Resources\text\gen3\text_ItemsG2_es.txt" />
<None Include="Resources\text\gen3\text_ItemsG3_es.txt" />
<None Include="Resources\text\gen3\text_rsefrlg_00000_es.txt" />
<None Include="Resources\text\gen3\text_gsc_00000_zh.txt" />
<None Include="Resources\text\gen3\text_ItemsG1_zh.txt" />
<None Include="Resources\text\gen3\text_ItemsG2_zh.txt" />
<None Include="Resources\text\gen3\text_ItemsG3_zh.txt" />
<None Include="Resources\text\gen3\text_rsefrlg_00000_zh.txt" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">

129
PKHeX/Resources/text/en/lang_en.txt
View File

@@ -21,7 +21,7 @@ Menu_Open = Open...
Menu_Save = Save PKM...
Menu_ExportSAV = Export SAV...
Menu_ExportMAIN = Export main
Menu_ExportBAK = Export BAK
Menu_ExportBAK = Export Backup
Menu_Exit = Quit
--
Menu_Tools = Tools
@@ -38,6 +38,8 @@ Menu_LoadBoxes = Load Boxes
Menu_DumpBoxes = Dump Boxes
Menu_Report = Box Data Report
Menu_Database = PKM Database
Menu_MGDatabase = Mystery Gift Database
Menu_BatchEditor = Batch Editor
Menu_Other = Other
Menu_OpenSDF = Open SaveDataFiler Folder
Menu_OpenSDB = Open SaveDataBackup Folder
@@ -92,6 +94,7 @@ Label_EggLocation = Location:
Label_EggDate = Date:
--------------------Stats Tab Data----------------------
Tab_Stats = Stats
CHK_HackedStats = Hacked Stats
Label_IVs = IVs
Label_EVs = EVs
Label_Stats = Stats
@@ -101,6 +104,7 @@ Label_DEF = Def:
Label_SPA = SpA:
Label_SPD = SpD:
Label_SPE = Spe:
Label_SPC = SpC:
Label_Total = Total:
Label_HiddenPowerPrefix = Hidden Power Type:
Label_CharacteristicPrefix = Characteristic:
@@ -144,15 +148,18 @@ B_OpenItemPouch = Items
B_OpenTrainerInfo = Trainer Info
B_OUTPasserby = Passerby
B_OpenBoxLayout = Box Layout
B_OpenWondercards = WonderCard
B_OpenWondercards = Mystery Gift
B_OpenSuperTraining = Super Train
B_OpenHallofFame = Hall of Fame
B_OpenOPowers = O-Powers
B_OpenEventFlags = Event Flags
B_OpenPokedex = Pokédex
B_OpenBerryField = Berry Field
B_OpenPokeBlocks = Pokéblocks
B_OpenLinkInfo = Link Data
--
B_OpenSecretBase = Secret Base
B_CGearSkin = C-Gear Skin
--------------------Tab Internals-----------------------
L_Party = Party:
L_BattleBox = Battle Box:
@@ -363,6 +370,66 @@ L_Arguments = Disabled ; Never left ; OT ; Past Gen ; Memories with ; Pokémon ;
! End
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
! SAV_PokeBlockORAS = Pokéblock Editor
- Change stuff below this line, not above.
-------------------------------------------------------
L_Red = Red Pokéblocks:
L_Blue = Blue Pokéblocks:
L_Pink = Pink Pokéblocks:
L_Green = Green Pokéblocks:
L_Yellow = Yellow Pokéblocks:
L_Rainbow = Rainbow Pokéblocks:
L_Red = Red Pokéblocks +:
L_Blue = Blue Pokéblocks +:
L_Pink = Pink Pokéblocks +:
L_Green = Green Pokéblocks +:
L_Yellow = Yellow Pokéblocks +:
L_Rainbow = Rainbow Pokéblocks +:
B_RandomizeBerries = Randomize Berries
B_GiveAllBlocks = Give All Blocks
B_Cancel = Cancel
B_Save = Save
! End
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
! SAV_Link6 = Pokémon Link Tool
- Change stuff below this line, not above.
-------------------------------------------------------
TAB_Main = Main
TAB_PKM = Pokémon
TAB_Items = Items
L_BP = Battle Points:
L_Pokemiles: PokéMiles
CHK_LinkAvailable = Pokémon Link Enabled
B_Import = Import
B_Export = Export
B_Cancel = Cancel
B_Save = Save
L_Item1 = Item 1:
L_Item2 = Item 2:
L_Item3 = Item 3:
L_Item4 = Item 4:
L_Item5 = Item 5:
L_Item6 = Item 6:
! End
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
! SuperTrain = Super Training Records
- Change stuff below this line, not above.
----------------------Buttons--------------------------
L_Records = Records
L_Bags = Training Bags
L_Species = Species:
L_Unk = L_Unk
L_Time0 = Time:
L_Time1 = Time1
L_Time2 = Time2
L_UNKNOWN = UNKNOWN
L_Species2 = Species
B_Cancel = Cancel
B_Save = Save
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
! SAV_BerryField = Berry Field Viewer
- Change stuff below this line, not above.
-------------------------------------------------------
@@ -525,13 +592,14 @@ B_Cancel = Cancel
- Change stuff below this line, not above.
------------------------------------------------------
L_goto = goto:
GB_Owned = Owned
CHK_P1 = Obtained
GB_Owned = Seen
CHK_P2 = Male
CHK_P3 = Female
CHK_P4 = Shiny Male
CHK_P5 = Shiny Female
GB_Encountered = Encountered
GB_Owned = Owned
CHK_P1 = Obtained
GB_Displayed = Displayed
CHK_P6 = Male
CHK_P7 = Female
CHK_P8 = Shiny Male
@@ -606,6 +674,7 @@ Label_EncryptionConstant = Encryption Constant:
CHK_Nicknamed = Nickname:
Label_Species = Species:
L_PartyNum = Party Index:
B_Delete = Delete
B_Close = Save
! End
! -----------------------------------------------------
@@ -613,12 +682,7 @@ B_Close = Save
! SAV_Inventory = Inventory Editor
- Change stuff below this line, not above.
-------------------------------------------------------
GB_Pouch = Pouches
B_DisplayBerries = Berry
B_DisplayMedicine = Medicine
B_DisplayTMHM = TM/HM
B_DisplayKeyItems = Key Items
B_DisplayItems = Items
B_GiveAll = Give All
B_Save = Save
B_Cancel = Cancel
! End
@@ -723,14 +787,20 @@ L_PPUps = PPUps
-------------------------------------------------------
Tab_Multiplayer = Multiplayer
L_MultiplayerSprite = Multiplayer Sprite:
L_Style = Style:
GB_Sayings = Saved Sayings
L_Saying1 = 1:
L_Saying2 = 2:
L_Saying3 = 3:
L_Saying4 = 4:
L_Saying5 = 5:
--
Tab_BadgeMap = Badges/Map
GB_Map = Map Position
L_CurrentMap = Current Map:
L_X = X Coordinate:
L_Z = Z Coordinate:
L_Y = Y Coordinate:
L_Offset = (offset)
--
Tab_Appearance = Current Appearance (X/Y)
L_Outfit = Outfit Vals
B_GiveAccessories = Give All Accessories
@@ -745,6 +815,8 @@ L_FacialHair = Facial Hair:
L_Hairstyle = Hairstyle:
L_HairColor = Hair Color:
L_SkinColor = Skin Color:
--
Tab_Maison = Maison
GB_MaisonCurrent = Maison Streaks (Current)
L_SuperC = Super
L_NormalC = Normal
@@ -764,32 +836,35 @@ L_SinglesB = Singles:
B_Save = Save
L_Stats = Stats
B_Cancel = Cancel
--
Tab_Overview = Overview
L_Seconds = Sec:
L_Minutes = Min:
L_Hours = Hrs:
L_TrainerName = Trainer Name:
L_Language = Language:
L_PM = PokéMiles:
L_Region = Region:
L_BP = BP:
L_Country = Country:
B_MaxCash = +
L_3DSReg = 3DS Region:
L_Money = $:
L_SID = SID:
L_TID = TID:
L_TrainerName = Trainer Name:
L_SID = SID:
-
GB_Adventure = Adventure Info
L_Seconds = Sec:
L_Minutes = Min:
L_Hours = Hrs:
L_Started = Game Started:
L_Fame = HoF Entered:
L_LastSaved = Last Saved:
-
L_PM = PokéMiles:
L_BP = BP:
L_Style = Style:
L_Value = Value
GB_Sayings = Saved Sayings
L_Saying1 = 1:
L_Saying2 = 2:
L_Saying3 = 3:
L_Saying4 = 4:
L_Saying5 = 5:
L_Offset = (offset)
! End
! -----------------------------------------------------
- DO NOT CHANGE THIS SECTION.
! SAV_Wondercard = Wonder Card I/O
! SAV_Wondercard = Mystery Gift I/O
- Change stuff below this line, not above.
-------------------------------------------------------
L_Details = Details:

BIN
PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt Normal file
View File

Binary file not shown.

255
PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt Normal file
View File

@@ -0,0 +1,255 @@
(无)
掌门球
高级球
亮光之粉
超级球
精灵球
卡比丘 (0)
自行车
月之石
解毒剂
灼伤药
解冻药
解眠药
解麻药
回复药水
全满药水
超高级药水
超级药水
药水
脱离洞穴的绳子
除虫喷雾器
PP全补剂
火之石
雷之石
水之石
卡比丘 (1)
HP提升剂
攻击牛磺剂
防御提升剂
效果防护
幸运之拳
特攻增加剂
神奇糖果
命中加强
叶之石
金属粉
金色珠
皮皮玩偶
万能药
更生剂
特级更生剂
防御效果
白银喷雾器
黄金喷雾器
要害攻击
卡比丘 (2)
美味之水
塞可汽水
综合调味乳
力量增强
卡比丘 (3)
伤害预防
速度增加
特殊增强
代币盒
蓝色卡片
卡比丘 (4)
学习装置
破烂钓竿
优秀钓竿
银叶
超强钓竿
PP提升剂
PP小补剂
PP单补剂
PP大补剂
红色的鳞片
秘传之药
船票
神奇之蛋
透明铃铛
银色之翼
摩摩牛奶
先攻之爪
解毒的果实
金叶
柔软的沙子
尖锐的鸟嘴
消除麻痹的果实
烧烤的果实
冰冻的果实
毒针
王者之证
苦涩的果实
薄荷的果实
红色圆柑果实
小蘑菇
大蘑菇
银色的粉
蓝色圆柑果实
卡比丘 (5)
护身金币
黄色圆柑果实
绿色圆柑果实
净身的护身符
神秘的水滴
弯曲的汤匙
白色圆柑果实
黑色带子
黑色圆柑果实
卡比丘 (6)
桃色圆柑果实
黑色的眼镜
美味尾巴
粉红色丝带
大葱
烟雾球
融化不了的冰块
磁铁
奇迹的果实
珍珠
大珍珠
不变之石
诅咒护身符
愤怒馒头
GS球*
蓝色卡片*
奇迹种子
胖骨头
振奋精神的头布
卡比丘 (7)
元气之粉
元气之根
万能之粉
复活草
硬石头
幸运蛋
卡片钥匙
机械的零件
神奇宝贝蛋兑换券
掉落的东西
星星的沙子
星星的碎片
地下室钥匙
定期月票
卡比丘 (8)
卡比丘 (9)
卡比丘 (10)
木灰
树果汁
对焦镜片
卡比丘 (11)
卡比丘 (12)
金属涂层
龙之牙
卡比丘 (13)
吃剩下的东西
卡比丘 (14)
卡比丘 (15)
卡比丘 (16)
神奇的果实
龙之鳞片
破坏性的遗传因子
卡比丘 (17)
卡比丘 (18)
卡比丘 (19)
神圣之灰
重量球
花案邮件
等级球
诱饵球
速度球
卡比丘 (20)
电气球
友友球
月亮球
爱心球
木箱
桐木箱
太阳之石
水玉色之带
卡比丘 (21)
升级
树果
黄金的果实
杰尼龟喷壶
卡比丘 (22)
公园球
彩虹之翼
卡比丘 (23)
砖瓦碎片
冲浪邮件
海洋邮件
肖像邮件
可爱邮件
伊布邮件
变身邮件
蓝天邮件
音符邮件
梦幻邮件
卡比丘 (24)
TM01
TM02
TM03
TM04
TM04 (未使用)
TM05
TM06
TM07
TM08
TM09
TM10
TM11
TM12
TM13
TM14
TM15
TM16
TM17
TM18
TM19
TM20
TM21
TM22
TM23
TM24
TM25
TM26
TM27
TM28
TM28 (未使用)
TM29
TM30
TM31
TM32
TM33
TM34
TM35
TM36
TM37
TM38
TM39
TM40
TM41
TM42
TM43
TM44
TM45
TM46
TM47
TM48
TM49
TM50
HM01
HM02
HM03
HM04
HM05
HM06
HM07
HM08 (未使用)
HM09 (未使用)
HM10 (未使用)
HM11 (未使用)
HM12 (未使用)

BIN
PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt Normal file
View File

Binary file not shown.

BIN
PKHeX/Resources/text/gen3/text_gsc_00000_zh.txt Normal file
View File

Binary file not shown.

BIN
PKHeX/Resources/text/gen3/text_rsefrlg_00000_zh.txt Normal file
View File

Binary file not shown.

2
PKHeX/Saves/SaveFile.cs
View File

@@ -328,7 +328,7 @@ public virtual MysteryGiftAlbum GiftAlbum
public abstract int getDaycareSlotOffset(int loc, int slot);
public abstract uint? getDaycareEXP(int loc, int slot);
public virtual ulong? getDaycareRNGSeed(int loc) { return null; }
public virtual bool? getDaycareHasEgg(int loc) { return false; }
public virtual bool? getDaycareHasEgg(int loc) { return null; }
public abstract bool? getDaycareOccupied(int loc, int slot);
public abstract void setDaycareEXP(int loc, int slot, uint EXP);

22
PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs generated
View File

@@ -44,7 +44,7 @@ private void InitializeComponent()
this.TB_Unk = new System.Windows.Forms.MaskedTextBox();
this.L_Unk = new System.Windows.Forms.Label();
this.L_Species = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.L_Time0 = new System.Windows.Forms.Label();
this.L_Records = new System.Windows.Forms.Label();
this.L_Bags = new System.Windows.Forms.Label();
this.L_UNKNOWN = new System.Windows.Forms.Label();
@@ -245,15 +245,15 @@ private void InitializeComponent()
this.L_Species.TabIndex = 129;
this.L_Species.Text = "Species:";
//
// label4
// L_Time0
//
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(178, 99);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(33, 13);
this.label4.TabIndex = 130;
this.label4.Text = "Time:";
this.L_Time0.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.L_Time0.AutoSize = true;
this.L_Time0.Location = new System.Drawing.Point(178, 99);
this.L_Time0.Name = "L_Time0";
this.L_Time0.Size = new System.Drawing.Size(33, 13);
this.L_Time0.TabIndex = 130;
this.L_Time0.Text = "Time:";
//
// L_Records
//
@@ -292,7 +292,7 @@ private void InitializeComponent()
this.Controls.Add(this.L_UNKNOWN);
this.Controls.Add(this.L_Bags);
this.Controls.Add(this.L_Records);
this.Controls.Add(this.label4);
this.Controls.Add(this.L_Time0);
this.Controls.Add(this.L_Species);
this.Controls.Add(this.L_Unk);
this.Controls.Add(this.TB_Unk);
@@ -339,7 +339,7 @@ private void InitializeComponent()
private System.Windows.Forms.MaskedTextBox TB_Unk;
private System.Windows.Forms.Label L_Unk;
private System.Windows.Forms.Label L_Species;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label L_Time0;
private System.Windows.Forms.Label L_Records;
private System.Windows.Forms.Label L_Bags;
private System.Windows.Forms.Label L_UNKNOWN;

174
PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs generated
View File

@@ -179,8 +179,11 @@ private void InitializeComponent()
this.MT_Stat = new System.Windows.Forms.MaskedTextBox();
this.TC_Editor = new System.Windows.Forms.TabControl();
this.Tab_Overview = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.GB_Stats = new System.Windows.Forms.GroupBox();
this.GB_Adventure = new System.Windows.Forms.GroupBox();
this.L_Fame = new System.Windows.Forms.Label();
this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker();
this.CAL_HoFTime = new System.Windows.Forms.DateTimePicker();
this.L_Started = new System.Windows.Forms.Label();
this.CAL_AdventureStartDate = new System.Windows.Forms.DateTimePicker();
this.CAL_AdventureStartTime = new System.Windows.Forms.DateTimePicker();
@@ -199,9 +202,6 @@ private void InitializeComponent()
this.Tab_Multiplayer = new System.Windows.Forms.TabPage();
this.Tab_Maison = new System.Windows.Forms.TabPage();
this.Tab_Appearance = new System.Windows.Forms.TabPage();
this.L_Fame = new System.Windows.Forms.Label();
this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker();
this.CAL_HoFTime = new System.Windows.Forms.DateTimePicker();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PB_Badge4)).BeginInit();
@@ -216,8 +216,8 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.PB_Sprite)).BeginInit();
this.TC_Editor.SuspendLayout();
this.Tab_Overview.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.GB_Stats.SuspendLayout();
this.GB_Adventure.SuspendLayout();
this.Tab_BadgeMap.SuspendLayout();
this.GB_Map.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NUD_Z)).BeginInit();
@@ -1777,8 +1777,8 @@ private void InitializeComponent()
//
// Tab_Overview
//
this.Tab_Overview.Controls.Add(this.groupBox1);
this.Tab_Overview.Controls.Add(this.groupBox2);
this.Tab_Overview.Controls.Add(this.GB_Stats);
this.Tab_Overview.Controls.Add(this.GB_Adventure);
this.Tab_Overview.Controls.Add(this.CB_Vivillon);
this.Tab_Overview.Controls.Add(this.L_Vivillon);
this.Tab_Overview.Controls.Add(this.TB_OTName);
@@ -1808,48 +1808,81 @@ private void InitializeComponent()
this.Tab_Overview.Text = "Overview";
this.Tab_Overview.UseVisualStyleBackColor = true;
//
// groupBox1
// GB_Stats
//
this.groupBox1.Controls.Add(this.TB_BP);
this.groupBox1.Controls.Add(this.TB_PM);
this.groupBox1.Controls.Add(this.L_PM);
this.groupBox1.Controls.Add(this.TB_Style);
this.groupBox1.Controls.Add(this.L_Offset);
this.groupBox1.Controls.Add(this.L_BP);
this.groupBox1.Controls.Add(this.L_Value);
this.groupBox1.Controls.Add(this.L_Style);
this.groupBox1.Controls.Add(this.MT_Stat);
this.groupBox1.Controls.Add(this.CB_Stats);
this.groupBox1.Location = new System.Drawing.Point(209, 99);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(171, 151);
this.groupBox1.TabIndex = 55;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Stats";
this.GB_Stats.Controls.Add(this.TB_BP);
this.GB_Stats.Controls.Add(this.TB_PM);
this.GB_Stats.Controls.Add(this.L_PM);
this.GB_Stats.Controls.Add(this.TB_Style);
this.GB_Stats.Controls.Add(this.L_Offset);
this.GB_Stats.Controls.Add(this.L_BP);
this.GB_Stats.Controls.Add(this.L_Value);
this.GB_Stats.Controls.Add(this.L_Style);
this.GB_Stats.Controls.Add(this.MT_Stat);
this.GB_Stats.Controls.Add(this.CB_Stats);
this.GB_Stats.Location = new System.Drawing.Point(209, 99);
this.GB_Stats.Name = "GB_Stats";
this.GB_Stats.Size = new System.Drawing.Size(171, 151);
this.GB_Stats.TabIndex = 55;
this.GB_Stats.TabStop = false;
this.GB_Stats.Text = "Stats";
//
// groupBox2
// GB_Adventure
//
this.groupBox2.Controls.Add(this.L_Fame);
this.groupBox2.Controls.Add(this.CAL_HoFDate);
this.groupBox2.Controls.Add(this.CAL_HoFTime);
this.groupBox2.Controls.Add(this.L_Started);
this.groupBox2.Controls.Add(this.CAL_AdventureStartDate);
this.groupBox2.Controls.Add(this.CAL_LastSavedDate);
this.groupBox2.Controls.Add(this.L_LastSaved);
this.groupBox2.Controls.Add(this.MT_Seconds);
this.groupBox2.Controls.Add(this.MT_Hours);
this.groupBox2.Controls.Add(this.L_Seconds);
this.groupBox2.Controls.Add(this.L_Hours);
this.groupBox2.Controls.Add(this.MT_Minutes);
this.groupBox2.Controls.Add(this.L_Minutes);
this.groupBox2.Controls.Add(this.CAL_AdventureStartTime);
this.groupBox2.Controls.Add(this.CAL_LastSavedTime);
this.groupBox2.Location = new System.Drawing.Point(3, 99);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(200, 151);
this.groupBox2.TabIndex = 56;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Adventure Info";
this.GB_Adventure.Controls.Add(this.L_Fame);
this.GB_Adventure.Controls.Add(this.CAL_HoFDate);
this.GB_Adventure.Controls.Add(this.CAL_HoFTime);
this.GB_Adventure.Controls.Add(this.L_Started);
this.GB_Adventure.Controls.Add(this.CAL_AdventureStartDate);
this.GB_Adventure.Controls.Add(this.CAL_LastSavedDate);
this.GB_Adventure.Controls.Add(this.L_LastSaved);
this.GB_Adventure.Controls.Add(this.MT_Seconds);
this.GB_Adventure.Controls.Add(this.MT_Hours);
this.GB_Adventure.Controls.Add(this.L_Seconds);
this.GB_Adventure.Controls.Add(this.L_Hours);
this.GB_Adventure.Controls.Add(this.MT_Minutes);
this.GB_Adventure.Controls.Add(this.L_Minutes);
this.GB_Adventure.Controls.Add(this.CAL_AdventureStartTime);
this.GB_Adventure.Controls.Add(this.CAL_LastSavedTime);
this.GB_Adventure.Location = new System.Drawing.Point(3, 99);
this.GB_Adventure.Name = "GB_Adventure";
this.GB_Adventure.Size = new System.Drawing.Size(200, 151);
this.GB_Adventure.TabIndex = 56;
this.GB_Adventure.TabStop = false;
this.GB_Adventure.Text = "Adventure Info";
//
// L_Fame
//
this.L_Fame.Location = new System.Drawing.Point(3, 72);
this.L_Fame.Name = "L_Fame";
this.L_Fame.Size = new System.Drawing.Size(80, 20);
this.L_Fame.TabIndex = 40;
this.L_Fame.Text = "HoF Entered:";
this.L_Fame.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// CAL_HoFDate
//
this.CAL_HoFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.CAL_HoFDate.Location = new System.Drawing.Point(89, 72);
this.CAL_HoFDate.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0);
this.CAL_HoFDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
this.CAL_HoFDate.Name = "CAL_HoFDate";
this.CAL_HoFDate.Size = new System.Drawing.Size(99, 20);
this.CAL_HoFDate.TabIndex = 39;
this.CAL_HoFDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
//
// CAL_HoFTime
//
this.CAL_HoFTime.CustomFormat = "hh:mm tt";
this.CAL_HoFTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.CAL_HoFTime.Location = new System.Drawing.Point(115, 91);
this.CAL_HoFTime.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0);
this.CAL_HoFTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
this.CAL_HoFTime.Name = "CAL_HoFTime";
this.CAL_HoFTime.ShowUpDown = true;
this.CAL_HoFTime.Size = new System.Drawing.Size(73, 20);
this.CAL_HoFTime.TabIndex = 38;
this.CAL_HoFTime.Value = new System.DateTime(2001, 1, 1, 0, 0, 0, 0);
//
// L_Started
//
@@ -2119,39 +2152,6 @@ private void InitializeComponent()
this.Tab_Appearance.Text = "Appearance";
this.Tab_Appearance.UseVisualStyleBackColor = true;
//
// L_Fame
//
this.L_Fame.Location = new System.Drawing.Point(3, 72);
this.L_Fame.Name = "L_Fame";
this.L_Fame.Size = new System.Drawing.Size(80, 20);
this.L_Fame.TabIndex = 40;
this.L_Fame.Text = "HoF Entered:";
this.L_Fame.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// CAL_HoFDate
//
this.CAL_HoFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.CAL_HoFDate.Location = new System.Drawing.Point(89, 72);
this.CAL_HoFDate.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0);
this.CAL_HoFDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
this.CAL_HoFDate.Name = "CAL_HoFDate";
this.CAL_HoFDate.Size = new System.Drawing.Size(99, 20);
this.CAL_HoFDate.TabIndex = 39;
this.CAL_HoFDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
//
// CAL_HoFTime
//
this.CAL_HoFTime.CustomFormat = "hh:mm tt";
this.CAL_HoFTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.CAL_HoFTime.Location = new System.Drawing.Point(115, 91);
this.CAL_HoFTime.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0);
this.CAL_HoFTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0);
this.CAL_HoFTime.Name = "CAL_HoFTime";
this.CAL_HoFTime.ShowUpDown = true;
this.CAL_HoFTime.Size = new System.Drawing.Size(73, 20);
this.CAL_HoFTime.TabIndex = 38;
this.CAL_HoFTime.Value = new System.DateTime(2001, 1, 1, 0, 0, 0, 0);
//
// SAV_Trainer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -2185,10 +2185,10 @@ private void InitializeComponent()
this.TC_Editor.ResumeLayout(false);
this.Tab_Overview.ResumeLayout(false);
this.Tab_Overview.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.GB_Stats.ResumeLayout(false);
this.GB_Stats.PerformLayout();
this.GB_Adventure.ResumeLayout(false);
this.GB_Adventure.PerformLayout();
this.Tab_BadgeMap.ResumeLayout(false);
this.Tab_BadgeMap.PerformLayout();
this.GB_Map.ResumeLayout(false);
@@ -2371,8 +2371,8 @@ private void InitializeComponent()
private System.Windows.Forms.NumericUpDown NUD_M;
private System.Windows.Forms.NumericUpDown NUD_Z;
private System.Windows.Forms.GroupBox GB_Map;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox GB_Adventure;
private System.Windows.Forms.GroupBox GB_Stats;
private System.Windows.Forms.DateTimePicker CAL_AdventureStartDate;
private System.Windows.Forms.DateTimePicker CAL_AdventureStartTime;
private System.Windows.Forms.Label L_Started;

1
PKHeX/Subforms/Save Editors/SAV_Inventory.cs
View File

@@ -23,6 +23,7 @@ public SAV_Inventory()
break;
case 3:
itemlist = Main.g3items;
B_GiveAll.Visible = false;
break;
default:
itemlist = Main.itemlist;

7
PKHeX/Util/DataUtil.cs
View File

@@ -55,6 +55,13 @@ public static string[] getStringList(string f, string l)
rawlist[i] = rawlist[i].Trim();
return rawlist;
}
public static string[] getStringListFallback(string f, string l, string fallback)
{
string[] text = getStringList(f, l);
if (text.Length == 0)
text = getStringList(f, fallback);
return text;
}
internal static string[] getNulledStringArray(string[] SimpleStringList)
{
try