From f50a62d3fc523adfb03c4995bf17aebb6f85fb06 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Thu, 23 Feb 2023 21:13:46 +0100 Subject: [PATCH] Consistency in SwitchPokemonQueryObject --- .../QueryObjects/SwitchPokemonQueryObject.vb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb b/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb index c515bc03d..449c1dca3 100644 --- a/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb +++ b/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb @@ -95,6 +95,14 @@ Core.SetScreen(selScreen) Else SoundManager.PlaySound("select") + TempScreen.BattleQuery.Clear() + FinishOppSwitch(TempScreen) + Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16) + Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16) + cq2.PassThis = True + TempScreen.BattleQuery.AddRange({cq1, cq2}) + TempScreen.HasSwitchedOwn = False + TempScreen.Battle.StartRound(TempScreen) _ready = True End If End If @@ -107,6 +115,14 @@ Core.SetScreen(selScreen) Else SoundManager.PlaySound("select") + TempScreen.BattleQuery.Clear() + FinishOppSwitch(TempScreen) + Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16) + Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16) + cq2.PassThis = True + TempScreen.BattleQuery.AddRange({cq1, cq2}) + TempScreen.HasSwitchedOwn = False + TempScreen.Battle.StartRound(TempScreen) _ready = True End If End If