diff --git a/pkNX.Randomization/Randomizers/LearnsetRandomizer.cs b/pkNX.Randomization/Randomizers/LearnsetRandomizer.cs index 834e1757..1ba33b70 100644 --- a/pkNX.Randomization/Randomizers/LearnsetRandomizer.cs +++ b/pkNX.Randomization/Randomizers/LearnsetRandomizer.cs @@ -131,12 +131,7 @@ private int[] GetRandomMoves(int count, int index) return moves; } - public int[] GetHighPoweredMoves(int species, int form, int count = 4) - { - int index = Personal.GetFormeIndex(species, form); - var learn = Learnsets[index]; - return learn.GetHighPoweredMoves(count, Moves); - } + internal int[] GetHighPoweredMoves(int species, int form, int count = 4) => GetHighPoweredMoves(Moves, species, form, count); public int[] GetCurrentMoves(int species, int form, int level, int count = 4) { @@ -145,5 +140,12 @@ public int[] GetCurrentMoves(int species, int form, int level, int count = 4) Array.Resize(ref moves, count); return moves; } + + public int[] GetHighPoweredMoves(Move[] movedata, int species, int form, int count = 4) + { + int index = Personal.GetFormeIndex(species, form); + var learn = Learnsets[index]; + return learn.GetHighPoweredMoves(count, movedata); + } } } \ No newline at end of file diff --git a/pkNX.WinForms/Subforms/BTTE.cs b/pkNX.WinForms/Subforms/BTTE.cs index 1062f5c3..f2d581b0 100644 --- a/pkNX.WinForms/Subforms/BTTE.cs +++ b/pkNX.WinForms/Subforms/BTTE.cs @@ -499,7 +499,8 @@ private void B_HighAttack_Click(object sender, EventArgs e) pkm.Species = CB_Species.SelectedIndex; pkm.Level = (int)NUD_Level.Value; pkm.Form = CB_Forme.SelectedIndex; - var moves = learn.GetHighPoweredMoves(pkm.Species, pkm.Form, 4); + var movedata = Game.Data.MoveData.LoadAll(); + var moves = learn.GetHighPoweredMoves(movedata, pkm.Species, pkm.Form, 4); SetMoves(moves); }