diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index b3436b74b..0bddf33c2 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -157,6 +157,7 @@ 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(); @@ -426,7 +427,6 @@ 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(); @@ -1063,10 +1063,12 @@ public void InitializeComponent() // // Label_Form // - this.Label_Form.Location = new System.Drawing.Point(22, 0); + this.Label_Form.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.Label_Form.AutoSize = true; + this.Label_Form.Location = new System.Drawing.Point(22, 4); this.Label_Form.Margin = new System.Windows.Forms.Padding(0); this.Label_Form.Name = "Label_Form"; - this.Label_Form.Size = new System.Drawing.Size(35, 21); + this.Label_Form.Size = new System.Drawing.Size(33, 13); this.Label_Form.TabIndex = 11; this.Label_Form.Text = "Form:"; this.Label_Form.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1077,10 +1079,10 @@ public void InitializeComponent() this.CB_Form.DropDownWidth = 85; this.CB_Form.Enabled = false; this.CB_Form.FormattingEnabled = true; - this.CB_Form.Location = new System.Drawing.Point(57, 0); + this.CB_Form.Location = new System.Drawing.Point(55, 0); this.CB_Form.Margin = new System.Windows.Forms.Padding(0); this.CB_Form.Name = "CB_Form"; - this.CB_Form.Size = new System.Drawing.Size(69, 21); + this.CB_Form.Size = new System.Drawing.Size(71, 21); this.CB_Form.TabIndex = 12; this.CB_Form.SelectedIndexChanged += new System.EventHandler(this.updateForm); // @@ -2088,6 +2090,16 @@ 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 = 29; + 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); @@ -5466,16 +5478,6 @@ 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; diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index 83c30b379..afb521d4b 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -120,6 +120,117 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -155,6 +266,15 @@ True + + True + + + True + + + True + True @@ -164,6 +284,9 @@ True + + True + True @@ -182,6 +305,18 @@ True + + True + + + True + + + True + + + True + True @@ -200,6 +335,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + True @@ -224,21 +377,21 @@ True + + True + + + True + + + True + True True - - True - - - True - - - True - True @@ -251,6 +404,15 @@ True + + True + + + True + + + True + True @@ -287,12 +449,36 @@ True + + True + + + True + + + True + + + True + True True + + True + + + True + + + True + + + True + True @@ -305,6 +491,18 @@ True + + True + + + True + + + True + + + True + True @@ -317,9 +515,24 @@ True + + True + + + True + True + + True + + + True + + + True + True @@ -365,9 +578,60 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True + + True + + + True + + + True + + + True + True @@ -380,6 +644,9 @@ True + + True + True @@ -389,6 +656,18 @@ True + + True + + + True + + + True + + + True + True @@ -401,9 +680,30 @@ True + + True + + + True + + + True + True + + True + + + True + + + True + + + True + True @@ -416,6 +716,9 @@ True + + True + True @@ -425,6 +728,18 @@ True + + True + + + True + + + True + + + True + True @@ -437,6 +752,18 @@ True + + True + + + True + + + True + + + True + True @@ -449,9 +776,30 @@ True + + True + + + True + + + True + True + + True + + + True + + + True + + + True + True @@ -467,6 +815,18 @@ True + + True + + + True + + + True + + + True + True @@ -553,6 +913,30 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1 @@ -675,6 +1059,48 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -687,9 +1113,27 @@ True + + True + + + True + + + True + True + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -847,6 +1291,33 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -988,6 +1459,84 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1101,6 +1650,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1204,18 +1771,57 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True True + + True + True True + + True + True @@ -1225,6 +1831,9 @@ True + + True + True @@ -1258,6 +1867,57 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True diff --git a/PKHeX/PKM/ShowdownSet.cs b/PKHeX/PKM/ShowdownSet.cs index d15e96b18..0eaeadf74 100644 --- a/PKHeX/PKM/ShowdownSet.cs +++ b/PKHeX/PKM/ShowdownSet.cs @@ -178,7 +178,7 @@ public ShowdownSet(string input = null) if (index > -1) IVs[index] = IV; else - InvalidLines.Add($"Unknown EV Type input: {ivlist[i * 2]}"); + InvalidLines.Add($"Unknown IV Type input: {ivlist[i * 2]}"); } break; } diff --git a/PKHeX/Properties/Resources.Designer.cs b/PKHeX/Properties/Resources.Designer.cs index 4536a233d..c92f0a89e 100644 --- a/PKHeX/Properties/Resources.Designer.cs +++ b/PKHeX/Properties/Resources.Designer.cs @@ -16672,6 +16672,7 @@ internal class Resources { /// /// Looks up a localized string similar to If you are having issues viewing certain symbols/text: Options -> Toggle Font. /// + ///// /// ///// Main Window /// @@ -16682,6 +16683,7 @@ internal class Resources { ///CTRL-Q: Quit /// ///CTRL-D: Open Database + ///CTRL-G: Open Mystery Gift Database ///CTRL-R: Open Box Report ///CTRL-P: Open About PKHeX ///CTRL-T: Import Showdown Set @@ -16690,8 +16692,7 @@ internal class Resources { ///Control + Click on... ///- Species: Import Showdown/Smogon set from Clipboard. ///- Nickname/OT box: Bring up the ingame-special characters. - ///- Individual IVs: Set IV to max. - ///- Indivi [rest of string was truncated]";. + ///- [rest of string was truncated]";. /// internal static string shortcuts { get { @@ -21308,7 +21309,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Spiky + /// Looks up a localized string similar to Picoreja /// /// /// @@ -21509,8 +21510,7 @@ internal class Resources { /// /// /// - ///Unaa - /// + ///Una /// /// /// @@ -23617,6 +23617,196 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to (Ninguno) + ///Pueblo Primavera + ///Ruta 29 + ///Ciudad Cerezo + ///Ruta 30 + ///Ruta 31 + ///Ciudad Malva + ///Torre Bellsprout + ///Ruta 32 + ///Ruinas Alfa + ///Cueva Unión + ///Ruta 33 + ///Pueblo Azalea + ///Pozo Slowpoke + ///Encinar + ///Ruta 34 + ///Ciudad Trigal + ///Torre Radio + ///Ruta 35 + ///Parque Nacional + ///Ruta 36 + ///Ruta 37 + ///Ciudad Iris + ///Torre Campana + ///Torre Quemada + ///Ruta 38 + ///Ruta 39 + ///Ciudad Olivo + ///Faro + ///Torre Batalla + ///Ruta 40 + ///Islas Remolino + ///Ruta 41 + ///Ciudad Orquídea + ///Ruta 42 + ///Mt. Mortero + ///Pueblo Caoba + ///Ruta 43 + ///Lago de la Furia + ///Ruta 44 + ///Ruta Helada + ///Ciudad Endrino + ///Guarida Dragón + ///Ruta 45 + ///Cueva Oscura + ///Rut [rest of string was truncated]";. + /// + internal static string text_gsc_00000_es { + get { + return ResourceManager.GetString("text_gsc_00000_es", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to (None) + ///若叶镇 + ///29号路 + ///吉花市 + ///30号路 + ///31号路 + ///桔梗市 + ///喇叭芽之塔 + ///32号路 + ///阿露福遗迹 + ///互连洞 + ///33号路 + ///桧皮镇 + ///呆呆兽之井 + ///桐树林 + ///34号路 + ///满金市 + ///广播电塔 + ///35号路 + ///自然公园 + ///36号路 + ///37号路 + ///圆朱市 + ///铃铛塔 + ///烧焦塔 + ///38号路 + ///39号路 + ///浅黄市 + ///灯塔 + ///对战塔 + ///40号路 + ///漩涡列岛 + ///41号路 + ///湛蓝市 + ///42号路 + ///擂钵山 + ///卡吉镇 + ///43号路 + ///愤怒之湖 + ///44号路 + ///冰雪通路 + ///烟墨市 + ///龙穴 + ///45号路 + ///黑暗穴 + ///46号路 + ///白银洞窟 + ///真新镇 + ///1号路 + ///常磐市 + ///2号路 + ///尼比市 + ///3号路 + ///月见山 + ///4号路 + ///华蓝市 + ///24号路 + ///25号路 + ///5号路 + ///地道 + ///6号路 + ///枯叶市 + ///地鼠洞 + ///7号路 + ///8号路 + ///9号路 + ///岩山隧道 + ///10号路 + ///无人发电站 + ///紫苑镇 + ///紫苑广播电塔 + ///彩虹市 + ///金黄市 + ///11号路 + ///12号路 + ///13号路 + ///14号路 + ///15号路 + ///16号路 + ///17号路 + ///18号路 + ///浅红市 + ///19号路 + ///20号路 + ///双子岛 + ///红莲岛 + ///21号路 + ///22号路 + ///冠军之路 + ///23号路 + ///石英高原 + ///26号路 + ///27号路 + ///都城瀑布 + ///28号路 + ///快船 + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + ///不能说 + ///事件. + /// + internal static string text_gsc_00000_zh { + get { + return ResourceManager.GetString("text_gsc_00000_zh", resourceCulture); + } + } + /// /// Looks up a localized string similar to Mysteriöser Ort ///Zweiblattdorf @@ -25249,6 +25439,231 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Ningún + ///Master Ball + ///Ultra Ball + ///Super Ball + ///Poké Ball + ///Mapa + ///Bicicleta + ///????? (7) + ///Safari Ball + ///Pokédex + ///Piedra Lunar + ///Antídoto + ///Antiquemar + ///Antihielo + ///Despertar + ///Antiparalizador + ///Restaurar Todo + ///Poción Máxima + ///Hiperpoción + ///Superpoción + ///Poción + ///Medalla Roca + ///Medalla Cascada + ///Medalla Trueno + ///Medalla Arcoiris + ///Medalla Alma + ///Medalla Pantano + ///Medalla Volcán + ///Medalla Tierra + ///Cuerda Huida + ///Repelente + ///Ámbar viejo + ///Piedra Fuego + ///Piedra Trueno + ///Piedra Agua + ///Más PS + ///Proteína + ///Hierro + ///Carburante + ///Calcio + ///Caramelo Raro + ///Fósil domo + ///Fósil hélix + ///Llave secreta + ///? [rest of string was truncated]";. + /// + internal static string text_ItemsG1_es { + get { + return ResourceManager.GetString("text_ItemsG1_es", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to (无) + ///掌门球 + ///高级球 + ///超级球 + ///精灵球 + ///城镇地图 + ///自行车 + ///????? (7) + ///狩猎球 + ///宝可梦图鉴 + ///月之石 + ///解毒剂 + ///灼伤药 + ///解冻药 + ///解眠药 + ///解麻药 + ///回复药水 + ///全满药水 + ///超高级药水 + ///超级药水 + ///药水 + ///灰色徽章 + ///蓝色徽章 + ///橘色徽章 + ///彩虹徽章 + ///粉红徽章 + ///金黄徽章 + ///深红徽章 + ///绿色徽章 + ///脱离洞穴的绳子 + ///除虫喷雾器 + ///秘密琥珀 + ///火之石 + ///雷之石 + ///水之石 + ///HP提升剂 + ///攻击牛磺剂 + ///防御提升剂 + ///效果防护 + ///特攻增加剂 + ///神奇糖果 + ///龟壳化石 + ///贝之化石 + ///神秘的钥匙 + ///????? (44) + ///兑换券 + ///命中加强 + ///叶之石 + ///卡片钥匙 + ///金色珠 + ///PP提升剂（未使用） + ///皮皮玩偶 + ///万能药 + ///更生剂 + ///特级更生剂 + ///防御效果 + ///白银喷雾器 + ///黄金喷雾器 + ///要害攻击 + ///代币 + ///美味之水 + ///塞可汽水 + ///综合调味乳 + ///船票 + ///金子做的假牙 + ///力量增强 + ///伤害预防 + ///速度增加 + ///特殊增强 + ///代币盒 + ///包裹 + ///蓝色卡片 + ///幻影透视镜 + ///神奇宝贝之笛 + ///电梯的钥匙 + ///学习装置 + ///破烂钓竿 + ///优秀钓竿 + ///超强钓竿 + ///PP提升剂 + ///PP小补剂 + ///PP单补剂 + ///PP大补剂 + ///PP全补剂 + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// [rest of string was truncated]";. + /// + internal static string text_ItemsG1_zh { + get { + return ResourceManager.GetString("text_ItemsG1_zh", resourceCulture); + } + } + /// /// Looks up a localized string similar to (None) ///Master Ball @@ -25303,6 +25718,148 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Ningún + ///Master Ball + ///Ultra Ball + ///Polvo brillo + ///Super Ball + ///Poké Ball + ///Teru-sama (0) + ///Bicicleta + ///Piedra Lunar + ///Antídoto + ///Antiquemar + ///Antihielo + ///Despertar + ///Antiparalizador + ///Restaurar Todo + ///Poción Máxima + ///Hiperpoción + ///Superpoción + ///Poción + ///Cuerda Huida + ///Repelente + ///Elixir Máximo + ///Piedra Fuego + ///Piedra Trueno + ///Piedra Agua + ///Teru-sama (1) + ///Más PS + ///Proteína + ///Hierro + ///Carburante + ///Puño suerte + ///Calcio + ///Caramelo Raro + ///Precisión X + ///Piedra Hoja + ///Polvo metálico + ///Pepita + ///Poké Muñeco + ///Cura Total + ///Revivir + ///Revivir Máximo + ///Prote [rest of string was truncated]";. + /// + internal static string text_ItemsG2_es { + get { + return ResourceManager.GetString("text_ItemsG2_es", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to (无) + ///掌门球 + ///高级球 + ///亮光之粉 + ///超级球 + ///精灵球 + ///卡比丘 (0) + ///自行车 + ///月之石 + ///解毒剂 + ///灼伤药 + ///解冻药 + ///解眠药 + ///解麻药 + ///回复药水 + ///全满药水 + ///超高级药水 + ///超级药水 + ///药水 + ///脱离洞穴的绳子 + ///除虫喷雾器 + ///PP全补剂 + ///火之石 + ///雷之石 + ///水之石 + ///卡比丘 (1) + ///HP提升剂 + ///攻击牛磺剂 + ///防御提升剂 + ///效果防护 + ///幸运之拳 + ///特攻增加剂 + ///神奇糖果 + ///命中加强 + ///叶之石 + ///金属粉 + ///金色珠 + ///皮皮玩偶 + ///万能药 + ///更生剂 + ///特级更生剂 + ///防御效果 + ///白银喷雾器 + ///黄金喷雾器 + ///要害攻击 + ///卡比丘 (2) + ///美味之水 + ///塞可汽水 + ///综合调味乳 + ///力量增强 + ///卡比丘 (3) + ///伤害预防 + ///速度增加 + ///特殊增强 + ///代币盒 + ///蓝色卡片 + ///卡比丘 (4) + ///学习装置 + ///破烂钓竿 + ///优秀钓竿 + ///银叶 + ///超强钓竿 + ///PP提升剂 + ///PP小补剂 + ///PP单补剂 + ///PP大补剂 + ///红色的鳞片 + ///秘传之药 + ///船票 + ///神奇之蛋 + ///透明铃铛 + ///银色之翼 + ///摩摩牛奶 + ///先攻之爪 + ///解毒的果实 + ///金叶 + ///柔软的沙子 + ///尖锐的鸟嘴 + ///消除麻痹的果实 + ///烧烤的果实 + ///冰冻的果实 + ///毒针 + ///王者之证 + ///苦涩的 [rest of string was truncated]";. + /// + internal static string text_ItemsG2_zh { + get { + return ResourceManager.GetString("text_ItemsG2_zh", resourceCulture); + } + } + /// /// Looks up a localized string similar to (None) ///Master Ball @@ -25359,6 +25916,177 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Ningún + ///Master Ball + ///Ultra Ball + ///Super Ball + ///Poké Ball + ///Safari Ball + ///Malla Ball + ///Buceo Ball + ///Nido Ball + ///Acopio Ball + ///Turno Ball + ///Lujo Ball + ///Honor Ball + ///Poción + ///Antídoto + ///Antiquemar + ///Antihielo + ///Despertar + ///Antiparalizador + ///Restaurar Todo + ///Poción Máxima + ///Hiperpoción + ///Superpoción + ///Cura Total + ///Revivir + ///Revivir Máximo + ///Agua Fresca + ///Refresco + ///Limonada + ///Leche Mu-mu + ///Polvo Energía + ///Raíz Energía + ///Polvo Curación + ///Hierba Revivir + ///Éter + ///Éter Máximo + ///Elixir + ///Elixir Máximo + ///Galleta Lava + ///Flauta Azul + ///Flauta Amarilla + ///Flauta Roja + ///Flauta Negra + ///Flauta Blanca + ///Zumo d [rest of string was truncated]";. + /// + internal static string text_ItemsG3_es { + get { + return ResourceManager.GetString("text_ItemsG3_es", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to (无) + ///掌门球 + ///高级球 + ///超级球 + ///精灵球 + ///狩猎球 + ///网纹球 + ///潜水球 + ///巢穴球 + ///重复球 + ///计时球 + ///华丽球 + ///首席球 + ///药水 + ///解毒剂 + ///灼伤药 + ///解冻药 + ///解眠药 + ///解麻药 + ///回复药水 + ///全满药水 + ///超高级药水 + ///超级药水 + ///万能药 + ///更生剂 + ///特级更生剂 + ///美味之水 + ///塞可汽水 + ///综合调味乳 + ///摩摩牛奶 + ///元气之粉 + ///元气之根 + ///万能之粉 + ///复活草 + ///PP小补剂 + ///PP单补剂 + ///PP大补剂 + ///PP全补剂 + ///釜炎仙贝 + ///蓝色哨子 + ///黄色哨子 + ///红色哨子 + ///黑色哨子 + ///白色哨子 + ///树果汁 + ///神圣之灰 + ///浅滩海盐 + ///浅滩贝壳 + ///红色碎片 + ///蓝色碎片 + ///黄色碎片 + ///绿色碎片 + ///??? + ///??? + ///??? + ///??? + ///??? + ///??? + ///??? + ///??? + ///??? + ///??? + ///??? + ///HP提升剂 + ///攻击牛磺剂 + ///防御提升剂 + ///效果防护 + ///特攻增加剂 + ///神奇糖果 + ///PP提升剂 + ///特防甲壳剂 + ///PP增加剂 + ///??? + ///防御效果 + ///要害攻击 + ///力量增强 + ///伤害预防 + ///速度增加 + ///命中加强 + ///特殊增强 + ///皮皮玩偶 + ///向尾喵的尾巴 + ///??? + ///白银喷雾器 + ///黄金喷雾器 + ///脱离洞穴的绳子 + ///除虫喷雾器 + ///??? + ///??? + ///??? + ///??? + ///??? + ///??? + ///太阳之石 + ///月之石 + ///火之石 + ///雷之石 + ///水之石 + ///叶之石 + ///??? + ///??? + ///??? + ///??? + ///小蘑菇 + ///大蘑菇 + ///??? + ///珍珠 + ///大珍珠 + ///星星的沙子 + ///星星 [rest of string was truncated]";. + /// + internal static string text_ItemsG3_zh { + get { + return ResourceManager.GetString("text_ItemsG3_zh", resourceCulture); + } + } + /// /// Looks up a localized string similar to /// @@ -27092,6 +27820,153 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Villa Raíz + ///Pueblo Escaso + ///Pueblo Azuliza + ///Pueblo Lavacalda + ///Pueblo Pardal + ///Pueblo Verdegal + ///Pueblo Oromar + ///Ciudad Petalia + ///Ciudad Portual + ///Ciudad Malvalona + ///Ciudad Férrica + ///Ciudad Arborada + ///Ciudad Calagua + ///Ciudad Algaria + ///Arrecípolis + ///Ciudad Colosalia + ///Ruta 101 + ///Ruta 102 + ///Ruta 103 + ///Ruta 104 + ///Ruta 105 + ///Ruta 106 + ///Ruta 107 + ///Ruta 108 + ///Ruta 109 + ///Ruta 110 + ///Ruta 111 + ///Ruta 112 + ///Ruta 113 + ///Ruta 114 + ///Ruta 115 + ///Ruta 116 + ///Ruta 117 + ///Ruta 118 + ///Ruta 119 + ///Ruta 120 + ///Ruta 121 + ///Ruta 122 + ///Ruta 123 + ///Ruta 124 + ///Ruta 125 + ///Ruta 126 + ///Ruta 127 + ///Ruta 128 + ///Ruta 129 + ///Ruta 130 + ///Ruta [rest of string was truncated]";. + /// + internal static string text_rsefrlg_00000_es { + get { + return ResourceManager.GetString("text_rsefrlg_00000_es", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 未白镇 + ///古辰镇 + ///武斗镇 + ///釜炎镇 + ///秋叶镇 + ///绿荫镇 + ///暮水镇 + ///橙华市 + ///凯那市 + ///紫堇市 + ///卡那兹市 + ///茵郁市 + ///水静市 + ///绿岭市 + ///琉璃市 + ///彩幽市 + ///101号路 + ///102号路 + ///103号路 + ///104号路 + ///105号路 + ///106号路 + ///107号路 + ///108号路 + ///109号路 + ///110号路 + ///111号路 + ///112号路 + ///113号路 + ///114号路 + ///115号路 + ///116号路 + ///117号路 + ///118号路 + ///119号路 + ///120号路 + ///121号路 + ///122号路 + ///123号路 + ///124号路 + ///125号路 + ///126号路 + ///127号路 + ///128号路 + ///129号路 + ///130号路 + ///131号路 + ///132号路 + ///133号路 + ///134号路 + ///水下(124号路) + ///水下(126号路) + ///水下(127号路) + ///水下(128号路) + ///水下(琉璃市) + ///石之洞窟 + ///烟突山 + ///野生原野区 (红蓝绿宝石) + ///对战塔 (红蓝宝石) / 对战开拓区 (绿宝石) + ///橙华森林 + ///卡绿隧道 + ///弃船 + ///新紫堇 + ///流星瀑布 + ///流星瀑布 (未使用) + ///送火山 + ///秘密指挥部 + ///浅滩洞穴 + ///海底洞窟 + ///水下(海底洞窟) + ///冠军之路 (红蓝绿宝石) + ///梦幻岛 + ///觉醒祠堂 + ///南方孤岛 + ///热焰小径 + ///热焰小径 (2) + ///凹凸山道 + ///凹凸山道 (2) + ///布告石室 + ///水下(134号路) + ///天旱焦岩 + ///小岛横穴 + ///沙漠遗迹 + /// [rest of string was truncated]";. + /// + internal static string text_rsefrlg_00000_zh { + get { + return ResourceManager.GetString("text_rsefrlg_00000_zh", resourceCulture); + } + } + /// /// Looks up a localized string similar to Ei ///Bisasam diff --git a/PKHeX/Properties/Resources.resx b/PKHeX/Properties/Resources.resx index 0b33dc3b6..e837909e2 100644 --- a/PKHeX/Properties/Resources.resx +++ b/PKHeX/Properties/Resources.resx @@ -6418,4 +6418,34 @@ ..\Resources\img\Program\gift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\text\gen3\text_gsc_00000_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + + + ..\Resources\text\gen3\text_gsc_00000_zh.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + + + ..\Resources\text\gen3\text_ItemsG1_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + + + ..\Resources\text\gen3\text_ItemsG1_zh.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + + + ..\Resources\text\gen3\text_ItemsG2_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\text\gen3\text_ItemsG2_zh.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\Resources\text\gen3\text_ItemsG3_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + + + ..\Resources\text\gen3\text_ItemsG3_zh.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + + + ..\Resources\text\gen3\text_rsefrlg_00000_es.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + + + ..\Resources\text\gen3\text_rsefrlg_00000_zh.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 + \ No newline at end of file diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs index fe932c756..b2a55e5f4 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs @@ -396,12 +396,12 @@ private void InitializeComponent() // // L_PKFriendship // - this.L_PKFriendship.AutoSize = true; - this.L_PKFriendship.Location = new System.Drawing.Point(265, 166); + this.L_PKFriendship.Location = new System.Drawing.Point(245, 163); this.L_PKFriendship.Name = "L_PKFriendship"; - this.L_PKFriendship.Size = new System.Drawing.Size(55, 13); + this.L_PKFriendship.Size = new System.Drawing.Size(75, 21); this.L_PKFriendship.TabIndex = 82; this.L_PKFriendship.Text = "Friendship"; + this.L_PKFriendship.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // CB_Ball // @@ -451,7 +451,7 @@ private void InitializeComponent() this.CHK_Shiny.AutoSize = true; this.CHK_Shiny.Location = new System.Drawing.Point(146, 92); this.CHK_Shiny.Name = "CHK_Shiny"; - this.CHK_Shiny.Size = new System.Drawing.Size(38, 17); + this.CHK_Shiny.Size = new System.Drawing.Size(35, 17); this.CHK_Shiny.TabIndex = 77; this.CHK_Shiny.Text = "☆"; this.CHK_Shiny.UseVisualStyleBackColor = true; @@ -514,7 +514,7 @@ private void InitializeComponent() this.CB_Move4.FormattingEnabled = true; this.CB_Move4.Location = new System.Drawing.Point(15, 225); this.CB_Move4.Name = "CB_Move4"; - this.CB_Move4.Size = new System.Drawing.Size(121, 21); + this.CB_Move4.Size = new System.Drawing.Size(122, 21); this.CB_Move4.TabIndex = 74; // // CB_PPu1 @@ -538,7 +538,7 @@ private void InitializeComponent() this.CB_Move3.FormattingEnabled = true; this.CB_Move3.Location = new System.Drawing.Point(15, 203); this.CB_Move3.Name = "CB_Move3"; - this.CB_Move3.Size = new System.Drawing.Size(121, 21); + this.CB_Move3.Size = new System.Drawing.Size(122, 21); this.CB_Move3.TabIndex = 72; // // CB_Move2 @@ -548,7 +548,7 @@ private void InitializeComponent() this.CB_Move2.FormattingEnabled = true; this.CB_Move2.Location = new System.Drawing.Point(15, 181); this.CB_Move2.Name = "CB_Move2"; - this.CB_Move2.Size = new System.Drawing.Size(121, 21); + this.CB_Move2.Size = new System.Drawing.Size(122, 21); this.CB_Move2.TabIndex = 70; // // CB_Move1 @@ -558,21 +558,21 @@ private void InitializeComponent() this.CB_Move1.FormattingEnabled = true; this.CB_Move1.Location = new System.Drawing.Point(15, 159); this.CB_Move1.Name = "CB_Move1"; - this.CB_Move1.Size = new System.Drawing.Size(121, 21); + this.CB_Move1.Size = new System.Drawing.Size(122, 21); this.CB_Move1.TabIndex = 68; // // L_Participant // - this.L_Participant.AutoSize = true; - this.L_Participant.Location = new System.Drawing.Point(12, 19); + this.L_Participant.Location = new System.Drawing.Point(15, 19); this.L_Participant.Name = "L_Participant"; - this.L_Participant.Size = new System.Drawing.Size(60, 13); + this.L_Participant.Size = new System.Drawing.Size(78, 20); this.L_Participant.TabIndex = 67; this.L_Participant.Text = "Participant:"; + this.L_Participant.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FPKM // - this.NUD_FPKM.Location = new System.Drawing.Point(78, 17); + this.NUD_FPKM.Location = new System.Drawing.Point(99, 21); this.NUD_FPKM.Maximum = new decimal(new int[] { 3, 0, @@ -584,7 +584,7 @@ private void InitializeComponent() 0, 0}); this.NUD_FPKM.Name = "NUD_FPKM"; - this.NUD_FPKM.Size = new System.Drawing.Size(35, 20); + this.NUD_FPKM.Size = new System.Drawing.Size(38, 20); this.NUD_FPKM.TabIndex = 66; this.NUD_FPKM.Value = new decimal(new int[] { 1, @@ -627,18 +627,18 @@ private void InitializeComponent() // // L_EncryptionConstant // - this.L_EncryptionConstant.AutoSize = true; - this.L_EncryptionConstant.Location = new System.Drawing.Point(12, 47); + this.L_EncryptionConstant.Location = new System.Drawing.Point(15, 44); this.L_EncryptionConstant.Name = "L_EncryptionConstant"; - this.L_EncryptionConstant.Size = new System.Drawing.Size(32, 13); + this.L_EncryptionConstant.Size = new System.Drawing.Size(56, 21); this.L_EncryptionConstant.TabIndex = 62; this.L_EncryptionConstant.Text = "ENC:"; + this.L_EncryptionConstant.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // TB_EC // this.TB_EC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TB_EC.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_EC.Location = new System.Drawing.Point(53, 45); + this.TB_EC.Location = new System.Drawing.Point(77, 44); this.TB_EC.MaxLength = 8; this.TB_EC.Name = "TB_EC"; this.TB_EC.Size = new System.Drawing.Size(60, 20); @@ -668,62 +668,62 @@ private void InitializeComponent() // L_SPE // this.L_SPE.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_SPE.AutoSize = true; - this.L_SPE.Location = new System.Drawing.Point(235, 140); + this.L_SPE.Location = new System.Drawing.Point(209, 138); this.L_SPE.Name = "L_SPE"; - this.L_SPE.Size = new System.Drawing.Size(28, 13); + this.L_SPE.Size = new System.Drawing.Size(50, 21); this.L_SPE.TabIndex = 13; this.L_SPE.Text = "SPE"; + this.L_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_SpD // this.L_SpD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_SpD.AutoSize = true; - this.L_SpD.Location = new System.Drawing.Point(235, 118); + this.L_SpD.Location = new System.Drawing.Point(209, 116); this.L_SpD.Name = "L_SpD"; - this.L_SpD.Size = new System.Drawing.Size(28, 13); + this.L_SpD.Size = new System.Drawing.Size(50, 21); this.L_SpD.TabIndex = 12; this.L_SpD.Text = "SpD"; + this.L_SpD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_SpA // this.L_SpA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_SpA.AutoSize = true; - this.L_SpA.Location = new System.Drawing.Point(236, 96); + this.L_SpA.Location = new System.Drawing.Point(209, 94); this.L_SpA.Name = "L_SpA"; - this.L_SpA.Size = new System.Drawing.Size(27, 13); + this.L_SpA.Size = new System.Drawing.Size(50, 21); this.L_SpA.TabIndex = 11; this.L_SpA.Text = "SpA"; + this.L_SpA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_DEF // this.L_DEF.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_DEF.AutoSize = true; - this.L_DEF.Location = new System.Drawing.Point(235, 74); + this.L_DEF.Location = new System.Drawing.Point(209, 72); this.L_DEF.Name = "L_DEF"; - this.L_DEF.Size = new System.Drawing.Size(28, 13); + this.L_DEF.Size = new System.Drawing.Size(50, 21); this.L_DEF.TabIndex = 4; this.L_DEF.Text = "DEF"; + this.L_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_ATK // this.L_ATK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_ATK.AutoSize = true; - this.L_ATK.Location = new System.Drawing.Point(235, 52); + this.L_ATK.Location = new System.Drawing.Point(209, 50); this.L_ATK.Name = "L_ATK"; - this.L_ATK.Size = new System.Drawing.Size(28, 13); + this.L_ATK.Size = new System.Drawing.Size(50, 21); this.L_ATK.TabIndex = 3; this.L_ATK.Text = "ATK"; + this.L_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_HP // this.L_HP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_HP.AutoSize = true; - this.L_HP.Location = new System.Drawing.Point(241, 30); + this.L_HP.Location = new System.Drawing.Point(209, 28); this.L_HP.Name = "L_HP"; - this.L_HP.Size = new System.Drawing.Size(22, 13); + this.L_HP.Size = new System.Drawing.Size(50, 21); this.L_HP.TabIndex = 2; this.L_HP.Text = "HP"; + this.L_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // f_MAIN // @@ -754,7 +754,7 @@ private void InitializeComponent() // // NUD_FBaseLocation // - this.NUD_FBaseLocation.Location = new System.Drawing.Point(128, 35); + this.NUD_FBaseLocation.Location = new System.Drawing.Point(159, 5); this.NUD_FBaseLocation.Maximum = new decimal(new int[] { 85, 0, @@ -778,7 +778,7 @@ private void InitializeComponent() // this.TB_FT2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FT2.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FT2.Location = new System.Drawing.Point(240, 132); + this.TB_FT2.Location = new System.Drawing.Point(92, 101); this.TB_FT2.MaxLength = 16; this.TB_FT2.Name = "TB_FT2"; this.TB_FT2.Size = new System.Drawing.Size(124, 20); @@ -788,7 +788,7 @@ private void InitializeComponent() // this.TB_FT1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FT1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FT1.Location = new System.Drawing.Point(240, 110); + this.TB_FT1.Location = new System.Drawing.Point(92, 80); this.TB_FT1.MaxLength = 16; this.TB_FT1.Name = "TB_FT1"; this.TB_FT1.Size = new System.Drawing.Size(124, 20); @@ -797,10 +797,9 @@ private void InitializeComponent() // L_TeamSlogan // this.L_TeamSlogan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_TeamSlogan.AutoSize = true; - this.L_TeamSlogan.Location = new System.Drawing.Point(166, 135); + this.L_TeamSlogan.Location = new System.Drawing.Point(11, 100); this.L_TeamSlogan.Name = "L_TeamSlogan"; - this.L_TeamSlogan.Size = new System.Drawing.Size(73, 13); + this.L_TeamSlogan.Size = new System.Drawing.Size(75, 21); this.L_TeamSlogan.TabIndex = 17; this.L_TeamSlogan.Text = "Team Slogan:"; this.L_TeamSlogan.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -808,10 +807,9 @@ private void InitializeComponent() // L_TeamName // this.L_TeamName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_TeamName.AutoSize = true; - this.L_TeamName.Location = new System.Drawing.Point(171, 113); + this.L_TeamName.Location = new System.Drawing.Point(11, 79); this.L_TeamName.Name = "L_TeamName"; - this.L_TeamName.Size = new System.Drawing.Size(68, 13); + this.L_TeamName.Size = new System.Drawing.Size(75, 21); this.L_TeamName.TabIndex = 16; this.L_TeamName.Text = "Team Name:"; this.L_TeamName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -830,85 +828,85 @@ private void InitializeComponent() this.GB_Object.Controls.Add(this.NUD_FObjType); this.GB_Object.Controls.Add(this.L_Index); this.GB_Object.Controls.Add(this.NUD_FObject); - this.GB_Object.Location = new System.Drawing.Point(6, 158); + this.GB_Object.Location = new System.Drawing.Point(222, 56); this.GB_Object.Name = "GB_Object"; - this.GB_Object.Size = new System.Drawing.Size(357, 103); + this.GB_Object.Size = new System.Drawing.Size(142, 154); this.GB_Object.TabIndex = 13; this.GB_Object.TabStop = false; this.GB_Object.Text = "Object Layout"; // // L_Y // - this.L_Y.AutoSize = true; - this.L_Y.Location = new System.Drawing.Point(231, 48); + this.L_Y.Location = new System.Drawing.Point(10, 117); this.L_Y.Name = "L_Y"; - this.L_Y.Size = new System.Drawing.Size(71, 13); + this.L_Y.Size = new System.Drawing.Size(75, 21); this.L_Y.TabIndex = 9; this.L_Y.Text = "Y Coordinate:"; + this.L_Y.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_X // - this.L_X.AutoSize = true; - this.L_X.Location = new System.Drawing.Point(231, 22); + this.L_X.Location = new System.Drawing.Point(10, 96); this.L_X.Name = "L_X"; - this.L_X.Size = new System.Drawing.Size(71, 13); + this.L_X.Size = new System.Drawing.Size(75, 21); this.L_X.TabIndex = 8; this.L_X.Text = "X Coordinate:"; + this.L_X.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FX // - this.NUD_FX.Location = new System.Drawing.Point(308, 20); + this.NUD_FX.Location = new System.Drawing.Point(87, 98); this.NUD_FX.Maximum = new decimal(new int[] { 40, 0, 0, 0}); this.NUD_FX.Name = "NUD_FX"; - this.NUD_FX.Size = new System.Drawing.Size(36, 20); + this.NUD_FX.Size = new System.Drawing.Size(40, 20); this.NUD_FX.TabIndex = 7; this.NUD_FX.ValueChanged += new System.EventHandler(this.changeObjectQuality); // // NUD_FY // - this.NUD_FY.Location = new System.Drawing.Point(308, 46); + this.NUD_FY.Location = new System.Drawing.Point(87, 119); this.NUD_FY.Maximum = new decimal(new int[] { 40, 0, 0, 0}); this.NUD_FY.Name = "NUD_FY"; - this.NUD_FY.Size = new System.Drawing.Size(36, 20); + this.NUD_FY.Size = new System.Drawing.Size(40, 20); this.NUD_FY.TabIndex = 6; this.NUD_FY.ValueChanged += new System.EventHandler(this.changeObjectQuality); // // L_Rotation // - this.L_Rotation.AutoSize = true; - this.L_Rotation.Location = new System.Drawing.Point(6, 74); + this.L_Rotation.Location = new System.Drawing.Point(10, 70); this.L_Rotation.Name = "L_Rotation"; - this.L_Rotation.Size = new System.Drawing.Size(68, 13); + this.L_Rotation.Size = new System.Drawing.Size(75, 21); this.L_Rotation.TabIndex = 5; this.L_Rotation.Text = "Rotation Val:"; + this.L_Rotation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Decoration // - this.L_Decoration.AutoSize = true; - this.L_Decoration.Location = new System.Drawing.Point(12, 48); + this.L_Decoration.Location = new System.Drawing.Point(10, 49); this.L_Decoration.Name = "L_Decoration"; - this.L_Decoration.Size = new System.Drawing.Size(62, 13); + this.L_Decoration.Size = new System.Drawing.Size(75, 21); this.L_Decoration.TabIndex = 4; this.L_Decoration.Text = "Decoration:"; + this.L_Decoration.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FRot // - this.NUD_FRot.Location = new System.Drawing.Point(76, 72); + this.NUD_FRot.Location = new System.Drawing.Point(87, 72); this.NUD_FRot.Maximum = new decimal(new int[] { 7, 0, 0, 0}); this.NUD_FRot.Name = "NUD_FRot"; - this.NUD_FRot.Size = new System.Drawing.Size(36, 20); + this.NUD_FRot.Size = new System.Drawing.Size(40, 20); this.NUD_FRot.TabIndex = 3; this.NUD_FRot.Value = new decimal(new int[] { 1, @@ -919,7 +917,7 @@ private void InitializeComponent() // // NUD_FObjType // - this.NUD_FObjType.Location = new System.Drawing.Point(76, 46); + this.NUD_FObjType.Location = new System.Drawing.Point(87, 51); this.NUD_FObjType.Maximum = new decimal(new int[] { 173, 0, @@ -931,7 +929,7 @@ private void InitializeComponent() 0, -2147483648}); this.NUD_FObjType.Name = "NUD_FObjType"; - this.NUD_FObjType.Size = new System.Drawing.Size(38, 20); + this.NUD_FObjType.Size = new System.Drawing.Size(40, 20); this.NUD_FObjType.TabIndex = 2; this.NUD_FObjType.Value = new decimal(new int[] { 1, @@ -942,16 +940,16 @@ private void InitializeComponent() // // L_Index // - this.L_Index.AutoSize = true; - this.L_Index.Location = new System.Drawing.Point(38, 22); + this.L_Index.Location = new System.Drawing.Point(10, 23); this.L_Index.Name = "L_Index"; - this.L_Index.Size = new System.Drawing.Size(36, 13); + this.L_Index.Size = new System.Drawing.Size(75, 21); this.L_Index.TabIndex = 1; this.L_Index.Text = "Index:"; + this.L_Index.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FObject // - this.NUD_FObject.Location = new System.Drawing.Point(76, 20); + this.NUD_FObject.Location = new System.Drawing.Point(87, 25); this.NUD_FObject.Maximum = new decimal(new int[] { 25, 0, @@ -963,7 +961,7 @@ private void InitializeComponent() 0, 0}); this.NUD_FObject.Name = "NUD_FObject"; - this.NUD_FObject.Size = new System.Drawing.Size(36, 20); + this.NUD_FObject.Size = new System.Drawing.Size(40, 20); this.NUD_FObject.TabIndex = 0; this.NUD_FObject.Value = new decimal(new int[] { 1, @@ -974,18 +972,18 @@ private void InitializeComponent() // // L_BaseLocation // - this.L_BaseLocation.AutoSize = true; - this.L_BaseLocation.Location = new System.Drawing.Point(6, 35); + this.L_BaseLocation.Location = new System.Drawing.Point(3, 3); this.L_BaseLocation.Name = "L_BaseLocation"; - this.L_BaseLocation.Size = new System.Drawing.Size(112, 13); + this.L_BaseLocation.Size = new System.Drawing.Size(150, 21); this.L_BaseLocation.TabIndex = 11; this.L_BaseLocation.Text = "Secret Base Location:"; + this.L_BaseLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // TB_FSay4 // this.TB_FSay4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FSay4.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FSay4.Location = new System.Drawing.Point(240, 72); + this.TB_FSay4.Location = new System.Drawing.Point(92, 190); this.TB_FSay4.MaxLength = 16; this.TB_FSay4.Name = "TB_FSay4"; this.TB_FSay4.Size = new System.Drawing.Size(124, 20); @@ -995,7 +993,7 @@ private void InitializeComponent() // this.TB_FSay3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FSay3.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FSay3.Location = new System.Drawing.Point(240, 50); + this.TB_FSay3.Location = new System.Drawing.Point(92, 169); this.TB_FSay3.MaxLength = 16; this.TB_FSay3.Name = "TB_FSay3"; this.TB_FSay3.Size = new System.Drawing.Size(124, 20); @@ -1005,7 +1003,7 @@ private void InitializeComponent() // this.TB_FSay2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FSay2.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FSay2.Location = new System.Drawing.Point(240, 28); + this.TB_FSay2.Location = new System.Drawing.Point(92, 148); this.TB_FSay2.MaxLength = 16; this.TB_FSay2.Name = "TB_FSay2"; this.TB_FSay2.Size = new System.Drawing.Size(124, 20); @@ -1015,7 +1013,7 @@ private void InitializeComponent() // this.TB_FSay1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FSay1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FSay1.Location = new System.Drawing.Point(240, 6); + this.TB_FSay1.Location = new System.Drawing.Point(92, 127); this.TB_FSay1.MaxLength = 16; this.TB_FSay1.Name = "TB_FSay1"; this.TB_FSay1.Size = new System.Drawing.Size(124, 20); @@ -1024,7 +1022,7 @@ private void InitializeComponent() // TB_FOT // this.TB_FOT.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FOT.Location = new System.Drawing.Point(80, 7); + this.TB_FOT.Location = new System.Drawing.Point(123, 54); this.TB_FOT.MaxLength = 12; this.TB_FOT.Name = "TB_FOT"; this.TB_FOT.Size = new System.Drawing.Size(93, 20); @@ -1032,20 +1030,19 @@ private void InitializeComponent() // // L_TrName // - this.L_TrName.AutoSize = true; - this.L_TrName.Location = new System.Drawing.Point(6, 9); + this.L_TrName.Location = new System.Drawing.Point(9, 53); this.L_TrName.Name = "L_TrName"; - this.L_TrName.Size = new System.Drawing.Size(74, 13); + this.L_TrName.Size = new System.Drawing.Size(108, 21); this.L_TrName.TabIndex = 9; this.L_TrName.Text = "Trainer Name:"; + this.L_TrName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Confetti // this.L_Confetti.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Confetti.AutoSize = true; - this.L_Confetti.Location = new System.Drawing.Point(193, 75); + this.L_Confetti.Location = new System.Drawing.Point(11, 189); this.L_Confetti.Name = "L_Confetti"; - this.L_Confetti.Size = new System.Drawing.Size(46, 13); + this.L_Confetti.Size = new System.Drawing.Size(75, 21); this.L_Confetti.TabIndex = 8; this.L_Confetti.Text = "Confetti:"; this.L_Confetti.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1053,10 +1050,9 @@ private void InitializeComponent() // L_Blackboard // this.L_Blackboard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Blackboard.AutoSize = true; - this.L_Blackboard.Location = new System.Drawing.Point(175, 53); + this.L_Blackboard.Location = new System.Drawing.Point(11, 168); this.L_Blackboard.Name = "L_Blackboard"; - this.L_Blackboard.Size = new System.Drawing.Size(64, 13); + this.L_Blackboard.Size = new System.Drawing.Size(75, 21); this.L_Blackboard.TabIndex = 7; this.L_Blackboard.Text = "Blackboard:"; this.L_Blackboard.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1064,10 +1060,9 @@ private void InitializeComponent() // L_Encourage // this.L_Encourage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Encourage.AutoSize = true; - this.L_Encourage.Location = new System.Drawing.Point(177, 32); + this.L_Encourage.Location = new System.Drawing.Point(11, 147); this.L_Encourage.Name = "L_Encourage"; - this.L_Encourage.Size = new System.Drawing.Size(62, 13); + this.L_Encourage.Size = new System.Drawing.Size(75, 21); this.L_Encourage.TabIndex = 6; this.L_Encourage.Text = "Encourage:"; this.L_Encourage.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1075,10 +1070,9 @@ private void InitializeComponent() // L_Happy // this.L_Happy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Happy.AutoSize = true; - this.L_Happy.Location = new System.Drawing.Point(198, 9); + this.L_Happy.Location = new System.Drawing.Point(11, 126); this.L_Happy.Name = "L_Happy"; - this.L_Happy.Size = new System.Drawing.Size(41, 13); + this.L_Happy.Size = new System.Drawing.Size(75, 21); this.L_Happy.TabIndex = 5; this.L_Happy.Text = "Happy:"; this.L_Happy.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1098,7 +1092,7 @@ private void InitializeComponent() // B_GiveDecor // this.B_GiveDecor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.B_GiveDecor.Location = new System.Drawing.Point(144, 302); + this.B_GiveDecor.Location = new System.Drawing.Point(162, 302); this.B_GiveDecor.Name = "B_GiveDecor"; this.B_GiveDecor.Size = new System.Drawing.Size(112, 23); this.B_GiveDecor.TabIndex = 19; @@ -1118,7 +1112,7 @@ private void InitializeComponent() // // MT_Flags // - this.MT_Flags.Location = new System.Drawing.Point(93, 304); + this.MT_Flags.Location = new System.Drawing.Point(111, 304); this.MT_Flags.Mask = "00000"; this.MT_Flags.Name = "MT_Flags"; this.MT_Flags.Size = new System.Drawing.Size(39, 20); @@ -1127,12 +1121,12 @@ private void InitializeComponent() // // L_FlagsCaptured // - this.L_FlagsCaptured.AutoSize = true; this.L_FlagsCaptured.Location = new System.Drawing.Point(9, 307); this.L_FlagsCaptured.Name = "L_FlagsCaptured"; - this.L_FlagsCaptured.Size = new System.Drawing.Size(84, 13); + this.L_FlagsCaptured.Size = new System.Drawing.Size(100, 13); this.L_FlagsCaptured.TabIndex = 22; this.L_FlagsCaptured.Text = "Flags Captured: "; + this.L_FlagsCaptured.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // B_FDelete // @@ -1175,7 +1169,6 @@ private void InitializeComponent() this.f_MAIN.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_FBaseLocation)).EndInit(); this.GB_Object.ResumeLayout(false); - this.GB_Object.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_FX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_FY)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_FRot)).EndInit();