From cfefc23df18527235b2ebf54969bdaab2566ad55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Wed, 29 Nov 2017 12:49:43 +0800
Subject: [PATCH] =?UTF-8?q?*=20Fixed=20the=20error=20that=20the=20CP=20and?=
 =?UTF-8?q?=20IV%=20formulas=20were=20not=20referring=20to=20the=20correct?=
 =?UTF-8?q?=20IV=20cells=20for=20the=20following=20Pok=C3=A9mons=20on=20th?=
 =?UTF-8?q?e=20same=20sheet.=20*=20Advanced=20to=20version=200.8.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PokemonGoIV/2Report.vb          | 6 +++---
 VERSION                         | 2 +-
 excludes/pokemongoiv.update.xml | 4 ++--
 oxt/PokemonGoIV/2Report.xba     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/PokemonGoIV/2Report.vb b/PokemonGoIV/2Report.vb
index 0a6a43c..6a19671 100644
--- a/PokemonGoIV/2Report.vb
+++ b/PokemonGoIV/2Report.vb
@@ -244,9 +244,9 @@ Sub subCreateReport ( _
 	' Fills in the CP calculation.
 	For nI = 0 To UBound (maIVs)
 		sCPM = fnGetCPMFormula (maIVs (nI).fLevel)
-		sColIVAttack = "G" & (nI + 2)
-		sColIVDefense = "H" & (nI + 2)
-		sColIVStamina = "I" & (nI + 2)
+		sColIVAttack = "G" & (nStartRow + nI + 1)
+		sColIVDefense = "H" & (nStartRow + nI + 1)
+		sColIVStamina = "I" & (nStartRow + nI + 1)
 		
 		oCell = oSheet.getCellByPosition (nLeadCols - 1, nStartRow + nI)
 		sFormula = "=(" & sColIVAttack & "+" & sColIVDefense _
diff --git a/VERSION b/VERSION
index a3df0a6..6f4eebd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.0
+0.8.1
diff --git a/excludes/pokemongoiv.update.xml b/excludes/pokemongoiv.update.xml
index 0876413..910758c 100644
--- a/excludes/pokemongoiv.update.xml
+++ b/excludes/pokemongoiv.update.xml
@@ -2,8 +2,8 @@
 <description xmlns="http://openoffice.org/extensions/update/2006"
 	xmlns:xlink="http://www.w3.org/1999/xlink">
 <identifier value="tw.idv.imacat.office.pokemongoiv" />
-	<version value="0.8.0" />
+	<version value="0.8.1" />
 	<update-download>
-		<src xlink:href="https://sourceforge.net/projects/aoo-extensions/files/18585/27/pokemongoiv.oxt" />
+		<src xlink:href="https://sourceforge.net/projects/aoo-extensions/files/18585/29/pokemongoiv.oxt" />
 	</update-download>
 </description>
diff --git a/oxt/PokemonGoIV/2Report.xba b/oxt/PokemonGoIV/2Report.xba
index 62d5d8a..7b9dde6 100644
--- a/oxt/PokemonGoIV/2Report.xba
+++ b/oxt/PokemonGoIV/2Report.xba
@@ -246,9 +246,9 @@ Sub subCreateReport ( _
 	&apos; Fills in the CP calculation.
 	For nI = 0 To UBound (maIVs)
 		sCPM = fnGetCPMFormula (maIVs (nI).fLevel)
-		sColIVAttack = &quot;G&quot; &amp; (nI + 2)
-		sColIVDefense = &quot;H&quot; &amp; (nI + 2)
-		sColIVStamina = &quot;I&quot; &amp; (nI + 2)
+		sColIVAttack = &quot;G&quot; &amp; (nStartRow + nI + 1)
+		sColIVDefense = &quot;H&quot; &amp; (nStartRow + nI + 1)
+		sColIVStamina = &quot;I&quot; &amp; (nStartRow + nI + 1)
 		
 		oCell = oSheet.getCellByPosition (nLeadCols - 1, nStartRow + nI)
 		sFormula = &quot;=(&quot; &amp; sColIVAttack &amp; &quot;+&quot; &amp; sColIVDefense _