From 300aa1163a1c970fcf632a311d33db1d1a57672a Mon Sep 17 00:00:00 2001
From: Matthew Olker <matthew.olker@gmail.com>
Date: Mon, 27 May 2024 00:03:15 -0400
Subject: [PATCH] fix geticonatlaskey and geticonid for pokemon with forms

---
 src/data/pokemon-species.ts | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 144c03d1d5d..c95cf2bd939 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -271,8 +271,28 @@ export abstract class PokemonSpeciesForm {
 
   abstract getFormSpriteKey(formIndex?: integer): string;
 
+
+  /**
+   * Variant Data key/index is either species id or species id followed by -formkey
+   * @param formIndex optional form index for pokemon with different forms
+   * @returns species id if no additional forms, index with formkey if a pokemon with a form
+   */
+  getVariantDataIndex(formIndex?: integer) {
+    let formkey = null;
+    let variantDataIndex: integer|string = this.speciesId;
+    const species = getPokemonSpecies(this.speciesId);
+    if (species.forms.length > 0) {
+      formkey = species.forms[formIndex]?.formKey;
+      if (formkey) {
+        variantDataIndex = `${this.speciesId}-${formkey}`;
+      }
+    }
+    return variantDataIndex;
+  }
+
   getIconAtlasKey(formIndex?: integer, shiny?: boolean, variant?: integer): string {
-    const isVariant = shiny && variantData[this.speciesId] && variantData[this.speciesId][variant];
+    const variantDataIndex = this.getVariantDataIndex(formIndex);
+    const isVariant = shiny && variantData[variantDataIndex] && variantData[variantDataIndex][variant];
     return `pokemon_icons_${this.generation}${isVariant ? "v" : ""}`;
   }
 
@@ -281,9 +301,11 @@ export abstract class PokemonSpeciesForm {
       formIndex = this.formIndex;
     }
 
+    const variantDataIndex = this.getVariantDataIndex(formIndex);
+
     let ret = this.speciesId.toString();
 
-    const isVariant = shiny && variantData[this.speciesId] && variantData[this.speciesId][variant];
+    const isVariant = shiny && variantData[variantDataIndex] && variantData[variantDataIndex][variant];
 
     if (shiny && !isVariant) {
       ret += "s";