Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-26 05:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show move elemental type in PKM Editor

Browse source 
Note this is only SV types, so moves that had their type changed (=>dark/steel/fairy) will be inaccurate in past game formats.

Would need time to dump the info.
This commit is contained in:
Kurt 2023-04-04 14:22:49 -07:00
parent 43c67fd455
commit aeb6595887
16 changed files with 190 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PKHeX.Core/Moves/MoveInfo.cs
View file

@ -167,4 +167,16 @@ public static class MoveInfo
Gen9 => Legal.MaxMoveID_9, Gen9 => Legal.MaxMoveID_9,
_ => -1, _ => -1,
}; };
public static byte GetType(ushort move, EntityContext context) => context switch
{
_ => GetType(move, MoveInfo9.MoveType_SV),
};
private static byte GetType(ushort move, ReadOnlySpan<byte> types)
{
if (move >= types.Length)
return 0;
return types[move];
}
} }

50
PKHeX.Core/Moves/MoveInfo9.cs
View file

@ -58,6 +58,56 @@ internal static class MoveInfo9
10, 10,
}; };
public static ReadOnlySpan<byte> MoveType_SV => new byte[]
{
00, 00, 01, 00, 00, 00, 00, 09, 14, 12, 00, 00, 00, 00, 00, 00, 02, 02, 00, 02,
00, 00, 11, 00, 01, 00, 01, 01, 04, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
03, 06, 06, 00, 16, 00, 00, 00, 00, 00, 00, 03, 09, 09, 14, 10, 10, 10, 14, 14,
13, 10, 14, 00, 02, 02, 01, 01, 01, 01, 00, 11, 11, 11, 00, 11, 11, 03, 11, 11,
11, 06, 15, 09, 12, 12, 12, 12, 05, 04, 04, 04, 03, 13, 13, 13, 13, 13, 00, 00,
13, 07, 00, 00, 00, 00, 00, 00, 00, 07, 10, 00, 13, 13, 14, 13, 00, 00, 00, 02,
00, 00, 07, 03, 03, 04, 09, 10, 10, 00, 00, 00, 00, 13, 13, 00, 01, 00, 13, 03,
00, 06, 00, 02, 00, 10, 00, 11, 00, 13, 00, 03, 10, 00, 00, 04, 13, 05, 00, 00,
00, 00, 00, 00, 00, 00, 00, 01, 16, 06, 00, 07, 09, 00, 07, 00, 00, 02, 11, 01,
07, 14, 00, 01, 00, 16, 17, 00, 03, 04, 10, 04, 12, 00, 07, 00, 14, 01, 04, 00,
15, 05, 11, 00, 17, 05, 00, 00, 00, 12, 06, 08, 00, 00, 00, 00, 00, 00, 00, 00,
00, 09, 04, 01, 06, 15, 00, 00, 16, 00, 00, 08, 08, 01, 00, 11, 17, 00, 01, 15,
10, 09, 16, 13, 00, 00, 05, 07, 13, 01, 10, 16, 00, 00, 00, 00, 00, 09, 14, 16,
16, 09, 16, 00, 01, 00, 00, 00, 12, 16, 00, 13, 13, 00, 00, 11, 01, 13, 00, 01,
01, 00, 16, 00, 09, 13, 13, 00, 07, 16, 00, 10, 01, 00, 06, 13, 13, 02, 00, 09,
04, 14, 11, 00, 00, 03, 00, 09, 10, 08, 07, 00, 11, 16, 02, 09, 00, 05, 06, 08,
11, 00, 13, 10, 06, 07, 13, 01, 04, 14, 10, 11, 02, 14, 08, 00, 00, 15, 11, 01,
02, 04, 03, 00, 12, 11, 10, 13, 11, 15, 05, 12, 10, 08, 13, 02, 13, 13, 01, 01,
08, 13, 10, 00, 00, 02, 02, 00, 08, 06, 01, 16, 16, 16, 16, 13, 00, 13, 00, 13,
03, 00, 00, 00, 13, 13, 16, 00, 11, 16, 03, 13, 10, 12, 09, 01, 01, 05, 03, 16,
16, 10, 11, 02, 06, 06, 15, 15, 05, 01, 01, 01, 11, 02, 04, 16, 00, 16, 08, 14,
14, 07, 12, 14, 09, 07, 04, 13, 13, 08, 08, 00, 02, 13, 15, 12, 09, 11, 11, 05,
03, 03, 08, 08, 05, 00, 05, 11, 02, 00, 06, 12, 11, 10, 06, 06, 06, 05, 00, 15,
15, 13, 00, 09, 16, 11, 07, 07, 16, 05, 13, 13, 13, 13, 03, 08, 06, 13, 13, 05,
01, 09, 03, 06, 08, 13, 12, 10, 09, 03, 01, 03, 16, 00, 00, 00, 00, 00, 00, 03,
13, 01, 13, 10, 00, 13, 07, 02, 08, 01, 09, 16, 02, 00, 00, 01, 00, 09, 10, 09,
11, 12, 06, 04, 14, 15, 00, 12, 12, 04, 15, 13, 11, 01, 10, 09, 11, 06, 11, 16,
13, 00, 02, 00, 08, 09, 00, 00, 01, 14, 12, 09, 09, 14, 14, 16, 14, 09, 09, 12,
01, 01, 03, 04, 06, 06, 07, 07, 00, 12, 12, 11, 11, 14, 17, 16, 16, 17, 17, 17,
11, 17, 12, 17, 17, 17, 00, 17, 08, 00, 00, 05, 10, 13, 10, 09, 11, 17, 12, 03,
06, 17, 12, 00, 12, 17, 00, 00, 17, 12, 00, 06, 01, 02, 04, 04, 04, 17, 10, 04,
02, 16, 00, 00, 01, 01, 02, 02, 03, 03, 04, 04, 05, 05, 06, 06, 07, 07, 08, 08,
09, 09, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 12, 04,
06, 03, 07, 16, 10, 14, 17, 04, 11, 11, 11, 00, 03, 00, 08, 16, 06, 08, 13, 06,
09, 16, 09, 13, 08, 03, 00, 15, 11, 13, 02, 15, 15, 16, 14, 07, 16, 10, 17, 07,
12, 00, 00, 13, 09, 17, 13, 04, 07, 05, 10, 13, 07, 08, 07, 00, 12, 17, 00, 12,
09, 12, 13, 13, 08, 07, 17, 05, 15, 12, 10, 02, 12, 10, 12, 09, 13, 16, 11, 14,
17, 00, 08, 00, 15, 10, 16, 00, 01, 05, 13, 15, 00, 01, 12, 10, 00, 09, 06, 12,
00, 01, 07, 14, 03, 10, 02, 17, 15, 13, 05, 04, 16, 11, 08, 15, 01, 17, 11, 11,
09, 08, 08, 12, 15, 11, 12, 11, 11, 17, 17, 10, 16, 16, 01, 15, 08, 13, 08, 15,
05, 03, 17, 11, 12, 00, 06, 09, 16, 07, 03, 01, 10, 14, 02, 04, 11, 16, 10, 12,
15, 13, 16, 01, 14, 07, 13, 03, 13, 00, 05, 17, 13, 09, 10, 11, 14, 01, 04, 03,
13, 07, 08, 01, 07, 16, 02, 12, 04, 13, 13, 00, 06, 01, 07, 13, 15, 10, 11, 08,
00, 14, 15, 00, 05, 10, 03, 00, 00, 16, 11, 09, 10, 00, 08, 13, 10, 16, 01, 12,
00, 14, 00, 14, 06, 11, 10, 00, 13, 07, 09, 09, 12, 08, 16, 10, 09, 16, 03, 01,
17,
};
/// <summary> /// <summary>
/// Moves that are kill /// Moves that are kill
/// </summary> /// </summary>

4
PKHeX.Drawing.PokeSprite/Util/TypeColor.cs
View file

@ -16,7 +16,9 @@ public static class TypeColor
/// <param name="type">Type to get the color of.</param> /// <param name="type">Type to get the color of.</param>
/// <returns>Color of the type.</returns> /// <returns>Color of the type.</returns>
/// <exception cref="ArgumentOutOfRangeException"></exception> /// <exception cref="ArgumentOutOfRangeException"></exception>
public static Color GetTypeSpriteColor(byte type) => (MoveType)type switch public static Color GetTypeSpriteColor(byte type) => ((MoveType)type).GetTypeSpriteColor();
public static Color GetTypeSpriteColor(this MoveType type) => type switch
{ {
Normal => Color.FromArgb(159, 161, 159), Normal => Color.FromArgb(159, 161, 159),
Fighting => Color.FromArgb(255, 128, 000), Fighting => Color.FromArgb(255, 128, 000),

137
PKHeX.WinForms/Controls/PKM Editor/MoveChoice.Designer.cs generated
View file

@ -28,87 +28,97 @@ namespace PKHeX.WinForms.Controls
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.PB_Triangle = new System.Windows.Forms.PictureBox(); PB_Triangle = new System.Windows.Forms.PictureBox();
this.TB_PP = new System.Windows.Forms.MaskedTextBox(); TB_PP = new System.Windows.Forms.MaskedTextBox();
this.CB_PPUps = new System.Windows.Forms.ComboBox(); CB_PPUps = new System.Windows.Forms.ComboBox();
this.CB_Move = new System.Windows.Forms.ComboBox(); CB_Move = new System.Windows.Forms.ComboBox();
this.FLP_Move = new System.Windows.Forms.FlowLayoutPanel(); FLP_Move = new System.Windows.Forms.FlowLayoutPanel();
((System.ComponentModel.ISupportInitialize)(this.PB_Triangle)).BeginInit(); PB_Type = new System.Windows.Forms.PictureBox();
this.FLP_Move.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)PB_Triangle).BeginInit();
this.SuspendLayout(); FLP_Move.SuspendLayout();
((System.ComponentModel.ISupportInitialize)PB_Type).BeginInit();
SuspendLayout();
// //
// PB_Triangle // PB_Triangle
// //
this.PB_Triangle.Image = global::PKHeX.WinForms.Properties.Resources.warn; PB_Triangle.Image = Properties.Resources.warn;
this.PB_Triangle.Location = new System.Drawing.Point(0, 0); PB_Triangle.Location = new System.Drawing.Point(0, 0);
this.PB_Triangle.Name = "PB_Triangle"; PB_Triangle.Name = "PB_Triangle";
this.PB_Triangle.Size = new System.Drawing.Size(24, 24); PB_Triangle.Size = new System.Drawing.Size(24, 24);
this.PB_Triangle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; PB_Triangle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.PB_Triangle.TabIndex = 15; PB_Triangle.TabIndex = 15;
this.PB_Triangle.TabStop = false; PB_Triangle.TabStop = false;
this.PB_Triangle.Visible = false; PB_Triangle.Visible = false;
// //
// TB_PP // TB_PP
// //
this.TB_PP.Location = new System.Drawing.Point(128, 0); TB_PP.Location = new System.Drawing.Point(160, 0);
this.TB_PP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); TB_PP.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0);
this.TB_PP.Mask = "000"; TB_PP.Mask = "000";
this.TB_PP.Name = "TB_PP"; TB_PP.Name = "TB_PP";
this.TB_PP.PromptChar = ' '; TB_PP.PromptChar = ' ';
this.TB_PP.Size = new System.Drawing.Size(32, 23); TB_PP.Size = new System.Drawing.Size(24, 23);
this.TB_PP.TabIndex = 1; TB_PP.TabIndex = 1;
// //
// CB_PPUps // CB_PPUps
// //
this.CB_PPUps.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; CB_PPUps.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.CB_PPUps.FormattingEnabled = true; CB_PPUps.FormattingEnabled = true;
this.CB_PPUps.Items.AddRange(new object[] { CB_PPUps.Items.AddRange(new object[] { "0", "1", "2", "3" });
"0", CB_PPUps.Location = new System.Drawing.Point(186, 0);
"1", CB_PPUps.Margin = new System.Windows.Forms.Padding(0, 0, 4, 0);
"2", CB_PPUps.Name = "CB_PPUps";
"3"}); CB_PPUps.Size = new System.Drawing.Size(32, 23);
this.CB_PPUps.Location = new System.Drawing.Point(164, 0); CB_PPUps.TabIndex = 2;
this.CB_PPUps.Margin = new System.Windows.Forms.Padding(0, 0, 4, 0);
this.CB_PPUps.Name = "CB_PPUps";
this.CB_PPUps.Size = new System.Drawing.Size(40, 23);
this.CB_PPUps.TabIndex = 2;
// //
// CB_Move // CB_Move
// //
this.CB_Move.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; CB_Move.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.CB_Move.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; CB_Move.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.CB_Move.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable; CB_Move.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
this.CB_Move.DropDownHeight = 400; CB_Move.DropDownHeight = 400;
this.CB_Move.FormattingEnabled = true; CB_Move.FormattingEnabled = true;
this.CB_Move.IntegralHeight = false; CB_Move.IntegralHeight = false;
this.CB_Move.Location = new System.Drawing.Point(0, 0); CB_Move.Location = new System.Drawing.Point(32, 0);
this.CB_Move.Margin = new System.Windows.Forms.Padding(0, 0, 4, 0); CB_Move.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0);
this.CB_Move.Name = "CB_Move"; CB_Move.Name = "CB_Move";
this.CB_Move.Size = new System.Drawing.Size(120, 24); CB_Move.Size = new System.Drawing.Size(120, 24);
this.CB_Move.TabIndex = 0; CB_Move.TabIndex = 0;
CB_Move.SelectedIndexChanged += CB_Move_SelectedIndexChanged;
// //
// FLP_Move // FLP_Move
// //
this.FLP_Move.Controls.Add(this.CB_Move); FLP_Move.Controls.Add(PB_Type);
this.FLP_Move.Controls.Add(this.TB_PP); FLP_Move.Controls.Add(CB_Move);
this.FLP_Move.Controls.Add(this.CB_PPUps); FLP_Move.Controls.Add(TB_PP);
this.FLP_Move.Location = new System.Drawing.Point(24, 0); FLP_Move.Controls.Add(CB_PPUps);
this.FLP_Move.Name = "FLP_Move"; FLP_Move.Location = new System.Drawing.Point(24, 0);
this.FLP_Move.Size = new System.Drawing.Size(216, 24); FLP_Move.Name = "FLP_Move";
this.FLP_Move.TabIndex = 18; FLP_Move.Size = new System.Drawing.Size(224, 24);
FLP_Move.TabIndex = 18;
//
// PB_Type
//
PB_Type.Location = new System.Drawing.Point(0, 0);
PB_Type.Margin = new System.Windows.Forms.Padding(0, 0, 8, 0);
PB_Type.Name = "PB_Type";
PB_Type.Size = new System.Drawing.Size(24, 24);
PB_Type.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
PB_Type.TabIndex = 4;
PB_Type.TabStop = false;
// //
// MoveChoice // MoveChoice
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.PB_Triangle); Controls.Add(PB_Triangle);
this.Controls.Add(this.FLP_Move); Controls.Add(FLP_Move);
this.Name = "MoveChoice"; Name = "MoveChoice";
this.Size = new System.Drawing.Size(240, 24); Size = new System.Drawing.Size(248, 24);
((System.ComponentModel.ISupportInitialize)(this.PB_Triangle)).EndInit(); ((System.ComponentModel.ISupportInitialize)PB_Triangle).EndInit();
this.FLP_Move.ResumeLayout(false); FLP_Move.ResumeLayout(false);
this.FLP_Move.PerformLayout(); FLP_Move.PerformLayout();
this.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)PB_Type).EndInit();
ResumeLayout(false);
} }
#endregion #endregion
@ -118,5 +128,6 @@ namespace PKHeX.WinForms.Controls
internal System.Windows.Forms.ComboBox CB_PPUps; internal System.Windows.Forms.ComboBox CB_PPUps;
private System.Windows.Forms.FlowLayoutPanel FLP_Move; private System.Windows.Forms.FlowLayoutPanel FLP_Move;
internal System.Windows.Forms.ComboBox CB_Move; internal System.Windows.Forms.ComboBox CB_Move;
private System.Windows.Forms.PictureBox PB_Type;
} }
} }

