From f8a1d26694c90f6ba236b20ca8ae3d38632ec705 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 15 Jun 2018 23:41:07 -0700 Subject: [PATCH] Fill empty ability values with ability1 update handling that checked for this case to instead check for equivalence to ability1 instead of 0 was generating a PGF with ability[1] = 0, which is not correct. Just fix the binaries to behave and get rid of all the workarounds since future tables don't have missing values. --- PKHeX.Core/Legality/Checks.cs | 10 ++++------ .../Legality/Encounters/Data/Encounters5.cs | 5 +++-- PKHeX.Core/PKM/PKM.cs | 2 +- PKHeX.Core/PKM/Shared/_K3.cs | 2 +- PKHeX.Core/PersonalInfo/PersonalInfoBW.cs | 2 ++ PKHeX.Core/PersonalInfo/PersonalInfoG3.cs | 2 ++ PKHeX.Core/Resources/byte/personal_b2w2 | Bin 53884 -> 53884 bytes PKHeX.Core/Resources/byte/personal_bw | Bin 40080 -> 40080 bytes PKHeX.Core/Resources/byte/personal_dp | Bin 22044 -> 22044 bytes PKHeX.Core/Resources/byte/personal_e | Bin 10836 -> 10836 bytes PKHeX.Core/Resources/byte/personal_fr | Bin 10836 -> 10836 bytes PKHeX.Core/Resources/byte/personal_hgss | Bin 22352 -> 22352 bytes PKHeX.Core/Resources/byte/personal_lg | Bin 10836 -> 10836 bytes PKHeX.Core/Resources/byte/personal_pt | Bin 22352 -> 22352 bytes PKHeX.Core/Resources/byte/personal_rs | Bin 10836 -> 10836 bytes .../Controls/PKM Editor/LoadSave.cs | 2 +- .../Controls/PKM Editor/PKMEditor.cs | 10 +++------- 17 files changed, 17 insertions(+), 18 deletions(-) diff --git a/PKHeX.Core/Legality/Checks.cs b/PKHeX.Core/Legality/Checks.cs index 056d2a86d..d9c12e7f2 100644 --- a/PKHeX.Core/Legality/Checks.cs +++ b/PKHeX.Core/Legality/Checks.cs @@ -1098,8 +1098,6 @@ private void VerifyCXDStarterCorrelation(PIDIV pidiv) private void VerifyAbility() { int[] abilities = pkm.PersonalInfo.Abilities; - if (abilities[1] == 0) - abilities[1] = abilities[0]; int abilval = Array.IndexOf(abilities, pkm.Ability); if (abilval < 0) { @@ -1226,8 +1224,8 @@ private static bool IsAbilityCapsuleModified(PKM pkm, IReadOnlyList abiliti } private bool? VerifyAbilityGen3Transfer(int[] abilities, int abilval, int Species_g3) { - var abilities_g3 = PersonalTable.E[Species_g3].Abilities.Where(a => a != 0).Distinct().ToArray(); - if (abilities_g3.Length == 2) // Excluding Colosseum/XD, a gen3 pkm must match PID if it has 2 unique abilities + var pers = (PersonalInfoG3)PersonalTable.E[Species_g3]; + if (pers.Ability1 != pers.Ability2) // Excluding Colosseum/XD, a gen3 pkm must match PID if it has 2 unique abilities return pkm.Version != (int)GameVersion.CXD; int Species_g4 = Info.EvoChainsAllGens[4].FirstOrDefault()?.Species ?? 0; @@ -1239,7 +1237,7 @@ private static bool IsAbilityCapsuleModified(PKM pkm, IReadOnlyList abiliti if (Evolutions_g45 > 1) { // Evolutions_g45 > 1 and Species_g45 = Species_g3 with means both options, evolve in gen 4-5 or not evolve, are possible - if (pkm.Ability == abilities_g3[0]) + if (pkm.Ability == pers.Ability1) // It could evolve in gen 4-5 an have generation 3 only ability // that means it have not actually evolved in gen 4-5, ability do not need to match PID return null; @@ -1250,7 +1248,7 @@ private static bool IsAbilityCapsuleModified(PKM pkm, IReadOnlyList abiliti } // Evolutions_g45 == 1 means it have not evolved in gen 4-5 games, // ability do not need to match PID, but only generation 3 ability is allowed - if (pkm.Ability != abilities_g3[0]) + if (pkm.Ability != pers.Ability1) // Not evolved in gen4-5 but do not have generation 3 only ability AddLine(Severity.Invalid, V373, CheckIdentifier.Ability); return null; diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters5.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters5.cs index a28491f9b..eb5a39ed7 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters5.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters5.cs @@ -90,8 +90,9 @@ private static void MarkG5DreamWorld(ref EncounterStatic[] t) { foreach (EncounterStatic s in t) { - s.Location = 75; //Entree Forest - s.Ability = PersonalTable.B2W2.GetAbilities(s.Species, s.Form)[2] == 0 ? 1 : 4; // Check if has HA + s.Location = 75; // Entree Forest + var p = (PersonalInfoBW)PersonalTable.B2W2[s.Species]; + s.Ability = p.HasHiddenAbility ? 4 : 1; s.Shiny = Shiny.Never; } diff --git a/PKHeX.Core/PKM/PKM.cs b/PKHeX.Core/PKM/PKM.cs index 8cc2cf097..541a899ad 100644 --- a/PKHeX.Core/PKM/PKM.cs +++ b/PKHeX.Core/PKM/PKM.cs @@ -668,7 +668,7 @@ public void RefreshAbility(int n) int[] abilities = PersonalInfo.Abilities; if (n < abilities.Length) { - if (abilities[n] == 0) + if (abilities[n] == abilities[0]) n = 0; Ability = abilities[n]; } diff --git a/PKHeX.Core/PKM/Shared/_K3.cs b/PKHeX.Core/PKM/Shared/_K3.cs index 5a6f44031..52d4d2c93 100644 --- a/PKHeX.Core/PKM/Shared/_K3.cs +++ b/PKHeX.Core/PKM/Shared/_K3.cs @@ -26,7 +26,7 @@ public abstract class _K3 : PKM, IRibbonSetEvent3, IRibbonSetCommon3, IRibbonSet public override bool WasGiftEgg => IsEgg && Met_Location == 253; // Gift Egg, indistinguible from normal eggs after hatch public override bool WasEventEgg => IsEgg && Met_Location == 255; // Event Egg, indistinguible from normal eggs after hatch - public override int Ability { get { int[] abils = PersonalInfo.Abilities; return abils[abils[1] == 0 ? 0 : AbilityNumber >> 1]; } set { } } + public override int Ability { get { var pi = (PersonalInfoG3)PersonalInfo; return pi.Abilities[pi.HasSecondAbility ? AbilityNumber >> 1 : 0]; } set { } } public override uint EncryptionConstant { get => PID; set { } } public override int Nature { get => (int)(PID % 25); set { } } public override int AltForm { get => Species == 201 ? PKX.GetUnownForm(PID) : 0; set { } } diff --git a/PKHeX.Core/PersonalInfo/PersonalInfoBW.cs b/PKHeX.Core/PersonalInfo/PersonalInfoBW.cs index 8ff40d1c9..76657e7be 100644 --- a/PKHeX.Core/PersonalInfo/PersonalInfoBW.cs +++ b/PKHeX.Core/PersonalInfo/PersonalInfoBW.cs @@ -86,5 +86,7 @@ public override int[] Abilities AbilityH = (byte)value[2]; } } + + public bool HasHiddenAbility => AbilityH != Ability1; } } diff --git a/PKHeX.Core/PersonalInfo/PersonalInfoG3.cs b/PKHeX.Core/PersonalInfo/PersonalInfoG3.cs index 9b918b2d6..5fbc96b7f 100644 --- a/PKHeX.Core/PersonalInfo/PersonalInfoG3.cs +++ b/PKHeX.Core/PersonalInfo/PersonalInfoG3.cs @@ -69,5 +69,7 @@ public override int[] Abilities Ability2 = (byte)value[1]; } } + + public bool HasSecondAbility => Ability1 != Ability2; } } diff --git a/PKHeX.Core/Resources/byte/personal_b2w2 b/PKHeX.Core/Resources/byte/personal_b2w2 index dbe6c87e3eea722f48833ab081a8a9167447b9c3..9236ad139126af222e915650dbda70d6df897399 100644 GIT binary patch delta 2374 zcmbW2eN5F=7{~89S1v>f%1z`&uRww3%SB;=$xHKsZ|4{+Dr{P}hKhE9C4VyS+rMJYzY1o>9NlEzv%9d^YksGYF*^66l)T~j@bFkGP)gRqIKHuk@-}&A1 zyq)v=t=0KktFv*nnBP>c3GIwwEqqXd8MGWA7Qic+wU+0lj&f%>_$QoG98SlirsVOc z3WVW@qS093j1zhAJGF>Hi0HdliS;REW>68KrHG?xWE%ShwYtCf`1P$`%aJuR&uMtyBO4hP4 zjv$a@gY3ys(Gy@t{RzD zmlF%nZaK^}>LH5Ajq^o+wM@icEi(=aisM8f{KdR=i0C#$#pG)~B1_n(QX(}G)BISH zE~r$VN4ZoLj}FSLEEGScV${>*Q3U*D+`b{A2Sb*=m0FBL zJuweot<+qgDXVOYZCX`pJMQLcTd$mQCB|b9oyzg(Cys(=4YPunj1J<1kZZNf$wBd2 zCC84%p|u12ce~ap>Gk5`x*(5MRs_WabGw4hm&Ung_}!>ynaiI&K>Ug91<2pPtRu$a z+6Emx>6PWSPv+-3T#gT%P09D5u=0K}2^%Uk@k2{j72742hpTKP-&I-Hvo|U!C7${? z8Lb=dmkSr7k7kxGMPjv*Nl92!tz2HOcCwMI_rLxT&~lv+j14x+YBBW zk#9#Nvq8~TI~&-;3q-mD8?~&e!pcT|&_)BQ^skLdKKUdTHCX{kAb{&6bP%WSRdU-l z)Q}uKYP$DEhKUmN9?-;ugUoWvcFSR=QExmY`DQr8xf@~{-Kwb)_4Zgop} z@E~rzrC1((dqBSM0`5JoSSpVX$o>2A$O*;La$-Q#V0TCpdzmKT9ZJC_47{s}-jmGQ zlYFQ7+Xh7 z8!F4gi0#nCvJOs+In_}bCbP2QfHaFwNj}%Mah$MC@ zaTw*Dn%Lf{<*{She^I_L#O3s>vo1fT?PJRAA_WO^m*^7VO^NwF#-AkNXw{EpgHGl5r81A_7 zx2XPM(e(>KjxPFA3f{Ol^-uGgKTSpFbNMAcrEgu*d}-Xeq(lPpFWX+P?4675%Q2kM zFE87ed1ghgovG}-Gcz0C_r~)D8Q!NxBpY>oZZ=!`f?@}xn3CtkIMU2|29Zfvw&C!JyRt=QN(72jNq6OkCc%9oGo&-eq6Xcj2| delta 2372 zcma)-eN0nV7{+gVr4WZWzi`T|Ujx5O#0ZNpmN68)-DrXe37T#Jty(9A>SUu%3{Eu7 z#@E^E)I}0U{HPOR?}CfbqSS#3wn8$O_=hGKW8&OQX2KR`*v|8m>HgT3^^f0s&U2pg z-uJxsw0+v5K5bDOHX4*hhgBi~3`+>j0Q$%Q(qe>CMRpmj2}+uRk3pTIsLHg)nUh4h zCr12~A1{`xFG;6eh2KvOs@8brwW!~?QZb2&l*wX``l8q|YKlS8>qd1Oq_@z79mh=f zBx_?a?kCN0a;!V!P8+3^_yQJ6$X0TQToDhwiM&J3AA@Z>$4rlv3%-e19sqUAq)d}h zQN-3H4dEPvuD)zX{t`1Rt>$h6)+%SfqK9UY0{t+Xgp-IhC@E2ly1dB4H+h< zz6HfW2FPJh*WTudy7Hf2nYiayW}H}V40i;6m7^weTkc#G**I>c9 z<{tWCTg!eNiG~MjQDRyl47Rg~;@iz$2g$pRSzPOx#kGF1{%HN@cu0*M z-mo3T>)N}l$XzXGmWiA-clcsWv3&^A8Eab;>K02d96XPz=7A+O?P(q}F zYLc5_lUp;%GU+XZF!E*_|77i!ige`GfzR#sc^iu4nE z{P=DZ?1l9x`4H68KjwXN?879m&qH_Wehco0{QyM&0oLaBViNTJioD|7r+inoI(Fzt zG(3ogCH1%myX&Q2TqhG7SX*fW7Fwf|-y66!uaQAS!`*0D&_uD4K@T;Jj*(PmVM7>nC{gW}oEDb&|8yr#Ndq zH6XXu_>n0L>Qhg%1p{A0vYY{{&fx9YTfv+*nCjZ1zrRIikwyRNti_PPzYqC`6PKYF z6?rSCh~EOq=-+gmrmZ?(OJX}xmb9ZwdRu!Te+6SNu$tA;(0l>Cdw2oH^owlg-itIu zq9G{=gCht-AV|X>K^m+bSn+jGyVpT2^%8?88oDp}=Fnl4X9arK=UBKX~e=x~+# z8S3q#zrK^f*8Qe1hhkx{b&o7$2!DuMIzrDB^VN|g8KUkAht*fP`1lG#+qGxb|Np%I zcr*(C*JqB@)e%~yelT*#!`E2UNEv@S)jyc-UgwP;+dE4f>Y0n9V|f3sAzEDAi{>Bi zWuu?;Ldw3ui7Wi72;CTuT|eC5nW3x;Q*nhyl*QsvcnUnR5h}5f4B?Hi#O8?nQ55Mn yt@tI9A5nd2k@)5&-I1GgC-pIG>eJ$t2AYg&j3Gf(1m}wTefR?!?n8ZAf7+j2y|rin diff --git a/PKHeX.Core/Resources/byte/personal_bw b/PKHeX.Core/Resources/byte/personal_bw index 78c862814ee2345d1f4a00bfcd04062daf2dc8a0..db73853e2764a7809a0e71cd790ccab07fd970f0 100644 GIT binary patch delta 799 zcmW+!O-NKx6!zRVqcb^a&iI2i)`bPnEA6RGLq)2hGLm>7BIAqdF;Ijs;I9Db~ zHp?VQMY$rmS3U#~pudM>AYAoV+M=PgiVMxps+8ZYsvxk21~QIbVS;q@m<2xc*C^ke zH5P<$yT*nmv{9=NqID7>9FiGKhB#vk*Fu&j6iSm1xK5>|W4m5JkLxEGxKMAj#g~N> zz-cZllE}sNlTu`<$sry4O(pWRDGYn@YeZ&>)ttjW8s)11XNjK{S$Z(qqym24BpP$+ zeRH1!cA?p#RAP%I!w+1X)F20!FDY9Ymp{p2ZL~?N!FC(=k@xB!2BnzUVF9C5M;n8m zq;(1SotWRPbX@CJ^BcJN2Ef4j9xk*$=uspe#g9(LErF`xcCV`OK8vMNXp2M4F?L%7 zXy97E1rF>Tu;Cn?A5hm&2{cCH@Qz-M z2!0bs#yB|f?U?j~yT>gyJ4-Y!Hr9pF`!=LgctXUGhc6x`UlZH3W{DO=Lm6f$VJ zeX+#`U3d|+h>#D247w=DyDqvY$Y3zR3!`p?iY}!0dEszA-uFE3^E~hKorO2r0zFHb zqAbapCSGVZaYH|;Dx#*F)RcepkWN)^(>lFfR`kS8Ye`k4w(~T;gl#6hi#A5rZ3lKx zWohARpruVC;8@NqSk2!w>-M!bVYRdJ3Y8TV4!?5t$ z#iU>MvAAK7xL7gDg`W-?-(SZ}q@x3}2{+Nnckb`-RrNw)!wZG(E>^hTl~M`t?@*c! zk@R7uAwK}m{S4Uhdq`W6#*xc#oI46BXMlCb0w}fvG$b3n%n&;chENa;`5>d#f+g`v zvs$cY6$>vRpY+Xx%XJD^ErblJAL zTn%f)9zY>9&q*vlqJTv--#`$)$Mi=#ip^rP0OHOfL!OnG>|HxpGJs{S}Yc Ps<^~(Ww$(79asMYNUG#e diff --git a/PKHeX.Core/Resources/byte/personal_dp b/PKHeX.Core/Resources/byte/personal_dp index bbc6f343d41e107f6132dc9f35a99b5c0e7da08e..671fa7899990a9814212c844dcac8c1679ab209c 100644 GIT binary patch delta 1430 zcmXZcJ4~Bb6bEo$V}dJLi3uN=m^X=p(+jQ>9(9P#(}0sY1f`}%RjM*DAcesLX=$4Q z$sHn<0rF?CR0akH1|*_>NM*1hh71f03=ENA$dJJU15z_EFyw!Zy8L{6KYiADU2p7| zjUBT(YKGVH&e}{!J}ud>W@PP9_)O4htQkc{T~fDb4UTD&ItY40<~kx?InB}}mTAh} z@m3krjlBv>KUNgXSD5ozx=Q^hiEi2VmoYc7c+JvH8pn}(Njq?-N}QtYc%^QO?nzaP zk4LQm2mU}vBRS3l{;n`#ly6w-1gSd|{MqpNX0<#&s%A=IoZRG-e`?@mGV8V0+`~a_ z!Q1xZ8Y`Ho3z<6P>vE>bJ*>OoHBo%1x72q_jL{^XtFLJX_VoNCZA2i<4kE73sjGAZ zCAF+N4bspdbwPBC4eSAHZITvkH|0$HP4g+kvu5d*zeVh!?e1(#Na|Z^m-@D72*>R? zQ;EoJYbxFB?O%PS7e^iP<+7vO@Wsx%Qs2zo0+T;u9EJaDv4;*|mL{=6yRfh4pVXkW zrWpx3jCplkJ)k2vSL-_^PSH{1)eZHq^VHO=aWVG0Lb4)VTn1dxBqC8RiJOfwvjM#R zMl#r=Tn{x6+cj+{#VjXKjulKF7VcS-Mv?a6J-v<#T7ky<*4#pxS}dxYqI-0o6MKxa z9!veb1@izaz1H-*`@NieJr4RTJ?}d;kKDs=nT8)%aoNVm11UJGF4Jo4&?G+4Fns-D ztpAh-9!eaiwU|>^sShQ!OxxfjtQo`*eTW4bL@`m|Ta8I+eL9(Ayh&wz4gv%JneW~V z%8Q-q%wUf3TgGEJQ~g8IlOEcHS#?F-S3jx2VR@RMVa%)R)QbZ;j&qtp{fITKNYNI~O0cS#%Vu=32e+vi86Cq|)oRGRNc-n@>G#4Ie`n$WB<{jp>eYDF9{pVxemMDT5 z8Cyb~SJyMU+~U*|+2#Bb8C7O-*Sy5lq%|+y$Wx{@iP#jcgZq5yU-=E^nG9m#nRKkE zzE>}36pi2OuqgkZXdat-azw+pq(9+KR-B@L;1zAgHvJ7JS-Ed-ryVRzOJx!j|Bs~p cvuRuV!c*n(w2n9IdER-vk^Ud9c`7`fFE|y5F8}}l delta 1426 zcmXZbKTH}?90%~@PlVwTu^vh*Dp3=$qNNrswODCIr43qQu_cX39T*%K7)a{iKw<}z zIzW$sqznuW4kR@_k}{Bn!GVE+fx$!u1_uTQlR7vs^nJf^`S9NF_r1G!?{WE}E??B8 zS9DS)p=6?i_?;HyK@HprREG|R=srE6je8ZQd*d7;BMPuIuOt8YSAMvip~)RNSa{+*oh? zDaJW^PH(7v4)q{S(gM`#b3Ct>2W|5_ZgD)1MtPp+UR^-rdO>WiR(sB6biF7!U%&`W z(IUN|#zl19i#QYcCB|MFqiI^99jf?{@zXfX`LGuI66(Pv99V%i#uQb4^-mo5GFmPg zT}I%H;}$jh(e=<>dQ8joidtSHOJ)G~kEO!`_o$w!g7s?i%7vI7a zIeJcSsQm-#L7JomTBmn(B7#hq9?(RAzAW8oLHf>-< diff --git a/PKHeX.Core/Resources/byte/personal_e b/PKHeX.Core/Resources/byte/personal_e index b3c0bab023a9bd519cbf82def284582d9068ebb7..77957529d6c0cd084a8ef8e52903d030453ec5d4 100644 GIT binary patch delta 3977 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 U&E;hi#i_@% delta 3977 zcmZWrU2GKB6}~&Ovun?cXLiH#V{EV23_t6@ZJZ%xARXH~fQFwTFs?nN8k{U?M@mh| zhRSW^RuEej&5v;^U{W`tJfKu4YD*>BxD@BZ|UrF?CT&*g+UC z8oW@*Wa{4qL0IFu%S3S*i+fUd?!FXqG%;2-iYCa3^`|OJ+@t+h1XCz~^cK^pzeXYxnH)qJc=3y}wq{k798pjd~2H z(H7t+bHgf@MWMc>LTX_A(&-J1fgYakhK?r+;h!d!VDV+*xPcrQaDnFsW)wo|eVAm? zIM|ZSuAx1KYqfGKqt3c%_5%9}1B{8;HWrs8)WeqAAUbfC>)2uFWkhePLQW+)%%h)4 z7(Z~Pg>3N+;GWXbqL%gr*g6RUG^6A`@8@&mqVA^V#30fNG){3C}kV!t*}8t1^;< zIo#ycQ7bEkucGQu7C^2js|m9myEf@%MLzq`U5LepWh*f?*yHZlGpcFcMJyfK&6=8Y z7Jne0g0m_Lo;$4IxtHnvhJricTqhi}16LI7KbK(NN91neE~zhr^l24$UQ*HN;AYFI z234*o-tTho>l2a|G)UI3R6OTc3rbJ7piQux!EGbeprwVMpP=9UtuAN2OB@e~142}gEnhDvO1)4aj&aGARIQ6)2&yLz4A_w(@P9X)PS^?v zoMt6nwJg)(kOF*|Hn2_u18h>lPdc_!t3s3dm>k}~6c*2EXvMsSHp6mkw;XuDF^L{v ztPV*c%WGL&(67NM@Lw1P(TT7{5dV|Jr|uh)u78J;FpR?R1T;+X^QBmv%i$@Ta_B4I zIP_Z8kD{EwzrYd(&z22I(4efq2S;k*kiavZ1UJNa+m{q4sF6F#%GUFQ~KGwWD-iap1!%F}6G-%70{Eb4l>z}O!*kYfRJ z35!e1Fqi53%=av} zW(BIiFVA5Nsk|~E7Jpo@K<+^S4Oq4OWjGLuqUzKfdorKr|47QI(=Z@y+8HL19Xx(0 zcswr@U#v8k47gLE)aI6B(m|i-+1&$QP5ZJpO?K7GF4J`=<&%ufc0JwI^|Yq(za&Wq z>M})H3Af)0EJ)bxh0|r*&NO+ilp6eaKT0efFH1cLy{zw#XDD_KaQ_Lf4sBm zJ$P1H@qM@zg8}*lerS(Wp&UL)8dbef4#={n+7|?nZ~S7CAPFlJW;7cKQhgK$()#5+miFBT`n#;lm#+?3LMM?+sIx>TxKic5I9tHtW5hANz+pPP8aP;+6X>aA+S0&R z!0!gm*hql2IkyCh?-IuY;sC@SbN!ktr}(GIHQxz=r`iO}bj`A9LTx&UDTt*6s7=2e zZ8_SGwt&foWf;X`K3}&`?sXb!s3SsX-OzPyJD(q)z_eMwAbfMgF;5%-ac&d}MHu0> z03ob}5f0x?!_r|i%lzMH*3*G{?CZerK?>NW>zH9iV`z7xC^=I~z9JW!os*s#~d6HzjSP9yhdWW6v&l9eWiU!$T~tlu(c1(kX}^v^>{w zTnqZCJq60JDRxzN(^3ZdDVCMznU0gs@*hD{g*D!4h)qo}u$H>0pLQYB^)8$O+SlOw z)-_lv$JU^??$SRG)*$K|h#sZq8wUO}Z=lS+wT+74W!o%!OsMZo?o}xCR9Y)iY&x*uxxp_Hx<_81MZyb0Luul@5IvZGgpP1D3 z$N?2l&@$o)T2XY;u>u3>V1G8t-$%P1V)0GlxJMkY?Z-O@H}5{E3fKRD*?^IBr4$ax z!0$liRDHNYV$5H{fFGv8$_CV9cta!WOyBD*KY+)IB1KH`*(sl1|$bTE{BrLv6 z95)s?YJTWcLtWu>jjV^RB0!U+PErX8zt^(EdTuvgH>IyGavYK-PbSGabl#+32#+;ckVQjlY^}cvDunETg E2OMOWLI3~& diff --git a/PKHeX.Core/Resources/byte/personal_fr b/PKHeX.Core/Resources/byte/personal_fr index 0e90accb0a299c0ff2da108efc2ec86dd84bf65c..0a8d2b85123dbf5c371078cab73e30fdaf40444a 100644 GIT binary patch delta 3977 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 delta 3977 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 LVDZ?-rWpG#f9RTK diff --git a/PKHeX.Core/Resources/byte/personal_hgss b/PKHeX.Core/Resources/byte/personal_hgss index 55da3503c5465ecc622eeaab8db0ad1168da60aa..cca533668e8bed60c4935b327a038b7089ddd47f 100644 GIT binary patch delta 1458 zcmZwHJxp6y6bJBLV~Q(TiHQv+4xdgWoL+F9V5mcQe45~-4ne7@QIx6-3`k}0Kw8>n zKyrsjWq|w{ER}(QfguV}A5s|@7&0(0xDrDoJY>k=fdQ!*7#R9LM;W{Pe0;Co(>dp! z`^v9P`L$UcGb3w-(ArE`el6LsW_0aP_(;%htQkXAT~fDb5M}Dn5CWdCxrCTUR&&(B zGEKX$JaxwOV7JE7_ccZH1?Ie#u2LWNMYrnx!xn)=hd&6PKg`{BzpQ8df7X}?s+TPd1*kh5_`z_0vtIU(>X}mn$5*)XR}da% zv)*9MEgUoyJsnThSi($W*fgThm^XFqVdG_wiQ`?9rQWMzf;xDrzM!4h)%EwZ8U6@c zh?F{~uF_HLt5r30O*%TPE{JaF8k@jkTck(ZEqRlA*?PjT(kkupwTVd@b!XecQr}Wk z>f54Wl%si5i`aE*YTexRpS`9RN1gKLytBvf!LFN9-^|S-ldmw2!}q0_q=T5H4pwM4 z_H_M&8nD*1Vt|fdUR_rY=qOIrrY?!obPNS`Lp|&|F~K!X#$I<=W~7_bfD7s%7Uz_> zxi~W$#EY*agI&t`Q2mJ=(}DejVp!v2nSCOF>i|VH6 z9^K}NJwPRCsjs(a?qH?Yntpe$mnYwZgFZ`7`%cV#_wZ|`;lo8r#xZtB3eKs^v>vah zgLgCnZ@-x6KcW7+5~pYb=G0Z{#lBjl9S99rGlXG!7Yj6i(m;_Eu1( z&+tz)2>;-}=9`y8@?@7fGn8lihVeKms&81DlB6w|RaewK^@AE1k=+3r!MwUoJvgBE za7wdi8nvb!X&Og?j$lJQR6kPQ`7tr8F3~Y;sb%$o_8^v)d~)h?x@a6Z@TT!FFMeX2 zt)55fo~3iN7OUz$bx@^0A~YdWF-(8r_acPli7+!NO-S8mT3OB{i$oZEmpudZizIL7IRGR%dCa#q>N9rFwqlh!2SEfbZck-qrZO5#}fxN8zpP~N%>mQI~ delta 1454 zcmZwGKTH}?90zbXNoBZ1ET__nf2t;8MSHbqsl`ewR&3A`dsfnzl!3v4fq|qB4kUIk zsRQ&FNb11g;9#ujnUsNn!GVE+CJZJrI5;pknAE|6q3`>RW0w!_{eItj_wF87Ju+91 z%;`C^DU(n#kuLm>3id!5+z9l3GYrv9x=*WjD!NS)*Xk|_IgO^EaVWK#Md_pkjf<9T zVa$SYniiqauzW)(c@K>|tOG8-Fyi{J$Oe4J>t&ad(XwN-ixHQ4|<>x z?d!txZ4RKcPpbnWue%1()&{>=#H2Ee$?fnnJh*!V*~kdiu5)aCjEaXw=`JnMOKKZM z#z!}3mX_!hb-0lU&;;G1W%qf;+@Tl7@FJ^Y2sNo|T#OBEocr2&g2oBGptAZ?REjF< z4Hf&1KgBplPw6#vPM{v7Nt%a7WrF8b_n>W^#1gxcXcQ)S?xiU-uBODxHOkMqjiwhR z*9)l86g{M8)H02(I*l`tUt;W~F`A}D+MtRL89$BFoDX|(&Y&Kg!GYyx)+Ccj|1)6M z07i6xv=Xc?8}GS+at=eE=^ChOtf z_%M_e+%LX@D{}OdUQ_1>)Ppoh^Rz;5>5zs@m~PPnTGMda$E%7SU&WJQl)D?@iux+F PeuN$xrM5Lx{-^Q}s@P|} diff --git a/PKHeX.Core/Resources/byte/personal_lg b/PKHeX.Core/Resources/byte/personal_lg index 0e90accb0a299c0ff2da108efc2ec86dd84bf65c..0a8d2b85123dbf5c371078cab73e30fdaf40444a 100644 GIT binary patch delta 3977 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 delta 3977 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 LVDZ?-rWpG#f9RTK diff --git a/PKHeX.Core/Resources/byte/personal_pt b/PKHeX.Core/Resources/byte/personal_pt index 6f97210333ab6dde6165241e150cb9985dce0a88..e6a3e24fbd532f554d68ae6c79639846ffa2513d 100644 GIT binary patch delta 1456 zcmZwHJxp6y6bEo!V~Q(Ti3tzvIOa2vaC*UYf}swQIDMFX$s3U zn)eT5u3_;rOE+l}RrP{)<5q(>O}p?y-4@;B zhITKHI{XfN{-8#3ob&%#XTqpmwbThvcQo*W;q%Q#d0uT~N?{ydUs6{((l|53_?vs`Kh9 z9ml>}Q=J>q&{4H0x|JL30c&lQ7Hzi{O!8IR3B%Ji>6WiuOwcZOu01IAEp0d%Mi!PZ`JH`$A06Va(AKR%kEw^!%e5 zu-3F;h>l@FT~`n2IL_2ikHi_8MoHaJ4|`5b(;63JuQw`4A2UEIk`IF%R9tub74pmr2>i=shVouP)O@yrwCGT(}%r1jZUf$=7l@j37h|6?A% z8j%-!)Y*{&tI*_3; zl;{{X)I;?X<&95^IdzGqv85iVm$VPjjO3G7mosIPl6i+Fg1q+e33hq`$p@Cs(|W9` z`!t0b{SnTjEX64OiT@T3mM4SEs4^*apYya6kt`P;S^BHHnB^VjwSBn53;p{e-j)~w zIT_oKx}dJ-cDTivC$h_>Co-zs)Q)+M%PDJ~yV0+i))eB?ybkWO>A&SSoToB~;#28Z zMSZ89(-$RlQJ+cI505Wz+fVSg9C$uNgW&*`o1rYU4Fdx|9^M)?mf;twwTA3 z%)F%~n^dyV9{i38_CW>Q3UrqRhUpePpys`bE?dR5y4#AJM$^zZvbI@7>9iG%%hnxX z+=g+6mY~tFeMczu0F45z(mOibhI)i<(?e*~+6HW*;gS^HF5&Sm3FWZ#vsFwQ?YK&j zQ3}Xk@PI-GCe;ousrFDzes}6t(a3cnTkhJiwtUW7I`wEbZkOy{7x7AWJ0j-}L~M_s zN;l{(J*AgadW?*Z#%YF@XoD)f$OLEt8u?!C!Ehh8=&(;b`A7eS7}oodv=2ZpG-3li zc)zVdln$slDDt{{2yJcXD|V$ig2~;;bG*1`6xrw~?p^2D{sa{-jnO??q*qiPL&i@x zX^xiZHFbE93DP9prxnjd*3zXH$FY&-I6_V8o)BY0o8Y>3pQ3R}FR7&d5|xsQdPBu} z6VEWt(=&QQos+1CXo?n~QJv&@)xBujr*MnCDKv^xJooZ68rRcebB)RiE~Du~$^8;) zG)<4_IknB8tIps|q*oaGXq;wfi8iR>MK^oq)Fknz(^nxkcUO&xEM3DP9prxkijUGvC<=@vbpCT&u8 z5E+f8gF85F$AUO*LtWrL``)1+rx{wJ4XP}n8=z^cqNf+}N69bZt#4R$hL8wBBNgKJ zTU!!;4&&QQ5 z$kQ`=L!BQ{5787Y&?>#7!x}OXx=jyhO~YZItSNe84R3}~{(gij>TA&c33_Ra%Im27 GPvsxt6lY-o diff --git a/PKHeX.Core/Resources/byte/personal_rs b/PKHeX.Core/Resources/byte/personal_rs index b3c0bab023a9bd519cbf82def284582d9068ebb7..77957529d6c0cd084a8ef8e52903d030453ec5d4 100644 GIT binary patch delta 3977 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 U&E;hi#i_@% delta 3977 zcmZWrU2GKB6}~&Ovun?cXLiH#V{EV23_t6@ZJZ%xARXH~fQFwTFs?nN8k{U?M@mh| zhRSW^RuEej&5v;^U{W`tJfKu4YD*>BxD@BZ|UrF?CT&*g+UC z8oW@*Wa{4qL0IFu%S3S*i+fUd?!FXqG%;2-iYCa3^`|OJ+@t+h1XCz~^cK^pzeXYxnH)qJc=3y}wq{k798pjd~2H z(H7t+bHgf@MWMc>LTX_A(&-J1fgYakhK?r+;h!d!VDV+*xPcrQaDnFsW)wo|eVAm? zIM|ZSuAx1KYqfGKqt3c%_5%9}1B{8;HWrs8)WeqAAUbfC>)2uFWkhePLQW+)%%h)4 z7(Z~Pg>3N+;GWXbqL%gr*g6RUG^6A`@8@&mqVA^V#30fNG){3C}kV!t*}8t1^;< zIo#ycQ7bEkucGQu7C^2js|m9myEf@%MLzq`U5LepWh*f?*yHZlGpcFcMJyfK&6=8Y z7Jne0g0m_Lo;$4IxtHnvhJricTqhi}16LI7KbK(NN91neE~zhr^l24$UQ*HN;AYFI z234*o-tTho>l2a|G)UI3R6OTc3rbJ7piQux!EGbeprwVMpP=9UtuAN2OB@e~142}gEnhDvO1)4aj&aGARIQ6)2&yLz4A_w(@P9X)PS^?v zoMt6nwJg)(kOF*|Hn2_u18h>lPdc_!t3s3dm>k}~6c*2EXvMsSHp6mkw;XuDF^L{v ztPV*c%WGL&(67NM@Lw1P(TT7{5dV|Jr|uh)u78J;FpR?R1T;+X^QBmv%i$@Ta_B4I zIP_Z8kD{EwzrYd(&z22I(4efq2S;k*kiavZ1UJNa+m{q4sF6F#%GUFQ~KGwWD-iap1!%F}6G-%70{Eb4l>z}O!*kYfRJ z35!e1Fqi53%=av} zW(BIiFVA5Nsk|~E7Jpo@K<+^S4Oq4OWjGLuqUzKfdorKr|47QI(=Z@y+8HL19Xx(0 zcswr@U#v8k47gLE)aI6B(m|i-+1&$QP5ZJpO?K7GF4J`=<&%ufc0JwI^|Yq(za&Wq z>M})H3Af)0EJ)bxh0|r*&NO+ilp6eaKT0efFH1cLy{zw#XDD_KaQ_Lf4sBm zJ$P1H@qM@zg8}*lerS(Wp&UL)8dbef4#={n+7|?nZ~S7CAPFlJW;7cKQhgK$()#5+miFBT`n#;lm#+?3LMM?+sIx>TxKic5I9tHtW5hANz+pPP8aP;+6X>aA+S0&R z!0!gm*hql2IkyCh?-IuY;sC@SbN!ktr}(GIHQxz=r`iO}bj`A9LTx&UDTt*6s7=2e zZ8_SGwt&foWf;X`K3}&`?sXb!s3SsX-OzPyJD(q)z_eMwAbfMgF;5%-ac&d}MHu0> z03ob}5f0x?!_r|i%lzMH*3*G{?CZerK?>NW>zH9iV`z7xC^=I~z9JW!os*s#~d6HzjSP9yhdWW6v&l9eWiU!$T~tlu(c1(kX}^v^>{w zTnqZCJq60JDRxzN(^3ZdDVCMznU0gs@*hD{g*D!4h)qo}u$H>0pLQYB^)8$O+SlOw z)-_lv$JU^??$SRG)*$K|h#sZq8wUO}Z=lS+wT+74W!o%!OsMZo?o}xCR9Y)iY&x*uxxp_Hx<_81MZyb0Luul@5IvZGgpP1D3 z$N?2l&@$o)T2XY;u>u3>V1G8t-$%P1V)0GlxJMkY?Z-O@H}5{E3fKRD*?^IBr4$ax z!0$liRDHNYV$5H{fFGv8$_CV9cta!WOyBD*KY+)IB1KH`*(sl1|$bTE{BrLv6 z95)s?YJTWcLtWu>jjV^RB0!U+PErX8zt^(EdTuvgH>IyGavYK-PbSGabl#+32#+;ckVQjlY^}cvDunETg E2OMOWLI3~& diff --git a/PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs b/PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs index f3342c01e..bd215315e 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs @@ -355,7 +355,7 @@ private static int GetAbilityIndex4(PKM pk, int[] abils) return 0; if (abilityIndex >= 2) return 2; - if (abils[0] == abils[1] || abils[1] == 0) + if (abils[0] == abils[1]) return pk.PIDAbility; return abilityIndex; } diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index 3a5fa1ec5..22ea27d66 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -392,14 +392,10 @@ private void SetAbilityList() private static List GetAbilityList(PKM pkm) { var abils = pkm.PersonalInfo.Abilities; - if (abils[1] == 0 && pkm.Format != 3) - abils[1] = abils[0]; + if (pkm.Format == 3 && abils[1] == abils[0]) + abils = new[] {abils[0]}; - var list = abils.Where(a => a != 0).Select(GetItem).ToList(); - if (list.Count == 0) - list.Add(GetItem(0, 0)); - - return list; + return abils.Select(GetItem).ToList(); ComboItem GetItem(int ability, int index) => new ComboItem {