diff --git a/2.5DHero/2.5DHero/Pokemon/Monster/Pokemon.vb b/2.5DHero/2.5DHero/Pokemon/Monster/Pokemon.vb index 5ffe260dc..4e5647c9e 100644 --- a/2.5DHero/2.5DHero/Pokemon/Monster/Pokemon.vb +++ b/2.5DHero/2.5DHero/Pokemon/Monster/Pokemon.vb @@ -1637,7 +1637,36 @@ Public Class Pokemon Me.HP = Me.HP.Clamp(0, Me.MaxHP) End If End Sub + ''' + ''' Returns the important save data from the Pokémon to be displayed in the Hall of Fame. + ''' + Public Function GetHallOfFameData() As String + Dim Data As String = "" + Dim SaveGender As Integer = 0 + If Me.Gender = Genders.Female Then + SaveGender = 1 + End If + If Me.IsGenderless = True Then + SaveGender = 2 + End If + Dim shinyString As String = "0" + If Me.IsShiny = True Then + shinyString = "1" + End If + + Data = "{""Pokemon""[" & Me.Number & "]}" & + "{""Gender""[" & SaveGender & "]}" & + "{""NickName""[" & Me.NickName & "]}" & + "{""Level""[" & Me.Level & "]}" & + "{""OT""[" & Me.OT & "]}" & + "{""CatchTrainer""[" & Me.CatchTrainerName & "]}" & + "{""isShiny""[" & shinyString & "]}" & + "{""AdditionalData""[" & Me.AdditionalData & "]}" & + "{""IDValue""[" & Me.IndividualValue & "]}" + + Return Data + End Function ''' ''' Returns the save data from the Pokémon. ''' diff --git a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoPokemon.vb b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoPokemon.vb index 49d2e8dcf..ed91e50e0 100644 --- a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoPokemon.vb +++ b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoPokemon.vb @@ -459,7 +459,7 @@ For Each p As Pokemon In Core.Player.Pokemons If p.IsEgg() = False Then - Dim pData As String = p.GetSaveData() + Dim pData As String = p.GetHallOfFameData() newData &= vbNewLine & count & "," & pData End If Next