tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistency in SwitchPokemonQueryObject

This commit is contained in:
JappaWakka 2023-02-23 21:13:46 +01:00
parent 36a5ebf936
commit f50a62d3fc
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb
View File

@ -95,6 +95,14 @@
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
Else Else
SoundManager.PlaySound("select") 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 _ready = True
End If End If
End If End If
@ -107,6 +115,14 @@
Core.SetScreen(selScreen) Core.SetScreen(selScreen)
Else Else
SoundManager.PlaySound("select") 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 _ready = True
End If End If
End If End If