Roaming Pokemon doesn't delete away after user fled.
This commit is contained in:
parent
a455a5ca16
commit
e5bd91e4b4
|
@ -3,6 +3,7 @@
|
|||
Public Class Battle
|
||||
|
||||
Public Shared Won As Boolean = False
|
||||
Public Shared Fled As Boolean = False
|
||||
|
||||
#Region "StartRound"
|
||||
|
||||
|
|
|
@ -661,6 +661,7 @@
|
|||
BattleScreen.BattleQuery.Add(New TextQueryObject("Got away safely!"))
|
||||
BattleScreen.BattleQuery.Add(New EndBattleQueryObject(False))
|
||||
Battle.Won = True
|
||||
Battle.Fled = True
|
||||
Else
|
||||
BattleScreen.BattleQuery.Clear()
|
||||
BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())
|
||||
|
|
|
@ -954,7 +954,7 @@ nextIndex:
|
|||
|
||||
'Shift the Roaming Pokemon.
|
||||
If RoamingBattle = True Then
|
||||
If FieldEffects.RoamingFled = False Then
|
||||
If FieldEffects.RoamingFled = False AndAlso Battle.Fled = False Then
|
||||
Core.Player.RoamingPokemonData = RoamingPokemon.RemoveRoamingPokemon(RoamingPokemonStorage)
|
||||
Else
|
||||
Core.Player.RoamingPokemonData = RoamingPokemon.ReplaceRoamingPokemon(RoamingPokemonStorage)
|
||||
|
@ -962,6 +962,9 @@ nextIndex:
|
|||
RoamingPokemon.ShiftRoamingPokemon(RoamingPokemonStorage.WorldID)
|
||||
End If
|
||||
|
||||
'Reverse this variable temp >
|
||||
Battle.Fled = False
|
||||
|
||||
'Add the Pokefile to the visited pokefiles list.
|
||||
If IsTrainerBattle = False Then
|
||||
If TempPokeFile <> "" Then
|
||||
|
|
Loading…
Reference in New Issue