23
PKHeX.WinForms/Controls/PKM Editor/MoveChoice.cs
View file

@ -1,10 +1,14 @@
using System;
using System.Windows.Forms; using System.Windows.Forms;
using PKHeX.Core; using PKHeX.Core;
using PKHeX.Drawing.Misc;
namespace PKHeX.WinForms.Controls; namespace PKHeX.WinForms.Controls;
public partial class MoveChoice : UserControl public partial class MoveChoice : UserControl
{ {
private EntityContext Context;
public MoveChoice() public MoveChoice()
{ {
InitializeComponent(); InitializeComponent();
@ -15,6 +19,19 @@ public partial class MoveChoice : UserControl
public int PP { get => SelectedMove == 0 ? 0 : Util.ToInt32(TB_PP.Text); set => TB_PP.Text = value.ToString(); } public int PP { get => SelectedMove == 0 ? 0 : Util.ToInt32(TB_PP.Text); set => TB_PP.Text = value.ToString(); }
public int PPUps { get => SelectedMove == 0 ? 0 : CB_PPUps.SelectedIndex; set => LoadClamp(CB_PPUps, value); } public int PPUps { get => SelectedMove == 0 ? 0 : CB_PPUps.SelectedIndex; set => LoadClamp(CB_PPUps, value); }
public bool HideLegality { private get; set; } public bool HideLegality { private get; set; }
public void SetContext(EntityContext context) => Context = context;
private void UpdateTypeSprite(int value)
{
if (value <= 0)
{
PB_Type.Image = null;
return;
}
var type = MoveInfo.GetType((ushort)value, Context);
PB_Type.Image = TypeSpriteUtil.GetTypeSpriteIcon(type);
}
private static void LoadClamp(ComboBox cb, int value) private static void LoadClamp(ComboBox cb, int value)
{ {
@ -42,4 +59,10 @@ public partial class MoveChoice : UserControl
var move = SelectedMove; var move = SelectedMove;
PP = move <= 0 ? (PPUps = 0) : pk.GetMovePP(move, PPUps); PP = move <= 0 ? (PPUps = 0) : pk.GetMovePP(move, PPUps);
} }
private void CB_Move_SelectedIndexChanged(object sender, EventArgs e)
{
var value = WinFormsUtil.GetIndex(CB_Move);
UpdateTypeSprite(value);
}
} }

34
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs generated
View file

@ -504,8 +504,8 @@ namespace PKHeX.WinForms.Controls
// //
// UC_Gender // UC_Gender
// //
this.UC_Gender.AccessibleDescription = "Entity Gender Pane"; this.UC_Gender.AccessibleDescription = ("Entity Gender Pane (0) (0) (0)");
this.UC_Gender.AccessibleName = "Entity Gender Pane"; this.UC_Gender.AccessibleName = ("Entity Gender Pane (0) (0) (0)");
this.UC_Gender.AccessibleRole = (global::System.Windows.Forms.AccessibleRole.Graphic); this.UC_Gender.AccessibleRole = (global::System.Windows.Forms.AccessibleRole.Graphic);
this.UC_Gender.AllowClick = (false); this.UC_Gender.AllowClick = (false);
this.UC_Gender.BackgroundImage = ((global::System.Drawing.Image)(resources.GetObject("UC_Gender.BackgroundImage"))); this.UC_Gender.BackgroundImage = ((global::System.Drawing.Image)(resources.GetObject("UC_Gender.BackgroundImage")));
@ -1999,7 +1999,7 @@ namespace PKHeX.WinForms.Controls
this.GB_CurrentMoves.Controls.Add(this.Label_PPups); this.GB_CurrentMoves.Controls.Add(this.Label_PPups);
this.GB_CurrentMoves.Location = (new global::System.Drawing.Point(16, 16)); this.GB_CurrentMoves.Location = (new global::System.Drawing.Point(16, 16));
this.GB_CurrentMoves.Name = ("GB_CurrentMoves"); this.GB_CurrentMoves.Name = ("GB_CurrentMoves");
this.GB_CurrentMoves.Size = (new global::System.Drawing.Size(248, 136)); this.GB_CurrentMoves.Size = (new global::System.Drawing.Size(260, 136));
this.GB_CurrentMoves.TabIndex = (0); this.GB_CurrentMoves.TabIndex = (0);
this.GB_CurrentMoves.TabStop = (false); this.GB_CurrentMoves.TabStop = (false);
this.GB_CurrentMoves.Text = ("Current Moves"); this.GB_CurrentMoves.Text = ("Current Moves");
@ -2013,7 +2013,7 @@ namespace PKHeX.WinForms.Controls
this.FLP_Moves.Location = (new global::System.Drawing.Point(8, 32)); this.FLP_Moves.Location = (new global::System.Drawing.Point(8, 32));
this.FLP_Moves.Margin = (new global::System.Windows.Forms.Padding(0)); this.FLP_Moves.Margin = (new global::System.Windows.Forms.Padding(0));
this.FLP_Moves.Name = ("FLP_Moves"); this.FLP_Moves.Name = ("FLP_Moves");
this.FLP_Moves.Size = (new global::System.Drawing.Size(240, 96)); this.FLP_Moves.Size = (new global::System.Drawing.Size(250, 96));
this.FLP_Moves.TabIndex = (14); this.FLP_Moves.TabIndex = (14);
// //
// MC_Move1 // MC_Move1
@ -2024,7 +2024,7 @@ namespace PKHeX.WinForms.Controls
this.MC_Move1.PP = (0); this.MC_Move1.PP = (0);
this.MC_Move1.PPUps = (0); this.MC_Move1.PPUps = (0);
this.MC_Move1.SelectedMove = ((global::System.UInt16)(0)); this.MC_Move1.SelectedMove = ((global::System.UInt16)(0));
this.MC_Move1.Size = (new global::System.Drawing.Size(240, 24)); this.MC_Move1.Size = (new global::System.Drawing.Size(248, 24));
this.MC_Move1.TabIndex = (1); this.MC_Move1.TabIndex = (1);
// //
// MC_Move2 // MC_Move2
@ -2035,7 +2035,7 @@ namespace PKHeX.WinForms.Controls
this.MC_Move2.PP = (0); this.MC_Move2.PP = (0);
this.MC_Move2.PPUps = (0); this.MC_Move2.PPUps = (0);
this.MC_Move2.SelectedMove = ((global::System.UInt16)(0)); this.MC_Move2.SelectedMove = ((global::System.UInt16)(0));
this.MC_Move2.Size = (new global::System.Drawing.Size(240, 24)); this.MC_Move2.Size = (new global::System.Drawing.Size(248, 24));
this.MC_Move2.TabIndex = (2); this.MC_Move2.TabIndex = (2);
// //
// MC_Move3 // MC_Move3
@ -2046,7 +2046,7 @@ namespace PKHeX.WinForms.Controls
this.MC_Move3.PP = (0); this.MC_Move3.PP = (0);
this.MC_Move3.PPUps = (0); this.MC_Move3.PPUps = (0);
this.MC_Move3.SelectedMove = ((global::System.UInt16)(0)); this.MC_Move3.SelectedMove = ((global::System.UInt16)(0));
this.MC_Move3.Size = (new global::System.Drawing.Size(240, 24)); this.MC_Move3.Size = (new global::System.Drawing.Size(248, 24));
this.MC_Move3.TabIndex = (3); this.MC_Move3.TabIndex = (3);
// //
// MC_Move4 // MC_Move4
@ -2057,14 +2057,14 @@ namespace PKHeX.WinForms.Controls
this.MC_Move4.PP = (0); this.MC_Move4.PP = (0);
this.MC_Move4.PPUps = (0); this.MC_Move4.PPUps = (0);
this.MC_Move4.SelectedMove = ((global::System.UInt16)(0)); this.MC_Move4.SelectedMove = ((global::System.UInt16)(0));
this.MC_Move4.Size = (new global::System.Drawing.Size(240, 24)); this.MC_Move4.Size = (new global::System.Drawing.Size(248, 24));
this.MC_Move4.TabIndex = (4); this.MC_Move4.TabIndex = (4);
// //
// Label_CurPP // Label_CurPP
// //
this.Label_CurPP.Location = (new global::System.Drawing.Point(160, 16)); this.Label_CurPP.Location = (new global::System.Drawing.Point(193, 16));
this.Label_CurPP.Name = ("Label_CurPP"); this.Label_CurPP.Name = ("Label_CurPP");
this.Label_CurPP.Size = (new global::System.Drawing.Size(32, 16)); this.Label_CurPP.Size = (new global::System.Drawing.Size(24, 16));
this.Label_CurPP.TabIndex = (2); this.Label_CurPP.TabIndex = (2);
this.Label_CurPP.Text = ("PP"); this.Label_CurPP.Text = ("PP");
this.Label_CurPP.TextAlign = (global::System.Drawing.ContentAlignment.BottomCenter); this.Label_CurPP.TextAlign = (global::System.Drawing.ContentAlignment.BottomCenter);
@ -2072,11 +2072,11 @@ namespace PKHeX.WinForms.Controls
// //
// Label_PPups // Label_PPups
// //
this.Label_PPups.Location = (new global::System.Drawing.Point(192, 16)); this.Label_PPups.Location = (new global::System.Drawing.Point(217, 16));
this.Label_PPups.Name = ("Label_PPups"); this.Label_PPups.Name = ("Label_PPups");
this.Label_PPups.Size = (new global::System.Drawing.Size(48, 16)); this.Label_PPups.Size = (new global::System.Drawing.Size(32, 16));
this.Label_PPups.TabIndex = (12); this.Label_PPups.TabIndex = (12);
this.Label_PPups.Text = ("PP Ups"); this.Label_PPups.Text = ("Ups");
this.Label_PPups.TextAlign = (global::System.Drawing.ContentAlignment.BottomCenter); this.Label_PPups.TextAlign = (global::System.Drawing.ContentAlignment.BottomCenter);
this.Label_PPups.Click += (this.ClickPPUps); this.Label_PPups.Click += (this.ClickPPUps);
// //
@ -2486,8 +2486,8 @@ namespace PKHeX.WinForms.Controls
// //
// UC_OTGender // UC_OTGender
// //
this.UC_OTGender.AccessibleDescription = ("Trainer Gender Pane"); this.UC_OTGender.AccessibleDescription = ("Trainer Gender Pane (0) (0) (0)");
this.UC_OTGender.AccessibleName = ("Trainer Gender Pane"); this.UC_OTGender.AccessibleName = ("Trainer Gender Pane (0) (0) (0)");
this.UC_OTGender.AccessibleRole = (global::System.Windows.Forms.AccessibleRole.Graphic); this.UC_OTGender.AccessibleRole = (global::System.Windows.Forms.AccessibleRole.Graphic);
this.UC_OTGender.AllowClick = (true); this.UC_OTGender.AllowClick = (true);
this.UC_OTGender.BackgroundImage = ((global::System.Drawing.Image)(resources.GetObject("UC_OTGender.BackgroundImage"))); this.UC_OTGender.BackgroundImage = ((global::System.Drawing.Image)(resources.GetObject("UC_OTGender.BackgroundImage")));
@ -2680,8 +2680,8 @@ namespace PKHeX.WinForms.Controls
// //
// UC_HTGender // UC_HTGender
// //
this.UC_HTGender.AccessibleDescription = ("Handling Trainer Gender Pane"); this.UC_HTGender.AccessibleDescription = ("Handling Trainer Gender Pane (0) (0) (0)");
this.UC_HTGender.AccessibleName = ("Handling Trainer Gender Pane"); this.UC_HTGender.AccessibleName = ("Handling Trainer Gender Pane (0) (0) (0)");
this.UC_HTGender.AccessibleRole = (global::System.Windows.Forms.AccessibleRole.Graphic); this.UC_HTGender.AccessibleRole = (global::System.Windows.Forms.AccessibleRole.Graphic);
this.UC_HTGender.AllowClick = (true); this.UC_HTGender.AllowClick = (true);
this.UC_HTGender.BackgroundImage = ((global::System.Drawing.Image)(resources.GetObject("UC_HTGender.BackgroundImage"))); this.UC_HTGender.BackgroundImage = ((global::System.Drawing.Image)(resources.GetObject("UC_HTGender.BackgroundImage")));

2
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View file

@ -255,6 +255,8 @@ public sealed partial class PKMEditor : UserControl, IMainEditor
// Load Extra Byte List // Load Extra Byte List
SetPKMFormatExtraBytes(pk); SetPKMFormatExtraBytes(pk);
(GetFieldsfromPKM, GetPKMfromFields) = GetLoadSet(pk); (GetFieldsfromPKM, GetPKMfromFields) = GetLoadSet(pk);
foreach (var move in Moves)
move.SetContext(pk.Context);
} }
private (Action Load, Func<PKM> Set) GetLoadSet(PKM pk) => GetLoadSet(pk.Context); private (Action Load, Func<PKM> Set) GetLoadSet(PKM pk) => GetLoadSet(pk.Context);

2
PKHeX.WinForms/Resources/text/lang_de.txt
View file

@ -303,7 +303,7 @@ Main.Label_OT=OT:
Main.Label_PID=PID: Main.Label_PID=PID:
Main.Label_PKRS=PkRs: Main.Label_PKRS=PkRs:
Main.Label_PKRSdays=d: Main.Label_PKRSdays=d:
Main.Label_PPups=AP-Plus Main.Label_PPups=Plus
Main.Label_PrevOT=OT: Main.Label_PrevOT=OT:
Main.Label_Sheen=Glanz Main.Label_Sheen=Glanz
Main.Label_SID=SID: Main.Label_SID=SID:

2
PKHeX.WinForms/Resources/text/lang_en.txt
View file

@ -303,7 +303,7 @@ Main.Label_OT=OT:
Main.Label_PID=PID: Main.Label_PID=PID:
Main.Label_PKRS=PkRs: Main.Label_PKRS=PkRs:
Main.Label_PKRSdays=d: Main.Label_PKRSdays=d:
Main.Label_PPups=PP Ups Main.Label_PPups=Ups
Main.Label_PrevOT=OT: Main.Label_PrevOT=OT:
Main.Label_Sheen=Sheen Main.Label_Sheen=Sheen
Main.Label_SID=SID: Main.Label_SID=SID:

2
PKHeX.WinForms/Resources/text/lang_es.txt
View file

@ -303,7 +303,7 @@ Main.Label_OT=EO:
Main.Label_PID=PID: Main.Label_PID=PID:
Main.Label_PKRS=PkRs.: Main.Label_PKRS=PkRs.:
Main.Label_PKRSdays=d: Main.Label_PKRSdays=d:
Main.Label_PPups=Más PP Main.Label_PPups=Más
Main.Label_PrevOT=EO: Main.Label_PrevOT=EO:
Main.Label_Sheen=Brillo Main.Label_Sheen=Brillo
Main.Label_SID=IDS: Main.Label_SID=IDS:

2
PKHeX.WinForms/Resources/text/lang_fr.txt
View file

@ -303,7 +303,7 @@ Main.Label_OT=DO :
Main.Label_PID=PID: Main.Label_PID=PID:
Main.Label_PKRS=Pokérus : Main.Label_PKRS=Pokérus :
Main.Label_PKRSdays=Jr. Main.Label_PKRSdays=Jr.
Main.Label_PPups=PP Max Main.Label_PPups=Max
Main.Label_PrevOT=DO : Main.Label_PrevOT=DO :
Main.Label_Sheen=Lustre Main.Label_Sheen=Lustre
Main.Label_SID=SID : Main.Label_SID=SID :

