Hopefully this'll fix some issues (description)
Pokémon without a CatchMethod or CatchLocation get defaulted to "Somehow obtained at" and "an unknown place" respectively.
This commit is contained in:
parent
8f1eb6795f
commit
4c92f343d7
|
@ -906,9 +906,9 @@ Public Class Pokemon
|
|||
Private _OT As String = "00000"
|
||||
Private _status As StatusProblems = StatusProblems.None
|
||||
Private _nature As Natures
|
||||
Private _catchLocation As String = "at unknown place"
|
||||
Private _catchLocation As String = "an unknown place"
|
||||
Private _catchTrainerName As String = "???"
|
||||
Private _catchMethod As String = "somehow obtained"
|
||||
Private _catchMethod As String = "Somehow obtained at"
|
||||
Private _friendship As Integer
|
||||
Private _isShiny As Boolean
|
||||
Private _individualValue As String = ""
|
||||
|
|
|
@ -402,6 +402,12 @@
|
|||
evolvedPokemon.Item = currentPokemon.Item
|
||||
|
||||
evolvedPokemon.CatchBall = currentPokemon.CatchBall
|
||||
If currentPokemon.CatchMethod = "" Then
|
||||
currentPokemon.CatchMethod = "Somehow obtained at"
|
||||
End If
|
||||
If currentPokemon.CatchLocation = "" Then
|
||||
currentPokemon.CatchLocation = "an unknown place"
|
||||
End If
|
||||
evolvedPokemon.CatchLocation = currentPokemon.CatchLocation
|
||||
evolvedPokemon.CatchMethod = currentPokemon.CatchMethod
|
||||
evolvedPokemon.CatchTrainerName = currentPokemon.CatchTrainerName
|
||||
|
|
|
@ -400,7 +400,15 @@
|
|||
|
||||
SpriteBatch.DrawString(FontManager.MainFont, "Catch Method", New Vector2(DeltaX + 360, DeltaY + 366 + 64), New Color(255, 255, 255, CInt(220 * _interfaceFade * _pageFade)))
|
||||
|
||||
Dim text As String = .CatchMethod.Replace(.CatchMethod(0), Char.ToUpper(.CatchMethod(0))) & " " & .CatchLocation
|
||||
If .CatchMethod = "" Then
|
||||
.CatchMethod = "Somehow obtained at"
|
||||
End If
|
||||
If .CatchLocation = "" Then
|
||||
.CatchLocation = "an unknown place"
|
||||
End If
|
||||
|
||||
Dim text As String = .CatchMethod.Replace(.CatchMethod(0), Char.ToUpper(.CatchMethod(0))) & " " & .CatchLocation & "."
|
||||
|
||||
SpriteBatch.DrawString(FontManager.MainFont, text.CropStringToWidth(FontManager.MainFont, 1.0F, 300), New Vector2(DeltaX + 358, DeltaY + 336 + 128), New Color(255, 255, 255, CInt(220 * _fadeIn * _pageFade)))
|
||||
|
||||
'EV/IV values
|
||||
|
|
Loading…
Reference in New Issue