Consistency in SwitchPokemonQueryObject
This commit is contained in:
parent
36a5ebf936
commit
f50a62d3fc
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue