From a57e12db592ee0992022a4e3a9dbe003cea932d0 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 30 Jul 2021 13:06:15 -0700 Subject: [PATCH] Remove unobtainable encounter slots from gen4 tables --- .../Moveset/EncounterMovesetGenerator.cs | 16 ---------------- PKHeX.Core/Resources/byte/encounter_hg.pkl | Bin 78792 -> 78732 bytes PKHeX.Core/Resources/byte/encounter_ss.pkl | Bin 78220 -> 78160 bytes 3 files changed, 16 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs index 0bf7ebba7..ed78ba2da 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs @@ -373,8 +373,6 @@ private static IEnumerable GetSlots(PKM pk, IReadOnlyList ne { if (!IsSane(chain, slot)) continue; - if (slot.IsUnobtainable()) - continue; if (needs.Count == 0) { @@ -407,20 +405,6 @@ private static bool IsSane(IReadOnlyList chain, IEncounterTemplate return false; } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static bool IsUnobtainable(this EncounterSlot slot) - { - switch (slot.Generation) - { - case 4: - if (slot.Location == 193 && slot.Area.Type == SlotType.Surf) // Johto Route 45 surfing encounter. Unreachable Water tiles. - return true; - break; - } - - return false; - } - [MethodImpl(MethodImplOptions.AggressiveInlining)] private static bool IsUnobtainable(this EncounterStatic enc) { diff --git a/PKHeX.Core/Resources/byte/encounter_hg.pkl b/PKHeX.Core/Resources/byte/encounter_hg.pkl index f4e8e3a1bb8df75fbf7a4b0217f933f7438808c0..b1b73fa0cd5a58d52a09f4782748afba8b8db775 100644 GIT binary patch delta 1816 zcmWmEacrDp7y$6+i?TDd-LlO(&UCU^Er-sQSeRs_WTc{rMTU_s8Y_m1hLPHJSu+=o z3_}waE;Lh8$z&rHmuRFo6h%eFM8zc=ii)D5!OtJR@4kM0-sgLs=Y8)gM`{X3YI5z{ z-bkj8i^$H2Xrss&n^F-4hDjYC(aZ?xxe*&FP^IOBh*4Tmo{wlU}Mox|il6;^c@Xx;VrnsZ(^r5F0WPJ2=2m>Q9x3anj2qqMN4WilB3a7q5)y zqkWY%^k*X`s5{G~$dfudVldYjv2Jxl#~MLQP`6ePqjaCAz;#}JenjI1#&)5x(a8W+ ziW`iW+KUuH7ky2NxJ1{Kn4#@b@eFQ^n4;mbh+L~nFLjqkRGM{jh2Sf7+#=vAMX~v6 z)n21&MyR<~90mHBpzbwAnR|^ zB?DB+Y||+dlx~)U^evLmP24KScE#OhEu9RIz1^1HVHzE#!9GT4zSDWR%l>zDT5z`o z3{WL=kC(CKUJDqZ=00(h8SK&-YwtG&X4tV)r@M4Y*KTKtNg8|PW}3<#g+5?M>7YO7 z(va89gU0-jF+XA&3_ofwA9K%vCnR~&R47rU;i-sLdKo3vYZ_0R2HgxYMMu%LJSz`F z%+OeplaA-?f4|ElP0xEsW1mj<>y%Cg$iCn!^rC6JN<1dP#M47=~9jxDM)$e{-sQ<&cVJ{VG|Fo6l>G?}@e_O*84YQh{m(BlJL$2Zy z|2mNjQc02+J|>BwW0NS)Nn)C8Dv36Vj4?VliILhQD)YpqlbB`gf+V)n$6>}7id`&r ziP)t{)MS!~WnxbgTQ8Qr`Xm=e-PAAl0*Yi#Poi!`5)Ef0(Mm6)q*f+=R>hu~#Ckdz zph{+yHQ6Lu$TP$YnRDbM)0o8GbH!67vnGj66xQf;=i|F}uRgeH&crhZFW$fB;r{?# CU8bM_ delta 1821 zcmWmEe{7s{7y$6+b5g`+dYGbRLBuF6>4*X&RGln_9DR(DJtd-* zeN?Dg7}2ya@-ggYmWFBz=%aR#0_dScERGmHRU8c&ar9BUL>xVoh@}x-9ATQXPO~W! z|9{p*^fOLonF8rvmXAm+kJv;PN0=skx^5VuIUBKyL;OVD84@v0W`#s_vuULw=&ZBx z>WBf_*I2_~eZ(Z$wI)S@^f?j5d_%;B^CCLd31X6Lqaa4MDow5FYQ(%r=59stkoznG?-xAX_cFWBy<%bpeh$E+i z!MscTZrwa;%#RuK6Q)7wNoV<#dk#G#$+M6e(^IF7C2AH7cu(7k7VP+3I|H|wBVns>bP&q|rs2^4o&2LILVmf5s(hUVhm}Bs5 z&q~Jnj-=$?wb6T~LU-9wzHgdze<06?J}D9vdsgx~a#Li2>W^$nJN=B4{#ZA()5|ES zPduZY+^3G>GryJ375Rl1(wBY{l!&iPf!VM99=ekls*4A z|FTQ!U)|8b45{N1mn7y+NMd$g5)D;JiJ2e7bM>ENu(BvU6jOnb~3;OHH(wT zWW+8NTO)RP5>448Hmnd^E0%%UBp(xQ>Q*MPjXuWMdS((WbxE|XN}`uh(yNnbrj>1H zC(+3eQ`D}phL-vy3XCvE<66(pm6NRvNtDkQPwhJ2=~;Jt5~YL3PF%A8>8ti<_ikL3 MEI*h!u>0}<0QG;VApigX diff --git a/PKHeX.Core/Resources/byte/encounter_ss.pkl b/PKHeX.Core/Resources/byte/encounter_ss.pkl index a0793bcafee4e10cf1d91611cfa8336dd96afd7f..34b9d46abc578ff08784e4d71637f39e7a7da2ec 100644 GIT binary patch delta 1808 zcmWmEeQexg902g|FRE&4>$1)|>t>6_x+%HIMB^<(!y=V5(XcR73=JV$cA=r!m6Tkf zV&NnwIaD-JG_qI|B^4)%qNb6HG)&YK6%`eSBNaaT<8$}ByXX17Jx@FEUDfols?7fV zZzYS>5zQw>bdhJ8j+%%pMXFAY*vTZd%OcvyGE4g@5mU6+M)WgIoN5hS^dBiRb zGD)n6Xk8JR81t}5bDa(3X;`TMvJ|N>w#qu1>#ZYC!)oiuQlvu9X%UB*XX6@4nK}O6 z5K*8+?OFxWyEYTCh z*xnpb-V)KWHDV71N_3tr$GLK3yo{$TqGg*!6lgrpShpMN`3k&1f>xbgs8fnmNL{4Z zOLTdu?l{OKiWCa|*F;Q^?obp%*Q)k9 zRnu_2BFHgAnU-DlQ=mld28B~~qeP@BGkTL^Xu3IKH#zEWasH()W4u*jdKo2qn=Yx4 z+7r>uJT12ia)%&y3PO%4+PlTLOL1f=QlaN=m+T(XV3=7N?sa$AxzDurIsfc_8>o;< zOU69I_t`+h{Q{GvrblNF=!`yQXnWAaNFUHClYMUYLlV)H1g|)63Y6%4RdRN|W-k+mbo{ymqz;=V zgUnDjY8`#-dPCkfkDvdzvwPbZ>1C8@rrr_oU0pKtUc^!ACybDOw!iN?20jq0W#!-p7uQj!!&Ki9_wDa*(CO#v?u-asJ&N@=Q~v5e|_iEaidth9EOwX3aNlf>lO zBqr8byWUz-8?0qyLz0O(56x#tz$`~MC9!a35=~7>>?X$)^UR%?61 zOj^lF4iyy(4YMuLP;xjFH5C|G|_R5GXMJkVu*v16aOCwszGDF)j5tFo4Mf6jk;#h0wB+nEz%Ob8} zkO?Z5M>H>wOpLi%prP6Z@}yQsfGkDIjIFeehE>*)C$-u-vJ@%Pb6ms$=BQiaP^SNX zt%(?-MD3dTp)=HBSx5~^&*AQ)Z);K6-1i7WM*BuE-{}=BXYD}7BNn`O;YT+T((!p zn$(q&AjdR|G`8E%5G8U~Nu0{79YmT%Mz56&_18sokfY{$^DlL1;|&g`mr=4es**BI zoe?{jqwyv|ZWiPgLC7&lTbCHON{%c=%JkgkA-i2S7-5Fg9iAPw?bNNE=AYeV17(`J z9mX6ZciBMdZh^^Cl~&n3Dx;5STJO~{()X#9iC$0l{SKy=A}tT7wojt;Q(%#F=0Vl; zYcuT+X(6i~F-uCsfFO)APt%}H>}8hP$Lu4Y^E0FBafi`End!WEPpFnY#%O-hcTb5m zWd3QFNt&PbB@@rce%O1u8KL1>fu8e_?J|O1r?>&i* zJBZx-;(cIzWIuF2A7_{ZK?NN&|6Vu4Oi}f*3h82qNn+AxbdY15_{3*4d}@53 z`3Zh5$uB%BUwKx@Ql!k-*T(UUj(+R?VIBS6x*v>;%FL`bbBJv}Y9(zyscy~#LgUYp zVTdtCfAw4b&HR5ie`*)ZpWTd8^@sV>Pv4)4`^z5YssCFMP0N$m!7$U5R#>~z+SS&sNupw1 zqHJr|Tf4zphBqXcm~~Tof&<8ts!gKiq$KL=lIS4EB$X#8QAh2@B%0}Fgc(xx_H0U` zjeZI&k~&RHQk#?5-Do{Cq_!lno$QwVzbu)~4}6(V4V<}RUGnC@qsz|PH{AB{e`?#U A7ytkO