Fix form names
This commit is contained in:
parent
6764062c79
commit
d2d937e336
|
@ -2280,10 +2280,19 @@ Public Class Pokemon
|
||||||
Return "Egg"
|
Return "Egg"
|
||||||
Else
|
Else
|
||||||
If Me.NickName = "" Then
|
If Me.NickName = "" Then
|
||||||
If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then
|
If PokemonForms.GetFormName(Me) <> "" Then
|
||||||
Return Localization.GetString("pokemon_name_" & Me.Name)
|
Dim FormName As String = PokemonForms.GetFormName(Me)
|
||||||
|
If Localization.TokenExists("pokemon_name_" & FormName) = True Then
|
||||||
|
Return Localization.GetString("pokemon_name_" & FormName)
|
||||||
|
Else
|
||||||
|
Return FormName
|
||||||
|
End If
|
||||||
Else
|
Else
|
||||||
Return Me.Name
|
If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then
|
||||||
|
Return Localization.GetString("pokemon_name_" & Me.Name)
|
||||||
|
Else
|
||||||
|
Return Me.Name
|
||||||
|
End If
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
Return Me.NickName
|
Return Me.NickName
|
||||||
|
@ -2295,10 +2304,19 @@ Public Class Pokemon
|
||||||
''' Returns the properly translated name of a Pokémon if defined in the language files.
|
''' Returns the properly translated name of a Pokémon if defined in the language files.
|
||||||
''' </summary>
|
''' </summary>
|
||||||
Public Function GetName() As String
|
Public Function GetName() As String
|
||||||
If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then
|
If PokemonForms.GetFormName(Me) <> "" Then
|
||||||
Return Localization.GetString("pokemon_name_" & Me.Name)
|
Dim FormName As String = PokemonForms.GetFormName(Me)
|
||||||
|
If Localization.TokenExists("pokemon_name_" & FormName) = True Then
|
||||||
|
Return Localization.GetString("pokemon_name_" & FormName)
|
||||||
|
Else
|
||||||
|
Return FormName
|
||||||
|
End If
|
||||||
Else
|
Else
|
||||||
Return Me.Name
|
If Localization.TokenExists("pokemon_name_" & Me.Name) = True Then
|
||||||
|
Return Localization.GetString("pokemon_name_" & Me.Name)
|
||||||
|
Else
|
||||||
|
Return Me.Name
|
||||||
|
End If
|
||||||
End If
|
End If
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue