From 5ad8f189501a0afea2cc458eeacecaadae5c192c Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Fri, 14 Feb 2025 02:13:28 +0100
Subject: [PATCH 1/2] getFullUnlockedData now properly accounts for forms

---
 src/data/pokemon-species.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 5883bac3fc8..8473f7788e3 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -1051,7 +1051,11 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali
       caughtAttr += DexAttr.VARIANT_2;
       caughtAttr += DexAttr.VARIANT_3;
     }
-    caughtAttr += DexAttr.DEFAULT_FORM;
+
+    // Summing successive bigints for each obtainable form
+    caughtAttr += this.forms
+      .map((f, index) => f.isUnobtainable ? 0n : 128n * 2n ** BigInt(index))
+      .reduce((acc, val) => acc + val, 0n);
 
     return caughtAttr;
   }

From 7611061378f61e21381719a33f21266f3e02774d Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Fri, 14 Feb 2025 02:15:24 +0100
Subject: [PATCH 2/2] Updating version

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 270b72afda8..1bf7649704b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
diff --git a/package.json b/package.json
index 3861d5fb4ca..4e43b835189 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.6.0",
+	"version": "1.6.1",
 	"type": "module",
 	"scripts": {
 		"start": "vite",