From c7f02bcc20d5c7d49f134e35ea3a1e0e772a4be5 Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Mon, 9 Mar 2026 13:11:23 -0400 Subject: [PATCH] GO: more tweaks to 30th Anniversary event handling --- .../Encounters/Templates/GO/PogoType.cs | 9 ++++++--- .../legality/wild/encounter_go_home.pkl | Bin 181356 -> 181848 bytes .../legality/wild/encounter_go_lgpe.pkl | Bin 35892 -> 35944 bytes 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs b/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs index d9cd9cdbc..4eb26f7ca 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs @@ -12,7 +12,8 @@ public enum PogoType : byte // Pokémon captured in the wild. Wild, - Wild20, + WildLevel20, + WildLevel25, // Pokémon hatched from Eggs. Egg, @@ -138,7 +139,8 @@ public static class PogoTypeExtensions public byte LevelMin => encounterType switch { Wild => 1, - Wild20 => 20, + WildLevel20 => 20, + WildLevel25 => 25, Egg => 1, Egg12km => 8, Raid => 20, @@ -206,7 +208,8 @@ public static class PogoTypeExtensions public int MinimumIV => encounterType switch { Wild => 0, - Wild20 => 0, + WildLevel20 => 0, + WildLevel25 => 0, RaidMythical => 10, RaidShadowMythical => 8, RaidShadowMythicalGOWA => 8, diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index fdbb490cbbb2d138a7302d7fa17a275576f18983..1ce5dbde006d9628ecd07d706303dc67288dba70 100644 GIT binary patch delta 9329 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 ZeZ}i)8fD-1mIVs&BY6t#OAG%B_W$A4uq*%o diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl index 4d575e707031e3cdbcc625f65baedb6301de2338..d2252d484555b7cc3c471e7498c0e05376bf87cd 100644 GIT binary patch delta 1023 zcma)4OH30%82)B==wp{ciIsa{4<3SUTBtC;YV)Wp_0|)=5ZCK*PO}@!L-(zO}nO&NZ)@G#V z3oNA70?s-h^DN*ad?J+914|7+aU-xo@SOu55t5sLQbIl91tI7qAECIJGA%$(D{#CG z(9Q$PgoO)~y9i8N0zMD|mw~Z%V9pP`y8={qAcU7wve;B_}G79evkFwjTl ze%d5R{58Nf0K6qs+#rtNx=D)@N(X^sL&OgQgCX*0Ky#S%5x_kPOIaZF>9@7dNfU0baWd^kMotClqpZ9%I&t#R?w$$ z;oVn8>Ob_NC&E?kkiN!!dewoCyXGZ%S&Zwa^G?!uH*ellpVFiG4^-~tiLCG)Ok=wU z?NF*riRl6ljZX`1nQE_iSZHTNEEE~yo1$l?+9$S(zo!yWSl&cq`H4+a?GtO|jhu*z z%A+(!%d++9$|>_)1gch(3vKd7tf_9N6uX8n&yrT-jdFQCR%HNsu-0GjzxFOY?M#Mn z)y-39V!7cgb?lJ7#a9*SjgtmH=k1hsU1NI7dJ0cbzr=mOu%6qJq2Ko_dP(a~m8Z)I zNgQtb;Z(UzO`KHZ1l%mgIG#e#SZ30ORkBc}WZO5aOxmQ1dZ_9B?b#Yl)pLyd$ieOfFG9>@i+4 sk#dRIP%X9Zwj}m~_95Hhu8oAE@0u@2`^8f$< delta 940 zcmaJ;OGs2<7(Ms?qjP7jlUI@)Lnlj%93>KF(V_-H3zwRTIrxe+A6br%$kLqAtg(m` zZVMp;sTL9Tz~5aWErKFu69jF7vcg6saM7ZLL1)y7nTRf&pYJ>0`JOj2sm@KR&t{ZB zUj?vESSo>XB245|0n^ohvj%ugl%D`5h@V7OEl^B6B$|BG5zad1)B`CE!2U*{vk7=W zOrB)kDWI-4zy&Uo9|Fn()C5^;m~kR90<2wO(@_q66?l0K7z+VyW5B^1 z0`SPkYOhcLB6 zgPzR}S#;r0zijEu(mfv&`~$g}iZIJ^kMg~hdq2)TW-jF2(S>1&<;v#0X-WbS+?Oht zF_E9m_euUhob8kM+%|>8OhGjGrr>Fu-7MD&zon9Jdu#c6kF3Vo%`)Pxv5+V(DdM}} zahVe(u z=DJYDfcdsPLxz2oYQo9f^~<{0rhkr!T@Blry+iyV4mW-`bfM|7sieoBrKCHPR;+6B ziZy6=*;cHIx=PFRcmGJSkkmE;oT$G?Q_^=)s@S7aJNeX&n4IpttMLln!RS5f2AAXP z4`%U@Bj(G_p`z&FH-vIN(8B4nl4C#7EFAgum%k?SMi&!BM(BNl$Ot`>Q)6NA8_b*L AT>t<8