From 18b081c1e3df49b5e6b4e16fa80c537df76660c8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 31 Aug 2016 08:54:56 -0700 Subject: [PATCH 01/75] Move gen1item string to resource Add gsc met locations --- PKHeX/MainWindow/Main.cs | 17 ++- PKHeX/PKHeX.csproj | 6 + PKHeX/PKM/PKX.cs | 7 -- PKHeX/Properties/Resources.Designer.cs | 111 ++++++++++++++++++ PKHeX/Properties/Resources.resx | 6 + PKHeX/Resources/text/gen3/text_ItemsG1_en.txt | Bin 0 -> 2530 bytes .../Resources/text/gen3/text_gsc_00000_en.txt | Bin 0 -> 2194 bytes PKHeX/Subforms/Save Editors/SAV_Inventory.cs | 2 +- 8 files changed, 136 insertions(+), 13 deletions(-) create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG1_en.txt create mode 100644 PKHeX/Resources/text/gen3/text_gsc_00000_en.txt diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index eaadc2bc3..09b2dcfc7 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -169,8 +169,8 @@ public Main() public static string[] gendersymbols = { "♂", "♀", "-" }; public static string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms, memories, genloc, trainingbags, trainingstage, characteristics, - encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items = { }; - public static string[] metRSEFRLG_00000 = { }; + encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items, g1items = { }; + public static string[] metGSC_00000, metRSEFRLG_00000 = { }; public static string[] metHGSS_00000, metHGSS_02000, metHGSS_03000 = { }; public static string[] metBW2_00000, metBW2_30000, metBW2_40000, metBW2_60000 = { }; public static string[] metXY_00000, metXY_30000, metXY_40000, metXY_60000 = { }; @@ -1046,7 +1046,9 @@ private void InitializeStrings() // Past Generation strings g3items = Util.getStringList("ItemsG3", "en"); + g1items = Util.getStringList("ItemsG1", "en"); metRSEFRLG_00000 = Util.getStringList("rsefrlg_00000", "en"); + metGSC_00000 = Util.getStringList("gsc_00000", "en"); // Current Generation strings string l = curlanguage; @@ -1211,9 +1213,9 @@ private void InitializeLanguage() #region Met Locations // Gen 2 { - var met_list = Util.getCBList(metRSEFRLG_00000, Enumerable.Range(0, 0x5F).ToArray()); - met_list = Util.getOffsetCBList(met_list, metRSEFRLG_00000, 00000, new[] { 253, 254, 255 }); - metGen2 = null; + var met_list = Util.getCBList(metGSC_00000, Enumerable.Range(0, 0x5F).ToArray()); + met_list = Util.getOffsetCBList(met_list, metGSC_00000, 00000, new[] { 0x7E, 0x7F }); + metGen2 = met_list; } // Gen 3 { @@ -2053,6 +2055,11 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm switch (Version) { + case GameVersion.GSC: + if (SaveFormat == 2) + return metGen2; + break; + case GameVersion.CXD: if (SaveFormat == 3) return metGen3; diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index 3e73dbbef..ca856033b 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -2740,6 +2740,12 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + 17, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAE + AAAAAAAAAAAAAAAAAAAAAAAAIyMjAQAAAAALCwsPJiYmJysrKycqKionKSkpJykpKScpKSknKioqJyoq + KicrKysnJycnJw0ODQ8AAAAAJiYmAQAAAABpaWlHq6ur17+/v+6+vr7svr6+7b6+vu2+vr7tvr6+7b6+ + vu2+vr7tvr6+7L+/v+6rq6vXampqSAAAAAAoKSgXvr++3eLi4v/g4OD94eHh/+Hh4f/i4uL/4uLi/+Li + 4v/i4uL/4eHh/+Dh4P/g4OD94uLi/7+/v90sLCwXfn5+PNna2frg4OD/39/f/uHh4f7h4eH+39/f/uDg + 4P7g4OD+39/f/uHh4f7h4OH+39/f/t/g3//a2tr6g4ODPoOCgz7X19f64+Pj/+Li4v7k5OT/4+Tj//Ly + 8v/19fX/9PT0//T09P/k5OT/5OTk/+Pj4/7j4+P/19jX+4qLikCDhIM+2tra++Xl5f/k5eT+5OTk//Lz + 8v+urq7/RUVF/z4+Pv+Zmpn/8fHx/+Xm5f/k5eT+5eXl/9ra2vyLi4tAhYWFPuXm5vvx8vP/7+/w/v// + //+sra3/AgIC/15eXv9tbG3/BQUF/4yMjP//////7+/w/vHy8//l5ub8jY2NQC4uLD5LS0f7UFBL/09P + Sv5YWVP/FBUS/29wcP///////////5SUlP8PDw//U1NO/1BQS/5PT0r/S0tH/DIyMEAAAAs+AAAM+wAA + Dv8AAA/+AwMS/wAAAP+UlJX///////////+3t7n/AAAA/wAAD/8BAQ/+AAAO/wAADPwCAg5ABARSPgoK + k/sNDab/DQ2o/hAQvP8CAmj/IiIW/7Kzrv/Cw8D/NDQm/wAATf8QELz/DQ2q/gwMp/8LC5T8Dg5bQAUF + Xj4KCpz7DQ2u/w0NsP4NDbX/Dw+//wUFYf8CAhL/AwMP/wMDTf8ODrj/Dg64/w0NsP4MDK7/Cwud/A8P + aEEGBmU9DAyl+w4Otf8ODrf+Dw+6/xAQvv8TE8v/EhK+/xAQvP8TE8v/EBDA/w8Puf8PD7f+Dg61/w0N + pvsREW9ACAhtQA8PsfsTE77/ExO//xQUwP8UFML/FBTD/xUVyP8WFsn/FRXE/xQUw/8UFMH/ExO//xMT + vv8QELL7ERF3QxkZdCgXF771ExPH/xUVyPwVFcn9FhbL/RcXzP0XF8z9FxfM/RcXy/0XF8v9FhbJ/RUV + yPwTE8f/Fxe+9RkZdykAAAAAIyOtghsbx/8ZGcj+GRnJ/xoayf8aGsn/GhrK/xoayv8aGsn/GhrJ/xkZ + yf8ZGcj+GxvH/yMjrYQAAAAAAADHAQAAAAAzM51FLCyscCoqrGwqKqxtKSmsbSoqrG0qKqxtKSmsbSoq + rG0qKqxsLCyscDMznUUAAAAAAAAAAP//AADAAwAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIAB + AACAAQAAgAEAAIABAACAAQAAgAEAAP//AAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKysrCR0dHSMWFhY3GBgYORgYGDkYGBg5GBgYORgY + GDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5FxcXNx4e + HiQuLi4JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASEhIARYWFis7OzuVkJCQ2ampqeqqqqrsqqqq7Kqq + quyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqq + quypqanqkZGR2j09PZcXFxcsUFBQAQAAAAAAAAAAAAAAAAAAAAASEhIuhISEytvb2/7W1tb/19fX/9jY + 2P/Y2Nj/2NjY/9jY2P/Y2Nj/2NjY/9nZ2f/Z2dn/2dnZ/9nZ2f/Z2dn/2dnZ/9nZ2f/Y2Nj/2NjY/9jY + 2P/Y2Nj/2NjY/9fX1//W1tb/29vb/oeHh8sTExMvAAAAAAAAAAAAAAAAPDw8DGtra6zZ2dn/2dnZ/9ra + 2v/b29v/29vb/9vb2//c3Nz/3Nzc/9zc3P/c3Nz/3d3d/93d3f/d3d3/3d3d/93d3f/d3d3/3Nzc/9zc + 3P/c3Nz/3Nzc/9vb2//b29v/29vb/9ra2v/Z2dn/2dnZ/21tba5DQ0MNAAAAAAAAAAAiIiIx1NXU9tna + 2f/c3Nz/3d3d/93e3f/e3t7/3t7e/9/f3//f39//39/f/9/g3//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg + 4P/g4OD/39/f/9/f3//f39//3t/e/97e3v/d3t3/3d3d/9zc3P/Z2tn/1dXV9icnJzMAAAAAAAAAAFhZ + WFzf4N//3Nzc/97e3v/f39//39/f/9/g3//g4OD/4ODg/+Hh4f/h4eH/4eHh/+Li4v/i4uL/4uLi/+Li + 4v/i4uL/4uLi/+Hi4f/h4eH/4eHh/+Dg4P/g4OD/3+Df/9/f3//f39//3t7e/9zc3P/f39//XV1dXQAA + AAAAAAAAZmZmZdvc2//e3t7/3+Df/+Dg4P/g4eD/4eHh/+Hi4f/i4uL/4uPi/+Pj4//j4+P/5OTk/+Tk + 5P/k5OT/5OTk/+Tk5P/k5OT/4+Pj/+Pj4//j4+P/4uLi/+Li4v/h4eH/4eHh/+Dg4P/f4N//3t7e/9vb + 2/9wcHBoAAAAAAAAAABoaGhl3d3d/9/f3//h4eH/4eLh/+Li4v/j4+P/4+Pj/+Tk5P/k5OT/5eXl/+Xl + 5f/l5uX/5ubm/+bm5v/m5ub/5ubm/+bm5v/l5eX/5eXl/+Tk5P/k5OT/4+Pj/+Pj4//i4uL/4uLi/+Hh + 4f/f39//3N3c/3Nzc2kAAAAAAAAAAGhoaGXe3t7/4ODg/+Li4v/j4+P/4+Pj/+Tk5P/l5eX/5eXl/+bm + 5v/m5+b/5+fn/+fn5//n6Of/6Ojo/+jo6P/o6Oj/5+fn/+fn5//n5+f/5ubm/+Xl5f/l5eX/5OTk/+Pk + 4//j4+P/4uLi/+Dg4P/e3t7/c3NzaQAAAAAAAAAAaGhoZd/g3//i4uL/5OTk/+Tl5P/l5eX/5ebl/+bn + 5v/n5+f/5+jn/+jp6P/p6en/7Ozs/8LCwv+Tk5P/ioqK/66urv/o6ej/6enp/+jp6P/o6Oj/5+jn/+bn + 5v/m5ub/5ebl/+Tl5P/k5OT/4uLi/9/g3/9zdHNpAAAAAAAAAABoaWhl4eLh/+Pk4//m5ub/5ubm/+fn + 5//n6Of/6Ojo/+np6f/p6un/6urq/8bGxv8yMjL/AAAA/wAAAP8AAAD/AAAA/xMTE/+ZmZn/7Ozs/+rq + 6v/p6en/6Ojo/+jo6P/n5+f/5ubm/+bm5v/k5OT/4eHh/3R0dGkAAAAAAAAAAGhpaGXj4+P/5eXl/+fn + 5//n6Of/6Ojo/+np6f/q6ur/6urq/+vr6//Dw8P/DAwM/wAAAP8AAAD/Gxsb/ygoKP8BAQH/AAAA/wAA + AP+FhYX/7O3s/+rr6v/q6ur/6enp/+jo6P/o6Oj/5+fn/+Xl5f/i4+L/dHR0aQAAAAAAAAAAYWFhZeTl + 5P/m5+b/6Ono/+np6f/p6un/6uvq/+vr6//s7Oz/7e7t/ycnJ/8AAAD/Ghoa/7S0tP/m5ub/5OTk/9HR + 0f9GRkb/AAAA/wICAv/IyMj/7Ozs/+vs6//q6+r/6urq/+nq6f/o6ej/5+fn/+Tk5P9sbGxpAAAAAAAA + AAA9Pj1lj4+P/5OTk/+VlZX/lpaW/5eXl/+YmJj/mZmZ/5qamv92dnb/AAAA/wEBAf+/wL//3Nzc/+Tk + 5P/l5eX/3d3d/+Li4v8mJib/AAAA/0ZGRv+ampr/mZmZ/5iYmP+Xl5f/lpaW/5WVlf+Tk5P/j4+P/0ZG + RmoAAAAAAAAAAAwMDGUAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/Nzc3/+fn + 5//q6ur/7O3s/+zt7P/v7+//39/f/4WFhf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/EBAQagAAAAAAAAAAAwMHZQAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP9NTU3/5ufm//Lz8v/z9PP/8/Tz//X19f/l5eX/nZ2d/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8GBgpqAAAAAAAAAAAAABZlAQEk/wEBJ/8CAin/AgIq/wICKv8CAiv/AgIs/wIC + LP8BAR3/AAAA/xwcHP/w8PD/6+zr//r6+v/6+vr/9PT0/+vr6/9lZWX/AAAA/wAAD/8CAi3/AgIs/wIC + K/8CAir/AgIq/wICKf8BASf/AQEl/wUFG2oAAAAAAAAAAAICQGUGBpL/Bwec/wgIo/8JCaf/CQmq/wkJ + rf8JCa//Cgqz/wkJqP8AAAL/AAAA/4CAgP/y8/L/6+zr/+3t7f/u7u7/xMTE/wcHB/8AAAD/BgZz/woK + s/8JCbD/CQmt/wkJqv8JCaj/CAik/wcHnf8HB5P/Dg5MagAAAAAAAAAAAwNHZQgIk/8JCZ3/Cgqj/wsL + p/8LC6n/Cwus/wsLr/8MDLL/DAy2/wYGW/8AAAD/AAAA/1JSUv+sraz/tra2/3h4eP8KCgr/AAAA/wIC + Iv8MDLb/DAyy/wsLsP8LC63/Cwuq/wsLp/8KCqT/CQmd/wgIk/8PD1VrAAAAAAAAAAAEBE1lCQmY/woK + ov8LC6j/DAyr/wwMrf8MDLD/DAyy/w0Ntf8NDbf/Dg67/wUFSv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8CAiH/DQ2q/w0NuP8NDbX/DQ2z/wwMsP8MDK7/DAyr/wsLqP8KCqL/CQmZ/xAQWmsAAAAAAAAAAAQE + UGUKCp7/Cwum/wwMrP8NDa//DQ2w/w0Ns/8ODrX/Dg63/w4Ouf8ODrv/Dw/A/wwMiv8FBTj/AAAG/wAA + AP8DAyb/CQls/w8Pu/8PD7z/Dg66/w4OuP8ODrX/DQ2z/w0Nsf8NDa//DAys/wsLp/8KCp7/ERFeawAA + AAAAAAAABQVTZQsLpP8MDKv/DQ2w/w4Os/8ODrT/Dg62/w8PuP8PD7r/Dw+8/w8Pvf8QEL//EBDA/xER + w/8SEsn/ERHJ/xERxf8QEMD/EBC//w8Pvv8PD7z/Dw+6/w8PuP8ODrf/Dg61/w4Os/8NDbH/DAyr/wsL + pP8SEmFrAAAAAAAAAAAGBlZlDAyq/w4OsP8PD7X/Dw+3/w8PuP8QELr/EBC7/xAQvf8REb7/ERHA/xER + wf8REcL/EhLC/xISw/8SEsP/EhLC/xERwv8REcH/ERHA/xERvv8QEL3/EBC7/xAQuv8QELj/Dw+3/w8P + tf8ODrD/DAyq/xMTZWsAAAAAAAAAAAcHWmUODrD/EBC2/xERuv8REbz/ERG9/xISvv8SEr//EhLA/xMT + wf8TE8P/ExPD/xMTxP8TE8X/FBTF/xQUxf8UFMX/ExPE/xMTxP8TE8P/ExPC/xISwf8SEr//EhK+/xER + vf8REbz/ERG6/xAQtv8ODrD/FBRpawAAAAAAAAAACAhcYxAQtf8SErv/ExO+/xQUwP8UFMD/FBTB/xUV + wv8VFcP/FRXE/xUVxf8WFsb/FhbG/xYWx/8WFsf/FhbH/xYWx/8WFsf/FhbG/xYWxf8VFcT/FRXD/xUV + wv8UFMH/FBTB/xQUwP8TE77/EhK7/xAQtf8TE2hoAAAAAAAAAAAQEFNUFRXC/xMTv/8UFMP/FRXE/xUV + xP8VFcX/FRXG/xYWx/8WFsf/FhbI/xYWyf8XF8n/FxfK/xcXyv8XF8r/FxfK/xcXyf8XF8n/FhbI/xYW + yP8WFsf/FhbG/xUVxf8VFcT/FRXE/xQUw/8TE7//FRXB/xAQV1UAAAAAAAAAAA0NPxkjI8byFBTD/xUV + x/8WFsj/FxfJ/xcXyf8XF8r/FxfK/xcXy/8YGMz/GBjM/xgYzP8YGM3/GBjN/xgYzf8YGM3/GBjM/xgY + zP8YGMz/GBjL/xcXy/8XF8r/FxfJ/xcXyf8WFsj/FRXH/xQUw/8jI8f0Dg5GGwAAAAAAAAAAFhZxAiUl + eIUZGcr/FBTI/xUVyv8WFsv/FhbM/xYWzP8WFsz/FhbN/xcXzf8XF83/FxfN/xcXzv8XF87/FxfO/xcX + zv8XF87/FxfN/xcXzf8WFs3/FhbM/xYWzP8WFsz/FhbL/xUVyv8UFMj/GBjJ/yYmeogWFnYCAAAAAAAA + AAAAAAAAGBh1BzMzk50kJNP+FxfK/xgYzP8YGMz/GBjN/xgYzf8YGM3/GBjN/xgYzf8ZGc7/GRnO/xkZ + zv8ZGc7/GRnO/xkZzv8YGM3/GBjN/xgYzf8YGM3/GBjN/xgYzP8YGMz/FxfK/yMj0v4zM5WfFBRkBwAA + AAAAAAAAAAAAAAAAAAAAAAAAHBx7Ay0tdkg3N5emMTGpxSwsp8gsLKfILCynyCwsp8gsLKfILCynyCws + p8gsLKfILCynyCwsp8gsLKfILCynyCwsp8gsLKfILCynyCwsp8gsLKfILCynyDExqcU2NpenLi54Shsb + ewMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////8AAAD+AAAAfAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAAD4AAAB/gAAB////// + + + \ No newline at end of file diff --git a/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs index 2c72ad174..a71e02fda 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs +++ b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs @@ -468,7 +468,7 @@ private void pbBoxSlot_DragEnter(object sender, DragEventArgs e) } private int wc_slot = -1; - private static Image getSprite(MysteryGift gift) + internal static Image getSprite(MysteryGift gift) { Image img; if (gift.IsPokémon) @@ -487,7 +487,7 @@ private static string getDescription(MysteryGift gift) if (gift.Empty) return "Empty Slot. No data!"; - string s = gift.getCardHeader(); + string s = gift.getCardHeader() + Environment.NewLine; if (gift.IsItem) { s += "Item: " + Main.itemlist[gift.Item] + Environment.NewLine + "Quantity: " + gift.Quantity; From 5fe650f5a9c31772b86bc36063b8d17108e80ec6 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 10:42:56 -0700 Subject: [PATCH 21/75] Fix too-many-slots gen1/2 Closes #216 --- PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs b/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs index e66675e51..488544ff1 100644 --- a/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs @@ -42,6 +42,9 @@ public SAV_BoxViewer(Main p) pb.DragEnter += pbBoxSlot_DragEnter; pb.QueryContinueDrag += pbBoxSlot_QueryContinueDrag; } + for (int i = SAV.BoxSlotCount; i < SlotPictureBoxes.Length; i++) + SlotPictureBoxes[i].Visible = false; + try { CB_BoxSelect.Items.Clear(); @@ -87,7 +90,7 @@ private void setPKXBoxes() int boxbgval = SAV.getBoxWallpaper(CB_BoxSelect.SelectedIndex); PAN_Box.BackgroundImage = BoxWallpaper.getWallpaper(SAV, boxbgval); - for (int i = 0; i < SlotPictureBoxes.Length; i++) + for (int i = 0; i < SAV.BoxSlotCount; i++) getSlotFiller(boxoffset + SAV.SIZE_STORED*i, SlotPictureBoxes[i]); } private void getSlotFiller(int offset, PictureBox pb) From 80938b698381b88927b450a2299ab47195fdc6d3 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 11:02:27 -0700 Subject: [PATCH 22/75] Remove unused options Carryover from SAV_Database Fix impossible null ref in both, won't ever happen in current state --- PKHeX/Subforms/SAV_Database.cs | 3 ++ PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs | 48 -------------------- PKHeX/Subforms/SAV_MysteryGiftDB.cs | 8 ++-- 3 files changed, 7 insertions(+), 52 deletions(-) diff --git a/PKHeX/Subforms/SAV_Database.cs b/PKHeX/Subforms/SAV_Database.cs index abcc6bef1..7aff6ad48 100644 --- a/PKHeX/Subforms/SAV_Database.cs +++ b/PKHeX/Subforms/SAV_Database.cs @@ -525,8 +525,11 @@ private void setResults(List res) private void FillPKXBoxes(int start) { if (Results == null) + { for (int i = 0; i < RES_MAX; i++) PKXBOXES[i].Image = null; + return; + } PKM[] data = Results.Skip(start * RES_MIN).Take(RES_MAX).ToArray(); for (int i = 0; i < data.Length; i++) PKXBOXES[i].Image = data[i].Sprite; diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs index 3ba24a5a3..60a77c585 100644 --- a/PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs @@ -95,10 +95,6 @@ private void InitializeComponent() this.Menu_Exit = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Tools = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_SearchSettings = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_SearchBoxes = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_SearchDatabase = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_SearchLegal = new System.Windows.Forms.ToolStripMenuItem(); - this.Menu_SearchIllegal = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_SearchAdvanced = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_OpenDB = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Export = new System.Windows.Forms.ToolStripMenuItem(); @@ -924,52 +920,12 @@ private void InitializeComponent() // Menu_SearchSettings // this.Menu_SearchSettings.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.Menu_SearchBoxes, - this.Menu_SearchDatabase, - this.Menu_SearchLegal, - this.Menu_SearchIllegal, this.Menu_SearchAdvanced}); this.Menu_SearchSettings.Image = global::PKHeX.Properties.Resources.settings; this.Menu_SearchSettings.Name = "Menu_SearchSettings"; this.Menu_SearchSettings.Size = new System.Drawing.Size(197, 22); this.Menu_SearchSettings.Text = "Search Settings"; // - // Menu_SearchBoxes - // - this.Menu_SearchBoxes.Checked = true; - this.Menu_SearchBoxes.CheckOnClick = true; - this.Menu_SearchBoxes.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_SearchBoxes.Name = "Menu_SearchBoxes"; - this.Menu_SearchBoxes.Size = new System.Drawing.Size(207, 22); - this.Menu_SearchBoxes.Text = "Search Within Boxes"; - // - // Menu_SearchDatabase - // - this.Menu_SearchDatabase.Checked = true; - this.Menu_SearchDatabase.CheckOnClick = true; - this.Menu_SearchDatabase.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_SearchDatabase.Name = "Menu_SearchDatabase"; - this.Menu_SearchDatabase.Size = new System.Drawing.Size(207, 22); - this.Menu_SearchDatabase.Text = "Search Within Database"; - // - // Menu_SearchLegal - // - this.Menu_SearchLegal.Checked = true; - this.Menu_SearchLegal.CheckOnClick = true; - this.Menu_SearchLegal.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_SearchLegal.Name = "Menu_SearchLegal"; - this.Menu_SearchLegal.Size = new System.Drawing.Size(207, 22); - this.Menu_SearchLegal.Text = "Show Legal"; - // - // Menu_SearchIllegal - // - this.Menu_SearchIllegal.Checked = true; - this.Menu_SearchIllegal.CheckOnClick = true; - this.Menu_SearchIllegal.CheckState = System.Windows.Forms.CheckState.Checked; - this.Menu_SearchIllegal.Name = "Menu_SearchIllegal"; - this.Menu_SearchIllegal.Size = new System.Drawing.Size(207, 22); - this.Menu_SearchIllegal.Text = "Show Illegal"; - // // Menu_SearchAdvanced // this.Menu_SearchAdvanced.CheckOnClick = true; @@ -1697,10 +1653,6 @@ private void InitializeComponent() private System.Windows.Forms.Label L_Viewed; private System.Windows.Forms.ToolStripMenuItem Menu_Export; private System.Windows.Forms.ToolStripMenuItem Menu_SearchSettings; - private System.Windows.Forms.ToolStripMenuItem Menu_SearchBoxes; - private System.Windows.Forms.ToolStripMenuItem Menu_SearchDatabase; - private System.Windows.Forms.ToolStripMenuItem Menu_SearchLegal; - private System.Windows.Forms.ToolStripMenuItem Menu_SearchIllegal; private System.Windows.Forms.TableLayoutPanel TLP_Filters; public System.Windows.Forms.CheckBox CHK_Shiny; public System.Windows.Forms.CheckBox CHK_IsEgg; diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.cs index f6a4819af..9d21c3860 100644 --- a/PKHeX/Subforms/SAV_MysteryGiftDB.cs +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.cs @@ -271,10 +271,7 @@ private void B_Search_Click(object sender, EventArgs e) var results = res.ToArray(); if (results.Length == 0) { - if (!Menu_SearchBoxes.Checked && !Menu_SearchDatabase.Checked) - Util.Alert("No data source to search!", "No results found!"); - else - Util.Alert("No results found!"); + Util.Alert("No results found!"); } setResults(new List(results)); // updates Count Label as well. System.Media.SystemSounds.Asterisk.Play(); @@ -299,8 +296,11 @@ private void setResults(List res) private void FillPKXBoxes(int start) { if (Results == null) + { for (int i = 0; i < RES_MAX; i++) PKXBOXES[i].Image = null; + return; + } var data = Results.Skip(start * RES_MIN).Take(RES_MAX).ToArray(); for (int i = 0; i < data.Length; i++) PKXBOXES[i].Image = SAV_Wondercard.getSprite(data[i]); From 387ed9cbccd38adca2f276507448cfe6c43c29b2 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 14:00:52 -0700 Subject: [PATCH 23/75] Refactoring Gen1/2 arrays to legality tables Add PP tables for gen1/2 too --- PKHeX/Legality/Tables1.cs | 28 ++++++++++++++++++++++++++++ PKHeX/Legality/Tables2.cs | 35 +++++++++++++++++++++++++++++++++++ PKHeX/PKHeX.csproj | 2 ++ PKHeX/PKM/PKM.cs | 2 ++ PKHeX/PKM/PKX.cs | 12 ------------ PKHeX/Saves/SAV1.cs | 2 +- PKHeX/Saves/SAV2.cs | 15 +++++---------- 7 files changed, 73 insertions(+), 23 deletions(-) create mode 100644 PKHeX/Legality/Tables1.cs create mode 100644 PKHeX/Legality/Tables2.cs diff --git a/PKHeX/Legality/Tables1.cs b/PKHeX/Legality/Tables1.cs new file mode 100644 index 000000000..fb27c2f0b --- /dev/null +++ b/PKHeX/Legality/Tables1.cs @@ -0,0 +1,28 @@ +using System.Linq; + +namespace PKHeX +{ + public static partial class Legal + { + // PKHeX Valid Array Storage + internal static readonly ushort[] Pouch_Items_RBY = Enumerable.Range(0, 7) // 0-6 + .Concat(Enumerable.Range(10, 11)) // 10-20 + .Concat(Enumerable.Range(29, 15)) // 29-43 + .Concat(Enumerable.Range(45, 5)) // 45-49 + .Concat(Enumerable.Range(51, 8)) // 51-58 + .Concat(Enumerable.Range(60, 24)) // 60-83 + .Concat(Enumerable.Range(196, 54)) // 196-249 + .Select(i => (ushort)i).ToArray(); + + internal static readonly int[] MovePP_RBY = + { + 0, + 35, 25, 10, 15, 20, 20, 15, 15, 15, 35, 30, 05, 10, 30, 30, 35, 35, 20, 15, 20, 20, 10, 20, 30, 05, 25, 15, 15, 15, 25, 20, 05, 35, 15, 20, 20, 20, 15, 30, 35, 20, 20, 30, 25, 40, 20, 15, 20, 20, 20, + 30, 25, 15, 30, 25, 05, 15, 10, 05, 20, 20, 20, 05, 35, 20, 25, 20, 20, 20, 15, 20, 10, 10, 40, 25, 10, 35, 30, 15, 20, 40, 10, 15, 30, 15, 20, 10, 15, 10, 05, 10, 10, 25, 10, 20, 40, 30, 30, 20, 20, + 15, 10, 40, 15, 20, 30, 20, 20, 10, 40, 40, 30, 30, 30, 20, 30, 10, 10, 20, 05, 10, 30, 20, 20, 20, 05, 15, 10, 20, 15, 15, 35, 20, 15, 10, 20, 30, 15, 40, 20, 15, 10, 05, 10, 30, 10, 15, 20, 15, 40, + 40, 10, 05, 15, 10, 10, 10, 15, 30, 30, 10, 10, 20, 10, 10, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00 + }; + } +} diff --git a/PKHeX/Legality/Tables2.cs b/PKHeX/Legality/Tables2.cs new file mode 100644 index 000000000..c7f0be57d --- /dev/null +++ b/PKHeX/Legality/Tables2.cs @@ -0,0 +1,35 @@ +using System.Linq; + +namespace PKHeX +{ + public static partial class Legal + { + // PKHeX Valid Array Storage + internal static readonly ushort[] Pouch_Items_GSC = { + 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189 + }; + internal static readonly ushort[] Pouch_Ball_GSC = { + 1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166, 167 + }; + internal static readonly ushort[] Pouch_Key_GS = { + 7, 54, 55, 58, 59, 61, 66, 67, 68 , 69, 71, 127, 128, 130, 133, 134, 175, 178 + }; + internal static readonly ushort[] Pouch_Key_C = Pouch_Key_GS.Concat(new ushort[]{70, 115, 116, 129}).ToArray(); + internal static readonly ushort[] Pouch_TMHM_GSC = { + 191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249 + }; + + internal static readonly ushort[] HeldItems_GSC = new ushort[1].Concat(Pouch_Items_GSC).Concat(Pouch_Ball_GSC).ToArray(); + + internal static readonly int[] MovePP_GSC = + { + 00, + 35, 25, 10, 15, 20, 20, 15, 15, 15, 35, 30, 05, 10, 30, 30, 35, 35, 20, 15, 20, 20, 10, 20, 30, 05, 25, 15, 15, 15, 25, 20, 05, 35, 15, 20, 20, 20, 15, 30, 35, 20, 20, 30, 25, 40, 20, 15, 20, 20, 20, + 30, 25, 15, 30, 25, 05, 15, 10, 05, 20, 20, 20, 05, 35, 20, 25, 20, 20, 20, 15, 20, 10, 10, 40, 25, 10, 35, 30, 15, 20, 40, 10, 15, 30, 15, 20, 10, 15, 10, 05, 10, 10, 25, 10, 20, 40, 30, 30, 20, 20, + 15, 10, 40, 15, 20, 30, 20, 20, 10, 40, 40, 30, 30, 30, 20, 30, 10, 10, 20, 05, 10, 30, 20, 20, 20, 05, 15, 10, 20, 15, 15, 35, 20, 15, 10, 20, 30, 15, 40, 20, 15, 10, 05, 10, 30, 10, 15, 20, 15, 40, + 40, 10, 05, 15, 10, 10, 10, 15, 30, 30, 10, 10, 20, 10, 01, 01, 10, 10, 10, 05, 15, 25, 15, 10, 15, 30, 05, 40, 15, 10, 25, 10, 30, 10, 20, 10, 10, 10, 10, 10, 20, 05, 40, 05, 05, 15, 05, 10, 05, 15, + 10, 05, 10, 20, 20, 40, 15, 10, 20, 20, 25, 05, 15, 10, 05, 20, 15, 20, 25, 20, 05, 30, 05, 10, 20, 40, 05, 20, 40, 20, 15, 35, 10, 05, 05, 05, 15, 05, 20, 05, 05, 15, 20, 10, 05, 05, 15, 15, 15, 15, + 10, 00, 00, 00, 00 + }; + } +} diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index a5eaa88f4..ab34b112a 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -70,6 +70,8 @@ + + diff --git a/PKHeX/PKM/PKM.cs b/PKHeX/PKM/PKM.cs index 0bbb0f351..bb2293dbd 100644 --- a/PKHeX/PKM/PKM.cs +++ b/PKHeX/PKM/PKM.cs @@ -447,6 +447,8 @@ private int getBasePP(int move) int[] pptable; switch (Format) { + case 1: pptable = Legal.MovePP_RBY; break; + case 2: pptable = Legal.MovePP_GSC; break; case 3: pptable = Legal.MovePP_RS; break; case 4: pptable = Legal.MovePP_DP; break; case 5: pptable = Legal.MovePP_BW; break; diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 3f5b51498..c85c9531a 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -2148,18 +2148,6 @@ public static ushort getG4Item(ushort g3val) }; #endregion - public static int[] getG1LegalItems() - { - return Enumerable.Range(0, 7) // 0-6 - .Concat(Enumerable.Range(10, 11)) // 10-20 - .Concat(Enumerable.Range(29, 15)) // 29-43 - .Concat(Enumerable.Range(45, 5)) // 45-49 - .Concat(Enumerable.Range(51, 8)) // 51-58 - .Concat(Enumerable.Range(60, 24)) // 60-83 - .Concat(Enumerable.Range(196, 54)) // 196-249 - .ToArray(); - } - public static int getG1Species(int raw_id) { int[] table = { 0x00, 0x70, 0x73, 0x20, 0x23, 0x15, 0x64, 0x22, 0x50, 0x02, 0x67, 0x6C, 0x66, 0x58, 0x5E, 0x1D, 0x1F, 0x68, 0x6F, 0x83, 0x3B, 0x97, 0x82, 0x5A, 0x48, 0x5C, 0x7B, 0x78, 0x09, 0x7F, 0x72, 0x00, 0x00, 0x3A, 0x5F, 0x16, 0x10, 0x4F, 0x40, 0x4B, 0x71, 0x43, 0x7A, 0x6A, 0x6B, 0x18, 0x2F, 0x36, 0x60, 0x4C, 0x00, 0x7E, 0x00, 0x7D, 0x52, 0x6D, 0x00, 0x38, 0x56, 0x32, 0x80, 0x00, 0x00, 0x00, 0x53, 0x30, 0x95, 0x00, 0x00, 0x00, 0x54, 0x3C, 0x7C, 0x92, 0x90, 0x91, 0x84, 0x34, 0x62, 0x00, 0x00, 0x00, 0x25, 0x26, 0x19, 0x1A, 0x00, 0x00, 0x93, 0x94, 0x8C, 0x8D, 0x74, 0x75, 0x00, 0x00, 0x1B, 0x1C, 0x8A, 0x8B, 0x27, 0x28, 0x85, 0x88, 0x87, 0x86, 0x42, 0x29, 0x17, 0x2E, 0x3D, 0x3E, 0x0D, 0x0E, 0x0F, 0x00, 0x55, 0x39, 0x33, 0x31, 0x57, 0x00, 0x00, 0x0A, 0x0B, 0x0C, 0x44, 0x00, 0x37, 0x61, 0x2A, 0x96, 0x8F, 0x81, 0x00, 0x00, 0x59, 0x00, 0x63, 0x5B, 0x00, 0x65, 0x24, 0x6E, 0x35, 0x69, 0x00, 0x5D, 0x3F, 0x41, 0x11, 0x12, 0x79, 0x01, 0x03, 0x49, 0x00, 0x76, 0x77, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x4E, 0x13, 0x14, 0x21, 0x1E, 0x4A, 0x89, 0x8E, 0x00, 0x51, 0x00, 0x00, 0x04, 0x07, 0x05, 0x08, 0x06, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x2C, 0x2D, 0x45, 0x46, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index 03e99cac3..1bd0ff55c 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -327,7 +327,7 @@ public uint Coin } } - private readonly ushort[] LegalItems = PKX.getG1LegalItems().Select(i => (ushort)i).ToArray(); + private readonly ushort[] LegalItems = Legal.Pouch_Items_RBY; public override InventoryPouch[] Inventory { get diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs index 2af40cf19..615aa26aa 100644 --- a/PKHeX/Saves/SAV2.cs +++ b/PKHeX/Saves/SAV2.cs @@ -31,16 +31,11 @@ public SAV2(byte[] data = null) getSAVOffsets(); - LegalItems = new ushort[] { 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189 }; - LegalBalls = new ushort[] { 1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166, 167}; - LegalKeyItems = new ushort[] {7, 54, 55, 58, 59, 61, 66, 67, 68 , 69, 71, 127, 128, 130, 133, 134, 175, 178}; - if (Version == GameVersion.C) - { - LegalKeyItems = LegalKeyItems.Concat(new ushort[] {70, 115, 116, 129}).ToArray(); - } - LegalTMHMs = new ushort[] {191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249}; - HeldItems = new ushort[] {0}.Concat(LegalItems).Concat(LegalBalls).ToArray(); - Array.Sort(HeldItems); + LegalItems = Legal.Pouch_Items_GSC; + LegalBalls = Legal.Pouch_Ball_GSC; + LegalKeyItems = Version == GameVersion.C ? Legal.Pouch_Key_C : Legal.Pouch_Key_GS; + LegalTMHMs = Legal.Pouch_TMHM_GSC; + HeldItems = Legal.HeldItems_GSC; // Stash boxes after the save file's end. byte[] TempBox = new byte[SIZE_STOREDBOX]; From 1bb5388b4b556967a45e5f6701534cf6b7b0af84 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 4 Sep 2016 15:03:40 -0700 Subject: [PATCH 24/75] PK1 <-> PK2 Conversion --- PKHeX/Legality/Tables2.cs | 2 +- PKHeX/PKM/PK1.cs | 44 +++++++++++++++++++++++++++++++++++++-- PKHeX/PKM/PK2.cs | 14 +++++++++++++ PKHeX/PKM/PKMConverter.cs | 33 +++++++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/PKHeX/Legality/Tables2.cs b/PKHeX/Legality/Tables2.cs index c7f0be57d..0b33cccea 100644 --- a/PKHeX/Legality/Tables2.cs +++ b/PKHeX/Legality/Tables2.cs @@ -19,7 +19,7 @@ public static partial class Legal 191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249 }; - internal static readonly ushort[] HeldItems_GSC = new ushort[1].Concat(Pouch_Items_GSC).Concat(Pouch_Ball_GSC).ToArray(); + internal static readonly ushort[] HeldItems_GSC = new ushort[1].Concat(Pouch_Items_GSC).Concat(Pouch_Ball_GSC).Concat(Pouch_TMHM_GSC).ToArray(); internal static readonly int[] MovePP_GSC = { diff --git a/PKHeX/PKM/PK1.cs b/PKHeX/PKM/PK1.cs index 7226a23ad..addf1c119 100644 --- a/PKHeX/PKM/PK1.cs +++ b/PKHeX/PKM/PK1.cs @@ -120,8 +120,8 @@ public override int Species get { return PKX.getG1Species(Data[0]); } set { - // Before updating catch rate, check if Special Yellow Version Pikachu - if (!(PKX.getG1Species(Data[0]) == 25 && value == 25 && Catch_Rate == 163)) + // Before updating catch rate, check if non-standard + if (Catch_Rate == PersonalTable.RBY[Species].CatchRate) Catch_Rate = PersonalTable.RBY[value].CatchRate; Data[0] = (byte)PKX.setG1Species(value); Type_A = PersonalTable.RBY[value].Types[0]; @@ -250,6 +250,46 @@ public override bool CanHoldItem(ushort[] ValidArray) public override int CNT_Tough { get { return 0; } set { } } public override int CNT_Sheen { get { return 0; } set { } } #endregion + + public PK2 convertToPK2() + { + PK2 pk2 = new PK2(null, Identifier, Japanese); + pk2.Species = Species; + Array.Copy(Data, 0x7, pk2.Data, 0x1, 0x1A); + // https://github.com/pret/pokecrystal/blob/master/engine/link.asm#L1132 + if (!Legal.HeldItems_GSC.Contains((ushort)pk2.HeldItem)) + switch (pk2.HeldItem) + { + case 0x19: + pk2.HeldItem = 0x92; // Leftovers + break; + case 0x2D: + pk2.HeldItem = 0x53; // Bitter Berry + break; + case 0x32: + pk2.HeldItem = 0xAE; // Leftovers + break; + case 0x5A: + case 0x64: + case 0x78: + case 0x87: + case 0xBE: + case 0xC3: + case 0xDC: + case 0xFA: + case 0xFF: + pk2.HeldItem = 0xAD; // Berry + break; + } + pk2.CurrentFriendship = PersonalTable.C[Species].BaseFriendship; + // Pokerus = 0 + // Caught Data = 0 + pk2.Stat_Level = Stat_Level; + Array.Copy(otname, 0, pk2.otname, 0, otname.Length); + Array.Copy(nick, 0, pk2.nick, 0, nick.Length); + + return pk2; + } } public class PokemonList1 diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index 21fbfe3b5..fcd06f5dd 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -325,6 +325,20 @@ public override int HPType public override int CNT_Tough { get { return 0; } set { } } public override int CNT_Sheen { get { return 0; } set { } } #endregion + + public PK1 convertToPK1() + { + PK1 pk1 = new PK1(null, Identifier, Japanese); + Array.Copy(Data, 0x1, pk1.Data, 0x7, 0x1A); + pk1.Species = Species; // This will take care of Typing :) + pk1.Stat_HPCurrent = Stat_HPCurrent; + pk1.Stat_Level = Stat_Level; + // Status = 0 + Array.Copy(otname, 0, pk1.otname, 0, otname.Length); + Array.Copy(nick, 0, pk1.nick, 0, nick.Length); + + return pk1; + } } public class PokemonList2 diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 27a62531c..55fd04f4d 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -100,6 +100,9 @@ public static PKM getPKMfromBytes(byte[] data, string ident = null) } internal static PKM convertToFormat(PKM pk, int Format, out string comment) { + string currentFormat = pk.Format.ToString(); + PKM pkm = pk.Clone(); + if (pk == null) { comment = "Null input. Aborting."; @@ -110,6 +113,34 @@ internal static PKM convertToFormat(PKM pk, int Format, out string comment) comment = "No need to convert, current format matches requested format."; return pk; } + if (pk.Format != Format && pk.Format <= 2 && Format <= 2) + { + if (Format == 2) // pk.Format == 1 + { + pkm = ((PK1) pk).convertToPK2(); + } + if (Format == 1) // pk.Format == 2 + { + // Only convert if it's legal to do so. + if (1 <= pk.Species && pk.Species <= 151) + { + foreach (var move in new[] { pk.Move1, pk.Move2, pk.Move3, pk.Move4}) + if (move < 1 || move > 165) + { + comment = $"Pokemon cannot be converted due to invalid move: {Main.movelist[move]}"; + return null; + } + pkm = ((PK2) pk).convertToPK1(); + } + else + { + comment =$"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; + return null; + } + } + comment = $"Converted from pk{pk.Format} to pk{Format}"; + return pkm; + } if (pk.Format > Format) { comment = "Cannot convert a PKM backwards." + Environment.NewLine @@ -128,8 +159,6 @@ internal static PKM convertToFormat(PKM pk, int Format, out string comment) + "Please wait for Sun/Moon to release and documentation to occur."; return null; } - string currentFormat = pk.Format.ToString(); - PKM pkm = pk.Clone(); if (pkm.IsEgg) // force hatch { pkm.IsEgg = false; From 45df87f8cc1c94a6fc4bf97b865c3e1129d1d419 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 4 Sep 2016 15:21:46 -0700 Subject: [PATCH 25/75] PK2 -> PK1 Conversion fix --- PKHeX/PKM/PKMConverter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 55fd04f4d..7ea43e1f1 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -125,7 +125,7 @@ internal static PKM convertToFormat(PKM pk, int Format, out string comment) if (1 <= pk.Species && pk.Species <= 151) { foreach (var move in new[] { pk.Move1, pk.Move2, pk.Move3, pk.Move4}) - if (move < 1 || move > 165) + if (move < 0 || move > 165) { comment = $"Pokemon cannot be converted due to invalid move: {Main.movelist[move]}"; return null; From ce1202ead8fa4c07952f265684c0f8de7aba33e0 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:29:55 -0700 Subject: [PATCH 26/75] Tweak 1<->2 conversion Delete gen2 only moves on 2->1 instead of refusing to convert; fix moves afterwards. Simplify PKMConverter checks --- PKHeX/PKM/PK2.cs | 7 +++++++ PKHeX/PKM/PKMConverter.cs | 41 ++++++++++++++------------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index fcd06f5dd..a6319b95c 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -337,6 +337,13 @@ public PK1 convertToPK1() Array.Copy(otname, 0, pk1.otname, 0, otname.Length); Array.Copy(nick, 0, pk1.nick, 0, nick.Length); + int[] newMoves = pk1.Moves; + for (int i = 0; i < 4; i++) + if (newMoves[i] > 165) // not present in Gen 1 + newMoves[i] = 0; + pk1.Moves = newMoves; + pk1.FixMoves(); + return pk1; } } diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 55fd04f4d..7ab96784a 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -100,43 +100,32 @@ public static PKM getPKMfromBytes(byte[] data, string ident = null) } internal static PKM convertToFormat(PKM pk, int Format, out string comment) { - string currentFormat = pk.Format.ToString(); - PKM pkm = pk.Clone(); - - if (pk == null) + if (pk == null || pk.Species == 0) { comment = "Null input. Aborting."; return null; } + + string currentFormat = pk.Format.ToString(); + PKM pkm = pk.Clone(); + if (pk.Format == Format) { comment = "No need to convert, current format matches requested format."; return pk; } - if (pk.Format != Format && pk.Format <= 2 && Format <= 2) + if (pk.Format <= 2 && Format <= 2) // 1<->2, already checked not equal { - if (Format == 2) // pk.Format == 1 + switch (Format) { - pkm = ((PK1) pk).convertToPK2(); - } - if (Format == 1) // pk.Format == 2 - { - // Only convert if it's legal to do so. - if (1 <= pk.Species && pk.Species <= 151) - { - foreach (var move in new[] { pk.Move1, pk.Move2, pk.Move3, pk.Move4}) - if (move < 1 || move > 165) - { - comment = $"Pokemon cannot be converted due to invalid move: {Main.movelist[move]}"; - return null; - } - pkm = ((PK2) pk).convertToPK1(); - } - else - { - comment =$"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; - return null; - } + case 1: + if (pk.Species > 151) + { comment = $"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; return null; } + pkm = ((PK2)pk).convertToPK1(); + break; + case 2: + pkm = ((PK1)pk).convertToPK2(); + break; } comment = $"Converted from pk{pk.Format} to pk{Format}"; return pkm; From db660355cc2582913d780c9274b4d53b3a66aed8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:32:48 -0700 Subject: [PATCH 27/75] Simplify 1<->2 conversion --- PKHeX/PKM/PKMConverter.cs | 41 ++++++++++++++------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 55fd04f4d..7ab96784a 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -100,43 +100,32 @@ public static PKM getPKMfromBytes(byte[] data, string ident = null) } internal static PKM convertToFormat(PKM pk, int Format, out string comment) { - string currentFormat = pk.Format.ToString(); - PKM pkm = pk.Clone(); - - if (pk == null) + if (pk == null || pk.Species == 0) { comment = "Null input. Aborting."; return null; } + + string currentFormat = pk.Format.ToString(); + PKM pkm = pk.Clone(); + if (pk.Format == Format) { comment = "No need to convert, current format matches requested format."; return pk; } - if (pk.Format != Format && pk.Format <= 2 && Format <= 2) + if (pk.Format <= 2 && Format <= 2) // 1<->2, already checked not equal { - if (Format == 2) // pk.Format == 1 + switch (Format) { - pkm = ((PK1) pk).convertToPK2(); - } - if (Format == 1) // pk.Format == 2 - { - // Only convert if it's legal to do so. - if (1 <= pk.Species && pk.Species <= 151) - { - foreach (var move in new[] { pk.Move1, pk.Move2, pk.Move3, pk.Move4}) - if (move < 1 || move > 165) - { - comment = $"Pokemon cannot be converted due to invalid move: {Main.movelist[move]}"; - return null; - } - pkm = ((PK2) pk).convertToPK1(); - } - else - { - comment =$"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; - return null; - } + case 1: + if (pk.Species > 151) + { comment = $"Cannot convert a {PKX.getSpeciesName(pk.Species, ((PK2)pk).Japanese ? 1 : 2)} to pk{Format}"; return null; } + pkm = ((PK2)pk).convertToPK1(); + break; + case 2: + pkm = ((PK1)pk).convertToPK2(); + break; } comment = $"Converted from pk{pk.Format} to pk{Format}"; return pkm; From d18e17a5992dd0284745f60371f712d3dcc947b4 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:33:53 -0700 Subject: [PATCH 28/75] Fix moves 2->1 Unsync'd --- PKHeX/PKM/PK2.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index fcd06f5dd..a6319b95c 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -337,6 +337,13 @@ public PK1 convertToPK1() Array.Copy(otname, 0, pk1.otname, 0, otname.Length); Array.Copy(nick, 0, pk1.nick, 0, nick.Length); + int[] newMoves = pk1.Moves; + for (int i = 0; i < 4; i++) + if (newMoves[i] > 165) // not present in Gen 1 + newMoves[i] = 0; + pk1.Moves = newMoves; + pk1.FixMoves(); + return pk1; } } From fff75df8480874ccf2ac1f19fa010f440d378fea Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:44:54 -0700 Subject: [PATCH 29/75] gen1 OT length fix --- PKHeX/Saves/SAV1.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index 1bd0ff55c..f5778528d 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -173,7 +173,7 @@ public override byte[] Write(bool DSV) public override int MaxIV => 15; public override int Generation => 1; protected override int GiftCountMax => 0; - public override int OTLength => Japanese ? 5 : 10; + public override int OTLength => Japanese ? 5 : 7; public override int NickLength => Japanese ? 5 : 10; public override int BoxSlotCount => Japanese ? 30 : 20; From f9cfdd6c18d5ed6e94254840a873030230b60448 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 15:54:16 -0700 Subject: [PATCH 30/75] Add more descriptive backup names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit \u02D0 = ː If anyone has problems with this, speak up (and . will be used instead) --- PKHeX/Saves/SAV1.cs | 2 +- PKHeX/Saves/SAV2.cs | 2 +- PKHeX/Saves/SAV3.cs | 2 +- PKHeX/Saves/SAV4.cs | 2 +- PKHeX/Saves/SAV5.cs | 2 +- PKHeX/Saves/SaveFile.cs | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index f5778528d..e65d73f61 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -5,7 +5,7 @@ namespace PKHeX { public sealed class SAV1 : SaveFile { - public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({Version}) - {PlayTimeString}].bak"; public override string Filter => "SAV File|*.sav"; public override string Extension => ".sav"; diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs index 615aa26aa..87367195c 100644 --- a/PKHeX/Saves/SAV2.cs +++ b/PKHeX/Saves/SAV2.cs @@ -5,7 +5,7 @@ namespace PKHeX { public sealed class SAV2 : SaveFile { - public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({Version}) - {PlayTimeString}].bak"; public override string Filter => "SAV File|*.sav"; public override string Extension => ".sav"; diff --git a/PKHeX/Saves/SAV3.cs b/PKHeX/Saves/SAV3.cs index b70138539..f9e041d1f 100644 --- a/PKHeX/Saves/SAV3.cs +++ b/PKHeX/Saves/SAV3.cs @@ -5,7 +5,7 @@ namespace PKHeX { public sealed class SAV3 : SaveFile { - public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({Version}) - {PlayTimeString}].bak"; public override string Filter => "SAV File|*.sav"; public override string Extension => ".sav"; diff --git a/PKHeX/Saves/SAV4.cs b/PKHeX/Saves/SAV4.cs index 7384563ca..d9a215e0a 100644 --- a/PKHeX/Saves/SAV4.cs +++ b/PKHeX/Saves/SAV4.cs @@ -5,7 +5,7 @@ namespace PKHeX { public sealed class SAV4 : SaveFile { - public override string BAKName => $"{FileName} [{OT} ({Version})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({Version}) - {PlayTimeString}].bak"; public override string Filter => (Footer.Length > 0 ? "DeSmuME DSV|*.dsv|" : "") + "SAV File|*.sav"; public override string Extension => ".sav"; public SAV4(byte[] data = null, GameVersion versionOverride = GameVersion.Any) diff --git a/PKHeX/Saves/SAV5.cs b/PKHeX/Saves/SAV5.cs index 5f7870931..ba2120c35 100644 --- a/PKHeX/Saves/SAV5.cs +++ b/PKHeX/Saves/SAV5.cs @@ -7,7 +7,7 @@ namespace PKHeX public sealed class SAV5 : SaveFile { // Save Data Attributes - public override string BAKName => $"{FileName} [{OT} ({(GameVersion)Game})" +/* - {LastSavedTime}*/ "].bak"; + public override string BAKName => $"{FileName} [{OT} ({(GameVersion)Game}) - {PlayTimeString}].bak"; public override string Filter => (Footer.Length > 0 ? "DeSmuME DSV|*.dsv|" : "") + "SAV File|*.sav"; public override string Extension => ".sav"; public SAV5(byte[] data = null, GameVersion versionOverride = GameVersion.Any) diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index a6fac64af..4e142c077 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -20,6 +20,7 @@ public abstract class SaveFile public abstract string Filter { get; } public byte[] Footer { protected get; set; } = new byte[0]; // .dsv public bool Japanese { protected get; set; } + public string PlayTimeString => $"{PlayedHours}ː{PlayedMinutes}ː{PlayedSeconds}"; // not : public bool GetJapanese => Japanese; From 9b6552d3146f73c2a33f5254f0b673f8f08d9891 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 18:17:13 -0700 Subject: [PATCH 31/75] Database/MysteryGift fixes gen1/2 Fix unhandled exception loading gen1/2 to gen3+ Fix unhandled exception loading gen1/2 save and opening Database Fix not loading pk1/pk2 dumped files as they aren't in the "List" format (rather, party and stored). --- PKHeX/MainWindow/Main.cs | 7 ++++--- PKHeX/PKM/PKMConverter.cs | 4 ++++ PKHeX/PKM/PKX.cs | 10 +++++++++- PKHeX/Subforms/SAV_Database.Designer.cs | 4 +++- PKHeX/Subforms/SAV_Database.cs | 3 ++- PKHeX/Subforms/SAV_MysteryGiftDB.cs | 3 ++- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index ab9df59cc..b8827ce30 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1350,9 +1350,10 @@ private void populateFilteredDataSources() public void populateFields(PKM pk, bool focus = true) { if (pk == null) { Util.Error("Attempted to load a null file."); return; } - - if (pk.Format > SAV.Generation) - { Util.Alert("Can't load future generation files."); return; } + + if ((pk.Format >= 3 && pk.Format > SAV.Generation) // pk3-7, can't go backwards + || (pk.Format <= 2 && SAV.Generation > 2 && SAV.Generation < 7)) // pk1-2, can't go 3-6 + { Util.Alert($"Can't load Gen{pk.Format} to Gen{SAV.Generation} games."); return; } bool oldInit = fieldsInitialized; fieldsInitialized = fieldsLoaded = false; diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index 7ab96784a..bd3e14b73 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -33,9 +33,13 @@ public static int getPKMDataFormat(byte[] data) { case PKX.SIZE_1JLIST: case PKX.SIZE_1ULIST: + case PKX.SIZE_1PARTY: + case PKX.SIZE_1STORED: return 1; case PKX.SIZE_2ULIST: case PKX.SIZE_2JLIST: + case PKX.SIZE_2PARTY: + case PKX.SIZE_2STORED: return 2; case PKX.SIZE_3PARTY: case PKX.SIZE_3STORED: diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index c85c9531a..1c9a62d9f 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -43,7 +43,15 @@ public static class PKX /// A boolean indicating whether or not the length is valid for a Pokemon file. public static bool getIsPKM(long len) { - return new[] {SIZE_1JLIST, SIZE_1ULIST, SIZE_2ULIST, SIZE_2JLIST, SIZE_3STORED, SIZE_3PARTY, SIZE_4STORED, SIZE_4PARTY, SIZE_5PARTY, SIZE_6STORED, SIZE_6PARTY}.Contains((int)len); + return new[] + { + SIZE_1JLIST, SIZE_1ULIST, SIZE_1PARTY, SIZE_1STORED, + SIZE_2ULIST, SIZE_2JLIST, SIZE_2PARTY, SIZE_2STORED, + SIZE_3STORED, SIZE_3PARTY, + SIZE_4STORED, SIZE_4PARTY, + SIZE_5PARTY, + SIZE_6STORED, SIZE_6PARTY + }.Contains((int)len); } // C# PKX Function Library diff --git a/PKHeX/Subforms/SAV_Database.Designer.cs b/PKHeX/Subforms/SAV_Database.Designer.cs index 8e022359c..3e38131de 100644 --- a/PKHeX/Subforms/SAV_Database.Designer.cs +++ b/PKHeX/Subforms/SAV_Database.Designer.cs @@ -1768,7 +1768,9 @@ private void InitializeComponent() ".pk6", ".pk5", ".pk4", - ".pk3"}); + ".pk3", + ".pk2", + ".pk1"}); this.CB_Format.Location = new System.Drawing.Point(54, 0); this.CB_Format.Margin = new System.Windows.Forms.Padding(0); this.CB_Format.Name = "CB_Format"; diff --git a/PKHeX/Subforms/SAV_Database.cs b/PKHeX/Subforms/SAV_Database.cs index 7aff6ad48..1682e2280 100644 --- a/PKHeX/Subforms/SAV_Database.cs +++ b/PKHeX/Subforms/SAV_Database.cs @@ -594,7 +594,8 @@ private void changeFormatFilter(object sender, EventArgs e) else { CB_Format.Visible = true; - CB_Format.SelectedIndex = MAXFORMAT - Main.SAV.Generation + 1; // SAV generation (offset by 1 for "Any") + int index = MAXFORMAT - Main.SAV.Generation + 1; + CB_Format.SelectedIndex = index < CB_Format.Items.Count ? index : 0; // SAV generation (offset by 1 for "Any") } } } diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.cs index 9d21c3860..0b64d2ef1 100644 --- a/PKHeX/Subforms/SAV_MysteryGiftDB.cs +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.cs @@ -344,7 +344,8 @@ private void changeFormatFilter(object sender, EventArgs e) else { CB_Format.Visible = true; - CB_Format.SelectedIndex = MAXFORMAT - Main.SAV.Generation + 1; // SAV generation (offset by 1 for "Any") + int index = MAXFORMAT - Main.SAV.Generation + 1; + CB_Format.SelectedIndex = index < CB_Format.Items.Count ? index : 0; // SAV generation (offset by 1 for "Any") } } } From fed18d1d51fd017181b325ba231e35cc5d242ec3 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 4 Sep 2016 21:36:41 -0700 Subject: [PATCH 32/75] Ban gen3/4 balls on g4 starters Thanks /u/Subject21_J ! --- PKHeX/Legality/Tables.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PKHeX/Legality/Tables.cs b/PKHeX/Legality/Tables.cs index 6d9a2a1f6..5555397c7 100644 --- a/PKHeX/Legality/Tables.cs +++ b/PKHeX/Legality/Tables.cs @@ -840,6 +840,9 @@ public static partial class Legal }; internal static readonly int[] Ban_Gen3Ball = { + 387, 390, 393, //1 - Turtwig, Chimchar, Piplup + 388, 391, 394, //2 + 389, 392, 395, //3 495, 498, 501, //1 - Snivy, Tepig, Oshawott 496, 499, 502, //2 497, 500, 503, //3 @@ -850,6 +853,9 @@ public static partial class Legal 152, 155, 158, //1 - Chikorita, Cyndaquil, Totodile 153, 156, 159, //2 154, 157, 160, //3 + 387, 390, 393, //1 - Turtwig, Chimchar, Piplup + 388, 391, 394, //2 + 389, 392, 395, //3 495, 498, 501, //1 - Snivy, Tepig, Oshawott 496, 499, 502, //2 497, 500, 503, //3 From 57122d2f9ddecd1b71237286dbcdeecd95d9c494 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 14:26:21 -0700 Subject: [PATCH 33/75] Redesign first 3 tabs of editor Uses many FlowLayoutPanel to automatically collapse controls so that when future properties are hidden, the remaining aren't 'randomly' spaced out. With the collapsing of controls, N's sparkle was added for gen5 pkm. --- PKHeX/MainWindow/Main.Designer.cs | 3208 +++++++++++++++++++---------- PKHeX/MainWindow/Main.cs | 106 +- PKHeX/MainWindow/Main.resx | 860 ++++---- PKHeX/MainWindow/MainPK5.cs | 3 + 4 files changed, 2558 insertions(+), 1619 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index d48ef9d03..6c9e18c95 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -33,103 +33,118 @@ public void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); this.tabMain = new System.Windows.Forms.TabControl(); this.Tab_Main = new System.Windows.Forms.TabPage(); - this.CB_Language = new System.Windows.Forms.ComboBox(); - this.MT_Form = new System.Windows.Forms.MaskedTextBox(); - this.CB_Ability = new System.Windows.Forms.ComboBox(); + this.FLP_Main = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_PID = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_PIDLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_PID = new System.Windows.Forms.Label(); + this.BTN_Shinytize = new System.Windows.Forms.Button(); + this.Label_IsShiny = new System.Windows.Forms.PictureBox(); + this.FLP_PIDRight = new System.Windows.Forms.FlowLayoutPanel(); this.TB_PID = new System.Windows.Forms.TextBox(); - this.CHK_Nicknamed = new System.Windows.Forms.CheckBox(); this.Label_Gender = new System.Windows.Forms.Label(); - this.CB_Form = new System.Windows.Forms.ComboBox(); - this.CHK_Cured = new System.Windows.Forms.CheckBox(); - this.CHK_Infected = new System.Windows.Forms.CheckBox(); + this.BTN_RerollPID = new System.Windows.Forms.Button(); + this.FLP_Species = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Species = new System.Windows.Forms.Label(); + this.CB_Species = new System.Windows.Forms.ComboBox(); + this.FLP_Nickname = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_NicknameLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_Nicknamed = new System.Windows.Forms.CheckBox(); + this.TB_Nickname = new System.Windows.Forms.TextBox(); + this.FLP_EXPLevel = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_EXP = new System.Windows.Forms.Label(); + this.FLP_EXPLevelRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_EXP = new System.Windows.Forms.MaskedTextBox(); + this.Label_CurLevel = new System.Windows.Forms.Label(); + this.TB_Level = new System.Windows.Forms.MaskedTextBox(); + this.MT_Level = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Nature = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Nature = new System.Windows.Forms.Label(); + this.CB_Nature = new System.Windows.Forms.ComboBox(); + this.FLP_HeldItem = new System.Windows.Forms.FlowLayoutPanel(); this.Label_HeldItem = new System.Windows.Forms.Label(); this.CB_HeldItem = new System.Windows.Forms.ComboBox(); - this.TB_Friendship = new System.Windows.Forms.MaskedTextBox(); - this.TB_Level = new System.Windows.Forms.MaskedTextBox(); - this.TB_EXP = new System.Windows.Forms.MaskedTextBox(); - this.BTN_RerollPID = new System.Windows.Forms.Button(); - this.CB_3DSReg = new System.Windows.Forms.ComboBox(); - this.CB_SubRegion = new System.Windows.Forms.ComboBox(); - this.CB_Country = new System.Windows.Forms.ComboBox(); - this.CB_PKRSDays = new System.Windows.Forms.ComboBox(); - this.CB_PKRSStrain = new System.Windows.Forms.ComboBox(); - this.CB_Nature = new System.Windows.Forms.ComboBox(); - this.Label_3DSRegion = new System.Windows.Forms.Label(); - this.Label_SubRegion = new System.Windows.Forms.Label(); - this.Label_Country = new System.Windows.Forms.Label(); - this.Label_PKRSdays = new System.Windows.Forms.Label(); - this.Label_PKRS = new System.Windows.Forms.Label(); - this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); - this.Label_Language = new System.Windows.Forms.Label(); - this.Label_Form = new System.Windows.Forms.Label(); - this.Label_Ability = new System.Windows.Forms.Label(); + this.FLP_FriendshipForm = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_FriendshipFormLeft = new System.Windows.Forms.FlowLayoutPanel(); this.Label_Friendship = new System.Windows.Forms.Label(); - this.Label_Nature = new System.Windows.Forms.Label(); - this.Label_CurLevel = new System.Windows.Forms.Label(); - this.TB_Nickname = new System.Windows.Forms.TextBox(); - this.CB_Species = new System.Windows.Forms.ComboBox(); - this.Label_EXP = new System.Windows.Forms.Label(); - this.Label_Species = new System.Windows.Forms.Label(); this.Label_HatchCounter = new System.Windows.Forms.Label(); - this.Label_IsShiny = new System.Windows.Forms.PictureBox(); - this.BTN_Shinytize = new System.Windows.Forms.Button(); - this.Label_PID = new System.Windows.Forms.Label(); - this.TB_AbilityNumber = new System.Windows.Forms.MaskedTextBox(); - this.MT_Level = new System.Windows.Forms.MaskedTextBox(); + this.FLP_FriendshipFormRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_Friendship = new System.Windows.Forms.MaskedTextBox(); + this.Label_Form = new System.Windows.Forms.Label(); + this.CB_Form = new System.Windows.Forms.ComboBox(); + this.MT_Form = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Ability = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Ability = new System.Windows.Forms.Label(); + this.FLP_AbilityRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CB_Ability = new System.Windows.Forms.ComboBox(); this.DEV_Ability = new System.Windows.Forms.ComboBox(); + this.TB_AbilityNumber = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Language = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Language = new System.Windows.Forms.Label(); + this.CB_Language = new System.Windows.Forms.ComboBox(); + this.FLP_EggPKRS = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_EggPKRSLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); + this.FLP_EggPKRSRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_Infected = new System.Windows.Forms.CheckBox(); + this.CHK_Cured = new System.Windows.Forms.CheckBox(); + this.FLP_PKRS = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_PKRS = new System.Windows.Forms.Label(); + this.FLP_PKRSRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CB_PKRSStrain = new System.Windows.Forms.ComboBox(); + this.Label_PKRSdays = new System.Windows.Forms.Label(); + this.CB_PKRSDays = new System.Windows.Forms.ComboBox(); + this.FLP_Country = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Country = new System.Windows.Forms.Label(); + this.CB_Country = new System.Windows.Forms.ComboBox(); + this.FLP_SubRegion = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SubRegion = new System.Windows.Forms.Label(); + this.CB_SubRegion = new System.Windows.Forms.ComboBox(); + this.FLP_3DSRegion = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_3DSRegion = new System.Windows.Forms.Label(); + this.CB_3DSReg = new System.Windows.Forms.ComboBox(); + this.FLP_NSparkle = new System.Windows.Forms.FlowLayoutPanel(); + this.L_NSparkle = new System.Windows.Forms.Label(); + this.CHK_NSparkle = new System.Windows.Forms.CheckBox(); this.Tab_Met = new System.Windows.Forms.TabPage(); - this.L_MetTimeOfDay = new System.Windows.Forms.Label(); - this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); this.CHK_AsEgg = new System.Windows.Forms.CheckBox(); - this.CHK_Fateful = new System.Windows.Forms.CheckBox(); this.GB_EggConditions = new System.Windows.Forms.GroupBox(); this.CB_EggLocation = new System.Windows.Forms.ComboBox(); this.CAL_EggDate = new System.Windows.Forms.DateTimePicker(); this.Label_EggDate = new System.Windows.Forms.Label(); this.Label_EggLocation = new System.Windows.Forms.Label(); - this.Label_EncounterType = new System.Windows.Forms.Label(); - this.Label_MetDate = new System.Windows.Forms.Label(); - this.Label_MetLevel = new System.Windows.Forms.Label(); - this.Label_Ball = new System.Windows.Forms.Label(); - this.Label_MetLocation = new System.Windows.Forms.Label(); + this.FLP_Met = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_OriginGame = new System.Windows.Forms.FlowLayoutPanel(); this.Label_OriginGame = new System.Windows.Forms.Label(); this.CB_GameOrigin = new System.Windows.Forms.ComboBox(); + this.FLP_MetLocation = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetLocation = new System.Windows.Forms.Label(); this.CB_MetLocation = new System.Windows.Forms.ComboBox(); + this.FLP_Ball = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Ball = new System.Windows.Forms.Label(); this.CB_Ball = new System.Windows.Forms.ComboBox(); + this.FLP_MetLevel = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetLevel = new System.Windows.Forms.Label(); this.TB_MetLevel = new System.Windows.Forms.MaskedTextBox(); + this.FLP_MetDate = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetDate = new System.Windows.Forms.Label(); this.CAL_MetDate = new System.Windows.Forms.DateTimePicker(); + this.FLP_Fateful = new System.Windows.Forms.FlowLayoutPanel(); + this.PAN_Fateful = new System.Windows.Forms.Panel(); + this.CHK_Fateful = new System.Windows.Forms.CheckBox(); + this.FLP_EncounterType = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_EncounterType = new System.Windows.Forms.Label(); this.CB_EncounterType = new System.Windows.Forms.ComboBox(); + this.FLP_TimeOfDay = new System.Windows.Forms.FlowLayoutPanel(); + this.L_MetTimeOfDay = new System.Windows.Forms.Label(); + this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); this.Tab_Stats = new System.Windows.Forms.TabPage(); - this.Stat_SPE = new System.Windows.Forms.MaskedTextBox(); - this.Stat_SPD = new System.Windows.Forms.MaskedTextBox(); - this.Stat_SPA = new System.Windows.Forms.MaskedTextBox(); - this.Stat_DEF = new System.Windows.Forms.MaskedTextBox(); - this.Stat_ATK = new System.Windows.Forms.MaskedTextBox(); - this.Stat_HP = new System.Windows.Forms.MaskedTextBox(); - this.CB_HPType = new System.Windows.Forms.ComboBox(); - this.CHK_HackedStats = new System.Windows.Forms.CheckBox(); - this.Label_CharacteristicPrefix = new System.Windows.Forms.Label(); - this.L_Potential = new System.Windows.Forms.Label(); - this.TB_IVTotal = new System.Windows.Forms.TextBox(); - this.L_Characteristic = new System.Windows.Forms.Label(); + this.PAN_Contest = new System.Windows.Forms.Panel(); this.TB_Sheen = new System.Windows.Forms.MaskedTextBox(); this.TB_Tough = new System.Windows.Forms.MaskedTextBox(); this.TB_Smart = new System.Windows.Forms.MaskedTextBox(); this.TB_Cute = new System.Windows.Forms.MaskedTextBox(); this.TB_Beauty = new System.Windows.Forms.MaskedTextBox(); this.TB_Cool = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPEIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPDIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPAIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_DEFIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_ATKIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_HPIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_ATKEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_DEFEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPEEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPDEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPAEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_HPEV = new System.Windows.Forms.MaskedTextBox(); this.Label_Sheen = new System.Windows.Forms.Label(); this.Label_Tough = new System.Windows.Forms.Label(); this.Label_Smart = new System.Windows.Forms.Label(); @@ -137,20 +152,66 @@ public void InitializeComponent() this.Label_Beauty = new System.Windows.Forms.Label(); this.Label_Cool = new System.Windows.Forms.Label(); this.Label_ContestStats = new System.Windows.Forms.Label(); + this.FLP_Stats = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_StatHeader = new System.Windows.Forms.FlowLayoutPanel(); + 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(); + this.Label_HP = new System.Windows.Forms.Label(); + this.FLP_HPRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_HPIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_HPEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_HP = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Atk = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_ATK = new System.Windows.Forms.Label(); + this.FLP_AtkRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_ATKIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_ATKEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_ATK = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Def = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_DEF = new System.Windows.Forms.Label(); + this.FLP_DefRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_DEFIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_DEFEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_DEF = new System.Windows.Forms.MaskedTextBox(); + this.FLP_SpA = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_SpALeft = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPA = new System.Windows.Forms.Label(); + this.Label_SPC = new System.Windows.Forms.Label(); + this.FLP_SpARight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPAIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPAEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPA = new System.Windows.Forms.MaskedTextBox(); + this.FLP_SpD = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPD = new System.Windows.Forms.Label(); + this.FLP_SpDRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPDIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPDEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPD = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Spe = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPE = new System.Windows.Forms.Label(); + this.FLP_SpeRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPEIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPEEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPE = new System.Windows.Forms.MaskedTextBox(); + this.FLP_StatsTotal = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Total = new System.Windows.Forms.Label(); + this.FLP_StatsTotalRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_IVTotal = new System.Windows.Forms.TextBox(); + this.TB_EVTotal = new System.Windows.Forms.TextBox(); + this.L_Potential = new System.Windows.Forms.Label(); + this.FLP_HPType = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_HiddenPowerPrefix = new System.Windows.Forms.Label(); + this.CB_HPType = new System.Windows.Forms.ComboBox(); + this.FLP_Characteristic = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_CharacteristicPrefix = new System.Windows.Forms.Label(); + this.L_Characteristic = new System.Windows.Forms.Label(); this.BTN_RandomEVs = new System.Windows.Forms.Button(); this.BTN_RandomIVs = new System.Windows.Forms.Button(); - this.Label_HiddenPowerPrefix = new System.Windows.Forms.Label(); - this.Label_Stats = new System.Windows.Forms.Label(); - this.Label_EVs = new System.Windows.Forms.Label(); - this.Label_IVs = new System.Windows.Forms.Label(); - this.Label_Total = new System.Windows.Forms.Label(); - this.Label_SPE = new System.Windows.Forms.Label(); - this.Label_SPD = new System.Windows.Forms.Label(); - this.Label_SPA = new System.Windows.Forms.Label(); - this.Label_DEF = new System.Windows.Forms.Label(); - this.Label_ATK = new System.Windows.Forms.Label(); - this.Label_HP = new System.Windows.Forms.Label(); - this.TB_EVTotal = new System.Windows.Forms.TextBox(); this.Tab_Attacks = new System.Windows.Forms.TabPage(); this.PB_WarnMove4 = new System.Windows.Forms.PictureBox(); this.PB_WarnMove3 = new System.Windows.Forms.PictureBox(); @@ -368,10 +429,67 @@ public void InitializeComponent() this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); + this.FLP_Main.SuspendLayout(); + this.FLP_PID.SuspendLayout(); + this.FLP_PIDLeft.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Label_IsShiny)).BeginInit(); + this.FLP_PIDRight.SuspendLayout(); + this.FLP_Species.SuspendLayout(); + this.FLP_Nickname.SuspendLayout(); + this.FLP_NicknameLeft.SuspendLayout(); + this.FLP_EXPLevel.SuspendLayout(); + this.FLP_EXPLevelRight.SuspendLayout(); + this.FLP_Nature.SuspendLayout(); + this.FLP_HeldItem.SuspendLayout(); + this.FLP_FriendshipForm.SuspendLayout(); + this.FLP_FriendshipFormLeft.SuspendLayout(); + this.FLP_FriendshipFormRight.SuspendLayout(); + this.FLP_Ability.SuspendLayout(); + this.FLP_AbilityRight.SuspendLayout(); + this.FLP_Language.SuspendLayout(); + this.FLP_EggPKRS.SuspendLayout(); + this.FLP_EggPKRSLeft.SuspendLayout(); + this.FLP_EggPKRSRight.SuspendLayout(); + this.FLP_PKRS.SuspendLayout(); + this.FLP_PKRSRight.SuspendLayout(); + this.FLP_Country.SuspendLayout(); + this.FLP_SubRegion.SuspendLayout(); + this.FLP_3DSRegion.SuspendLayout(); + this.FLP_NSparkle.SuspendLayout(); this.Tab_Met.SuspendLayout(); this.GB_EggConditions.SuspendLayout(); + this.FLP_Met.SuspendLayout(); + this.FLP_OriginGame.SuspendLayout(); + this.FLP_MetLocation.SuspendLayout(); + this.FLP_Ball.SuspendLayout(); + this.FLP_MetLevel.SuspendLayout(); + this.FLP_MetDate.SuspendLayout(); + this.FLP_Fateful.SuspendLayout(); + this.FLP_EncounterType.SuspendLayout(); + this.FLP_TimeOfDay.SuspendLayout(); this.Tab_Stats.SuspendLayout(); + this.PAN_Contest.SuspendLayout(); + this.FLP_Stats.SuspendLayout(); + this.FLP_StatHeader.SuspendLayout(); + this.FLP_HackedStats.SuspendLayout(); + this.FLP_StatsHeaderRight.SuspendLayout(); + this.FLP_HP.SuspendLayout(); + this.FLP_HPRight.SuspendLayout(); + this.FLP_Atk.SuspendLayout(); + this.FLP_AtkRight.SuspendLayout(); + this.FLP_Def.SuspendLayout(); + this.FLP_DefRight.SuspendLayout(); + this.FLP_SpA.SuspendLayout(); + this.FLP_SpALeft.SuspendLayout(); + this.FLP_SpARight.SuspendLayout(); + this.FLP_SpD.SuspendLayout(); + this.FLP_SpDRight.SuspendLayout(); + this.FLP_Spe.SuspendLayout(); + this.FLP_SpeRight.SuspendLayout(); + this.FLP_StatsTotal.SuspendLayout(); + this.FLP_StatsTotalRight.SuspendLayout(); + this.FLP_HPType.SuspendLayout(); + this.FLP_Characteristic.SuspendLayout(); this.Tab_Attacks.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove3)).BeginInit(); @@ -489,50 +607,7 @@ public void InitializeComponent() // Tab_Main // this.Tab_Main.AllowDrop = true; - this.Tab_Main.Controls.Add(this.CB_Language); - this.Tab_Main.Controls.Add(this.MT_Form); - this.Tab_Main.Controls.Add(this.CB_Ability); - this.Tab_Main.Controls.Add(this.TB_PID); - this.Tab_Main.Controls.Add(this.CHK_Nicknamed); - this.Tab_Main.Controls.Add(this.Label_Gender); - this.Tab_Main.Controls.Add(this.CB_Form); - this.Tab_Main.Controls.Add(this.CHK_Cured); - this.Tab_Main.Controls.Add(this.CHK_Infected); - this.Tab_Main.Controls.Add(this.Label_HeldItem); - this.Tab_Main.Controls.Add(this.CB_HeldItem); - this.Tab_Main.Controls.Add(this.TB_Friendship); - this.Tab_Main.Controls.Add(this.TB_Level); - this.Tab_Main.Controls.Add(this.TB_EXP); - this.Tab_Main.Controls.Add(this.BTN_RerollPID); - this.Tab_Main.Controls.Add(this.CB_3DSReg); - this.Tab_Main.Controls.Add(this.CB_SubRegion); - this.Tab_Main.Controls.Add(this.CB_Country); - this.Tab_Main.Controls.Add(this.CB_PKRSDays); - this.Tab_Main.Controls.Add(this.CB_PKRSStrain); - this.Tab_Main.Controls.Add(this.CB_Nature); - this.Tab_Main.Controls.Add(this.Label_3DSRegion); - this.Tab_Main.Controls.Add(this.Label_SubRegion); - this.Tab_Main.Controls.Add(this.Label_Country); - this.Tab_Main.Controls.Add(this.Label_PKRSdays); - this.Tab_Main.Controls.Add(this.Label_PKRS); - this.Tab_Main.Controls.Add(this.CHK_IsEgg); - this.Tab_Main.Controls.Add(this.Label_Language); - this.Tab_Main.Controls.Add(this.Label_Form); - this.Tab_Main.Controls.Add(this.Label_Ability); - this.Tab_Main.Controls.Add(this.Label_Friendship); - this.Tab_Main.Controls.Add(this.Label_Nature); - this.Tab_Main.Controls.Add(this.Label_CurLevel); - this.Tab_Main.Controls.Add(this.TB_Nickname); - this.Tab_Main.Controls.Add(this.CB_Species); - this.Tab_Main.Controls.Add(this.Label_EXP); - this.Tab_Main.Controls.Add(this.Label_Species); - this.Tab_Main.Controls.Add(this.Label_HatchCounter); - this.Tab_Main.Controls.Add(this.Label_IsShiny); - this.Tab_Main.Controls.Add(this.BTN_Shinytize); - this.Tab_Main.Controls.Add(this.Label_PID); - this.Tab_Main.Controls.Add(this.TB_AbilityNumber); - this.Tab_Main.Controls.Add(this.MT_Level); - this.Tab_Main.Controls.Add(this.DEV_Ability); + this.Tab_Main.Controls.Add(this.FLP_Main); this.Tab_Main.Location = new System.Drawing.Point(4, 22); this.Tab_Main.Name = "Tab_Main"; this.Tab_Main.Padding = new System.Windows.Forms.Padding(3); @@ -541,48 +616,109 @@ public void InitializeComponent() this.Tab_Main.Text = "Main"; this.Tab_Main.UseVisualStyleBackColor = true; // - // CB_Language + // FLP_Main // - this.CB_Language.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Language.FormattingEnabled = true; - this.CB_Language.Location = new System.Drawing.Point(105, 174); - this.CB_Language.Name = "CB_Language"; - this.CB_Language.Size = new System.Drawing.Size(122, 21); - this.CB_Language.TabIndex = 15; - this.CB_Language.SelectedIndexChanged += new System.EventHandler(this.updateNickname); + this.FLP_Main.Controls.Add(this.FLP_PID); + this.FLP_Main.Controls.Add(this.FLP_Species); + this.FLP_Main.Controls.Add(this.FLP_Nickname); + this.FLP_Main.Controls.Add(this.FLP_EXPLevel); + this.FLP_Main.Controls.Add(this.FLP_Nature); + this.FLP_Main.Controls.Add(this.FLP_HeldItem); + this.FLP_Main.Controls.Add(this.FLP_FriendshipForm); + this.FLP_Main.Controls.Add(this.FLP_Ability); + this.FLP_Main.Controls.Add(this.FLP_Language); + this.FLP_Main.Controls.Add(this.FLP_EggPKRS); + this.FLP_Main.Controls.Add(this.FLP_PKRS); + this.FLP_Main.Controls.Add(this.FLP_Country); + this.FLP_Main.Controls.Add(this.FLP_SubRegion); + this.FLP_Main.Controls.Add(this.FLP_3DSRegion); + this.FLP_Main.Controls.Add(this.FLP_NSparkle); + this.FLP_Main.Location = new System.Drawing.Point(0, 2); + this.FLP_Main.Name = "FLP_Main"; + this.FLP_Main.Size = new System.Drawing.Size(272, 322); + this.FLP_Main.TabIndex = 103; // - // MT_Form + // FLP_PID // - this.MT_Form.Enabled = false; - this.MT_Form.Location = new System.Drawing.Point(229, 133); - this.MT_Form.Mask = "00"; - this.MT_Form.Name = "MT_Form"; - this.MT_Form.Size = new System.Drawing.Size(19, 20); - this.MT_Form.TabIndex = 18; - this.MT_Form.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.MT_Form.Visible = false; - this.MT_Form.TextChanged += new System.EventHandler(this.updateHaXForm); + this.FLP_PID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PID.Controls.Add(this.FLP_PIDLeft); + this.FLP_PID.Controls.Add(this.FLP_PIDRight); + this.FLP_PID.Location = new System.Drawing.Point(0, 0); + this.FLP_PID.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PID.Name = "FLP_PID"; + this.FLP_PID.Size = new System.Drawing.Size(272, 22); + this.FLP_PID.TabIndex = 0; // - // CB_Ability + // FLP_PIDLeft // - this.CB_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Ability.FormattingEnabled = true; - this.CB_Ability.Items.AddRange(new object[] { - "Item"}); - this.CB_Ability.Location = new System.Drawing.Point(105, 153); - this.CB_Ability.Name = "CB_Ability"; - this.CB_Ability.Size = new System.Drawing.Size(122, 21); - this.CB_Ability.TabIndex = 13; - this.CB_Ability.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Ability.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Ability.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.FLP_PIDLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_PIDLeft.Controls.Add(this.Label_PID); + this.FLP_PIDLeft.Controls.Add(this.BTN_Shinytize); + this.FLP_PIDLeft.Controls.Add(this.Label_IsShiny); + this.FLP_PIDLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_PIDLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_PIDLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PIDLeft.Name = "FLP_PIDLeft"; + this.FLP_PIDLeft.Size = new System.Drawing.Size(110, 22); + this.FLP_PIDLeft.TabIndex = 0; + // + // Label_PID + // + this.Label_PID.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_PID.AutoSize = true; + this.Label_PID.Location = new System.Drawing.Point(82, 5); + this.Label_PID.Margin = new System.Windows.Forms.Padding(0, 5, 0, 4); + this.Label_PID.Name = "Label_PID"; + this.Label_PID.Size = new System.Drawing.Size(28, 13); + this.Label_PID.TabIndex = 0; + this.Label_PID.Text = "PID:"; + this.Label_PID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // BTN_Shinytize + // + this.BTN_Shinytize.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.BTN_Shinytize.Location = new System.Drawing.Point(58, 0); + this.BTN_Shinytize.Margin = new System.Windows.Forms.Padding(0); + this.BTN_Shinytize.Name = "BTN_Shinytize"; + this.BTN_Shinytize.Size = new System.Drawing.Size(24, 22); + this.BTN_Shinytize.TabIndex = 1; + this.BTN_Shinytize.Text = "☆"; + this.BTN_Shinytize.UseVisualStyleBackColor = true; + this.BTN_Shinytize.Click += new System.EventHandler(this.updateShinyPID); + // + // Label_IsShiny + // + this.Label_IsShiny.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_IsShiny.Image = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.Image"))); + this.Label_IsShiny.InitialImage = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.InitialImage"))); + this.Label_IsShiny.Location = new System.Drawing.Point(36, 2); + this.Label_IsShiny.Margin = new System.Windows.Forms.Padding(0, 2, 2, 0); + this.Label_IsShiny.Name = "Label_IsShiny"; + this.Label_IsShiny.Size = new System.Drawing.Size(20, 20); + this.Label_IsShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.Label_IsShiny.TabIndex = 62; + this.Label_IsShiny.TabStop = false; + this.Label_IsShiny.Visible = false; + // + // FLP_PIDRight + // + this.FLP_PIDRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PIDRight.Controls.Add(this.TB_PID); + this.FLP_PIDRight.Controls.Add(this.Label_Gender); + this.FLP_PIDRight.Controls.Add(this.BTN_RerollPID); + this.FLP_PIDRight.Location = new System.Drawing.Point(110, 0); + this.FLP_PIDRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PIDRight.Name = "FLP_PIDRight"; + this.FLP_PIDRight.Size = new System.Drawing.Size(162, 22); + this.FLP_PIDRight.TabIndex = 104; // // TB_PID // + this.TB_PID.Anchor = System.Windows.Forms.AnchorStyles.Left; this.TB_PID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TB_PID.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_PID.Location = new System.Drawing.Point(105, 7); + this.TB_PID.Location = new System.Drawing.Point(0, 1); + this.TB_PID.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); this.TB_PID.MaxLength = 8; this.TB_PID.Name = "TB_PID"; this.TB_PID.Size = new System.Drawing.Size(60, 20); @@ -591,69 +727,253 @@ public void InitializeComponent() this.TB_PID.TextChanged += new System.EventHandler(this.update_ID); this.TB_PID.MouseHover += new System.EventHandler(this.updateTSV); // - // CHK_Nicknamed - // - this.CHK_Nicknamed.Location = new System.Drawing.Point(25, 51); - this.CHK_Nicknamed.Name = "CHK_Nicknamed"; - this.CHK_Nicknamed.Size = new System.Drawing.Size(80, 17); - this.CHK_Nicknamed.TabIndex = 4; - this.CHK_Nicknamed.Text = "Nickname:"; - this.CHK_Nicknamed.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Nicknamed.UseVisualStyleBackColor = true; - this.CHK_Nicknamed.CheckedChanged += new System.EventHandler(this.updateNickname); - // // Label_Gender // + this.Label_Gender.Anchor = System.Windows.Forms.AnchorStyles.Left; this.Label_Gender.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label_Gender.Location = new System.Drawing.Point(170, 10); + this.Label_Gender.Location = new System.Drawing.Point(60, 0); + this.Label_Gender.Margin = new System.Windows.Forms.Padding(0); this.Label_Gender.Name = "Label_Gender"; - this.Label_Gender.Size = new System.Drawing.Size(16, 13); + this.Label_Gender.Size = new System.Drawing.Size(19, 21); this.Label_Gender.TabIndex = 55; this.Label_Gender.Text = "-"; this.Label_Gender.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.Label_Gender.Click += new System.EventHandler(this.clickGender); // - // CB_Form + // BTN_RerollPID // - this.CB_Form.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Form.DropDownWidth = 85; - this.CB_Form.Enabled = false; - this.CB_Form.FormattingEnabled = true; - this.CB_Form.Location = new System.Drawing.Point(158, 132); - this.CB_Form.Name = "CB_Form"; - this.CB_Form.Size = new System.Drawing.Size(69, 21); - this.CB_Form.TabIndex = 12; - this.CB_Form.SelectedIndexChanged += new System.EventHandler(this.updateForm); + this.BTN_RerollPID.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.BTN_RerollPID.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.BTN_RerollPID.Location = new System.Drawing.Point(79, 1); + this.BTN_RerollPID.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); + this.BTN_RerollPID.Name = "BTN_RerollPID"; + this.BTN_RerollPID.Size = new System.Drawing.Size(47, 20); + this.BTN_RerollPID.TabIndex = 1; + this.BTN_RerollPID.Text = "Reroll"; + this.BTN_RerollPID.UseVisualStyleBackColor = true; + this.BTN_RerollPID.Click += new System.EventHandler(this.updateRandomPID); // - // CHK_Cured + // FLP_Species // - this.CHK_Cured.AutoSize = true; - this.CHK_Cured.Location = new System.Drawing.Point(179, 196); - this.CHK_Cured.Name = "CHK_Cured"; - this.CHK_Cured.Size = new System.Drawing.Size(54, 17); - this.CHK_Cured.TabIndex = 18; - this.CHK_Cured.Text = "Cured"; - this.CHK_Cured.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Cured.UseVisualStyleBackColor = true; - this.CHK_Cured.CheckedChanged += new System.EventHandler(this.updatePKRSCured); + this.FLP_Species.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Species.Controls.Add(this.Label_Species); + this.FLP_Species.Controls.Add(this.CB_Species); + this.FLP_Species.Location = new System.Drawing.Point(0, 22); + this.FLP_Species.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Species.Name = "FLP_Species"; + this.FLP_Species.Size = new System.Drawing.Size(272, 21); + this.FLP_Species.TabIndex = 1; // - // CHK_Infected + // Label_Species // - this.CHK_Infected.AutoSize = true; - this.CHK_Infected.Location = new System.Drawing.Point(105, 196); - this.CHK_Infected.Name = "CHK_Infected"; - this.CHK_Infected.Size = new System.Drawing.Size(65, 17); - this.CHK_Infected.TabIndex = 17; - this.CHK_Infected.Text = "Infected"; - this.CHK_Infected.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Infected.UseVisualStyleBackColor = true; - this.CHK_Infected.CheckedChanged += new System.EventHandler(this.updatePKRSInfected); + this.Label_Species.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_Species.Location = new System.Drawing.Point(0, 0); + this.Label_Species.Margin = new System.Windows.Forms.Padding(0); + this.Label_Species.Name = "Label_Species"; + this.Label_Species.Size = new System.Drawing.Size(110, 21); + this.Label_Species.TabIndex = 1; + this.Label_Species.Text = "Species:"; + this.Label_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Species.Click += new System.EventHandler(this.updateNickname); + // + // CB_Species + // + this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Species.FormattingEnabled = true; + this.CB_Species.Location = new System.Drawing.Point(110, 0); + this.CB_Species.Margin = new System.Windows.Forms.Padding(0); + this.CB_Species.Name = "CB_Species"; + this.CB_Species.Size = new System.Drawing.Size(126, 21); + this.CB_Species.TabIndex = 3; + this.CB_Species.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Species.SelectedValueChanged += new System.EventHandler(this.updateSpecies); + this.CB_Species.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Species.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // FLP_Nickname + // + this.FLP_Nickname.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Nickname.Controls.Add(this.FLP_NicknameLeft); + this.FLP_Nickname.Controls.Add(this.TB_Nickname); + this.FLP_Nickname.Location = new System.Drawing.Point(0, 43); + this.FLP_Nickname.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Nickname.Name = "FLP_Nickname"; + this.FLP_Nickname.Size = new System.Drawing.Size(272, 22); + this.FLP_Nickname.TabIndex = 2; + // + // FLP_NicknameLeft + // + this.FLP_NicknameLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_NicknameLeft.Controls.Add(this.CHK_Nicknamed); + this.FLP_NicknameLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_NicknameLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_NicknameLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_NicknameLeft.Name = "FLP_NicknameLeft"; + this.FLP_NicknameLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_NicknameLeft.TabIndex = 109; + // + // CHK_Nicknamed + // + this.CHK_Nicknamed.AutoSize = true; + this.CHK_Nicknamed.Location = new System.Drawing.Point(36, 3); + this.CHK_Nicknamed.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Nicknamed.Name = "CHK_Nicknamed"; + this.CHK_Nicknamed.Size = new System.Drawing.Size(74, 17); + this.CHK_Nicknamed.TabIndex = 4; + this.CHK_Nicknamed.Text = "Nickname"; + this.CHK_Nicknamed.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Nicknamed.UseVisualStyleBackColor = true; + this.CHK_Nicknamed.CheckedChanged += new System.EventHandler(this.updateNickname); + // + // TB_Nickname + // + this.TB_Nickname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Nickname.Location = new System.Drawing.Point(110, 0); + this.TB_Nickname.Margin = new System.Windows.Forms.Padding(0); + this.TB_Nickname.MaxLength = 12; + this.TB_Nickname.Name = "TB_Nickname"; + this.TB_Nickname.Size = new System.Drawing.Size(126, 20); + this.TB_Nickname.TabIndex = 5; + this.TB_Nickname.TextChanged += new System.EventHandler(this.updateIsNicknamed); + this.TB_Nickname.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick); + // + // FLP_EXPLevel + // + this.FLP_EXPLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EXPLevel.Controls.Add(this.Label_EXP); + this.FLP_EXPLevel.Controls.Add(this.FLP_EXPLevelRight); + this.FLP_EXPLevel.Location = new System.Drawing.Point(0, 65); + this.FLP_EXPLevel.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EXPLevel.Name = "FLP_EXPLevel"; + this.FLP_EXPLevel.Size = new System.Drawing.Size(272, 21); + this.FLP_EXPLevel.TabIndex = 3; + // + // Label_EXP + // + this.Label_EXP.Location = new System.Drawing.Point(0, 0); + this.Label_EXP.Margin = new System.Windows.Forms.Padding(0); + this.Label_EXP.Name = "Label_EXP"; + this.Label_EXP.Size = new System.Drawing.Size(110, 21); + this.Label_EXP.TabIndex = 3; + this.Label_EXP.Text = "EXP:"; + this.Label_EXP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_EXPLevelRight + // + this.FLP_EXPLevelRight.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.FLP_EXPLevelRight.Controls.Add(this.TB_EXP); + this.FLP_EXPLevelRight.Controls.Add(this.Label_CurLevel); + this.FLP_EXPLevelRight.Controls.Add(this.TB_Level); + this.FLP_EXPLevelRight.Controls.Add(this.MT_Level); + this.FLP_EXPLevelRight.Location = new System.Drawing.Point(110, 0); + this.FLP_EXPLevelRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EXPLevelRight.Name = "FLP_EXPLevelRight"; + this.FLP_EXPLevelRight.Size = new System.Drawing.Size(162, 21); + this.FLP_EXPLevelRight.TabIndex = 0; + // + // TB_EXP + // + this.TB_EXP.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.TB_EXP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_EXP.Location = new System.Drawing.Point(0, 0); + this.TB_EXP.Margin = new System.Windows.Forms.Padding(0); + this.TB_EXP.Mask = "0000000"; + this.TB_EXP.Name = "TB_EXP"; + this.TB_EXP.Size = new System.Drawing.Size(46, 20); + this.TB_EXP.TabIndex = 7; + this.TB_EXP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_EXP.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // Label_CurLevel + // + this.Label_CurLevel.Location = new System.Drawing.Point(46, 0); + this.Label_CurLevel.Margin = new System.Windows.Forms.Padding(0); + this.Label_CurLevel.Name = "Label_CurLevel"; + this.Label_CurLevel.Size = new System.Drawing.Size(58, 21); + this.Label_CurLevel.TabIndex = 7; + this.Label_CurLevel.Text = "Level:"; + this.Label_CurLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // TB_Level + // + this.TB_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Level.Location = new System.Drawing.Point(104, 0); + this.TB_Level.Margin = new System.Windows.Forms.Padding(0); + this.TB_Level.Mask = "000"; + this.TB_Level.Name = "TB_Level"; + this.TB_Level.Size = new System.Drawing.Size(22, 20); + this.TB_Level.TabIndex = 8; + this.TB_Level.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // MT_Level + // + this.MT_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.MT_Level.Enabled = false; + this.MT_Level.Location = new System.Drawing.Point(126, 0); + this.MT_Level.Margin = new System.Windows.Forms.Padding(0); + this.MT_Level.Mask = "000"; + this.MT_Level.Name = "MT_Level"; + this.MT_Level.Size = new System.Drawing.Size(22, 20); + this.MT_Level.TabIndex = 17; + this.MT_Level.Visible = false; + this.MT_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // FLP_Nature + // + this.FLP_Nature.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Nature.Controls.Add(this.Label_Nature); + this.FLP_Nature.Controls.Add(this.CB_Nature); + this.FLP_Nature.Location = new System.Drawing.Point(0, 86); + this.FLP_Nature.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Nature.Name = "FLP_Nature"; + this.FLP_Nature.Size = new System.Drawing.Size(272, 21); + this.FLP_Nature.TabIndex = 4; + // + // Label_Nature + // + this.Label_Nature.Location = new System.Drawing.Point(0, 0); + this.Label_Nature.Margin = new System.Windows.Forms.Padding(0); + this.Label_Nature.Name = "Label_Nature"; + this.Label_Nature.Size = new System.Drawing.Size(110, 21); + this.Label_Nature.TabIndex = 8; + this.Label_Nature.Text = "Nature:"; + this.Label_Nature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Nature + // + this.CB_Nature.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Nature.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Nature.FormattingEnabled = true; + this.CB_Nature.Location = new System.Drawing.Point(110, 0); + this.CB_Nature.Margin = new System.Windows.Forms.Padding(0); + this.CB_Nature.Name = "CB_Nature"; + this.CB_Nature.Size = new System.Drawing.Size(126, 21); + this.CB_Nature.TabIndex = 9; + this.CB_Nature.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Nature.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Nature.MouseHover += new System.EventHandler(this.updateNatureModification); + this.CB_Nature.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // FLP_HeldItem + // + this.FLP_HeldItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HeldItem.Controls.Add(this.Label_HeldItem); + this.FLP_HeldItem.Controls.Add(this.CB_HeldItem); + this.FLP_HeldItem.Location = new System.Drawing.Point(0, 107); + this.FLP_HeldItem.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HeldItem.Name = "FLP_HeldItem"; + this.FLP_HeldItem.Size = new System.Drawing.Size(272, 21); + this.FLP_HeldItem.TabIndex = 5; // // Label_HeldItem // - this.Label_HeldItem.Location = new System.Drawing.Point(25, 114); + this.Label_HeldItem.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_HeldItem.Location = new System.Drawing.Point(0, 0); + this.Label_HeldItem.Margin = new System.Windows.Forms.Padding(0); this.Label_HeldItem.Name = "Label_HeldItem"; - this.Label_HeldItem.Size = new System.Drawing.Size(77, 13); + this.Label_HeldItem.Size = new System.Drawing.Size(110, 21); this.Label_HeldItem.TabIndex = 51; this.Label_HeldItem.Text = "Held Item:"; this.Label_HeldItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -663,18 +983,77 @@ public void InitializeComponent() this.CB_HeldItem.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_HeldItem.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem.FormattingEnabled = true; - this.CB_HeldItem.Location = new System.Drawing.Point(105, 111); + this.CB_HeldItem.Location = new System.Drawing.Point(110, 0); + this.CB_HeldItem.Margin = new System.Windows.Forms.Padding(0); this.CB_HeldItem.Name = "CB_HeldItem"; - this.CB_HeldItem.Size = new System.Drawing.Size(122, 21); + this.CB_HeldItem.Size = new System.Drawing.Size(126, 21); this.CB_HeldItem.TabIndex = 10; this.CB_HeldItem.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); this.CB_HeldItem.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_HeldItem.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_FriendshipForm + // + this.FLP_FriendshipForm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_FriendshipForm.Controls.Add(this.FLP_FriendshipFormLeft); + this.FLP_FriendshipForm.Controls.Add(this.FLP_FriendshipFormRight); + this.FLP_FriendshipForm.Location = new System.Drawing.Point(0, 128); + this.FLP_FriendshipForm.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipForm.Name = "FLP_FriendshipForm"; + this.FLP_FriendshipForm.Size = new System.Drawing.Size(272, 21); + this.FLP_FriendshipForm.TabIndex = 6; + // + // FLP_FriendshipFormLeft + // + this.FLP_FriendshipFormLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_FriendshipFormLeft.Controls.Add(this.Label_Friendship); + this.FLP_FriendshipFormLeft.Controls.Add(this.Label_HatchCounter); + this.FLP_FriendshipFormLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_FriendshipFormLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_FriendshipFormLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipFormLeft.Name = "FLP_FriendshipFormLeft"; + this.FLP_FriendshipFormLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_FriendshipFormLeft.TabIndex = 0; + // + // Label_Friendship + // + this.Label_Friendship.Location = new System.Drawing.Point(0, 0); + this.Label_Friendship.Margin = new System.Windows.Forms.Padding(0); + this.Label_Friendship.Name = "Label_Friendship"; + this.Label_Friendship.Size = new System.Drawing.Size(110, 21); + this.Label_Friendship.TabIndex = 9; + this.Label_Friendship.Text = "Friendship:"; + this.Label_Friendship.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Friendship.Click += new System.EventHandler(this.clickFriendship); + // + // Label_HatchCounter + // + this.Label_HatchCounter.Location = new System.Drawing.Point(0, 21); + this.Label_HatchCounter.Margin = new System.Windows.Forms.Padding(0); + this.Label_HatchCounter.Name = "Label_HatchCounter"; + this.Label_HatchCounter.Size = new System.Drawing.Size(110, 21); + this.Label_HatchCounter.TabIndex = 61; + this.Label_HatchCounter.Text = "Hatch Counter:"; + this.Label_HatchCounter.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_FriendshipFormRight + // + this.FLP_FriendshipFormRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_FriendshipFormRight.Controls.Add(this.TB_Friendship); + this.FLP_FriendshipFormRight.Controls.Add(this.Label_Form); + this.FLP_FriendshipFormRight.Controls.Add(this.CB_Form); + this.FLP_FriendshipFormRight.Controls.Add(this.MT_Form); + this.FLP_FriendshipFormRight.Location = new System.Drawing.Point(110, 0); + this.FLP_FriendshipFormRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipFormRight.Name = "FLP_FriendshipFormRight"; + this.FLP_FriendshipFormRight.Size = new System.Drawing.Size(162, 21); + this.FLP_FriendshipFormRight.TabIndex = 104; + // // TB_Friendship // this.TB_Friendship.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Friendship.Location = new System.Drawing.Point(105, 133); + this.TB_Friendship.Location = new System.Drawing.Point(0, 0); + this.TB_Friendship.Margin = new System.Windows.Forms.Padding(0); this.TB_Friendship.Mask = "000"; this.TB_Friendship.Name = "TB_Friendship"; this.TB_Friendship.Size = new System.Drawing.Size(22, 20); @@ -682,86 +1061,256 @@ public void InitializeComponent() this.TB_Friendship.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.TB_Friendship.TextChanged += new System.EventHandler(this.update255_MTB); // - // TB_Level + // Label_Form // - this.TB_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Level.Location = new System.Drawing.Point(205, 70); - this.TB_Level.Mask = "000"; - this.TB_Level.Name = "TB_Level"; - this.TB_Level.Size = new System.Drawing.Size(22, 20); - this.TB_Level.TabIndex = 8; - this.TB_Level.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + this.Label_Form.Location = new System.Drawing.Point(22, 0); + 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.TabIndex = 11; + this.Label_Form.Text = "Form:"; + this.Label_Form.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // TB_EXP + // CB_Form // - this.TB_EXP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_EXP.Location = new System.Drawing.Point(105, 70); - this.TB_EXP.Mask = "0000000"; - this.TB_EXP.Name = "TB_EXP"; - this.TB_EXP.Size = new System.Drawing.Size(46, 20); - this.TB_EXP.TabIndex = 7; - this.TB_EXP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_EXP.TextChanged += new System.EventHandler(this.updateEXPLevel); + this.CB_Form.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + 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.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.TabIndex = 12; + this.CB_Form.SelectedIndexChanged += new System.EventHandler(this.updateForm); // - // BTN_RerollPID + // MT_Form // - this.BTN_RerollPID.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.BTN_RerollPID.Location = new System.Drawing.Point(188, 7); - this.BTN_RerollPID.Name = "BTN_RerollPID"; - this.BTN_RerollPID.Size = new System.Drawing.Size(40, 20); - this.BTN_RerollPID.TabIndex = 1; - this.BTN_RerollPID.Text = "Reroll"; - this.BTN_RerollPID.UseVisualStyleBackColor = true; - this.BTN_RerollPID.Click += new System.EventHandler(this.updateRandomPID); + this.MT_Form.Enabled = false; + this.MT_Form.Location = new System.Drawing.Point(126, 0); + this.MT_Form.Margin = new System.Windows.Forms.Padding(0); + this.MT_Form.Mask = "00"; + this.MT_Form.Name = "MT_Form"; + this.MT_Form.Size = new System.Drawing.Size(19, 20); + this.MT_Form.TabIndex = 18; + this.MT_Form.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.MT_Form.Visible = false; + this.MT_Form.TextChanged += new System.EventHandler(this.updateHaXForm); // - // CB_3DSReg + // FLP_Ability // - this.CB_3DSReg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_3DSReg.FormattingEnabled = true; - this.CB_3DSReg.Location = new System.Drawing.Point(105, 276); - this.CB_3DSReg.Name = "CB_3DSReg"; - this.CB_3DSReg.Size = new System.Drawing.Size(122, 21); - this.CB_3DSReg.TabIndex = 23; + this.FLP_Ability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Ability.Controls.Add(this.Label_Ability); + this.FLP_Ability.Controls.Add(this.FLP_AbilityRight); + this.FLP_Ability.Location = new System.Drawing.Point(0, 149); + this.FLP_Ability.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Ability.Name = "FLP_Ability"; + this.FLP_Ability.Size = new System.Drawing.Size(272, 21); + this.FLP_Ability.TabIndex = 7; // - // CB_SubRegion + // Label_Ability // - this.CB_SubRegion.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_SubRegion.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_SubRegion.DropDownWidth = 180; - this.CB_SubRegion.FormattingEnabled = true; - this.CB_SubRegion.Location = new System.Drawing.Point(105, 256); - this.CB_SubRegion.Name = "CB_SubRegion"; - this.CB_SubRegion.Size = new System.Drawing.Size(122, 21); - this.CB_SubRegion.TabIndex = 22; - this.CB_SubRegion.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_SubRegion.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_SubRegion.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.Label_Ability.Location = new System.Drawing.Point(0, 0); + this.Label_Ability.Margin = new System.Windows.Forms.Padding(0); + this.Label_Ability.Name = "Label_Ability"; + this.Label_Ability.Size = new System.Drawing.Size(110, 21); + this.Label_Ability.TabIndex = 10; + this.Label_Ability.Text = "Ability:"; + this.Label_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_Country + // FLP_AbilityRight // - this.CB_Country.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Country.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Country.DropDownWidth = 180; - this.CB_Country.FormattingEnabled = true; - this.CB_Country.Location = new System.Drawing.Point(105, 236); - this.CB_Country.Name = "CB_Country"; - this.CB_Country.Size = new System.Drawing.Size(122, 21); - this.CB_Country.TabIndex = 21; - this.CB_Country.SelectedIndexChanged += new System.EventHandler(this.updateCountry); - this.CB_Country.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Country.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.FLP_AbilityRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_AbilityRight.Controls.Add(this.CB_Ability); + this.FLP_AbilityRight.Controls.Add(this.DEV_Ability); + this.FLP_AbilityRight.Controls.Add(this.TB_AbilityNumber); + this.FLP_AbilityRight.Location = new System.Drawing.Point(110, 0); + this.FLP_AbilityRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_AbilityRight.Name = "FLP_AbilityRight"; + this.FLP_AbilityRight.Size = new System.Drawing.Size(162, 21); + this.FLP_AbilityRight.TabIndex = 109; // - // CB_PKRSDays + // CB_Ability // - this.CB_PKRSDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_PKRSDays.FormattingEnabled = true; - this.CB_PKRSDays.Location = new System.Drawing.Point(197, 213); - this.CB_PKRSDays.Name = "CB_PKRSDays"; - this.CB_PKRSDays.Size = new System.Drawing.Size(30, 21); - this.CB_PKRSDays.TabIndex = 20; - this.CB_PKRSDays.Visible = false; - this.CB_PKRSDays.SelectedIndexChanged += new System.EventHandler(this.updatePKRSdays); + this.CB_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Ability.FormattingEnabled = true; + this.CB_Ability.Items.AddRange(new object[] { + "Item"}); + this.CB_Ability.Location = new System.Drawing.Point(0, 0); + this.CB_Ability.Margin = new System.Windows.Forms.Padding(0); + this.CB_Ability.Name = "CB_Ability"; + this.CB_Ability.Size = new System.Drawing.Size(126, 21); + this.CB_Ability.TabIndex = 13; + this.CB_Ability.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Ability.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Ability.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // DEV_Ability + // + this.DEV_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.DEV_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.DEV_Ability.Enabled = false; + this.DEV_Ability.FormattingEnabled = true; + this.DEV_Ability.Items.AddRange(new object[] { + "Item"}); + this.DEV_Ability.Location = new System.Drawing.Point(0, 21); + this.DEV_Ability.Margin = new System.Windows.Forms.Padding(0); + this.DEV_Ability.Name = "DEV_Ability"; + this.DEV_Ability.Size = new System.Drawing.Size(122, 21); + this.DEV_Ability.TabIndex = 14; + this.DEV_Ability.Visible = false; + // + // TB_AbilityNumber + // + this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_AbilityNumber.Location = new System.Drawing.Point(122, 21); + this.TB_AbilityNumber.Margin = new System.Windows.Forms.Padding(0); + this.TB_AbilityNumber.Mask = "0"; + this.TB_AbilityNumber.Name = "TB_AbilityNumber"; + this.TB_AbilityNumber.Size = new System.Drawing.Size(19, 20); + this.TB_AbilityNumber.TabIndex = 14; + this.TB_AbilityNumber.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_AbilityNumber.Visible = false; + // + // FLP_Language + // + this.FLP_Language.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Language.Controls.Add(this.Label_Language); + this.FLP_Language.Controls.Add(this.CB_Language); + this.FLP_Language.Location = new System.Drawing.Point(0, 170); + this.FLP_Language.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Language.Name = "FLP_Language"; + this.FLP_Language.Size = new System.Drawing.Size(272, 21); + this.FLP_Language.TabIndex = 8; + // + // Label_Language + // + this.Label_Language.Location = new System.Drawing.Point(0, 0); + this.Label_Language.Margin = new System.Windows.Forms.Padding(0); + this.Label_Language.Name = "Label_Language"; + this.Label_Language.Size = new System.Drawing.Size(110, 21); + this.Label_Language.TabIndex = 12; + this.Label_Language.Text = "Language:"; + this.Label_Language.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Language + // + this.CB_Language.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Language.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Language.FormattingEnabled = true; + this.CB_Language.Location = new System.Drawing.Point(110, 0); + this.CB_Language.Margin = new System.Windows.Forms.Padding(0); + this.CB_Language.Name = "CB_Language"; + this.CB_Language.Size = new System.Drawing.Size(126, 21); + this.CB_Language.TabIndex = 15; + this.CB_Language.SelectedIndexChanged += new System.EventHandler(this.updateNickname); + // + // FLP_EggPKRS + // + this.FLP_EggPKRS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EggPKRS.Controls.Add(this.FLP_EggPKRSLeft); + this.FLP_EggPKRS.Controls.Add(this.FLP_EggPKRSRight); + this.FLP_EggPKRS.Location = new System.Drawing.Point(0, 191); + this.FLP_EggPKRS.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRS.Name = "FLP_EggPKRS"; + this.FLP_EggPKRS.Size = new System.Drawing.Size(272, 21); + this.FLP_EggPKRS.TabIndex = 9; + // + // FLP_EggPKRSLeft + // + this.FLP_EggPKRSLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_EggPKRSLeft.Controls.Add(this.CHK_IsEgg); + this.FLP_EggPKRSLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_EggPKRSLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_EggPKRSLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRSLeft.Name = "FLP_EggPKRSLeft"; + this.FLP_EggPKRSLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_EggPKRSLeft.TabIndex = 0; + // + // CHK_IsEgg + // + this.CHK_IsEgg.AutoSize = true; + this.CHK_IsEgg.Location = new System.Drawing.Point(54, 3); + this.CHK_IsEgg.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_IsEgg.Name = "CHK_IsEgg"; + this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); + this.CHK_IsEgg.TabIndex = 16; + this.CHK_IsEgg.Text = "Is Egg"; + this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_IsEgg.UseVisualStyleBackColor = true; + this.CHK_IsEgg.CheckedChanged += new System.EventHandler(this.updateIsEgg); + // + // FLP_EggPKRSRight + // + this.FLP_EggPKRSRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EggPKRSRight.Controls.Add(this.CHK_Infected); + this.FLP_EggPKRSRight.Controls.Add(this.CHK_Cured); + this.FLP_EggPKRSRight.Location = new System.Drawing.Point(110, 0); + this.FLP_EggPKRSRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRSRight.Name = "FLP_EggPKRSRight"; + this.FLP_EggPKRSRight.Size = new System.Drawing.Size(162, 21); + this.FLP_EggPKRSRight.TabIndex = 104; + // + // CHK_Infected + // + this.CHK_Infected.AutoSize = true; + this.CHK_Infected.Location = new System.Drawing.Point(0, 3); + this.CHK_Infected.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Infected.Name = "CHK_Infected"; + this.CHK_Infected.Size = new System.Drawing.Size(65, 17); + this.CHK_Infected.TabIndex = 17; + this.CHK_Infected.Text = "Infected"; + this.CHK_Infected.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Infected.UseVisualStyleBackColor = true; + this.CHK_Infected.CheckedChanged += new System.EventHandler(this.updatePKRSInfected); + // + // CHK_Cured + // + this.CHK_Cured.AutoSize = true; + this.CHK_Cured.Location = new System.Drawing.Point(65, 3); + this.CHK_Cured.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Cured.Name = "CHK_Cured"; + this.CHK_Cured.Size = new System.Drawing.Size(54, 17); + this.CHK_Cured.TabIndex = 18; + this.CHK_Cured.Text = "Cured"; + this.CHK_Cured.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Cured.UseVisualStyleBackColor = true; + this.CHK_Cured.CheckedChanged += new System.EventHandler(this.updatePKRSCured); + // + // FLP_PKRS + // + this.FLP_PKRS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PKRS.Controls.Add(this.Label_PKRS); + this.FLP_PKRS.Controls.Add(this.FLP_PKRSRight); + this.FLP_PKRS.Location = new System.Drawing.Point(0, 212); + this.FLP_PKRS.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PKRS.Name = "FLP_PKRS"; + this.FLP_PKRS.Size = new System.Drawing.Size(272, 21); + this.FLP_PKRS.TabIndex = 10; + // + // Label_PKRS + // + this.Label_PKRS.Location = new System.Drawing.Point(0, 0); + this.Label_PKRS.Margin = new System.Windows.Forms.Padding(0); + this.Label_PKRS.Name = "Label_PKRS"; + this.Label_PKRS.Size = new System.Drawing.Size(110, 21); + this.Label_PKRS.TabIndex = 14; + this.Label_PKRS.Text = "PkRs:"; + this.Label_PKRS.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_PKRS.Visible = false; + // + // FLP_PKRSRight + // + this.FLP_PKRSRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PKRSRight.Controls.Add(this.CB_PKRSStrain); + this.FLP_PKRSRight.Controls.Add(this.Label_PKRSdays); + this.FLP_PKRSRight.Controls.Add(this.CB_PKRSDays); + this.FLP_PKRSRight.Location = new System.Drawing.Point(110, 0); + this.FLP_PKRSRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PKRSRight.Name = "FLP_PKRSRight"; + this.FLP_PKRSRight.Size = new System.Drawing.Size(162, 21); + this.FLP_PKRSRight.TabIndex = 105; // // CB_PKRSStrain // @@ -784,284 +1333,176 @@ public void InitializeComponent() "13", "14", "15"}); - this.CB_PKRSStrain.Location = new System.Drawing.Point(135, 213); + this.CB_PKRSStrain.Location = new System.Drawing.Point(0, 0); + this.CB_PKRSStrain.Margin = new System.Windows.Forms.Padding(0); this.CB_PKRSStrain.Name = "CB_PKRSStrain"; this.CB_PKRSStrain.Size = new System.Drawing.Size(43, 21); this.CB_PKRSStrain.TabIndex = 19; this.CB_PKRSStrain.Visible = false; this.CB_PKRSStrain.SelectedValueChanged += new System.EventHandler(this.updatePKRSstrain); // - // CB_Nature - // - this.CB_Nature.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Nature.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Nature.FormattingEnabled = true; - this.CB_Nature.Location = new System.Drawing.Point(105, 90); - this.CB_Nature.Name = "CB_Nature"; - this.CB_Nature.Size = new System.Drawing.Size(122, 21); - this.CB_Nature.TabIndex = 9; - this.CB_Nature.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Nature.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Nature.MouseHover += new System.EventHandler(this.updateNatureModification); - this.CB_Nature.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); - // - // Label_3DSRegion - // - this.Label_3DSRegion.Location = new System.Drawing.Point(25, 279); - this.Label_3DSRegion.Name = "Label_3DSRegion"; - this.Label_3DSRegion.Size = new System.Drawing.Size(77, 13); - this.Label_3DSRegion.TabIndex = 18; - this.Label_3DSRegion.Text = "3DS Region:"; - this.Label_3DSRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_SubRegion - // - this.Label_SubRegion.Location = new System.Drawing.Point(25, 259); - this.Label_SubRegion.Name = "Label_SubRegion"; - this.Label_SubRegion.Size = new System.Drawing.Size(77, 13); - this.Label_SubRegion.TabIndex = 17; - this.Label_SubRegion.Text = "Sub Region:"; - this.Label_SubRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Country - // - this.Label_Country.Location = new System.Drawing.Point(25, 239); - this.Label_Country.Name = "Label_Country"; - this.Label_Country.Size = new System.Drawing.Size(77, 13); - this.Label_Country.TabIndex = 16; - this.Label_Country.Text = "Country:"; - this.Label_Country.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // Label_PKRSdays // - this.Label_PKRSdays.Location = new System.Drawing.Point(178, 216); + this.Label_PKRSdays.Location = new System.Drawing.Point(43, 0); + this.Label_PKRSdays.Margin = new System.Windows.Forms.Padding(0); this.Label_PKRSdays.Name = "Label_PKRSdays"; - this.Label_PKRSdays.Size = new System.Drawing.Size(20, 13); + this.Label_PKRSdays.Size = new System.Drawing.Size(25, 21); this.Label_PKRSdays.TabIndex = 15; this.Label_PKRSdays.Text = "d:"; this.Label_PKRSdays.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.Label_PKRSdays.Visible = false; // - // Label_PKRS + // CB_PKRSDays // - this.Label_PKRS.Location = new System.Drawing.Point(80, 216); - this.Label_PKRS.Name = "Label_PKRS"; - this.Label_PKRS.Size = new System.Drawing.Size(56, 13); - this.Label_PKRS.TabIndex = 14; - this.Label_PKRS.Text = "PkRs:"; - this.Label_PKRS.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_PKRS.Visible = false; + this.CB_PKRSDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_PKRSDays.FormattingEnabled = true; + this.CB_PKRSDays.Location = new System.Drawing.Point(68, 0); + this.CB_PKRSDays.Margin = new System.Windows.Forms.Padding(0); + this.CB_PKRSDays.Name = "CB_PKRSDays"; + this.CB_PKRSDays.Size = new System.Drawing.Size(30, 21); + this.CB_PKRSDays.TabIndex = 20; + this.CB_PKRSDays.Visible = false; + this.CB_PKRSDays.SelectedIndexChanged += new System.EventHandler(this.updatePKRSdays); // - // CHK_IsEgg + // FLP_Country // - this.CHK_IsEgg.AutoSize = true; - this.CHK_IsEgg.Location = new System.Drawing.Point(35, 196); - this.CHK_IsEgg.Name = "CHK_IsEgg"; - this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); - this.CHK_IsEgg.TabIndex = 16; - this.CHK_IsEgg.Text = "Is Egg"; - this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_IsEgg.UseVisualStyleBackColor = true; - this.CHK_IsEgg.CheckedChanged += new System.EventHandler(this.updateIsEgg); + this.FLP_Country.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Country.Controls.Add(this.Label_Country); + this.FLP_Country.Controls.Add(this.CB_Country); + this.FLP_Country.Location = new System.Drawing.Point(0, 233); + this.FLP_Country.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Country.Name = "FLP_Country"; + this.FLP_Country.Size = new System.Drawing.Size(272, 21); + this.FLP_Country.TabIndex = 107; // - // Label_Language + // Label_Country // - this.Label_Language.Location = new System.Drawing.Point(25, 177); - this.Label_Language.Name = "Label_Language"; - this.Label_Language.Size = new System.Drawing.Size(77, 13); - this.Label_Language.TabIndex = 12; - this.Label_Language.Text = "Language:"; - this.Label_Language.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Country.Location = new System.Drawing.Point(0, 0); + this.Label_Country.Margin = new System.Windows.Forms.Padding(0); + this.Label_Country.Name = "Label_Country"; + this.Label_Country.Size = new System.Drawing.Size(110, 21); + this.Label_Country.TabIndex = 16; + this.Label_Country.Text = "Country:"; + this.Label_Country.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_Form + // CB_Country // - this.Label_Form.AutoSize = true; - this.Label_Form.Location = new System.Drawing.Point(125, 136); - this.Label_Form.Name = "Label_Form"; - this.Label_Form.Size = new System.Drawing.Size(33, 13); - this.Label_Form.TabIndex = 11; - this.Label_Form.Text = "Form:"; + this.CB_Country.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Country.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Country.DropDownWidth = 180; + this.CB_Country.FormattingEnabled = true; + this.CB_Country.Location = new System.Drawing.Point(110, 0); + this.CB_Country.Margin = new System.Windows.Forms.Padding(0); + this.CB_Country.Name = "CB_Country"; + this.CB_Country.Size = new System.Drawing.Size(126, 21); + this.CB_Country.TabIndex = 21; + this.CB_Country.SelectedIndexChanged += new System.EventHandler(this.updateCountry); + this.CB_Country.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Country.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // - // Label_Ability + // FLP_SubRegion // - this.Label_Ability.Location = new System.Drawing.Point(25, 157); - this.Label_Ability.Name = "Label_Ability"; - this.Label_Ability.Size = new System.Drawing.Size(77, 13); - this.Label_Ability.TabIndex = 10; - this.Label_Ability.Text = "Ability:"; - this.Label_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_SubRegion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SubRegion.Controls.Add(this.Label_SubRegion); + this.FLP_SubRegion.Controls.Add(this.CB_SubRegion); + this.FLP_SubRegion.Location = new System.Drawing.Point(0, 254); + this.FLP_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SubRegion.Name = "FLP_SubRegion"; + this.FLP_SubRegion.Size = new System.Drawing.Size(272, 21); + this.FLP_SubRegion.TabIndex = 110; // - // Label_Friendship + // Label_SubRegion // - this.Label_Friendship.Location = new System.Drawing.Point(25, 135); - this.Label_Friendship.Name = "Label_Friendship"; - this.Label_Friendship.Size = new System.Drawing.Size(77, 13); - this.Label_Friendship.TabIndex = 9; - this.Label_Friendship.Text = "Friendship:"; - this.Label_Friendship.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_Friendship.Click += new System.EventHandler(this.clickFriendship); + this.Label_SubRegion.Location = new System.Drawing.Point(0, 0); + this.Label_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.Label_SubRegion.Name = "Label_SubRegion"; + this.Label_SubRegion.Size = new System.Drawing.Size(110, 21); + this.Label_SubRegion.TabIndex = 17; + this.Label_SubRegion.Text = "Sub Region:"; + this.Label_SubRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_Nature + // CB_SubRegion // - this.Label_Nature.Location = new System.Drawing.Point(25, 93); - this.Label_Nature.Name = "Label_Nature"; - this.Label_Nature.Size = new System.Drawing.Size(77, 13); - this.Label_Nature.TabIndex = 8; - this.Label_Nature.Text = "Nature:"; - this.Label_Nature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CB_SubRegion.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_SubRegion.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_SubRegion.DropDownWidth = 180; + this.CB_SubRegion.FormattingEnabled = true; + this.CB_SubRegion.Location = new System.Drawing.Point(110, 0); + this.CB_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.CB_SubRegion.Name = "CB_SubRegion"; + this.CB_SubRegion.Size = new System.Drawing.Size(126, 21); + this.CB_SubRegion.TabIndex = 22; // - // Label_CurLevel + // FLP_3DSRegion // - this.Label_CurLevel.Location = new System.Drawing.Point(153, 73); - this.Label_CurLevel.Name = "Label_CurLevel"; - this.Label_CurLevel.Size = new System.Drawing.Size(50, 13); - this.Label_CurLevel.TabIndex = 7; - this.Label_CurLevel.Text = "Level:"; - this.Label_CurLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_3DSRegion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_3DSRegion.Controls.Add(this.Label_3DSRegion); + this.FLP_3DSRegion.Controls.Add(this.CB_3DSReg); + this.FLP_3DSRegion.Location = new System.Drawing.Point(0, 275); + this.FLP_3DSRegion.Margin = new System.Windows.Forms.Padding(0); + this.FLP_3DSRegion.Name = "FLP_3DSRegion"; + this.FLP_3DSRegion.Size = new System.Drawing.Size(272, 21); + this.FLP_3DSRegion.TabIndex = 111; // - // TB_Nickname + // Label_3DSRegion // - this.TB_Nickname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Nickname.Location = new System.Drawing.Point(105, 49); - this.TB_Nickname.MaximumSize = new System.Drawing.Size(122, 20); - this.TB_Nickname.MaxLength = 12; - this.TB_Nickname.MinimumSize = new System.Drawing.Size(122, 20); - this.TB_Nickname.Name = "TB_Nickname"; - this.TB_Nickname.Size = new System.Drawing.Size(122, 20); - this.TB_Nickname.TabIndex = 5; - this.TB_Nickname.TextChanged += new System.EventHandler(this.updateIsNicknamed); - this.TB_Nickname.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick); + this.Label_3DSRegion.Location = new System.Drawing.Point(0, 0); + this.Label_3DSRegion.Margin = new System.Windows.Forms.Padding(0); + this.Label_3DSRegion.Name = "Label_3DSRegion"; + this.Label_3DSRegion.Size = new System.Drawing.Size(110, 21); + this.Label_3DSRegion.TabIndex = 18; + this.Label_3DSRegion.Text = "3DS Region:"; + this.Label_3DSRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_Species + // CB_3DSReg // - this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Species.FormattingEnabled = true; - this.CB_Species.Location = new System.Drawing.Point(105, 27); - this.CB_Species.Name = "CB_Species"; - this.CB_Species.Size = new System.Drawing.Size(122, 21); - this.CB_Species.TabIndex = 3; - this.CB_Species.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Species.SelectedValueChanged += new System.EventHandler(this.updateSpecies); - this.CB_Species.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Species.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.CB_3DSReg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_3DSReg.FormattingEnabled = true; + this.CB_3DSReg.Location = new System.Drawing.Point(110, 0); + this.CB_3DSReg.Margin = new System.Windows.Forms.Padding(0); + this.CB_3DSReg.Name = "CB_3DSReg"; + this.CB_3DSReg.Size = new System.Drawing.Size(126, 21); + this.CB_3DSReg.TabIndex = 23; // - // Label_EXP + // FLP_NSparkle // - this.Label_EXP.Location = new System.Drawing.Point(25, 73); - this.Label_EXP.Name = "Label_EXP"; - this.Label_EXP.Size = new System.Drawing.Size(77, 13); - this.Label_EXP.TabIndex = 3; - this.Label_EXP.Text = "EXP:"; - this.Label_EXP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_NSparkle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_NSparkle.Controls.Add(this.L_NSparkle); + this.FLP_NSparkle.Controls.Add(this.CHK_NSparkle); + this.FLP_NSparkle.Location = new System.Drawing.Point(0, 296); + this.FLP_NSparkle.Margin = new System.Windows.Forms.Padding(0); + this.FLP_NSparkle.Name = "FLP_NSparkle"; + this.FLP_NSparkle.Size = new System.Drawing.Size(272, 21); + this.FLP_NSparkle.TabIndex = 112; // - // Label_Species + // L_NSparkle // - this.Label_Species.Location = new System.Drawing.Point(25, 30); - this.Label_Species.Name = "Label_Species"; - this.Label_Species.Size = new System.Drawing.Size(77, 13); - this.Label_Species.TabIndex = 1; - this.Label_Species.Text = "Species:"; - this.Label_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_Species.Click += new System.EventHandler(this.updateNickname); + this.L_NSparkle.Location = new System.Drawing.Point(0, 0); + this.L_NSparkle.Margin = new System.Windows.Forms.Padding(0); + this.L_NSparkle.Name = "L_NSparkle"; + this.L_NSparkle.Size = new System.Drawing.Size(110, 21); + this.L_NSparkle.TabIndex = 17; + this.L_NSparkle.Text = "N\'s Sparkle:"; + this.L_NSparkle.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_HatchCounter + // CHK_NSparkle // - this.Label_HatchCounter.Location = new System.Drawing.Point(20, 134); - this.Label_HatchCounter.Name = "Label_HatchCounter"; - this.Label_HatchCounter.Size = new System.Drawing.Size(82, 13); - this.Label_HatchCounter.TabIndex = 61; - this.Label_HatchCounter.Text = "Hatch Counter:"; - this.Label_HatchCounter.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_IsShiny - // - this.Label_IsShiny.Image = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.Image"))); - this.Label_IsShiny.InitialImage = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.InitialImage"))); - this.Label_IsShiny.Location = new System.Drawing.Point(53, 7); - this.Label_IsShiny.Name = "Label_IsShiny"; - this.Label_IsShiny.Size = new System.Drawing.Size(20, 20); - this.Label_IsShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.Label_IsShiny.TabIndex = 62; - this.Label_IsShiny.TabStop = false; - this.Label_IsShiny.Visible = false; - // - // BTN_Shinytize - // - this.BTN_Shinytize.Location = new System.Drawing.Point(50, 6); - this.BTN_Shinytize.Name = "BTN_Shinytize"; - this.BTN_Shinytize.Size = new System.Drawing.Size(26, 22); - this.BTN_Shinytize.TabIndex = 1; - this.BTN_Shinytize.Text = "☆"; - this.BTN_Shinytize.UseVisualStyleBackColor = true; - this.BTN_Shinytize.Click += new System.EventHandler(this.updateShinyPID); - // - // Label_PID - // - this.Label_PID.Location = new System.Drawing.Point(25, 11); - this.Label_PID.Name = "Label_PID"; - this.Label_PID.Size = new System.Drawing.Size(77, 13); - this.Label_PID.TabIndex = 0; - this.Label_PID.Text = "PID:"; - this.Label_PID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // TB_AbilityNumber - // - this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_AbilityNumber.Location = new System.Drawing.Point(229, 153); - this.TB_AbilityNumber.Mask = "0"; - this.TB_AbilityNumber.Name = "TB_AbilityNumber"; - this.TB_AbilityNumber.Size = new System.Drawing.Size(19, 20); - this.TB_AbilityNumber.TabIndex = 14; - this.TB_AbilityNumber.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_AbilityNumber.Visible = false; - // - // MT_Level - // - this.MT_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.MT_Level.Enabled = false; - this.MT_Level.Location = new System.Drawing.Point(205, 70); - this.MT_Level.Mask = "000"; - this.MT_Level.Name = "MT_Level"; - this.MT_Level.Size = new System.Drawing.Size(22, 20); - this.MT_Level.TabIndex = 17; - this.MT_Level.Visible = false; - this.MT_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); - // - // DEV_Ability - // - this.DEV_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.DEV_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.DEV_Ability.Enabled = false; - this.DEV_Ability.FormattingEnabled = true; - this.DEV_Ability.Items.AddRange(new object[] { - "Item"}); - this.DEV_Ability.Location = new System.Drawing.Point(105, 153); - this.DEV_Ability.Name = "DEV_Ability"; - this.DEV_Ability.Size = new System.Drawing.Size(122, 21); - this.DEV_Ability.TabIndex = 14; - this.DEV_Ability.Visible = false; + this.CHK_NSparkle.AutoSize = true; + this.CHK_NSparkle.Location = new System.Drawing.Point(110, 3); + this.CHK_NSparkle.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_NSparkle.Name = "CHK_NSparkle"; + this.CHK_NSparkle.Size = new System.Drawing.Size(56, 17); + this.CHK_NSparkle.TabIndex = 18; + this.CHK_NSparkle.Text = "Active"; + this.CHK_NSparkle.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_NSparkle.UseVisualStyleBackColor = true; // // Tab_Met // this.Tab_Met.AllowDrop = true; - this.Tab_Met.Controls.Add(this.L_MetTimeOfDay); - this.Tab_Met.Controls.Add(this.CB_MetTimeOfDay); this.Tab_Met.Controls.Add(this.CHK_AsEgg); - this.Tab_Met.Controls.Add(this.CHK_Fateful); this.Tab_Met.Controls.Add(this.GB_EggConditions); - this.Tab_Met.Controls.Add(this.Label_EncounterType); - this.Tab_Met.Controls.Add(this.Label_MetDate); - this.Tab_Met.Controls.Add(this.Label_MetLevel); - this.Tab_Met.Controls.Add(this.Label_Ball); - this.Tab_Met.Controls.Add(this.Label_MetLocation); - this.Tab_Met.Controls.Add(this.Label_OriginGame); - this.Tab_Met.Controls.Add(this.CB_GameOrigin); - this.Tab_Met.Controls.Add(this.CB_MetLocation); - this.Tab_Met.Controls.Add(this.CB_Ball); - this.Tab_Met.Controls.Add(this.TB_MetLevel); - this.Tab_Met.Controls.Add(this.CAL_MetDate); - this.Tab_Met.Controls.Add(this.CB_EncounterType); + this.Tab_Met.Controls.Add(this.FLP_Met); this.Tab_Met.Location = new System.Drawing.Point(4, 22); this.Tab_Met.Name = "Tab_Met"; this.Tab_Met.Padding = new System.Windows.Forms.Padding(3); @@ -1070,37 +1511,10 @@ public void InitializeComponent() this.Tab_Met.Text = "Met"; this.Tab_Met.UseVisualStyleBackColor = true; // - // L_MetTimeOfDay - // - this.L_MetTimeOfDay.Location = new System.Drawing.Point(25, 165); - this.L_MetTimeOfDay.Name = "L_MetTimeOfDay"; - this.L_MetTimeOfDay.Size = new System.Drawing.Size(77, 13); - this.L_MetTimeOfDay.TabIndex = 10; - this.L_MetTimeOfDay.Text = "Time of Day:"; - this.L_MetTimeOfDay.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.L_MetTimeOfDay.Visible = false; - // - // CB_MetTimeOfDay - // - this.CB_MetTimeOfDay.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_MetTimeOfDay.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_MetTimeOfDay.DropDownWidth = 150; - this.CB_MetTimeOfDay.FormattingEnabled = true; - this.CB_MetTimeOfDay.Items.AddRange(new object[] { - "(None)", - "Morning", - "Day", - "Night"}); - this.CB_MetTimeOfDay.Location = new System.Drawing.Point(105, 162); - this.CB_MetTimeOfDay.Name = "CB_MetTimeOfDay"; - this.CB_MetTimeOfDay.Size = new System.Drawing.Size(122, 21); - this.CB_MetTimeOfDay.TabIndex = 11; - this.CB_MetTimeOfDay.Visible = false; - // // CHK_AsEgg // this.CHK_AsEgg.AutoSize = true; - this.CHK_AsEgg.Location = new System.Drawing.Point(105, 204); + this.CHK_AsEgg.Location = new System.Drawing.Point(110, 204); this.CHK_AsEgg.Name = "CHK_AsEgg"; this.CHK_AsEgg.Size = new System.Drawing.Size(60, 17); this.CHK_AsEgg.TabIndex = 8; @@ -1108,16 +1522,6 @@ public void InitializeComponent() this.CHK_AsEgg.UseVisualStyleBackColor = true; this.CHK_AsEgg.Click += new System.EventHandler(this.updateMetAsEgg); // - // CHK_Fateful - // - this.CHK_Fateful.AutoSize = true; - this.CHK_Fateful.Location = new System.Drawing.Point(105, 115); - this.CHK_Fateful.Name = "CHK_Fateful"; - this.CHK_Fateful.Size = new System.Drawing.Size(110, 17); - this.CHK_Fateful.TabIndex = 6; - this.CHK_Fateful.Text = "Fateful Encounter"; - this.CHK_Fateful.UseVisualStyleBackColor = true; - // // GB_EggConditions // this.GB_EggConditions.Controls.Add(this.CB_EggLocation); @@ -1125,7 +1529,7 @@ public void InitializeComponent() this.GB_EggConditions.Controls.Add(this.Label_EggDate); this.GB_EggConditions.Controls.Add(this.Label_EggLocation); this.GB_EggConditions.Enabled = false; - this.GB_EggConditions.Location = new System.Drawing.Point(37, 226); + this.GB_EggConditions.Location = new System.Drawing.Point(39, 226); this.GB_EggConditions.Name = "GB_EggConditions"; this.GB_EggConditions.Size = new System.Drawing.Size(200, 67); this.GB_EggConditions.TabIndex = 9; @@ -1176,56 +1580,38 @@ public void InitializeComponent() this.Label_EggLocation.Text = "Location:"; this.Label_EggLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_EncounterType + // FLP_Met // - this.Label_EncounterType.Location = new System.Drawing.Point(25, 138); - this.Label_EncounterType.Name = "Label_EncounterType"; - this.Label_EncounterType.Size = new System.Drawing.Size(77, 13); - this.Label_EncounterType.TabIndex = 5; - this.Label_EncounterType.Text = "Encounter:"; - this.Label_EncounterType.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_Met.Controls.Add(this.FLP_OriginGame); + this.FLP_Met.Controls.Add(this.FLP_MetLocation); + this.FLP_Met.Controls.Add(this.FLP_Ball); + this.FLP_Met.Controls.Add(this.FLP_MetLevel); + this.FLP_Met.Controls.Add(this.FLP_MetDate); + this.FLP_Met.Controls.Add(this.FLP_Fateful); + this.FLP_Met.Controls.Add(this.FLP_EncounterType); + this.FLP_Met.Controls.Add(this.FLP_TimeOfDay); + this.FLP_Met.Location = new System.Drawing.Point(0, 24); + this.FLP_Met.Name = "FLP_Met"; + this.FLP_Met.Size = new System.Drawing.Size(272, 175); + this.FLP_Met.TabIndex = 103; // - // Label_MetDate + // FLP_OriginGame // - this.Label_MetDate.Location = new System.Drawing.Point(25, 93); - this.Label_MetDate.Name = "Label_MetDate"; - this.Label_MetDate.Size = new System.Drawing.Size(77, 13); - this.Label_MetDate.TabIndex = 4; - this.Label_MetDate.Text = "Met Date:"; - this.Label_MetDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_MetLevel - // - this.Label_MetLevel.Location = new System.Drawing.Point(25, 73); - this.Label_MetLevel.Name = "Label_MetLevel"; - this.Label_MetLevel.Size = new System.Drawing.Size(77, 13); - this.Label_MetLevel.TabIndex = 3; - this.Label_MetLevel.Text = "Met Level:"; - this.Label_MetLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Ball - // - this.Label_Ball.Location = new System.Drawing.Point(25, 52); - this.Label_Ball.Name = "Label_Ball"; - this.Label_Ball.Size = new System.Drawing.Size(77, 13); - this.Label_Ball.TabIndex = 2; - this.Label_Ball.Text = "Ball:"; - this.Label_Ball.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_MetLocation - // - this.Label_MetLocation.Location = new System.Drawing.Point(25, 30); - this.Label_MetLocation.Name = "Label_MetLocation"; - this.Label_MetLocation.Size = new System.Drawing.Size(77, 13); - this.Label_MetLocation.TabIndex = 1; - this.Label_MetLocation.Text = "Met Location:"; - this.Label_MetLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_OriginGame.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_OriginGame.Controls.Add(this.Label_OriginGame); + this.FLP_OriginGame.Controls.Add(this.CB_GameOrigin); + this.FLP_OriginGame.Location = new System.Drawing.Point(0, 0); + this.FLP_OriginGame.Margin = new System.Windows.Forms.Padding(0); + this.FLP_OriginGame.Name = "FLP_OriginGame"; + this.FLP_OriginGame.Size = new System.Drawing.Size(272, 21); + this.FLP_OriginGame.TabIndex = 112; // // Label_OriginGame // - this.Label_OriginGame.Location = new System.Drawing.Point(25, 11); + this.Label_OriginGame.Location = new System.Drawing.Point(0, 0); + this.Label_OriginGame.Margin = new System.Windows.Forms.Padding(0); this.Label_OriginGame.Name = "Label_OriginGame"; - this.Label_OriginGame.Size = new System.Drawing.Size(77, 13); + this.Label_OriginGame.Size = new System.Drawing.Size(110, 21); this.Label_OriginGame.TabIndex = 0; this.Label_OriginGame.Text = "Origin Game:"; this.Label_OriginGame.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1234,125 +1620,259 @@ public void InitializeComponent() // this.CB_GameOrigin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_GameOrigin.FormattingEnabled = true; - this.CB_GameOrigin.Location = new System.Drawing.Point(105, 7); + this.CB_GameOrigin.Location = new System.Drawing.Point(110, 0); + this.CB_GameOrigin.Margin = new System.Windows.Forms.Padding(0); this.CB_GameOrigin.Name = "CB_GameOrigin"; - this.CB_GameOrigin.Size = new System.Drawing.Size(122, 21); + this.CB_GameOrigin.Size = new System.Drawing.Size(126, 21); this.CB_GameOrigin.TabIndex = 1; this.CB_GameOrigin.SelectedIndexChanged += new System.EventHandler(this.updateOriginGame); // + // FLP_MetLocation + // + this.FLP_MetLocation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetLocation.Controls.Add(this.Label_MetLocation); + this.FLP_MetLocation.Controls.Add(this.CB_MetLocation); + this.FLP_MetLocation.Location = new System.Drawing.Point(0, 21); + this.FLP_MetLocation.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetLocation.Name = "FLP_MetLocation"; + this.FLP_MetLocation.Size = new System.Drawing.Size(272, 21); + this.FLP_MetLocation.TabIndex = 113; + // + // Label_MetLocation + // + this.Label_MetLocation.Location = new System.Drawing.Point(0, 0); + this.Label_MetLocation.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetLocation.Name = "Label_MetLocation"; + this.Label_MetLocation.Size = new System.Drawing.Size(110, 21); + this.Label_MetLocation.TabIndex = 1; + this.Label_MetLocation.Text = "Met Location:"; + this.Label_MetLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_MetLocation // this.CB_MetLocation.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_MetLocation.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_MetLocation.DropDownWidth = 150; this.CB_MetLocation.FormattingEnabled = true; - this.CB_MetLocation.Location = new System.Drawing.Point(105, 27); + this.CB_MetLocation.Location = new System.Drawing.Point(110, 0); + this.CB_MetLocation.Margin = new System.Windows.Forms.Padding(0); this.CB_MetLocation.Name = "CB_MetLocation"; - this.CB_MetLocation.Size = new System.Drawing.Size(122, 21); + this.CB_MetLocation.Size = new System.Drawing.Size(126, 21); this.CB_MetLocation.TabIndex = 2; this.CB_MetLocation.SelectedIndexChanged += new System.EventHandler(this.validateLocation); this.CB_MetLocation.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_MetLocation.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_Ball + // + this.FLP_Ball.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Ball.Controls.Add(this.Label_Ball); + this.FLP_Ball.Controls.Add(this.CB_Ball); + this.FLP_Ball.Location = new System.Drawing.Point(0, 42); + this.FLP_Ball.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Ball.Name = "FLP_Ball"; + this.FLP_Ball.Size = new System.Drawing.Size(272, 21); + this.FLP_Ball.TabIndex = 114; + // + // Label_Ball + // + this.Label_Ball.Location = new System.Drawing.Point(0, 0); + this.Label_Ball.Margin = new System.Windows.Forms.Padding(0); + this.Label_Ball.Name = "Label_Ball"; + this.Label_Ball.Size = new System.Drawing.Size(110, 21); + this.Label_Ball.TabIndex = 2; + this.Label_Ball.Text = "Ball:"; + this.Label_Ball.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_Ball // this.CB_Ball.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Ball.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ball.FormattingEnabled = true; - this.CB_Ball.Location = new System.Drawing.Point(105, 48); + this.CB_Ball.Location = new System.Drawing.Point(110, 0); + this.CB_Ball.Margin = new System.Windows.Forms.Padding(0); this.CB_Ball.Name = "CB_Ball"; - this.CB_Ball.Size = new System.Drawing.Size(122, 21); + this.CB_Ball.Size = new System.Drawing.Size(126, 21); this.CB_Ball.TabIndex = 3; this.CB_Ball.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); this.CB_Ball.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_Ball.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_MetLevel + // + this.FLP_MetLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetLevel.Controls.Add(this.Label_MetLevel); + this.FLP_MetLevel.Controls.Add(this.TB_MetLevel); + this.FLP_MetLevel.Location = new System.Drawing.Point(0, 63); + this.FLP_MetLevel.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetLevel.Name = "FLP_MetLevel"; + this.FLP_MetLevel.Size = new System.Drawing.Size(272, 21); + this.FLP_MetLevel.TabIndex = 115; + // + // Label_MetLevel + // + this.Label_MetLevel.Location = new System.Drawing.Point(0, 0); + this.Label_MetLevel.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetLevel.Name = "Label_MetLevel"; + this.Label_MetLevel.Size = new System.Drawing.Size(110, 21); + this.Label_MetLevel.TabIndex = 3; + this.Label_MetLevel.Text = "Met Level:"; + this.Label_MetLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // TB_MetLevel // this.TB_MetLevel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_MetLevel.Location = new System.Drawing.Point(105, 70); + this.TB_MetLevel.Location = new System.Drawing.Point(110, 0); + this.TB_MetLevel.Margin = new System.Windows.Forms.Padding(0); this.TB_MetLevel.Mask = "000"; this.TB_MetLevel.Name = "TB_MetLevel"; - this.TB_MetLevel.Size = new System.Drawing.Size(122, 20); + this.TB_MetLevel.Size = new System.Drawing.Size(126, 20); this.TB_MetLevel.TabIndex = 4; this.TB_MetLevel.TextChanged += new System.EventHandler(this.update255_MTB); // + // FLP_MetDate + // + this.FLP_MetDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetDate.Controls.Add(this.Label_MetDate); + this.FLP_MetDate.Controls.Add(this.CAL_MetDate); + this.FLP_MetDate.Location = new System.Drawing.Point(0, 84); + this.FLP_MetDate.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetDate.Name = "FLP_MetDate"; + this.FLP_MetDate.Size = new System.Drawing.Size(272, 21); + this.FLP_MetDate.TabIndex = 116; + // + // Label_MetDate + // + this.Label_MetDate.Location = new System.Drawing.Point(0, 0); + this.Label_MetDate.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetDate.Name = "Label_MetDate"; + this.Label_MetDate.Size = new System.Drawing.Size(110, 21); + this.Label_MetDate.TabIndex = 4; + this.Label_MetDate.Text = "Met Date:"; + this.Label_MetDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CAL_MetDate // this.CAL_MetDate.CustomFormat = "MM/dd/yyyy"; this.CAL_MetDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.CAL_MetDate.Location = new System.Drawing.Point(105, 90); + this.CAL_MetDate.Location = new System.Drawing.Point(110, 0); + this.CAL_MetDate.Margin = new System.Windows.Forms.Padding(0); this.CAL_MetDate.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); this.CAL_MetDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); this.CAL_MetDate.Name = "CAL_MetDate"; - this.CAL_MetDate.Size = new System.Drawing.Size(122, 20); + this.CAL_MetDate.Size = new System.Drawing.Size(126, 20); this.CAL_MetDate.TabIndex = 5; this.CAL_MetDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); // + // FLP_Fateful + // + this.FLP_Fateful.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Fateful.Controls.Add(this.PAN_Fateful); + this.FLP_Fateful.Controls.Add(this.CHK_Fateful); + this.FLP_Fateful.Location = new System.Drawing.Point(0, 105); + this.FLP_Fateful.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Fateful.Name = "FLP_Fateful"; + this.FLP_Fateful.Size = new System.Drawing.Size(272, 21); + this.FLP_Fateful.TabIndex = 117; + // + // PAN_Fateful + // + this.PAN_Fateful.Location = new System.Drawing.Point(0, 0); + this.PAN_Fateful.Margin = new System.Windows.Forms.Padding(0); + this.PAN_Fateful.Name = "PAN_Fateful"; + this.PAN_Fateful.Size = new System.Drawing.Size(110, 21); + this.PAN_Fateful.TabIndex = 104; + // + // CHK_Fateful + // + this.CHK_Fateful.AutoSize = true; + this.CHK_Fateful.Location = new System.Drawing.Point(110, 3); + this.CHK_Fateful.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Fateful.Name = "CHK_Fateful"; + this.CHK_Fateful.Size = new System.Drawing.Size(110, 17); + this.CHK_Fateful.TabIndex = 6; + this.CHK_Fateful.Text = "Fateful Encounter"; + this.CHK_Fateful.UseVisualStyleBackColor = true; + // + // FLP_EncounterType + // + this.FLP_EncounterType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EncounterType.Controls.Add(this.Label_EncounterType); + this.FLP_EncounterType.Controls.Add(this.CB_EncounterType); + this.FLP_EncounterType.Location = new System.Drawing.Point(0, 126); + this.FLP_EncounterType.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EncounterType.Name = "FLP_EncounterType"; + this.FLP_EncounterType.Size = new System.Drawing.Size(272, 21); + this.FLP_EncounterType.TabIndex = 118; + // + // Label_EncounterType + // + this.Label_EncounterType.Location = new System.Drawing.Point(0, 0); + this.Label_EncounterType.Margin = new System.Windows.Forms.Padding(0); + this.Label_EncounterType.Name = "Label_EncounterType"; + this.Label_EncounterType.Size = new System.Drawing.Size(110, 21); + this.Label_EncounterType.TabIndex = 5; + this.Label_EncounterType.Text = "Encounter:"; + this.Label_EncounterType.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_EncounterType // this.CB_EncounterType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_EncounterType.DropDownWidth = 160; this.CB_EncounterType.FormattingEnabled = true; - this.CB_EncounterType.Location = new System.Drawing.Point(105, 135); + this.CB_EncounterType.Location = new System.Drawing.Point(110, 0); + this.CB_EncounterType.Margin = new System.Windows.Forms.Padding(0); this.CB_EncounterType.Name = "CB_EncounterType"; - this.CB_EncounterType.Size = new System.Drawing.Size(122, 21); + this.CB_EncounterType.Size = new System.Drawing.Size(126, 21); this.CB_EncounterType.TabIndex = 7; // + // FLP_TimeOfDay + // + this.FLP_TimeOfDay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_TimeOfDay.Controls.Add(this.L_MetTimeOfDay); + this.FLP_TimeOfDay.Controls.Add(this.CB_MetTimeOfDay); + this.FLP_TimeOfDay.Location = new System.Drawing.Point(0, 147); + this.FLP_TimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.FLP_TimeOfDay.Name = "FLP_TimeOfDay"; + this.FLP_TimeOfDay.Size = new System.Drawing.Size(272, 21); + this.FLP_TimeOfDay.TabIndex = 119; + // + // L_MetTimeOfDay + // + this.L_MetTimeOfDay.Location = new System.Drawing.Point(0, 0); + this.L_MetTimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.L_MetTimeOfDay.Name = "L_MetTimeOfDay"; + this.L_MetTimeOfDay.Size = new System.Drawing.Size(110, 21); + this.L_MetTimeOfDay.TabIndex = 10; + this.L_MetTimeOfDay.Text = "Time of Day:"; + this.L_MetTimeOfDay.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.L_MetTimeOfDay.Visible = false; + // + // CB_MetTimeOfDay + // + this.CB_MetTimeOfDay.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_MetTimeOfDay.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_MetTimeOfDay.DropDownWidth = 150; + this.CB_MetTimeOfDay.FormattingEnabled = true; + this.CB_MetTimeOfDay.Items.AddRange(new object[] { + "(None)", + "Morning", + "Day", + "Night"}); + this.CB_MetTimeOfDay.Location = new System.Drawing.Point(110, 0); + this.CB_MetTimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.CB_MetTimeOfDay.Name = "CB_MetTimeOfDay"; + this.CB_MetTimeOfDay.Size = new System.Drawing.Size(126, 21); + this.CB_MetTimeOfDay.TabIndex = 11; + this.CB_MetTimeOfDay.Visible = false; + // // Tab_Stats // this.Tab_Stats.AllowDrop = true; - this.Tab_Stats.Controls.Add(this.Stat_SPE); - this.Tab_Stats.Controls.Add(this.Stat_SPD); - this.Tab_Stats.Controls.Add(this.Stat_SPA); - this.Tab_Stats.Controls.Add(this.Stat_DEF); - this.Tab_Stats.Controls.Add(this.Stat_ATK); - this.Tab_Stats.Controls.Add(this.Stat_HP); - this.Tab_Stats.Controls.Add(this.CB_HPType); - this.Tab_Stats.Controls.Add(this.CHK_HackedStats); - this.Tab_Stats.Controls.Add(this.Label_CharacteristicPrefix); - this.Tab_Stats.Controls.Add(this.L_Potential); - this.Tab_Stats.Controls.Add(this.TB_IVTotal); - this.Tab_Stats.Controls.Add(this.L_Characteristic); - this.Tab_Stats.Controls.Add(this.TB_Sheen); - this.Tab_Stats.Controls.Add(this.TB_Tough); - this.Tab_Stats.Controls.Add(this.TB_Smart); - this.Tab_Stats.Controls.Add(this.TB_Cute); - this.Tab_Stats.Controls.Add(this.TB_Beauty); - this.Tab_Stats.Controls.Add(this.TB_Cool); - this.Tab_Stats.Controls.Add(this.TB_SPEIV); - this.Tab_Stats.Controls.Add(this.TB_SPDIV); - this.Tab_Stats.Controls.Add(this.TB_SPAIV); - this.Tab_Stats.Controls.Add(this.TB_DEFIV); - this.Tab_Stats.Controls.Add(this.TB_ATKIV); - this.Tab_Stats.Controls.Add(this.TB_HPIV); - this.Tab_Stats.Controls.Add(this.TB_ATKEV); - this.Tab_Stats.Controls.Add(this.TB_DEFEV); - this.Tab_Stats.Controls.Add(this.TB_SPEEV); - this.Tab_Stats.Controls.Add(this.TB_SPDEV); - this.Tab_Stats.Controls.Add(this.TB_SPAEV); - this.Tab_Stats.Controls.Add(this.TB_HPEV); - this.Tab_Stats.Controls.Add(this.Label_Sheen); - this.Tab_Stats.Controls.Add(this.Label_Tough); - this.Tab_Stats.Controls.Add(this.Label_Smart); - this.Tab_Stats.Controls.Add(this.Label_Cute); - this.Tab_Stats.Controls.Add(this.Label_Beauty); - this.Tab_Stats.Controls.Add(this.Label_Cool); - this.Tab_Stats.Controls.Add(this.Label_ContestStats); + this.Tab_Stats.Controls.Add(this.PAN_Contest); + this.Tab_Stats.Controls.Add(this.FLP_Stats); this.Tab_Stats.Controls.Add(this.BTN_RandomEVs); this.Tab_Stats.Controls.Add(this.BTN_RandomIVs); - this.Tab_Stats.Controls.Add(this.Label_HiddenPowerPrefix); - this.Tab_Stats.Controls.Add(this.Label_Stats); - this.Tab_Stats.Controls.Add(this.Label_EVs); - this.Tab_Stats.Controls.Add(this.Label_IVs); - this.Tab_Stats.Controls.Add(this.Label_Total); - this.Tab_Stats.Controls.Add(this.Label_SPE); - this.Tab_Stats.Controls.Add(this.Label_SPD); - this.Tab_Stats.Controls.Add(this.Label_SPA); - this.Tab_Stats.Controls.Add(this.Label_DEF); - this.Tab_Stats.Controls.Add(this.Label_ATK); - this.Tab_Stats.Controls.Add(this.Label_HP); - this.Tab_Stats.Controls.Add(this.TB_EVTotal); this.Tab_Stats.Location = new System.Drawing.Point(4, 22); this.Tab_Stats.Name = "Tab_Stats"; this.Tab_Stats.Padding = new System.Windows.Forms.Padding(3); @@ -1361,96 +1881,193 @@ public void InitializeComponent() this.Tab_Stats.Text = "Stats"; this.Tab_Stats.UseVisualStyleBackColor = true; // - // Stat_SPE + // PAN_Contest // - this.Stat_SPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPE.Enabled = false; - this.Stat_SPE.Location = new System.Drawing.Point(167, 129); - this.Stat_SPE.Mask = "00000"; - this.Stat_SPE.Name = "Stat_SPE"; - this.Stat_SPE.PromptChar = ' '; - this.Stat_SPE.Size = new System.Drawing.Size(31, 20); - this.Stat_SPE.TabIndex = 50; - this.Stat_SPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.PAN_Contest.Controls.Add(this.TB_Sheen); + this.PAN_Contest.Controls.Add(this.TB_Tough); + this.PAN_Contest.Controls.Add(this.TB_Smart); + this.PAN_Contest.Controls.Add(this.TB_Cute); + this.PAN_Contest.Controls.Add(this.TB_Beauty); + this.PAN_Contest.Controls.Add(this.TB_Cool); + this.PAN_Contest.Controls.Add(this.Label_Sheen); + this.PAN_Contest.Controls.Add(this.Label_Tough); + this.PAN_Contest.Controls.Add(this.Label_Smart); + this.PAN_Contest.Controls.Add(this.Label_Cute); + this.PAN_Contest.Controls.Add(this.Label_Beauty); + this.PAN_Contest.Controls.Add(this.Label_Cool); + this.PAN_Contest.Controls.Add(this.Label_ContestStats); + this.PAN_Contest.Location = new System.Drawing.Point(21, 247); + this.PAN_Contest.Name = "PAN_Contest"; + this.PAN_Contest.Size = new System.Drawing.Size(230, 50); + this.PAN_Contest.TabIndex = 104; // - // Stat_SPD + // TB_Sheen // - this.Stat_SPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPD.Enabled = false; - this.Stat_SPD.Location = new System.Drawing.Point(167, 107); - this.Stat_SPD.Mask = "00000"; - this.Stat_SPD.Name = "Stat_SPD"; - this.Stat_SPD.PromptChar = ' '; - this.Stat_SPD.Size = new System.Drawing.Size(31, 20); - this.Stat_SPD.TabIndex = 49; - this.Stat_SPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Sheen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Sheen.Location = new System.Drawing.Point(192, 30); + this.TB_Sheen.Mask = "000"; + this.TB_Sheen.Name = "TB_Sheen"; + this.TB_Sheen.Size = new System.Drawing.Size(31, 20); + this.TB_Sheen.TabIndex = 45; + this.TB_Sheen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_SPA + // TB_Tough // - this.Stat_SPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPA.Enabled = false; - this.Stat_SPA.Location = new System.Drawing.Point(167, 85); - this.Stat_SPA.Mask = "00000"; - this.Stat_SPA.Name = "Stat_SPA"; - this.Stat_SPA.PromptChar = ' '; - this.Stat_SPA.Size = new System.Drawing.Size(31, 20); - this.Stat_SPA.TabIndex = 48; - this.Stat_SPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Tough.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Tough.Location = new System.Drawing.Point(155, 30); + this.TB_Tough.Mask = "000"; + this.TB_Tough.Name = "TB_Tough"; + this.TB_Tough.Size = new System.Drawing.Size(31, 20); + this.TB_Tough.TabIndex = 44; + this.TB_Tough.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_DEF + // TB_Smart // - this.Stat_DEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_DEF.Enabled = false; - this.Stat_DEF.Location = new System.Drawing.Point(167, 63); - this.Stat_DEF.Mask = "00000"; - this.Stat_DEF.Name = "Stat_DEF"; - this.Stat_DEF.PromptChar = ' '; - this.Stat_DEF.Size = new System.Drawing.Size(31, 20); - this.Stat_DEF.TabIndex = 47; - this.Stat_DEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Smart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Smart.Location = new System.Drawing.Point(118, 30); + this.TB_Smart.Mask = "000"; + this.TB_Smart.Name = "TB_Smart"; + this.TB_Smart.Size = new System.Drawing.Size(31, 20); + this.TB_Smart.TabIndex = 43; + this.TB_Smart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_ATK + // TB_Cute // - this.Stat_ATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_ATK.Enabled = false; - this.Stat_ATK.Location = new System.Drawing.Point(167, 41); - this.Stat_ATK.Mask = "00000"; - this.Stat_ATK.Name = "Stat_ATK"; - this.Stat_ATK.PromptChar = ' '; - this.Stat_ATK.Size = new System.Drawing.Size(31, 20); - this.Stat_ATK.TabIndex = 46; - this.Stat_ATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Cute.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Cute.Location = new System.Drawing.Point(81, 30); + this.TB_Cute.Mask = "000"; + this.TB_Cute.Name = "TB_Cute"; + this.TB_Cute.Size = new System.Drawing.Size(31, 20); + this.TB_Cute.TabIndex = 42; + this.TB_Cute.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_HP + // TB_Beauty // - this.Stat_HP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_HP.Enabled = false; - this.Stat_HP.Location = new System.Drawing.Point(167, 19); - this.Stat_HP.Mask = "00000"; - this.Stat_HP.Name = "Stat_HP"; - this.Stat_HP.PromptChar = ' '; - this.Stat_HP.Size = new System.Drawing.Size(31, 20); - this.Stat_HP.TabIndex = 45; - this.Stat_HP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.Stat_HP.TextChanged += new System.EventHandler(this.updateHackedStatText); + this.TB_Beauty.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Beauty.Location = new System.Drawing.Point(44, 30); + this.TB_Beauty.Mask = "000"; + this.TB_Beauty.Name = "TB_Beauty"; + this.TB_Beauty.Size = new System.Drawing.Size(31, 20); + this.TB_Beauty.TabIndex = 41; + this.TB_Beauty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // CB_HPType + // TB_Cool // - this.CB_HPType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_HPType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_HPType.DropDownWidth = 80; - this.CB_HPType.FormattingEnabled = true; - this.CB_HPType.Location = new System.Drawing.Point(162, 176); - this.CB_HPType.Name = "CB_HPType"; - this.CB_HPType.Size = new System.Drawing.Size(70, 21); - this.CB_HPType.TabIndex = 44; - this.CB_HPType.SelectedIndexChanged += new System.EventHandler(this.updateHPType); + this.TB_Cool.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Cool.Location = new System.Drawing.Point(7, 30); + this.TB_Cool.Mask = "000"; + this.TB_Cool.Name = "TB_Cool"; + this.TB_Cool.Size = new System.Drawing.Size(31, 20); + this.TB_Cool.TabIndex = 40; + this.TB_Cool.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // Label_Sheen + // + this.Label_Sheen.Location = new System.Drawing.Point(186, 17); + this.Label_Sheen.Name = "Label_Sheen"; + this.Label_Sheen.Size = new System.Drawing.Size(43, 13); + this.Label_Sheen.TabIndex = 52; + this.Label_Sheen.Text = "Sheen"; + this.Label_Sheen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Tough + // + this.Label_Tough.Location = new System.Drawing.Point(149, 17); + this.Label_Tough.Name = "Label_Tough"; + this.Label_Tough.Size = new System.Drawing.Size(43, 13); + this.Label_Tough.TabIndex = 51; + this.Label_Tough.Text = "Tough"; + this.Label_Tough.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Smart + // + this.Label_Smart.Location = new System.Drawing.Point(112, 17); + this.Label_Smart.Name = "Label_Smart"; + this.Label_Smart.Size = new System.Drawing.Size(43, 13); + this.Label_Smart.TabIndex = 50; + this.Label_Smart.Text = "Clever"; + this.Label_Smart.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Cute + // + this.Label_Cute.Location = new System.Drawing.Point(75, 17); + this.Label_Cute.Name = "Label_Cute"; + this.Label_Cute.Size = new System.Drawing.Size(43, 13); + this.Label_Cute.TabIndex = 49; + this.Label_Cute.Text = "Cute"; + this.Label_Cute.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Beauty + // + this.Label_Beauty.Location = new System.Drawing.Point(38, 17); + this.Label_Beauty.Name = "Label_Beauty"; + this.Label_Beauty.Size = new System.Drawing.Size(43, 13); + this.Label_Beauty.TabIndex = 48; + this.Label_Beauty.Text = "Beauty"; + this.Label_Beauty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Cool + // + this.Label_Cool.Location = new System.Drawing.Point(1, 17); + this.Label_Cool.Name = "Label_Cool"; + this.Label_Cool.Size = new System.Drawing.Size(43, 13); + this.Label_Cool.TabIndex = 47; + this.Label_Cool.Text = "Cool"; + this.Label_Cool.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_ContestStats + // + this.Label_ContestStats.Location = new System.Drawing.Point(46, 1); + this.Label_ContestStats.Name = "Label_ContestStats"; + this.Label_ContestStats.Size = new System.Drawing.Size(140, 13); + this.Label_ContestStats.TabIndex = 46; + this.Label_ContestStats.Text = "Contest Stats"; + this.Label_ContestStats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // FLP_Stats + // + this.FLP_Stats.Controls.Add(this.FLP_StatHeader); + this.FLP_Stats.Controls.Add(this.FLP_HP); + this.FLP_Stats.Controls.Add(this.FLP_Atk); + this.FLP_Stats.Controls.Add(this.FLP_Def); + this.FLP_Stats.Controls.Add(this.FLP_SpA); + this.FLP_Stats.Controls.Add(this.FLP_SpD); + this.FLP_Stats.Controls.Add(this.FLP_Spe); + this.FLP_Stats.Controls.Add(this.FLP_StatsTotal); + this.FLP_Stats.Controls.Add(this.FLP_HPType); + this.FLP_Stats.Controls.Add(this.FLP_Characteristic); + this.FLP_Stats.Location = new System.Drawing.Point(0, 2); + this.FLP_Stats.Name = "FLP_Stats"; + this.FLP_Stats.Size = new System.Drawing.Size(272, 206); + this.FLP_Stats.TabIndex = 103; + // + // FLP_StatHeader + // + this.FLP_StatHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatHeader.Controls.Add(this.FLP_HackedStats); + this.FLP_StatHeader.Controls.Add(this.FLP_StatsHeaderRight); + this.FLP_StatHeader.Location = new System.Drawing.Point(0, 0); + this.FLP_StatHeader.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatHeader.Name = "FLP_StatHeader"; + this.FLP_StatHeader.Size = new System.Drawing.Size(272, 22); + this.FLP_StatHeader.TabIndex = 122; + // + // FLP_HackedStats + // + this.FLP_HackedStats.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HackedStats.Controls.Add(this.CHK_HackedStats); + this.FLP_HackedStats.Location = new System.Drawing.Point(0, 0); + this.FLP_HackedStats.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HackedStats.Name = "FLP_HackedStats"; + this.FLP_HackedStats.Size = new System.Drawing.Size(107, 21); + this.FLP_HackedStats.TabIndex = 122; // // CHK_HackedStats // this.CHK_HackedStats.AutoSize = true; this.CHK_HackedStats.Enabled = false; - this.CHK_HackedStats.Location = new System.Drawing.Point(3, 3); + this.CHK_HackedStats.Location = new System.Drawing.Point(0, 3); + this.CHK_HackedStats.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.CHK_HackedStats.Name = "CHK_HackedStats"; this.CHK_HackedStats.Size = new System.Drawing.Size(91, 17); this.CHK_HackedStats.TabIndex = 18; @@ -1459,175 +2076,87 @@ public void InitializeComponent() this.CHK_HackedStats.Visible = false; this.CHK_HackedStats.Click += new System.EventHandler(this.updateHackedStats); // - // Label_CharacteristicPrefix + // FLP_StatsHeaderRight // - this.Label_CharacteristicPrefix.Location = new System.Drawing.Point(29, 198); - this.Label_CharacteristicPrefix.Name = "Label_CharacteristicPrefix"; - this.Label_CharacteristicPrefix.Size = new System.Drawing.Size(103, 13); - this.Label_CharacteristicPrefix.TabIndex = 43; - this.Label_CharacteristicPrefix.Text = "Characteristic:"; - this.Label_CharacteristicPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_StatsHeaderRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_IVs); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_EVs); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_Stats); + this.FLP_StatsHeaderRight.Location = new System.Drawing.Point(107, 0); + this.FLP_StatsHeaderRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsHeaderRight.Name = "FLP_StatsHeaderRight"; + this.FLP_StatsHeaderRight.Size = new System.Drawing.Size(162, 21); + this.FLP_StatsHeaderRight.TabIndex = 123; // - // L_Potential + // Label_IVs // - this.L_Potential.AutoSize = true; - this.L_Potential.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_Potential.Location = new System.Drawing.Point(165, 153); - this.L_Potential.Name = "L_Potential"; - this.L_Potential.Size = new System.Drawing.Size(67, 16); - this.L_Potential.TabIndex = 42; - this.L_Potential.Text = "(potential)"; + this.Label_IVs.Location = new System.Drawing.Point(0, 0); + this.Label_IVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_IVs.Name = "Label_IVs"; + this.Label_IVs.Size = new System.Drawing.Size(30, 21); + this.Label_IVs.TabIndex = 26; + this.Label_IVs.Text = "IVs"; + this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // TB_IVTotal + // Label_EVs // - this.TB_IVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_IVTotal.Enabled = false; - this.TB_IVTotal.Location = new System.Drawing.Point(102, 151); - this.TB_IVTotal.MaxLength = 3; - this.TB_IVTotal.Name = "TB_IVTotal"; - this.TB_IVTotal.Size = new System.Drawing.Size(22, 20); - this.TB_IVTotal.TabIndex = 41; - this.TB_IVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Label_EVs.Location = new System.Drawing.Point(30, 0); + this.Label_EVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_EVs.Name = "Label_EVs"; + this.Label_EVs.Size = new System.Drawing.Size(35, 21); + this.Label_EVs.TabIndex = 27; + this.Label_EVs.Text = "EVs"; + this.Label_EVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // L_Characteristic + // Label_Stats // - this.L_Characteristic.AutoSize = true; - this.L_Characteristic.Location = new System.Drawing.Point(131, 198); - this.L_Characteristic.Name = "L_Characteristic"; - this.L_Characteristic.Size = new System.Drawing.Size(34, 13); - this.L_Characteristic.TabIndex = 40; - this.L_Characteristic.Text = "(char)"; + this.Label_Stats.Location = new System.Drawing.Point(65, 0); + this.Label_Stats.Margin = new System.Windows.Forms.Padding(0); + this.Label_Stats.Name = "Label_Stats"; + this.Label_Stats.Size = new System.Drawing.Size(35, 21); + this.Label_Stats.TabIndex = 28; + this.Label_Stats.Text = "Stats"; + this.Label_Stats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // TB_Sheen + // FLP_HP // - this.TB_Sheen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Sheen.Location = new System.Drawing.Point(213, 279); - this.TB_Sheen.Mask = "000"; - this.TB_Sheen.Name = "TB_Sheen"; - this.TB_Sheen.Size = new System.Drawing.Size(31, 20); - this.TB_Sheen.TabIndex = 20; - this.TB_Sheen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Sheen.TextChanged += new System.EventHandler(this.update255_MTB); + this.FLP_HP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HP.Controls.Add(this.Label_HP); + this.FLP_HP.Controls.Add(this.FLP_HPRight); + this.FLP_HP.Location = new System.Drawing.Point(0, 22); + this.FLP_HP.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HP.Name = "FLP_HP"; + this.FLP_HP.Size = new System.Drawing.Size(272, 21); + this.FLP_HP.TabIndex = 123; // - // TB_Tough + // Label_HP // - this.TB_Tough.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Tough.Location = new System.Drawing.Point(176, 279); - this.TB_Tough.Mask = "000"; - this.TB_Tough.Name = "TB_Tough"; - this.TB_Tough.Size = new System.Drawing.Size(31, 20); - this.TB_Tough.TabIndex = 19; - this.TB_Tough.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Tough.TextChanged += new System.EventHandler(this.update255_MTB); + this.Label_HP.Location = new System.Drawing.Point(0, 0); + this.Label_HP.Margin = new System.Windows.Forms.Padding(0); + this.Label_HP.Name = "Label_HP"; + this.Label_HP.Size = new System.Drawing.Size(110, 21); + this.Label_HP.TabIndex = 19; + this.Label_HP.Text = "HP:"; + this.Label_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_HP.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); // - // TB_Smart + // FLP_HPRight // - this.TB_Smart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Smart.Location = new System.Drawing.Point(139, 279); - this.TB_Smart.Mask = "000"; - this.TB_Smart.Name = "TB_Smart"; - this.TB_Smart.Size = new System.Drawing.Size(31, 20); - this.TB_Smart.TabIndex = 18; - this.TB_Smart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Smart.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Cute - // - this.TB_Cute.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Cute.Location = new System.Drawing.Point(102, 279); - this.TB_Cute.Mask = "000"; - this.TB_Cute.Name = "TB_Cute"; - this.TB_Cute.Size = new System.Drawing.Size(31, 20); - this.TB_Cute.TabIndex = 17; - this.TB_Cute.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Cute.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Beauty - // - this.TB_Beauty.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Beauty.Location = new System.Drawing.Point(65, 279); - this.TB_Beauty.Mask = "000"; - this.TB_Beauty.Name = "TB_Beauty"; - this.TB_Beauty.Size = new System.Drawing.Size(31, 20); - this.TB_Beauty.TabIndex = 16; - this.TB_Beauty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Beauty.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Cool - // - this.TB_Cool.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Cool.Location = new System.Drawing.Point(28, 279); - this.TB_Cool.Mask = "000"; - this.TB_Cool.Name = "TB_Cool"; - this.TB_Cool.Size = new System.Drawing.Size(31, 20); - this.TB_Cool.TabIndex = 15; - this.TB_Cool.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Cool.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_SPEIV - // - this.TB_SPEIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPEIV.Location = new System.Drawing.Point(102, 129); - this.TB_SPEIV.Mask = "00"; - this.TB_SPEIV.Name = "TB_SPEIV"; - this.TB_SPEIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPEIV.TabIndex = 6; - this.TB_SPEIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPEIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPEIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_SPDIV - // - this.TB_SPDIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPDIV.Location = new System.Drawing.Point(102, 107); - this.TB_SPDIV.Mask = "00"; - this.TB_SPDIV.Name = "TB_SPDIV"; - this.TB_SPDIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPDIV.TabIndex = 5; - this.TB_SPDIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPDIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPDIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_SPAIV - // - this.TB_SPAIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPAIV.Location = new System.Drawing.Point(102, 85); - this.TB_SPAIV.Mask = "00"; - this.TB_SPAIV.Name = "TB_SPAIV"; - this.TB_SPAIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPAIV.TabIndex = 4; - this.TB_SPAIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPAIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPAIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_DEFIV - // - this.TB_DEFIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_DEFIV.Location = new System.Drawing.Point(102, 63); - this.TB_DEFIV.Mask = "00"; - this.TB_DEFIV.Name = "TB_DEFIV"; - this.TB_DEFIV.Size = new System.Drawing.Size(22, 20); - this.TB_DEFIV.TabIndex = 3; - this.TB_DEFIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_DEFIV.Click += new System.EventHandler(this.clickIV); - this.TB_DEFIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_ATKIV - // - this.TB_ATKIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_ATKIV.Location = new System.Drawing.Point(102, 41); - this.TB_ATKIV.Mask = "00"; - this.TB_ATKIV.Name = "TB_ATKIV"; - this.TB_ATKIV.Size = new System.Drawing.Size(22, 20); - this.TB_ATKIV.TabIndex = 2; - this.TB_ATKIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_ATKIV.Click += new System.EventHandler(this.clickIV); - this.TB_ATKIV.TextChanged += new System.EventHandler(this.updateIVs); + this.FLP_HPRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HPRight.Controls.Add(this.TB_HPIV); + this.FLP_HPRight.Controls.Add(this.TB_HPEV); + this.FLP_HPRight.Controls.Add(this.Stat_HP); + this.FLP_HPRight.Location = new System.Drawing.Point(110, 0); + this.FLP_HPRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HPRight.Name = "FLP_HPRight"; + this.FLP_HPRight.Size = new System.Drawing.Size(162, 21); + this.FLP_HPRight.TabIndex = 121; // // TB_HPIV // this.TB_HPIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HPIV.Location = new System.Drawing.Point(102, 19); + this.TB_HPIV.Location = new System.Drawing.Point(0, 0); + this.TB_HPIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.TB_HPIV.Mask = "00"; this.TB_HPIV.Name = "TB_HPIV"; this.TB_HPIV.Size = new System.Drawing.Size(22, 20); @@ -1636,140 +2165,552 @@ public void InitializeComponent() this.TB_HPIV.Click += new System.EventHandler(this.clickIV); this.TB_HPIV.TextChanged += new System.EventHandler(this.updateIVs); // - // TB_ATKEV - // - this.TB_ATKEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_ATKEV.Location = new System.Drawing.Point(130, 41); - this.TB_ATKEV.Mask = "000"; - this.TB_ATKEV.Name = "TB_ATKEV"; - this.TB_ATKEV.Size = new System.Drawing.Size(31, 20); - this.TB_ATKEV.TabIndex = 8; - this.TB_ATKEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_ATKEV.Click += new System.EventHandler(this.clickEV); - this.TB_ATKEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_DEFEV - // - this.TB_DEFEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_DEFEV.Location = new System.Drawing.Point(130, 63); - this.TB_DEFEV.Mask = "000"; - this.TB_DEFEV.Name = "TB_DEFEV"; - this.TB_DEFEV.Size = new System.Drawing.Size(31, 20); - this.TB_DEFEV.TabIndex = 9; - this.TB_DEFEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_DEFEV.Click += new System.EventHandler(this.clickEV); - this.TB_DEFEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPEEV - // - this.TB_SPEEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPEEV.Location = new System.Drawing.Point(130, 129); - this.TB_SPEEV.Mask = "000"; - this.TB_SPEEV.Name = "TB_SPEEV"; - this.TB_SPEEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPEEV.TabIndex = 12; - this.TB_SPEEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPEEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPEEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPDEV - // - this.TB_SPDEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPDEV.Location = new System.Drawing.Point(130, 107); - this.TB_SPDEV.Mask = "000"; - this.TB_SPDEV.Name = "TB_SPDEV"; - this.TB_SPDEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPDEV.TabIndex = 11; - this.TB_SPDEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPDEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPDEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPAEV - // - this.TB_SPAEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPAEV.Location = new System.Drawing.Point(130, 85); - this.TB_SPAEV.Mask = "000"; - this.TB_SPAEV.Name = "TB_SPAEV"; - this.TB_SPAEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPAEV.TabIndex = 10; - this.TB_SPAEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPAEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPAEV.TextChanged += new System.EventHandler(this.updateEVs); - // // TB_HPEV // this.TB_HPEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HPEV.Location = new System.Drawing.Point(130, 19); + this.TB_HPEV.Location = new System.Drawing.Point(28, 0); + this.TB_HPEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); this.TB_HPEV.Mask = "000"; this.TB_HPEV.Name = "TB_HPEV"; - this.TB_HPEV.Size = new System.Drawing.Size(31, 20); + this.TB_HPEV.Size = new System.Drawing.Size(28, 20); this.TB_HPEV.TabIndex = 7; this.TB_HPEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.TB_HPEV.Click += new System.EventHandler(this.clickEV); this.TB_HPEV.TextChanged += new System.EventHandler(this.updateEVs); // - // Label_Sheen + // Stat_HP // - this.Label_Sheen.Location = new System.Drawing.Point(207, 266); - this.Label_Sheen.Name = "Label_Sheen"; - this.Label_Sheen.Size = new System.Drawing.Size(43, 13); - this.Label_Sheen.TabIndex = 39; - this.Label_Sheen.Text = "Sheen"; - this.Label_Sheen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Stat_HP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_HP.Enabled = false; + this.Stat_HP.Location = new System.Drawing.Point(62, 0); + this.Stat_HP.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_HP.Mask = "00000"; + this.Stat_HP.Name = "Stat_HP"; + this.Stat_HP.PromptChar = ' '; + this.Stat_HP.Size = new System.Drawing.Size(37, 20); + this.Stat_HP.TabIndex = 45; + this.Stat_HP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Stat_HP.TextChanged += new System.EventHandler(this.updateHackedStatText); // - // Label_Tough + // FLP_Atk // - this.Label_Tough.Location = new System.Drawing.Point(170, 266); - this.Label_Tough.Name = "Label_Tough"; - this.Label_Tough.Size = new System.Drawing.Size(43, 13); - this.Label_Tough.TabIndex = 38; - this.Label_Tough.Text = "Tough"; - this.Label_Tough.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.FLP_Atk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Atk.Controls.Add(this.Label_ATK); + this.FLP_Atk.Controls.Add(this.FLP_AtkRight); + this.FLP_Atk.Location = new System.Drawing.Point(0, 43); + this.FLP_Atk.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Atk.Name = "FLP_Atk"; + this.FLP_Atk.Size = new System.Drawing.Size(272, 21); + this.FLP_Atk.TabIndex = 124; // - // Label_Smart + // Label_ATK // - this.Label_Smart.Location = new System.Drawing.Point(133, 266); - this.Label_Smart.Name = "Label_Smart"; - this.Label_Smart.Size = new System.Drawing.Size(43, 13); - this.Label_Smart.TabIndex = 37; - this.Label_Smart.Text = "Clever"; - this.Label_Smart.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Label_ATK.Location = new System.Drawing.Point(0, 0); + this.Label_ATK.Margin = new System.Windows.Forms.Padding(0); + this.Label_ATK.Name = "Label_ATK"; + this.Label_ATK.Size = new System.Drawing.Size(110, 21); + this.Label_ATK.TabIndex = 20; + this.Label_ATK.Text = "Atk:"; + this.Label_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_ATK.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); // - // Label_Cute + // FLP_AtkRight // - this.Label_Cute.Location = new System.Drawing.Point(96, 266); - this.Label_Cute.Name = "Label_Cute"; - this.Label_Cute.Size = new System.Drawing.Size(43, 13); - this.Label_Cute.TabIndex = 36; - this.Label_Cute.Text = "Cute"; - this.Label_Cute.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.FLP_AtkRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_AtkRight.Controls.Add(this.TB_ATKIV); + this.FLP_AtkRight.Controls.Add(this.TB_ATKEV); + this.FLP_AtkRight.Controls.Add(this.Stat_ATK); + this.FLP_AtkRight.Location = new System.Drawing.Point(110, 0); + this.FLP_AtkRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_AtkRight.Name = "FLP_AtkRight"; + this.FLP_AtkRight.Size = new System.Drawing.Size(162, 21); + this.FLP_AtkRight.TabIndex = 123; // - // Label_Beauty + // TB_ATKIV // - this.Label_Beauty.Location = new System.Drawing.Point(59, 266); - this.Label_Beauty.Name = "Label_Beauty"; - this.Label_Beauty.Size = new System.Drawing.Size(43, 13); - this.Label_Beauty.TabIndex = 35; - this.Label_Beauty.Text = "Beauty"; - this.Label_Beauty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.TB_ATKIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_ATKIV.Location = new System.Drawing.Point(0, 0); + this.TB_ATKIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_ATKIV.Mask = "00"; + this.TB_ATKIV.Name = "TB_ATKIV"; + this.TB_ATKIV.Size = new System.Drawing.Size(22, 20); + this.TB_ATKIV.TabIndex = 2; + this.TB_ATKIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_ATKIV.Click += new System.EventHandler(this.clickIV); + this.TB_ATKIV.TextChanged += new System.EventHandler(this.updateIVs); // - // Label_Cool + // TB_ATKEV // - this.Label_Cool.Location = new System.Drawing.Point(22, 266); - this.Label_Cool.Name = "Label_Cool"; - this.Label_Cool.Size = new System.Drawing.Size(43, 13); - this.Label_Cool.TabIndex = 34; - this.Label_Cool.Text = "Cool"; - this.Label_Cool.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.TB_ATKEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_ATKEV.Location = new System.Drawing.Point(28, 0); + this.TB_ATKEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_ATKEV.Mask = "000"; + this.TB_ATKEV.Name = "TB_ATKEV"; + this.TB_ATKEV.Size = new System.Drawing.Size(28, 20); + this.TB_ATKEV.TabIndex = 8; + this.TB_ATKEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_ATKEV.Click += new System.EventHandler(this.clickEV); + this.TB_ATKEV.TextChanged += new System.EventHandler(this.updateEVs); // - // Label_ContestStats + // Stat_ATK // - this.Label_ContestStats.Location = new System.Drawing.Point(67, 250); - this.Label_ContestStats.Name = "Label_ContestStats"; - this.Label_ContestStats.Size = new System.Drawing.Size(140, 13); - this.Label_ContestStats.TabIndex = 33; - this.Label_ContestStats.Text = "Contest Stats"; - this.Label_ContestStats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Stat_ATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_ATK.Enabled = false; + this.Stat_ATK.Location = new System.Drawing.Point(62, 0); + this.Stat_ATK.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_ATK.Mask = "00000"; + this.Stat_ATK.Name = "Stat_ATK"; + this.Stat_ATK.PromptChar = ' '; + this.Stat_ATK.Size = new System.Drawing.Size(37, 20); + this.Stat_ATK.TabIndex = 46; + this.Stat_ATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_Def + // + this.FLP_Def.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Def.Controls.Add(this.Label_DEF); + this.FLP_Def.Controls.Add(this.FLP_DefRight); + this.FLP_Def.Location = new System.Drawing.Point(0, 64); + this.FLP_Def.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Def.Name = "FLP_Def"; + this.FLP_Def.Size = new System.Drawing.Size(272, 21); + this.FLP_Def.TabIndex = 125; + // + // Label_DEF + // + this.Label_DEF.Location = new System.Drawing.Point(0, 0); + this.Label_DEF.Margin = new System.Windows.Forms.Padding(0); + this.Label_DEF.Name = "Label_DEF"; + this.Label_DEF.Size = new System.Drawing.Size(110, 21); + this.Label_DEF.TabIndex = 21; + this.Label_DEF.Text = "Def:"; + this.Label_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_DEF.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_DefRight + // + this.FLP_DefRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_DefRight.Controls.Add(this.TB_DEFIV); + this.FLP_DefRight.Controls.Add(this.TB_DEFEV); + this.FLP_DefRight.Controls.Add(this.Stat_DEF); + this.FLP_DefRight.Location = new System.Drawing.Point(110, 0); + this.FLP_DefRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_DefRight.Name = "FLP_DefRight"; + this.FLP_DefRight.Size = new System.Drawing.Size(162, 21); + this.FLP_DefRight.TabIndex = 123; + // + // TB_DEFIV + // + this.TB_DEFIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_DEFIV.Location = new System.Drawing.Point(0, 0); + this.TB_DEFIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_DEFIV.Mask = "00"; + this.TB_DEFIV.Name = "TB_DEFIV"; + this.TB_DEFIV.Size = new System.Drawing.Size(22, 20); + this.TB_DEFIV.TabIndex = 3; + this.TB_DEFIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_DEFIV.Click += new System.EventHandler(this.clickIV); + this.TB_DEFIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_DEFEV + // + this.TB_DEFEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_DEFEV.Location = new System.Drawing.Point(28, 0); + this.TB_DEFEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_DEFEV.Mask = "000"; + this.TB_DEFEV.Name = "TB_DEFEV"; + this.TB_DEFEV.Size = new System.Drawing.Size(28, 20); + this.TB_DEFEV.TabIndex = 9; + this.TB_DEFEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_DEFEV.Click += new System.EventHandler(this.clickEV); + this.TB_DEFEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_DEF + // + this.Stat_DEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_DEF.Enabled = false; + this.Stat_DEF.Location = new System.Drawing.Point(62, 0); + this.Stat_DEF.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_DEF.Mask = "00000"; + this.Stat_DEF.Name = "Stat_DEF"; + this.Stat_DEF.PromptChar = ' '; + this.Stat_DEF.Size = new System.Drawing.Size(37, 20); + this.Stat_DEF.TabIndex = 47; + this.Stat_DEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_SpA + // + this.FLP_SpA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpA.Controls.Add(this.FLP_SpALeft); + this.FLP_SpA.Controls.Add(this.FLP_SpARight); + this.FLP_SpA.Location = new System.Drawing.Point(0, 85); + this.FLP_SpA.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpA.Name = "FLP_SpA"; + this.FLP_SpA.Size = new System.Drawing.Size(272, 21); + this.FLP_SpA.TabIndex = 126; + // + // FLP_SpALeft + // + this.FLP_SpALeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_SpALeft.Controls.Add(this.Label_SPA); + this.FLP_SpALeft.Controls.Add(this.Label_SPC); + this.FLP_SpALeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_SpALeft.Location = new System.Drawing.Point(0, 0); + this.FLP_SpALeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpALeft.Name = "FLP_SpALeft"; + this.FLP_SpALeft.Size = new System.Drawing.Size(110, 21); + this.FLP_SpALeft.TabIndex = 124; + // + // Label_SPA + // + this.Label_SPA.Location = new System.Drawing.Point(0, 0); + this.Label_SPA.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPA.Name = "Label_SPA"; + this.Label_SPA.Size = new System.Drawing.Size(110, 21); + this.Label_SPA.TabIndex = 22; + this.Label_SPA.Text = "SpA:"; + this.Label_SPA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPA.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // Label_SPC + // + this.Label_SPC.Location = new System.Drawing.Point(0, 21); + this.Label_SPC.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPC.Name = "Label_SPC"; + this.Label_SPC.Size = new System.Drawing.Size(110, 21); + this.Label_SPC.TabIndex = 125; + this.Label_SPC.Text = "SpC:"; + this.Label_SPC.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_SpARight + // + this.FLP_SpARight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpARight.Controls.Add(this.TB_SPAIV); + this.FLP_SpARight.Controls.Add(this.TB_SPAEV); + this.FLP_SpARight.Controls.Add(this.Stat_SPA); + this.FLP_SpARight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpARight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpARight.Name = "FLP_SpARight"; + this.FLP_SpARight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpARight.TabIndex = 123; + // + // TB_SPAIV + // + this.TB_SPAIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPAIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPAIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPAIV.Mask = "00"; + this.TB_SPAIV.Name = "TB_SPAIV"; + this.TB_SPAIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPAIV.TabIndex = 4; + this.TB_SPAIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPAIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPAIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPAEV + // + this.TB_SPAEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPAEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPAEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPAEV.Mask = "000"; + this.TB_SPAEV.Name = "TB_SPAEV"; + this.TB_SPAEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPAEV.TabIndex = 10; + this.TB_SPAEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPAEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPAEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPA + // + this.Stat_SPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPA.Enabled = false; + this.Stat_SPA.Location = new System.Drawing.Point(62, 0); + this.Stat_SPA.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPA.Mask = "00000"; + this.Stat_SPA.Name = "Stat_SPA"; + this.Stat_SPA.PromptChar = ' '; + this.Stat_SPA.Size = new System.Drawing.Size(37, 20); + this.Stat_SPA.TabIndex = 48; + this.Stat_SPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_SpD + // + this.FLP_SpD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpD.Controls.Add(this.Label_SPD); + this.FLP_SpD.Controls.Add(this.FLP_SpDRight); + this.FLP_SpD.Location = new System.Drawing.Point(0, 106); + this.FLP_SpD.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpD.Name = "FLP_SpD"; + this.FLP_SpD.Size = new System.Drawing.Size(272, 21); + this.FLP_SpD.TabIndex = 127; + // + // Label_SPD + // + this.Label_SPD.Location = new System.Drawing.Point(0, 0); + this.Label_SPD.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPD.Name = "Label_SPD"; + this.Label_SPD.Size = new System.Drawing.Size(110, 21); + this.Label_SPD.TabIndex = 23; + this.Label_SPD.Text = "SpD:"; + this.Label_SPD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPD.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_SpDRight + // + this.FLP_SpDRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpDRight.Controls.Add(this.TB_SPDIV); + this.FLP_SpDRight.Controls.Add(this.TB_SPDEV); + this.FLP_SpDRight.Controls.Add(this.Stat_SPD); + this.FLP_SpDRight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpDRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpDRight.Name = "FLP_SpDRight"; + this.FLP_SpDRight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpDRight.TabIndex = 123; + // + // TB_SPDIV + // + this.TB_SPDIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPDIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPDIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPDIV.Mask = "00"; + this.TB_SPDIV.Name = "TB_SPDIV"; + this.TB_SPDIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPDIV.TabIndex = 5; + this.TB_SPDIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPDIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPDIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPDEV + // + this.TB_SPDEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPDEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPDEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPDEV.Mask = "000"; + this.TB_SPDEV.Name = "TB_SPDEV"; + this.TB_SPDEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPDEV.TabIndex = 11; + this.TB_SPDEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPDEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPDEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPD + // + this.Stat_SPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPD.Enabled = false; + this.Stat_SPD.Location = new System.Drawing.Point(62, 0); + this.Stat_SPD.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPD.Mask = "00000"; + this.Stat_SPD.Name = "Stat_SPD"; + this.Stat_SPD.PromptChar = ' '; + this.Stat_SPD.Size = new System.Drawing.Size(37, 20); + this.Stat_SPD.TabIndex = 49; + this.Stat_SPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_Spe + // + this.FLP_Spe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Spe.Controls.Add(this.Label_SPE); + this.FLP_Spe.Controls.Add(this.FLP_SpeRight); + this.FLP_Spe.Location = new System.Drawing.Point(0, 127); + this.FLP_Spe.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Spe.Name = "FLP_Spe"; + this.FLP_Spe.Size = new System.Drawing.Size(272, 21); + this.FLP_Spe.TabIndex = 128; + // + // Label_SPE + // + this.Label_SPE.Location = new System.Drawing.Point(0, 0); + this.Label_SPE.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPE.Name = "Label_SPE"; + this.Label_SPE.Size = new System.Drawing.Size(110, 21); + this.Label_SPE.TabIndex = 24; + this.Label_SPE.Text = "Spe:"; + this.Label_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPE.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_SpeRight + // + this.FLP_SpeRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpeRight.Controls.Add(this.TB_SPEIV); + this.FLP_SpeRight.Controls.Add(this.TB_SPEEV); + this.FLP_SpeRight.Controls.Add(this.Stat_SPE); + this.FLP_SpeRight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpeRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpeRight.Name = "FLP_SpeRight"; + this.FLP_SpeRight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpeRight.TabIndex = 123; + // + // TB_SPEIV + // + this.TB_SPEIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPEIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPEIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPEIV.Mask = "00"; + this.TB_SPEIV.Name = "TB_SPEIV"; + this.TB_SPEIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPEIV.TabIndex = 6; + this.TB_SPEIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPEIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPEIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPEEV + // + this.TB_SPEEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPEEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPEEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPEEV.Mask = "000"; + this.TB_SPEEV.Name = "TB_SPEEV"; + this.TB_SPEEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPEEV.TabIndex = 12; + this.TB_SPEEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPEEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPEEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPE + // + this.Stat_SPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPE.Enabled = false; + this.Stat_SPE.Location = new System.Drawing.Point(62, 0); + this.Stat_SPE.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPE.Mask = "00000"; + this.Stat_SPE.Name = "Stat_SPE"; + this.Stat_SPE.PromptChar = ' '; + this.Stat_SPE.Size = new System.Drawing.Size(37, 20); + this.Stat_SPE.TabIndex = 50; + this.Stat_SPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_StatsTotal + // + this.FLP_StatsTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsTotal.Controls.Add(this.Label_Total); + this.FLP_StatsTotal.Controls.Add(this.FLP_StatsTotalRight); + this.FLP_StatsTotal.Location = new System.Drawing.Point(0, 148); + this.FLP_StatsTotal.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsTotal.Name = "FLP_StatsTotal"; + this.FLP_StatsTotal.Size = new System.Drawing.Size(272, 21); + this.FLP_StatsTotal.TabIndex = 129; + // + // Label_Total + // + this.Label_Total.Location = new System.Drawing.Point(0, 0); + this.Label_Total.Margin = new System.Windows.Forms.Padding(0); + this.Label_Total.Name = "Label_Total"; + this.Label_Total.Size = new System.Drawing.Size(110, 21); + this.Label_Total.TabIndex = 25; + this.Label_Total.Text = "Total:"; + this.Label_Total.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_StatsTotalRight + // + this.FLP_StatsTotalRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsTotalRight.Controls.Add(this.TB_IVTotal); + this.FLP_StatsTotalRight.Controls.Add(this.TB_EVTotal); + this.FLP_StatsTotalRight.Controls.Add(this.L_Potential); + this.FLP_StatsTotalRight.Location = new System.Drawing.Point(110, 0); + this.FLP_StatsTotalRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsTotalRight.Name = "FLP_StatsTotalRight"; + this.FLP_StatsTotalRight.Size = new System.Drawing.Size(162, 21); + this.FLP_StatsTotalRight.TabIndex = 123; + // + // TB_IVTotal + // + this.TB_IVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_IVTotal.Enabled = false; + this.TB_IVTotal.Location = new System.Drawing.Point(0, 0); + this.TB_IVTotal.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_IVTotal.MaxLength = 3; + this.TB_IVTotal.Name = "TB_IVTotal"; + this.TB_IVTotal.Size = new System.Drawing.Size(22, 20); + this.TB_IVTotal.TabIndex = 41; + this.TB_IVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // TB_EVTotal + // + this.TB_EVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_EVTotal.Enabled = false; + this.TB_EVTotal.Location = new System.Drawing.Point(28, 0); + this.TB_EVTotal.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_EVTotal.MaxLength = 3; + this.TB_EVTotal.Name = "TB_EVTotal"; + this.TB_EVTotal.Size = new System.Drawing.Size(28, 20); + this.TB_EVTotal.TabIndex = 18; + this.TB_EVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // L_Potential + // + this.L_Potential.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_Potential.Location = new System.Drawing.Point(59, 0); + this.L_Potential.Margin = new System.Windows.Forms.Padding(0); + this.L_Potential.Name = "L_Potential"; + this.L_Potential.Size = new System.Drawing.Size(67, 21); + this.L_Potential.TabIndex = 42; + this.L_Potential.Text = "(potential)"; + this.L_Potential.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // FLP_HPType + // + this.FLP_HPType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HPType.Controls.Add(this.Label_HiddenPowerPrefix); + this.FLP_HPType.Controls.Add(this.CB_HPType); + this.FLP_HPType.Location = new System.Drawing.Point(0, 169); + this.FLP_HPType.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HPType.Name = "FLP_HPType"; + this.FLP_HPType.Size = new System.Drawing.Size(272, 21); + this.FLP_HPType.TabIndex = 130; + // + // Label_HiddenPowerPrefix + // + this.Label_HiddenPowerPrefix.Location = new System.Drawing.Point(0, 0); + this.Label_HiddenPowerPrefix.Margin = new System.Windows.Forms.Padding(0); + this.Label_HiddenPowerPrefix.Name = "Label_HiddenPowerPrefix"; + this.Label_HiddenPowerPrefix.Size = new System.Drawing.Size(172, 21); + this.Label_HiddenPowerPrefix.TabIndex = 29; + this.Label_HiddenPowerPrefix.Text = "Hidden Power Type:"; + this.Label_HiddenPowerPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_HPType + // + this.CB_HPType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_HPType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_HPType.DropDownWidth = 80; + this.CB_HPType.FormattingEnabled = true; + this.CB_HPType.Location = new System.Drawing.Point(172, 0); + this.CB_HPType.Margin = new System.Windows.Forms.Padding(0); + this.CB_HPType.Name = "CB_HPType"; + this.CB_HPType.Size = new System.Drawing.Size(70, 21); + this.CB_HPType.TabIndex = 44; + this.CB_HPType.SelectedIndexChanged += new System.EventHandler(this.updateHPType); + // + // FLP_Characteristic + // + this.FLP_Characteristic.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Characteristic.Controls.Add(this.Label_CharacteristicPrefix); + this.FLP_Characteristic.Controls.Add(this.L_Characteristic); + this.FLP_Characteristic.Location = new System.Drawing.Point(0, 190); + this.FLP_Characteristic.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Characteristic.Name = "FLP_Characteristic"; + this.FLP_Characteristic.Size = new System.Drawing.Size(272, 21); + this.FLP_Characteristic.TabIndex = 131; + // + // Label_CharacteristicPrefix + // + this.Label_CharacteristicPrefix.Location = new System.Drawing.Point(0, 0); + this.Label_CharacteristicPrefix.Margin = new System.Windows.Forms.Padding(0); + this.Label_CharacteristicPrefix.Name = "Label_CharacteristicPrefix"; + this.Label_CharacteristicPrefix.Size = new System.Drawing.Size(110, 21); + this.Label_CharacteristicPrefix.TabIndex = 43; + this.Label_CharacteristicPrefix.Text = "Characteristic:"; + this.Label_CharacteristicPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // L_Characteristic + // + this.L_Characteristic.Location = new System.Drawing.Point(110, 0); + this.L_Characteristic.Margin = new System.Windows.Forms.Padding(0); + this.L_Characteristic.Name = "L_Characteristic"; + this.L_Characteristic.Size = new System.Drawing.Size(150, 21); + this.L_Characteristic.TabIndex = 40; + this.L_Characteristic.Text = "(char)"; + this.L_Characteristic.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // BTN_RandomEVs // @@ -1791,122 +2732,6 @@ public void InitializeComponent() this.BTN_RandomIVs.UseVisualStyleBackColor = true; this.BTN_RandomIVs.Click += new System.EventHandler(this.updateRandomIVs); // - // Label_HiddenPowerPrefix - // - this.Label_HiddenPowerPrefix.Location = new System.Drawing.Point(29, 179); - this.Label_HiddenPowerPrefix.Name = "Label_HiddenPowerPrefix"; - this.Label_HiddenPowerPrefix.Size = new System.Drawing.Size(133, 13); - this.Label_HiddenPowerPrefix.TabIndex = 29; - this.Label_HiddenPowerPrefix.Text = "Hidden Power Type:"; - this.Label_HiddenPowerPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Stats - // - this.Label_Stats.Location = new System.Drawing.Point(162, 6); - this.Label_Stats.Name = "Label_Stats"; - this.Label_Stats.Size = new System.Drawing.Size(40, 13); - this.Label_Stats.TabIndex = 28; - this.Label_Stats.Text = "Stats"; - this.Label_Stats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_EVs - // - this.Label_EVs.Location = new System.Drawing.Point(125, 6); - this.Label_EVs.Name = "Label_EVs"; - this.Label_EVs.Size = new System.Drawing.Size(40, 13); - this.Label_EVs.TabIndex = 27; - this.Label_EVs.Text = "EVs"; - this.Label_EVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_IVs - // - this.Label_IVs.Location = new System.Drawing.Point(98, 6); - this.Label_IVs.Name = "Label_IVs"; - this.Label_IVs.Size = new System.Drawing.Size(30, 13); - this.Label_IVs.TabIndex = 26; - this.Label_IVs.Text = "IVs"; - this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_Total - // - this.Label_Total.Location = new System.Drawing.Point(29, 154); - this.Label_Total.Name = "Label_Total"; - this.Label_Total.Size = new System.Drawing.Size(70, 13); - this.Label_Total.TabIndex = 25; - this.Label_Total.Text = "Total:"; - this.Label_Total.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_SPE - // - this.Label_SPE.Location = new System.Drawing.Point(29, 131); - this.Label_SPE.Name = "Label_SPE"; - this.Label_SPE.Size = new System.Drawing.Size(70, 13); - this.Label_SPE.TabIndex = 24; - this.Label_SPE.Text = "Spe:"; - this.Label_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPE.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_SPD - // - this.Label_SPD.Location = new System.Drawing.Point(29, 109); - this.Label_SPD.Name = "Label_SPD"; - this.Label_SPD.Size = new System.Drawing.Size(70, 13); - this.Label_SPD.TabIndex = 23; - this.Label_SPD.Text = "SpD:"; - this.Label_SPD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPD.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_SPA - // - this.Label_SPA.Location = new System.Drawing.Point(29, 87); - this.Label_SPA.Name = "Label_SPA"; - this.Label_SPA.Size = new System.Drawing.Size(70, 13); - this.Label_SPA.TabIndex = 22; - this.Label_SPA.Text = "SpA:"; - this.Label_SPA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPA.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_DEF - // - this.Label_DEF.Location = new System.Drawing.Point(29, 65); - this.Label_DEF.Name = "Label_DEF"; - this.Label_DEF.Size = new System.Drawing.Size(70, 13); - this.Label_DEF.TabIndex = 21; - this.Label_DEF.Text = "Def:"; - this.Label_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_DEF.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_ATK - // - this.Label_ATK.Location = new System.Drawing.Point(29, 43); - this.Label_ATK.Name = "Label_ATK"; - this.Label_ATK.Size = new System.Drawing.Size(70, 13); - this.Label_ATK.TabIndex = 20; - this.Label_ATK.Text = "Atk:"; - this.Label_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_ATK.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_HP - // - this.Label_HP.Location = new System.Drawing.Point(29, 21); - this.Label_HP.Name = "Label_HP"; - this.Label_HP.Size = new System.Drawing.Size(70, 13); - this.Label_HP.TabIndex = 19; - this.Label_HP.Text = "HP:"; - this.Label_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_HP.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // TB_EVTotal - // - this.TB_EVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_EVTotal.Enabled = false; - this.TB_EVTotal.Location = new System.Drawing.Point(130, 151); - this.TB_EVTotal.MaxLength = 3; - this.TB_EVTotal.Name = "TB_EVTotal"; - this.TB_EVTotal.Size = new System.Drawing.Size(31, 20); - this.TB_EVTotal.TabIndex = 18; - this.TB_EVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // Tab_Attacks // this.Tab_Attacks.AllowDrop = true; @@ -2790,7 +3615,7 @@ public void InitializeComponent() this.Menu_ShowdownExportBattleBox}); this.Menu_Showdown.Image = global::PKHeX.Properties.Resources.showdown; this.Menu_Showdown.Name = "Menu_Showdown"; - this.Menu_Showdown.Size = new System.Drawing.Size(152, 22); + this.Menu_Showdown.Size = new System.Drawing.Size(143, 22); this.Menu_Showdown.Text = "Showdown"; // // Menu_ShowdownImportPKM @@ -2837,7 +3662,7 @@ public void InitializeComponent() this.Menu_OpenCache}); this.Menu_CyberGadget.Image = global::PKHeX.Properties.Resources.other; this.Menu_CyberGadget.Name = "Menu_CyberGadget"; - this.Menu_CyberGadget.Size = new System.Drawing.Size(152, 22); + this.Menu_CyberGadget.Size = new System.Drawing.Size(143, 22); this.Menu_CyberGadget.Text = "CyberGadget"; // // Menu_OpenTemp @@ -2867,7 +3692,7 @@ public void InitializeComponent() this.Menu_BatchEditor}); this.Menu_Data.Image = global::PKHeX.Properties.Resources.data; this.Menu_Data.Name = "Menu_Data"; - this.Menu_Data.Size = new System.Drawing.Size(152, 22); + this.Menu_Data.Size = new System.Drawing.Size(143, 22); this.Menu_Data.Text = "Data"; // // Menu_LoadBoxes @@ -2933,7 +3758,7 @@ public void InitializeComponent() this.Menu_OpenSDB}); this.Menu_Other.Image = global::PKHeX.Properties.Resources.other; this.Menu_Other.Name = "Menu_Other"; - this.Menu_Other.Size = new System.Drawing.Size(152, 22); + this.Menu_Other.Size = new System.Drawing.Size(143, 22); this.Menu_Other.Text = "Other"; // // Menu_OpenSDF @@ -4674,13 +5499,89 @@ public void InitializeComponent() this.DragEnter += new System.Windows.Forms.DragEventHandler(this.tabMain_DragEnter); this.tabMain.ResumeLayout(false); this.Tab_Main.ResumeLayout(false); - this.Tab_Main.PerformLayout(); + this.FLP_Main.ResumeLayout(false); + this.FLP_PID.ResumeLayout(false); + this.FLP_PIDLeft.ResumeLayout(false); + this.FLP_PIDLeft.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.Label_IsShiny)).EndInit(); + this.FLP_PIDRight.ResumeLayout(false); + this.FLP_PIDRight.PerformLayout(); + this.FLP_Species.ResumeLayout(false); + this.FLP_Nickname.ResumeLayout(false); + this.FLP_Nickname.PerformLayout(); + this.FLP_NicknameLeft.ResumeLayout(false); + this.FLP_NicknameLeft.PerformLayout(); + this.FLP_EXPLevel.ResumeLayout(false); + this.FLP_EXPLevelRight.ResumeLayout(false); + this.FLP_EXPLevelRight.PerformLayout(); + this.FLP_Nature.ResumeLayout(false); + this.FLP_HeldItem.ResumeLayout(false); + this.FLP_FriendshipForm.ResumeLayout(false); + this.FLP_FriendshipFormLeft.ResumeLayout(false); + this.FLP_FriendshipFormRight.ResumeLayout(false); + this.FLP_FriendshipFormRight.PerformLayout(); + this.FLP_Ability.ResumeLayout(false); + this.FLP_AbilityRight.ResumeLayout(false); + this.FLP_AbilityRight.PerformLayout(); + this.FLP_Language.ResumeLayout(false); + this.FLP_EggPKRS.ResumeLayout(false); + this.FLP_EggPKRSLeft.ResumeLayout(false); + this.FLP_EggPKRSLeft.PerformLayout(); + this.FLP_EggPKRSRight.ResumeLayout(false); + this.FLP_EggPKRSRight.PerformLayout(); + this.FLP_PKRS.ResumeLayout(false); + this.FLP_PKRSRight.ResumeLayout(false); + this.FLP_Country.ResumeLayout(false); + this.FLP_SubRegion.ResumeLayout(false); + this.FLP_3DSRegion.ResumeLayout(false); + this.FLP_NSparkle.ResumeLayout(false); + this.FLP_NSparkle.PerformLayout(); this.Tab_Met.ResumeLayout(false); this.Tab_Met.PerformLayout(); this.GB_EggConditions.ResumeLayout(false); + this.FLP_Met.ResumeLayout(false); + this.FLP_OriginGame.ResumeLayout(false); + this.FLP_MetLocation.ResumeLayout(false); + this.FLP_Ball.ResumeLayout(false); + this.FLP_MetLevel.ResumeLayout(false); + this.FLP_MetLevel.PerformLayout(); + this.FLP_MetDate.ResumeLayout(false); + this.FLP_Fateful.ResumeLayout(false); + this.FLP_Fateful.PerformLayout(); + this.FLP_EncounterType.ResumeLayout(false); + this.FLP_TimeOfDay.ResumeLayout(false); this.Tab_Stats.ResumeLayout(false); - this.Tab_Stats.PerformLayout(); + this.PAN_Contest.ResumeLayout(false); + this.PAN_Contest.PerformLayout(); + this.FLP_Stats.ResumeLayout(false); + this.FLP_StatHeader.ResumeLayout(false); + this.FLP_HackedStats.ResumeLayout(false); + this.FLP_HackedStats.PerformLayout(); + this.FLP_StatsHeaderRight.ResumeLayout(false); + this.FLP_HP.ResumeLayout(false); + this.FLP_HPRight.ResumeLayout(false); + this.FLP_HPRight.PerformLayout(); + this.FLP_Atk.ResumeLayout(false); + this.FLP_AtkRight.ResumeLayout(false); + this.FLP_AtkRight.PerformLayout(); + this.FLP_Def.ResumeLayout(false); + this.FLP_DefRight.ResumeLayout(false); + this.FLP_DefRight.PerformLayout(); + this.FLP_SpA.ResumeLayout(false); + this.FLP_SpALeft.ResumeLayout(false); + this.FLP_SpARight.ResumeLayout(false); + this.FLP_SpARight.PerformLayout(); + this.FLP_SpD.ResumeLayout(false); + this.FLP_SpDRight.ResumeLayout(false); + this.FLP_SpDRight.PerformLayout(); + this.FLP_Spe.ResumeLayout(false); + this.FLP_SpeRight.ResumeLayout(false); + this.FLP_SpeRight.PerformLayout(); + this.FLP_StatsTotal.ResumeLayout(false); + this.FLP_StatsTotalRight.ResumeLayout(false); + this.FLP_StatsTotalRight.PerformLayout(); + this.FLP_HPType.ResumeLayout(false); + this.FLP_Characteristic.ResumeLayout(false); this.Tab_Attacks.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove3)).EndInit(); @@ -4815,15 +5716,11 @@ public void InitializeComponent() private System.Windows.Forms.Label Label_Nature; private System.Windows.Forms.Label Label_CurLevel; private System.Windows.Forms.Button BTN_RerollPID; - private System.Windows.Forms.ComboBox CB_3DSReg; - private System.Windows.Forms.ComboBox CB_SubRegion; private System.Windows.Forms.ComboBox CB_Country; private System.Windows.Forms.ComboBox CB_PKRSDays; private System.Windows.Forms.ComboBox CB_PKRSStrain; private System.Windows.Forms.ComboBox CB_Language; private System.Windows.Forms.ComboBox CB_Ability; - private System.Windows.Forms.Label Label_3DSRegion; - private System.Windows.Forms.Label Label_SubRegion; private System.Windows.Forms.Label Label_Country; private System.Windows.Forms.Label Label_PKRSdays; private System.Windows.Forms.Label Label_PKRS; @@ -4853,13 +5750,6 @@ public void InitializeComponent() private System.Windows.Forms.ComboBox CB_RelearnMove1; private System.Windows.Forms.Label Label_CurPP; private System.Windows.Forms.Label Label_PPups; - private System.Windows.Forms.Label Label_Sheen; - private System.Windows.Forms.Label Label_Tough; - private System.Windows.Forms.Label Label_Smart; - private System.Windows.Forms.Label Label_Cute; - private System.Windows.Forms.Label Label_Beauty; - private System.Windows.Forms.Label Label_Cool; - private System.Windows.Forms.Label Label_ContestStats; private System.Windows.Forms.Button BTN_RandomEVs; private System.Windows.Forms.Button BTN_RandomIVs; private System.Windows.Forms.Label Label_HiddenPowerPrefix; @@ -4901,12 +5791,6 @@ public void InitializeComponent() private System.Windows.Forms.MaskedTextBox TB_DEFIV; private System.Windows.Forms.MaskedTextBox TB_ATKIV; private System.Windows.Forms.MaskedTextBox TB_HPIV; - private System.Windows.Forms.MaskedTextBox TB_Sheen; - private System.Windows.Forms.MaskedTextBox TB_Tough; - private System.Windows.Forms.MaskedTextBox TB_Smart; - private System.Windows.Forms.MaskedTextBox TB_Cute; - private System.Windows.Forms.MaskedTextBox TB_Beauty; - private System.Windows.Forms.MaskedTextBox TB_Cool; private System.Windows.Forms.MaskedTextBox TB_SID; private System.Windows.Forms.MaskedTextBox TB_TID; private System.Windows.Forms.MaskedTextBox TB_Level; @@ -4917,7 +5801,6 @@ public void InitializeComponent() private System.Windows.Forms.CheckBox CHK_Infected; private System.Windows.Forms.ComboBox CB_Form; private System.Windows.Forms.Label Label_Gender; - private System.Windows.Forms.CheckBox CHK_Nicknamed; private System.Windows.Forms.Button BTN_Shinytize; private System.Windows.Forms.MaskedTextBox TB_AbilityNumber; private System.Windows.Forms.MaskedTextBox TB_MetLevel; @@ -5134,6 +6017,85 @@ public void InitializeComponent() private System.Windows.Forms.Label L_MetTimeOfDay; public System.Windows.Forms.ComboBox CB_MetTimeOfDay; private System.Windows.Forms.ToolStripMenuItem Menu_MGDatabase; + private System.Windows.Forms.FlowLayoutPanel FLP_Main; + private System.Windows.Forms.FlowLayoutPanel FLP_PID; + private System.Windows.Forms.FlowLayoutPanel FLP_PIDLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_PIDRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Species; + private System.Windows.Forms.FlowLayoutPanel FLP_EXPLevel; + private System.Windows.Forms.FlowLayoutPanel FLP_EXPLevelRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Nature; + private System.Windows.Forms.FlowLayoutPanel FLP_HeldItem; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipForm; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipFormLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipFormRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Ability; + private System.Windows.Forms.FlowLayoutPanel FLP_Language; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRS; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRSRight; + private System.Windows.Forms.FlowLayoutPanel FLP_PKRS; + private System.Windows.Forms.FlowLayoutPanel FLP_Country; + private System.Windows.Forms.FlowLayoutPanel FLP_PKRSRight; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRSLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_AbilityRight; + private System.Windows.Forms.CheckBox CHK_Nicknamed; + private System.Windows.Forms.FlowLayoutPanel FLP_NicknameLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_Nickname; + private System.Windows.Forms.CheckBox CHK_NSparkle; + private System.Windows.Forms.Label L_NSparkle; + private System.Windows.Forms.FlowLayoutPanel FLP_NSparkle; + private System.Windows.Forms.ComboBox CB_3DSReg; + private System.Windows.Forms.Label Label_3DSRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_3DSRegion; + private System.Windows.Forms.ComboBox CB_SubRegion; + private System.Windows.Forms.Label Label_SubRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_SubRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_Met; + private System.Windows.Forms.FlowLayoutPanel FLP_OriginGame; + private System.Windows.Forms.FlowLayoutPanel FLP_MetLocation; + private System.Windows.Forms.FlowLayoutPanel FLP_Ball; + private System.Windows.Forms.FlowLayoutPanel FLP_MetLevel; + private System.Windows.Forms.FlowLayoutPanel FLP_MetDate; + private System.Windows.Forms.FlowLayoutPanel FLP_Fateful; + private System.Windows.Forms.FlowLayoutPanel FLP_EncounterType; + private System.Windows.Forms.FlowLayoutPanel FLP_TimeOfDay; + private System.Windows.Forms.Panel PAN_Fateful; + private System.Windows.Forms.FlowLayoutPanel FLP_Stats; + private System.Windows.Forms.FlowLayoutPanel FLP_StatHeader; + private System.Windows.Forms.FlowLayoutPanel FLP_HP; + private System.Windows.Forms.FlowLayoutPanel FLP_Atk; + private System.Windows.Forms.FlowLayoutPanel FLP_Def; + private System.Windows.Forms.FlowLayoutPanel FLP_SpA; + private System.Windows.Forms.FlowLayoutPanel FLP_SpD; + private System.Windows.Forms.FlowLayoutPanel FLP_Spe; + private System.Windows.Forms.FlowLayoutPanel FLP_HPRight; + private System.Windows.Forms.FlowLayoutPanel FLP_HPType; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsTotal; + private System.Windows.Forms.FlowLayoutPanel FLP_Characteristic; + private System.Windows.Forms.FlowLayoutPanel FLP_DefRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpDRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpeRight; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsTotalRight; + private System.Windows.Forms.FlowLayoutPanel FLP_HackedStats; + private System.Windows.Forms.FlowLayoutPanel FLP_AtkRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpARight; + private System.Windows.Forms.Label Label_SPC; + private System.Windows.Forms.FlowLayoutPanel FLP_SpALeft; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsHeaderRight; + private System.Windows.Forms.Panel PAN_Contest; + private System.Windows.Forms.Label Label_ContestStats; + private System.Windows.Forms.Label Label_Cool; + private System.Windows.Forms.Label Label_Beauty; + private System.Windows.Forms.Label Label_Cute; + private System.Windows.Forms.Label Label_Smart; + private System.Windows.Forms.Label Label_Tough; + private System.Windows.Forms.Label Label_Sheen; + private System.Windows.Forms.MaskedTextBox TB_Cool; + private System.Windows.Forms.MaskedTextBox TB_Beauty; + private System.Windows.Forms.MaskedTextBox TB_Cute; + private System.Windows.Forms.MaskedTextBox TB_Smart; + private System.Windows.Forms.MaskedTextBox TB_Tough; + private System.Windows.Forms.MaskedTextBox TB_Sheen; } } diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index b8827ce30..d0fb9f7dd 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -865,111 +865,94 @@ private void loadSAV(SaveFile sav, string path) byte[] extraBytes = new byte[1]; Tip1.RemoveAll(); Tip2.RemoveAll(); Tip3.RemoveAll(); // TSV/PSV - CB_Country.Visible = CB_SubRegion.Visible = CB_3DSReg.Visible = - Label_Country.Visible = Label_SubRegion.Visible = Label_3DSRegion.Visible = SAV.Generation >= 6; + FLP_Country.Visible = FLP_SubRegion.Visible = FLP_3DSRegion.Visible = SAV.Generation >= 6; Label_EncryptionConstant.Visible = BTN_RerollEC.Visible = TB_EC.Visible = SAV.Generation >= 6; GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; + TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; PB_MarkPentagon.Visible = SAV.Generation == 6; TB_GameSync.Visible = TB_Secure1.Visible = TB_Secure2.Visible = L_GameSync.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Exportable && SAV.Generation == 6; - CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible = - Label_MetDate.Visible = CAL_MetDate.Visible = PB_Mark5.Visible = PB_Mark6.Visible = SAV.Generation >= 4; + FLP_NSparkle.Visible = L_NSparkle.Visible = CHK_NSparkle.Visible = SAV.Generation == 5; + + CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible = PB_Mark5.Visible = PB_Mark6.Visible = SAV.Generation >= 4; - BTN_Ribbons.Visible = SAV.Generation >= 3; DEV_Ability.Enabled = DEV_Ability.Visible = SAV.Generation > 3 && HaX; - TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; CB_Ability.Visible = !DEV_Ability.Enabled && SAV.Generation >= 3; + FLP_Nature.Visible = SAV.Generation >= 3; + FLP_Ability.Visible = SAV.Generation >= 3; + FLP_Language.Visible = SAV.Generation >= 3; + GB_ExtraBytes.Visible = SAV.Generation >= 3; + GB_Markings.Visible = SAV.Generation >= 3; + BTN_Ribbons.Visible = SAV.Generation >= 3; + CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; + FLP_PKRSRight.Visible = SAV.Generation >= 3; + FLP_PKRS.Visible = SAV.Generation >= 3; + BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; - GB_ExtraBytes.Visible = SAV.Generation > 2; - GB_Markings.Visible = SAV.Generation > 2; + FLP_FriendshipForm.Visible = SAV.Generation >= 2; + FLP_HeldItem.Visible = SAV.Generation >= 2; + - Label_HeldItem.Visible = CB_HeldItem.Visible = SAV.Generation > 1; - Label_Total.Visible = TB_IVTotal.Visible = TB_EVTotal.Visible = L_Potential.Visible = SAV.Generation > 2; - Label_HiddenPowerPrefix.Visible = CB_HPType.Visible = SAV.Generation > 1; - CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation > 2; - Label_CharacteristicPrefix.Visible = L_Characteristic.Visible = SAV.Generation > 2; - Label_ContestStats.Visible = Label_Cool.Visible = Label_Tough.Visible = Label_Smart.Visible = - Label_Sheen.Visible = Label_Beauty.Visible = Label_Cute.Visible = TB_Cool.Visible = TB_Tough.Visible = - TB_Smart.Visible = TB_Sheen.Visible = TB_Beauty.Visible = TB_Cute.Visible = Label_Nature.Visible = - CB_Nature.Visible = Label_Language.Visible = CB_Language.Visible = Label_Ability.Visible = - BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; + CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; - Label_Friendship.Visible = Label_HatchCounter.Visible = TB_Friendship.Visible = SAV.Generation >= 2; // Met Tab - CHK_Fateful.Visible = Label_OriginGame.Visible = Label_Ball.Visible = - CB_Ball.Visible = CB_GameOrigin.Visible = SAV.Generation > 2; - Label_MetLocation.Visible = CB_MetLocation.Visible = Label_MetLevel.Visible = TB_MetLevel.Visible = Label_OTGender.Visible = - SAV.Generation > 1; + FLP_MetDate.Visible = SAV.Generation >= 4; + FLP_Fateful.Visible = FLP_Ball.Visible = FLP_OriginGame.Visible = SAV.Generation >= 3; + FLP_MetLocation.Visible = FLP_MetLevel.Visible = SAV.Generation >= 2; + FLP_TimeOfDay.Visible = SAV.Generation == 2; - L_MetTimeOfDay.Visible = CB_MetTimeOfDay.Visible = SAV.Generation == 2; + // Stats + FLP_StatsTotal.Visible = SAV.Generation >= 3; + FLP_Characteristic.Visible = SAV.Generation >= 3; + FLP_HPType.Visible = SAV.Generation >= 2; - if (SAV.Generation == 2) - { - var met_list = getLocationList(SAV.Version, SAV.Generation, egg: false); - CB_MetLocation.DisplayMember = "Text"; - CB_MetLocation.ValueMember = "Value"; - CB_MetLocation.DataSource = new BindingSource(met_list, null); - } - - CHK_Infected.Visible = CHK_Cured.Visible = SAV.Generation >= 3; + PAN_Contest.Visible = SAV.Generation >= 3; // Second daycare slot - SlotPictureBoxes[43].Visible = SAV.Generation > 1; - - CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation > 1; - + SlotPictureBoxes[43].Visible = SAV.Generation >= 2; if (sav.Generation == 1) { - Label_SPD.Visible = TB_SPDEV.Visible = TB_SPDIV.Visible = Stat_SPD.Visible = false; - Label_SPA.Text = "Spc:"; + FLP_SpD.Visible = false; + Label_SPA.Visible = false; + Label_SPC.Visible = true; TB_HPIV.ReadOnly = true; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { ctrl.Mask = "00000"; - ctrl.Size = new Size(37, 20); + ctrl.Size = Stat_HP.Size; } - Control[] statControls = {Stat_HP, Stat_ATK, Stat_DEF, Stat_SPA, Stat_SPD, Stat_SPE}; - foreach (Control ctrl in statControls) - ctrl.Location = new Point(173, ctrl.Location.Y); - Label_Stats.Location = new Point(168, Label_Stats.Location.Y); } else if (sav.Generation == 2) { - Label_SPD.Visible = TB_SPDEV.Visible = TB_SPDIV.Visible = Stat_SPD.Visible = true; - Label_SPA.Text = "SpA:"; + FLP_SpD.Visible = true; + Label_SPA.Visible = true; + Label_SPC.Visible = false; TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = true; TB_HPIV.ReadOnly = true; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { ctrl.Mask = "00000"; - ctrl.Size = new Size(37, 20); + ctrl.Size = Stat_HP.Size; } - Control[] statControls = { Stat_HP, Stat_ATK, Stat_DEF, Stat_SPA, Stat_SPD, Stat_SPE }; - foreach (Control ctrl in statControls) - ctrl.Location = new Point(173, ctrl.Location.Y); - Label_Stats.Location = new Point(168, Label_Stats.Location.Y); } else { - Label_SPD.Visible = TB_SPDEV.Visible = TB_SPDIV.Visible = Stat_SPD.Visible = true; - Label_SPA.Text = "SpA:"; + FLP_SpD.Visible = true; + Label_SPA.Visible = true; + Label_SPC.Visible = false; TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = false; TB_HPIV.ReadOnly = false; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { ctrl.Mask = "000"; - ctrl.Size = new Size(31, 20); + ctrl.Size = TB_ExtraByte.Size; } - Control[] statControls = { Stat_HP, Stat_ATK, Stat_DEF, Stat_SPA, Stat_SPD, Stat_SPE }; - foreach (Control ctrl in statControls) - ctrl.Location = new Point(167, ctrl.Location.Y); - Label_Stats.Location = new Point(162, Label_Stats.Location.Y); } // Recenter PKM SubEditors @@ -1397,6 +1380,9 @@ public void populateFields(PKM pk, bool focus = true) } fieldsLoaded = true; + Label_HatchCounter.Visible = CHK_IsEgg.Checked && SAV.Generation > 1; + Label_Friendship.Visible = !CHK_IsEgg.Checked && SAV.Generation > 1; + // Set the Preview Box dragout.Image = pk.Sprite; updateLegality(); @@ -2461,7 +2447,7 @@ private void validateComboBox(object sender) { cb.SelectedIndex = 0; return; } cb.BackColor = cb.SelectedValue == null ? Color.DarkSalmon : defaultControlWhite; } - private void validateComboBox(object sender, EventArgs e) + private void validateComboBox(object sender, System.ComponentModel.CancelEventArgs e) { if (!(sender is ComboBox)) return; @@ -2475,7 +2461,7 @@ private void validateComboBox2(object sender, EventArgs e) { if (!fieldsInitialized) return; - validateComboBox(sender, e); + validateComboBox(sender, null); if (fieldsLoaded) { if (sender == CB_Ability && SAV.Generation >= 6) diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index 6659fcbca..3cf020fe4 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -120,31 +120,22 @@ True - + True - + True - + True - + True - + True - - True - - - True - - - True - - + True @@ -153,217 +144,88 @@ 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 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 - - - True - - - True - - + True @@ -386,72 +248,189 @@ GigXDIB8F3QxIgADAwC7NFU/mWb72QAAAABJRU5ErkJggg== - + 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 - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + True True - - True - True @@ -479,19 +458,10 @@ True - + True - - True - - - True - - - True - - + True @@ -500,55 +470,70 @@ 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 @@ -569,42 +554,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -626,84 +575,6 @@ 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 @@ -722,42 +593,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -779,64 +614,226 @@ 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 + + + 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 + + True @@ -1104,15 +1101,6 @@ True - - True - - - True - - - True - True diff --git a/PKHeX/MainWindow/MainPK5.cs b/PKHeX/MainWindow/MainPK5.cs index 286871469..37764677e 100644 --- a/PKHeX/MainWindow/MainPK5.cs +++ b/PKHeX/MainWindow/MainPK5.cs @@ -136,6 +136,7 @@ private void populateFieldsPK5() TB_EXP.Text = pk5.EXP.ToString(); Label_Gender.Text = gendersymbols[pk5.Gender]; Label_Gender.ForeColor = pk5.Gender == 2 ? Label_Species.ForeColor : (pk5.Gender == 1 ? Color.Red : Color.Blue); + CHK_NSparkle.Checked = pk5.NPokémon; if (HaX) DEV_Ability.SelectedValue = pk5.Ability; @@ -240,6 +241,8 @@ private PKM preparePK5() pk5.Version = Util.getIndex(CB_GameOrigin); pk5.Language = Util.getIndex(CB_Language); + pk5.NPokémon = CHK_NSparkle.Checked; + // Toss in Party Stats Array.Resize(ref pk5.Data, pk5.SIZE_PARTY); pk5.Stat_Level = Util.ToInt32(TB_Level.Text); From 36a3757418fb750df814ed07806a73a050975fe8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:27:02 -0700 Subject: [PATCH 34/75] 2digit minute/second as to not show 20:6:2 (20:06:02) As shown in #233 first picture --- PKHeX/Saves/SaveFile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index 4e142c077..250d68dd1 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -20,7 +20,7 @@ public abstract class SaveFile public abstract string Filter { get; } public byte[] Footer { protected get; set; } = new byte[0]; // .dsv public bool Japanese { protected get; set; } - public string PlayTimeString => $"{PlayedHours}ː{PlayedMinutes}ː{PlayedSeconds}"; // not : + public string PlayTimeString => $"{PlayedHours}ː{PlayedMinutes.ToString("00")}ː{PlayedSeconds.ToString("00")}"; // not : public bool GetJapanese => Japanese; From 24126c1e96abe4976b6f04ded396a13a7c64918d Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:27:22 -0700 Subject: [PATCH 35/75] Fix gen4 met location datasource providing Copy paste copy paste copy paste Closes #233 --- PKHeX/MainWindow/Main.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index d0fb9f7dd..99995e4c7 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -2144,18 +2144,18 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm case GameVersion.D: case GameVersion.P: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value <= 111)); // Battle Park + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)); // Battle Park break; case GameVersion.Pt: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value <= 125)); // Rock Peak Ruins + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)); // Rock Peak Ruins break; case GameVersion.HG: case GameVersion.SS: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)); // Celadon Dept. + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)); // Celadon Dept. break; case GameVersion.B: From ed76235e9adfcf37fa9091ffddd71b47de8fae14 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:46:38 -0700 Subject: [PATCH 36/75] Minor hax tweaks Display overrides for visual neatness why resx do you keep modifying yourself --- PKHeX/MainWindow/Main.Designer.cs | 4 +-- PKHeX/MainWindow/Main.cs | 5 +++ PKHeX/MainWindow/Main.resx | 60 +++++++++++++++---------------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index 6c9e18c95..287945846 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -1157,14 +1157,14 @@ public void InitializeComponent() this.DEV_Ability.Location = new System.Drawing.Point(0, 21); this.DEV_Ability.Margin = new System.Windows.Forms.Padding(0); this.DEV_Ability.Name = "DEV_Ability"; - this.DEV_Ability.Size = new System.Drawing.Size(122, 21); + this.DEV_Ability.Size = new System.Drawing.Size(126, 21); this.DEV_Ability.TabIndex = 14; this.DEV_Ability.Visible = false; // // TB_AbilityNumber // this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_AbilityNumber.Location = new System.Drawing.Point(122, 21); + this.TB_AbilityNumber.Location = new System.Drawing.Point(126, 21); this.TB_AbilityNumber.Margin = new System.Windows.Forms.Padding(0); this.TB_AbilityNumber.Mask = "0"; this.TB_AbilityNumber.Name = "TB_AbilityNumber"; diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 99995e4c7..eab904893 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -870,6 +870,8 @@ private void loadSAV(SaveFile sav, string path) GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; + if (HaX && SAV.Generation >= 6) + TB_AbilityNumber.Visible = true; PB_MarkPentagon.Visible = SAV.Generation == 6; TB_GameSync.Visible = TB_Secure1.Visible = TB_Secure2.Visible = L_GameSync.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Exportable && SAV.Generation == 6; @@ -1414,6 +1416,9 @@ private void setForms() CB_Form.Enabled = CB_Form.Visible = Label_Form.Visible = hasForms; if (SAV.Generation == 2) CB_Form.Enabled = false; + + if (HaX) + Label_Form.Visible = true; if (!hasForms) return; diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index 3cf020fe4..b8929a07f 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -144,6 +144,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + True @@ -326,36 +344,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -428,6 +416,18 @@ True + + True + + + True + + + True + + + True + True From fb313edeac1e10d0ec92afddb08379da458ea44d Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 5 Sep 2016 15:50:09 -0700 Subject: [PATCH 37/75] Fix 1 -> 2 Conversion bug, gender issues (Closes #232) --- PKHeX/PKM/PK1.cs | 2 +- PKHeX/PKM/PK2.cs | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/PKHeX/PKM/PK1.cs b/PKHeX/PKM/PK1.cs index addf1c119..c8c3f07fa 100644 --- a/PKHeX/PKM/PK1.cs +++ b/PKHeX/PKM/PK1.cs @@ -284,7 +284,7 @@ public PK2 convertToPK2() pk2.CurrentFriendship = PersonalTable.C[Species].BaseFriendship; // Pokerus = 0 // Caught Data = 0 - pk2.Stat_Level = Stat_Level; + pk2.Stat_Level = PKX.getLevel(Species, EXP); Array.Copy(otname, 0, pk2.otname, 0, otname.Length); Array.Copy(nick, 0, pk2.nick, 0, nick.Length); diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index a6319b95c..d5c32897f 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -215,18 +215,18 @@ public override bool getGenderIsValid() if (gv == 255) return Gender == 2; if (gv == 254) - return Gender == 0; - if (gv == 0) return Gender == 1; + if (gv == 0) + return Gender == 0; switch (gv) { - case 191: - return IV_ATK >= 2 ? Gender == 0 : Gender == 1; - case 127: - return IV_ATK >= 5 ? Gender == 0 : Gender == 1; - case 63: - return IV_ATK >= 7 ? Gender == 0 : Gender == 1; case 31: + return IV_ATK >= 2 ? Gender == 0 : Gender == 1; + case 63: + return IV_ATK >= 5 ? Gender == 0 : Gender == 1; + case 127: + return IV_ATK >= 7 ? Gender == 0 : Gender == 1; + case 191: return IV_ATK >= 12 ? Gender == 0 : Gender == 1; } return false; @@ -242,18 +242,18 @@ public override int Gender if (gv == 255) return 2; if (gv == 254) - return 0; - if (gv == 0) return 1; + if (gv == 0) + return 0; switch (gv) { - case 191: - return IV_ATK >= 2 ? 0 : 1; - case 127: - return IV_ATK >= 5 ? 0 : 1; - case 63: - return IV_ATK >= 7 ? 0 : 1; case 31: + return IV_ATK >= 2 ? 0 : 1; + case 63: + return IV_ATK >= 5 ? 0 : 1; + case 127: + return IV_ATK >= 7 ? 0 : 1; + case 191: return IV_ATK >= 12 ? 0 : 1; } Console.WriteLine("Unknown Gender value: " + gv); From 421dbf31f3b6c833eb53d323b37e271593e4b9b7 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 15:57:28 -0700 Subject: [PATCH 38/75] Fix extrabytes Visible returns false if the tab is not active -- even if it is defined as true in an earlier line, so use Enabled instead. Move the AbilityNumber visibility to the end so that the logic isn't repeated. --- PKHeX/MainWindow/Main.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index eab904893..2c8a74190 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -869,9 +869,6 @@ private void loadSAV(SaveFile sav, string path) Label_EncryptionConstant.Visible = BTN_RerollEC.Visible = TB_EC.Visible = SAV.Generation >= 6; GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; - TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; - if (HaX && SAV.Generation >= 6) - TB_AbilityNumber.Visible = true; PB_MarkPentagon.Visible = SAV.Generation == 6; TB_GameSync.Visible = TB_Secure1.Visible = TB_Secure2.Visible = L_GameSync.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Exportable && SAV.Generation == 6; @@ -885,7 +882,7 @@ private void loadSAV(SaveFile sav, string path) FLP_Nature.Visible = SAV.Generation >= 3; FLP_Ability.Visible = SAV.Generation >= 3; FLP_Language.Visible = SAV.Generation >= 3; - GB_ExtraBytes.Visible = SAV.Generation >= 3; + GB_ExtraBytes.Enabled = SAV.Generation >= 3; GB_Markings.Visible = SAV.Generation >= 3; BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; @@ -895,10 +892,11 @@ private void loadSAV(SaveFile sav, string path) FLP_FriendshipForm.Visible = SAV.Generation >= 2; FLP_HeldItem.Visible = SAV.Generation >= 2; - - CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; + // HaX override, needs to be after DEV_Ability enabled assignment. + TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; + // Met Tab FLP_MetDate.Visible = SAV.Generation >= 4; FLP_Fateful.Visible = FLP_Ball.Visible = FLP_OriginGame.Visible = SAV.Generation >= 3; @@ -1014,7 +1012,7 @@ private void loadSAV(SaveFile sav, string path) TB_Level.Visible = !HaX; // Load Extra Byte List - if (GB_ExtraBytes.Visible) + if (GB_ExtraBytes.Enabled) { CB_ExtraBytes.Items.Clear(); foreach (byte b in extraBytes) From 39ed9c4d0dccb57d90b8a7e4140638886d30b17f Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 17:05:27 -0700 Subject: [PATCH 39/75] Fix Drag&Drop gen1 error Dunno why it manifests itself only in gen<3, but this fixes the index out of range Reference #235 --- PKHeX/MainWindow/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 2c8a74190..22a25e404 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -3699,7 +3699,7 @@ private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e) getQuickFiller(pb, SAV.getStoredSlot(DragInfo.slotSourceOffset)); pb.BackgroundImage = null; - if (DragInfo.slotDestinationBoxNumber == DragInfo.slotSourceBoxNumber) + if (DragInfo.slotDestinationBoxNumber == DragInfo.slotSourceBoxNumber && DragInfo.slotDestinationSlotNumber > -1) SlotPictureBoxes[DragInfo.slotDestinationSlotNumber].Image = img; if (result == DragDropEffects.Copy) // viewed in tabs, apply 'view' highlight From 75fbaab26fc1aa65a196eced281502493d5fbf37 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 19:44:15 -0700 Subject: [PATCH 40/75] Reset pkm before repopulating Clear init states too. Also updates program text (window title) to indicate if it is in HaX or not (makes it clear when people take screenshots). --- PKHeX/MainWindow/Main.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 22a25e404..386301015 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -798,7 +798,7 @@ private void loadSAV(SaveFile sav, string path) SAV.FileName = Path.GetExtension(path) == ".bak" ? Path.GetFileName(path).Split(new[] { " [" }, StringSplitOptions.None)[0] : Path.GetFileName(path); - Text = "PKHeX - " + $"SAV{SAV.Generation}: {Path.GetFileNameWithoutExtension(Util.CleanFileName(SAV.BAKName))}"; // more descriptive + Text = $"PKH{(HaX ? "a" : "e")}X - " + $"SAV{SAV.Generation}: {Path.GetFileNameWithoutExtension(Util.CleanFileName(SAV.BAKName))}"; // more descriptive // If backup folder exists, save a backup. string backupName = Path.Combine(BackupPath, Util.CleanFileName(SAV.BAKName)); @@ -811,7 +811,7 @@ private void loadSAV(SaveFile sav, string path) { SAV.FilePath = null; SAV.FileName = "Blank Save File"; - Text = "PKHeX - " + $"SAV{SAV.Generation}: {SAV.FileName} [{SAV.OT} ({SAV.Version})]"; + Text = $"PKH{(HaX ? "a" : "e")}X - " + $"SAV{SAV.Generation}: {SAV.FileName} [{SAV.OT} ({SAV.Version})]"; GB_SAVtools.Visible = false; } @@ -997,9 +997,10 @@ private void loadSAV(SaveFile sav, string path) break; } bool init = fieldsInitialized; - fieldsInitialized = false; + fieldsInitialized = fieldsLoaded = false; + pkm = (pkm.Format != SAV.Generation || SAV.Generation < 3) ? SAV.BlankPKM : pk; populateFilteredDataSources(); - populateFields((pkm.Format != SAV.Generation || SAV.Generation < 3) ? SAV.BlankPKM : pk); + populateFields(pkm); fieldsInitialized |= init; // SAV Specific Limits From 12fc528d349d383ee38e32c2495d63b2c82aab8d Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 20:20:56 -0700 Subject: [PATCH 41/75] Tweak HGSS Ball set PGT -> PK4 doesn't have HGSS ball data (value=0) Return the higher of the two When setting, consider the Fateful Encounter status before writing to 0x86 --- PKHeX/PKM/PK4.cs | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/PKHeX/PKM/PK4.cs b/PKHeX/PKM/PK4.cs index 6b5e97c78..e90bf2661 100644 --- a/PKHeX/PKM/PK4.cs +++ b/PKHeX/PKM/PK4.cs @@ -323,19 +323,26 @@ public override int Met_Location public override int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | (value << 4)); } } public override int Ball { - get { return Data[HGSS ? 0x86 : 0x83]; } + get + { + // Pokemon obtained in HGSS have the HGSS ball set (@0x86) + // However, this info is not set when receiving a wondercard! + // The PGT contains a preformatted PK4 file, which is slightly modified. + // No HGSS balls were used, and no HGSS ball info is set. + + // Sneaky way = return the higher of the two values. + return Math.Max(Data[0x86], Data[0x83]); + } set { - if (HGSS) - { - Data[0x83] = (byte)(value <= 0x10 ? value : 4); // Ball to display in DP (cap at Cherish) + // Ball to display in DPPt + Data[0x83] = (byte)(value <= 0x10 ? value : 4); // Cap at Cherish Ball + + // HGSS Exclusive Balls -- If the user wants to screw things up, let them. Any legality checking could catch hax. + if (value > 0x10 || (HGSS && !FatefulEncounter)) Data[0x86] = (byte)(value <= 0x18 ? value : 4); // Cap at Comp Ball - } else - { - Data[0x83] = (byte)(value <= 0x10 ? value : 4); // Cap at Cherish Ball Data[0x86] = 0; // Unused - } } } public override int Met_Level { get { return Data[0x84] & ~0x80; } set { Data[0x84] = (byte)((Data[0x84] & 0x80) | value); } } From 7ef4a73fcd6819aa55fac3cfafae404ff650cb80 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Mon, 5 Sep 2016 23:13:46 -0700 Subject: [PATCH 42/75] Hide met tab for gen1 saves, fix verifiedPKM 6->1->translate->6 needs translation done for the Met tab as it being removed does not list it in the control list when translating, so just trigger it again. Other methods had to be tweaked to not reference the tabMain tabs by index (instead by control names!) Simplify the verifiedPKM method. removes unnecessary goto and fixes recent added bug :) As a side effect the color tracking variables are no longer, now using the ResetForeColor/ResetBackColor methods of the control -- duh --- PKHeX/MainWindow/Main.cs | 71 ++++++++++--------- PKHeX/Subforms/Save Editors/SAV_EventFlags.cs | 2 +- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 386301015..aacfa5508 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -66,8 +66,7 @@ public Main() }; relearnPB = new[] { PB_WarnRelearn1, PB_WarnRelearn2, PB_WarnRelearn3, PB_WarnRelearn4 }; movePB = new[] { PB_WarnMove1, PB_WarnMove2, PB_WarnMove3, PB_WarnMove4 }; - defaultControlWhite = CB_Species.BackColor; - defaultControlText = Label_Species.ForeColor; + Label_Species.ResetForeColor(); // Set up Language Selection foreach (var cbItem in main_langlist) @@ -162,7 +161,6 @@ public Main() #region Important Variables public static PKM pkm = new PK6(); // Tab Pokemon Data Storage public static SaveFile SAV = new SAV6 { Game = (int)GameVersion.AS, OT = "PKHeX", TID = 12345, SID = 54321, Language = 2, Country = 49, SubRegion = 7, ConsoleRegion = 1 }; // Save File - public static Color defaultControlWhite, defaultControlText; public static string eggname = ""; public static string curlanguage = "en"; @@ -790,6 +788,8 @@ private void openSAV(byte[] input, string path) private void loadSAV(SaveFile sav, string path) { PKM pk = preparePKM(); + // clean fields + populateFields(SAV.BlankPKM); SAV = sav; if (path != null) // Actual save file @@ -956,7 +956,7 @@ private void loadSAV(SaveFile sav, string path) } // Recenter PKM SubEditors - FLP_PKMEditors.Location = new Point((tabMain.TabPages[4].Width - FLP_PKMEditors.Width) / 2, FLP_PKMEditors.Location.Y); + FLP_PKMEditors.Location = new Point((Tab_OTMisc.Width - FLP_PKMEditors.Width) / 2, FLP_PKMEditors.Location.Y); switch (SAV.Generation) { @@ -1008,6 +1008,16 @@ private void loadSAV(SaveFile sav, string path) TB_OTt2.MaxLength = SAV.OTLength; TB_Nickname.MaxLength = SAV.NickLength; + // Hide Unused Tabs + if (SAV.Generation == 1 && tabMain.TabPages.Contains(Tab_Met)) + tabMain.TabPages.Remove(Tab_Met); + else if (SAV.Generation != 1 && !tabMain.TabPages.Contains(Tab_Met)) + { + tabMain.TabPages.Insert(1, Tab_Met); + // force update -- re-added tab may be untranslated + Util.TranslateInterface(this, curlanguage); + } + // Common HaX Interface CHK_HackedStats.Enabled = CHK_HackedStats.Visible = MT_Level.Enabled = MT_Level.Visible = MT_Form.Enabled = MT_Form.Visible = HaX; TB_Level.Visible = !HaX; @@ -1065,7 +1075,7 @@ private void changeMainLanguage(object sender, EventArgs e) InitializeLanguage(); Util.TranslateInterface(this, lang_val[CB_MainLanguage.SelectedIndex]); // Translate the UI to language. // Recenter PKM SubEditors - FLP_PKMEditors.Location = new Point((tabMain.TabPages[4].Width - FLP_PKMEditors.Width)/2, FLP_PKMEditors.Location.Y); + FLP_PKMEditors.Location = new Point((Tab_OTMisc.Width - FLP_PKMEditors.Width)/2, FLP_PKMEditors.Location.Y); populateFields(pk); // put data back in form fieldsInitialized |= alreadyInit; } @@ -2261,7 +2271,7 @@ private void updateNatureModification(object sender, EventArgs e) Label[] labarray = { Label_ATK, Label_DEF, Label_SPE, Label_SPA, Label_SPD }; // Reset Label Colors foreach (Label label in labarray) - label.ForeColor = defaultControlText; + label.ResetForeColor(); // Set Colored StatLabels only if Nature isn't Neutral NatureTip.SetToolTip(CB_Nature, @@ -2449,7 +2459,10 @@ private void validateComboBox(object sender) cb.SelectionLength = 0; if (cb.Text == "") { cb.SelectedIndex = 0; return; } - cb.BackColor = cb.SelectedValue == null ? Color.DarkSalmon : defaultControlWhite; + if (cb.SelectedValue == null) + cb.BackColor = Color.DarkSalmon; + else + cb.ResetBackColor(); } private void validateComboBox(object sender, System.ComponentModel.CancelEventArgs e) { @@ -2561,7 +2574,7 @@ private void updateStats() Label[] labarray = { Label_ATK, Label_DEF, Label_SPE, Label_SPA, Label_SPD }; // Reset Label Colors foreach (Label label in labarray) - label.ForeColor = defaultControlText; + label.ResetForeColor(); // Set Colored StatLabels only if Nature isn't Neutral if (incr == decr) return; @@ -2619,38 +2632,30 @@ public bool verifiedPKM() if (ModifierKeys == (Keys.Control | Keys.Shift | Keys.Alt)) return true; // Override // Make sure the PKX Fields are filled out properly (color check) - #region ComboBoxes to verify they are set. ComboBox[] cba = { CB_Species, CB_Nature, CB_HeldItem, CB_Ability, // Main Tab CB_MetLocation, CB_EggLocation, CB_Ball, // Met Tab CB_Move1, CB_Move2, CB_Move3, CB_Move4, // Moves CB_RelearnMove1, CB_RelearnMove2, CB_RelearnMove3, CB_RelearnMove4 // Moves }; - for (int i = 0; i < cba.Length; i++) - { - int back = cba[i].BackColor.ToArgb(); - if (!cba[i].Visible || back == SystemColors.Control.ToArgb() || back == 0 || - !(back != -1 & back != defaultControlWhite.ToArgb())) continue; - if (i < 6) // Main Tab - tabMain.SelectedIndex = 0; - else if (i < 9) // Met Tab - tabMain.SelectedIndex = 1; - else // Moves - tabMain.SelectedIndex = 3; - goto invalid; - } - #endregion - // Further logic checking - if (SAV.Generation >= 3 && Convert.ToUInt32(TB_EVTotal.Text) > 510 && !CHK_HackedStats.Checked) - { tabMain.SelectedIndex = 2; goto invalid; } - // If no errors detected... - if (Util.getIndex(CB_Species) != 0) return true; - // Else - tabMain.SelectedIndex = 0; - // else... - invalid: - { SystemSounds.Exclamation.Play(); return false; } + ComboBox cb = cba.FirstOrDefault(c => c.BackColor == Color.DarkSalmon); + if (cb != null) + { + Control c = cb.Parent; + while (!(c is TabPage)) + c = c.Parent; + tabMain.SelectedTab = c as TabPage; + } + else if (SAV.Generation >= 3 && Convert.ToUInt32(TB_EVTotal.Text) > 510 && !CHK_HackedStats.Checked) + tabMain.SelectedTab = Tab_Stats; + else if (Util.getIndex(CB_Species) == 0) + tabMain.SelectedTab = Tab_Main; + else + return true; + + SystemSounds.Exclamation.Play(); + return false; } public static string[] verifyPKMtoSAV(PKM pk) { diff --git a/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs index 84504de88..6db4f3a40 100644 --- a/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs +++ b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs @@ -218,7 +218,7 @@ private void changeCustomFlag(object sender, EventArgs e) else { c_CustomFlag.Enabled = true; - nud.BackColor = Main.defaultControlWhite; + nud.ResetBackColor(); c_CustomFlag.Checked = flags[flag]; } } From 7d4a60efdde73e57a2a286c6cecb2c873f114b48 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 16:46:00 -0700 Subject: [PATCH 43/75] Tweak IV/EV events #237 Hides the Shiny star on gen1, and re-hides the extrabytes for gen1/2 Adds missing click event for Label_SPC, as it was recently added. Replaces the Label_SPA in gen1. --- PKHeX/MainWindow/Main.Designer.cs | 1 + PKHeX/MainWindow/Main.cs | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index 287945846..cc4951835 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -2381,6 +2381,7 @@ public void InitializeComponent() this.Label_SPC.TabIndex = 125; this.Label_SPC.Text = "SpC:"; this.Label_SPC.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPC.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); // // FLP_SpARight // diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index aacfa5508..07c4e5d89 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -882,7 +882,7 @@ private void loadSAV(SaveFile sav, string path) FLP_Nature.Visible = SAV.Generation >= 3; FLP_Ability.Visible = SAV.Generation >= 3; FLP_Language.Visible = SAV.Generation >= 3; - GB_ExtraBytes.Enabled = SAV.Generation >= 3; + GB_ExtraBytes.Visible = GB_ExtraBytes.Enabled = SAV.Generation >= 3; GB_Markings.Visible = SAV.Generation >= 3; BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; @@ -894,6 +894,9 @@ private void loadSAV(SaveFile sav, string path) FLP_HeldItem.Visible = SAV.Generation >= 2; CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; + if (SAV.Generation == 1) + Label_IsShiny.Visible = false; + // HaX override, needs to be after DEV_Ability enabled assignment. TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; @@ -1585,32 +1588,40 @@ private void clickStatLabel(object sender, MouseEventArgs e) if (!(ModifierKeys == Keys.Control || ModifierKeys == Keys.Alt)) return; + if (sender == Label_SPC) + sender = Label_SPA; int index = Array.IndexOf(new[] { Label_HP, Label_ATK, Label_DEF, Label_SPA, Label_SPD, Label_SPE }, sender); if (ModifierKeys == Keys.Alt) // EV { - var arrayEV = new[] {TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPAEV, TB_SPDEV, TB_SPEEV}; - arrayEV[index].Text = (e.Button == MouseButtons.Left - ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(arrayEV[index].Text), 0), 252) - : 0).ToString(); + var mt = new[] {TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPAEV, TB_SPDEV, TB_SPEEV}[index]; + if (e.Button == MouseButtons.Left) // max + mt.Text = SAV.Generation >= 3 + ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(mt.Text), 0), 252).ToString() + : ushort.MaxValue.ToString(); + else // min + mt.Text = 0.ToString(); } else new[] {TB_HPIV, TB_ATKIV, TB_DEFIV, TB_SPAIV, TB_SPDIV, TB_SPEIV}[index].Text = - (e.Button == MouseButtons.Left ? 31 : 0).ToString(); + (e.Button == MouseButtons.Left ? SAV.MaxIV : 0).ToString(); } private void clickIV(object sender, EventArgs e) { if (ModifierKeys == Keys.Control) - ((MaskedTextBox) sender).Text = 31.ToString(); + ((MaskedTextBox) sender).Text = SAV.MaxIV.ToString(); else if (ModifierKeys == Keys.Alt) ((MaskedTextBox) sender).Text = 0.ToString(); } private void clickEV(object sender, EventArgs e) { + MaskedTextBox mt = (MaskedTextBox)sender; if (ModifierKeys == Keys.Control) // EV - ((MaskedTextBox) sender).Text = Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32((sender as MaskedTextBox).Text), 0), 252).ToString(); + mt.Text = SAV.Generation >= 3 + ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(mt.Text), 0), 252).ToString() + : ushort.MaxValue.ToString(); else if (ModifierKeys == Keys.Alt) - ((MaskedTextBox) sender).Text = 0.ToString(); + mt.Text = 0.ToString(); } private void clickOT(object sender, EventArgs e) { From 06942089fa0a01fbe57ea4e4bfef7e94516d1fb8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 17:01:31 -0700 Subject: [PATCH 44/75] Add Event Flag warning Closes #236 Altering Event Flags may impact other story events. Save file backups are recommended. --- .../Save Editors/SAV_EventFlags.Designer.cs | 56 ++++++++++++------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs index e341d52a2..338dddf6a 100644 --- a/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs @@ -49,9 +49,10 @@ private void InitializeComponent() this.B_LoadNew = new System.Windows.Forms.Button(); this.B_LoadOld = new System.Windows.Forms.Button(); this.GB_Flags = new System.Windows.Forms.GroupBox(); + this.TLP_Flags = new System.Windows.Forms.TableLayoutPanel(); this.GB_Constants = new System.Windows.Forms.GroupBox(); this.TLP_Const = new System.Windows.Forms.TableLayoutPanel(); - this.TLP_Flags = new System.Windows.Forms.TableLayoutPanel(); + this.L_EventFlagWarn = new System.Windows.Forms.Label(); this.GB_FlagStatus.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nud)).BeginInit(); this.GB_Researcher.SuspendLayout(); @@ -271,21 +272,38 @@ private void InitializeComponent() this.GB_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.GB_Flags.Controls.Add(this.TLP_Flags); - this.GB_Flags.Location = new System.Drawing.Point(12, 12); + this.GB_Flags.Location = new System.Drawing.Point(12, 24); this.GB_Flags.Name = "GB_Flags"; - this.GB_Flags.Size = new System.Drawing.Size(212, 210); + this.GB_Flags.Size = new System.Drawing.Size(212, 198); this.GB_Flags.TabIndex = 39; this.GB_Flags.TabStop = false; this.GB_Flags.Text = "Event Flags"; // + // TLP_Flags + // + this.TLP_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.TLP_Flags.AutoScroll = true; + this.TLP_Flags.ColumnCount = 2; + this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Flags.Location = new System.Drawing.Point(6, 19); + this.TLP_Flags.Name = "TLP_Flags"; + this.TLP_Flags.RowCount = 2; + this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Flags.Size = new System.Drawing.Size(200, 172); + this.TLP_Flags.TabIndex = 0; + // // GB_Constants // this.GB_Constants.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.GB_Constants.Controls.Add(this.TLP_Const); - this.GB_Constants.Location = new System.Drawing.Point(235, 12); + this.GB_Constants.Location = new System.Drawing.Point(235, 24); this.GB_Constants.Name = "GB_Constants"; - this.GB_Constants.Size = new System.Drawing.Size(212, 210); + this.GB_Constants.Size = new System.Drawing.Size(212, 198); this.GB_Constants.TabIndex = 40; this.GB_Constants.TabStop = false; this.GB_Constants.Text = "Event Constants"; @@ -303,31 +321,28 @@ private void InitializeComponent() this.TLP_Const.Name = "TLP_Const"; this.TLP_Const.RowCount = 1; this.TLP_Const.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Const.Size = new System.Drawing.Size(200, 184); + this.TLP_Const.Size = new System.Drawing.Size(200, 172); this.TLP_Const.TabIndex = 0; // - // TLP_Flags + // L_EventFlagWarn // - this.TLP_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.L_EventFlagWarn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.TLP_Flags.AutoScroll = true; - this.TLP_Flags.ColumnCount = 2; - this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.TLP_Flags.Location = new System.Drawing.Point(6, 19); - this.TLP_Flags.Name = "TLP_Flags"; - this.TLP_Flags.RowCount = 2; - this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Flags.Size = new System.Drawing.Size(200, 184); - this.TLP_Flags.TabIndex = 0; + this.L_EventFlagWarn.ForeColor = System.Drawing.Color.Red; + this.L_EventFlagWarn.Location = new System.Drawing.Point(12, 1); + this.L_EventFlagWarn.Name = "L_EventFlagWarn"; + this.L_EventFlagWarn.Size = new System.Drawing.Size(435, 20); + this.L_EventFlagWarn.TabIndex = 41; + this.L_EventFlagWarn.Text = "Altering Event Flags may impact other story events. Save file backups are recomme" + + "nded."; + this.L_EventFlagWarn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // SAV_EventFlags // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(454, 351); + this.Controls.Add(this.L_EventFlagWarn); this.Controls.Add(this.GB_Constants); this.Controls.Add(this.GB_Flags); this.Controls.Add(this.GB_Researcher); @@ -378,5 +393,6 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox GB_Constants; private System.Windows.Forms.TableLayoutPanel TLP_Const; private System.Windows.Forms.TableLayoutPanel TLP_Flags; + private System.Windows.Forms.Label L_EventFlagWarn; } } \ No newline at end of file From b483cd8002997f95372f8afb79bf3382b9ef0ca8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 17:19:30 -0700 Subject: [PATCH 45/75] Check if 'wc6' exists Thanks Destinyy! --- PKHeX/Subforms/SAV_MysteryGiftDB.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PKHeX/Subforms/SAV_MysteryGiftDB.cs b/PKHeX/Subforms/SAV_MysteryGiftDB.cs index 0b64d2ef1..ad1a579b6 100644 --- a/PKHeX/Subforms/SAV_MysteryGiftDB.cs +++ b/PKHeX/Subforms/SAV_MysteryGiftDB.cs @@ -76,6 +76,8 @@ public SAV_MysteryGiftDB(Main f1) // Load Data RawDB = new List(); RawDB.AddRange(Legal.WC6DB); + + if (Directory.Exists(DatabasePath)) foreach (string file in Directory.GetFiles(DatabasePath, "*", SearchOption.AllDirectories)) { FileInfo fi = new FileInfo(file); From 8b608389eb5c39d89e8f2a56632cee7f610ef99f Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 6 Sep 2016 19:35:36 -0700 Subject: [PATCH 46/75] Fix box dumping/loading for Gens I/II --- PKHeX/MainWindow/Main.cs | 2 +- PKHeX/Saves/SaveFile.cs | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 07c4e5d89..d44571465 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -3394,7 +3394,7 @@ private void dumpBoxesToDB(string path, bool individualBoxFolders) Directory.CreateDirectory(Path.Combine(path, boxfolder)); } if (!File.Exists(Path.Combine(Path.Combine(path, boxfolder), fileName))) - File.WriteAllBytes(Path.Combine(Path.Combine(path, boxfolder), fileName), pk.Data.Take(SAV.SIZE_STORED).ToArray()); + File.WriteAllBytes(Path.Combine(Path.Combine(path, boxfolder), fileName), pk.DecryptedBoxData); } } private void loadBoxesFromDB(string path) diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index 250d68dd1..15c3229f4 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -466,7 +466,14 @@ public bool setPCBin(byte[] data) PKM[] pkms = BoxData; for (int i = 0; i < pkms.Length; i++) - pkms[i].Data = decryptPKM(pkdata[i]); + { + if (Generation == 1) + pkms[i] = new PokemonList1(decryptPKM(pkdata[i]))[0]; + else if (Generation == 2) + pkms[i] = new PokemonList2(decryptPKM(pkdata[i]))[0]; + else + pkms[i].Data = decryptPKM(pkdata[i]); + } BoxData = pkms; return true; } @@ -484,7 +491,14 @@ public bool setBoxBin(byte[] data, int box) PKM[] pkms = BoxData; for (int i = 0; i < BoxSlotCount; i++) - pkms[box*BoxSlotCount + i].Data = decryptPKM(pkdata[i]); + { + if (Generation == 1) + pkms[box * BoxSlotCount + i] = new PokemonList1(decryptPKM(pkdata[i]))[0]; + else if (Generation == 2) + pkms[box * BoxSlotCount + i] = new PokemonList2(decryptPKM(pkdata[i]))[0]; + else + pkms[box * BoxSlotCount + i].Data = decryptPKM(pkdata[i]); + } BoxData = pkms; return true; } From b2860ea3de21d45015de51d2631ad82fea285ba5 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 6 Sep 2016 19:40:54 -0700 Subject: [PATCH 47/75] Simplify box bin loading --- PKHeX/Saves/SaveFile.cs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index 15c3229f4..59fcae316 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -466,14 +466,7 @@ public bool setPCBin(byte[] data) PKM[] pkms = BoxData; for (int i = 0; i < pkms.Length; i++) - { - if (Generation == 1) - pkms[i] = new PokemonList1(decryptPKM(pkdata[i]))[0]; - else if (Generation == 2) - pkms[i] = new PokemonList2(decryptPKM(pkdata[i]))[0]; - else - pkms[i].Data = decryptPKM(pkdata[i]); - } + pkms[i] = getPKM(decryptPKM(pkdata[i])); BoxData = pkms; return true; } @@ -491,14 +484,7 @@ public bool setBoxBin(byte[] data, int box) PKM[] pkms = BoxData; for (int i = 0; i < BoxSlotCount; i++) - { - if (Generation == 1) - pkms[box * BoxSlotCount + i] = new PokemonList1(decryptPKM(pkdata[i]))[0]; - else if (Generation == 2) - pkms[box * BoxSlotCount + i] = new PokemonList2(decryptPKM(pkdata[i]))[0]; - else - pkms[box * BoxSlotCount + i].Data = decryptPKM(pkdata[i]); - } + pkms[box*BoxSlotCount + i] = getPKM(decryptPKM(pkdata[i])); BoxData = pkms; return true; } From 822fc47dc413c2edfbd9ac2d10d5e8ef23795edc Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 19:52:03 -0700 Subject: [PATCH 48/75] Remove invalid pk sizes export always is in list format for gen1/2, these were introduced in https://github.com/kwsch/PKHeX/commit/9b6552d3146f73c2a33f5254f0b673f8f08d9891 which was an incorrect 'fix' for getting files dumped from dumpBoxesToDB to show up in SAV_Database. This underlying issue has been resolved with the two previous commits. --- PKHeX/PKM/PKMConverter.cs | 4 ---- PKHeX/PKM/PKX.cs | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index bd3e14b73..7ab96784a 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -33,13 +33,9 @@ public static int getPKMDataFormat(byte[] data) { case PKX.SIZE_1JLIST: case PKX.SIZE_1ULIST: - case PKX.SIZE_1PARTY: - case PKX.SIZE_1STORED: return 1; case PKX.SIZE_2ULIST: case PKX.SIZE_2JLIST: - case PKX.SIZE_2PARTY: - case PKX.SIZE_2STORED: return 2; case PKX.SIZE_3PARTY: case PKX.SIZE_3STORED: diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 1c9a62d9f..73c066406 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -45,8 +45,8 @@ public static bool getIsPKM(long len) { return new[] { - SIZE_1JLIST, SIZE_1ULIST, SIZE_1PARTY, SIZE_1STORED, - SIZE_2ULIST, SIZE_2JLIST, SIZE_2PARTY, SIZE_2STORED, + SIZE_1JLIST, SIZE_1ULIST, + SIZE_2ULIST, SIZE_2JLIST, SIZE_3STORED, SIZE_3PARTY, SIZE_4STORED, SIZE_4PARTY, SIZE_5PARTY, From de6205ac4b24108492d3a97cfaeddcc623dc745f Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 7 Sep 2016 09:10:38 -0700 Subject: [PATCH 49/75] Fix gen1/2 visibility Closes #242 Thanks @sora10pls ! --- PKHeX/MainWindow/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index d44571465..cab5d0a59 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -886,13 +886,13 @@ private void loadSAV(SaveFile sav, string path) GB_Markings.Visible = SAV.Generation >= 3; BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; - FLP_PKRSRight.Visible = SAV.Generation >= 3; - FLP_PKRS.Visible = SAV.Generation >= 3; BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; FLP_FriendshipForm.Visible = SAV.Generation >= 2; FLP_HeldItem.Visible = SAV.Generation >= 2; CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; + FLP_PKRS.Visible = FLP_EggPKRSRight.Visible = SAV.Generation >= 2; + Label_OTGender.Visible = SAV.Generation >= 2; if (SAV.Generation == 1) Label_IsShiny.Visible = false; From f0d13da35a2475c89c94fce4dd9d1f34d7f85010 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 8 Sep 2016 20:20:32 -0700 Subject: [PATCH 50/75] MaxMoney capping 1-4 Closes #245 Thanks @sora10pls ! --- PKHeX/Saves/SAV1.cs | 1 + PKHeX/Saves/SAV2.cs | 1 + PKHeX/Saves/SAV3.cs | 1 + PKHeX/Saves/SAV4.cs | 1 + PKHeX/Saves/SaveFile.cs | 1 + PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs | 3 ++- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index e65d73f61..a0a737add 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -167,6 +167,7 @@ public override byte[] Write(bool DSV) public override int MaxItemID => 255; public override int MaxBallID => 0; public override int MaxGameID => 99; // What do I set this to...? + public override int MaxMoney => 999999; public override int BoxCount => Japanese ? 8 : 12; public override int MaxEV => 65535; diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs index 87367195c..24426483f 100644 --- a/PKHeX/Saves/SAV2.cs +++ b/PKHeX/Saves/SAV2.cs @@ -216,6 +216,7 @@ private void getSAVOffsets() public override int MaxItemID => 255; public override int MaxBallID => 0; public override int MaxGameID => 99; // What do I set this to...? + public override int MaxMoney => 999999; public override int BoxCount => Japanese ? 9 : 14; public override int MaxEV => 65535; diff --git a/PKHeX/Saves/SAV3.cs b/PKHeX/Saves/SAV3.cs index f9e041d1f..9ea4cbdec 100644 --- a/PKHeX/Saves/SAV3.cs +++ b/PKHeX/Saves/SAV3.cs @@ -172,6 +172,7 @@ public override byte[] Write(bool DSV) protected override int GiftCountMax => 1; public override int OTLength => 8; public override int NickLength => 10; + public override int MaxMoney => 999999; public override bool HasParty => true; diff --git a/PKHeX/Saves/SAV4.cs b/PKHeX/Saves/SAV4.cs index d9a215e0a..f0e415884 100644 --- a/PKHeX/Saves/SAV4.cs +++ b/PKHeX/Saves/SAV4.cs @@ -53,6 +53,7 @@ public SAV4(byte[] data = null, GameVersion versionOverride = GameVersion.Any) protected override int GiftCountMax => 11; public override int OTLength => 8; public override int NickLength => 10; + public override int MaxMoney => 999999; public override int MaxMoveID => 467; public override int MaxSpeciesID => 493; diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index 59fcae316..ae2ea1090 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -105,6 +105,7 @@ public virtual byte[] Write(bool DSV) public virtual int DaycareSeedSize { get; } = 0; public abstract int OTLength { get; } public abstract int NickLength { get; } + public virtual int MaxMoney { get; } = 9999999; // Offsets protected int Box { get; set; } = int.MinValue; diff --git a/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs index feda2adf8..bbfa1e24c 100644 --- a/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs @@ -13,7 +13,8 @@ public SAV_SimpleTrainer() cba = new[] {CHK_1, CHK_2, CHK_3, CHK_4, CHK_5, CHK_6, CHK_7, CHK_8}; TB_OTName.MaxLength = SAV.OTLength; - B_MaxCash.Click += (sender, e) => MT_Money.Text = "9,999,999"; + B_MaxCash.Click += (sender, e) => MT_Money.Text = SAV.MaxMoney.ToString(); + MT_Money.Mask = "00000000000".Substring(0, SAV.MaxMoney.ToString().Length); B_MaxCoins.Click += (sender, e) => MT_Coins.Text = "9999"; CB_Gender.Items.Clear(); From eaa12f59bddce2801a454a3d91ed1062ad838ca6 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Thu, 8 Sep 2016 20:29:12 -0700 Subject: [PATCH 51/75] Disallow out-of-bounds puff values Closes #246 Might as well use the SAV property "Puffs" when loading instead of only when saving. --- PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs index 915668503..cfbaef4ee 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs @@ -48,11 +48,18 @@ private void Setup() dgv.Columns.Add(dgvIndex); dgv.Columns.Add(dgvPuff); - dgv.Rows.Add(100); - for (int i = 0; i < 100; i++) + var Puffs = SAV.Puffs; + dgv.Rows.Add(Puffs.Length); + for (int i = 0; i < Puffs.Length; i++) { dgv.Rows[i].Cells[0].Value = (i + 1).ToString(); - dgv.Rows[i].Cells[1].Value = pfa[SAV.Data[SAV.Puff + i]]; + int puffval = Puffs[i]; + if (puffval >= pfa.Length) + { + Util.Error($"Invalid Puff Index: {i}", $"Expected < ${pfa.Length}"); + puffval = 0; + } + dgv.Rows[i].Cells[1].Value = pfa[puffval]; } MT_CNT.Text = SAV.PuffCount.ToString(); } From 92448f478df1986f19eb3623fa73d2f851a77734 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 9 Sep 2016 08:40:57 -0700 Subject: [PATCH 52/75] Fix box0 sort/delete Closes #248 Thanks @exegg --- PKHeX/MainWindow/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index cab5d0a59..a59e45cf3 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -2860,7 +2860,7 @@ private void clickBoxSort(object sender, EventArgs e) return; SAV.resetBoxes(); - CB_BoxSelect.SelectedIndex = 0; + setPKXBoxes(); Util.Alert("Boxes cleared!"); } else if (ModifierKeys == Keys.Alt) @@ -2878,7 +2878,7 @@ private void clickBoxSort(object sender, EventArgs e) return; SAV.sortBoxes(); - CB_BoxSelect.SelectedIndex = 0; + setPKXBoxes(); Util.Alert("Boxes sorted!"); } else if (ModifierKeys == Keys.Control) From ca6a0da9dbacd9fcfaf36e809ab3abfecf4f916a Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 9 Sep 2016 19:13:48 -0700 Subject: [PATCH 53/75] ShowdownSet Improve error handling Because people can't follow directions and try to type it out manually -> incorrect input --- PKHeX/PKM/ShowdownSet.cs | 43 ++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/PKHeX/PKM/ShowdownSet.cs b/PKHeX/PKM/ShowdownSet.cs index 22538281f..d15e96b18 100644 --- a/PKHeX/PKM/ShowdownSet.cs +++ b/PKHeX/PKM/ShowdownSet.cs @@ -31,7 +31,7 @@ public class ShowdownSet public int[] EVs; public int[] IVs; public int[] Moves; - public List InvalidLines = new List(); + public readonly List InvalidLines = new List(); // Parsing Utility public ShowdownSet(string input = null) @@ -120,7 +120,10 @@ public ShowdownSet(string input = null) { string type = moveString.Remove(0, 13).Replace("[", "").Replace("]", ""); // Trim out excess data int hpVal = Array.IndexOf(hptypes, type); // Get HP Type - if (hpVal >= 0) IVs = PKX.setHPIVs(hpVal, IVs); // Get IVs + if (hpVal >= 0) + IVs = PKX.setHPIVs(hpVal, IVs); // Get IVs + else + InvalidLines.Add($"Invalid Hidden Power Type: {type}"); } moveString = "Hidden Power"; } @@ -142,17 +145,41 @@ public ShowdownSet(string input = null) case "EVs": { // Get EV list String - string[] evlist = brokenline[1].Replace("SAtk", "SpA").Replace("SDef", "SpD").Replace("Spd", "Spe").Split(new[] { " / ", " " }, StringSplitOptions.None); - for (int i = 0; i < evlist.Length / 2; i++) - EVs[Array.IndexOf(StatNames, evlist[1 + i * 2])] = (byte)Util.ToInt32(evlist[0 + 2 * i]); + string[] evlist = brokenline[1] + // Because people think they can type sets out... + .Replace("SAtk", "SpA").Replace("Sp Atk", "SpA") + .Replace("SDef", "SpD").Replace("Sp Def", "SpD") + .Replace("Spd", "Spe").Replace("Speed", "Spe").Split(new[] { " / ", " " }, StringSplitOptions.None); + for (int i = 0; i < evlist.Length/2; i++) + { + ushort EV; + ushort.TryParse(evlist[i * 2 + 0], out EV); + int index = Array.IndexOf(StatNames, evlist[i*2 + 1]); + if (index > -1) + EVs[index] = EV; + else + InvalidLines.Add($"Unknown EV Type input: {evlist[i*2]}"); + } break; } case "IVs": { // Get IV list String - string[] ivlist = brokenline[1].Split(new[] { " / ", " " }, StringSplitOptions.None); - for (int i = 0; i < ivlist.Length / 2; i++) - IVs[Array.IndexOf(StatNames, ivlist[1 + i * 2])] = (byte)Util.ToInt32(ivlist[0 + 2 * i]); + string[] ivlist = brokenline[1] + // Because people think they can type sets out... + .Replace("SAtk", "SpA").Replace("Sp Atk", "SpA") + .Replace("SDef", "SpD").Replace("Sp Def", "SpD") + .Replace("Spd", "Spe").Replace("Speed", "Spe").Split(new[] { " / ", " " }, StringSplitOptions.None); + for (int i = 0; i < ivlist.Length/2; i++) + { + byte IV; + byte.TryParse(ivlist[i*2 + 0], out IV); + int index = Array.IndexOf(StatNames, ivlist[i*2 + 1]); + if (index > -1) + IVs[index] = IV; + else + InvalidLines.Add($"Unknown EV Type input: {ivlist[i * 2]}"); + } break; } default: From cfb8d71f8414062f7860287c230690819855a696 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Fri, 9 Sep 2016 23:59:13 -0700 Subject: [PATCH 54/75] Fix ribbon name Exception was thrown in ribbon editor, easy to replicate by giving all ribbons to a pk4 (gen4 save file). Property name now matches pk5/pk6. --- PKHeX/PKM/PK4.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/PKM/PK4.cs b/PKHeX/PKM/PK4.cs index e90bf2661..a9d669876 100644 --- a/PKHeX/PKM/PK4.cs +++ b/PKHeX/PKM/PK4.cs @@ -81,7 +81,7 @@ public PK4(byte[] decryptedData = null, string ident = null) public bool RibbonRecord { get { return (RIB2 & (1 << 2)) == 1 << 2; } set { RIB2 = (byte)(RIB2 & ~(1 << 2) | (value ? 1 << 2 : 0)); } } public bool RibbonEvent { get { return (RIB2 & (1 << 3)) == 1 << 3; } set { RIB2 = (byte)(RIB2 & ~(1 << 3) | (value ? 1 << 3 : 0)); } } public bool RibbonLegend { get { return (RIB2 & (1 << 4)) == 1 << 4; } set { RIB2 = (byte)(RIB2 & ~(1 << 4) | (value ? 1 << 4 : 0)); } } - public bool RibbonWorldChampion { get { return (RIB2 & (1 << 5)) == 1 << 5; } set { RIB2 = (byte)(RIB2 & ~(1 << 5) | (value ? 1 << 5 : 0)); } } + public bool RibbonChampionWorld { get { return (RIB2 & (1 << 5)) == 1 << 5; } set { RIB2 = (byte)(RIB2 & ~(1 << 5) | (value ? 1 << 5 : 0)); } } public bool RibbonBirthday { get { return (RIB2 & (1 << 6)) == 1 << 6; } set { RIB2 = (byte)(RIB2 & ~(1 << 6) | (value ? 1 << 6 : 0)); } } public bool RibbonSpecial { get { return (RIB2 & (1 << 7)) == 1 << 7; } set { RIB2 = (byte)(RIB2 & ~(1 << 7) | (value ? 1 << 7 : 0)); } } public bool RibbonSouvenir { get { return (RIB3 & (1 << 0)) == 1 << 0; } set { RIB3 = (byte)(RIB3 & ~(1 << 0) | (value ? 1 << 0 : 0)); } } From c3b7601adfb1d0cca7067d6516b68892aeb492cf Mon Sep 17 00:00:00 2001 From: ajtudela Date: Sat, 10 Sep 2016 16:14:34 +0200 Subject: [PATCH 55/75] Spanish translations for Gen 1-3 --- PKHeX/PKHeX.csproj | 5 + PKHeX/Resources/text/es/lang_es.txt | 12 +- PKHeX/Resources/text/es/text_Forms_es.txt | 4 +- PKHeX/Resources/text/gen3/text_ItemsG1_es.txt | Bin 0 -> 2754 bytes PKHeX/Resources/text/gen3/text_ItemsG2_es.txt | 255 ++++++++++++++++++ PKHeX/Resources/text/gen3/text_ItemsG3_es.txt | Bin 0 -> 7096 bytes .../Resources/text/gen3/text_gsc_00000_es.txt | Bin 0 -> 2168 bytes .../text/gen3/text_rsefrlg_00000_es.txt | Bin 0 -> 6028 bytes 8 files changed, 268 insertions(+), 8 deletions(-) create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG1_es.txt create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG2_es.txt create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG3_es.txt create mode 100644 PKHeX/Resources/text/gen3/text_gsc_00000_es.txt create mode 100644 PKHeX/Resources/text/gen3/text_rsefrlg_00000_es.txt diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index ab34b112a..78abf06ba 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -449,6 +449,11 @@ Settings.settings True + + + + + diff --git a/PKHeX/Resources/text/es/lang_es.txt b/PKHeX/Resources/text/es/lang_es.txt index 150bf0dba..b2e22bad8 100644 --- a/PKHeX/Resources/text/es/lang_es.txt +++ b/PKHeX/Resources/text/es/lang_es.txt @@ -94,13 +94,13 @@ Label_EggDate = Fecha: Tab_Stats = Estadísticas Label_IVs = IVs Label_EVs = EVs -Label_Stats = Estad. +Label_Stats = Esta. Label_HP = PS: -Label_ATK = Atq: -Label_DEF = Def: -Label_SPA = Atq E: -Label_SPD = Def E: -Label_SPE = Velo: +Label_ATK = Ataque: +Label_DEF = Defensa: +Label_SPA = Atq. Esp.: +Label_SPD = Def. Esp.: +Label_SPE = Velocidad: Label_Total = Total: Label_HiddenPowerPrefix = Tipo del Poder Oculto: Label_CharacteristicPrefix = Características: diff --git a/PKHeX/Resources/text/es/text_Forms_es.txt b/PKHeX/Resources/text/es/text_Forms_es.txt index 2ad2e7655..5a79c94ca 100644 --- a/PKHeX/Resources/text/es/text_Forms_es.txt +++ b/PKHeX/Resources/text/es/text_Forms_es.txt @@ -1,4 +1,4 @@ -Spiky +Picoreja @@ -199,7 +199,7 @@ -Unaa +Una diff --git a/PKHeX/Resources/text/gen3/text_ItemsG1_es.txt b/PKHeX/Resources/text/gen3/text_ItemsG1_es.txt new file mode 100644 index 0000000000000000000000000000000000000000..f9f16814ce80a53e318decd12068c23560f432fc GIT binary patch literal 2754 zcmds3yK>V|5Zzi|p)xcKdJ(7?=QSx3&?F{9YaBaKVl3ka!|->Md`8L?DKhCOfOB?z zSC*VFU_7#~_I1v_Zu0lfd#Pk9SMnR*k(|mv7P6F)%q5mRyiM?le&`w>2fC>;}JCjc)71Gh*79KoSVvA4(MGWT2}Ymc$8LPnI5*0mJvT=h^XeH* zyC!X~9`C=5K8ony`Ccy@gKm0oY`T^fZ4MTbFi{G2}~(v4Ju_}HUqF{KDG9h zUi3ebC!kf3$H=^fO;>u2{o{OcLr!oSAomfh7x*3`%JZ9-ORl@Ohj{E$434&~mJ@y1 z`3m@);!lX)uE;UGZZzXfRL;Z|Jnm5w#$!cFaG2rEZh)qKCF1U&ioBI#RA_;Sybn0@ zcB`C1`lxwWEv<^SYmCPGij%-@^9j4zyl?IwV>JC5%1fXg0+n;bY%N~1iL70B#fedV)CYHmAybxf?@Nh8<>KLhGq!KVv$4DI`m4J~tM&=lqV`Pqz zIY#CfnPX&*kvT@@7@1?_j*&Y??ijga@Gpo}BX^A4F>=Sq9V2&)!Z8ZRC>*13jKVPr GVEh9t{G=WL literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_ItemsG2_es.txt b/PKHeX/Resources/text/gen3/text_ItemsG2_es.txt new file mode 100644 index 000000000..8c78d6e01 --- /dev/null +++ b/PKHeX/Resources/text/gen3/text_ItemsG2_es.txt @@ -0,0 +1,255 @@ +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 +Protec. Especial +Superrepelente +Repelente Máximo +Directo +Teru-sama (2) +Agua Fresca +Refresco +Limonada +Ataque X +Teru-sama (3) +Defensa X +Velocidad X +Especial X +Monedero +Buscaobjetos +Teru-sama (4) +Repartir Exp +Caña Vieja +Caña Buena +Hoja plata +Supercaña +Más PP +Éter +Éter Máximo +Elixir +Escama roja +Poción secreta +Ticket barco +Huevo misterioso +Campana clara* +Ala plateada +Leche Mu-mu +Garra Rápida +Bayantídoto +Hoja oro +Arena Fina +Pico Afilado +Antiparabaya +Antiquembaya +Baya Hielo +Flecha venenosa +Roca del Rey +Bayamarga +Baya Menta +Bonguri rojo +Mini Seta +Seta Grande +Polvo Plata +Bonguri azul +Teru-sama (5) +Moneda Amuleto +Bonguri amarillo +Bonguri verde +Amuleto +Agua Mística +Cuchara Torcida +Bonguri blanco +Cinturón Negro +Bonguri negro +Teru-sama (6) +Bonguri rosa +Gafas de Sol +Cola Slowpoke +Lazo rosa +Palo +Bola humo +Antiderretir +Imán +Baya Milagro +Perla +Perla Grande +Piedra Eterna +Hechizo +Caramelo furia +GS Ball* +Tarjeta azul* +Semilla milagro +Hueso grueso +Cinta Focus +Teru-sama (7) +Polvo Energía +Raíz Energía +Polvo Curación +Hierba Revivir +Piedra dura +Huevo Suerte +Llave magnética +Maquinaria +Ticket huevo* +Objeto perdido +Polvoestelar +Trozo Estrella +Llave sótano +Pase del tren +Teru-sama (8) +Teru-sama (9) +Teru-sama (10) +Carbón +Zumo de Baya +Periscopio +Teru-sama (11) +Teru-sama (12) +Revest. Metálico +Colmillo Dragón +Teru-sama (13) +Restos +Teru-sama (14) +Teru-sama (15) +Teru-sama (16) +Baya Misterio +Escamadragón +Gen loco +Teru-sama (17) +Teru-sama (18) +Teru-sama (19) +Ceniza Sagrada +Peso Ball +Carta flor +Nivel Ball +Cebo Ball +Rapid Ball +Teru-sama (20) +Bolaluminosa +Amigo Ball +Luna Ball +Amor Ball +Caja Normal +Caja Grande +Piedra Solar +Cinta lunares +Teru-sama (21) +Mejora +Baya +Baya Dorada +Regadera +Teru-sama (22) +Parque Ball +Ala arcoíris +Teru-sama (23) +Ladrillo +Carta surf +Carta azul +Carta retrato +Carta amor +Carta eón +Carta morfosis +Carta celeste +Carta música +Carta espejismo +Teru-sama (24) +MT01 +MT02 +MT03 +MT04 +MT04 (Sin uso) +MT05 +MT06 +MT07 +MT08 +MT09 +MT10 +MT11 +MT12 +MT13 +MT14 +MT15 +MT16 +MT17 +MT18 +MT19 +MT20 +MT21 +MT22 +MT23 +MT24 +MT25 +MT26 +MT27 +MT28 +MT28 (Sin uso) +MT29 +MT30 +MT31 +MT32 +MT33 +MT34 +MT35 +MT36 +MT37 +MT38 +MT39 +MT40 +MT41 +MT42 +MT43 +MT44 +MT45 +MT46 +MT47 +MT48 +MT49 +MT50 +MO01 +MO02 +MO03 +MO04 +MO05 +MO06 +MO07 +MO08 (Sin uso) +MO09 (Sin uso) +MO10 (Sin uso) +MO11 (Sin uso) +MO12 (Sin uso) \ No newline at end of file diff --git a/PKHeX/Resources/text/gen3/text_ItemsG3_es.txt b/PKHeX/Resources/text/gen3/text_ItemsG3_es.txt new file mode 100644 index 0000000000000000000000000000000000000000..47356a5cf3c28f4c158c6f0aed0f6959ae0de2cb GIT binary patch literal 7096 zcmds+$#Ppo6oz}Pr_c*9Xkc1Va$+Y`*|Ewo1hTUgS#jbC*-i!CjwO$gB?~W7>{tN* z*Z=L|wvxbt73GrD_w?yAPksH@pO3<6xCpE8hrS14FC2yIa1)kc9fn~`PiOiYgm3kI zBiK<7`Z(N%s}0aneZ+p!)XIQ z6os`k>QmSi^hE=EsAur{`l7=^RDX|Fnd$o`+(qs;+8G2xPQ#C)xD4k}vjTmtlS^p@ z=6$WMJ1gBZcvtZm3!H|ZwMM(O&K$%uV50?A8-_#eu|Ej4Y(shMO?a*I$S?>GwX#R9 zgj+Nyp6bKzbsS6|j(8jXuSAJYlBYb^JZ+1WsNlgJVWaIL$^w;>3;}aD%89+v6?u1s zvk1@i4b|K5k@UC~939WZAOCF&pLkr!1DrX~_nqvuxl^A?niU&h8|WPC{BT3ZU%RLu zgtTh)+>U<2*4U(eYB3*(15v#cO?d6<`;|TeS%_G_?cg(MaVy9s+!1vescfD*kX>H9 zgWe-?TuHjk6I+q*Mdz8P;(8u!`%EXCk3Ypz_w;-r4T;8Kc&u;Jv$uFY6a1cj*YY4# zz#j;LSMen0HuvZ81a$?=C+TZwu|*%+TB6?lPV|stDG9!gfB*e2`E@O+=duQIxt8?k zaVLGTbBZe9*a6EN%QAR@s)1}k&tx5{RKhumwxdR15l*pJxXtzSR41@1eCNU|xqc~` zimpYfMfg~F+g-(hqci%xR^;YF62WH{Bhb}r7`_*TI(4GYh0fwbVAvN4p+f{b>)`N% z)~Rq^BaPqkHI%G$KOn>3#*?-KIqo=nDLOa$`>E2Z)GWAB)ySx1Q>sfJ*0&FKrZy8F z@OY>vYvKCVKU-}1Z{uh#YD>|^&t!^qp)&M$=s85n=FU!(Zx#K~KXWK-WT!8+^k&LP zs%;CWkGUrNlLmW|oE%4LSExZ=4a0+|(SS@+_9((d2xJ5ybsA4Mt2S6i^&n@3NqC7WXw zeSB(5D_7`t=Nskr8&ONSZu~uQ!K!G}-`VdhTl0km)i>4G!k1V(SB=@EV=H6Hh0fAf zYKr93Qu)_PyCYmG7MV`&_fL^$c#BiagY=1^Dii*rOVm(T6=JIo-xIFuNR3T5@qAE2 z9bHVJr#;$Fg-sq|l^TB*?T|cIBt&!S8@8zNsj1k3$ZX-x<{C>7cg+{U-HKN9+zHIs><$B)| zGudVpCF#Szkx#Bp=Hi8et@tL4-sHx+1`b+BvCS9hXzAO*odHA+eu46p* zBlQR2UFmbvP$A->PG7ENdHP=J#MQBOsR+eh+meFlwhi7_H%m=tPOK|lntYB$ojvPC z<$()4sSnJHJL0nzA3BQrwyPOXrj^&ybD+)xlygi(Zv;#Inp{4Qwx9wGHND_vZX{Ht zz8pj&GeW9=#63^&VSZR;st3`6>`;}F6WN$RYMtlWajr3);eWcmrQojODIYmzlCgd^ z{X3n(I-K+j#jM5b;7Nw51-+3ID*f(P_H5NOF)__B!M9Vuwsa*!u@iN?Xul)ug-(%U zoaTmyWbO*|G`!>bK_-@ab-E9_r!!w-;~RMhFMwwZy1M7mS_jwERoA_-1NJ^&3 z9HJVVU|HhD8c?^&lyzUHh!4*z=h{o}4wz}6%WVaDh$Y@PFuCL1G@%unK#7TB7}BkY zbER{qISXy?M29SNY$Fp|6Ne`qU*F8R-T6L?7EI4X3w}*H;&Y-JAE7T#%tsHkcD-Om zLQ3i>w<+fXxBs;ubw+T{@Jw`1yJw1rG>r@uVVp}=r{lbhKKFftxsO;RqL=ZFh^^Y@ z8FbUF4%@JHXNma-^CY-HN#7iAW`iSiP@u{a@g% z_oyqp#j*`*zxMCY^$uqogDtiC4&Cli(OjFzGdOO^|HQyh-|P^>j-65)%Y;C+0q;_g z`a+ngJ`iVb^&v-yr!sXL%KJap0x~_lV}ug>+$NCXWu)l07vx5=$hF|UHxRGnxg#dU z1Gz;v9EK;NM$Vk;M7f{QwWu5S1tl)&)yxIX`R9UQ4etNEzoP08;X|GIT^g2IAX$o& zRHb88%u+>oLuo0lw8#AzS%FZYv5@Z>t+vZ9=c%#W*Igf=Z!7lU^kBbXa!r0CsjX{W zAw7GciF*J-92- zzp({x2K!KES3 z#7<%b@qMPPC&a0z1gajh6SKrH<{eeIKS@%v;6)w$MLEJ;PJ}ZjyUX|KlSM00{H>}= zb%s*~`7aD_1fko{s^>b#{P((nGYNSzeXP^`Z^qLX8G5COru2}7AoK*!A-?Odo4N)k z!ANroRM%bIE!C5}`$XBdFUqA#qdWI&Dp|4hVMo#LqfYhThPsn5;ZWkKKAU=Dn75>1(%>C(R#`;R1+LM0+>~x+S literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_gsc_00000_es.txt b/PKHeX/Resources/text/gen3/text_gsc_00000_es.txt new file mode 100644 index 0000000000000000000000000000000000000000..bf86d0e2f32fb53d130ead37f3eacadfbc811784 GIT binary patch literal 2168 zcmbtWO>+`K5PfHU#UAxyxdVP36M~v52?&@wfeo%gHZDP{{I~vq9IV_tsPFY+?ey%? zq5?ZJJ+Hf8zwXVS-;Z#C5;xf3!0!r=(ZiI_1+K8=I^(LQ#STk+mGRiRLUWIRrq{3&O_Anya z%6MEdI*&Wx+ViuZO-aUu?X#S5Z_Trmw`a7Q@~p-e%OqpfmgcdtY=zU-q>tyx`UTfM zhI5Ny&;6L?AyIeCYiX$d?7exG4pe9F?`5*?YGT4%OV(AHz2<$@(Bq$SSDI3lJ^sLS zbIzLTM3tS9^&Js}Db>c&4A528vox@kmB20HDlWV&wenb+G>cmIeEG|>Y&CCdMk{B)~eym&pp*;hkJ`H=JSlz z+8o)sb8)LPTTI_a>Y@dHneVNszGD46FS+%Ga=l@+Qi3d{87X+fSY+>2ETw7|N>@6K zCqO)be04Mp4@7S!PFlNWR$kMmxQcVitsmPQbL+Qwt=h(GU!6RuPM%D+9G=4*V$sL0 zE?iLwX&>hH_G*2H&ZHUf)-7*q?)C6*2I(Cq{+h0hqYp{8!LpUL=9=DQmyBY?T4~Ot z@dPwFmuj2N(p&5&?firf2?xPAkQa5MRG?o?O4arwJ|)@>#?hP;Pk-{E_lh$7pU(xo YWX4uu6Qh}gD@Lz(;>iAgkV-531x3eN!2kdN literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_rsefrlg_00000_es.txt b/PKHeX/Resources/text/gen3/text_rsefrlg_00000_es.txt new file mode 100644 index 0000000000000000000000000000000000000000..3f5b7e83ab2bd7537180d714bd261c0b650cbb47 GIT binary patch literal 6028 zcmb`LOLJ345QS&0UvZbt0usqQm%`YDDmysXVd0%Egd-w9BH5|Hui+2zBUom^g32z7 zB#erVqR4;dRf7U5zblX5Q?6B@E0>!?EqJ&wioVvv6V- z24O=OF3r+wVcylQ3)?l*cRPEgy%$;!u6lOIM!}8$r#<_(!XMhd(200f?;mUCNIMsr zbDv9W8)o@XUU7cAdv5+>oms3cfZBJylzn2*g<<$kpMh>T z9~m_x>&?i$X5@Y|@}L=c*o-`CMjlrqU@Q?18_dH{V;+VY^DxwyhoQzi3^nFqs4)*i zjd>Vq%%cYLsKGpHFpnC{qXzS+!8~d(j~dLQ2J@)Fyxw45Z!oVnnAaQ3>xTJ>^6RZ~ zuTzH3^&PYNLs%=a4G+K3{eJ!W2e(}R@RsWz-MGHL^6+9qbu=|*>%udu^HbH_h2k&> zJNiD=|EG$^hQ673Z!-rrLp|;(PH*&~#ygADfmjyH`m-dU`i!pDdQE}m*0zP@Rmcq|o{Q|-JoK3iC1^0@Ab3!Qzj_q|rrCC-f9%G&`8 zJ>*h-g1hk3-AkC=eS=ZG6I_>{*t%+`X9YIqI;RWt)rn<<^SIyg-s+a0>pZ_xdh5A% zyw&=pFnWAac8!I3qWPt4(NE}BX*XU|b$jw}p_x7X=9cj5qi&JArHAy7gK1>3eQGDX z5e86U)o-eQJnh>EpH}_Xvl=vRfm5%GW!{Nk65>ZC#s0LXNMH%ClE10$yi<@RBJN^y^Q}pf@}sK7)6D6VsJpYuE7ED$kH?Gqn7CjMV6qBROmf)N+WCvc?fxEDSsOPxol z0N7|(-@izKQ7xyIIcYsA;PYKU+S* zdq-9o)El`&jlfSaBbLgB`{9nX6AW|xKJq5t_fY#>B_!VI!c%4N@v4e1WRnWIj`g=> zb6ecz42R-}ZJeWD%EyUvnfky}*ycR^ED!K{tPd4LJyB
fCcu2_}*s$xwnl+N8Y z%tWTF9rQ+00FEZFW|(zTXP+B~GL!3*+EyMVDmG`!RKY|GtK1bzgPY9xW7pzyQjOBV zCPEQeEb-00*(q)OsFlRoc{Z(ezAxAAiAm@Q^@*F|_tpN`6HqwbAwWT=g_G$LaNRq7 zI>iUR%asmKg7}LydW83Q=jf>3ev+-!bLbe}y}FE7`}`y-VCd}GAo-cbsrJ5cIH_-( z>fcuMP=Itj{N&9*>~QFlvFS19%TpPK@j1`-6 zL>wDiMtl;2_#FO97-B6_$x$DadF!f%e)CzUQ}t83oumV(RWj5ym)EN2ExGVzr4G{n zsaLXyO2wc2Z07uyazEo(Cj~~&NioZ3;QIa^p03=_GZN9^X`(%ySj<)@)Rxh#uBc%e zSM_t*q0_o<#AsrTdZlUuYX1+;@P3>tUKCy zY*|{?ezcuGZ(V(xerlRWZ=4%W?-qH+?i*Hm9?vZK3|NSi-}`k>MOW>@_k7OtlX%^1 zGb$Q?3wYn+cpZj(J!*}!zkdDW)jcf~DcAhY0lY6wJe~W}U%4Lns7U%4&R6(*Pme9y zjP4tmeIVrj@4q$W)J%QjLOID>>0|SD&F=P&e(~%GQ^dY8UCr~Zhw6D_RnA`OkoOf{ I&Aj3G7ugQyO8@`> literal 0 HcmV?d00001 From 191debe5205e27546597795a718b3d1c8c8aee05 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 13:40:03 -0700 Subject: [PATCH 56/75] Minor qol improvements Closes #251 -- remaining stuff pending a future localization update #240 -- DVs now shown instead of IVs Hides Box tab for saves that do not have Box (ORAS Demo) Hides Daycare Egg Available for gen 1 (use correct return type) --- PKHeX/MainWindow/Main.Designer.cs | 83 +++-- PKHeX/MainWindow/Main.cs | 18 +- PKHeX/MainWindow/Main.resx | 303 ++++++++---------- PKHeX/Resources/text/en/lang_en.txt | 130 ++++++-- PKHeX/Saves/SaveFile.cs | 2 +- .../Gen6/SAV_SuperTrain.Designer.cs | 22 +- .../Save Editors/Gen6/SAV_Trainer.Designer.cs | 174 +++++----- 7 files changed, 410 insertions(+), 322 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index cc4951835..ccd735cad 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -157,7 +157,9 @@ 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.FLP_IVs = new System.Windows.Forms.FlowLayoutPanel(); this.Label_IVs = new System.Windows.Forms.Label(); + this.Label_DVs = new System.Windows.Forms.Label(); this.Label_EVs = new System.Windows.Forms.Label(); this.Label_Stats = new System.Windows.Forms.Label(); this.FLP_HP = new System.Windows.Forms.FlowLayoutPanel(); @@ -411,9 +413,9 @@ public void InitializeComponent() this.B_OpenOPowers = new System.Windows.Forms.Button(); this.B_OpenEventFlags = new System.Windows.Forms.Button(); this.B_OpenPokedex = new System.Windows.Forms.Button(); - this.B_LinkInfo = new System.Windows.Forms.Button(); + this.B_OpenLinkInfo = new System.Windows.Forms.Button(); this.B_OpenBerryField = new System.Windows.Forms.Button(); - this.B_Pokeblocks = new System.Windows.Forms.Button(); + this.B_OpenPokeblocks = new System.Windows.Forms.Button(); this.B_OpenSecretBase = new System.Windows.Forms.Button(); this.B_OpenPokepuffs = new System.Windows.Forms.Button(); this.B_OpenSuperTraining = new System.Windows.Forms.Button(); @@ -473,6 +475,7 @@ public void InitializeComponent() this.FLP_StatHeader.SuspendLayout(); this.FLP_HackedStats.SuspendLayout(); this.FLP_StatsHeaderRight.SuspendLayout(); + this.FLP_IVs.SuspendLayout(); this.FLP_HP.SuspendLayout(); this.FLP_HPRight.SuspendLayout(); this.FLP_Atk.SuspendLayout(); @@ -2079,7 +2082,7 @@ public void InitializeComponent() // FLP_StatsHeaderRight // this.FLP_StatsHeaderRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.FLP_StatsHeaderRight.Controls.Add(this.Label_IVs); + this.FLP_StatsHeaderRight.Controls.Add(this.FLP_IVs); this.FLP_StatsHeaderRight.Controls.Add(this.Label_EVs); this.FLP_StatsHeaderRight.Controls.Add(this.Label_Stats); this.FLP_StatsHeaderRight.Location = new System.Drawing.Point(107, 0); @@ -2088,6 +2091,17 @@ public void InitializeComponent() this.FLP_StatsHeaderRight.Size = new System.Drawing.Size(162, 21); this.FLP_StatsHeaderRight.TabIndex = 123; // + // FLP_IVs + // + this.FLP_IVs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_IVs.Controls.Add(this.Label_IVs); + this.FLP_IVs.Controls.Add(this.Label_DVs); + this.FLP_IVs.Location = new System.Drawing.Point(0, 0); + this.FLP_IVs.Margin = new System.Windows.Forms.Padding(0); + this.FLP_IVs.Name = "FLP_IVs"; + this.FLP_IVs.Size = new System.Drawing.Size(30, 21); + this.FLP_IVs.TabIndex = 124; + // // Label_IVs // this.Label_IVs.Location = new System.Drawing.Point(0, 0); @@ -2098,6 +2112,16 @@ public void InitializeComponent() this.Label_IVs.Text = "IVs"; this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // Label_DVs + // + this.Label_DVs.Location = new System.Drawing.Point(0, 21); + this.Label_DVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_DVs.Name = "Label_DVs"; + this.Label_DVs.Size = new System.Drawing.Size(30, 21); + this.Label_DVs.TabIndex = 26; + this.Label_DVs.Text = "DVs"; + this.Label_DVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // Label_EVs // this.Label_EVs.Location = new System.Drawing.Point(30, 0); @@ -3572,7 +3596,7 @@ public void InitializeComponent() this.Menu_ExportMAIN.Name = "Menu_ExportMAIN"; this.Menu_ExportMAIN.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.Menu_ExportMAIN.ShowShortcutKeys = false; - this.Menu_ExportMAIN.Size = new System.Drawing.Size(130, 22); + this.Menu_ExportMAIN.Size = new System.Drawing.Size(142, 22); this.Menu_ExportMAIN.Text = "&Export main"; this.Menu_ExportMAIN.Click += new System.EventHandler(this.clickExportSAV); // @@ -3582,8 +3606,8 @@ public void InitializeComponent() this.Menu_ExportBAK.Name = "Menu_ExportBAK"; this.Menu_ExportBAK.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); this.Menu_ExportBAK.ShowShortcutKeys = false; - this.Menu_ExportBAK.Size = new System.Drawing.Size(130, 22); - this.Menu_ExportBAK.Text = "Export &BAK"; + this.Menu_ExportBAK.Size = new System.Drawing.Size(142, 22); + this.Menu_ExportBAK.Text = "Export &Backup"; this.Menu_ExportBAK.Click += new System.EventHandler(this.clickExportSAVBAK); // // Menu_Exit @@ -3729,7 +3753,7 @@ public void InitializeComponent() this.Menu_Database.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.Menu_Database.ShowShortcutKeys = false; this.Menu_Database.Size = new System.Drawing.Size(182, 22); - this.Menu_Database.Text = "PK6 &Database"; + this.Menu_Database.Text = "PKM &Database"; this.Menu_Database.Click += new System.EventHandler(this.mainMenuDatabase); // // Menu_MGDatabase @@ -5231,9 +5255,9 @@ public void InitializeComponent() this.FLP_SAVtools.Controls.Add(this.B_OpenOPowers); this.FLP_SAVtools.Controls.Add(this.B_OpenEventFlags); this.FLP_SAVtools.Controls.Add(this.B_OpenPokedex); - this.FLP_SAVtools.Controls.Add(this.B_LinkInfo); + this.FLP_SAVtools.Controls.Add(this.B_OpenLinkInfo); this.FLP_SAVtools.Controls.Add(this.B_OpenBerryField); - this.FLP_SAVtools.Controls.Add(this.B_Pokeblocks); + this.FLP_SAVtools.Controls.Add(this.B_OpenPokeblocks); this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase); this.FLP_SAVtools.Controls.Add(this.B_OpenPokepuffs); this.FLP_SAVtools.Controls.Add(this.B_OpenSuperTraining); @@ -5315,15 +5339,15 @@ public void InitializeComponent() this.B_OpenPokedex.UseVisualStyleBackColor = true; this.B_OpenPokedex.Click += new System.EventHandler(this.B_OpenPokedex_Click); // - // B_LinkInfo + // B_OpenLinkInfo // - this.B_LinkInfo.Location = new System.Drawing.Point(96, 61); - this.B_LinkInfo.Name = "B_LinkInfo"; - this.B_LinkInfo.Size = new System.Drawing.Size(87, 23); - this.B_LinkInfo.TabIndex = 23; - this.B_LinkInfo.Text = "Link Data"; - this.B_LinkInfo.UseVisualStyleBackColor = true; - this.B_LinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click); + this.B_OpenLinkInfo.Location = new System.Drawing.Point(96, 61); + this.B_OpenLinkInfo.Name = "B_OpenLinkInfo"; + this.B_OpenLinkInfo.Size = new System.Drawing.Size(87, 23); + this.B_OpenLinkInfo.TabIndex = 23; + this.B_OpenLinkInfo.Text = "Link Data"; + this.B_OpenLinkInfo.UseVisualStyleBackColor = true; + this.B_OpenLinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click); // // B_OpenBerryField // @@ -5335,16 +5359,16 @@ public void InitializeComponent() this.B_OpenBerryField.UseVisualStyleBackColor = true; this.B_OpenBerryField.Click += new System.EventHandler(this.B_OpenBerryField_Click); // - // B_Pokeblocks + // B_OpenPokeblocks // - this.B_Pokeblocks.Location = new System.Drawing.Point(3, 90); - this.B_Pokeblocks.Name = "B_Pokeblocks"; - this.B_Pokeblocks.Size = new System.Drawing.Size(87, 23); - this.B_Pokeblocks.TabIndex = 22; - this.B_Pokeblocks.Text = "Pokéblocks"; - this.B_Pokeblocks.UseVisualStyleBackColor = true; - this.B_Pokeblocks.Visible = false; - this.B_Pokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click); + this.B_OpenPokeblocks.Location = new System.Drawing.Point(3, 90); + this.B_OpenPokeblocks.Name = "B_OpenPokeblocks"; + this.B_OpenPokeblocks.Size = new System.Drawing.Size(87, 23); + this.B_OpenPokeblocks.TabIndex = 22; + this.B_OpenPokeblocks.Text = "Pokéblocks"; + this.B_OpenPokeblocks.UseVisualStyleBackColor = true; + this.B_OpenPokeblocks.Visible = false; + this.B_OpenPokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click); // // B_OpenSecretBase // @@ -5559,6 +5583,7 @@ public void InitializeComponent() this.FLP_HackedStats.ResumeLayout(false); this.FLP_HackedStats.PerformLayout(); this.FLP_StatsHeaderRight.ResumeLayout(false); + this.FLP_IVs.ResumeLayout(false); this.FLP_HP.ResumeLayout(false); this.FLP_HPRight.ResumeLayout(false); this.FLP_HPRight.PerformLayout(); @@ -6008,11 +6033,11 @@ public void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel FLP_SAVtools; private System.Windows.Forms.GroupBox GB_SAVtools; private System.Windows.Forms.PictureBox PB_Mark1; - private System.Windows.Forms.Button B_Pokeblocks; + private System.Windows.Forms.Button B_OpenPokeblocks; private System.Windows.Forms.ToolStripMenuItem Menu_BatchEditor; private System.Windows.Forms.Button BTN_Medals; private System.Windows.Forms.FlowLayoutPanel FLP_PKMEditors; - private System.Windows.Forms.Button B_LinkInfo; + private System.Windows.Forms.Button B_OpenLinkInfo; private System.Windows.Forms.Button B_CGearSkin; private System.Windows.Forms.LinkLabel L_UpdateAvailable; private System.Windows.Forms.Label L_MetTimeOfDay; @@ -6097,6 +6122,8 @@ public void InitializeComponent() private System.Windows.Forms.MaskedTextBox TB_Smart; private System.Windows.Forms.MaskedTextBox TB_Tough; private System.Windows.Forms.MaskedTextBox TB_Sheen; + private System.Windows.Forms.FlowLayoutPanel FLP_IVs; + private System.Windows.Forms.Label Label_DVs; } } diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index a59e45cf3..3c329d897 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -835,7 +835,18 @@ private void loadSAV(SaveFile sav, string path) GB_SUBE.Visible = SAV.HasSUBE; PB_Locked.Visible = SAV.HasBattleBox && SAV.BattleBoxLocked; - PAN_Box.Visible = CB_BoxSelect.Visible = B_BoxLeft.Visible = B_BoxRight.Visible = SAV.HasBox; + if (!SAV.HasBox && tabBoxMulti.TabPages.Contains(Tab_Box)) + { + tabBoxMulti.TabPages.Remove(Tab_Box); + tabBoxMulti.TabPages.Remove(Tab_Other); + } + else if (SAV.HasBox && !tabBoxMulti.TabPages.Contains(Tab_Box)) + { + tabBoxMulti.TabPages.Insert(0, Tab_Box); + tabBoxMulti.TabPages.Insert(2, Tab_Other); + // force update -- re-added tab may be untranslated + Util.TranslateInterface(this, curlanguage); + } Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_Report.Enabled = Menu_Modify.Enabled = B_SaveBoxBin.Enabled = SAV.HasBox; if (path != null) // Actual save file @@ -854,10 +865,10 @@ private void loadSAV(SaveFile sav, string path) B_OpenOPowers.Visible = SAV.HasOPower; B_OpenPokedex.Visible = SAV.HasPokeDex; B_OpenBerryField.Visible = SAV.HasBerryField && SAV.XY; - B_Pokeblocks.Visible = SAV.HasPokeBlock; + B_OpenPokeblocks.Visible = SAV.HasPokeBlock; B_JPEG.Visible = SAV.HasJPEG; B_OpenEventFlags.Visible = SAV.HasEvents; - B_LinkInfo.Visible = SAV.HasLink; + B_OpenLinkInfo.Visible = SAV.HasLink; B_CGearSkin.Visible = SAV.Generation == 5; } @@ -893,6 +904,7 @@ private void loadSAV(SaveFile sav, string path) CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; FLP_PKRS.Visible = FLP_EggPKRSRight.Visible = SAV.Generation >= 2; Label_OTGender.Visible = SAV.Generation >= 2; + Label_IVs.Visible = SAV.Generation >= 2; // DVs appears instead if (SAV.Generation == 1) Label_IsShiny.Visible = false; diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index b8929a07f..e5c0098ac 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -120,117 +120,6 @@ 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 @@ -290,6 +179,15 @@ True + + True + + + True + + + True + True @@ -302,6 +200,9 @@ True + + True + True @@ -332,6 +233,18 @@ True + + True + + + True + + + True + + + True + True @@ -344,6 +257,39 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -371,6 +317,12 @@ True + + True + + + True + True @@ -392,6 +344,9 @@ True + + True + True @@ -416,6 +371,18 @@ True + + True + + + True + + + True + + + True + True @@ -428,6 +395,18 @@ True + + True + + + True + + + True + + + True + True @@ -536,6 +515,12 @@ True + + True + + + True + True @@ -620,7 +605,7 @@ True - + True @@ -629,9 +614,21 @@ True + + True + True + + True + + + True + + + True + True @@ -839,6 +836,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1 @@ -1101,6 +1116,15 @@ True + + True + + + True + + + True + True @@ -1966,9 +1990,6 @@ True - - True - True @@ -1990,61 +2011,13 @@ True - + True True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - + True diff --git a/PKHeX/Resources/text/en/lang_en.txt b/PKHeX/Resources/text/en/lang_en.txt index d71b13a26..633fe5432 100644 --- a/PKHeX/Resources/text/en/lang_en.txt +++ b/PKHeX/Resources/text/en/lang_en.txt @@ -21,7 +21,7 @@ Menu_Open = Open... Menu_Save = Save PKM... Menu_ExportSAV = Export SAV... Menu_ExportMAIN = Export main -Menu_ExportBAK = Export BAK +Menu_ExportBAK = Export Backup Menu_Exit = Quit -- Menu_Tools = Tools @@ -38,6 +38,8 @@ Menu_LoadBoxes = Load Boxes Menu_DumpBoxes = Dump Boxes Menu_Report = Box Data Report Menu_Database = PKM Database +Menu_MGDatabase = Mystery Gift Database +Menu_BatchEditor = Batch Editor Menu_Other = Other Menu_OpenSDF = Open SaveDataFiler Folder Menu_OpenSDB = Open SaveDataBackup Folder @@ -92,7 +94,9 @@ Label_EggLocation = Location: Label_EggDate = Date: --------------------Stats Tab Data---------------------- Tab_Stats = Stats +CHK_HackedStats = Hacked Stats Label_IVs = IVs +Label_DVs = DVs Label_EVs = EVs Label_Stats = Stats Label_HP = HP: @@ -101,6 +105,7 @@ Label_DEF = Def: Label_SPA = SpA: Label_SPD = SpD: Label_SPE = Spe: +Label_SPC = SpC: Label_Total = Total: Label_HiddenPowerPrefix = Hidden Power Type: Label_CharacteristicPrefix = Characteristic: @@ -144,15 +149,18 @@ B_OpenItemPouch = Items B_OpenTrainerInfo = Trainer Info B_OUTPasserby = Passerby B_OpenBoxLayout = Box Layout -B_OpenWondercards = WonderCard +B_OpenWondercards = Mystery Gift B_OpenSuperTraining = Super Train B_OpenHallofFame = Hall of Fame B_OpenOPowers = O-Powers B_OpenEventFlags = Event Flags B_OpenPokedex = Pokédex B_OpenBerryField = Berry Field +B_OpenPokeBlocks = Pokéblocks +B_OpenLinkInfo = Link Data -- B_OpenSecretBase = Secret Base +B_CGearSkin = C-Gear Skin --------------------Tab Internals----------------------- L_Party = Party: L_BattleBox = Battle Box: @@ -363,6 +371,66 @@ L_Arguments = Disabled ; Never left ; OT ; Past Gen ; Memories with ; Pokémon ; ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. +! SAV_PokeBlockORAS = Pokéblock Editor +- Change stuff below this line, not above. +------------------------------------------------------- +L_Red = Red Pokéblocks: +L_Blue = Blue Pokéblocks: +L_Pink = Pink Pokéblocks: +L_Green = Green Pokéblocks: +L_Yellow = Yellow Pokéblocks: +L_Rainbow = Rainbow Pokéblocks: +L_Red = Red Pokéblocks +: +L_Blue = Blue Pokéblocks +: +L_Pink = Pink Pokéblocks +: +L_Green = Green Pokéblocks +: +L_Yellow = Yellow Pokéblocks +: +L_Rainbow = Rainbow Pokéblocks +: +B_RandomizeBerries = Randomize Berries +B_GiveAllBlocks = Give All Blocks +B_Cancel = Cancel +B_Save = Save +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_Link6 = Pokémon Link Tool +- Change stuff below this line, not above. +------------------------------------------------------- +TAB_Main = Main +TAB_PKM = Pokémon +TAB_Items = Items +L_BP = Battle Points: +L_Pokemiles: PokéMiles +CHK_LinkAvailable = Pokémon Link Enabled +B_Import = Import +B_Export = Export +B_Cancel = Cancel +B_Save = Save +L_Item1 = Item 1: +L_Item2 = Item 2: +L_Item3 = Item 3: +L_Item4 = Item 4: +L_Item5 = Item 5: +L_Item6 = Item 6: +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SuperTrain = Super Training Records +- Change stuff below this line, not above. +----------------------Buttons-------------------------- +L_Records = Records +L_Bags = Training Bags +L_Species = Species: +L_Unk = L_Unk +L_Time0 = Time: +L_Time1 = Time1 +L_Time2 = Time2 +L_UNKNOWN = UNKNOWN +L_Species2 = Species +B_Cancel = Cancel +B_Save = Save +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. ! SAV_BerryField = Berry Field Viewer - Change stuff below this line, not above. ------------------------------------------------------- @@ -525,13 +593,14 @@ B_Cancel = Cancel - Change stuff below this line, not above. ------------------------------------------------------ L_goto = goto: -GB_Owned = Owned -CHK_P1 = Obtained +GB_Owned = Seen CHK_P2 = Male CHK_P3 = Female CHK_P4 = Shiny Male CHK_P5 = Shiny Female -GB_Encountered = Encountered +GB_Owned = Owned +CHK_P1 = Obtained +GB_Displayed = Displayed CHK_P6 = Male CHK_P7 = Female CHK_P8 = Shiny Male @@ -606,6 +675,7 @@ Label_EncryptionConstant = Encryption Constant: CHK_Nicknamed = Nickname: Label_Species = Species: L_PartyNum = Party Index: +B_Delete = Delete B_Close = Save ! End ! ----------------------------------------------------- @@ -613,12 +683,7 @@ B_Close = Save ! SAV_Inventory = Inventory Editor - Change stuff below this line, not above. ------------------------------------------------------- -GB_Pouch = Pouches -B_DisplayBerries = Berry -B_DisplayMedicine = Medicine -B_DisplayTMHM = TM/HM -B_DisplayKeyItems = Key Items -B_DisplayItems = Items +B_GiveAll = Give All B_Save = Save B_Cancel = Cancel ! End @@ -723,14 +788,20 @@ L_PPUps = PPUps ------------------------------------------------------- Tab_Multiplayer = Multiplayer L_MultiplayerSprite = Multiplayer Sprite: -L_Style = Style: +GB_Sayings = Saved Sayings +L_Saying1 = 1: +L_Saying2 = 2: +L_Saying3 = 3: +L_Saying4 = 4: +L_Saying5 = 5: +-- Tab_BadgeMap = Badges/Map GB_Map = Map Position L_CurrentMap = Current Map: L_X = X Coordinate: L_Z = Z Coordinate: L_Y = Y Coordinate: -L_Offset = (offset) +-- Tab_Appearance = Current Appearance (X/Y) L_Outfit = Outfit Vals B_GiveAccessories = Give All Accessories @@ -745,6 +816,8 @@ L_FacialHair = Facial Hair: L_Hairstyle = Hairstyle: L_HairColor = Hair Color: L_SkinColor = Skin Color: +-- +Tab_Maison = Maison GB_MaisonCurrent = Maison Streaks (Current) L_SuperC = Super L_NormalC = Normal @@ -764,32 +837,35 @@ L_SinglesB = Singles: B_Save = Save L_Stats = Stats B_Cancel = Cancel +-- Tab_Overview = Overview -L_Seconds = Sec: -L_Minutes = Min: -L_Hours = Hrs: +L_TrainerName = Trainer Name: L_Language = Language: -L_PM = PokéMiles: L_Region = Region: -L_BP = BP: L_Country = Country: B_MaxCash = + L_3DSReg = 3DS Region: L_Money = $: -L_SID = SID: L_TID = TID: -L_TrainerName = Trainer Name: +L_SID = SID: +- +GB_Adventure = Adventure Info +L_Seconds = Sec: +L_Minutes = Min: +L_Hours = Hrs: +L_Started = Game Started: +L_Fame = HoF Entered: +L_LastSaved = Last Saved: +- +L_PM = PokéMiles: +L_BP = BP: +L_Style = Style: L_Value = Value -GB_Sayings = Saved Sayings -L_Saying1 = 1: -L_Saying2 = 2: -L_Saying3 = 3: -L_Saying4 = 4: -L_Saying5 = 5: +L_Offset = (offset) ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. -! SAV_Wondercard = Wonder Card I/O +! SAV_Wondercard = Mystery Gift I/O - Change stuff below this line, not above. ------------------------------------------------------- L_Details = Details: diff --git a/PKHeX/Saves/SaveFile.cs b/PKHeX/Saves/SaveFile.cs index ae2ea1090..63305c23c 100644 --- a/PKHeX/Saves/SaveFile.cs +++ b/PKHeX/Saves/SaveFile.cs @@ -328,7 +328,7 @@ public virtual MysteryGiftAlbum GiftAlbum public abstract int getDaycareSlotOffset(int loc, int slot); public abstract uint? getDaycareEXP(int loc, int slot); public virtual ulong? getDaycareRNGSeed(int loc) { return null; } - public virtual bool? getDaycareHasEgg(int loc) { return false; } + public virtual bool? getDaycareHasEgg(int loc) { return null; } public abstract bool? getDaycareOccupied(int loc, int slot); public abstract void setDaycareEXP(int loc, int slot, uint EXP); diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs index bcccc2442..3f996480f 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs @@ -44,7 +44,7 @@ private void InitializeComponent() this.TB_Unk = new System.Windows.Forms.MaskedTextBox(); this.L_Unk = new System.Windows.Forms.Label(); this.L_Species = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.L_Time0 = new System.Windows.Forms.Label(); this.L_Records = new System.Windows.Forms.Label(); this.L_Bags = new System.Windows.Forms.Label(); this.L_UNKNOWN = new System.Windows.Forms.Label(); @@ -245,15 +245,15 @@ private void InitializeComponent() this.L_Species.TabIndex = 129; this.L_Species.Text = "Species:"; // - // label4 + // L_Time0 // - this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(178, 99); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(33, 13); - this.label4.TabIndex = 130; - this.label4.Text = "Time:"; + this.L_Time0.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.L_Time0.AutoSize = true; + this.L_Time0.Location = new System.Drawing.Point(178, 99); + this.L_Time0.Name = "L_Time0"; + this.L_Time0.Size = new System.Drawing.Size(33, 13); + this.L_Time0.TabIndex = 130; + this.L_Time0.Text = "Time:"; // // L_Records // @@ -292,7 +292,7 @@ private void InitializeComponent() this.Controls.Add(this.L_UNKNOWN); this.Controls.Add(this.L_Bags); this.Controls.Add(this.L_Records); - this.Controls.Add(this.label4); + this.Controls.Add(this.L_Time0); this.Controls.Add(this.L_Species); this.Controls.Add(this.L_Unk); this.Controls.Add(this.TB_Unk); @@ -339,7 +339,7 @@ private void InitializeComponent() private System.Windows.Forms.MaskedTextBox TB_Unk; private System.Windows.Forms.Label L_Unk; private System.Windows.Forms.Label L_Species; - private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label L_Time0; private System.Windows.Forms.Label L_Records; private System.Windows.Forms.Label L_Bags; private System.Windows.Forms.Label L_UNKNOWN; diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs index 11747e675..60ba5c73c 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs @@ -179,8 +179,11 @@ private void InitializeComponent() this.MT_Stat = new System.Windows.Forms.MaskedTextBox(); this.TC_Editor = new System.Windows.Forms.TabControl(); this.Tab_Overview = new System.Windows.Forms.TabPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.GB_Stats = new System.Windows.Forms.GroupBox(); + this.GB_Adventure = new System.Windows.Forms.GroupBox(); + this.L_Fame = new System.Windows.Forms.Label(); + this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker(); + this.CAL_HoFTime = new System.Windows.Forms.DateTimePicker(); this.L_Started = new System.Windows.Forms.Label(); this.CAL_AdventureStartDate = new System.Windows.Forms.DateTimePicker(); this.CAL_AdventureStartTime = new System.Windows.Forms.DateTimePicker(); @@ -199,9 +202,6 @@ private void InitializeComponent() this.Tab_Multiplayer = new System.Windows.Forms.TabPage(); this.Tab_Maison = new System.Windows.Forms.TabPage(); this.Tab_Appearance = new System.Windows.Forms.TabPage(); - this.L_Fame = new System.Windows.Forms.Label(); - this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker(); - this.CAL_HoFTime = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.PB_Badge8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Badge6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Badge4)).BeginInit(); @@ -216,8 +216,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.PB_Sprite)).BeginInit(); this.TC_Editor.SuspendLayout(); this.Tab_Overview.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); + this.GB_Stats.SuspendLayout(); + this.GB_Adventure.SuspendLayout(); this.Tab_BadgeMap.SuspendLayout(); this.GB_Map.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Z)).BeginInit(); @@ -1777,8 +1777,8 @@ private void InitializeComponent() // // Tab_Overview // - this.Tab_Overview.Controls.Add(this.groupBox1); - this.Tab_Overview.Controls.Add(this.groupBox2); + this.Tab_Overview.Controls.Add(this.GB_Stats); + this.Tab_Overview.Controls.Add(this.GB_Adventure); this.Tab_Overview.Controls.Add(this.CB_Vivillon); this.Tab_Overview.Controls.Add(this.L_Vivillon); this.Tab_Overview.Controls.Add(this.TB_OTName); @@ -1808,48 +1808,81 @@ private void InitializeComponent() this.Tab_Overview.Text = "Overview"; this.Tab_Overview.UseVisualStyleBackColor = true; // - // groupBox1 + // GB_Stats // - this.groupBox1.Controls.Add(this.TB_BP); - this.groupBox1.Controls.Add(this.TB_PM); - this.groupBox1.Controls.Add(this.L_PM); - this.groupBox1.Controls.Add(this.TB_Style); - this.groupBox1.Controls.Add(this.L_Offset); - this.groupBox1.Controls.Add(this.L_BP); - this.groupBox1.Controls.Add(this.L_Value); - this.groupBox1.Controls.Add(this.L_Style); - this.groupBox1.Controls.Add(this.MT_Stat); - this.groupBox1.Controls.Add(this.CB_Stats); - this.groupBox1.Location = new System.Drawing.Point(209, 99); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(171, 151); - this.groupBox1.TabIndex = 55; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Stats"; + this.GB_Stats.Controls.Add(this.TB_BP); + this.GB_Stats.Controls.Add(this.TB_PM); + this.GB_Stats.Controls.Add(this.L_PM); + this.GB_Stats.Controls.Add(this.TB_Style); + this.GB_Stats.Controls.Add(this.L_Offset); + this.GB_Stats.Controls.Add(this.L_BP); + this.GB_Stats.Controls.Add(this.L_Value); + this.GB_Stats.Controls.Add(this.L_Style); + this.GB_Stats.Controls.Add(this.MT_Stat); + this.GB_Stats.Controls.Add(this.CB_Stats); + this.GB_Stats.Location = new System.Drawing.Point(209, 99); + this.GB_Stats.Name = "GB_Stats"; + this.GB_Stats.Size = new System.Drawing.Size(171, 151); + this.GB_Stats.TabIndex = 55; + this.GB_Stats.TabStop = false; + this.GB_Stats.Text = "Stats"; // - // groupBox2 + // GB_Adventure // - this.groupBox2.Controls.Add(this.L_Fame); - this.groupBox2.Controls.Add(this.CAL_HoFDate); - this.groupBox2.Controls.Add(this.CAL_HoFTime); - this.groupBox2.Controls.Add(this.L_Started); - this.groupBox2.Controls.Add(this.CAL_AdventureStartDate); - this.groupBox2.Controls.Add(this.CAL_LastSavedDate); - this.groupBox2.Controls.Add(this.L_LastSaved); - this.groupBox2.Controls.Add(this.MT_Seconds); - this.groupBox2.Controls.Add(this.MT_Hours); - this.groupBox2.Controls.Add(this.L_Seconds); - this.groupBox2.Controls.Add(this.L_Hours); - this.groupBox2.Controls.Add(this.MT_Minutes); - this.groupBox2.Controls.Add(this.L_Minutes); - this.groupBox2.Controls.Add(this.CAL_AdventureStartTime); - this.groupBox2.Controls.Add(this.CAL_LastSavedTime); - this.groupBox2.Location = new System.Drawing.Point(3, 99); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(200, 151); - this.groupBox2.TabIndex = 56; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Adventure Info"; + this.GB_Adventure.Controls.Add(this.L_Fame); + this.GB_Adventure.Controls.Add(this.CAL_HoFDate); + this.GB_Adventure.Controls.Add(this.CAL_HoFTime); + this.GB_Adventure.Controls.Add(this.L_Started); + this.GB_Adventure.Controls.Add(this.CAL_AdventureStartDate); + this.GB_Adventure.Controls.Add(this.CAL_LastSavedDate); + this.GB_Adventure.Controls.Add(this.L_LastSaved); + this.GB_Adventure.Controls.Add(this.MT_Seconds); + this.GB_Adventure.Controls.Add(this.MT_Hours); + this.GB_Adventure.Controls.Add(this.L_Seconds); + this.GB_Adventure.Controls.Add(this.L_Hours); + this.GB_Adventure.Controls.Add(this.MT_Minutes); + this.GB_Adventure.Controls.Add(this.L_Minutes); + this.GB_Adventure.Controls.Add(this.CAL_AdventureStartTime); + this.GB_Adventure.Controls.Add(this.CAL_LastSavedTime); + this.GB_Adventure.Location = new System.Drawing.Point(3, 99); + this.GB_Adventure.Name = "GB_Adventure"; + this.GB_Adventure.Size = new System.Drawing.Size(200, 151); + this.GB_Adventure.TabIndex = 56; + this.GB_Adventure.TabStop = false; + this.GB_Adventure.Text = "Adventure Info"; + // + // L_Fame + // + this.L_Fame.Location = new System.Drawing.Point(3, 72); + this.L_Fame.Name = "L_Fame"; + this.L_Fame.Size = new System.Drawing.Size(80, 20); + this.L_Fame.TabIndex = 40; + this.L_Fame.Text = "HoF Entered:"; + this.L_Fame.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CAL_HoFDate + // + this.CAL_HoFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; + this.CAL_HoFDate.Location = new System.Drawing.Point(89, 72); + this.CAL_HoFDate.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0); + this.CAL_HoFDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + this.CAL_HoFDate.Name = "CAL_HoFDate"; + this.CAL_HoFDate.Size = new System.Drawing.Size(99, 20); + this.CAL_HoFDate.TabIndex = 39; + this.CAL_HoFDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + // + // CAL_HoFTime + // + this.CAL_HoFTime.CustomFormat = "hh:mm tt"; + this.CAL_HoFTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.CAL_HoFTime.Location = new System.Drawing.Point(115, 91); + this.CAL_HoFTime.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0); + this.CAL_HoFTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + this.CAL_HoFTime.Name = "CAL_HoFTime"; + this.CAL_HoFTime.ShowUpDown = true; + this.CAL_HoFTime.Size = new System.Drawing.Size(73, 20); + this.CAL_HoFTime.TabIndex = 38; + this.CAL_HoFTime.Value = new System.DateTime(2001, 1, 1, 0, 0, 0, 0); // // L_Started // @@ -2119,39 +2152,6 @@ private void InitializeComponent() this.Tab_Appearance.Text = "Appearance"; this.Tab_Appearance.UseVisualStyleBackColor = true; // - // L_Fame - // - this.L_Fame.Location = new System.Drawing.Point(3, 72); - this.L_Fame.Name = "L_Fame"; - this.L_Fame.Size = new System.Drawing.Size(80, 20); - this.L_Fame.TabIndex = 40; - this.L_Fame.Text = "HoF Entered:"; - this.L_Fame.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // CAL_HoFDate - // - this.CAL_HoFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.CAL_HoFDate.Location = new System.Drawing.Point(89, 72); - this.CAL_HoFDate.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0); - this.CAL_HoFDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); - this.CAL_HoFDate.Name = "CAL_HoFDate"; - this.CAL_HoFDate.Size = new System.Drawing.Size(99, 20); - this.CAL_HoFDate.TabIndex = 39; - this.CAL_HoFDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); - // - // CAL_HoFTime - // - this.CAL_HoFTime.CustomFormat = "hh:mm tt"; - this.CAL_HoFTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.CAL_HoFTime.Location = new System.Drawing.Point(115, 91); - this.CAL_HoFTime.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0); - this.CAL_HoFTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); - this.CAL_HoFTime.Name = "CAL_HoFTime"; - this.CAL_HoFTime.ShowUpDown = true; - this.CAL_HoFTime.Size = new System.Drawing.Size(73, 20); - this.CAL_HoFTime.TabIndex = 38; - this.CAL_HoFTime.Value = new System.DateTime(2001, 1, 1, 0, 0, 0, 0); - // // SAV_Trainer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2185,10 +2185,10 @@ private void InitializeComponent() this.TC_Editor.ResumeLayout(false); this.Tab_Overview.ResumeLayout(false); this.Tab_Overview.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); + this.GB_Stats.ResumeLayout(false); + this.GB_Stats.PerformLayout(); + this.GB_Adventure.ResumeLayout(false); + this.GB_Adventure.PerformLayout(); this.Tab_BadgeMap.ResumeLayout(false); this.Tab_BadgeMap.PerformLayout(); this.GB_Map.ResumeLayout(false); @@ -2371,8 +2371,8 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_M; private System.Windows.Forms.NumericUpDown NUD_Z; private System.Windows.Forms.GroupBox GB_Map; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox GB_Adventure; + private System.Windows.Forms.GroupBox GB_Stats; private System.Windows.Forms.DateTimePicker CAL_AdventureStartDate; private System.Windows.Forms.DateTimePicker CAL_AdventureStartTime; private System.Windows.Forms.Label L_Started; From 346745d6186476dc4c94526948d7d6e0afd62799 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 14:30:07 -0700 Subject: [PATCH 57/75] Implement past gen strings for 'es' lang Added fallback method to grab the english file if the requested language file does not exist. --- PKHeX/MainWindow/Main.cs | 13 +++++++------ PKHeX/Util/DataUtil.cs | 7 +++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 3c329d897..52420e86d 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1099,15 +1099,16 @@ private void InitializeStrings() if (CB_MainLanguage.SelectedIndex < 8) curlanguage = lang_val[CB_MainLanguage.SelectedIndex]; + string l = curlanguage; + // Past Generation strings - g3items = Util.getStringList("ItemsG3", "en"); - g2items = Util.getStringList("ItemsG2", "en"); - g1items = Util.getStringList("ItemsG1", "en"); - metRSEFRLG_00000 = Util.getStringList("rsefrlg_00000", "en"); - metGSC_00000 = Util.getStringList("gsc_00000", "en"); + g3items = Util.getStringListFallback("ItemsG3", l, "en"); + g2items = Util.getStringListFallback("ItemsG2", l, "en"); + g1items = Util.getStringListFallback("ItemsG1", l, "en"); + metRSEFRLG_00000 = Util.getStringListFallback("rsefrlg_00000", l, "en"); + metGSC_00000 = Util.getStringListFallback("gsc_00000", l, "en"); // Current Generation strings - string l = curlanguage; natures = Util.getStringList("natures", l); types = Util.getStringList("types", l); abilitylist = Util.getAbilitiesList(l); diff --git a/PKHeX/Util/DataUtil.cs b/PKHeX/Util/DataUtil.cs index 86ffbf8cb..2c358d39a 100644 --- a/PKHeX/Util/DataUtil.cs +++ b/PKHeX/Util/DataUtil.cs @@ -55,6 +55,13 @@ public static string[] getStringList(string f, string l) rawlist[i] = rawlist[i].Trim(); return rawlist; } + public static string[] getStringListFallback(string f, string l, string fallback) + { + string[] text = getStringList(f, l); + if (text.Length == 0) + text = getStringList(f, fallback); + return text; + } internal static string[] getNulledStringArray(string[] SimpleStringList) { try From da8a538c7372ade39f859f66e6bc026f3dd4dbaf Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 14:31:03 -0700 Subject: [PATCH 58/75] Mono fix getLocationList Fix verified in #229 , still other mono related issues to sort out. --- PKHeX/MainWindow/Main.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 52420e86d..34c22f173 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -2142,7 +2142,7 @@ private void updateSpecies(object sender, EventArgs e) updateLegality(); } - private IEnumerable getLocationList(GameVersion Version, int SaveFormat, bool egg) + private List getLocationList(GameVersion Version, int SaveFormat, bool egg) { if (egg) { @@ -2167,33 +2167,33 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm case GameVersion.R: case GameVersion.S: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value <= 87); // Ferry + return metGen3.OrderByDescending(loc => loc.Value <= 87).ToList(); // Ferry break; case GameVersion.E: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value <= 87 || (loc.Value >= 196 && loc.Value <= 212)); // Trainer Hill + return metGen3.OrderByDescending(loc => loc.Value <= 87 || (loc.Value >= 196 && loc.Value <= 212)).ToList(); // Trainer Hill break; case GameVersion.FR: case GameVersion.LG: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value > 87 && loc.Value < 197); // Celadon Dept. + return metGen3.OrderByDescending(loc => loc.Value > 87 && loc.Value < 197).ToList(); // Celadon Dept. break; case GameVersion.D: case GameVersion.P: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)); // Battle Park + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)).ToList(); // Battle Park break; case GameVersion.Pt: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)); // Rock Peak Ruins + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)).ToList(); // Rock Peak Ruins break; case GameVersion.HG: case GameVersion.SS: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)); // Celadon Dept. + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)).ToList(); // Celadon Dept. break; case GameVersion.B: @@ -2202,27 +2202,27 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm case GameVersion.B2: case GameVersion.W2: - return metGen5.Take(3).Concat(metGen5.Skip(3).OrderByDescending(loc => loc.Value <= 116)); // Abyssal Ruins + return metGen5.Take(3).Concat(metGen5.Skip(3).OrderByDescending(loc => loc.Value <= 116)).ToList(); // Abyssal Ruins case GameVersion.X: case GameVersion.Y: - return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value <= 168)); // Unknown Dungeon + return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value <= 168)).ToList(); // Unknown Dungeon case GameVersion.OR: case GameVersion.AS: - return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value > 168 && loc.Value <= 354)); // Secret Base + return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value > 168 && loc.Value <= 354)).ToList(); // Secret Base } // Currently on a future game, return corresponding list for generation if (Version <= GameVersion.CXD && SaveFormat == 4) return metGen4.Where(loc => loc.Value == 0x37) // Pal Park to front .Concat(metGen4.Take(4)) - .Concat(metGen4.Skip(4).Where(loc => loc.Value != 0x37)); + .Concat(metGen4.Skip(4).Where(loc => loc.Value != 0x37)).ToList(); if (Version < GameVersion.X && SaveFormat >= 5) // PokéTransfer to front return metGen5.Where(loc => loc.Value == 30001) .Concat(metGen5.Take(3)) - .Concat(metGen5.Skip(3).Where(loc => loc.Value != 30001)); + .Concat(metGen5.Skip(3).Where(loc => loc.Value != 30001)).ToList(); return metGen6; } From cd0f04eadd8dc5abf49d67c10959697bd694bdfd Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 14:43:51 -0700 Subject: [PATCH 59/75] Fix IV/DV label gen2 #240 Gen3 onward = IV Gen1/2 = DV --- PKHeX/MainWindow/Main.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 34c22f173..0f76d5c2a 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -898,13 +898,13 @@ private void loadSAV(SaveFile sav, string path) BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; + Label_IVs.Visible = SAV.Generation >= 3; // DVs appears instead FLP_FriendshipForm.Visible = SAV.Generation >= 2; FLP_HeldItem.Visible = SAV.Generation >= 2; CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; FLP_PKRS.Visible = FLP_EggPKRSRight.Visible = SAV.Generation >= 2; Label_OTGender.Visible = SAV.Generation >= 2; - Label_IVs.Visible = SAV.Generation >= 2; // DVs appears instead if (SAV.Generation == 1) Label_IsShiny.Visible = false; From 0a1fc199ba2734fb09240e00554e0a535c4219eb Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 17:14:25 -0700 Subject: [PATCH 60/75] Remove DVs label, readonly->enable IV We're gonna call them IVs for gen1/2 because this is {CURRENT YEAR}. Too much of a hassle to have multiple controls hidden just for generation specific nomenclature differences. Change the Readonly for HP & SpD to Enabled (and flip bool states); mask now appears to enforce non-centering, no need to pad with 0 to fake that it's centered. Closes #255, 8 bits down. --- PKHeX/MainWindow/Main.Designer.cs | 53 +- PKHeX/MainWindow/Main.cs | 13 +- PKHeX/MainWindow/Main.resx | 734 +--------------------------- PKHeX/Resources/text/en/lang_en.txt | 1 - 4 files changed, 20 insertions(+), 781 deletions(-) diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index ccd735cad..b3436b74b 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -157,9 +157,6 @@ public void InitializeComponent() this.FLP_HackedStats = new System.Windows.Forms.FlowLayoutPanel(); this.CHK_HackedStats = new System.Windows.Forms.CheckBox(); this.FLP_StatsHeaderRight = new System.Windows.Forms.FlowLayoutPanel(); - this.FLP_IVs = new System.Windows.Forms.FlowLayoutPanel(); - this.Label_IVs = new System.Windows.Forms.Label(); - this.Label_DVs = 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(); @@ -429,6 +426,7 @@ public void InitializeComponent() this.mnuLSave = new System.Windows.Forms.ToolStripMenuItem(); this.PB_Legal = new System.Windows.Forms.PictureBox(); this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); + this.Label_IVs = new System.Windows.Forms.Label(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); this.FLP_Main.SuspendLayout(); @@ -475,7 +473,6 @@ public void InitializeComponent() this.FLP_StatHeader.SuspendLayout(); this.FLP_HackedStats.SuspendLayout(); this.FLP_StatsHeaderRight.SuspendLayout(); - this.FLP_IVs.SuspendLayout(); this.FLP_HP.SuspendLayout(); this.FLP_HPRight.SuspendLayout(); this.FLP_Atk.SuspendLayout(); @@ -2082,7 +2079,7 @@ public void InitializeComponent() // FLP_StatsHeaderRight // this.FLP_StatsHeaderRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.FLP_StatsHeaderRight.Controls.Add(this.FLP_IVs); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_IVs); this.FLP_StatsHeaderRight.Controls.Add(this.Label_EVs); this.FLP_StatsHeaderRight.Controls.Add(this.Label_Stats); this.FLP_StatsHeaderRight.Location = new System.Drawing.Point(107, 0); @@ -2091,37 +2088,6 @@ public void InitializeComponent() this.FLP_StatsHeaderRight.Size = new System.Drawing.Size(162, 21); this.FLP_StatsHeaderRight.TabIndex = 123; // - // FLP_IVs - // - this.FLP_IVs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.FLP_IVs.Controls.Add(this.Label_IVs); - this.FLP_IVs.Controls.Add(this.Label_DVs); - this.FLP_IVs.Location = new System.Drawing.Point(0, 0); - this.FLP_IVs.Margin = new System.Windows.Forms.Padding(0); - this.FLP_IVs.Name = "FLP_IVs"; - this.FLP_IVs.Size = new System.Drawing.Size(30, 21); - this.FLP_IVs.TabIndex = 124; - // - // Label_IVs - // - this.Label_IVs.Location = new System.Drawing.Point(0, 0); - this.Label_IVs.Margin = new System.Windows.Forms.Padding(0); - this.Label_IVs.Name = "Label_IVs"; - this.Label_IVs.Size = new System.Drawing.Size(30, 21); - this.Label_IVs.TabIndex = 26; - this.Label_IVs.Text = "IVs"; - this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_DVs - // - this.Label_DVs.Location = new System.Drawing.Point(0, 21); - this.Label_DVs.Margin = new System.Windows.Forms.Padding(0); - this.Label_DVs.Name = "Label_DVs"; - this.Label_DVs.Size = new System.Drawing.Size(30, 21); - this.Label_DVs.TabIndex = 26; - this.Label_DVs.Text = "DVs"; - this.Label_DVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // Label_EVs // this.Label_EVs.Location = new System.Drawing.Point(30, 0); @@ -5500,6 +5466,16 @@ public void InitializeComponent() this.L_UpdateAvailable.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.L_UpdateAvailable.Visible = false; // + // Label_IVs + // + this.Label_IVs.Location = new System.Drawing.Point(0, 0); + this.Label_IVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_IVs.Name = "Label_IVs"; + this.Label_IVs.Size = new System.Drawing.Size(30, 21); + this.Label_IVs.TabIndex = 29; + this.Label_IVs.Text = "IVs"; + this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // Main // this.AllowDrop = true; @@ -5583,7 +5559,6 @@ public void InitializeComponent() this.FLP_HackedStats.ResumeLayout(false); this.FLP_HackedStats.PerformLayout(); this.FLP_StatsHeaderRight.ResumeLayout(false); - this.FLP_IVs.ResumeLayout(false); this.FLP_HP.ResumeLayout(false); this.FLP_HPRight.ResumeLayout(false); this.FLP_HPRight.PerformLayout(); @@ -5781,7 +5756,6 @@ public void InitializeComponent() private System.Windows.Forms.Label Label_HiddenPowerPrefix; private System.Windows.Forms.Label Label_Stats; private System.Windows.Forms.Label Label_EVs; - private System.Windows.Forms.Label Label_IVs; private System.Windows.Forms.Label Label_Total; private System.Windows.Forms.Label Label_SPE; private System.Windows.Forms.Label Label_SPD; @@ -6122,8 +6096,7 @@ public void InitializeComponent() private System.Windows.Forms.MaskedTextBox TB_Smart; private System.Windows.Forms.MaskedTextBox TB_Tough; private System.Windows.Forms.MaskedTextBox TB_Sheen; - private System.Windows.Forms.FlowLayoutPanel FLP_IVs; - private System.Windows.Forms.Label Label_DVs; + private System.Windows.Forms.Label Label_IVs; } } diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 0f76d5c2a..a8c11af23 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -898,7 +898,6 @@ private void loadSAV(SaveFile sav, string path) BTN_Ribbons.Visible = SAV.Generation >= 3; CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; - Label_IVs.Visible = SAV.Generation >= 3; // DVs appears instead FLP_FriendshipForm.Visible = SAV.Generation >= 2; FLP_HeldItem.Visible = SAV.Generation >= 2; @@ -933,7 +932,7 @@ private void loadSAV(SaveFile sav, string path) FLP_SpD.Visible = false; Label_SPA.Visible = false; Label_SPC.Visible = true; - TB_HPIV.ReadOnly = true; + TB_HPIV.Enabled = false; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { @@ -946,8 +945,8 @@ private void loadSAV(SaveFile sav, string path) FLP_SpD.Visible = true; Label_SPA.Visible = true; Label_SPC.Visible = false; - TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = true; - TB_HPIV.ReadOnly = true; + TB_SPDEV.Enabled = TB_SPDIV.Enabled = false; + TB_HPIV.Enabled = false; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { @@ -960,8 +959,8 @@ private void loadSAV(SaveFile sav, string path) FLP_SpD.Visible = true; Label_SPA.Visible = true; Label_SPC.Visible = false; - TB_SPDEV.ReadOnly = TB_SPDIV.ReadOnly = false; - TB_HPIV.ReadOnly = false; + TB_SPDEV.Enabled = TB_SPDIV.Enabled = true; + TB_HPIV.Enabled = true; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { @@ -1789,7 +1788,7 @@ private void updateIVs(object sender, EventArgs e) if (SAV.Generation < 3) { - TB_HPIV.Text = pkm.IV_HP.ToString("00"); + TB_HPIV.Text = pkm.IV_HP.ToString(); TB_SPDIV.Text = TB_SPAIV.Text; if (SAV.Generation == 2) { diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index e5c0098ac..83c30b379 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -129,15 +129,6 @@ True - - True - - - True - - - True - @@ -164,33 +155,12 @@ True - - True - - - True - - - True - True True - - True - - - True - - - True - - - True - True @@ -200,21 +170,6 @@ True - - True - - - True - - - True - - - True - - - True - True @@ -233,30 +188,12 @@ True - - True - - - True - True True - - True - - - True - - - True - - - True - True @@ -275,33 +212,9 @@ True - - True - - - True - - - True - - - True - True - - True - - - True - - - True - - - True - True @@ -317,15 +230,6 @@ True - - True - - - True - - - True - True @@ -335,27 +239,9 @@ True - - True - - - True - True - - True - - - True - - - True - - - True - True @@ -371,18 +257,6 @@ True - - True - - - True - - - True - - - True - True @@ -395,18 +269,6 @@ True - - True - - - True - - - True - - - True - True @@ -425,36 +287,12 @@ True - - True - - - True - - - True - - - True - True True - - True - - - True - - - True - - - True - True @@ -467,18 +305,6 @@ True - - True - - - True - - - True - - - True - True @@ -491,15 +317,6 @@ True - - True - - - True - - - True - True @@ -509,57 +326,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -602,10 +368,7 @@ True - - True - - + True @@ -614,30 +377,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -650,30 +389,9 @@ True - - True - - - True - - - True - True - - True - - - True - - - True - - - True - True @@ -686,9 +404,6 @@ True - - True - True @@ -698,18 +413,6 @@ True - - True - - - True - - - True - - - True - True @@ -722,30 +425,9 @@ True - - True - - - True - - - True - True - - True - - - True - - - True - - - True - True @@ -758,18 +440,6 @@ True - - True - - - True - - - True - - - True - True @@ -782,18 +452,6 @@ True - - True - - - True - - - True - - - True - True @@ -809,18 +467,6 @@ True - - True - - - True - - - True - - - True - True @@ -836,24 +482,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1 @@ -925,30 +553,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1 @@ -1071,57 +675,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -1134,27 +687,9 @@ True - - True - - - True - - - True - True - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1312,33 +847,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -1375,108 +883,6 @@ 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 @@ -1582,42 +988,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1731,24 +1101,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1819,54 +1171,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -1906,18 +1210,12 @@ True - - True - True True - - True - True @@ -1927,36 +1225,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True diff --git a/PKHeX/Resources/text/en/lang_en.txt b/PKHeX/Resources/text/en/lang_en.txt index 633fe5432..2da4c4a78 100644 --- a/PKHeX/Resources/text/en/lang_en.txt +++ b/PKHeX/Resources/text/en/lang_en.txt @@ -96,7 +96,6 @@ Label_EggDate = Date: Tab_Stats = Stats CHK_HackedStats = Hacked Stats Label_IVs = IVs -Label_DVs = DVs Label_EVs = EVs Label_Stats = Stats Label_HP = HP: From 946a475e68e98b148bfb0ebf5444dd9471175a2e Mon Sep 17 00:00:00 2001 From: easyworld Date: Sun, 11 Sep 2016 11:15:50 +0800 Subject: [PATCH 61/75] Chinese translations for Gen 1-3 --- PKHeX/PKHeX.csproj | 5 + PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt | Bin 0 -> 1690 bytes PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt | 255 ++++++++++++++++++ PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt | Bin 0 -> 3552 bytes .../Resources/text/gen3/text_gsc_00000_zh.txt | Bin 0 -> 956 bytes .../text/gen3/text_rsefrlg_00000_zh.txt | Bin 0 -> 2688 bytes 6 files changed, 260 insertions(+) create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt create mode 100644 PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt create mode 100644 PKHeX/Resources/text/gen3/text_gsc_00000_zh.txt create mode 100644 PKHeX/Resources/text/gen3/text_rsefrlg_00000_zh.txt diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index 78abf06ba..261a58160 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -454,6 +454,11 @@ + + + + + diff --git a/PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt b/PKHeX/Resources/text/gen3/text_ItemsG1_zh.txt new file mode 100644 index 0000000000000000000000000000000000000000..4dc19307a591592458aba0139ad1e0d540217910 GIT binary patch literal 1690 zcmds%OHWfl6o8L0Mw~?18I4g`U_=uW?xXTrn7AnkTH4+M#YV_B$##iedhB;0A3Fa>5o0)s&JLlX-I+YJ= zuH!&pxc<}l&Nc$8cV|O%92{Ze^I*G|&R*o3hi0sK8=Pc2N1Z^D@X=y|-BE>WlPqdTb|6)7BCvflYtEBeH)EDr z=@ahWiv0FHX##VBxxiz8z)WDb>CZL#EWS15wA0))-)x98t%O#fn*y6-yfaIQWQ=oP zbY7*k>(AJ(>5ZGIDh;(m`tAQ>~O=gr}O(Olyr zaL@WWmax+*@+#)l@EtKuAZK*OLAyosx!%ZjsbM8RV3+bE!rlN{ErD*wRcH3-aLXwdTI@vIS5shF(BN)*LMwy6HxK@Z% zgjBpuf}RbF6}GaXrwG6u0&s_*e>eO-?ht@G1pSZ3cez6V?hw%-qC-T7hz=1QB5;R@ z4iOz9aEFKv2^|tTBy>pVkkBEaLqdmy4hbC+I%IUn=#bGNql5lqST|&J$mo#KA)`Y^ ThXEZ1bQsWKK!*Vx2Ho)&6M}l= literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt b/PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt new file mode 100644 index 000000000..2a78584d7 --- /dev/null +++ b/PKHeX/Resources/text/gen3/text_ItemsG2_zh.txt @@ -0,0 +1,255 @@ +(无) +掌门球 +高级球 +亮光之粉 +超级球 +精灵球 +卡比丘 (0) +自行车 +月之石 +解毒剂 +灼伤药 +解冻药 +解眠药 +解麻药 +回复药水 +全满药水 +超高级药水 +超级药水 +药水 +脱离洞穴的绳子 +除虫喷雾器 +PP全补剂 +火之石 +雷之石 +水之石 +卡比丘 (1) +HP提升剂 +攻击牛磺剂 +防御提升剂 +效果防护 +幸运之拳 +特攻增加剂 +神奇糖果 +命中加强 +叶之石 +金属粉 +金色珠 +皮皮玩偶 +万能药 +更生剂 +特级更生剂 +防御效果 +白银喷雾器 +黄金喷雾器 +要害攻击 +卡比丘 (2) +美味之水 +塞可汽水 +综合调味乳 +力量增强 +卡比丘 (3) +伤害预防 +速度增加 +特殊增强 +代币盒 +蓝色卡片 +卡比丘 (4) +学习装置 +破烂钓竿 +优秀钓竿 +银叶 +超强钓竿 +PP提升剂 +PP小补剂 +PP单补剂 +PP大补剂 +红色的鳞片 +秘传之药 +船票 +神奇之蛋 +透明铃铛 +银色之翼 +摩摩牛奶 +先攻之爪 +解毒的果实 +金叶 +柔软的沙子 +尖锐的鸟嘴 +消除麻痹的果实 +烧烤的果实 +冰冻的果实 +毒针 +王者之证 +苦涩的果实 +薄荷的果实 +红色圆柑果实 +小蘑菇 +大蘑菇 +银色的粉 +蓝色圆柑果实 +卡比丘 (5) +护身金币 +黄色圆柑果实 +绿色圆柑果实 +净身的护身符 +神秘的水滴 +弯曲的汤匙 +白色圆柑果实 +黑色带子 +黑色圆柑果实 +卡比丘 (6) +桃色圆柑果实 +黑色的眼镜 +美味尾巴 +粉红色丝带 +大葱 +烟雾球 +融化不了的冰块 +磁铁 +奇迹的果实 +珍珠 +大珍珠 +不变之石 +诅咒护身符 +愤怒馒头 +GS球* +蓝色卡片* +奇迹种子 +胖骨头 +振奋精神的头布 +卡比丘 (7) +元气之粉 +元气之根 +万能之粉 +复活草 +硬石头 +幸运蛋 +卡片钥匙 +机械的零件 +神奇宝贝蛋兑换券 +掉落的东西 +星星的沙子 +星星的碎片 +地下室钥匙 +定期月票 +卡比丘 (8) +卡比丘 (9) +卡比丘 (10) +木灰 +树果汁 +对焦镜片 +卡比丘 (11) +卡比丘 (12) +金属涂层 +龙之牙 +卡比丘 (13) +吃剩下的东西 +卡比丘 (14) +卡比丘 (15) +卡比丘 (16) +神奇的果实 +龙之鳞片 +破坏性的遗传因子 +卡比丘 (17) +卡比丘 (18) +卡比丘 (19) +神圣之灰 +重量球 +花案邮件 +等级球 +诱饵球 +速度球 +卡比丘 (20) +电气球 +友友球 +月亮球 +爱心球 +木箱 +桐木箱 +太阳之石 +水玉色之带 +卡比丘 (21) +升级 +树果 +黄金的果实 +杰尼龟喷壶 +卡比丘 (22) +公园球 +彩虹之翼 +卡比丘 (23) +砖瓦碎片 +冲浪邮件 +海洋邮件 +肖像邮件 +可爱邮件 +伊布邮件 +变身邮件 +蓝天邮件 +音符邮件 +梦幻邮件 +卡比丘 (24) +TM01 +TM02 +TM03 +TM04 +TM04 (未使用) +TM05 +TM06 +TM07 +TM08 +TM09 +TM10 +TM11 +TM12 +TM13 +TM14 +TM15 +TM16 +TM17 +TM18 +TM19 +TM20 +TM21 +TM22 +TM23 +TM24 +TM25 +TM26 +TM27 +TM28 +TM28 (未使用) +TM29 +TM30 +TM31 +TM32 +TM33 +TM34 +TM35 +TM36 +TM37 +TM38 +TM39 +TM40 +TM41 +TM42 +TM43 +TM44 +TM45 +TM46 +TM47 +TM48 +TM49 +TM50 +HM01 +HM02 +HM03 +HM04 +HM05 +HM06 +HM07 +HM08 (未使用) +HM09 (未使用) +HM10 (未使用) +HM11 (未使用) +HM12 (未使用) \ No newline at end of file diff --git a/PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt b/PKHeX/Resources/text/gen3/text_ItemsG3_zh.txt new file mode 100644 index 0000000000000000000000000000000000000000..33a4521df05f600fd4b70c181ecdfed047ecd7c1 GIT binary patch literal 3552 zcmds3du&rx7(Y6Vdd-|ff~dops0<;7_4W=OLyQ_zNcFC-ZN1*wYPYVPYqzeYw=H%T zD0i?rx>4CWH%12)L1LUFYLsXU2+kOTGBk<`h-i$O_#Bx|bn|>WI|oBzG||7zP0sf_ zukUxx`CfNwasfK!xdm}(Q{7j+1*$XAMe7|R$ZY?uPLM6@1wV&APaSQ#+rptl@TRJk_0WICOymvG znSKuB$(llm?C_aCYbK~Y4QHd6qD#cz*TRl74J8rK91rbQDehVmwi!j>b=tqTw)p}5 zre10**c7&fMGiIAH`dD`MdHvs=GlIum`YGo;o}f!CS!$CWnd-dFyXJr;pqS#z}41s zxKuiaeP)7>XS#wPiSyDNI-!M%2%483vvUY^bj1uI!axu(5H!VR??mu%)9rsLSKwDTQfIKji&T2fn&r^1 zF~EFwhl`G{@C`ph>rqYwMZ@0h-XWSrtkQnrmm!xasAwJ7T#_aTk>1uj@&Lv6NO#qAcDjfWmz>?ZMoycYE4=0IP>7S*J)G6dtR!Z%=&7;UZWX`b?aV!p`_0m#jz-dF7*=G6eRNJnQ;MoB+QRniTpdwMUGh;-o##7DiKN79}b@i!zhs@ z4J8el((i}!6HI(%G!sg~x`QsGcybUtithinQhFqm9Ns*R<85*C=T?Hg=^YjcTI${F zBWQtlpGwea|JDFOr^4H0f?8ds8T4&%zLSjY@~yWMWRNDh2`ZGnnBjP`TlWZu_5`lR zv0NOv2e)4)x8V1QWuC@3uTCT(YV3GTabya6)Ra0RfoJvie~jBFyUQA(cS5_+WtbkH z8+jb>m{LvRvslJ53%tj1UdyXjwS(3Z8nmgz%61M}`hek3?pF_CdZ7{KD|~0$L1QYh z(Hq6`P%h&s-UvFt#~#*z^CGNcQQP4hoT=3@u^RY3X{x|)7t5TQK9xx{;C!{Htqkid zj==6OlSR0d`+(mdz2%<1!%(;iWGqu0ft7i+e+c@PzAD`2RXvW8DYc{lUZr@`>6$@r z4*SDjS$bGpX(pKv@>9!t$c0N?ODvVWuLdDT8svw>H#(ZvaA<|O(qj}CV(&@G18$>u zum?OU5+r*}*#Y?zcacj|1Zfh-TW9!UoM8`iVju4bB{c=|?@sqKU89)`oE+M3ex^%P zpg;dn;+KN|Of!dm3`7G)QNkPqogC!Qr@_fARGC8Y*i5u6t}{xnC7f~KD!|%e&LiD# zZ{W~`Jipb^3;sQtaXONLyB!=Vur*pP7d53=T$94~AEFUZ9+^E|GSUI%73;7?;1-G6j{-U0#f%h|5cdNLMD*<`w zXrQ^JyS2ZcL)#zvsh1$QH_jh8`@((Ug+EyP^Z?wTRBFXO_g6Omzl=kLB;E!!n4nZ5 zuMz|mk|3y>1o;P=(%-DRucM(G|DT8#IFBk2y`kj8R`41j_Ihwj&lHZ#xmEk)1huD^ zx(KRB`r_o@r&N;D*KWSA1H7BQ=eAVT~7a~(U~-znguzARJ~9s1dtm+y3I3gP0<>kH@gmz>vsPu$|9duRD7d~>Xz zb&g|Uh#pMD5EzHRI0VKaFb;un2#iBu90KDgpXOM>Y)%l^ zgCMX6L0}Jpz#asFJqQAO5Crz1aYW_C)(IRj@F%%Vo|iU?*Wo%rGA{9Hv)NsDy9F|z zNq)ejDFzed&tvfs`Q}yoahyOzla=L>=X}(gK@;)ep`kH5L616HT}7KmQsBunH@s78 z=q;oH! zDEJem_k+8T*k0#dX(lL@Sma&e8Oe_0YL{2H$q;oXG$NaVdmNYeKE(gJUsx9=qk+kq FKLCM4`6d7W literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_gsc_00000_zh.txt b/PKHeX/Resources/text/gen3/text_gsc_00000_zh.txt new file mode 100644 index 0000000000000000000000000000000000000000..d609b839a94a161e74d9835e39b23d7189ccd083 GIT binary patch literal 956 zcmezWPlLgaA)g_SA(cUsfs5g3)3;#vsay<343-SvgWvaZF>r=#Y+{PzVlZYffQlG1 z7(!Vg8PhXBa_ymSgZDOh`-Mb+)EPl#?WY+{@2?D>@Ux$bVUpjyez{zbtT9wJJ!4%N z$R@WCw~*REZ@;O2Tnqsjf*I4(L8?rksvhQDoCva^K5lJ_X(_~fQ>fglMzg}4z_(!_ z^=42pV+M05i!IzR9i;Q{l-pB4`koi46+-k|z}3S1=$dy$#En#5qv5RlJI;C@v}6iV>+3(EtE!F;wM z@YOV_37`65F#lbgH$4p^0`pyM*|#Zjx$}XlQMU3F~!t6H)51zmU583tU--1CV8iXs% z2gM{ToME8}3(J);g)z&gfpi+e!|y@rF29SxrlmK5F4wNT*aUJph(^R}W_)EE$n=X7 zAu(YH_n9HwPlj;c7{Xm`2zRw1+@*$aw;3|PT<4m*s19VlAv|3h!CiMII3OAnw~OjF zHG^m)xZOr@yB7q`2BuL^Y#G5_@wxnC(~Vj4gF#}j7&3y}{ddB-aKQp*pq)l=SG-`|EW-CPXae&756dPFfS literal 0 HcmV?d00001 diff --git a/PKHeX/Resources/text/gen3/text_rsefrlg_00000_zh.txt b/PKHeX/Resources/text/gen3/text_rsefrlg_00000_zh.txt new file mode 100644 index 0000000000000000000000000000000000000000..6a766defee3c4390958f75e7485dfbdfc7b3c586 GIT binary patch literal 2688 zcmb_eUrbw77(ZJd=I%6;nBZQdRii7g#r{LUkPsgxiB0ZyxrEZ(+6uE2))sCjZEZ=f zgBB75Y;mqc7-NBj$qa%nF+rb}nI+3~j?4#)ZZn%E`k;hh_+z5=d_6s!!?H(1$oD(n z`SbhE`M%$GoBOxSmx$Dz5zsI4LK1r;+znus34sGT5BvPlEll)fNEjJR!=v z-2z&XrZZs66MLG#Hp|nQm;|UIc_lw%3pht%oYUr9VE1+U_O$47_UX`Vo7i^E}(mAPdwxj(9IEjcv8MO@``LgMl_|}N#(Q&Wi1M; zx0C}d4NcTfyax0VGUR8F=XML(#dbi2{@FI_gPP1~7qfCkKsrx#uYeZ3P^|)bHK=bb zQgyfnDLRjN%Y5%1HHLw6SH`bGT+6X*%AVsd9RCfUa3uJ9M@g^?M;#5Gag+GTtI#p* zJTHw)c5!8x#>=9bY3p{6<1?=hd@%B6Y&VX=AuoF0Qo#3zY6|Ulr92G5ehbRqU)q#H zF1W*10kJuq`}Kyk=mmx4hh`CWmO59xFNS9E`TJetuCfyl`$qvorz5kK2HigpJ&w~j zj)TLk={^b8$K!T!6~7zY`)`NIA)seF9>@aHM;G$Fp~`*h9Z+tK>w7;~QNEJ`Tb@|z zh2AjlThI4~c2BGy{6~UQ8rUiA^CaAJExOvfJT{3>TpIcM9Lx}n!Rt>bEAmX+VezU5 zVy9|-)C^HERV`I4RV!60RVh^{RVPy>-w$YKpr`VkfS$~E0eU*$0Vo4gKhr)_KGQu@ zJyn{3b57%jw5sd6&Xzj^(k5miS+QgGof_p&aL4ML6UsBg4X5r!1T^ak zxrpYzk&or8o1Bq~gw>D78gRWq)e!ys?EO+)k}JYL;L1dzU4$ALD%iaR`(q>Ve^?mn z3O0y!2J8K*FGTe5?b{Pd6suG~KL7ndG^kOA3ap2`6+8cGgtx!cQ90z5Kw&y@LV=NhYP0j+X8E#4R7#?RnxPRx)i7+s zc|p2Xt Date: Sat, 10 Sep 2016 23:12:22 -0700 Subject: [PATCH 62/75] Fix gen3 ability dupe Thanks @ricksee ! Gen3 second ability for same-ability mons is stored as 0, same deal for gen4. MainPK4 alteration is an unneeded-code removal, gen4 only has abil0&1, not 2 (hidden) like gen5. Closes #256 --- PKHeX/MainWindow/Main.cs | 2 +- PKHeX/MainWindow/MainPK4.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index a8c11af23..a57a53091 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1460,7 +1460,7 @@ private void setAbilityList() formnum = CB_Form.SelectedIndex; int[] abils = SAV.Personal.getAbilities(species, formnum); - if (abils[1] == 0) + if (abils[1] == 0 && SAV.Generation != 3) abils[1] = abils[0]; string[] abilIdentifier = {" (1)", " (2)", " (H)"}; List ability_list = abils.Where(a => a != 0).Select((t, i) => abilitylist[t] + abilIdentifier[i]).ToList(); diff --git a/PKHeX/MainWindow/MainPK4.cs b/PKHeX/MainWindow/MainPK4.cs index fef518fd0..ca7c299ad 100644 --- a/PKHeX/MainWindow/MainPK4.cs +++ b/PKHeX/MainWindow/MainPK4.cs @@ -137,8 +137,6 @@ private void populateFieldsPK4() if (abil < 0) CB_Ability.SelectedIndex = 0; - else if (abil == 2) - CB_Ability.SelectedIndex = 2; else if (abils[0] == abils[1] || abils[1] == 0) CB_Ability.SelectedIndex = pk4.PIDAbility; else From f7afb8805259927400213df25e009bc1c5ae729b Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 23:14:52 -0700 Subject: [PATCH 63/75] Fix gen3 inventory bugs Thanks @sora10pls ! Premier Ball already in Balls pocket (remove from General Items list) Hide [Give All] button in Gen3, same treatment as Gen1/2. Closes #257 --- PKHeX/Legality/Tables3.cs | 2 +- PKHeX/Subforms/Save Editors/SAV_Inventory.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PKHeX/Legality/Tables3.cs b/PKHeX/Legality/Tables3.cs index d94fa86f3..41d5b0c59 100644 --- a/PKHeX/Legality/Tables3.cs +++ b/PKHeX/Legality/Tables3.cs @@ -7,7 +7,7 @@ public static partial class Legal // PKHeX Valid Array Storage #region RS internal static readonly ushort[] Pouch_Items_RS = { - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 254, 255, 256, 257, 258 + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 254, 255, 256, 257, 258 }; internal static readonly ushort[] Pouch_Key_RS = { 259, 260, 261, 262, 263, 264, 265, 266, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288 diff --git a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs index f520a03fa..963b2bedb 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs +++ b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs @@ -23,6 +23,7 @@ public SAV_Inventory() break; case 3: itemlist = Main.g3items; + B_GiveAll.Visible = false; break; default: itemlist = Main.itemlist; From 1d0d2b8d32ef73fdcadc8c8556cfa1715b593178 Mon Sep 17 00:00:00 2001 From: ajtudela Date: Sun, 11 Sep 2016 13:53:37 +0200 Subject: [PATCH 64/75] Full translation for spanish language except C-Gear Skin. I don't know why it didn't have translated.. --- PKHeX.userprefs | 29 +++ PKHeX/Resources/text/es/lang_es.txt | 303 +++++++++++++++++++++------- 2 files changed, 254 insertions(+), 78 deletions(-) create mode 100644 PKHeX.userprefs diff --git a/PKHeX.userprefs b/PKHeX.userprefs new file mode 100644 index 000000000..7e4063b2d --- /dev/null +++ b/PKHeX.userprefs @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PKHeX/Resources/text/es/lang_es.txt b/PKHeX/Resources/text/es/lang_es.txt index b2e22bad8..b81798b2c 100644 --- a/PKHeX/Resources/text/es/lang_es.txt +++ b/PKHeX/Resources/text/es/lang_es.txt @@ -38,6 +38,8 @@ Menu_LoadBoxes = Cargar Cajas Menu_DumpBoxes = Exportar Cajas Menu_Report = Informe de la caja Menu_Database = Base de datos de PKM +Menu_MGDatabase = Base de datos de regalo misterioso +Menu_BatchEditor = Editor por lotes Menu_Other = Otro Menu_OpenSDF = Abrir carpeta SaveDataFiler Menu_OpenSDB = Abrir carpeta SaveDataBackup @@ -76,6 +78,8 @@ Label_PKRSdays = d: Label_Country = País: Label_SubRegion = Subregión: Label_3DSRegion = Región 3DS: +L_NSparkle = Brillo de N +CHK_NSparkle = Activo ---------------------Met Tab Data----------------------- Tab_Met = Conocido Label_OriginGame = Juego Original: @@ -92,6 +96,7 @@ Label_EggLocation = Lugar: Label_EggDate = Fecha: --------------------Stats Tab Data---------------------- Tab_Stats = Estadísticas +CHK_HackedStats = Estadísticas Hackeadas Label_IVs = IVs Label_EVs = EVs Label_Stats = Esta. @@ -101,6 +106,7 @@ Label_DEF = Defensa: Label_SPA = Atq. Esp.: Label_SPD = Def. Esp.: Label_SPE = Velocidad: +Label_SPC = Especial: Label_Total = Total: Label_HiddenPowerPrefix = Tipo del Poder Oculto: Label_CharacteristicPrefix = Características: @@ -142,34 +148,37 @@ Tab_SAV = SAV B_OpenPokePuffs = ‎Pokélito B_OpenItemPouch = Inventario B_OpenTrainerInfo = Entrenador +B_OUTPasserby = Transeúntes B_OpenBoxLayout = Fondos Cajas B_OpenWondercards = Tarjetas Misteriosas -B_OpenBerryField = C. de Bayas +B_OpenSuperTraining = Superentren. +B_OpenHallofFame = Hall de la fama B_OpenOPowers = Poder O B_OpenEventFlags = Eventos B_OpenPokedex = Pokédex -B_OpenSuperTraining = Superentren. +B_OpenBerryField = C. de Bayas +B_OpenPokeBlocks = Pokécubos +B_OpenLinkInfo = Datos Enlace -- B_OpenSecretBase = Base Secreta +B_CGearSkin = C-Gear --------------------Tab Internals----------------------- L_Party = Equipo: L_BattleBox = Caja de Combate: -L_ReadOnlyPBB = Sólo leer. +L_ReadOnlyPBB = Sólo lectura. GB_Daycare = Guardería GB_GTS = GTS -GB_Fused = Fusionado +GB_Fused = Fusión GB_SUBE = Viejo DayCare_HasEgg = Huevo Disponible -L_DaycareSeed = Seed -L_ReadOnlyOther = Sólo leer. +L_DaycareSeed = Semill. +L_ReadOnlyOther = Sólo lectura. B_JPEG = Guardar PGL .JPEG -B_OpenHallofFame = Hall de la fama -B_OUTPasserby = Transeúntes B_VerifyCHK = Checksums -B_SaveBoxBin = Save Box Data++ -L_GameSync = Game Sync ID: -L_Secure1 = Secure Value 1: -L_Secure2 = Secure Value 2: +B_SaveBoxBin = Guardar Cajas++ +L_GameSync = ID de Sincronización: +L_Secure1 = Valor Seguro 1: +L_Secure2 = Valor Seguro 2: ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. @@ -293,23 +302,23 @@ B_Save = Guardar ------------------Super Training----------------------- CHK_SuperTraining = Superentrenamiento Normal CHK_SuperTrain1_HP = Nv. 1: PS -CHK_SuperTrain1_ATK = Nv. 1: Atq -CHK_SuperTrain1_DEF = Nv. 1: Def -CHK_SuperTrain1_SPA = Nv. 1: AtE -CHK_SuperTrain1_SPD = Nv. 1: DfE -CHK_SuperTrain1_SPE = Nv. 1: Vel +CHK_SuperTrain1_ATK = Nv. 1: Ataque +CHK_SuperTrain1_DEF = Nv. 1: Defensa +CHK_SuperTrain1_SPA = Nv. 1: Ataque Especial +CHK_SuperTrain1_SPD = Nv. 1: Defensa Especial +CHK_SuperTrain1_SPE = Nv. 1: Velocidad CHK_SuperTrain2_HP = Nv. 2: PS -CHK_SuperTrain2_ATK = Nv. 2: Atq -CHK_SuperTrain2_DEF = Nv. 2: Def -CHK_SuperTrain2_SPA = Nv. 2: AtE -CHK_SuperTrain2_SPD = Nv. 2: DfE -CHK_SuperTrain2_SPE = Nv. 2: Vel +CHK_SuperTrain2_ATK = Nv. 2: Ataque +CHK_SuperTrain2_DEF = Nv. 2: Defensa +CHK_SuperTrain2_SPA = Nv. 2: Ataque Especial +CHK_SuperTrain2_SPD = Nv. 2: Defensa Especial +CHK_SuperTrain2_SPE = Nv. 2: Velocidad CHK_SuperTrain3_HP = Nv. 3: PS -CHK_SuperTrain3_ATK = Nv. 3: Atq -CHK_SuperTrain3_DEF = Nv. 3: Def -CHK_SuperTrain3_SPA = Nv. 3: AtE -CHK_SuperTrain3_SPD = Nv. 3: DfE -CHK_SuperTrain3_SPE = Nv. 3: Vel +CHK_SuperTrain3_ATK = Nv. 3: Ataque +CHK_SuperTrain3_DEF = Nv. 3: Defensa +CHK_SuperTrain3_SPA = Nv. 3: Ataque Especial +CHK_SuperTrain3_SPD = Nv. 3: Defensa Especial +CHK_SuperTrain3_SPE = Nv. 3: Velocidad CHK_SecretUnlocked = Superentrenamiento Desbloqueado CHK_SecretComplete = Superentrenamiento Completa CHK_SuperTrain4_1 = Nv. 4: Dificultad tras otra @@ -330,20 +339,25 @@ L_Hits = Golpes restantes: ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. -! MemoryAmie = Editor de Memorias / Amigos +! MemoryAmie = Editor de Memorias / Poké Recreo - Change stuff below this line, not above. ---------------------Bottom UI------------------------- BTN_Cancel = Cancelar BTN_Save = Guardar -L_Handler = Manejador Actual: +L_Handler = Dueño Actual: +B_ClearAll = Limpiar todo - Tab_OTMemory = Memorias con: EO L_OT_Friendship = Amistad: -L_OT_Affection = Cariño: +L_OT_Affection = Afecto: +L_OT_TextLine = Tipo Memoria: Tab_CTMemory = Memorias con: noEO L_CT_Friendship = Amistad: L_cT_Affection = Cariño: Tab_Residence = Residencia +GB_Residence = El Pokémon ha residido en: +L_Enjoyment = Diversión: +L_Fullness = Saciedad: -- L_Country = País L_Region = Región @@ -353,7 +367,7 @@ L_Geo2 = Anterior 2: L_Geo3 = Anterior 3: L_Geo4 = Anterior 4: -- -L_Arguments = Disabled ; Never left ; OT ; Past Gen ; Memories with ; Pokémon ; Area ; Item(s) ; Move ; Location ; +L_Arguments = Deshabilitado ; Nunca dejado ; EO ; Gen Pas ; Memorias con ; Pokémon ; Área ; Objeto(s) ; Mov. ; Localización ; ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. @@ -364,12 +378,73 @@ L_Arguments = Disabled ; Never left ; OT ; Past Gen ; Memories with ; Pokémon ; ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. +! SAV_PokeBlockORAS = Editor de Pokécubos +- Change stuff below this line, not above. +------------------------------------------------------- + +L_Red = Pokécubos Rojos: +L_Blue = Pokécubos Azules: +L_Pink = Pokécubos Rosas: +L_Green = Pokécubos Verdes: +L_Yellow = Pokécubos Amarillos: +L_Rainbow = Pokécubos Arcoíris: +L_Red = Pokécubos Rojos Plus: +L_Blue = Pokécubos Azules Plus: +L_Pink = Pokécubos Rosas Plus: +L_Green = Pokécubos Verdes Plus: +L_Yellow = Pokécubos Amarillos Plus: +L_Rainbow = Pokécubos Arcoíris Plus: +B_RandomizeBerries = PkCubos aleatorios +B_GiveAllBlocks = Todos Max +B_Cancel = Cancelar +B_Save = Guardar +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_Link6 = Editor de Enlace de Datos +- Change stuff below this line, not above. +------------------------------------------------------- +TAB_Main = Inicio +TAB_PKM = Pokémon +TAB_Items = Objetos +L_BP = Ptos Batalla: +L_Pokemiles: PokéMillas +CHK_LinkAvailable = Habilitar Pokémon Link +B_Import = Importar +B_Export = Exportar +B_Cancel = Cancelar +B_Save = Guardar +L_Item1 = Objeto 1: +L_Item2 = Objeto 2: +L_Item3 = Objeto 3: +L_Item4 = Objeto 4: +L_Item5 = Objeto 5: +L_Item6 = Objeto 6: +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_SuperTrain = Records de Superentrenamiento +- Change stuff below this line, not above. +----------------------Buttons-------------------------- +L_Records = Records +L_Bags = Bolsas de Entrenamiento +L_Species = Especie: +L_Unk = L_Unk +L_Time0 = Tiempo: +L_Time1 = Tiempo1 +L_Time2 = Tiempo2 +L_UNKNOWN = DESCONOCIDO +L_Species2 = Especie +B_Cancel = Cancelar +B_Save = Guardar +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. ! SAV_BerryField = Visor de Campos de Bayas - Change stuff below this line, not above. ------------------------------------------------------- L_Berry = Baya: L_Field = Campo: -L_Unfinished = Unfinished: Needs More Research +L_Unfinished = Sin acabar: Necesita más investigación L_u1 = 1 L_u2 = 2 L_u3 = 3 @@ -397,7 +472,7 @@ L_BoxName = Nombre de la caja: ! SAV_EventFlagsORAS = Editor de Eventos (ORAS) - Change stuff below this line, not above. ------------------------------------------------------ -L_Ash = Asho volcánico: +L_Ash = Ceniza volcánica: GB_Misc = Misc flag_0288 = Multi Statuette flag_0287 = Rotation Statuette @@ -412,7 +487,7 @@ flag_0284 = Singles Statuette GB_Rebattle = Rebattle flag_2835 = (AS) Latios Capturado flag_0420 = (AS) Latios Derrotado -L_SkyTower = *Sky Tower +L_SkyTower = *Torre del Cielo flag_2834 = (OR) Latias Capturado flag_0419 = (OR) Latias Derrotado flag_2828 = (OR) Tornadus Capturado @@ -467,12 +542,12 @@ flag_2831 = (AS) Zekrom Capturado flag_0183 = (AS) Zekrom Derrotado flag_2840 = (AS) Kyogre Capturado flag_0647 = (AS) Kyogre Derrotado -GB_Researcher = FlagDiff Researcher +GB_Researcher = Investigador de FlagDiff L_UnSet = UnSet L_IsSet = IsSet B_LoadNew = Carg. Nuevo -B_LoadOld = Carg. Antiguo -GB_FlagStatus = Check Flag Status +B_LoadOld = Carg. Antig. +GB_FlagStatus = Comprobar Estado de Flags L_Flag = Flag: CHK_CustomFlag = Estado: B_Save = Guardar @@ -501,11 +576,11 @@ flag_0114 = Zygarde Capturado flag_0790 = Zygarde Derrotado flag_0115 = Mewtwo Capturado flag_0963 = Mewtwo Derrotado -GB_Researcher = FlagDiff Researcher +GB_Researcher = Investigador de FlagDiff L_UnSet = UnSet L_IsSet = IsSet B_LoadNew = Carg. Nuevo -B_LoadOld = Carg. Antiguo +B_LoadOld = Carg. Antig. flag_2239 = 2239 flag_2238 = 2238 flag_2237 = 2237 @@ -515,7 +590,7 @@ flag_0004 = Flag4 flag_0003 = Flag3 flag_0002 = Flag2 flag_0001 = Flag1 -GB_FlagStatus = Check Flag Status +GB_FlagStatus = Comprobar Estado de Flags L_Flag = Flag: CHK_CustomFlag = Estado: B_Cancel = Cancelar @@ -525,7 +600,7 @@ B_Cancel = Cancelar ! SAV_PokedexORAS = Editor de Pokédex (ORAS) - Change stuff below this line, not above. ------------------------------------------------------ -L_goto = goto: +L_goto = Ir a: GB_Owned = Obtenido CHK_P1 = Obtenido CHK_P2 = Macho @@ -533,10 +608,14 @@ CHK_P3 = Hembra CHK_P4 = Macho brillante CHK_P5 = Hembra brillante GB_Encountered = Encontrado +GB_Displayed = Aparecido CHK_P6 = Macho CHK_P7 = Hembra CHK_P8 = Macho brillante CHK_P9 = Hembra brillante +L_FormsSeen = Formas vistas +L_FormDisplayed = Formas mostradas +B_ModifyForms = Modificar... L_DexNav = Nvl. DexNav: GB_Language = Idiomas CHK_L1 = Japonés @@ -547,7 +626,7 @@ CHK_L5 = Alemán CHK_L6 = Español CHK_L7 = Coreano B_Modify = Modificar... -B_GiveAll = Marcar todos +B_GiveAll = Todos Max L_Spinda = Spinda: B_Save = Guardar B_Cancel = Cancelar @@ -557,7 +636,7 @@ B_Cancel = Cancelar ! SAV_PokedexXY = Editor de Pokédex (XY) - Change stuff below this line, not above. ------------------------------------------------------- -L_goto = ir a: +L_goto = Ir a: GB_Owned = Obtenido CHK_F1 = Extranjero (Pre) CHK_P1 = Nativo (Kalos) @@ -566,11 +645,14 @@ CHK_P2 = Macho CHK_P3 = Hembra CHK_P4 = Macho brillante CHK_P5 = Hembra brillante -GB_Displayed = Mostrado +GB_Displayed = Aparecido CHK_P6 = Macho CHK_P7 = Hembra CHK_P8 = Macho brillante CHK_P9 = Hembra brillante +L_FormsSeen = Formas vistas +L_FormDisplayed = Formas mostradas +B_ModifyForms = Modificar... GB_Language = Idiomas CHK_L1 = Japonés CHK_L2 = Inglés @@ -580,7 +662,7 @@ CHK_L5 = Alemán CHK_L6 = Español CHK_L7 = Coreano B_Modify = Modificar... -B_GiveAll = Marcar todos +B_GiveAll = Todos Max L_Spinda = Spinda: B_Save = Guardar B_Cancel = Cancelar @@ -607,6 +689,7 @@ Label_EncryptionConstant = Cte. de Encriptación: CHK_Nicknamed = Apodo: Label_Species = Especie: L_PartyNum = N. equipo: +B_Delete = Borrar B_Close = Guardar ! End ! ----------------------------------------------------- @@ -614,12 +697,7 @@ B_Close = Guardar ! SAV_Inventory = Editor de Inventario - Change stuff below this line, not above. ------------------------------------------------------- -GB_Pouch = Pokélitos -B_DisplayBerries = Bayas -B_DisplayMedicine = Medicinas -B_DisplayTMHM = MT/MO -B_DisplayKeyItems = Objetos clave -B_DisplayItems = Objetos +B_GiveAll = Todos Max B_Save = Guardar B_Cancel = Cancelar ! End @@ -677,7 +755,7 @@ B_Save = Guardar ! SAV_SecretBase = Editor de Bases Secretas - Change stuff below this line, not above. ------------------------------------------------------- -L_FlagsCaptured = Flags Captur.: +L_FlagsCaptured = Capturadas: B_FSave = < B_GiveDecor = Marcar Decoraciones B_Cancel = Cancelar @@ -688,10 +766,10 @@ L_Favorite = Favoritos: f_MAIN = Inicio L_TrName = Nombre Ent.: L_BaseLocation = Localización Base: -L_Happy = Happy: -L_Encourage = Encourage: -L_Blackboard = Blackboard: -L_Confetti = Confetti: +L_Happy = Feliz: +L_Encourage = Estimulante: +L_Blackboard = Pizarra: +L_Confetti = Confeti: L_TeamName = Nombre Eq.: L_TeamSlogan = Eslógan Eq.: -- @@ -709,11 +787,11 @@ L_EncryptionConstant = ENC: L_IVs = IVs L_EVs = EVs L_HP = PS -L_ATK = ATQ -L_DEF = DEF -L_SpA = AtE -L_SpD = DfE -L_SPE = VEL +L_ATK = Atq. +L_DEF = Def. +L_SpA = AtqE. +L_SpD = DefE. +L_SPE = Vel. L_PKFriendship = Amistad: L_PPUps = PPs ! End @@ -724,14 +802,20 @@ L_PPUps = PPs ------------------------------------------------------- Tab_Multiplayer = Multijugador L_MultiplayerSprite = Icono Multijugador: -L_Style = Estilo: +GB_Sayings = Frases guardadas +L_Saying1 = 1: +L_Saying2 = 2: +L_Saying3 = 3: +L_Saying4 = 4: +L_Saying5 = 5: +-- Tab_BadgeMap = Medallas/Mapa GB_Map = Posición en el Mapa L_CurrentMap = Mapa actual: L_X = Coordenada X: L_Z = Coordenada Z: L_Y = Coordenada Y: -L_Offset = (offset) +-- Tab_Appearance = Apariencia (X/Y) L_Outfit = Valores Atuendos B_GiveAccessories = Marcar Accesorios @@ -746,7 +830,9 @@ L_FacialHair = Pelo Facial: L_Hairstyle = Estilo Pelo: L_HairColor = Color Pelo: L_SkinColor = Color Piel: -GB_MaisonCurrent = Maison Streaks (Current) +-- +Tab_Maison = Mansión +GB_MaisonCurrent = Rachas Mansión (Actual) L_SuperC = Super L_NormalC = Normal L_MultiC = Multi: @@ -754,7 +840,7 @@ L_RotationC = Rotation: L_TriplesC = Triples: L_DoublesC = Dobles: L_SinglesC = Indiv.: -GB_MaisonBest = Maison Streaks (Best) +GB_MaisonBest = Rachas Mansión (Mejor) L_SuperB = Super L_NormalB = Normal L_MultiB = Multi: @@ -765,28 +851,77 @@ L_SinglesB = Indiv: B_Save = Guardar L_Stats = Estadísticas B_Cancel = Cancelar +-- Tab_Overview = Inicio -L_Seconds = Seg: -L_Minutes = Min: -L_Hours = Hrs: +L_TrainerName = Nombre Entr.: L_Language = Idioma: -L_PM = PokéMillas: L_Region = Subregión: -L_BP = BP: L_Country = País: B_MaxCash = + L_3DSReg = Región 3DS: L_Money = $: -L_SID = SID: L_TID = TID: -L_TrainerName = Nombre Entrena.: +L_SID = SID: +-- +GB_Adventure = Información de la Aventura +L_Seconds = Seg: +L_Minutes = Min: +L_Hours = Hrs: +L_Started = Comienzo: +L_Fame = Hall Fama: +L_LastSaved = Último: +-- +GB_Stats = Estadísticas +L_PM = PokéMillas: +L_BP = BP: +L_Style = Estilo: L_Value = Valor -GB_Sayings = Saved Sayings -L_Saying1 = 1: -L_Saying2 = 2: -L_Saying3 = 3: -L_Saying4 = 4: -L_Saying5 = 5: +L_Offset = (offset) +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_SimpleTrainer = Editor del Entrenador +- Change stuff below this line, not above. +------------------------------------------------------- +GB_Trainer = Nombre +L_TrainerName = Nombre Entr.: +B_MaxCash = + +L_Money = $: +L_TID = TID: +L_SID = SID: +GB_Adventure = Información de la Aventura +L_Seconds = Seg: +L_Minutes = Min: +L_Hours = Hrs: +L_Started = Comienzo: +L_Fame = Hall Fama: +GB_Badges = Medallas +GB_Map = Posición en el Mapa +L_CurrentMap = Mapa actual: +L_X = Coordenada X: +L_Z = Coordenada Z: +L_Y = Coordenada Y: +GB_Options = Opciones +label1 = Tipo Son.: +LBL_TextSpeed = Vel. Texto: +LBL_BattleStyle = Estilo Bat.: +CHK_BattleEffects = Usar efectos de batalla +B_Cancel = Cancelar +B_Save = Guardar +! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_SimplePokedex = Editor de Pokédex +- Change stuff below this line, not above. +------------------------------------------------------- +label2 = Atrapados: +Label_Seen = Vistos: +B_SeenNone = Visto Ninguno +B_SeenAll = Vistos Todos +B_CaughtNone = Atrapado Ninguno +B_CaughtAll = Atrapados Todos +B_Cancel = Cancelar +B_Save = Guardar ! End ! ----------------------------------------------------- - DO NOT CHANGE THIS SECTION. @@ -800,3 +935,15 @@ B_Output = Exportar B_Cancel = Cancelar B_Save = Guardar ! End +! ----------------------------------------------------- +- DO NOT CHANGE THIS SECTION. +! SAV_CGearSkin = Editor de la apariencia del C-Gear +- Change stuff below this line, not above. +------------------------------------------------------- +B_ImportPNG = Importar .png +B_ExportPNG = Exportar .png +B_ImportCGB = Importar .cgb/.psk +B_ExportCGB = Exportar .cgb +B_Cancel = Cancelar +B_Save = Guardar +! End From 50b4ebc4ba962c4d9467e09ab4ea0181ddb26374 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 12:52:28 -0700 Subject: [PATCH 65/75] Catch & Rethrow getFieldsfromPKM Initialization variable is captured, reset, then the pkm is loaded. If an exception is thrown, the initialization state is not restored. There's other capture-reset-restore cases but pkm loading is the only one exposed to bad input. Should prevent #261 from happening. fieldsInitialized is checked in a bunch of events. --- PKHeX/MainWindow/Main.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index a57a53091..333cf7d4d 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1382,7 +1382,8 @@ public void populateFields(PKM pk, bool focus = true) Util.Alert("Converted File."); } - getFieldsfromPKM(); + try { getFieldsfromPKM(); } + catch { fieldsInitialized = oldInit; throw; } CB_EncounterType.Visible = Label_EncounterType.Visible = pkm.Gen4; fieldsInitialized = oldInit; From 3d95df6fc6004b65c2ad498c59084f184ec8b9df Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 13:02:56 -0700 Subject: [PATCH 66/75] Translation fixes Add gen3/2/1 text files to Resources (existing code would fall back to english). L_Form is autosized now; the combobox may stick out on the right for other languages -- the combobox shouldn't be made smaller just because the form label is too big. Closes #259 Sneaks in typo fix in ShowdownSet --- PKHeX/MainWindow/Main.Designer.cs | 32 +- PKHeX/MainWindow/Main.resx | 678 +++++++++++++- PKHeX/PKM/ShowdownSet.cs | 2 +- PKHeX/Properties/Resources.Designer.cs | 885 +++++++++++++++++- PKHeX/Properties/Resources.resx | 30 + .../Gen6/SAV_SecretBase.Designer.cs | 191 ++-- 6 files changed, 1689 insertions(+), 129 deletions(-) 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(); From 0b52c9a208663d5b7230fb33ec73bd87046ccf18 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 11 Sep 2016 14:54:20 -0700 Subject: [PATCH 67/75] Fix Gen I/II Save cloning bug --- PKHeX/Saves/SAV1.cs | 2 +- PKHeX/Saves/SAV2.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX/Saves/SAV1.cs b/PKHeX/Saves/SAV1.cs index a0a737add..f66e35c98 100644 --- a/PKHeX/Saves/SAV1.cs +++ b/PKHeX/Saves/SAV1.cs @@ -149,7 +149,7 @@ public override byte[] Write(bool DSV) // Configuration - public override SaveFile Clone() { return new SAV1(Data.Take(Data.Length - SIZE_RESERVED).ToArray()); } + public override SaveFile Clone() { return new SAV1(Write(DSV: false)); } public override int SIZE_STORED => Japanese ? PKX.SIZE_1JLIST : PKX.SIZE_1ULIST; public override int SIZE_PARTY => Japanese ? PKX.SIZE_1JLIST : PKX.SIZE_1ULIST; diff --git a/PKHeX/Saves/SAV2.cs b/PKHeX/Saves/SAV2.cs index 24426483f..320256757 100644 --- a/PKHeX/Saves/SAV2.cs +++ b/PKHeX/Saves/SAV2.cs @@ -198,7 +198,7 @@ private void getSAVOffsets() } // Configuration - public override SaveFile Clone() { return new SAV2(Data.Take(Data.Length - SIZE_RESERVED).ToArray()); } + public override SaveFile Clone() { return new SAV2(Write(DSV: false)); } public override int SIZE_STORED => Japanese ? PKX.SIZE_2JLIST : PKX.SIZE_2ULIST; public override int SIZE_PARTY => Japanese ? PKX.SIZE_2JLIST : PKX.SIZE_2ULIST; From 418fbb7e22e23f6fb8f6c70180e16309200f8eec Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 14:58:03 -0700 Subject: [PATCH 68/75] Fix GenIII save cloning bug Just write the save back when cloning; previously, the reserved section wasn't set back. --- PKHeX/Saves/SAV3.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/Saves/SAV3.cs b/PKHeX/Saves/SAV3.cs index 9ea4cbdec..8fbddd7a2 100644 --- a/PKHeX/Saves/SAV3.cs +++ b/PKHeX/Saves/SAV3.cs @@ -152,7 +152,7 @@ public override byte[] Write(bool DSV) private readonly int[] BlockOfs; // Configuration - public override SaveFile Clone() { return new SAV3(Data.Take(Box).ToArray(), Version); } + public override SaveFile Clone() { return new SAV3(Write(DSV:false), Version); } public override int SIZE_STORED => PKX.SIZE_3STORED; public override int SIZE_PARTY => PKX.SIZE_3PARTY; From 984292c810b48b7ebb83506597403921267db32c Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 14:58:19 -0700 Subject: [PATCH 69/75] Cap gen3 item count @ 99 Closes #264 --- PKHeX/Subforms/Save Editors/SAV_Inventory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs index 963b2bedb..49fadc449 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs +++ b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs @@ -175,7 +175,7 @@ private void packBags() itemcnt++; // No 0 count of items else if (itemcnt > 995) itemcnt = 995; // cap out - else if (itemcnt > 99 && SAV.Generation < 3) + else if (itemcnt > 99 && SAV.Generation <= 3) itemcnt = 99; if (itemindex == 0) // Compression of Empty Slots From f753816cb70e5a04b1fbbbe2d33db19ca26ffbf8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 15:14:42 -0700 Subject: [PATCH 70/75] Fix gen2 met location Wasn't being loaded, the last loaded save file locations persisted. Load gen2 locations when loading a gen2 save file. Closes #262 --- PKHeX/MainWindow/Main.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 333cf7d4d..6d3daf63a 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1045,6 +1045,10 @@ private void loadSAV(SaveFile sav, string path) CB_ExtraBytes.SelectedIndex = 0; } + // pk2 save files do not have an Origin Game stored. Prompt the met location list to update. + if (SAV.Generation == 2) + updateOriginGame(null, null); + // Refresh PK#->PK6 conversion info PKMConverter.updateConfig(SAV.SubRegion, SAV.Country, SAV.ConsoleRegion, SAV.OT, SAV.Gender); @@ -2142,8 +2146,11 @@ private void updateSpecies(object sender, EventArgs e) updateLegality(); } - private List getLocationList(GameVersion Version, int SaveFormat, bool egg) + private static List getLocationList(GameVersion Version, int SaveFormat, bool egg) { + if (SaveFormat == 2) + return metGen2; + if (egg) { if (Version < GameVersion.W && SaveFormat >= 5) @@ -2152,13 +2159,6 @@ private List getLocationList(GameVersion Version, int SaveFormat, boo switch (Version) { - case GameVersion.GSC: - case GameVersion.GS: - case GameVersion.C: - if (SaveFormat == 2) - return metGen2; - break; - case GameVersion.CXD: if (SaveFormat == 3) return metGen3; From 7c4615a51eb4cb39dfe0449af02b383a0880ed10 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 15:18:06 -0700 Subject: [PATCH 71/75] Delete userprefs --- PKHeX/PKHeX.userprefs | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 PKHeX/PKHeX.userprefs diff --git a/PKHeX/PKHeX.userprefs b/PKHeX/PKHeX.userprefs deleted file mode 100644 index cec46d96e..000000000 --- a/PKHeX/PKHeX.userprefs +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From 315a2c1a5f40ab0b1f86292f29b06514198fe930 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 15:18:43 -0700 Subject: [PATCH 72/75] Delete userprefs again --- PKHeX.userprefs | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 PKHeX.userprefs diff --git a/PKHeX.userprefs b/PKHeX.userprefs deleted file mode 100644 index 7e4063b2d..000000000 --- a/PKHeX.userprefs +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 822b8f2148f335ddbe903c1e3a741a186cb1c9dc Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 15:19:38 -0700 Subject: [PATCH 73/75] Add userprefs to gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 989d13bf1..2bd0a997b 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,9 @@ pip-log.txt # Mr Developer .mr.developer.cfg + +################# +## MonoDevelop +################# + +*.userprefs \ No newline at end of file From efc66fd0b31c71b2cdfdebaf09d3578bd78d7564 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sun, 11 Sep 2016 16:22:05 -0700 Subject: [PATCH 74/75] Fix Mr. Mime/Farfetch'd Gen I/II name bugs --- PKHeX/MainWindow/Main.cs | 9 ++++++++- PKHeX/MainWindow/MainPK1.cs | 5 ++++- PKHeX/MainWindow/MainPK2.cs | 5 ++++- PKHeX/PKM/PK1.cs | 10 ++++++++-- PKHeX/PKM/PK2.cs | 10 ++++++++-- PKHeX/PKM/PKX.cs | 4 ++++ 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 333cf7d4d..c80b7e921 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -2325,9 +2325,14 @@ private void updateNickname(object sender, EventArgs e) if (SAV.Generation < 5) // All caps GenIV and previous nick = nick.ToUpper(); + if (SAV.Generation < 3) + nick = nick.Replace(" ", ""); TB_Nickname.Text = nick; if (SAV.Generation == 1) - ((PK1)pkm).setNotNicknamed(); + ((PK1)pkm).setNotNicknamed(); + if (SAV.Generation == 2) + ((PK2)pkm).setNotNicknamed(); + } } private void updateNicknameClick(object sender, MouseEventArgs e) @@ -3156,6 +3161,8 @@ private void updateIsNicknamed(object sender, EventArgs e) if (SAV.Generation < 5) // All caps GenIV and previous nick = nick.ToUpper(); + if (SAV.Generation < 3) + nick = nick.Replace(" ", ""); if (TB_Nickname.Text != nick) { CHK_Nicknamed.Checked = true; diff --git a/PKHeX/MainWindow/MainPK1.cs b/PKHeX/MainWindow/MainPK1.cs index 3057dc27f..0b4eef469 100644 --- a/PKHeX/MainWindow/MainPK1.cs +++ b/PKHeX/MainWindow/MainPK1.cs @@ -77,7 +77,10 @@ private PKM preparePK1() pk1.EV_SPE = Util.ToInt32(TB_SPEEV.Text); pk1.EV_SPC = Util.ToInt32(TB_SPAEV.Text); - pk1.Nickname = TB_Nickname.Text; + if (CHK_Nicknamed.Checked) + pk1.Nickname = TB_Nickname.Text; + else + pk1.setNotNicknamed(); pk1.Move1 = Util.getIndex(CB_Move1); pk1.Move2 = Util.getIndex(CB_Move2); pk1.Move3 = Util.getIndex(CB_Move3); diff --git a/PKHeX/MainWindow/MainPK2.cs b/PKHeX/MainWindow/MainPK2.cs index 4272e79d7..ce3b719bd 100644 --- a/PKHeX/MainWindow/MainPK2.cs +++ b/PKHeX/MainWindow/MainPK2.cs @@ -96,7 +96,10 @@ private PKM preparePK2() pk2.EV_SPE = Util.ToInt32(TB_SPEEV.Text); pk2.EV_SPC = Util.ToInt32(TB_SPAEV.Text); - pk2.Nickname = TB_Nickname.Text; + if (CHK_Nicknamed.Checked) + pk2.Nickname = TB_Nickname.Text; + else + pk2.setNotNicknamed(); pk2.Move1 = Util.getIndex(CB_Move1); pk2.Move2 = Util.getIndex(CB_Move2); pk2.Move3 = Util.getIndex(CB_Move3); diff --git a/PKHeX/PKM/PK1.cs b/PKHeX/PKM/PK1.cs index c8c3f07fa..afcfcf399 100644 --- a/PKHeX/PKM/PK1.cs +++ b/PKHeX/PKM/PK1.cs @@ -100,9 +100,11 @@ public override bool IsNicknamed get { string spName = PKX.getSpeciesName(Species, Japanese ? 1 : 2).ToUpper(); + spName = spName.Replace(" ", ""); // Gen I/II didn't have a space for Mr. Mime return !nick.SequenceEqual( PKX.setG1Str(spName, Japanese) - .Concat(Enumerable.Repeat((byte) 0x50, StringLength - spName.Length - 1))); + .Concat(Enumerable.Repeat((byte) 0x50, StringLength - spName.Length - 1)) + .Select(b => (byte)(b == 0xF2 ? 0xE8 : b))); } set { } } @@ -110,7 +112,11 @@ public override bool IsNicknamed public void setNotNicknamed() { string spName = PKX.getSpeciesName(Species, Japanese ? 1 : 2).ToUpper(); - nick = PKX.setG1Str(spName, Japanese).Concat(Enumerable.Repeat((byte)0x50, StringLength - spName.Length - 1)).ToArray(); + spName = spName.Replace(" ", ""); // Gen I/II didn't have a space for Mr. Mime + nick = PKX.setG1Str(spName, Japanese) + .Concat(Enumerable.Repeat((byte)0x50, StringLength - spName.Length - 1)) + .Select(b => (byte)(b == 0xF2 ? 0xE8 : b)) // Decimal point<->period fix + .ToArray(); } diff --git a/PKHeX/PKM/PK2.cs b/PKHeX/PKM/PK2.cs index d5c32897f..d9a333c5c 100644 --- a/PKHeX/PKM/PK2.cs +++ b/PKHeX/PKM/PK2.cs @@ -103,9 +103,11 @@ public override bool IsNicknamed get { string spName = PKX.getSpeciesName(Species, Japanese ? 1 : 2).ToUpper(); + spName = spName.Replace(" ", ""); // Gen I/II didn't have a space for Mr. Mime return !nick.SequenceEqual( PKX.setG1Str(spName, Japanese) - .Concat(Enumerable.Repeat((byte) 0x50, StringLength - spName.Length - 1))); + .Concat(Enumerable.Repeat((byte) 0x50, StringLength - spName.Length - 1)) + .Select(b => (byte)(b == 0xF2 ? 0xE8 : b))); } set { } } @@ -113,7 +115,11 @@ public override bool IsNicknamed public void setNotNicknamed() { string spName = PKX.getSpeciesName(Species, Japanese ? 1 : 2).ToUpper(); - nick = PKX.setG1Str(spName, Japanese).Concat(Enumerable.Repeat((byte)0x50, StringLength - spName.Length - 1)).ToArray(); + spName = spName.Replace(" ", ""); // Gen I/II didn't have a space for Mr. Mime + nick = PKX.setG1Str(spName, Japanese) + .Concat(Enumerable.Repeat((byte)0x50, StringLength - spName.Length - 1)) + .Select(b => (byte)(b == 0xF2 ? 0xE8 : b)) // Decimal point<->period fix + .ToArray(); } diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 73c066406..27efe9661 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -1713,11 +1713,13 @@ public static ushort getG4Item(ushort g3val) {0xB7, "x"}, {0xB8, "y"}, {0xB9, "z"}, + {0xE0, "’"}, {0xE1, "{"}, /* Pk */ {0xE2, "}"}, /* Mn */ {0xE3, "-"}, {0xE6, "?"}, {0xE7, "!"}, + {0xE8, "."}, // Alias decimal point to . {0xEF, "♂"}, {0xF2, "."}, {0xF3, "/"}, @@ -1797,6 +1799,8 @@ public static ushort getG4Item(ushort g3val) {"x", 0xB7}, {"y", 0xB8}, {"z", 0xB9}, + {"'", 0xE0}, // Alias ' to ’ for Farfetch'd + {"’", 0xE0}, {"{", 0xE1}, /* Pk */ {"}", 0xE2}, /* Mn */ {"-", 0xE3}, From 74dd6012d1656204650a66f76f5db75609d8d00a Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 11 Sep 2016 18:57:12 -0700 Subject: [PATCH 75/75] Hide Tab_Other smarter Hide it if daycare isn't documented. Also, fix drag&drop cursor feedback for non-box slots. Previously, initiating a d&d on a party slot would reset the drag cursor to the default (arrow + square) instead of keeping the sprite-cursor. GiveFeedback -> UseDefaultCursors = false :) --- PKHeX/MainWindow/Main.cs | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 3233222d7..a8a3f4f83 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -76,7 +76,7 @@ public Main() new ToolTip().SetToolTip(dragout, "PKM QuickSave"); // Box Drag & Drop - foreach (PictureBox pb in PAN_Box.Controls) + foreach (PictureBox pb in SlotPictureBoxes) { pb.AllowDrop = true; // The PictureBoxes have their own drag&drop event handlers (pbBoxSlot) pb.GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; }; @@ -831,24 +831,29 @@ private void loadSAV(SaveFile sav, string path) } setPKXBoxes(); // Reload all of the PKX Windows + bool WindowTranslationRequired = false; + // Hide content if not present in game. GB_SUBE.Visible = SAV.HasSUBE; PB_Locked.Visible = SAV.HasBattleBox && SAV.BattleBoxLocked; if (!SAV.HasBox && tabBoxMulti.TabPages.Contains(Tab_Box)) - { tabBoxMulti.TabPages.Remove(Tab_Box); - tabBoxMulti.TabPages.Remove(Tab_Other); - } else if (SAV.HasBox && !tabBoxMulti.TabPages.Contains(Tab_Box)) { tabBoxMulti.TabPages.Insert(0, Tab_Box); - tabBoxMulti.TabPages.Insert(2, Tab_Other); - // force update -- re-added tab may be untranslated - Util.TranslateInterface(this, curlanguage); + WindowTranslationRequired = true; } Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_Report.Enabled = Menu_Modify.Enabled = B_SaveBoxBin.Enabled = SAV.HasBox; + if (!SAV.HasDaycare && tabBoxMulti.TabPages.Contains(Tab_Other)) + tabBoxMulti.TabPages.Remove(Tab_Other); + else if (SAV.HasDaycare && !tabBoxMulti.TabPages.Contains(Tab_Other)) + { + tabBoxMulti.TabPages.Insert(tabBoxMulti.TabPages.IndexOf(Tab_PartyBattle) + 1, Tab_Other); + WindowTranslationRequired = true; + } + if (path != null) // Actual save file { PAN_BattleBox.Visible = L_BattleBox.Visible = L_ReadOnlyPBB.Visible = SAV.HasBattleBox; @@ -1028,8 +1033,7 @@ private void loadSAV(SaveFile sav, string path) else if (SAV.Generation != 1 && !tabMain.TabPages.Contains(Tab_Met)) { tabMain.TabPages.Insert(1, Tab_Met); - // force update -- re-added tab may be untranslated - Util.TranslateInterface(this, curlanguage); + WindowTranslationRequired = true; } // Common HaX Interface @@ -1052,6 +1056,9 @@ private void loadSAV(SaveFile sav, string path) // Refresh PK#->PK6 conversion info PKMConverter.updateConfig(SAV.SubRegion, SAV.Country, SAV.ConsoleRegion, SAV.OT, SAV.Gender); + if (WindowTranslationRequired) // force update -- re-added controls may be untranslated + Util.TranslateInterface(this, curlanguage); + // Indicate audibly the save is loaded SystemSounds.Beep.Play(); }