2
PKHeX.WinForms/Resources/text/lang_it.txt
View file

@ -304,7 +304,7 @@ Main.Label_OT=AO:
Main.Label_PID=PID: Main.Label_PID=PID:
Main.Label_PKRS=PkRs: Main.Label_PKRS=PkRs:
Main.Label_PKRSdays=d: Main.Label_PKRSdays=d:
Main.Label_PPups=PP Ups Main.Label_PPups=Ups
Main.Label_PrevOT=HT: Main.Label_PrevOT=HT:
Main.Label_Sheen=Lustro Main.Label_Sheen=Lustro
Main.Label_SID=SID: Main.Label_SID=SID:

2
PKHeX.WinForms/Resources/text/lang_ja.txt
View file

@ -303,7 +303,7 @@ Main.Label_OT=親
Main.Label_PID=性格値 Main.Label_PID=性格値
Main.Label_PKRS=ポケルス Main.Label_PKRS=ポケルス
Main.Label_PKRSdays=日 Main.Label_PKRSdays=日
Main.Label_PPups=PU回数 Main.Label_PPups=回数
Main.Label_PrevOT=親 Main.Label_PrevOT=親
Main.Label_Sheen=けづや Main.Label_Sheen=けづや
Main.Label_SID=裏ID Main.Label_SID=裏ID

