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

Fix opponent switching shenanigans

This commit is contained in:
JappaWakka 2023-02-23 12:58:43 +01:00
parent 5a6711f126
commit 36a5ebf936
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -5381,7 +5381,7 @@
BattleScreen.BattleQuery.AddRange({cq1, cq2})
If BattleScreen.OppFaint = False AndAlso OppStep.StepType <> RoundConst.StepTypes.Switch Then
If BattleScreen.OppFaint = False Then
StartRound(BattleScreen)
End If
BattleScreen.ClearMainMenuTime = True
@ -8024,8 +8024,10 @@
Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
cq2.PassThis = True
BattleScreen.BattleQuery.AddRange({cq1, cq2})
If Core.Player.BattleStyle = 1 Then
BattleScreen.HasSwitchedOwn = False
BattleScreen.Battle.StartRound(BattleScreen)
StartRound(BattleScreen)
End If
End With
End Sub

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

@ -127,6 +127,7 @@
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
@ -140,6 +141,7 @@
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