Fix the Pikachu forms' images

Author: github-actions-bot

plugins/pokedex-data-plugin/dex/functions.js

@@ -38,7 +38,7 @@ const getPokemonFormIndexById = (monsno, id, mode = GAMEDATA2) => {
   const ModeFormMap = FORM_MAP[mode];
   const formNo = ModeFormMap[monsno].findIndex((pokemonId) => pokemonId === id);
   if (mode === GAMEDATA2 && monsno === 25) {
-    const mapped_form_no = LUMI_TO_RELUMI_PIKACHU_FORMS[formNo]
+    const mapped_form_no = LUMI_TO_RELUMI_PIKACHU_FORMS[formNo];
     if (mapped_form_no !== undefined) return mapped_form_no;
   }
   return formNo;

plugins/pokedex-data-plugin/dex/moves.js

@@ -390,6 +390,7 @@ function searchForMovesOnPokemon(moveId = 0, mode = GAMEDATA2) {
   return Object.values(FORM_MAP[mode])
     .flat()
     .slice(1)
+    .filter(id => id !== -1)
     .map((id) => {
       // This is a map and not a filter because
       // we want to return which method(s) a pokemon can learn a move

plugins/pokedex-data-plugin/dex/name.js

@@ -6,7 +6,7 @@ const {
   GAMEDATA3,
   GAMEDATAV,
 } = require('../../../__gamedata');
-const { START_OF_LINE_FORMS, END_OF_LINE_FORMS, REVERSE_ORDER_ARRAY } = require('./nameConstants')
+const { START_OF_LINE_FORMS, END_OF_LINE_FORMS, REVERSE_ORDER_ARRAY, LUMI_TO_RELUMI_PIKACHU_FORMS } = require('./nameConstants')
 const { FORM_MAP } = require('./functions');
 
 const POKEMON_NAME_MAPV = PersonalTable[GAMEDATAV].Personal.reduce((pokemonNameMap, currentPokemon) => {
@@ -194,8 +194,12 @@ function getPokemonMonsNoAndFormNoFromPokemonId(pokemonId = 0, mode = GAMEDATA2)
   const MODE_FORM_MAP = FORM_MAP[mode];
 
 	const { monsno } = ModePersonalTable.Personal[pokemonId];
-	const formno = MODE_FORM_MAP[monsno].indexOf(pokemonId);
-	return [monsno, formno];
+  const formNo = MODE_FORM_MAP[monsno].findIndex((id) => pokemonId === id);
+  if (mode === GAMEDATA2 && monsno === 25) {
+    const mapped_form_no = LUMI_TO_RELUMI_PIKACHU_FORMS[formNo];
+    if (mapped_form_no !== undefined) return [monsno, mapped_form_no];
+  }
+	return [monsno, formNo];
 }
 
 module.exports = {

src/utils/dex/functions.js

@@ -12,7 +12,13 @@ function createFormMap(formMap, currentPokemon) {
     formMap[currentPokemon.monsno] = [];
   }
 
-  formMap[currentPokemon.monsno].push(currentPokemon.id);
+  const isValid = currentPokemon.valid_flag;
+
+  if (isValid === 1) {
+    formMap[currentPokemon.monsno].push(currentPokemon.id);
+  } else {
+    formMap[currentPokemon.monsno].push(-1);
+  }
   return formMap;
 }