From 61df1981ce0a111aa7ad320dc1eba44bb14654f4 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 27 Dec 2023 00:29:16 -0800
Subject: [PATCH] Include Ability in fixed pkl, beldum raid moves

Encode beldum's raid moves manually since it's the only one with empty moves (default -> learnset fetch). See pkNX for associated workarounds in pickle build.
---
 .../Templates/Gen9/EncounterFixed9.cs         |   4 ++--
 .../Templates/Gen9/EncounterTera9.cs          |   5 +----
 .../wild/Gen9/encounter_fixed_paldea.pkl      | Bin 19560 -> 19560 bytes
 .../wild/Gen9/encounter_gem_blueberry.pkl     | Bin 2712 -> 2712 bytes
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterFixed9.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterFixed9.cs
index c4feec97a..464687eca 100644
--- a/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterFixed9.cs
+++ b/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterFixed9.cs
@@ -20,7 +20,7 @@ public sealed record EncounterFixed9
     public Ball FixedBall => Ball.None;
     public bool IsShiny => false;
     public int EggLocation => 0;
-    public AbilityPermission Ability => Any12;
+    public AbilityPermission Ability { get; init; }
 
     public required ushort Species { get; init; }
     public required byte Form { get; init; }
@@ -54,7 +54,7 @@ public sealed record EncounterFixed9
         FlawlessIVCount = data[0x04],
         TeraType = (GemType)data[0x05],
         Gender = data[0x06],
-        // 1 byte reserved
+        Ability = (AbilityPermission)data[0x07],
         Moves = new Moveset(
             ReadUInt16LittleEndian(data[0x08..]),
             ReadUInt16LittleEndian(data[0x0A..]),
diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTera9.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTera9.cs
index 98c8156c8..898b01a3b 100644
--- a/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTera9.cs
+++ b/PKHeX.Core/Legality/Encounters/Templates/Gen9/EncounterTera9.cs
@@ -201,10 +201,7 @@ public sealed record EncounterTera9
         };
         SetPINGA(pk, criteria, pi);
 
-        if (Moves.HasMoves)
-            pk.SetMoves(Moves);
-        else // Beldum
-            EncounterUtil1.SetEncounterMoves(pk, Version, LevelMin);
+        pk.SetMoves(Moves);
 
         pk.ResetPartyStats();
         return pk;
diff --git a/PKHeX.Core/Resources/legality/wild/Gen9/encounter_fixed_paldea.pkl b/PKHeX.Core/Resources/legality/wild/Gen9/encounter_fixed_paldea.pkl
index 2ed2331f9b42f8829f7a7dbd5dea6e7bf0f8bf7f..23b14a7e1caad8915a2af7a3cbc2b1ee07c158cb 100644
GIT binary patch
delta 602
zcmaDcgYm@-#tqk*ME^5D!8#yqz`)?gocjO&<~K~gnHm3Ye!*tX$oPM<21hrL+`{1x
zBw09<5qdTN^`tQ{IDqs_uHh_4$bd{MU|?`(<^jrZaCIYOKzd3U7#zWRR&c2U&Ah;s
ztcl`|ItB(OX1@Oju^kKy4GaucU_CM1)<CDt;ARFnZ4M8Tb2c4dVCZCEa07cmg!eTI
z<NrxQw}Fc92+0GzGx?7wNT-EZKFDt?Bo~7W@R2?aBt>N214$OyWS~TbY%n9jxm$qF
zEoTIJkrNm!7vzH3P^Hc=GPr{LxY<Hg9AsR88d4x^IK;rf&BS01cJ>`LkmVBUU|aWS
z06CL?X!xU==FG(4%`6NwEk+ZhY?3z6ZJSSMgH3**1N3P+BP&BB!+i#jPxF}=e3@B*
z!5g7l4peqQx1I^)00SUr@(BZ^5Z?s!!g`QmP|Ri+h69ytK4APD6e26k)e$ZLsbgc7
s2dkU>1X%{`5oSpEZ&t843=G)GPi#Q8#@P0=0Xc7+f$_Lm#3h6S0FouWZ~y=R

delta 602
zcmY*WIY<LR6n(Q3!{*Q;#tV(HF$YnISR{Dht%WB<P$6CL=(G_VQCmqNxJ?Q>n^YQH
z3k!>&g()o3Ss2hFV8DQ_prHS62%AjtnVJ9JoA=(7QlgX+nHQx6)pbRiFt8*y|DczZ
zA1R=htYbnz3#dt|x9T!gi!EVdGKARz#u=j>+78SPv+V(M(n%fFo-{j**#{;JOxo@z
z&b&Plq}$43<Pk6_oBpa-xVi&QfFT1DcMOxXltZ$#3uld-n=Eh&%o-Nljh_~QbJr^k
z7hGPlqy4rpGTOS!-qIbHOt8@TMAhB(Mb+X-P-Djv6Q<l-5^*5NqK#t7cgL*tt!IH5
z_NYgD+n8>}R}(_!0dOdY7_tjKe!Sgpym}v?gZ3R*u4kK4FfW^lEgs~t^AKs%b0LHI
zy^ox3iw11q4eWGR!J@QKyzBiWP|x=tD=Z*P2Q3$_N&JQ^T=Ovh?9RX%jp^CJ4^AW<
s@tX>G&MLjeoK~#u7)E3zf4wLANWp5w5q>p3dS<0Vd5Zo~cTcaX|C3sPtpET3

diff --git a/PKHeX.Core/Resources/legality/wild/Gen9/encounter_gem_blueberry.pkl b/PKHeX.Core/Resources/legality/wild/Gen9/encounter_gem_blueberry.pkl
index fdf47f66299a92c003a93bd56762a6556295cf83..523514c844aabe536e68306b048e3c6568e0748b 100644
GIT binary patch
delta 14
VcmbOsIzx0r1uLWC=1Nw1RsbV71OEU3

delta 14
VcmbOsIzx0r1uG-N=1Nw1RsbS$1Kt1t