Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-03-21 17:48:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sanity check ability index on transfer

Browse Source 
Passing an entity with AbilityNumber of 7 no longer throws an exception on transfer logic
This commit is contained in:
Kurt 2025-11-15 22:24:15 -06:00
parent d138755ed0
commit 9f21f45f25
6 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PKHeX.Core/PKM/HOME/GameDataPA8.cs
View File

@ -201,7 +201,10 @@ private void PopulateFromCore(PKH pkh)
var pi = PersonalTable.LA.GetFormEntry(pkh.Species, pkh.Form);
HeightAbsolute = PA8.GetHeightAbsolute(pi, pkh.HeightScalar);
WeightAbsolute = PA8.GetWeightAbsolute(pi, pkh.HeightScalar, pkh.WeightScalar);
Ability = (ushort)pi.GetAbilityAtIndex(AbilityNumber >> 1);
var index = AbilityNumber >> 1;
if (index >= pi.AbilityCount)
index = 0;
Ability = (ushort)pi.GetAbilityAtIndex(index);
var level = Experience.GetLevel(pkh.EXP, pi.EXPGrowth);
this.ResetMoves(pkh.Species, pkh.Form, level, LearnSource8LA.Instance, EntityContext.Gen8a);

5
PKHeX.Core/PKM/HOME/GameDataPA9.cs
View File

@ -273,7 +273,10 @@ private void PopulateFromCore(PKH pkh)
Obedience_Level = pkh.MetLevel;
var pi = PersonalTable.ZA.GetFormEntry(pkh.Species, pkh.Form);
Ability = (ushort)pi.GetAbilityAtIndex(AbilityNumber >> 1);
var index = AbilityNumber >> 1;
if (index >= pi.AbilityCount)
index = 0;
Ability = (ushort)pi.GetAbilityAtIndex(index);
var level = Experience.GetLevel(pkh.EXP, pi.EXPGrowth);
this.ResetMoves(pkh.Species, pkh.Form, level, LearnSource9ZA.Instance, EntityContext.Gen9);

5
PKHeX.Core/PKM/HOME/GameDataPB7.cs
View File

@ -203,7 +203,10 @@ private void PopulateFromCore(PKH pkh)
var pi = PersonalTable.GG.GetFormEntry(pkh.Species, pkh.Form);
HeightAbsolute = PB7.GetHeightAbsolute(pi, pkh.HeightScalar);
WeightAbsolute = PB7.GetWeightAbsolute(pi, pkh.HeightScalar, pkh.WeightScalar);
Ability = (ushort)pi.GetAbilityAtIndex(AbilityNumber >> 1);
var index = AbilityNumber >> 1;
if (index >= pi.AbilityCount)
index = 0;
Ability = (ushort)pi.GetAbilityAtIndex(index);
}
private static IGameDataSide? GetNearestNeighbor(PKH pkh) => pkh.DataPK9 as IGameDataSide

5
PKHeX.Core/PKM/HOME/GameDataPB8.cs
View File

@ -126,7 +126,10 @@ public void InitializeFrom(IGameDataSide side, PKH pkh)
private void PopulateFromCore(PKH pkh)
{
var pi = PersonalTable.BDSP.GetFormEntry(pkh.Species, pkh.Form);
Ability = (ushort)pi.GetAbilityAtIndex(AbilityNumber >> 1);
var index = AbilityNumber >> 1;
if (index >= pi.AbilityCount)
index = 0;
Ability = (ushort)pi.GetAbilityAtIndex(index);
var level = Experience.GetLevel(pkh.EXP, pi.EXPGrowth);
this.ResetMoves(pkh.Species, pkh.Form, level, LearnSource8BDSP.Instance, EntityContext.Gen8b);

5
PKHeX.Core/PKM/HOME/GameDataPK8.cs
View File

@ -201,7 +201,10 @@ public void InitializeFrom(IGameDataSide side, PKH pkh)
private void PopulateFromCore(PKH pkh)
{
var pi = PersonalTable.SWSH.GetFormEntry(pkh.Species, pkh.Form);
Ability = (ushort)pi.GetAbilityAtIndex(AbilityNumber >> 1);
var index = AbilityNumber >> 1;
if (index >= pi.AbilityCount)
index = 0;
Ability = (ushort)pi.GetAbilityAtIndex(index);
}
private static void RemapMetEgg(GameVersion version, ref ushort met, ref ushort egg)

5
PKHeX.Core/PKM/HOME/GameDataPK9.cs
View File

@ -208,7 +208,10 @@ private void PopulateFromCore(PKH pkh)
Obedience_Level = pkh.MetLevel;
var pi = PersonalTable.SV.GetFormEntry(pkh.Species, pkh.Form);
Ability = (ushort)pi.GetAbilityAtIndex(AbilityNumber >> 1);
var index = AbilityNumber >> 1;
if (index >= pi.AbilityCount)
index = 0;
Ability = (ushort)pi.GetAbilityAtIndex(index);
TeraTypeOriginal = TeraTypeOverride = TeraTypeUtil.GetTeraTypeImport(pi.Type1, pi.Type2);
var level = Experience.GetLevel(pkh.EXP, pi.EXPGrowth);