parent
e6a50f64ca
commit
efa001061f
|
@ -721,6 +721,7 @@
|
|||
|
||||
Core.SetScreen(selScreen)
|
||||
CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
|
||||
CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
|
||||
End If
|
||||
If New Rectangle(700, 540, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then
|
||||
Me.GTSSetupScreen.loaded = False
|
||||
|
|
|
@ -207,6 +207,7 @@
|
|||
|
||||
Core.SetScreen(selScreen)
|
||||
CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
|
||||
CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
|
||||
Me.OpenedSelect = True
|
||||
End If
|
||||
Else
|
||||
|
|
|
@ -293,6 +293,7 @@
|
|||
|
||||
Core.SetScreen(selScreen)
|
||||
CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
|
||||
CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
|
||||
|
||||
Case 2
|
||||
Me.QuitTrade()
|
||||
|
|
|
@ -65,6 +65,7 @@ Public Class PartyScreen
|
|||
Public CanChooseFainted As Boolean = True
|
||||
Public CanChooseEgg As Boolean = True
|
||||
Public CanChooseHMPokemon As Boolean = True
|
||||
Public CanChooseFusedPokemon As Boolean = True
|
||||
|
||||
Public Delegate Sub DoStuff(ByVal PokeIndex As Integer)
|
||||
Dim ChoosePokemon As DoStuff
|
||||
|
@ -585,6 +586,13 @@ Public Class PartyScreen
|
|||
Return False
|
||||
End If
|
||||
End If
|
||||
If Me.CanChooseFusedPokemon = False Then
|
||||
If p.OriginalNumber = 646 Then
|
||||
If p.AdditionalData = "black" Or p.AdditionalData = "white" Then
|
||||
Return False
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
Return True
|
||||
End Function
|
||||
|
||||
|
|
Loading…
Reference in New Issue