2
PKHeX.WinForms/Resources/text/lang_ko.txt
View file

@ -303,7 +303,7 @@ Main.Label_OT=어버이:
Main.Label_PID=PID: Main.Label_PID=PID:
Main.Label_PKRS=포켓러스: Main.Label_PKRS=포켓러스:
Main.Label_PKRSdays=일수: Main.Label_PKRSdays=일수:
Main.Label_PPups=PP 업 Main.Label_PPups=업
Main.Label_PrevOT=소유자: Main.Label_PrevOT=소유자:
Main.Label_Sheen=윤기 Main.Label_Sheen=윤기
Main.Label_SID=SID: Main.Label_SID=SID:

2
PKHeX.WinForms/Resources/text/lang_zh.txt
View file

@ -303,7 +303,7 @@ Main.Label_OT=名字:
Main.Label_PID=PID: Main.Label_PID=PID:
Main.Label_PKRS=病毒 Main.Label_PKRS=病毒
Main.Label_PKRSdays=日: Main.Label_PKRSdays=日:
Main.Label_PPups=PP提升 Main.Label_PPups=提升
Main.Label_PrevOT=名字: Main.Label_PrevOT=名字:
Main.Label_Sheen=光泽 Main.Label_Sheen=光泽
Main.Label_SID=里ID: Main.Label_SID=里ID:

2
PKHeX.WinForms/Resources/text/lang_zh2.txt
View file

@ -304,7 +304,7 @@ Main.Label_OT=名字:
Main.Label_PID=PID: Main.Label_PID=PID:
Main.Label_PKRS=病毒 Main.Label_PKRS=病毒
Main.Label_PKRSdays=日: Main.Label_PKRSdays=日:
Main.Label_PPups=PP提升 Main.Label_PPups=提升
Main.Label_PrevOT=名字: Main.Label_PrevOT=名字:
Main.Label_Sheen=光澤 Main.Label_Sheen=光澤
Main.Label_SID=隱ID: Main.Label_SID=隱ID: