Renamed the Appraisal1 field to Total, and the Appraisal2 field to Max.

PokemonGoIV/0Main.vb

@@ -52,9 +52,9 @@ Type aFindIVParam
 	nStarDust As Integer
 	nPlayerLevel As Integer
 	bIsNew As Boolean
-	nAppraisal1 As Integer
+	nTotal As Integer
 	sBest As String
-	nAppraisal2 As Integer
+	nMax As Integer
 	bIsCancelled As Boolean
 End Type
 
@@ -88,13 +88,13 @@ Function fnAskParam As aFindIVParam
 	
 	DialogLibraries.loadLibrary "PokemonGoIV"
 	oDialog = CreateUnoDialog (DialogLibraries.PokemonGoIV.DlgMain)
-	oDialog.getControl ("lstAppraisal1").setVisible (False)
+	oDialog.getControl ("lstTotal").setVisible (False)
 	oDialog.getControl ("txtBestBefore").setVisible (False)
 	oDialog.getControl ("lstBest").setVisible (False)
 	oDialog.getControl ("txtBestAfter").setVisible (False)
 	oDialog.getControl ("cbxBest2").setVisible (False)
 	oDialog.getControl ("cbxBest3").setVisible (False)
-	oDialog.getControl ("lstAppraisal2").setVisible (False)
+	oDialog.getControl ("lstMax").setVisible (False)
 	
 	oDialog.getControl ("imgPokemon").getModel.setPropertyValue ( _
 		"ImageURL", fnGetImageUrl ("Unknown"))
@@ -113,8 +113,8 @@ Function fnAskParam As aFindIVParam
 		.nHP = oDialog.getControl ("numHP").getValue
 		.nStarDust = CInt (oDialog.getControl ("lstStarDust").getSelectedItem)
 		.nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem)
-		.nAppraisal1 = oDialog.getControl ("lstAppraisal1").getSelectedItemPos + 1
+		.nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1
-		.nAppraisal2 = oDialog.getControl ("lstAppraisal2").getSelectedItemPos + 1
+		.nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1
 		.bIsCancelled = False
 	End With
 	If oDialog.getControl ("cbxIsNew").getState = 1 Then
@@ -220,8 +220,8 @@ Sub subLstPokemonSelected (oEvent As object)
 	oImageModel.setPropertyValue ("ImageURL", _
 		fnGetImageUrl (sImageId))
 	
-	' Updates the text of the first appraisal.
+	' Updates the text of the stats total appraisal.
-	subUpdateAppraisal1 (oDialog, True)
+	subUpdateTotalAppraisal (oDialog, True)
 	' Checks if the required columns are filled.
 	subBtnOKCheck (oEvent)
 End Sub
@@ -245,8 +245,8 @@ Sub subRdoTeamValorItemChanged (oEvent As object)
 	oText.setVisible (True)
 	oText.setText (fnGetResString ("AppraiseFromCandela"))
 	
-	' Updates the text of the first appraisal.
+	' Updates the text of the stats total appraisal.
-	subUpdateAppraisal1 (oDialog, False)
+	subUpdateTotalAppraisal (oDialog, False)
 	
 	' Updates the text of the best stat appraisal.
 	subUpdateBestStatAppraisal (oDialog, _
@@ -257,7 +257,7 @@ Sub subRdoTeamValorItemChanged (oEvent As object)
 		"It's got excellent stats! How exciting!", _
 		"Its stats indicate that in battle, it'll get the job done.", _
 		"Its stats don't point to greatness in battle.")
-	oList = oDialog.getControl ("lstAppraisal2")
+	oList = oDialog.getControl ("lstMax")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
 	oList.setVisible (True)
@@ -282,8 +282,8 @@ Sub subRdoTeamMysticItemChanged (oEvent As object)
 	oText.setVisible (True)
 	oText.setText (fnGetResString ("AppraiseFromBlanche"))
 	
-	' Updates the text of the first appraisal.
+	' Updates the text of the stats total appraisal.
-	subUpdateAppraisal1 (oDialog, False)
+	subUpdateTotalAppraisal (oDialog, False)
 	
 	' Updates the text of the best stat appraisal.
 	subUpdateBestStatAppraisal (oDialog, _
@@ -294,7 +294,7 @@ Sub subRdoTeamMysticItemChanged (oEvent As object)
 		"I am certainly impressed by its stats, I must say.", _
 		"Its stats are noticeably trending to the positive.", _
 		"Its stats are not out of the norm, in my opinion.")
-	oList = oDialog.getControl ("lstAppraisal2")
+	oList = oDialog.getControl ("lstMax")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
 	oList.setVisible (True)
@@ -319,8 +319,8 @@ Sub subRdoTeamInstinctItemChanged (oEvent As object)
 	oText.setVisible (True)
 	oText.setText (fnGetResString ("AppraiseFromSpark"))
 	
-	' Updates the text of the first appraisal.
+	' Updates the text of the stats total appraisal.
-	subUpdateAppraisal1 (oDialog, False)
+	subUpdateTotalAppraisal (oDialog, False)
 	
 	' Updates the text of the best stat appraisal.
 	subUpdateBestStatAppraisal (oDialog, _
@@ -331,7 +331,7 @@ Sub subRdoTeamInstinctItemChanged (oEvent As object)
 		"Its stats are really strong! Impressive.", _
 		"It's definitely got some good stats. Definitely!", _
 		"Its stats are all right, but kinda basic, as far as I can see.")
-	oList = oDialog.getControl ("lstAppraisal2")
+	oList = oDialog.getControl ("lstMax")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
 	oList.setVisible (True)
@@ -472,8 +472,10 @@ Sub subLstBestItemChanged (oEvent As object)
 	End If
 End Sub
 
-' subUpdateAppraisal1: Updates the text of the first appraisal.
+' subUpdateTotalAppraisal: Updates the text of the stats total
-Sub subUpdateAppraisal1 (oDialog As Object, bIsKeepSelected As Boolean)
+'						   appraisal.
+Sub subUpdateTotalAppraisal ( _
+		oDialog As Object, bIsKeepSelected As Boolean)
 	Dim sPokemon As String, oList As Object, nSelected As Integer
 	Dim mItems () As String, nI As Integer
 	
@@ -511,7 +513,7 @@ Sub subUpdateAppraisal1 (oDialog As Object, bIsKeepSelected As Boolean)
 		Next nI
 	End If
 	
-	oList = oDialog.getControl ("lstAppraisal1")
+	oList = oDialog.getControl ("lstTotal")
 	If bIsKeepSelected Then
 		nSelected = oList.getSelectedItemPos
 	End If
@@ -545,7 +547,7 @@ Function fnFindIV ( _
 	End If
 	subReadStarDust
 	nEvolved = UBound (aBaseStats.mEvolved)
-	ReDim maEvBaseStats (nEvolved) As New aStats
+	ReDim Preserve maEvBaseStats (nEvolved) As New aStats
 	For nI = 0 To nEvolved
 		aTempStats = fnGetBaseStats (aBaseStats.mEvolved (nI))
 		With maEvBaseStats (nI)
@@ -907,25 +909,21 @@ Function fnFilterAppraisals (aQuery As aFindIVParam, _
 		nStamina As Integer) As Boolean
 	Dim nTotal As Integer, nMax As Integer, sBest As String
 	
-	' The first appraisal.
+	' The stats total.
 	nTotal = nAttack + nDefense + nStamina
-	If aQuery.nAppraisal1 = 1 _
+	If aQuery.nTotal = 1 And Not (nTotal >= 37) Then
-			And Not (nTotal >= 37) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal1 = 2 _
+	If aQuery.nTotal = 2 And Not (nTotal >= 30 And nTotal <= 36) Then
-			And Not (nTotal >= 30 And nTotal <= 36) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal1 = 3 _
+	If aQuery.nTotal = 3 And Not (nTotal >= 23 And nTotal <= 29) Then
-			And Not (nTotal >= 23 And nTotal <= 29) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal1 = 4 _
+	If aQuery.nTotal = 4 And Not (nTotal <= 22) Then
-			And Not (nTotal <= 22) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
@@ -953,20 +951,20 @@ Function fnFilterAppraisals (aQuery As aFindIVParam, _
 			Exit Function
 		End If
 	End If
-	' The second appraisal.
+	' The max stat value.
-	If aQuery.nAppraisal2 = 1 And Not (nMax = 15) Then
+	If aQuery.nMax = 1 And Not (nMax = 15) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal2 = 2 And Not (nMax = 13 Or nMax = 14) Then
+	If aQuery.nMax = 2 And Not (nMax = 13 Or nMax = 14) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal2 = 3 And Not (nMax >= 8 And nMax <= 12) Then
+	If aQuery.nMax = 3 And Not (nMax >= 8 And nMax <= 12) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal2 = 4 And Not (nMax <= 7) Then
+	If aQuery.nMax = 4 And Not (nMax <= 7) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If

oxt/PokemonGoIV/0Main.xba

@@ -19,23 +19,31 @@
 
 Option Explicit
 
-' The stats of a Pokémon.
+' The base stats of a Pokémon.
 Type aStats
 	sNo As String
 	sPokemon As String
+	nStamina As Integer
+	nAttack As Integer
+	nDefense As Integer
+	mEvolved () As String
+End Type
+
+' The individual values of a Pokémon.
+Type aIV
 	fLevel As Double
 	nStamina As Integer
 	nAttack As Integer
 	nDefense As Integer
 	nTotal As Integer
 	nMaxCP As Integer
-	maEvolvedForms () As aEvolveForm
+	maEvolved () As aEvolvedStats
 End Type
 
-' The amount of star dust to power-up.
+' The calculated evolved stats of a Pokémon.
-Type aStarDust
+Type aEvolvedStats
-	fLevel As Double
+	nCP As Integer
-	nStarDust As Integer
+	nMaxCP As Integer
 End Type
 
 ' The parameters to find the individual values.
@@ -46,35 +54,30 @@ Type aFindIVParam
 	nStarDust As Integer
 	nPlayerLevel As Integer
 	bIsNew As Boolean
-	nAppraisal1 As Integer
+	nTotal As Integer
 	sBest As String
-	nAppraisal2 As Integer
+	nMax As Integer
 	bIsCancelled As Boolean
 End Type
 
-Type aEvolveForm
-	sPokemon As String
-	nCP As Integer
-	nMaxCP As Integer
-End Type
-
 Private maBaseStats () As New aStats
 Private mCPM () As Double, mStarDust () As Integer
 
 ' subMain: The main program
 Sub subMain
-	Dim maIVs As Variant, nI As Integer
+	Dim aBaseStats As New aStats, maIVs As Variant, nI As Integer
-	Dim aQuery As New aFindIVParam, aBaseStats As New aStats
+	Dim aQuery As New aFindIVParam
 	
 	aQuery = fnAskParam
 	If aQuery.bIsCancelled Then
 		Exit Sub
 	End If
-	maIVs = fnFindIV (aQuery)
+	aBaseStats = fnGetBaseStats (aQuery.sPokemon)
+	maIVs = fnFindIV (aBaseStats, aQuery)
 	If UBound (maIVs) = -1 Then
 		MsgBox fnGetResString ("ErrorNotFound")
 	Else
-		subSaveIV (aQuery, maIVs)
+		subSaveIV (aBaseStats, aQuery, maIVs)
 	End If
 End Sub
 
@@ -87,18 +90,18 @@ Function fnAskParam As aFindIVParam
 	
 	DialogLibraries.loadLibrary "PokemonGoIV"
 	oDialog = CreateUnoDialog (DialogLibraries.PokemonGoIV.DlgMain)
-	oDialog.getControl ("lstAppraisal1").setVisible (False)
+	oDialog.getControl ("lstTotal").setVisible (False)
 	oDialog.getControl ("txtBestBefore").setVisible (False)
 	oDialog.getControl ("lstBest").setVisible (False)
 	oDialog.getControl ("txtBestAfter").setVisible (False)
 	oDialog.getControl ("cbxBest2").setVisible (False)
 	oDialog.getControl ("cbxBest3").setVisible (False)
-	oDialog.getControl ("lstAppraisal2").setVisible (False)
+	oDialog.getControl ("lstMax").setVisible (False)
 	
 	oDialog.getControl ("imgPokemon").getModel.setPropertyValue ( _
-	    "ImageURL", fnGetImageUrl ("Unknown"))
+		"ImageURL", fnGetImageUrl ("Unknown"))
 	oDialog.getControl ("imgTeamLogo").getModel.setPropertyValue ( _
-	    "ImageURL", fnGetImageUrl ("Unknown"))
+		"ImageURL", fnGetImageUrl ("Unknown"))
 	
 	If oDialog.execute = 0 Then
 		aQuery.bIsCancelled = True
@@ -112,8 +115,8 @@ Function fnAskParam As aFindIVParam
 		.nHP = oDialog.getControl ("numHP").getValue
 		.nStarDust = CInt (oDialog.getControl ("lstStarDust").getSelectedItem)
 		.nPlayerLevel = CInt (oDialog.getControl ("lstPlayerLevel").getSelectedItem)
-		.nAppraisal1 = oDialog.getControl ("lstAppraisal1").getSelectedItemPos + 1
+		.nTotal = oDialog.getControl ("lstTotal").getSelectedItemPos + 1
-		.nAppraisal2 = oDialog.getControl ("lstAppraisal2").getSelectedItemPos + 1
+		.nMax = oDialog.getControl ("lstMax").getSelectedItemPos + 1
 		.bIsCancelled = False
 	End With
 	If oDialog.getControl ("cbxIsNew").getState = 1 Then
@@ -219,8 +222,8 @@ Sub subLstPokemonSelected (oEvent As object)
 	oImageModel.setPropertyValue ("ImageURL", _
 		fnGetImageUrl (sImageId))
 	
-	' Updates the text of the first appraisal.
+	' Updates the text of the stats total appraisal.
-	subUpdateAppraisal1 (oDialog, True)
+	subUpdateTotalAppraisal (oDialog, True)
 	' Checks if the required columns are filled.
 	subBtnOKCheck (oEvent)
 End Sub
@@ -244,8 +247,8 @@ Sub subRdoTeamValorItemChanged (oEvent As object)
 	oText.setVisible (True)
 	oText.setText (fnGetResString ("AppraiseFromCandela"))
 	
-	' Updates the text of the first appraisal.
+	' Updates the text of the stats total appraisal.
-	subUpdateAppraisal1 (oDialog, False)
+	subUpdateTotalAppraisal (oDialog, False)
 	
 	' Updates the text of the best stat appraisal.
 	subUpdateBestStatAppraisal (oDialog, _
@@ -256,7 +259,7 @@ Sub subRdoTeamValorItemChanged (oEvent As object)
 		"It's got excellent stats! How exciting!", _
 		"Its stats indicate that in battle, it'll get the job done.", _
 		"Its stats don't point to greatness in battle.")
-	oList = oDialog.getControl ("lstAppraisal2")
+	oList = oDialog.getControl ("lstMax")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
 	oList.setVisible (True)
@@ -281,8 +284,8 @@ Sub subRdoTeamMysticItemChanged (oEvent As object)
 	oText.setVisible (True)
 	oText.setText (fnGetResString ("AppraiseFromBlanche"))
 	
-	' Updates the text of the first appraisal.
+	' Updates the text of the stats total appraisal.
-	subUpdateAppraisal1 (oDialog, False)
+	subUpdateTotalAppraisal (oDialog, False)
 	
 	' Updates the text of the best stat appraisal.
 	subUpdateBestStatAppraisal (oDialog, _
@@ -293,7 +296,7 @@ Sub subRdoTeamMysticItemChanged (oEvent As object)
 		"I am certainly impressed by its stats, I must say.", _
 		"Its stats are noticeably trending to the positive.", _
 		"Its stats are not out of the norm, in my opinion.")
-	oList = oDialog.getControl ("lstAppraisal2")
+	oList = oDialog.getControl ("lstMax")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
 	oList.setVisible (True)
@@ -318,8 +321,8 @@ Sub subRdoTeamInstinctItemChanged (oEvent As object)
 	oText.setVisible (True)
 	oText.setText (fnGetResString ("AppraiseFromSpark"))
 	
-	' Updates the text of the first appraisal.
+	' Updates the text of the stats total appraisal.
-	subUpdateAppraisal1 (oDialog, False)
+	subUpdateTotalAppraisal (oDialog, False)
 	
 	' Updates the text of the best stat appraisal.
 	subUpdateBestStatAppraisal (oDialog, _
@@ -330,7 +333,7 @@ Sub subRdoTeamInstinctItemChanged (oEvent As object)
 		"Its stats are really strong! Impressive.", _
 		"It's definitely got some good stats. Definitely!", _
 		"Its stats are all right, but kinda basic, as far as I can see.")
-	oList = oDialog.getControl ("lstAppraisal2")
+	oList = oDialog.getControl ("lstMax")
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
 	oList.setVisible (True)
@@ -471,66 +474,69 @@ Sub subLstBestItemChanged (oEvent As object)
 	End If
 End Sub
 
-' subUpdateAppraisal1: Updates the text of the first appraisal.
+' subUpdateTotalAppraisal: Updates the text of the stats total
-Sub subUpdateAppraisal1 (oDialog As Object, bIsKeepSelected As Boolean)
+'						   appraisal.
+Sub subUpdateTotalAppraisal ( _
+		oDialog As Object, bIsKeepSelected As Boolean)
 	Dim sPokemon As String, oList As Object, nSelected As Integer
 	Dim mItems () As String, nI As Integer
 	
 	If oDialog.getControl ("rdoTeamValor").getState Then
-	    mItems = Array ( _
+		mItems = Array ( _
-		    "Overall, your [Pokémon] simply amazes me. It can accomplish anything!", _
+			"Overall, your [Pokémon] simply amazes me. It can accomplish anything!", _
-		    "Overall, your [Pokémon] is a strong Pokémon. You should be proud!", _
+			"Overall, your [Pokémon] is a strong Pokémon. You should be proud!", _
-		    "Overall, your [Pokémon] is a decent Pokémon.", _
+			"Overall, your [Pokémon] is a decent Pokémon.", _
-		    "Overall, your [Pokémon] may not be great in battle, but I still like it!")
+			"Overall, your [Pokémon] may not be great in battle, but I still like it!")
 	End If
 	If oDialog.getControl ("rdoTeamMystic").getState Then
-	    mItems = Array ( _
+		mItems = Array ( _
-		    "Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!", _
+			"Overall, your [Pokémon] is a wonder! What a breathtaking Pokémon!", _
-		    "Overall, your [Pokémon] has certainly caught my attention.", _
+			"Overall, your [Pokémon] has certainly caught my attention.", _
-		    "Overall, your [Pokémon] is above average.", _
+			"Overall, your [Pokémon] is above average.", _
-		    "Overall, your [Pokémon] is not likely to make much headway in battle.")
+			"Overall, your [Pokémon] is not likely to make much headway in battle.")
 	End If
 	If oDialog.getControl ("rdoTeamInstinct").getState Then
-	    mItems = Array ( _
+		mItems = Array ( _
-		    "Overall, your [Pokémon] looks like it can really battle with the best of them!", _
+			"Overall, your [Pokémon] looks like it can really battle with the best of them!", _
-		    "Overall, your [Pokémon] is really strong!", _
+			"Overall, your [Pokémon] is really strong!", _
-		    "Overall, your [Pokémon] is pretty decent!", _
+			"Overall, your [Pokémon] is pretty decent!", _
-		    "Overall, your [Pokémon] has room for improvement as far as battling goes.")
+			"Overall, your [Pokémon] has room for improvement as far as battling goes.")
 	End If
 	' The team was not selected yet.
 	If UBound (mItems) = -1 Then
-	    Exit sub
+		Exit sub
 	End If
 	
 	sPokemon = oDialog.getControl ("lstPokemon").getSelectedItem
 	If sPokemon <> "" Then
-	    For nI = 0 To UBound (mItems)
+		For nI = 0 To UBound (mItems)
-	        mItems (nI) = fnReplace (mItems (nI), _
+			mItems (nI) = fnReplace (mItems (nI), _
-	            "[Pokémon]", sPokemon)
+				"[Pokémon]", sPokemon)
-	    Next nI
+		Next nI
 	End If
 	
-	oList = oDialog.getControl ("lstAppraisal1")
+	oList = oDialog.getControl ("lstTotal")
 	If bIsKeepSelected Then
-	    nSelected = oList.getSelectedItemPos
+		nSelected = oList.getSelectedItemPos
 	End If
 	oList.removeItems (0, oList.getItemCount())
 	oList.addItems (mItems, 0)
 	If bIsKeepSelected Then
-	    oList.selectItemPos (nSelected, True)
+		oList.selectItemPos (nSelected, True)
 	End If
 	oList.setVisible (True)
 End Sub
 
 ' fnFindIV: Finds the possible individual values of the Pokémon
-Function fnFindIV (aQuery As aFindIVParam) As Variant
+Function fnFindIV ( _
-	Dim aBaseStats As New aStats, maIV () As New aStats
+		aBaseStats As aStats, aQuery As aFindIVParam) As Variant
+	Dim nEvolved As Integer
+	Dim maEvBaseStats () As New aStats, aTempStats As New aStats
+	Dim maIV () As New aIV, aTempIV As New aIV
 	Dim fLevel As Double, nStamina As Integer
 	Dim nAttack As Integer, nDefense As integer
 	Dim nI As Integer, nJ As Integer
-	Dim fStep As Double, nCount As Integer
+	Dim fStep As Double, nN As Integer
-	Dim aEvBaseStats As new aStats, aTempIV As New aStats
-	Dim maEvolvedForms () As New aEvolveForm
 	
 	If aQuery.sPokemon = "" Then
 		fnFindIV = maIV
@@ -541,9 +547,18 @@ Function fnFindIV (aQuery As aFindIVParam) As Variant
 	Else
 		fStep = 0.5
 	End If
-	aBaseStats = fnGetBaseStats (aQuery.sPokemon)
 	subReadStarDust
-	nCount = -1
+	nEvolved = UBound (aBaseStats.mEvolved)
+	ReDim Preserve maEvBaseStats (nEvolved) As New aStats
+	For nI = 0 To nEvolved
+		aTempStats = fnGetBaseStats (aBaseStats.mEvolved (nI))
+		With maEvBaseStats (nI)
+			.nAttack = aTempStats.nAttack
+			.nDefense = aTempStats.nDefense
+			.nStamina = aTempStats.nStamina
+		End With
+	Next nI
+	nN = -1
 	For fLevel = 1 To UBound (mStarDust) Step fStep
 		If mStarDust (CInt (fLevel - 0.5)) = aQuery.nStarDust Then
 			For nStamina = 0 To 15
@@ -551,32 +566,33 @@ Function fnFindIV (aQuery As aFindIVParam) As Variant
 					For nAttack = 0 To 15
 						For nDefense = 0 To 15
 							If fnCalcCP (aBaseStats, fLevel, nAttack, nDefense, nStamina) = aQuery.nCP _
-									And Not (fnFilterAppraisals (aQuery, nAttack, nDefense, nStamina)) Then
+									And Not fnFilterAppraisals (aQuery, nAttack, nDefense, nStamina) Then
-								nCount = nCount + 1
+								nN = nN + 1
-								ReDim Preserve maIV (nCount) As New aStats
+								ReDim Preserve maIV (nN) As New aIV
-								With maIV (nCount)
+								With maIV (nN)
-									.sNo = aBaseStats.sNo
-									.sPokemon = aQuery.sPokemon
 									.fLevel = fLevel
 									.nAttack = nAttack
 									.nDefense = nDefense
 									.nStamina = nStamina
-									.nTotal = nAttack + nDefense + nStamina
+									.nTotal = nAttack _
+										+ nDefense + nStamina
 								End With
 								If aQuery.nPlayerLevel <> 0 Then
-									maIV (nCount).nMaxCP = fnCalcCP (aBaseStats, aQuery.nPlayerLevel + 1.5, nAttack, nDefense, nStamina)
+									maIV (nN).nMaxCP = fnCalcCP ( _
-								Else
+										aBaseStats, _
-									maIV (nCount).nMaxCP = -1
+										aQuery.nPlayerLevel + 1.5, _
+										nAttack, nDefense, nStamina)
 								End If
-								maIV (nCount).maEvolvedForms = fnGetEvolvedFormArray (UBound (aBaseStats.maEvolvedForms))
+								maIV (nN).maEvolved _
-								For nI = 0 To UBound (aBaseStats.maEvolvedForms)
+									= fnGetEvolvedArray (nEvolved)
-									maIV (nCount).maEvolvedForms (nI).sPokemon = aBaseStats.maEvolvedForms (nI).sPokemon
+								For nI = 0 To nEvolved
-									aEvBaseStats = fnGetBaseStats (aBaseStats.maEvolvedForms (nI).sPokemon)
+									maIV (nN).maEvolved (nI).nCP _
-									maIV (nCount).maEvolvedForms (nI).nCP = fnCalcCP (aEvBaseStats, fLevel, nAttack, nDefense, nStamina)
+										= fnCalcCP ( _
+											maEvBaseStats (nI), _
+											fLevel, nAttack, _
+											nDefense, nStamina)
 									If aQuery.nPlayerLevel <> 0 Then
-										maIV (nCount).maEvolvedForms (nI).nMaxCP = fnCalcCP (aEvBaseStats, aQuery.nPlayerLevel + 1.5, nAttack, nDefense, nStamina)
+										maIV (nN).maEvolved (nI).nMaxCP = fnCalcCP (maEvBaseStats (nI), aQuery.nPlayerLevel + 1.5, nAttack, nDefense, nStamina)
-									Else
-										maIV (nCount).maEvolvedForms (nI).nMaxCP = -1
 									End If
 								Next nI
 							End If
@@ -590,6 +606,9 @@ Function fnFindIV (aQuery As aFindIVParam) As Variant
 	For nI = 0 To UBound (maIV) - 1
 		For nJ = nI + 1 To UBound (maIV)
 			If fnCompareIV (maIV (nI), maIV (nJ)) > 0 Then
+				' This is an array of data.  The data are actually
+				' allocated in sequences.  maIV (nI) is not a
+				' reference.  They cannot simply be assigned.
 				subCopyIV (maIV (nI), aTempIV)
 				subCopyIV (maIV (nJ), maIV (nI))
 				subCopyIV (aTempIV, maIV (nJ))
@@ -600,19 +619,19 @@ Function fnFindIV (aQuery As aFindIVParam) As Variant
 End Function
 
 ' fnCompareIV: Compare two IVs for sorting
-Function fnCompareIV (aIVa As aStats, aIVb As aStats) As Double
+Function fnCompareIV (aIVa As aIV, aIVb As aIV) As Double
 	Dim nCPa As Integer, nCPb As Integer, nI As Integer
 	
 	nCPa = aIVa.nMaxCP
-	For nI = 0 To UBound (aIVa.maEvolvedForms)
+	For nI = 0 To UBound (aIVa.maEvolved)
-		If nCPa < aIVa.maEvolvedForms (nI).nMaxCP Then
+		If nCPa < aIVa.maEvolved (nI).nMaxCP Then
-			nCPa = aIVa.maEvolvedForms (nI).nMaxCP
+			nCPa = aIVa.maEvolved (nI).nMaxCP
 		End If
 	Next nI
 	nCPb = aIVb.nMaxCP
-	For nI = 0 To UBound (aIVb.maEvolvedForms)
+	For nI = 0 To UBound (aIVb.maEvolved)
-		If nCPb < aIVb.maEvolvedForms (nI).nMaxCP Then
+		If nCPb < aIVb.maEvolved (nI).nMaxCP Then
-			nCPb = aIVb.maEvolvedForms (nI).nMaxCP
+			nCPb = aIVb.maEvolved (nI).nMaxCP
 		End If
 	Next nI
 	fnCompareIV = nCPb - nCPa
@@ -621,15 +640,15 @@ Function fnCompareIV (aIVa As aStats, aIVb As aStats) As Double
 	End If
 	
 	nCPa = 0
-	For nI = 0 To UBound (aIVa.maEvolvedForms)
+	For nI = 0 To UBound (aIVa.maEvolved)
-		If nCPa < aIVa.maEvolvedForms (nI).nCP Then
+		If nCPa < aIVa.maEvolved (nI).nCP Then
-			nCPa = aIVa.maEvolvedForms (nI).nCP
+			nCPa = aIVa.maEvolved (nI).nCP
 		End If
 	Next nI
 	nCPb = 0
-	For nI = 0 To UBound (aIVb.maEvolvedForms)
+	For nI = 0 To UBound (aIVb.maEvolved)
-		If nCPb < aIVb.maEvolvedForms (nI).nCP Then
+		If nCPb < aIVb.maEvolved (nI).nCP Then
-			nCPb = aIVb.maEvolvedForms (nI).nCP
+			nCPb = aIVb.maEvolved (nI).nCP
 		End If
 	Next nI
 	fnCompareIV = nCPb - nCPa
@@ -660,77 +679,88 @@ Function fnCompareIV (aIVa As aStats, aIVb As aStats) As Double
 End Function
 
 ' subCopyIV: Copies one IV to another
-Function subCopyIV (aFrom As aStats, aTo As aStats) As Double
+Function subCopyIV (aFrom As aIV, aTo As aIV) As Double
-	Dim nI As Integer, maEvolvedForms () As New aEvolveForm
+	Dim nI As Integer
 	
 	With aTo
-		.sNo = aFrom.sNo
-		.sPokemon = aFrom.sPokemon
-		.fLevel = aFrom.fLevel
 		.nAttack = aFrom.nAttack
 		.nDefense = aFrom.nDefense
 		.nStamina = aFrom.nStamina
 		.nTotal = aFrom.nTotal
 		.nMaxCP = aFrom.nMaxCP
 	End With
-	aTo.maEvolvedForms = fnGetEvolvedFormArray (UBound (aFrom.maEvolvedForms))
+	aTo.maEvolved = fnGetEvolvedArray (UBound (aFrom.maEvolved))
-	For nI = 0 To UBound (aFrom.maEvolvedForms)
+	For nI = 0 To UBound (aFrom.maEvolved)
-		With aTo.maEvolvedForms (nI)
+		With aTo.maEvolved (nI)
-			.sPokemon = aFrom.maEvolvedForms (nI).sPokemon
+			.nCP = aFrom.maEvolved (nI).nCP
-			.nCP = aFrom.maEvolvedForms (nI).nCP
+			.nMaxCP = aFrom.maEvolved (nI).nMaxCP
-			.nMaxCP = aFrom.maEvolvedForms (nI).nMaxCP
 		End With
 	Next nI
 End Function
 
 ' subSaveIV: Saves the found IV
-Sub subSaveIV (aQuery As aFindIVParam, maIVs () As aStats)
+Sub subSaveIV ( _
+		aBaseStats As aStats, aQuery As aFindIVParam, maIVs () As aIV)
 	Dim oDoc As Object, oSheet As Object
 	Dim oRange As Object, oColumns As Object, oRows As Object
-	Dim nI As Integer, nJ As Integer, nFrontCols As Integer
+	Dim nI As Integer, nJ As Integer, nFront As Integer
+	Dim nEvolved As Integer
 	Dim mData (Ubound (maIVs) + 1) As Variant, mRow () As Variant
 	Dim mProps () As New com.sun.star.beans.PropertyValue
 	
 	oDoc = StarDesktop.loadComponentFromURL ( _
 		"private:factory/scalc", "_default", 0, mProps)
 	oSheet = oDoc.getSheets.getByIndex (0)
+	nEvolved = UBound (maIVs (0).maEvolved) + 1
 	
 	mRow = Array ( _
 		"No", "Pokemon", "CP", "HP", "Star dust", _
 		"Lv", "Atk", "Def", "Sta", "IV")
-	nFrontCols = UBound (mRow)
+	nFront = UBound (mRow)
 	If aQuery.sPokemon = "Eevee" Then
 		If aQuery.nPlayerLevel <> 0 Then
-			ReDim Preserve mRow (nFrontCols + 6) As Variant
+			ReDim Preserve mRow (nFront + 6) As Variant
-			mRow (nFrontCols + 1) = "CP as " & maIVs (0).maEvolvedForms (0).sPokemon
+			mRow (nFront + 1) = "CP as " _
-			mRow (nFrontCols + 2) = "Powered-up as " & maIVs (0).maEvolvedForms (0).sPokemon
+				& aBaseStats.mEvolved (0)
-			mRow (nFrontCols + 3) = "CP as " & maIVs (0).maEvolvedForms (1).sPokemon
+			mRow (nFront + 2) = "Powered-up as " _
-			mRow (nFrontCols + 4) = "Powered-up as " & maIVs (0).maEvolvedForms (1).sPokemon
+				& aBaseStats.mEvolved (0)
-			mRow (nFrontCols + 5) = "CP as " & maIVs (0).maEvolvedForms (2).sPokemon
+			mRow (nFront + 3) = "CP as " _
-			mRow (nFrontCols + 6) = "Powered-up as " & maIVs (0).maEvolvedForms (2).sPokemon
+				& aBaseStats.mEvolved (1)
+			mRow (nFront + 4) = "Powered-up as " _
+				& aBaseStats.mEvolved (1)
+			mRow (nFront + 5) = "CP as " _
+				& aBaseStats.mEvolved (2)
+			mRow (nFront + 6) = "Powered-up as " _
+				& aBaseStats.mEvolved (2)
 		Else
-			ReDim Preserve mRow (nFrontCols + 3) As Variant
+			ReDim Preserve mRow (nFront + 3) As Variant
-			mRow (nFrontCols + 1) = "CP as " & maIVs (0).maEvolvedForms (0).sPokemon
+			mRow (nFront + 1) = "CP as " _
-			mRow (nFrontCols + 2) = "CP as " & maIVs (0).maEvolvedForms (1).sPokemon
+				& aBaseStats.mEvolved (0)
-			mRow (nFrontCols + 3) = "CP as " & maIVs (0).maEvolvedForms (2).sPokemon
+			mRow (nFront + 2) = "CP as " _
+				& aBaseStats.mEvolved (1)
+			mRow (nFront + 3) = "CP as " _
+				& aBaseStats.mEvolved (2)
 		End If
 	Else
-		If UBound (maIVs (0).maEvolvedForms) = -1 Then
+		If nEvolved = 0 Then
 			If aQuery.nPlayerLevel <> 0 Then
-				ReDim Preserve mRow (nFrontCols + 1) As Variant
+				ReDim Preserve mRow (nFront + 1) As Variant
-				mRow (nFrontCols + 1) = "Powered-up"
+				mRow (nFront + 1) = "Powered-up"
 			End If
 		Else
 			If aQuery.nPlayerLevel <> 0 Then
-				ReDim Preserve mRow (nFrontCols + UBound (maIVs (0).maEvolvedForms) + 2) As Variant
+				ReDim Preserve mRow (nFront + nEvolved + 1) As Variant
-				For nJ = 0 To UBound (maIVs (0).maEvolvedForms)
+				For nJ = 0 To nEvolved - 1
-					mRow (nFrontCols + nJ + 1) = "CP as " & maIVs (0).maEvolvedForms (nJ).sPokemon
+					mRow (nFront + nJ + 1) = "CP as " _
+						& aBaseStats.mEvolved (nJ)
 				Next nJ
-				mRow (UBound (mRow)) = "Powered-up as " & maIVs (0).maEvolvedForms (UBound (maIVs (0).maEvolvedForms)).sPokemon
+				mRow (UBound (mRow)) = "Powered-up as " _
+					& aBaseStats.mEvolved (nEvolved - 1)
 			Else
-				ReDim Preserve mRow (nFrontCols + UBound (maIVs (0).maEvolvedForms) + 1) As Variant
+				ReDim Preserve mRow (nFront + nEvolved) As Variant
-				For nJ = 0 To UBound (maIVs (0).maEvolvedForms)
+				For nJ = 0 To nEvolved - 1
-					mRow (nFrontCols + nJ + 1) = "CP as " & maIVs (0).maEvolvedForms (nJ).sPokemon
+					mRow (nFront + nJ + 1) = "CP as " _
+						& aBaseStats.mEvolved (nJ)
 				Next nJ
 			End If
 		End If
@@ -740,40 +770,41 @@ Sub subSaveIV (aQuery As aFindIVParam, maIVs () As aStats)
 	For nI = 0 To UBound (maIVs)
 		mRow = Array ( _
 			"", "", "", "", "", _
-			maIVs (nI).fLevel, maIVs (nI).nAttack, maIVs (nI).nDefense, _
+			maIVs (nI).fLevel, maIVs (nI).nAttack, _
-			maIVs (nI).nStamina, maIVs (nI).nTotal / 45)
+			maIVs (nI).nDefense, maIVs (nI).nStamina, _
+			maIVs (nI).nTotal / 45)
 		If aQuery.sPokemon = "Eevee" Then
 			If aQuery.nPlayerLevel <> 0 Then
-				ReDim Preserve mRow (nFrontCols + 6) As Variant
+				ReDim Preserve mRow (nFront + 6) As Variant
-				mRow (nFrontCols + 1) = maIVs (nI).maEvolvedForms (0).nCP
+				mRow (nFront + 1) = maIVs (nI).maEvolved (0).nCP
-				mRow (nFrontCols + 2) = maIVs (nI).maEvolvedForms (0).nMaxCP
+				mRow (nFront + 2) = maIVs (nI).maEvolved (0).nMaxCP
-				mRow (nFrontCols + 3) = maIVs (nI).maEvolvedForms (1).nCP
+				mRow (nFront + 3) = maIVs (nI).maEvolved (1).nCP
-				mRow (nFrontCols + 4) = maIVs (nI).maEvolvedForms (1).nMaxCP
+				mRow (nFront + 4) = maIVs (nI).maEvolved (1).nMaxCP
-				mRow (nFrontCols + 5) = maIVs (nI).maEvolvedForms (2).nCP
+				mRow (nFront + 5) = maIVs (nI).maEvolved (2).nCP
-				mRow (nFrontCols + 6) = maIVs (nI).maEvolvedForms (2).nMaxCP
+				mRow (nFront + 6) = maIVs (nI).maEvolved (2).nMaxCP
 			Else
-				ReDim Preserve mRow (nFrontCols + 3) As Variant
+				ReDim Preserve mRow (nFront + 3) As Variant
-				mRow (nFrontCols + 1) = maIVs (nI).maEvolvedForms (0).nCP
+				mRow (nFront + 1) = maIVs (nI).maEvolved (0).nCP
-				mRow (nFrontCols + 2) = maIVs (nI).maEvolvedForms (1).nCP
+				mRow (nFront + 2) = maIVs (nI).maEvolved (1).nCP
-				mRow (nFrontCols + 3) = maIVs (nI).maEvolvedForms (2).nCP
+				mRow (nFront + 3) = maIVs (nI).maEvolved (2).nCP
 			End If
 		Else
-			If UBound (maIVs (nI).maEvolvedForms) = -1 Then
+			If nEvolved = 0 Then
 				If aQuery.nPlayerLevel <> 0 Then
-					ReDim Preserve mRow (nFrontCols + 1) As Variant
+					ReDim Preserve mRow (nFront + 1) As Variant
-					mRow (nFrontCols + 1) = maIVs (nI).nMaxCP
+					mRow (nFront + 1) = maIVs (nI).nMaxCP
 				End If
 			Else
 				If aQuery.nPlayerLevel <> 0 Then
-					ReDim Preserve mRow (nFrontCols + UBound (maIVs (nI).maEvolvedForms) + 2) As Variant
+					ReDim Preserve mRow (nFront + nEvolved + 1) As Variant
-					For nJ = 0 To UBound (maIVs (nI).maEvolvedForms)
+					For nJ = 0 To nEvolved - 1
-						mRow (nFrontCols + nJ + 1) = maIVs (nI).maEvolvedForms (nJ).nCP
+						mRow (nFront + nJ + 1) = maIVs (nI).maEvolved (nJ).nCP
 					Next nJ
-					mRow (UBound (mRow)) = maIVs (nI).maEvolvedForms (UBound (maIVs (nI).maEvolvedForms)).nMaxCP
+					mRow (UBound (mRow)) = maIVs (nI).maEvolved (nEvolved - 1).nMaxCP
 				Else
-					ReDim Preserve mRow (nFrontCols + UBound (maIVs (nI).maEvolvedForms) + 1) As Variant
+					ReDim Preserve mRow (nFront + nEvolved) As Variant
-					For nJ = 0 To UBound (maIVs (nI).maEvolvedForms)
+					For nJ = 0 To nEvolved - 1
-						mRow (nFrontCols + nJ + 1) = maIVs (nI).maEvolvedForms (nJ).nCP
+						mRow (nFront + nJ + 1) = maIVs (nI).maEvolved (nJ).nCP
 					Next nJ
 				End If
 			End If
@@ -782,7 +813,7 @@ Sub subSaveIV (aQuery As aFindIVParam, maIVs () As aStats)
 	Next nI
 	
 	' Fills the query information at the first row
-	mData (1) (0) = maIVs (0).sNo
+	mData (1) (0) = aBaseStats.sNo
 	mData (1) (1) = aQuery.sPokemon
 	mData (1) (2) = aQuery.nCP
 	mData (1) (3) = aQuery.nHP
@@ -817,12 +848,12 @@ Sub subSaveIV (aQuery As aFindIVParam, maIVs () As aStats)
 		oRange = oSheet.getCellRangeByPosition ( _
 			10, 0, 15, 0)
 	Else
-		If UBound (maIVs (0).maEvolvedForms) = -1 Then
+		If nEvolved = 0 Then
 			oRange = oSheet.getCellRangeByPosition ( _
 				10, 0, 10, 0)
 		Else
 			oRange = oSheet.getCellRangeByPosition ( _
-				10, 0, 10 + UBound (maIVs (0).maEvolvedForms) + 2, 0)
+				10, 0, 10 + nEvolved + 1, 0)
 		End If
 	End If
 	oRange.setPropertyValue ("IsTextWrapped", True)
@@ -843,49 +874,58 @@ Sub subSaveIV (aQuery As aFindIVParam, maIVs () As aStats)
 	If aQuery.sPokemon = "Eevee" Then
 		If aQuery.nPlayerLevel <> 0 Then
 			For nI = 0 To 5 Step 2
-				oColumns.getByIndex (10 + nI).setPropertyValue ("Width", 2310)
+				oColumns.getByIndex (10 + nI).setPropertyValue ( _
-				oColumns.getByIndex (10 + nI + 1).setPropertyValue ("Width", 2810)
+					"Width", 2310)
+				oColumns.getByIndex (10 + nI + 1).setPropertyValue ( _
+					"Width", 2810)
 			Next nI
 		Else
 			For nI = 0 To 2
-				oColumns.getByIndex (10 + nI).setPropertyValue ("Width", 2310)
+				oColumns.getByIndex (10 + nI).setPropertyValue ( _
+					"Width", 2310)
 			Next nI
 		End If
 	Else
-		If UBound (maIVs (0).maEvolvedForms) = -1 Then
+		If nEvolved = 0 Then
 			If aQuery.nPlayerLevel <> 0 Then
-				oColumns.getByIndex (10).setPropertyValue ("Width", 2200)
+				oColumns.getByIndex (10).setPropertyValue ( _
+					"Width", 2200)
 			End If
 		Else
-			For nI = 0 To UBound (maIVs (0).maEvolvedForms)
+			For nI = 0 To nEvolved - 1
-				oColumns.getByIndex (10 + nI).setPropertyValue ("Width", 2310)
+				oColumns.getByIndex (10 + nI).setPropertyValue ( _
+					"Width", 2310)
 			Next nI
 			If aQuery.nPlayerLevel <> 0 Then
-				oColumns.getByIndex (10 + UBound (maIVs (0).maEvolvedForms) + 1).setPropertyValue ("Width", 2810)
+				oColumns.getByIndex ( _
+					10 + nEvolved).setPropertyValue ( _
+					"Width", 2810)
 			End If
 		End If
 	End If
 End Sub
 
 ' fnFilterAppraisals: Filters the IV by the appraisals.
-Function fnFilterAppraisals (aQuery As aFindIVParam, nAttack As Integer, nDefense As Integer, nStamina As Integer) As Boolean
+Function fnFilterAppraisals (aQuery As aFindIVParam, _
+		nAttack As Integer, nDefense As Integer, _
+		nStamina As Integer) As Boolean
 	Dim nTotal As Integer, nMax As Integer, sBest As String
 	
-	' The first appraisal.
+	' The stats total.
 	nTotal = nAttack + nDefense + nStamina
-	If aQuery.nAppraisal1 = 1 And Not (nTotal >= 37) Then
+	If aQuery.nTotal = 1 And Not (nTotal >= 37) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal1 = 2 And Not (nTotal >= 30 And nTotal <= 36) Then
+	If aQuery.nTotal = 2 And Not (nTotal >= 30 And nTotal <= 36) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal1 = 3 And Not (nTotal >= 23 And nTotal <= 29) Then
+	If aQuery.nTotal = 3 And Not (nTotal >= 23 And nTotal <= 29) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal1 = 4 And Not (nTotal <= 22) Then
+	If aQuery.nTotal = 4 And Not (nTotal <= 22) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
@@ -913,20 +953,20 @@ Function fnFilterAppraisals (aQuery As aFindIVParam, nAttack As Integer, nDefens
 			Exit Function
 		End If
 	End If
-	' The second appraisal.
+	' The max stat value.
-	If aQuery.nAppraisal2 = 1 And Not (nMax = 15) Then
+	If aQuery.nMax = 1 And Not (nMax = 15) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal2 = 2 And Not (nMax = 13 Or nMax = 14) Then
+	If aQuery.nMax = 2 And Not (nMax = 13 Or nMax = 14) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal2 = 3 And Not (nMax >= 8 And nMax <= 12) Then
+	If aQuery.nMax = 3 And Not (nMax >= 8 And nMax <= 12) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
-	If aQuery.nAppraisal2 = 4 And Not (nMax <= 7) Then
+	If aQuery.nMax = 4 And Not (nMax <= 7) Then
 		fnFilterAppraisals = True
 		Exit Function
 	End If
@@ -934,21 +974,24 @@ Function fnFilterAppraisals (aQuery As aFindIVParam, nAttack As Integer, nDefens
 End Function
 
 ' fnCalcCP: Calculates the combat power of the Pokémon
-Function fnCalcCP (aBaseStats As aStats, fLevel As Double, nAttack As Integer, nDefense As Integer, nStamina As Integer) As Integer
+Function fnCalcCP (aBaseStats As aStats, fLevel As Double, _
-    Dim nCP As Integer
+		nAttack As Integer, nDefense As Integer, _
-    
+		nStamina As Integer) As Integer
+	Dim nCP As Integer
+		
 	nCP = fnFloor ((aBaseStats.nAttack + nAttack) _
 		* ((aBaseStats.nDefense + nDefense) ^ 0.5) _
 		* ((aBaseStats.nStamina + nStamina) ^ 0.5) _
 		* (fnGetCPM (fLevel) ^ 2) / 10)
 	If nCP < 10 Then
-	    nCP = 10
+		nCP = 10
 	End If
 	fnCalcCP = nCP
 End Function
 
 ' fnCalcHP: Calculates the hit points of the Pokémon
-Function fnCalcHP (aBaseStats As aStats, fLevel As Double, nStamina As Integer) As Integer
+Function fnCalcHP (aBaseStats As aStats, _
+		fLevel As Double, nStamina As Integer) As Integer
 	Dim nHP As Integer
 	
 	nHP = fnFloor ((aBaseStats.nStamina + nStamina) _
@@ -993,6 +1036,7 @@ End Function
 ' subReadBaseStats: Reads the base stats table.
 Sub subReadBaseStats
 	Dim mData As Variant, nI As Integer, nJ As Integer
+	DIm nEvolved As Integer
 	
 	If UBound (maBaseStats) = -1 Then
 		mData = fnGetBaseStatsData
@@ -1005,52 +1049,47 @@ Sub subReadBaseStats
 				.nAttack = mData (nI) (3)
 				.nDefense = mData (nI) (4)
 			End With
-			maBaseStats (nI).maEvolvedForms = fnGetEvolvedFormArray (UBound (mData (nI) (5)))
+			nEvolved = UBound (mData (nI) (5))
-			For nJ = 0 To UBound (maBaseStats (nI).maEvolvedForms)
+			maBaseStats (nI).mEvolved = fnGetStringArray (nEvolved)
-				With maBaseStats (nI).maEvolvedForms (nJ)
+			For nJ = 0 To nEvolved
-					.sPokemon = mData (nI) (5) (nJ)
+				maBaseStats (nI).mEvolved (nJ) = mData (nI) (5) (nJ)
-					.nCP = -1
-					.nMaxCP = -1
-				End With
 			Next nJ
 		Next nI
 	End If
 End Sub
 
-' fnGetEvolvedFormArray: Obtains a blank aEvolveForm array
+' fnGetStringArray: Obtains a blank string array
-Function fnGetEvolvedFormArray (nUBound As Integer) As Variant
+Function fnGetStringArray (nUBound As Integer) As Variant
-	If nUBound = -1 Then
+	Dim mData () As String
-		fnGetEvolvedFormArray = fnGetEmptyEvolvedFormArray
+	
-	Else
+	If nUBound >= 0 Then
-		fnGetEvolvedFormArray = fnGetNumberedEvolvedFormArray (nUBound)
+		ReDim Preserve mData (nUBound) As String
 	End If
+	fnGetStringArray = mData
 End Function
 
-' fnGetNumberedEvolvedFormArray: Obtains a numbered aEvolveForm array
+' fnGetEvolvedArray: Obtains a blank aEvolvedStats array
-Function fnGetNumberedEvolvedFormArray (nUBound As Integer) As Variant
+Function fnGetEvolvedArray (nUBound As Integer) As Variant
-	Dim mData (nUBound) As New aEvolveForm
+	Dim mData () As New aEvolvedStats
 	
-	fnGetNumberedEvolvedFormArray = mData
+	If nUBound >= 0 Then
-End Function
+		ReDim Preserve mData (nUBound) As New aEvolvedStats
-
+	End If
-' fnGetEmptyEvolvedFormArray: Obtains an empty aEvolveForm array
+	fnGetEvolvedArray = mData
-Function fnGetEmptyEvolvedFormArray () As Variant
-	Dim mData () As New aEvolveForm
-	
-	fnGetEmptyEvolvedFormArray = mData
 End Function
 
 ' fnReplace: Replaces all occurrances of a term to another.
-Function fnReplace (sText As String, sFrom As String, sTo As String) As String
+Function fnReplace ( _
-    Dim nPos As Integer
+		sText As String, sFrom As String, sTo As String) As String
-    
+	Dim nPos As Integer
-    nPos = InStr (sText, sFrom)
+	
-    Do While nPos <> 0
+	nPos = InStr (sText, sFrom)
-        sText = Left (sText, nPos - 1) & sTo _
+	Do While nPos <> 0
-            & Right (sText, Len (sText) - nPos - Len (sFrom) + 1)
+		sText = Left (sText, nPos - 1) & sTo _
-        nPos = InStr (nPos + Len (sTo), sText, sFrom)
+			& Right (sText, Len (sText) - nPos - Len (sFrom) + 1)
-    Loop
+		nPos = InStr (nPos + Len (sTo), sText, sFrom)
-    fnReplace = sText
+	Loop
+	fnReplace = sText
 End Function
 
 ' subReadCPM: Reads the CPM table.

oxt/PokemonGoIV/8Registry.xba

@@ -9,46 +9,22 @@ Const BASE_KEY As String = "/org.openoffice.Office.Addons.PokemonGoIV.Addon
 
 ' fnGetImageUrl: Returns the image URL for the UNO image controls.
 Function fnGetImageUrl (sName As String) As String
+	BasicLibraries.loadLibrary "Tools"
     Dim oRegKey As Object
 	
-	oRegKey = fnGetRegistryKeyContent (BASE_KEY & "FileResources/" & sName)
+	oRegKey = GetRegistryKeyContent (BASE_KEY & "FileResources/" & sName)
 	fnGetImageUrl = fnExpandMacroFieldExpression (oRegKey.Url)
 End Function
 
 ' fnGetResString: Returns the localized text string.
 Function fnGetResString (sID As String) As String
+	BasicLibraries.loadLibrary "Tools"
 	Dim oRegKey As Object
 	
-	oRegKey = fnGetRegistryKeyContent (BASE_KEY & "Messages/" & sID)
+	oRegKey = GetRegistryKeyContent (BASE_KEY & "Messages/" & sID)
 	fnGetResString = oRegKey.Text
 End Function
 
-' fnGetRegistryKeyContent: Returns the registry key content
-Function fnGetRegistryKeyContent (sKeyName as string, Optional bforUpdate as Boolean)
-    Dim oConfigProvider As Object
-    Dim aNodePath (0) As New com.sun.star.beans.PropertyValue
-    
-	oConfigProvider = createUnoService ( _
-	    "com.sun.star.configuration.ConfigurationProvider")
-	aNodePath(0).Name = "nodepath"
-	aNodePath(0).Value = sKeyName
-	If IsMissing (bForUpdate) Then
-		fnGetRegistryKeyContent = oConfigProvider.createInstanceWithArguments ( _
-			"com.sun.star.configuration.ConfigurationAccess", _
-			aNodePath())
-	Else
-		If bForUpdate Then
-			fnGetRegistryKeyContent = oConfigProvider.createInstanceWithArguments ( _
-				"com.sun.star.configuration.ConfigurationUpdateAccess", _
-				aNodePath())
-		Else
-			fnGetRegistryKeyContent = oConfigProvider.createInstanceWithArguments ( _
-				"com.sun.star.configuration.ConfigurationAccess", _
-				aNodePath())
-		End If
-	End If
-End Function
-
 ' fnExpandMacroFieldExpression
 Function fnExpandMacroFieldExpression (sURL As String) As String
     Dim sTemp As String

oxt/PokemonGoIV/DlgMain.xdl

@@ -264,7 +264,7 @@
   </dlg:radiogroup>
   <dlg:img dlg:style-id="0" dlg:id="imgTeamLeader" dlg:tab-index="28" dlg:left="10" dlg:top="110" dlg:width="30" dlg:height="35"/>
   <dlg:text dlg:id="txtLeaderAppraise" dlg:tab-index="27" dlg:left="45" dlg:top="116" dlg:width="180" dlg:height="8"/>
-  <dlg:menulist dlg:id="lstAppraisal1" dlg:tab-index="9" dlg:left="45" dlg:top="129" dlg:width="180" dlg:height="12" dlg:spin="true"/>
+  <dlg:menulist dlg:id="lstTotal" dlg:tab-index="9" dlg:left="45" dlg:top="129" dlg:width="180" dlg:height="12" dlg:spin="true"/>
   <dlg:text dlg:id="txtBestBefore" dlg:tab-index="23" dlg:left="45" dlg:top="146" dlg:width="20" dlg:height="8"/>
   <dlg:menulist dlg:id="lstBest" dlg:tab-index="10" dlg:left="65" dlg:top="144" dlg:width="45" dlg:height="12" dlg:spin="true">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:PokemonGoIV.0Main.subLstBestItemChanged?language=Basic&amp;location=application" script:language="Script"/>
@@ -272,8 +272,8 @@
   <dlg:text dlg:id="txtBestAfter" dlg:tab-index="24" dlg:left="110" dlg:top="146" dlg:width="100" dlg:height="8"/>
   <dlg:checkbox dlg:id="cbxBest2" dlg:tab-index="11" dlg:left="45" dlg:top="161" dlg:width="180" dlg:height="8" dlg:checked="false"/>
   <dlg:checkbox dlg:id="cbxBest3" dlg:tab-index="12" dlg:left="45" dlg:top="176" dlg:width="180" dlg:height="8" dlg:checked="false"/>
-  <dlg:menulist dlg:id="lstAppraisal2" dlg:tab-index="13" dlg:left="45" dlg:top="189" dlg:width="180" dlg:height="12" dlg:spin="true"/>
+  <dlg:menulist dlg:id="lstMax" dlg:tab-index="13" dlg:left="45" dlg:top="189" dlg:width="180" dlg:height="12" dlg:spin="true"/>
   <dlg:button dlg:id="btnOK" dlg:tab-index="14" dlg:disabled="true" dlg:left="40" dlg:top="215" dlg:width="60" dlg:height="15" dlg:default="true" dlg:button-type="ok"/>
   <dlg:button dlg:id="btnCancel" dlg:tab-index="15" dlg:left="135" dlg:top="215" dlg:width="60" dlg:height="15" dlg:button-type="cancel"/>
  </dlg:bulletinboard>
-</dlg:window>
+</dlg:window>