From afb5271e3422940d0675d5f831f1f747324d027f Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Wed, 3 May 2023 15:53:21 +0200 Subject: [PATCH] Fix Max Ether --- P3D/Pokemon/Items/Medicine/MaxEther.vb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/P3D/Pokemon/Items/Medicine/MaxEther.vb b/P3D/Pokemon/Items/Medicine/MaxEther.vb index 04b47d595..4c88621bc 100644 --- a/P3D/Pokemon/Items/Medicine/MaxEther.vb +++ b/P3D/Pokemon/Items/Medicine/MaxEther.vb @@ -42,6 +42,19 @@ Namespace Items.Medicine SoundManager.PlaySound("Use_Item", False) Screen.TextBox.Show(t, {}, True, True) + Dim s As Screen = Core.CurrentScreen + While s.Identification <> Screen.Identifications.BattleScreen AndAlso s.PreScreen IsNot Nothing + s = s.PreScreen + End While + If s.Identification = Screen.Identifications.BattleScreen Then + Dim TempBattleScreen As BattleSystem.BattleScreen = CType(s, BattleSystem.BattleScreen) + + TempBattleScreen.BattleQuery.Clear() + TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle()) + TempBattleScreen.BattleQuery.Insert(0, New BattleSystem.ToggleMenuQueryObject(True)) + TempBattleScreen.Battle.InitializeRound(TempBattleScreen, New BattleSystem.Battle.RoundConst With {.StepType = BattleSystem.Battle.RoundConst.StepTypes.Item, .Argument = Me.ID.ToString()}) + Core.SetScreen(TempBattleScreen) + End If Else Screen.TextBox.Show("The move already has~full PP.", {}, True, True) End If