From 47efdf8a90a3073e20f6c6ddec3e96b0b9039882 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 10 Aug 2025 23:09:27 -0500 Subject: [PATCH] PK5: add pokestar fame edit, update translations Remove pk4 walking mood from extrabyte list --- PKHeX.Core/PKM/BK4.cs | 4 +- PKHeX.Core/PKM/PK4.cs | 4 +- PKHeX.Core/PKM/PK5.cs | 1 - PKHeX.Core/PKM/RK4.cs | 4 +- .../localize/legality/legality_de.json | 2 + .../localize/legality/legality_en.json | 2 + .../localize/legality/legality_es.json | 2 + .../localize/legality/legality_fr.json | 2 + .../localize/legality/legality_it.json | 2 + .../localize/legality/legality_ja.json | 2 + .../localize/legality/legality_ko.json | 2 + .../localize/legality/legality_zh-hans.json | 2 + .../localize/legality/legality_zh-hant.json | 2 + PKHeX.Core/Saves/Util/SaveUtil.cs | 4 +- PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs | 2 + .../Controls/PKM Editor/PKMEditor.Designer.cs | 53 ++++++++++++++++--- .../Controls/PKM Editor/PKMEditor.cs | 2 +- PKHeX.WinForms/Resources/text/lang_de.txt | 3 ++ PKHeX.WinForms/Resources/text/lang_en.txt | 3 ++ PKHeX.WinForms/Resources/text/lang_es.txt | 3 ++ PKHeX.WinForms/Resources/text/lang_fr.txt | 3 ++ PKHeX.WinForms/Resources/text/lang_it.txt | 3 ++ PKHeX.WinForms/Resources/text/lang_ja.txt | 3 ++ PKHeX.WinForms/Resources/text/lang_ko.txt | 3 ++ .../Resources/text/lang_zh-Hans.txt | 3 ++ .../Resources/text/lang_zh-Hant.txt | 3 ++ 26 files changed, 106 insertions(+), 13 deletions(-) diff --git a/PKHeX.Core/PKM/BK4.cs b/PKHeX.Core/PKM/BK4.cs index 455f465b3..3a5db258e 100644 --- a/PKHeX.Core/PKM/BK4.cs +++ b/PKHeX.Core/PKM/BK4.cs @@ -13,7 +13,9 @@ public sealed class BK4 : G4PKM { public override ReadOnlySpan ExtraBytes => [ - 0x42, 0x43, 0x5E, 0x63, 0x64, 0x65, 0x66, 0x67, 0x87, + 0x42, 0x43, // Unused + 0x5E, // Unused + 0x63, 0x64, 0x65, 0x66, 0x67, // unused ribbon bits ]; public override int SIZE_PARTY => PokeCrypto.SIZE_4STORED; diff --git a/PKHeX.Core/PKM/PK4.cs b/PKHeX.Core/PKM/PK4.cs index 3483fb39e..d687f045f 100644 --- a/PKHeX.Core/PKM/PK4.cs +++ b/PKHeX.Core/PKM/PK4.cs @@ -9,7 +9,9 @@ public sealed class PK4 : G4PKM { public override ReadOnlySpan ExtraBytes => [ - 0x42, 0x43, 0x5E, 0x63, 0x64, 0x65, 0x66, 0x67, 0x87, + 0x42, 0x43, // Unused + 0x5E, // Unused + 0x63, 0x64, 0x65, 0x66, 0x67, // unused ribbon bits ]; public override int SIZE_PARTY => PokeCrypto.SIZE_4PARTY; diff --git a/PKHeX.Core/PKM/PK5.cs b/PKHeX.Core/PKM/PK5.cs index 4885e7e02..c39d9f0b3 100644 --- a/PKHeX.Core/PKM/PK5.cs +++ b/PKHeX.Core/PKM/PK5.cs @@ -16,7 +16,6 @@ public sealed class PK5 : PKM, ISanityChecksum, 0x63, // last 8 bits of a 32bit ribbonset 0x64, 0x65, 0x66, 0x67, // unused 32bit ribbonset? 0x86, // unused - 0x87, // PokeStar Fame ]; public override int SIZE_PARTY => PokeCrypto.SIZE_5PARTY; diff --git a/PKHeX.Core/PKM/RK4.cs b/PKHeX.Core/PKM/RK4.cs index 6788a35b4..4b0543e82 100644 --- a/PKHeX.Core/PKM/RK4.cs +++ b/PKHeX.Core/PKM/RK4.cs @@ -12,7 +12,9 @@ public sealed class RK4 : G4PKM { public override ReadOnlySpan ExtraBytes => [ - 0x42, 0x43, 0x5E, 0x63, 0x64, 0x65, 0x66, 0x67, 0x87, + 0x42, 0x43, // Unused + 0x5E, // Unused + 0x63, 0x64, 0x65, 0x66, 0x67, // unused ribbon bits ]; public override int SIZE_PARTY => PokeCrypto.SIZE_4RSTORED; diff --git a/PKHeX.Core/Resources/localize/legality/legality_de.json b/PKHeX.Core/Resources/localize/legality/legality_de.json index 8ba5fcfd0..bddd16c84 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_de.json +++ b/PKHeX.Core/Resources/localize/legality/legality_de.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "Hidden Grotto captures cannot be shiny.", "G5SparkleInvalid": "Special in-game N's Sparkle flag should not be checked.", "G5SparkleRequired": "Special in-game N's Sparkle flag missing.", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "One or more Ganbaru Value is above the natural limit of (10 - IV bonus).", "GenderInvalidNone": "Genderless Pokémon should not have a gender.", "GeoBadOrder": "GeoLocation Memory: Gap/Blank present.", diff --git a/PKHeX.Core/Resources/localize/legality/legality_en.json b/PKHeX.Core/Resources/localize/legality/legality_en.json index 2a325c5b2..c80634bfd 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_en.json +++ b/PKHeX.Core/Resources/localize/legality/legality_en.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "Hidden Grotto captures cannot be shiny.", "G5SparkleInvalid": "Special in-game N's Sparkle flag should not be checked.", "G5SparkleRequired": "Special in-game N's Sparkle flag missing.", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "One or more Ganbaru Value is above the natural limit of (10 - IV bonus).", "GenderInvalidNone": "Genderless Pokémon should not have a gender.", "GeoBadOrder": "GeoLocation Memory: Gap/Blank present.", diff --git a/PKHeX.Core/Resources/localize/legality/legality_es.json b/PKHeX.Core/Resources/localize/legality/legality_es.json index 021bdfe5e..0f22354a1 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_es.json +++ b/PKHeX.Core/Resources/localize/legality/legality_es.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "Las Capturas en Los Claros Ocultos no pueden ser variocolor.", "G5SparkleInvalid": "La marca chispeante especial de los Pokémon de N en el juego no debería marcarse.", "G5SparkleRequired": "Falta la marca chispeante especial de los Pokémon de N en el juego.", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "Un nivel o más de esfuerzo es mayor del límite natural de (10 - bonus IV).", "GenderInvalidNone": "Pokémon sn género no debería tener género.", "GeoBadOrder": "Recuerdo de Geolocalización: En blanco/nulo.", diff --git a/PKHeX.Core/Resources/localize/legality/legality_fr.json b/PKHeX.Core/Resources/localize/legality/legality_fr.json index 8db28d197..a168df0de 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_fr.json +++ b/PKHeX.Core/Resources/localize/legality/legality_fr.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "Les Pokémon capturés dans les Trouées cachées ne peuvent pas être chromatiques.", "G5SparkleInvalid": "Le flag de l'éclat spécial des Pokémon de N ne doit pas être coché.", "G5SparkleRequired": "Le flag de l'éclat spécial des Pokémon de N est manquant.", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "Une ou plusieurs valeurs du niveau d'effort sont supérieures à la limite naturelle de (10 - IV bonus).", "GenderInvalidNone": "Les Pokémon asexués ne peuvent pas être genrés.", "GeoBadOrder": "Mémoire géolocalisations : Vide présent.", diff --git a/PKHeX.Core/Resources/localize/legality/legality_it.json b/PKHeX.Core/Resources/localize/legality/legality_it.json index 2b61f783b..d42e0ec32 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_it.json +++ b/PKHeX.Core/Resources/localize/legality/legality_it.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "Gli incontri del Meandro Nascosto non possono essere Shiny.", "G5SparkleInvalid": "Il segnale speciale di luccichio dei Pokémon di N non dovrebbe essere ablitato.", "G5SparkleRequired": "Segnale speciale di luccichio dei Pokémon di N assente.", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "Uno o più valori Ganbaru è oltre il limite naturale di (10 - IV bonus).", "GenderInvalidNone": "I Pokémon senza sesso non dovrebbero avere un Sesso.", "GeoBadOrder": "Memoria GeoLocation: Gap/Blank.", diff --git a/PKHeX.Core/Resources/localize/legality/legality_ja.json b/PKHeX.Core/Resources/localize/legality/legality_ja.json index ff21cc3b2..0377abff6 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_ja.json +++ b/PKHeX.Core/Resources/localize/legality/legality_ja.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "隠し穴産のポケモンは色違いになりません。", "G5SparkleInvalid": "Nのポケモンフラグのチェックを外してください。", "G5SparkleRequired": "Nのポケモンフラグのチェックを入れてください。", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "１つ以上のがんばレベルが通常限界値（10-個体値ボーナス）を超えています。", "GenderInvalidNone": "性別不明のポケモンは性別を持ちません。", "GeoBadOrder": "地域（おもいで）:空白があります。", diff --git a/PKHeX.Core/Resources/localize/legality/legality_ko.json b/PKHeX.Core/Resources/localize/legality/legality_ko.json index d9b2f8288..2c7d66dc5 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_ko.json +++ b/PKHeX.Core/Resources/localize/legality/legality_ko.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "은혈에서 포획한 포켓몬은 색이 다를 수 없습니다.", "G5SparkleInvalid": "게임 내 특수한 N 전용 반짝임 플래그가 켜져 있지 않아야 합니다.", "G5SparkleRequired": "게임 내 특수한 N 전용 반짝임 플래그가 켜져 있지 않습니다.", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "One or more Ganbaru Value is above the natural limit of (10 - IV bonus).", "GenderInvalidNone": "무성 포켓몬은 성별을 가질 수 없습니다.", "GeoBadOrder": "지오로케이션 기억: 빈 공간이 존재합니다.", diff --git a/PKHeX.Core/Resources/localize/legality/legality_zh-hans.json b/PKHeX.Core/Resources/localize/legality/legality_zh-hans.json index ed4414e2e..dfbecfa14 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_zh-hans.json +++ b/PKHeX.Core/Resources/localize/legality/legality_zh-hans.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "在隐藏洞穴捕获的宝可梦不能为异色。", "G5SparkleInvalid": "特殊游戏内宝可梦N的闪光标记不应勾选。", "G5SparkleRequired": "特殊游戏内宝可梦N的闪光标记缺失。", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "一项或多项奋斗等级超过上限 (10 - IV个体值提升等级)。", "GenderInvalidNone": "无性别宝可梦不能有性别。", "GeoBadOrder": "地理位置回忆： 间隔/空白存在。", diff --git a/PKHeX.Core/Resources/localize/legality/legality_zh-hant.json b/PKHeX.Core/Resources/localize/legality/legality_zh-hant.json index 5677706da..1e1679d1e 100644 --- a/PKHeX.Core/Resources/localize/legality/legality_zh-hant.json +++ b/PKHeX.Core/Resources/localize/legality/legality_zh-hant.json @@ -156,6 +156,8 @@ "G5PIDShinyGrotto": "於隱藏洞穴捕獲之寶可夢不能為異色。", "G5SparkleInvalid": "特殊遊戲內寶可夢N的異色標記不應勾選。", "G5SparkleRequired": "特殊遊戲內寶可夢N的異色標記缺失。", + "G7BSocialShouldBe100Spirit": "Spirit should be 100 for Pokémon not in the player's party.", + "G7BSocialShouldBe100Mood": "Mood should be 100 for Pokémon not in the player's party.", "GanbaruStatTooHigh": "一項或多項奮鬥等級超過上限 (10 減 IV 個體值提升奮鬥等級)。", "GenderInvalidNone": "無性別寶可夢不能有性別。", "GeoBadOrder": "地理位置回憶: 間隔/空白存在。", diff --git a/PKHeX.Core/Saves/Util/SaveUtil.cs b/PKHeX.Core/Saves/Util/SaveUtil.cs index 74a19b61c..72a56837f 100644 --- a/PKHeX.Core/Saves/Util/SaveUtil.cs +++ b/PKHeX.Core/Saves/Util/SaveUtil.cs @@ -370,8 +370,8 @@ private static bool IsG3XD(ReadOnlySpan data) private static bool IsG4Pt(ReadOnlySpan data) => data.Length == SIZE_G4RAW && IsValidGeneralFooter2(data, SAV4Pt.GeneralSize); private static bool IsG4HGSS(ReadOnlySpan data) => data.Length == SIZE_G4RAW && IsValidGeneralFooter2(data, SAV4HGSS.GeneralSize); private static bool IsG4BR(ReadOnlySpan data) => data.Length == SIZE_G4BR && SAV4BR.IsValidSaveFile(data); - private static bool IsG5BW(ReadOnlySpan data) => data.Length == SIZE_G5BW && IsValidFooter5(data, SIZE_G5BW, 0x8C); - private static bool IsG5B2W2(ReadOnlySpan data) => data.Length == SIZE_G5B2W2 && IsValidFooter5(data, SIZE_G5B2W2, 0x94); + private static bool IsG5BW(ReadOnlySpan data) => data.Length == SIZE_G5RAW && IsValidFooter5(data, SIZE_G5BW, 0x8C); + private static bool IsG5B2W2(ReadOnlySpan data) => data.Length == SIZE_G5RAW && IsValidFooter5(data, SIZE_G5B2W2, 0x94); private static bool IsG6XY(ReadOnlySpan data) => data.Length == SIZE_G6XY && HasSaveFooterBEEF(data); private static bool IsG6AO(ReadOnlySpan data) => data.Length == SIZE_G6ORAS && HasSaveFooterBEEF(data); private static bool IsG6AODemo(ReadOnlySpan data) => data.Length == SIZE_G6ORASDEMO && HasSaveFooterBEEF(data); diff --git a/PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs b/PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs index e89fb09cc..e8bab6c17 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs @@ -17,6 +17,7 @@ private void PopulateFieldsPK5() CB_GroundTile.SelectedValue = pk5.Gen4 ? (int)pk5.GroundTile : 0; CB_GroundTile.Visible = Label_GroundTile.Visible = pk5.Gen4; CHK_NSparkle.Checked = pk5.NSparkle; + NUD_PokeStarFame.Value = pk5.PokeStarFame; if (HaX) DEV_Ability.SelectedValue = pk5.Ability; @@ -41,6 +42,7 @@ private PK5 PreparePK5() pk5.GroundTile = (GroundTileType)WinFormsUtil.GetIndex(CB_GroundTile); pk5.NSparkle = CHK_NSparkle.Checked; + pk5.PokeStarFame = (byte)NUD_PokeStarFame.Value; if (!HaX) { pk5.HiddenAbility = CB_Ability.SelectedIndex is not (0 or 1); diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs index 340815947..1a41cd2df 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs @@ -267,6 +267,9 @@ private void InitializeComponent() Tab_Moves = new System.Windows.Forms.TabPage(); Tab_Cosmetic = new System.Windows.Forms.TabPage(); Tab_OTMisc = new System.Windows.Forms.TabPage(); + FLP_PokeStarFame = new System.Windows.Forms.FlowLayoutPanel(); + L_PokeStarFame = new System.Windows.Forms.Label(); + NUD_PokeStarFame = new System.Windows.Forms.NumericUpDown(); Hidden_TC.SuspendLayout(); Hidden_Main.SuspendLayout(); FLP_Main.SuspendLayout(); @@ -370,6 +373,8 @@ private void InitializeComponent() FLP_EncryptionConstant.SuspendLayout(); FLP_ReceivedDate.SuspendLayout(); TC_Editor.SuspendLayout(); + FLP_PokeStarFame.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)NUD_PokeStarFame).BeginInit(); SuspendLayout(); // // Hidden_TC @@ -2319,6 +2324,7 @@ private void InitializeComponent() FLP_CosmeticTop.Controls.Add(FLP_Spirit7b); FLP_CosmeticTop.Controls.Add(FLP_Mood7b); FLP_CosmeticTop.Controls.Add(FLP_WalkingMood); + FLP_CosmeticTop.Controls.Add(FLP_PokeStarFame); FLP_CosmeticTop.Controls.Add(SizeCP); FLP_CosmeticTop.Controls.Add(ShinyLeaf); FLP_CosmeticTop.Controls.Add(PAN_CosmeticButtons); @@ -2631,7 +2637,7 @@ private void InitializeComponent() // SizeCP // SizeCP.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; - SizeCP.Location = new System.Drawing.Point(48, 238); + SizeCP.Location = new System.Drawing.Point(48, 264); SizeCP.Margin = new System.Windows.Forms.Padding(48, 8, 0, 0); SizeCP.Name = "SizeCP"; SizeCP.Size = new System.Drawing.Size(228, 96); @@ -2641,7 +2647,7 @@ private void InitializeComponent() // ShinyLeaf.AccessibleDescription = "Gen 4 shiny leaf crown control"; ShinyLeaf.AccessibleName = "Gen 4 shiny leaf crown control"; - ShinyLeaf.Location = new System.Drawing.Point(56, 342); + ShinyLeaf.Location = new System.Drawing.Point(56, 368); ShinyLeaf.Margin = new System.Windows.Forms.Padding(56, 8, 0, 0); ShinyLeaf.Name = "ShinyLeaf"; ShinyLeaf.Size = new System.Drawing.Size(200, 64); @@ -2651,7 +2657,7 @@ private void InitializeComponent() // PAN_CosmeticButtons.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; PAN_CosmeticButtons.Controls.Add(FLP_PKMEditors); - PAN_CosmeticButtons.Location = new System.Drawing.Point(0, 406); + PAN_CosmeticButtons.Location = new System.Drawing.Point(0, 432); PAN_CosmeticButtons.Margin = new System.Windows.Forms.Padding(0); PAN_CosmeticButtons.Name = "PAN_CosmeticButtons"; PAN_CosmeticButtons.Size = new System.Drawing.Size(296, 39); @@ -2722,7 +2728,7 @@ private void InitializeComponent() Contest.ContestSheen = 0; Contest.ContestSmart = 0; Contest.ContestTough = 0; - Contest.Location = new System.Drawing.Point(0, 445); + Contest.Location = new System.Drawing.Point(0, 471); Contest.Margin = new System.Windows.Forms.Padding(0); Contest.Name = "Contest"; Contest.Size = new System.Drawing.Size(288, 59); @@ -2824,8 +2830,6 @@ private void InitializeComponent() // // UC_OTGender // - UC_OTGender.AccessibleDescription = " (0) (0) (0)"; - UC_OTGender.AccessibleName = " (0) (0) (0)"; UC_OTGender.AllowClick = true; UC_OTGender.BackgroundImage = (System.Drawing.Image)resources.GetObject("UC_OTGender.BackgroundImage"); UC_OTGender.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; @@ -3339,6 +3343,38 @@ private void InitializeComponent() Tab_OTMisc.Text = "OT/Misc"; Tab_OTMisc.UseVisualStyleBackColor = true; // + // FLP_PokeStarFame + // + FLP_PokeStarFame.AutoSize = true; + FLP_PokeStarFame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + FLP_PokeStarFame.Controls.Add(L_PokeStarFame); + FLP_PokeStarFame.Controls.Add(NUD_PokeStarFame); + FLP_CosmeticTop.SetFlowBreak(FLP_PokeStarFame, true); + FLP_PokeStarFame.Location = new System.Drawing.Point(8, 230); + FLP_PokeStarFame.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0); + FLP_PokeStarFame.Name = "FLP_PokeStarFame"; + FLP_PokeStarFame.Size = new System.Drawing.Size(164, 26); + FLP_PokeStarFame.TabIndex = 55; + // + // L_PokeStarFame + // + L_PokeStarFame.Location = new System.Drawing.Point(0, 0); + L_PokeStarFame.Margin = new System.Windows.Forms.Padding(0); + L_PokeStarFame.Name = "L_PokeStarFame"; + L_PokeStarFame.Size = new System.Drawing.Size(120, 24); + L_PokeStarFame.TabIndex = 9; + L_PokeStarFame.Text = "Fame:"; + L_PokeStarFame.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // NUD_PokeStarFame + // + NUD_PokeStarFame.Location = new System.Drawing.Point(120, 1); + NUD_PokeStarFame.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); + NUD_PokeStarFame.Maximum = new decimal(new int[] { 255, 0, 0, 0 }); + NUD_PokeStarFame.Name = "NUD_PokeStarFame"; + NUD_PokeStarFame.Size = new System.Drawing.Size(44, 25); + NUD_PokeStarFame.TabIndex = 103; + // // PKMEditor // AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -3485,6 +3521,8 @@ private void InitializeComponent() FLP_EncryptionConstant.PerformLayout(); FLP_ReceivedDate.ResumeLayout(false); TC_Editor.ResumeLayout(false); + FLP_PokeStarFame.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)NUD_PokeStarFame).EndInit(); ResumeLayout(false); } @@ -3728,5 +3766,8 @@ private void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel FLP_Mood7b; private System.Windows.Forms.Label L_Mood7b; private System.Windows.Forms.NumericUpDown NUD_Mood7b; + private System.Windows.Forms.FlowLayoutPanel FLP_PokeStarFame; + private System.Windows.Forms.Label L_PokeStarFame; + private System.Windows.Forms.NumericUpDown NUD_PokeStarFame; } } diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index fb6756962..57bbb4591 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -1968,7 +1968,7 @@ private void ToggleInterface(byte format) FLP_Relearn4.Visible = FLP_Relearn3.Visible = FLP_Relearn2.Visible = FLP_Relearn1.Visible = GB_RelearnMoves.Visible = format >= 6; PB_Origin.Visible = format >= 6; - FLP_NSparkle.Visible = L_NSparkle.Visible = CHK_NSparkle.Visible = format == 5; + FLP_NSparkle.Visible = L_NSparkle.Visible = CHK_NSparkle.Visible = FLP_PokeStarFame.Visible = format == 5; CHK_AsEgg.Visible = GB_EggConditions.Visible = PB_Mark5.Visible = PB_Mark6.Visible = format >= 4; ShinyLeaf.Visible = FLP_WalkingMood.Visible = format == 4; diff --git a/PKHeX.WinForms/Resources/text/lang_de.txt b/PKHeX.WinForms/Resources/text/lang_de.txt index 1a63d77e0..e5c980359 100644 --- a/PKHeX.WinForms/Resources/text/lang_de.txt +++ b/PKHeX.WinForms/Resources/text/lang_de.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=HOME Tracker: Main.L_LanguageHT=Language: Main.L_MetTimeOfDay=Tageszeit: Main.L_Misc=Sonstiges +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=Ns Glanz: Main.L_ObedienceLevel=Gehorsamkeits Level: Main.L_OriginalNature=Status Wesen: Main.L_Party=Team: +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=Dieser Tab ist nur lesbar. Main.L_Resort=Resort Main.L_Ride=Ride @@ -439,6 +441,7 @@ Main.L_Scale=Scale: Main.L_Secure1=Secure Value 1: Main.L_Secure2=Secure Value 2: Main.L_ShadowID=Crypto ID: +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=Original Tera Typ: Main.L_TeraTypeOverride=Überschr. Tera Typ: Main.L_WalkingMood=Walking Mood: diff --git a/PKHeX.WinForms/Resources/text/lang_en.txt b/PKHeX.WinForms/Resources/text/lang_en.txt index 05ed04642..6c362f831 100644 --- a/PKHeX.WinForms/Resources/text/lang_en.txt +++ b/PKHeX.WinForms/Resources/text/lang_en.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=HOME Tracker: Main.L_LanguageHT=Language: Main.L_MetTimeOfDay=Time of Day: Main.L_Misc=Misc +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=N's Sparkle: Main.L_ObedienceLevel=Obedience Level: Main.L_OriginalNature=Stat Nature: Main.L_Party=Party: +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=This tab is read only. Main.L_Resort=Resort Main.L_Ride=Ride @@ -439,6 +441,7 @@ Main.L_Scale=Scale: Main.L_Secure1=Secure Value 1: Main.L_Secure2=Secure Value 2: Main.L_ShadowID=Shadow ID: +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=Original Tera Type: Main.L_TeraTypeOverride=Override Tera Type: Main.L_WalkingMood=Walking Mood: diff --git a/PKHeX.WinForms/Resources/text/lang_es.txt b/PKHeX.WinForms/Resources/text/lang_es.txt index 4451745eb..943b9fcfe 100644 --- a/PKHeX.WinForms/Resources/text/lang_es.txt +++ b/PKHeX.WinForms/Resources/text/lang_es.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=Rastreador HOME: Main.L_LanguageHT=Idioma: Main.L_MetTimeOfDay=Momento del día: Main.L_Misc=Misc. +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=Brillo de N Main.L_ObedienceLevel=Niv. Obediencia: Main.L_OriginalNature=Nat. Estad.: Main.L_Party=Equipo: +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=Sólo lectura. Main.L_Resort=Resortear Main.L_Ride=Ride @@ -439,6 +441,7 @@ Main.L_Scale=Escala: Main.L_Secure1=Valor seguro 1: Main.L_Secure2=Valor seguro 2: Main.L_ShadowID=ID Oscuro: +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=Teratipo original: Main.L_TeraTypeOverride=Teratipo sobreescrito: Main.L_WalkingMood=Walking Mood: diff --git a/PKHeX.WinForms/Resources/text/lang_fr.txt b/PKHeX.WinForms/Resources/text/lang_fr.txt index a8e060417..029649771 100644 --- a/PKHeX.WinForms/Resources/text/lang_fr.txt +++ b/PKHeX.WinForms/Resources/text/lang_fr.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=HOME Tracker : Main.L_LanguageHT=Langue : Main.L_MetTimeOfDay=Heure de la journée: Main.L_Misc=DO / Divers +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=N's Sparkle: Main.L_ObedienceLevel=Niveau d'obéissance: Main.L_OriginalNature=Stat Nature : Main.L_Party=Équipe : +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=Cet onglet est en lecture seule. Main.L_Resort=Resort Main.L_Ride=Ride @@ -439,6 +441,7 @@ Main.L_Scale=Scale: Main.L_Secure1=Secure Value 1: Main.L_Secure2=Secure Value 2: Main.L_ShadowID=Shadow ID: +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=Type Téra d'origine : Main.L_TeraTypeOverride=Type Téra remplaçant : Main.L_WalkingMood=Walking Mood: diff --git a/PKHeX.WinForms/Resources/text/lang_it.txt b/PKHeX.WinForms/Resources/text/lang_it.txt index f7266b877..9320a99bf 100644 --- a/PKHeX.WinForms/Resources/text/lang_it.txt +++ b/PKHeX.WinForms/Resources/text/lang_it.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=Monitoraggio HOME: Main.L_LanguageHT=Lingua: Main.L_MetTimeOfDay=Fase del giorno: Main.L_Misc=Varie +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=Scintillio di N: Main.L_ObedienceLevel=Lvl. Obbedienza: Main.L_OriginalNature=Natura Statistiche: Main.L_Party=Squadra: +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=Questa sezione è di sola lettura. Main.L_Resort=Resort Main.L_Ride=Ride @@ -439,6 +441,7 @@ Main.L_Scale=Scala: Main.L_Secure1=Secure Value 1: Main.L_Secure2=Secure Value 2: Main.L_ShadowID=ID Ombra: +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=Teratipo originale: Main.L_TeraTypeOverride=Teratipo sostitutivo: Main.L_WalkingMood=Walking Mood: diff --git a/PKHeX.WinForms/Resources/text/lang_ja.txt b/PKHeX.WinForms/Resources/text/lang_ja.txt index 15436b753..c6efd3205 100644 --- a/PKHeX.WinForms/Resources/text/lang_ja.txt +++ b/PKHeX.WinForms/Resources/text/lang_ja.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=HOME Tracker Main.L_LanguageHT=言語 Main.L_MetTimeOfDay=出会った時間 Main.L_Misc=その他 +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=Nのポケモン Main.L_ObedienceLevel=従順レベル Main.L_OriginalNature=ミント性格補正 Main.L_Party=手持ちポケモン +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=このタブは読み取り専用です Main.L_Resort=レポート Main.L_Ride=Ride @@ -439,6 +441,7 @@ Main.L_Scale=サイズ Main.L_Secure1=Secure Value 1: Main.L_Secure2=Secure Value 2: Main.L_ShadowID=ﾀﾞｰｸﾎﾟｹﾓﾝID +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=元のテラスタイプ Main.L_TeraTypeOverride=変更テラスタイプ Main.L_WalkingMood=Walking Mood: diff --git a/PKHeX.WinForms/Resources/text/lang_ko.txt b/PKHeX.WinForms/Resources/text/lang_ko.txt index 94142ec81..38aba111b 100644 --- a/PKHeX.WinForms/Resources/text/lang_ko.txt +++ b/PKHeX.WinForms/Resources/text/lang_ko.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=HOME Tracker: Main.L_LanguageHT=Language: Main.L_MetTimeOfDay=Time of Day: Main.L_Misc=기타 +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=N's Sparkle: Main.L_ObedienceLevel=Obedience Level: Main.L_OriginalNature=능력치 성격: Main.L_Party=파티: +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=이 탭은 읽기 전용입니다. Main.L_Resort=리조트 Main.L_Ride=Ride @@ -439,6 +441,7 @@ Main.L_Scale=Scale: Main.L_Secure1=보안 값 1: Main.L_Secure2=보안 값 2: Main.L_ShadowID=다크 ID: +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=Original Tera Type: Main.L_TeraTypeOverride=Override Tera Type: Main.L_WalkingMood=Walking Mood: diff --git a/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt b/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt index 1ef215e3d..5eaaa9e57 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=HOME追踪: Main.L_LanguageHT=语言: Main.L_MetTimeOfDay=相遇时段: Main.L_Misc=杂项 +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=N闪光特效: Main.L_ObedienceLevel=听话等级: Main.L_OriginalNature=薄荷修正: Main.L_Party=队伍: +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=此选项卡不可编辑。 Main.L_Resort=度假胜地 Main.L_Ride=坐骑 @@ -439,6 +441,7 @@ Main.L_Scale=大小: Main.L_Secure1=安全值 1: Main.L_Secure2=安全值 2: Main.L_ShadowID=黑暗ID: +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=原始太晶属性: Main.L_TeraTypeOverride=修正太晶属性: Main.L_WalkingMood=Walking Mood: diff --git a/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt b/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt index 9c719a31a..9e8d9b6b7 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt @@ -426,11 +426,13 @@ Main.L_HomeTracker=HOME追蹤碼: Main.L_LanguageHT=語言: Main.L_MetTimeOfDay=遇見時段: Main.L_Misc=雜項 +Main.L_Mood7b=Mood: Main.L_None=None Main.L_NSparkle=N異色特效: Main.L_ObedienceLevel=可指揮等級: Main.L_OriginalNature=薄荷修正性格: Main.L_Party=同行隊伍: +Main.L_PokeStarFame=Fame: Main.L_ReadOnlyOther=此選項卡不可編輯。 Main.L_Resort=度假勝地 Main.L_Ride=Ride @@ -439,6 +441,7 @@ Main.L_Scale=尺寸: Main.L_Secure1=安保值 1: Main.L_Secure2=安保值 2: Main.L_ShadowID=黑暗ID: +Main.L_Spirit7b=Spirit: Main.L_TeraTypeOriginal=原始太晶屬性: Main.L_TeraTypeOverride=轉變太晶屬性: Main.L_WalkingMood=Walking Mood: