From bd14ed640c8c11da897128ca621e5951b7cd0113 Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Tue, 20 May 2025 00:00:51 +0200 Subject: [PATCH 01/44] [Localization] Localizable "Cancel" text in Ball selection menu (#5836) "Cancel" text localizable --- src/ui/ball-ui-handler.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts index abb106a6553..eb7c208662a 100644 --- a/src/ui/ball-ui-handler.ts +++ b/src/ui/ball-ui-handler.ts @@ -7,6 +7,7 @@ import { addWindow } from "./ui-theme"; import { Button } from "#enums/buttons"; import type { CommandPhase } from "#app/phases/command-phase"; import { globalScene } from "#app/global-scene"; +import i18next from "i18next"; export default class BallUiHandler extends UiHandler { private pokeballSelectContainer: Phaser.GameObjects.Container; @@ -31,7 +32,7 @@ export default class BallUiHandler extends UiHandler { for (let pb = 0; pb < Object.keys(globalScene.pokeballCounts).length; pb++) { optionsTextContent += `${getPokeballName(pb)}\n`; } - optionsTextContent += "Cancel"; + optionsTextContent += i18next.t("pokeball:cancel"); const optionsText = addTextObject(0, 0, optionsTextContent, TextStyle.WINDOW, { align: "right", maxLines: 6 }); const optionsTextWidth = optionsText.displayWidth; this.pokeballSelectContainer = globalScene.add.container( From a9ec3b324c8deb88de9cc7b986fc92814922dd5a Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Tue, 20 May 2025 00:03:42 +0200 Subject: [PATCH 02/44] [UI/UX] [i18n] Text ratio adjustment for es-MX Egg Gatcha (#5839) --- src/ui/egg-gacha-ui-handler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts index 5377cf3d283..1bb7124d935 100644 --- a/src/ui/egg-gacha-ui-handler.ts +++ b/src/ui/egg-gacha-ui-handler.ts @@ -108,7 +108,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { let pokemonIconX = -20; let pokemonIconY = 6; - if (["de", "es-ES", "fr", "ko", "pt-BR"].includes(currentLanguage)) { + if (["de", "es-ES", "es-MX", "fr", "ko", "pt-BR"].includes(currentLanguage)) { gachaTextStyle = TextStyle.SMALLER_WINDOW_ALT; gachaX = 2; gachaY = 2; @@ -116,7 +116,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { let legendaryLabelX = gachaX; let legendaryLabelY = gachaY; - if (["de", "es-ES"].includes(currentLanguage)) { + if (["de", "es-ES", "es-MX"].includes(currentLanguage)) { pokemonIconX = -25; pokemonIconY = 10; legendaryLabelX = -6; From dda94c7b22411af71f7f1e52725f8587af89ad55 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Mon, 19 May 2025 17:18:26 -0700 Subject: [PATCH 03/44] [i18n] Update locales --- public/locales | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales b/public/locales index a074ddb28c3..42cd5cf577f 160000 --- a/public/locales +++ b/public/locales @@ -1 +1 @@ -Subproject commit a074ddb28c3f0c7e9bbd0560efa33e3ce5f71bcd +Subproject commit 42cd5cf577f475c22bc82d55e7ca358eb4f3184f From 9746f1a2a6aa61d03137674dad92ef2c72225469 Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Tue, 20 May 2025 02:39:17 +0200 Subject: [PATCH 04/44] [UI/UX] [Localization] Update Korean starterInfoText --- src/ui/starter-select-ui-handler.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 09d7322cb75..ac781a71da0 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -145,8 +145,10 @@ const languageSettings: { [key: string]: LanguageSetting } = { starterInfoXPos: 33, }, ko: { - starterInfoTextSize: "52px", + starterInfoTextSize: "60px", instructionTextSize: "38px", + starterInfoYOffset: -0.5, + starterInfoXPos: 30, }, ja: { starterInfoTextSize: "51px", From 23e1d88c3ad45914602d815fc10ef8b14d1c2c92 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Tue, 20 May 2025 15:40:05 -0400 Subject: [PATCH 05/44] [Balance] Update TM compatibility for Curse (#5791) * Update Curse TM compat with former egg moves/level ups * Pumpkaboo is not Phantump --- src/data/balance/tms.ts | 44 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/src/data/balance/tms.ts b/src/data/balance/tms.ts index 69aef9b135d..b7480e9131d 100644 --- a/src/data/balance/tms.ts +++ b/src/data/balance/tms.ts @@ -19057,8 +19057,15 @@ export const tmSpecies: TmSpecies = { Species.SLAKING, Species.HARIYAMA, Species.NOSEPASS, + Species.ARON, + Species.LAIRON, + Species.AGGRON, + Species.ELECTRIKE, + Species.MANECTRIC, Species.GULPIN, Species.SWALOT, + Species.WAILMER, + Species.WAILORD, Species.NUMEL, Species.CAMERUPT, Species.TORKOAL, @@ -19067,18 +19074,28 @@ export const tmSpecies: TmSpecies = { Species.ZANGOOSE, Species.SEVIPER, Species.WHISCASH, + Species.LILEEP, + Species.CRADILY, + Species.ANORITH, + Species.ARMALDO, Species.SHUPPET, Species.BANETTE, Species.DUSKULL, Species.DUSCLOPS, Species.TROPIUS, Species.CHIMECHO, + Species.ABSOL, + Species.SPHEAL, + Species.SEALEO, + Species.WALREIN, Species.REGIROCK, Species.REGICE, Species.REGISTEEL, Species.TURTWIG, Species.GROTLE, Species.TORTERRA, + Species.BIDOOF, + Species.BIBAREL, Species.CRANIDOS, Species.RAMPARDOS, Species.SHIELDON, @@ -19120,6 +19137,11 @@ export const tmSpecies: TmSpecies = { Species.TEPIG, Species.PIGNITE, Species.EMBOAR, + Species.MUNNA, + Species.MUSHARNA, + Species.ROGGENROLA, + Species.BOLDORE, + Species.GIGALITH, Species.DRILBUR, Species.EXCADRILL, Species.TIMBURR, @@ -19128,28 +19150,44 @@ export const tmSpecies: TmSpecies = { Species.SANDILE, Species.KROKOROK, Species.KROOKODILE, + Species.DWEBBLE, + Species.CRUSTLE, Species.SCRAGGY, Species.SCRAFTY, Species.YAMASK, - Species.COFAGRIGUS, + Species.COFAGRIGUS, + Species.TRUBBISH, + Species.GARBODOR, Species.SAWSBUCK, + Species.FERROSEED, + Species.FERROTHORN, Species.LITWICK, Species.LAMPENT, Species.CHANDELURE, Species.BEARTIC, + Species.SHELMET, + Species.ACCELGOR, + Species.STUNFISK, Species.GOLETT, Species.GOLURK, + Species.HEATMOR, Species.CHESPIN, Species.QUILLADIN, Species.CHESNAUGHT, + Species.TYRUNT, + Species.TYRANTRUM, Species.SYLVEON, Species.GOOMY, Species.SLIGGOO, Species.GOODRA, Species.PHANTUMP, Species.TREVENANT, + Species.PUMPKABOO, + Species.GOURGEIST, Species.BERGMITE, Species.AVALUGG, + Species.ROWLET, + Species.DARTRIX, Species.DECIDUEYE, Species.GUMSHOOS, Species.MUDBRAY, @@ -19157,7 +19195,9 @@ export const tmSpecies: TmSpecies = { Species.PASSIMIAN, Species.SANDYGAST, Species.PALOSSAND, + Species.PYUKUMUKU, Species.KOMALA, + Species.TURTONATOR, Species.MIMIKYU, Species.SKWOVET, Species.GREEDENT, @@ -19169,6 +19209,7 @@ export const tmSpecies: TmSpecies = { Species.SINISTEA, Species.POLTEAGEIST, Species.PERRSERKER, + Species.CURSOLA, Species.RUNERIGUS, Species.PINCURCHIN, Species.STONJOURNER, @@ -19236,6 +19277,7 @@ export const tmSpecies: TmSpecies = { Species.GALAR_WEEZING, Species.GALAR_SLOWKING, Species.GALAR_YAMASK, + Species.GALAR_STUNFISK, Species.HISUI_ELECTRODE, Species.HISUI_TYPHLOSION, Species.HISUI_QWILFISH, From 663c64fdb41c51a4104ba270639f93c862698296 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Tue, 20 May 2025 16:46:23 -0500 Subject: [PATCH 06/44] [Misc] Fix trailing whitespace (#5856) Remove trailing whitespace --- src/data/balance/signature-species.ts | 6 +++--- src/data/balance/tms.ts | 4 ++-- src/field/pokemon.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/data/balance/signature-species.ts b/src/data/balance/signature-species.ts index fb8f33d4435..04749a67521 100644 --- a/src/data/balance/signature-species.ts +++ b/src/data/balance/signature-species.ts @@ -8,11 +8,11 @@ export type SignatureSpecies = { * The signature species for each Gym Leader, Elite Four member, and Champion. * The key is the trainer type, and the value is an array of Species or Species arrays. * This is in a separate const so it can be accessed from other places and not just the trainerConfigs - * + * * @remarks - * The `Proxy` object allows us to define a handler that will intercept + * The `Proxy` object allows us to define a handler that will intercept * the property access and return an empty array if the property does not exist in the object. - * + * * This means that accessing `signatureSpecies` will not throw an error if the property does not exist, * but instead default to an empty array. */ diff --git a/src/data/balance/tms.ts b/src/data/balance/tms.ts index b7480e9131d..06d191c3b2a 100644 --- a/src/data/balance/tms.ts +++ b/src/data/balance/tms.ts @@ -67104,7 +67104,7 @@ export const tmSpecies: TmSpecies = { Species.CHEWTLE, Species.DREDNAW, Species.YAMPER, - Species.BOLTUND, + Species.BOLTUND, Species.ROLYCOLY, Species.CARKOL, Species.COALOSSAL, @@ -67121,7 +67121,7 @@ export const tmSpecies: TmSpecies = { Species.SIZZLIPEDE, Species.CENTISKORCH, Species.CLOBBOPUS, - Species.GRAPPLOCT, + Species.GRAPPLOCT, Species.SINISTEA, Species.POLTEAGEIST, Species.HATENNA, diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 8abe3a303ca..fcca0c5614a 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -5678,7 +5678,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** * Performs the action of clearing a Pokemon's status - * + * * This is a helper to {@linkcode resetStatus}, which should be called directly instead of this method */ public clearStatus(confusion: boolean, reloadAssets: boolean) { From 288e4e7e7eb9e6a9d450369a9c11cb0945845fcd Mon Sep 17 00:00:00 2001 From: itgalex24 <123003541+itgalex24@users.noreply.github.com> Date: Tue, 20 May 2025 19:12:54 -0400 Subject: [PATCH 07/44] [Bug] [Move] Synchronoise hitting Tera Type fix (#5779) * synchronoize fix * Add regression test for synchronoise --------- Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> --- src/data/moves/move.ts | 6 ++--- test/moves/synchronoise.test.ts | 47 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 test/moves/synchronoise.test.ts diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 235cb954ea5..b190729621c 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -8052,10 +8052,10 @@ export class UpperHandCondition extends MoveCondition { } } -export class hitsSameTypeAttr extends VariableMoveTypeMultiplierAttr { +export class HitsSameTypeAttr extends VariableMoveTypeMultiplierAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const multiplier = args[0] as NumberHolder; - if (!user.getTypes().some(type => target.getTypes().includes(type))) { + if (!user.getTypes(true).some(type => target.getTypes(true).includes(type))) { multiplier.value = 0; return true; } @@ -9756,7 +9756,7 @@ export function initMoves() { new AttackMove(Moves.SYNCHRONOISE, PokemonType.PSYCHIC, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 5) .target(MoveTarget.ALL_NEAR_OTHERS) .condition(unknownTypeCondition) - .attr(hitsSameTypeAttr), + .attr(HitsSameTypeAttr), new AttackMove(Moves.ELECTRO_BALL, PokemonType.ELECTRIC, MoveCategory.SPECIAL, -1, 100, 10, -1, 0, 5) .attr(ElectroBallPowerAttr) .ballBombMove(), diff --git a/test/moves/synchronoise.test.ts b/test/moves/synchronoise.test.ts new file mode 100644 index 00000000000..0f59bce26b4 --- /dev/null +++ b/test/moves/synchronoise.test.ts @@ -0,0 +1,47 @@ +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { PokemonType } from "#enums/pokemon-type"; +import { Species } from "#enums/species"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Synchronoise", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.SYNCHRONOISE]) + .ability(Abilities.BALL_FETCH) + .battleStyle("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH); + }); + + it("should consider the user's tera type if it is terastallized", async () => { + await game.classicMode.startBattle([Species.BIDOOF]); + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + // force the player to be terastallized + playerPokemon.teraType = PokemonType.WATER; + playerPokemon.isTerastallized = true; + game.move.select(Moves.SYNCHRONOISE); + await game.phaseInterceptor.to("BerryPhase"); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp()); + }); +}); From b72389295e69625406393f4b4087be3191ec8382 Mon Sep 17 00:00:00 2001 From: Madmadness65 <59298170+Madmadness65@users.noreply.github.com> Date: Tue, 20 May 2025 21:07:37 -0500 Subject: [PATCH 08/44] [Animation] [P3 Bug] Fix Sandstorm weather animation not playing properly (#5853) Fix Sandstorm weather animation not playing properly The sandstorm background image is now properly used within the weather animation's JSON. --- public/battle-anims/common-sandstorm.json | 73 +++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/public/battle-anims/common-sandstorm.json b/public/battle-anims/common-sandstorm.json index b5b2d29f54c..fba90a08645 100644 --- a/public/battle-anims/common-sandstorm.json +++ b/public/battle-anims/common-sandstorm.json @@ -542,6 +542,79 @@ "volume": 100, "pitch": 55, "eventType": "AnimTimedSoundEvent" + }, + { + "frameIndex": 0, + "resourceName": "PRAS- Sandstorm", + "bgX": -50, + "bgY": 0, + "opacity": 0, + "duration": 5, + "eventType": "AnimTimedAddBgEvent" + }, + { + "frameIndex": 0, + "resourceName": "", + "bgX": -50, + "bgY": 0, + "opacity": 96, + "duration": 3, + "eventType": "AnimTimedUpdateBgEvent" + } + ], + "3": [ + { + "frameIndex": 3, + "resourceName": "", + "bgX": -25, + "bgY": 0, + "opacity": 128, + "duration": 3, + "eventType": "AnimTimedUpdateBgEvent" + } + ], + "6": [ + { + "frameIndex": 6, + "resourceName": "", + "bgX": 0, + "bgY": 0, + "opacity": 192, + "duration": 3, + "eventType": "AnimTimedUpdateBgEvent" + } + ], + "9": [ + { + "frameIndex": 9, + "resourceName": "", + "bgX": 25, + "bgY": 0, + "opacity": 128, + "duration": 3, + "eventType": "AnimTimedUpdateBgEvent" + } + ], + "12": [ + { + "frameIndex": 12, + "resourceName": "", + "bgX": 50, + "bgY": 0, + "opacity": 96, + "duration": 3, + "eventType": "AnimTimedUpdateBgEvent" + } + ], + "15": [ + { + "frameIndex": 15, + "resourceName": "", + "bgX": 50, + "bgY": 0, + "opacity": 0, + "duration": 3, + "eventType": "AnimTimedUpdateBgEvent" } ] }, From f01e7599ac8ea7a1c8fc14f556f0c5ae090c4ea1 Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Wed, 21 May 2025 04:21:35 +0200 Subject: [PATCH 09/44] [UI/UX] [Localization] Update Japanese starterInfoText (#5852) Update Japanese starterInfoText --- src/ui/starter-select-ui-handler.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index ac781a71da0..a35f426e8bd 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -151,8 +151,10 @@ const languageSettings: { [key: string]: LanguageSetting } = { starterInfoXPos: 30, }, ja: { - starterInfoTextSize: "51px", + starterInfoTextSize: "62px", instructionTextSize: "38px", + starterInfoYOffset: 0.5, + starterInfoXPos: 33, }, "ca-ES": { starterInfoTextSize: "52px", From 1cf19b49f26d0b82c102d304d7585fe5bacea785 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Tue, 20 May 2025 22:59:39 -0400 Subject: [PATCH 10/44] [Balance] Moveset generation adjustments (#5801) * Moveset generation adjustments * Remove shiny explosion check, prevent 2 self-KO moves --- src/field/pokemon.ts | 74 +++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index fcca0c5614a..74ccb0c7f49 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -3500,11 +3500,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } let weight = levelMove[0]; // Evolution Moves - if (weight === 0) { + if (weight === EVOLVE_MOVE) { weight = 50; } - // Assume level 1 moves with 80+ BP are "move reminder" moves and bump their weight - if (weight === 1 && allMoves[levelMove[1]].power >= 80) { + // Assume level 1 moves with 80+ BP are "move reminder" moves and bump their weight. Trainers use actual relearn moves. + if (weight === 1 && allMoves[levelMove[1]].power >= 80 || weight === RELEARN_MOVE && this.hasTrainer()) { weight = 40; } if ( @@ -3609,9 +3609,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Bosses never get self ko moves or Pain Split if (this.isBoss()) { - movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttr)); - movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(HpSplitAttr)); + movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttr) && !allMoves[m[0]].hasAttr(HpSplitAttr)); } + // No one gets Memento or Final Gambit movePool = movePool.filter( m => !allMoves[m[0]].hasAttr(SacrificialAttrOnHit), ); @@ -3623,10 +3623,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { m[0], m[1] * (allMoves[m[0]].hasAttr(SacrificialAttr) ? 0.5 : 1), ]); - movePool = movePool.map(m => [ - m[0], - m[1] * (allMoves[m[0]].hasAttr(SacrificialAttrOnHit) ? 0.5 : 1), - ]); // Trainers get a weight bump to stat buffing moves movePool = movePool.map(m => [ m[0], @@ -3687,10 +3683,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ]); /** The higher this is the more the game weights towards higher level moves. At `0` all moves are equal weight. */ - let weightMultiplier = 0.9; - if (this.hasTrainer()) { - weightMultiplier += 0.7; - } + let weightMultiplier = 1.6; if (this.isBoss()) { weightMultiplier += 0.4; } @@ -3699,37 +3692,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { Math.ceil(Math.pow(m[1], weightMultiplier) * 100), ]); - // Trainers and bosses always force a stab move - if (this.hasTrainer() || this.isBoss()) { - const stabMovePool = baseWeights.filter( - m => - allMoves[m[0]].category !== MoveCategory.STATUS && - this.isOfType(allMoves[m[0]].type), - ); + // All Pokemon force a STAB move first + const stabMovePool = baseWeights.filter( + m => + allMoves[m[0]].category !== MoveCategory.STATUS && + this.isOfType(allMoves[m[0]].type), + ); - if (stabMovePool.length) { - const totalWeight = stabMovePool.reduce((v, m) => v + m[1], 0); - let rand = randSeedInt(totalWeight); - let index = 0; - while (rand > stabMovePool[index][1]) { - rand -= stabMovePool[index++][1]; - } - this.moveset.push(new PokemonMove(stabMovePool[index][0], 0, 0)); - } - } else { - // Normal wild pokemon just force a random damaging move - const attackMovePool = baseWeights.filter( - m => allMoves[m[0]].category !== MoveCategory.STATUS, - ); - if (attackMovePool.length) { - const totalWeight = attackMovePool.reduce((v, m) => v + m[1], 0); - let rand = randSeedInt(totalWeight); - let index = 0; - while (rand > attackMovePool[index][1]) { - rand -= attackMovePool[index++][1]; - } - this.moveset.push(new PokemonMove(attackMovePool[index][0], 0, 0)); + if (stabMovePool.length) { + const totalWeight = stabMovePool.reduce((v, m) => v + m[1], 0); + let rand = randSeedInt(totalWeight); + let index = 0; + while (rand > stabMovePool[index][1]) { + rand -= stabMovePool[index++][1]; } + this.moveset.push(new PokemonMove(stabMovePool[index][0], 0, 0)); } while ( @@ -3741,7 +3718,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Other damaging moves 2x weight if 0-1 damaging moves, 0.5x if 2, 0.125x if 3. These weights get 20x if STAB. // Status moves remain unchanged on weight, this encourages 1-2 movePool = baseWeights - .filter(m => !this.moveset.some(mo => m[0] === mo.moveId)) + .filter(m => !this.moveset.some( + mo => + m[0] === mo.moveId || + (allMoves[m[0]].hasAttr(SacrificialAttr) && mo.getMove().hasAttr(SacrificialAttr)) // Only one self-KO move allowed + )) .map(m => { let ret: number; if ( @@ -3772,7 +3753,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { }); } else { // Non-trainer pokemon just use normal weights - movePool = baseWeights.filter(m => !this.moveset.some(mo => m[0] === mo.moveId)); + movePool = baseWeights.filter(m => !this.moveset.some( + mo => + m[0] === mo.moveId || + (allMoves[m[0]].hasAttr(SacrificialAttr) && mo.getMove().hasAttr(SacrificialAttr)) // Only one self-KO move allowed + )); } const totalWeight = movePool.reduce((v, m) => v + m[1], 0); let rand = randSeedInt(totalWeight); @@ -7104,7 +7089,6 @@ export class EnemyPokemon extends Pokemon { if (!dataSource) { this.generateAndPopulateMoveset(); - if (shinyLock || Overrides.OPP_SHINY_OVERRIDE === false) { this.shiny = false; } else { From 4a39adacf88fa9b13a98def0d6dbf10329daba38 Mon Sep 17 00:00:00 2001 From: damocleas Date: Tue, 20 May 2025 23:05:39 -0400 Subject: [PATCH 11/44] [UI/UX] Remove Redundant Unlock Passive text (#5845) * Update starter-select-ui-handler.ts * Update pokedex-page-ui-handler.ts --- src/ui/pokedex-page-ui-handler.ts | 2 +- src/ui/starter-select-ui-handler.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts index ddc16ab5a88..051d267259f 100644 --- a/src/ui/pokedex-page-ui-handler.ts +++ b/src/ui/pokedex-page-ui-handler.ts @@ -1888,7 +1888,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler { if (!(passiveAttr & PassiveAttr.UNLOCKED)) { const passiveCost = getPassiveCandyCount(speciesStarterCosts[this.starterId]); options.push({ - label: `x${passiveCost} ${i18next.t("pokedexUiHandler:unlockPassive")} (${allAbilities[this.passive].name})`, + label: `x${passiveCost} ${i18next.t("pokedexUiHandler:unlockPassive")}`, handler: () => { if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= passiveCost) { starterData.passiveAttr |= PassiveAttr.UNLOCKED | PassiveAttr.ENABLED; diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index a35f426e8bd..f24a3ff9265 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -2184,7 +2184,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { if (!(passiveAttr & PassiveAttr.UNLOCKED)) { const passiveCost = getPassiveCandyCount(speciesStarterCosts[this.lastSpecies.speciesId]); options.push({ - label: `x${passiveCost} ${i18next.t("starterSelectUiHandler:unlockPassive")} (${allAbilities[this.lastSpecies.getPassiveAbility()].name})`, + label: `x${passiveCost} ${i18next.t("starterSelectUiHandler:unlockPassive")}`, handler: () => { if (Overrides.FREE_CANDY_UPGRADE_OVERRIDE || candyCount >= passiveCost) { starterData.passiveAttr |= PassiveAttr.UNLOCKED | PassiveAttr.ENABLED; From 3c934808c004f4e90ef77c30308197eb9ef33e90 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Tue, 20 May 2025 23:42:17 -0400 Subject: [PATCH 12/44] [Sprite] Fix T1 shiny Eternatus not animating in consistent, remove unused exp for Giratina Origin (#5802) Remove Origin Giratina exp, fix consistent shiny Etern Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> --- public/exp-sprites.json | 8 - public/images/pokemon/exp/487-origin.json | 566 ------ public/images/pokemon/exp/487-origin.png | Bin 9290 -> 0 bytes .../images/pokemon/exp/back/487-origin.json | 566 ------ public/images/pokemon/exp/back/487-origin.png | Bin 11381 -> 0 bytes .../pokemon/exp/back/shiny/487-origin.json | 293 --- .../pokemon/exp/back/shiny/487-origin.png | Bin 11381 -> 0 bytes .../images/pokemon/exp/shiny/487-origin.json | 293 --- .../images/pokemon/exp/shiny/487-origin.png | Bin 9290 -> 0 bytes public/images/pokemon/shiny/890.json | 1807 ++++++++++++++++- public/images/pokemon/shiny/890.png | Bin 1666 -> 33055 bytes 11 files changed, 1796 insertions(+), 1737 deletions(-) delete mode 100644 public/images/pokemon/exp/487-origin.json delete mode 100644 public/images/pokemon/exp/487-origin.png delete mode 100644 public/images/pokemon/exp/back/487-origin.json delete mode 100644 public/images/pokemon/exp/back/487-origin.png delete mode 100644 public/images/pokemon/exp/back/shiny/487-origin.json delete mode 100644 public/images/pokemon/exp/back/shiny/487-origin.png delete mode 100644 public/images/pokemon/exp/shiny/487-origin.json delete mode 100644 public/images/pokemon/exp/shiny/487-origin.png diff --git a/public/exp-sprites.json b/public/exp-sprites.json index 2595b5a7983..5580bb5cb7d 100644 --- a/public/exp-sprites.json +++ b/public/exp-sprites.json @@ -179,8 +179,6 @@ "483-origin", "484-origin", "484-origin", - "487-origin", - "487-origin", "531-mega", "531-mega", "569-gigantamax", @@ -1293,8 +1291,6 @@ "483b-origin", "484b-origin", "484b-origin", - "487b-origin", - "487b-origin", "531b-mega", "531b-mega", "569b-gigantamax", @@ -2407,8 +2403,6 @@ "483sb-origin", "484sb-origin", "484sb-origin", - "487sb-origin", - "487sb-origin", "531sb-mega", "531sb-mega", "569sb-gigantamax", @@ -3526,8 +3520,6 @@ "483s-origin", "484s-origin", "484s-origin", - "487s-origin", - "487s-origin", "531s-mega", "531s-mega", "569s-gigantamax", diff --git a/public/images/pokemon/exp/487-origin.json b/public/images/pokemon/exp/487-origin.json deleted file mode 100644 index a146f68d70d..00000000000 --- a/public/images/pokemon/exp/487-origin.json +++ /dev/null @@ -1,566 +0,0 @@ -{ - "textures": [ - { - "image": "487-origin.png", - "format": "RGBA8888", - "size": { - "w": 318, - "h": 318 - }, - "scale": 1, - "frames": [ - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 91, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 77 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 91, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 77 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 9, - "w": 91, - "h": 74 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 74 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 91, - "h": 74 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 74 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 91, - "h": 74 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 74 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 86, - "h": 79 - }, - "frame": { - "x": 91, - "y": 74, - "w": 86, - "h": 79 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 8, - "w": 86, - "h": 79 - }, - "frame": { - "x": 91, - "y": 74, - "w": 86, - "h": 79 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 85, - "h": 83 - }, - "frame": { - "x": 0, - "y": 77, - "w": 85, - "h": 83 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 85, - "h": 83 - }, - "frame": { - "x": 0, - "y": 77, - "w": 85, - "h": 83 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 85, - "h": 82 - }, - "frame": { - "x": 177, - "y": 75, - "w": 85, - "h": 82 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 83, - "h": 83 - }, - "frame": { - "x": 85, - "y": 153, - "w": 83, - "h": 83 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 83, - "h": 83 - }, - "frame": { - "x": 85, - "y": 153, - "w": 83, - "h": 83 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 80, - "h": 82 - }, - "frame": { - "x": 0, - "y": 236, - "w": 80, - "h": 82 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 80, - "h": 82 - }, - "frame": { - "x": 0, - "y": 236, - "w": 80, - "h": 82 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 6, - "y": 3, - "w": 80, - "h": 82 - }, - "frame": { - "x": 0, - "y": 236, - "w": 80, - "h": 82 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 83, - "h": 76 - }, - "frame": { - "x": 0, - "y": 160, - "w": 83, - "h": 76 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 2, - "y": 5, - "w": 83, - "h": 76 - }, - "frame": { - "x": 0, - "y": 160, - "w": 83, - "h": 76 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 81, - "h": 81 - }, - "frame": { - "x": 80, - "y": 236, - "w": 81, - "h": 81 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 81, - "h": 80 - }, - "frame": { - "x": 161, - "y": 236, - "w": 81, - "h": 80 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 81, - "h": 80 - }, - "frame": { - "x": 161, - "y": 236, - "w": 81, - "h": 80 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 3, - "w": 81, - "h": 79 - }, - "frame": { - "x": 168, - "y": 157, - "w": 81, - "h": 79 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 81, - "h": 79 - }, - "frame": { - "x": 168, - "y": 157, - "w": 81, - "h": 79 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 81, - "h": 79 - }, - "frame": { - "x": 168, - "y": 157, - "w": 81, - "h": 79 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:f669baef18fc6ae83124ad81c9b726f9:b705ee5bfe7dc7d92c348ffa4a4d6ce2:5d19509f6557fe13b0b6311434ba7e2d$" - } -} diff --git a/public/images/pokemon/exp/487-origin.png b/public/images/pokemon/exp/487-origin.png deleted file mode 100644 index 370ddf89173dc731773c3d0904099d582a00e295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9290 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 sR?Pp9(#aC%{ diff --git a/public/images/pokemon/exp/back/487-origin.json b/public/images/pokemon/exp/back/487-origin.json deleted file mode 100644 index 72f5e4d4dc4..00000000000 --- a/public/images/pokemon/exp/back/487-origin.json +++ /dev/null @@ -1,566 +0,0 @@ -{ - "textures": [ - { - "image": "487-origin.png", - "format": "RGBA8888", - "size": { - "w": 326, - "h": 326 - }, - "scale": 1, - "frames": [ - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 2, - "w": 95, - "h": 84 - }, - "frame": { - "x": 0, - "y": 0, - "w": 95, - "h": 84 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 1, - "w": 95, - "h": 84 - }, - "frame": { - "x": 0, - "y": 0, - "w": 95, - "h": 84 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 97, - "h": 79 - }, - "frame": { - "x": 0, - "y": 84, - "w": 97, - "h": 79 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 2, - "y": 7, - "w": 97, - "h": 79 - }, - "frame": { - "x": 0, - "y": 84, - "w": 97, - "h": 79 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 97, - "h": 78 - }, - "frame": { - "x": 95, - "y": 0, - "w": 97, - "h": 78 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 97, - "h": 78 - }, - "frame": { - "x": 95, - "y": 0, - "w": 97, - "h": 78 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 97, - "h": 78 - }, - "frame": { - "x": 95, - "y": 0, - "w": 97, - "h": 78 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 4, - "w": 94, - "h": 84 - }, - "frame": { - "x": 97, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 94, - "h": 84 - }, - "frame": { - "x": 97, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 2, - "w": 94, - "h": 84 - }, - "frame": { - "x": 97, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 95, - "h": 81 - }, - "frame": { - "x": 97, - "y": 162, - "w": 95, - "h": 81 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 1, - "y": 7, - "w": 95, - "h": 81 - }, - "frame": { - "x": 97, - "y": 162, - "w": 95, - "h": 81 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 1, - "w": 94, - "h": 84 - }, - "frame": { - "x": 191, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 94, - "h": 84 - }, - "frame": { - "x": 191, - "y": 78, - "w": 94, - "h": 84 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 94, - "h": 77 - }, - "frame": { - "x": 192, - "y": 0, - "w": 94, - "h": 77 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 94, - "h": 77 - }, - "frame": { - "x": 192, - "y": 0, - "w": 94, - "h": 77 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 94, - "h": 77 - }, - "frame": { - "x": 192, - "y": 0, - "w": 94, - "h": 77 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 94, - "h": 83 - }, - "frame": { - "x": 0, - "y": 163, - "w": 94, - "h": 83 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 92, - "h": 83 - }, - "frame": { - "x": 192, - "y": 162, - "w": 92, - "h": 83 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 92, - "h": 82 - }, - "frame": { - "x": 94, - "y": 243, - "w": 92, - "h": 82 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 92, - "h": 82 - }, - "frame": { - "x": 94, - "y": 243, - "w": 92, - "h": 82 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 90, - "h": 78 - }, - "frame": { - "x": 0, - "y": 246, - "w": 90, - "h": 78 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 90, - "h": 78 - }, - "frame": { - "x": 0, - "y": 246, - "w": 90, - "h": 78 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 91, - "h": 81 - }, - "frame": { - "x": 186, - "y": 245, - "w": 91, - "h": 81 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 91, - "h": 81 - }, - "frame": { - "x": 186, - "y": 245, - "w": 91, - "h": 81 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 101, - "h": 88 - }, - "spriteSourceSize": { - "x": 5, - "y": 1, - "w": 91, - "h": 81 - }, - "frame": { - "x": 186, - "y": 245, - "w": 91, - "h": 81 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d1a63c2aac4c99e778e6efb9fa120e53:11f49886c328fc8474daefc2533a7f5d:5d19509f6557fe13b0b6311434ba7e2d$" - } -} diff --git a/public/images/pokemon/exp/back/487-origin.png b/public/images/pokemon/exp/back/487-origin.png deleted file mode 100644 index ec3dfd6c8f80a4965e4bfbc29aa3f66ca7884c35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11381 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 xNbp>=^G*ET-)hwY|mOtxE6KtqFvCumAu60d!JM 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 DdfIMP diff --git a/public/images/pokemon/exp/shiny/487-origin.json b/public/images/pokemon/exp/shiny/487-origin.json deleted file mode 100644 index d770a34a1b8..00000000000 --- a/public/images/pokemon/exp/shiny/487-origin.json +++ /dev/null @@ -1,293 +0,0 @@ -{ - "textures": [ - { - "image": "487-origin.png", - "format": "RGBA8888", - "size": { - "w": 318, - "h": 318 - }, - "scale": 1, - "frames": [ - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 8, - "w": 91, - "h": 77 - }, - "frame": { - "x": 0, - "y": 0, - "w": 91, - "h": 77 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 10, - "w": 91, - "h": 74 - }, - "frame": { - "x": 91, - "y": 0, - "w": 91, - "h": 74 - } - }, - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 6, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 89, - "h": 75 - }, - "frame": { - "x": 182, - "y": 0, - "w": 89, - "h": 75 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 86, - "h": 79 - }, - "frame": { - "x": 91, - "y": 74, - "w": 86, - "h": 79 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 1, - "w": 85, - "h": 83 - }, - "frame": { - "x": 0, - "y": 77, - "w": 85, - "h": 83 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 85, - "h": 82 - }, - "frame": { - "x": 177, - "y": 75, - "w": 85, - "h": 82 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 4, - "y": 2, - "w": 83, - "h": 83 - }, - "frame": { - "x": 85, - "y": 153, - "w": 83, - "h": 83 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 80, - "h": 82 - }, - "frame": { - "x": 0, - "y": 236, - "w": 80, - "h": 82 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 2, - "y": 4, - "w": 83, - "h": 76 - }, - "frame": { - "x": 0, - "y": 160, - "w": 83, - "h": 76 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 81, - "h": 81 - }, - "frame": { - "x": 80, - "y": 236, - "w": 81, - "h": 81 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 81, - "h": 80 - }, - "frame": { - "x": 161, - "y": 236, - "w": 81, - "h": 80 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 91, - "h": 87 - }, - "spriteSourceSize": { - "x": 5, - "y": 2, - "w": 81, - "h": 79 - }, - "frame": { - "x": 168, - "y": 157, - "w": 81, - "h": 79 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:00abebb007c47ada81d4e754581d7146:4691e19364eb9392dbee1ee37d737c8b:5d19509f6557fe13b0b6311434ba7e2d$" - } -} diff --git a/public/images/pokemon/exp/shiny/487-origin.png b/public/images/pokemon/exp/shiny/487-origin.png deleted file mode 100644 index d0f0fdb6b9b40f63b37a71c4d9197fbdd095c60d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9290 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

oS}2mx?{p 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 delta 1649 zcmV-%29Eikf&zjKGKo-5M-2)Z3IG5A4M|8uQUCw|TmS$7SOfzA004?mjeP(B05DKY zR7C&)00993GXN}+GADlzf~QRY0004WQchCl(Q?R&sKm! zDRoJ!Yg(X6qyQjw5R`-T_ulO8?cC&Y7a6-|%=^smecx~P&v<`tv<2+7G?3RR+*b}X zE})^|1)8`+az2L+zLj@D{`P|g@*)MC&w~!W4=&8X@@(Brw0|CEE(a7mQ0Hl7bJXCP zcY-q=8=W$RrcI`0Bk=Hhc>#ycb;=#3zt6+I;t97H`XGID$sUcTzEnlx~ zJ{${#E|L@vv)N z!0i{t{LS1d!{i1%;Vg^rq%YlCn|bqi*njxE`{EcmWxVEuS18n1}x% zHb3lUA|$pv$H7@!GUviMH|F6nCc)y{qF9m7Q#ya|V$mf(EDCJ>ae&@74ht40q~IV59!_~J2iG)m{P~SoPrS`24LUlee%u@B%t3$Fby9FX;Pa1KRQi6UQZic=xWw>t z&aJL;o-!#@=F*H#bin4Q^lhi1jtY(QU`|=b*Cn5CqLF2|iOGvq#CG$y@$DJWwp*y^V7i2unQaV%7X&%T} zb@u69$Usrr(yb1SWg{qo(S^tpd& zQd}@&iI=!66`pM0o0y5AgIH-bV*MMGQrTu9d3p4BJ2&IW_h0Kh4QeEZeIt}Ha!4?~ zKO!Ydkl#iA&G^?J_b|<}9Hq@z$o6Pt`7@VB_9fL^j@mo>$RkHCBA zV2Vjjy!hTE|Ngt9qx)LuOOnwHyZBZj52RdNX~0t@B__o35wQFi|5@KVj5>-@jS;AqL{gANO@U00v(2qZ-cmXHg{zRn$X9=S;?spF zfHh{^WB7RTk$!hWWTrJh@(GnMd@D^rIe2gwi#T~EP8N4fka8eq#oRo`O zi8+*4PlzopNs03XPK(ZC4h*#7*)dKRvR3Y?%QByb+E$r3u>(UI@~80%u@c*eADfJtz#^*E$26d00000NkvXXu0mjfz!NVj From d1b0bbb155087d174d053aeab4de643382878062 Mon Sep 17 00:00:00 2001 From: Sophia Date: Wed, 21 May 2025 08:14:16 +0100 Subject: [PATCH 13/44] [Bug]: Fix #5010: roar and whirlwind missing fail message when against a trainer (#5659) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [BUG] Fixes #5010 Roar and Whirlwind don´t display a fail message Roar and Whirlwind should now display a fail message when used against a trainer with only one pokémon left * Apply suggestions from code review made by SirzBenjie --- src/data/moves/move.ts | 15 +++++++++++++++ test/moves/whirlwind.test.ts | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index b190729621c..71807288abc 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -6390,8 +6390,23 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { return (user, target, move) => { const switchOutTarget = (this.selfSwitch ? user : target); const player = switchOutTarget instanceof PlayerPokemon; + const forceSwitchAttr = move.getAttrs(ForceSwitchOutAttr).find(attr => attr.switchType === SwitchType.FORCE_SWITCH); if (!this.selfSwitch) { + if (move.hitsSubstitute(user, target)) { + return false; + } + + // Check if the move is Roar or Whirlwind and if there is a trainer with only Pokémon left. + if (forceSwitchAttr && globalScene.currentBattle.trainer) { + const enemyParty = globalScene.getEnemyParty(); + // Filter out any Pokémon that are not allowed in battle (e.g. fainted ones) + const remainingPokemon = enemyParty.filter(p => p.hp > 0 && p.isAllowedInBattle()); + if (remainingPokemon.length <= 1) { + return false; + } + } + // Dondozo with an allied Tatsugiri in its mouth cannot be forced out const commandedTag = switchOutTarget.getTag(BattlerTagType.COMMANDED); if (commandedTag?.getSourcePokemon()?.isActive(true)) { diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts index 6b5133ec7b1..67ffb77612c 100644 --- a/test/moves/whirlwind.test.ts +++ b/test/moves/whirlwind.test.ts @@ -10,6 +10,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { Status } from "#app/data/status-effect"; import { StatusEffect } from "#enums/status-effect"; +import { globalScene } from "#app/global-scene"; import { BattlerIndex } from "#app/battle"; import { BattleType } from "#enums/battle-type"; import { TrainerType } from "#enums/trainer-type"; @@ -161,6 +162,37 @@ describe("Moves - Whirlwind", () => { expect(eevee.isOnField()).toBe(false); }); + it("should fail when player uses Whirlwind against an opponent with only one available Pokémon", async () => { + // Set up the battle scenario with the player knowing Whirlwind + game.override.startingWave(5).enemySpecies(Species.PIDGEY).moveset([Moves.WHIRLWIND]); + await game.classicMode.startBattle(); + + const enemyParty = game.scene.getEnemyParty(); + + // Ensure the opponent has only one available Pokémon + if (enemyParty.length > 1) { + enemyParty.slice(1).forEach(p => { + p.hp = 0; + p.status = new Status(StatusEffect.FAINT); + }); + } + const eligibleEnemy = enemyParty.filter(p => p.hp > 0 && p.isAllowedInBattle()); + expect(eligibleEnemy.length).toBe(1); + + // Spy on the queueMessage function + const queueSpy = vi.spyOn(globalScene, "queueMessage"); + + // Player uses Whirlwind; opponent uses Splash + game.move.select(Moves.WHIRLWIND); + await game.forceEnemyMove(Moves.SPLASH); + await game.toNextTurn(); + + // Verify that the failure message is displayed for Whirlwind + expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But it failed")); + // Verify the opponent's Splash message + expect(queueSpy).toHaveBeenCalledWith(expect.stringContaining("But nothing happened!")); + }); + it("should not pull in the other trainer's pokemon in a partner trainer battle", async () => { game.override .startingWave(2) From ebac2d112606d8e9c9418b1db33974541b45aaf2 Mon Sep 17 00:00:00 2001 From: Madmadness65 <59298170+Madmadness65@users.noreply.github.com> Date: Wed, 21 May 2025 15:38:24 -0500 Subject: [PATCH 14/44] [Sprite] [P3 Bug] Fix Wishiwashi's shadow appearing broken (#5815) Fix Wishiwashi's shadow appearing broken Cropped all of Wishiwashi-solo's frames from 96x96 to 50x50, then re-exported the atlases. This fixed the shadows appearing broken in the animation. --- public/images/pokemon/exp/746.json | 2129 +++++++++++++++------- public/images/pokemon/exp/746.png | Bin 900 -> 1527 bytes public/images/pokemon/exp/shiny/746.json | 2128 ++++++++++++++------- public/images/pokemon/exp/shiny/746.png | Bin 868 -> 1509 bytes 4 files changed, 2978 insertions(+), 1279 deletions(-) diff --git a/public/images/pokemon/exp/746.json b/public/images/pokemon/exp/746.json index f4967f59669..9f5db562bf0 100644 --- a/public/images/pokemon/exp/746.json +++ b/public/images/pokemon/exp/746.json @@ -1,641 +1,1490 @@ -{ "frames": [ - { - "filename": "0001.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0002.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0003.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0004.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0005.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0006.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 42, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0007.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 44, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0008.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 46, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0009.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 47, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0010.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0011.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0012.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0013.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0014.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0015.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 47, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0016.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 46, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0017.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 44, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0018.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 42, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0019.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0020.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0021.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0022.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0023.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0024.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 42, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0025.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 44, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0026.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 46, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0027.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 47, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0028.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0029.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0030.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0031.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0032.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0033.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 47, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0034.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 46, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0035.png", - "frame": { "x": 1, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 44, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0036.png", - "frame": { "x": 40, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 42, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0037.png", - "frame": { "x": 40, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0038.png", - "frame": { "x": 75, "y": 26, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0039.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0040.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0041.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0042.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 42, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0043.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 44, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0044.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 46, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0045.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 47, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0046.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0047.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0048.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0049.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0050.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0051.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 47, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0052.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 46, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0053.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 44, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0054.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0055.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0056.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0057.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 41, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0058.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 42, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0059.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 44, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0060.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 46, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0061.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 47, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0062.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0063.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0064.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0065.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0066.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 48, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0067.png", - "frame": { "x": 79, "y": 1, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 47, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0068.png", - "frame": { "x": 1, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 46, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0069.png", - "frame": { "x": 1, "y": 26, "w": 39, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 44, "w": 37, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - }, - { - "filename": "0070.png", - "frame": { "x": 36, "y": 51, "w": 35, "h": 25 }, - "rotated": false, - "trimmed": true, - "spriteSourceSize": { "x": 28, "y": 42, "w": 33, "h": 23 }, - "sourceSize": { "w": 96, "h": 96 }, - "duration": 110 - } - ], - "meta": { - "app": "https://www.aseprite.org/", - "version": "1.3.13-x64", - "image": "746.png", - "format": "I8", - "size": { "w": 119, "h": 77 }, - "scale": "1" - } +{ + "textures": [ + { + "image": "746.png", + "format": "RGBA8888", + "size": { + "w": 100, + "h": 100 + }, + "scale": 1, + "frames": [ + { + "filename": "0001.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0003.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0005.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0007.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 18, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0009.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 21, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0011.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0013.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0015.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 21, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0017.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 18, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0019.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0021.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0023.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0025.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 18, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0027.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 21, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0029.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0031.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0033.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 21, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0035.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 18, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0037.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 39, + "y": 0, + "w": 39, + "h": 25 + } + }, + { + "filename": "0039.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0041.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0043.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 18, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0045.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 21, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0047.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0049.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0051.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 21, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0053.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 18, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0055.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0057.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0059.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 18, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0061.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 21, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0063.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0065.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0067.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 21, + "w": 39, + "h": 25 + }, + "frame": { + "x": 0, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0069.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 18, + "w": 39, + "h": 25 + }, + "frame": { + "x": 39, + "y": 25, + "w": 39, + "h": 25 + } + }, + { + "filename": "0002.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0004.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0006.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 16, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0008.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 20, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0010.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0012.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0014.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0016.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 20, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0018.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 16, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0020.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0022.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0024.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 16, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0026.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 20, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0028.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0030.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0032.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0034.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 20, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0036.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 16, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0038.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 35, + "h": 25 + }, + "frame": { + "x": 0, + "y": 75, + "w": 35, + "h": 25 + } + }, + { + "filename": "0040.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0042.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 16, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0044.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 20, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0046.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0048.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0050.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0052.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 20, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0054.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0056.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 15, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0058.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 16, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0060.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 20, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0062.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0064.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0066.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 22, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0068.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 20, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 50, + "w": 35, + "h": 25 + } + }, + { + "filename": "0070.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 50, + "h": 50 + }, + "spriteSourceSize": { + "x": 7, + "y": 16, + "w": 35, + "h": 25 + }, + "frame": { + "x": 35, + "y": 75, + "w": 35, + "h": 25 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:f7634f2f6edeb6f56071bb6680b7f94b:08a6c2c31e47fffe1f31594d207e513f:1a4f7e535d823202c4828f963d5b4404$" + } } diff --git a/public/images/pokemon/exp/746.png b/public/images/pokemon/exp/746.png index e2be0f27de7d630b0a3822b51f7cd70dc014b5ae..e06ee8916dee53c56537173bf67fc8afe6b9b770 100644 GIT binary patch literal 1527 zcmZ8heKga182@c;SzMQ6Szg0p&HG#1F6!2>Y}uB#gc3Uqd98~K$5qBq#LTYPrt(r9 z$6|(yR!lFLaLY>wU1f2*SMEWby7F>=>vsR?Ip_I)KF{ZQzR&kO-|so!OFncjO?3lx z001;8WKTa3nJPzY16Qy85s@H3lKi~ffrcTYw_pH^BGQNe&{V9k&VYk4-iI1MGBIN? zViUcX3Tuz*k0RN`Tr~g&RysI2J3wyy*Hv{Q{KkKs_#jsq6zmKA zQt9XN1IWJaa&&M|Wno(LdfVZBn;<((@gxSE@pxA;#S=MbdrS_%Q|u-OwzlGG6Q(ZC z;L|7LcF*s`5o!}o`*Zr8?{7lRmnz6%Yxz=7RHpW)O#Kndjgx!&t?ns$dneo1`{C{~ zY^(&M(6DnjWtXA3SS{wzrVG1i2~k;c+kWU%^9mP(& zMXmf8!r^qOzXF_LLiq;$z@<+_mn>7kVpObqm#+N$REanxGIm!4u5QQ0YwbxjUNd*5 zJbR_aH!n?o%8hOqm4yi6jwZM}&oqvVH>aG{j?hh`N%fbqLiuB2TE9+_5Gxfph1N6L zuIW~bt8LaZzKQom`93f{eN}s@h-rpkQC;=W z(pT(5W8U%AHje~BF(=A?^NsOf2QbZ0{s&rTa_clBb_VD723Sl-OSw2ACcTcv=Y$W^ zqijI|@$v#HDTHvnCB>?P6nt?;X@?eN7amwk#mGp(1-Po;)o1U%BL})Qw-!hRqp(9q zr#qh2EIp5}X0?0I{}h9az{QqIbLKFY#kZ*AF%x&9IM{lu##ZGz89ASm-NUX$*R$$u z?aauo?Ww{SLFgbq;_zdExOm5YZ(Ghj3mC-&zYG;cTW6tZaH11H^MgDwKE*)ZG9o&m z36^dw%a%6=L9v~8&EYa1r|OxGhr0~xf00wD-aLNzE^_WZH&$*GzOhLCn8evi!A)Hl zau$;CsQi^M3;p56X_v!Q1kZ#T%JW(|^H3IN~jQG`S6eefzt>)?VqyS5m| z(6nYhX?t2`a%W11UF#JCokd6IT*{Pq9~|RxhaZVE9x~6K6vkXO#}F7<*`pY;s}iSx zuhr4G?}LQO`lT!W-1pd#R)M7D?Z|H8aMjm0*Ztl=gLhes;t5UP&c0@~BZ;K}^5MMW zXFx%}L|9lV^j-;*Rxv$gNqP48Kx=fxaiVa4C7 O--SY=dp5X-v;PIZC4Q*@ literal 900 zcmV-~1AF|5P)Px#Hc(7dMF0Q*5D*X_Az@u+ZDDJ2oJCtVN0Ucn$v&LBVaVQ$oSluFo!Envu*JsA z($3h~+V1Y|{{H?~Y_NC$000tnQchC<|NsC0|NsC0|NsC0|NsC0|6aj{J^%m$-bqA3 zRA_F8$N)Ft(#lvq^yZ4qsotyauYDW8bdO zT&V{55r)oEP1lI4RF@&Nu_i>*G}Wmti_o13PaUpEUA93tuOUeMt+*O=S(Nv6UeP-0 zcZONKMm9FDBDS_zoZx+Z&bQlya`l};^e0}Z1BZ!58pHFOKhH>dkhP3z|o(Q^=|F5-37?6 zxK-8|kTcvC&u+WS4QTB64<~ZR!jBiC?$sahd|v zjYibK_Y3kuXtusWW<@NFXiO<_qCg+P8H^~s;c8(80DcrWg#`;9Ug!ucP9M%;8+PSY zx*2d9!#5mpKk!@>GdhcTxX}NH$CAs_7=tKxs4nwzJN5emDl+<<-OjMHfvW5mS5F}S zn0y@zVngxT=jEDz*wkbp4!3I*aoPO3lxlH>kBULpZ0@PR;{BLT^EJ87r!KB$Ol znY~K#Nj8&q9`B%9%QBdEJ@l~ zZfExk87N1p5mq2e+IeobHV86M8>vEgUt!WtbGujWAXCfiHIgp)qufqrKeIEEuK0K$ z4@ORs#>WGBFdZc8+#AR*3_%|$TK5KWcBVQB!yg6mPLg7sKrYVg3H~^c%QJh>N`bs1 zvy)K^jZLXTNVv80(n9h7mAn$3r zpSJU7?G@5rg0!7IYp;<*eOqa}_N@JVAeZ({pOCZrWlP(F%-&!56LM?IK;F*m{Uu4; z?aY3paXW1bGW($wYX@>^WBoub?yMik<*ii%xwNfvAn$0a8OVFvY6Wt6U*$k9ZTuI= a&#eFaD3{mT#6>3n00001jV3HCuUK7ORh&R5Mn+d3=$BJ>-<6gqazytA`=KKB)+a^~pppZ9gVz2l zz@%9u28wC2=}ayFAkiv?0cGX-kW)XI8lD_g8#?3_Oh zbTvRZ*W<#$y&z}}Xg~%6Fn}Qd7{qo$iv7k_TUx@_eeuH~PJ+P!6ok7VO~_UI;!lLQ zNN#?v^UxLc+JpEysF&&(PGgen<3cG%s0>##**{#@PdGW_?gvecVP z`U)x&DQU&zNXGl&S-VAuO3GBs+sDZFRzaJi0JN(X6W5s(RpV<1;%ir&j!Y!J-xv^D^cXKueg|DgK3r|9Y|S&hWc9EavvHP*>$UEct>JGC9(5(B zvJ09hdifU_qL5S}uXV-!&J$)LI!@PooRp%eT=3D$W_MNR;7qag8o@Uo5qdr9@@lRh z{%la=jHgre_K=2x#xlgC{$54=RG$!81pzs-iFK}Il)}^)-Y1P$`UUg^2iTU}lXbR|dwC1B-@oAL*5#@J10Ge*0~8Z7-V4>|yjCVejzX z%6BwZ1C5;*;pGW7S*8pG*&bj7!upJ&Vz$&8lI=~mS-J77uDvh_Px>xWkR54>8CV!s z=KMOea}r-`4(@D3;yueM-0nC?!f1SJ1?Du1-oc$Nm78Lbln)I8?SzyCEvqJ`Fm}~u z4(~Zy;dbLtYZ~h+yhDNRLEU?G$oqtD*E;NTQP_p-NIXVH=*HB@aQ?WaG=5a$80hud z?wU9#Y|?>U;F`?>B$K!$cnmE`mJRRn~ZHa||mszVGC4h9-H?%n8OWa+Fcr z6*UcsAU$DEs5GXDS0Cv_-6WJWc7lm$ywOtG6#Vle0zG{nV=3hQT`PLJXlB$We02G- zE_v{*?I*t_8-{qZuK`k!U#BOKn9NK*n3v5BoW8_m6lsCVOyV@vcRMlacWO=j%JCO{Bh?)p~&TA^sGB{xKXq+-O<_ zvGi&JU?=brr{=bsr7<{JnH)6!$LoX-zfUOZ`)1#6SphFE+rR3pR{bd;)t6H55uN=H Dzsqv2 literal 868 zcmV-q1DpJbP)Px#Fi=cXMF0Q*5D*X_Az_?FTZ(#U*p3DM&=@yIlSgF9jGUd=gOtX;m(0@6*xB0g z@xcE6{`Y3ZZ2$lO5Oh*bQvm<}|NsC0|NsC0|NsC0|G-d-LjV8*#z{m$R9Juxa|lO*O)^Xr49I`aWQR z2_k*eieO#W5|c(|wJkF+Q{u?XWpoOE8=pc}ZTqsLGt90+;PCo8wCoJDGZ3op@_MbP zR(-6+=#19jkTFfPRM9Z0$(|pw1r>dX7M>Ajun;NNkA*Y?(O6353MU722xJj5 z`oq)~6ad%}Kp2q&i)Pv!Ii?KK$U#$9M4tyr5ShbfhwGjEM?b$Ki#EE)K3l4W2N9}E zCWnmjm$f#O5DHgzh_3NN$QM8A-2y*Ez0!D1;GKJJaHC$4G=YcbgNhmT$UrBEVQ7C=0)Mv6;A<6%ZOLY4(H;QO&sToM|sA!0?E1#@ur zQ;ZZ>3XPVGcC^wc5eV0_o#K)_7~J_JARQ$KzJQbB(mbfOJ5B=fQ8IA$W2Lw_4_ae3 z5_uNPL3n~U@*s&?7W5!I!(XGG6Fd+!{59%1!30sqzNj|`1o$9n*%$SK>(K%HXE&l= z2MFQ)sK**5g14d`FAF*;5cQZ@kdBK)y}m4HN+9a7N-XLzyB$xDyHStVE_htsi+UaH zB%)qVJBg^r?^jE5@w>rF)ay9CN|H<84Q8OPUo*)i?*? Date: Wed, 21 May 2025 19:05:09 -0500 Subject: [PATCH 15/44] [GitHub] Make tests skip if no filters are matched (#5744) * Make tests skip if filters are matched * Tweak filter path * Make thing checkout thing * Change where workflow is skipped * Change where workflow is skipped * Update github test filters * Update test-filters.yml --------- Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com> --- .github/test-filters.yml | 19 ++++++++ .github/workflows/test-shard-template.yml | 5 ++ .github/workflows/tests.yml | 57 ++++++----------------- 3 files changed, 39 insertions(+), 42 deletions(-) create mode 100644 .github/test-filters.yml diff --git a/.github/test-filters.yml b/.github/test-filters.yml new file mode 100644 index 00000000000..89f4322adea --- /dev/null +++ b/.github/test-filters.yml @@ -0,0 +1,19 @@ +all: + - "src/**" + - "test/**" + - "public/**" + # Workflows that can impact tests + - ".github/workflows/test*.yml" + - ".github/test-filters.yml" + # top-level files + - "package*.json" + - ".nvrmc" # Updates to node version can break tests + - "vite*" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts + - "tsconfig*.json" # tsconfig.json tweaking can impact compilation + - "global.d.ts" + - ".env*" + # Blanket negations for files that cannot impact tests + - "!**/*.py" # No .py files + - "!**/*.sh" # No .sh files + - "!**/*.md" # No .md files + - "!**/.git*" # .gitkeep and family diff --git a/.github/workflows/test-shard-template.yml b/.github/workflows/test-shard-template.yml index cee452f3a59..a1146cb3497 100644 --- a/.github/workflows/test-shard-template.yml +++ b/.github/workflows/test-shard-template.yml @@ -12,11 +12,16 @@ on: totalShards: required: true type: number + skip: + required: true + type: boolean + default: false jobs: test: name: Shard ${{ inputs.shard }} of ${{ inputs.totalShards }} runs-on: ubuntu-latest + if: ${{ !inputs.skip }} steps: - name: Check out Git repository uses: actions/checkout@v4.2.2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d9db8401f8e..f04a1987eff 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,58 +7,30 @@ on: branches: - main # Trigger on push events to the main branch - beta # Trigger on push events to the beta branch - - release # Trigger on push events to the release branch - # go upvote https://github.com/actions/runner/issues/1182 and yell at microsoft until they fix this or ditch yml for workflows - paths: - # src and test files - - "src/**" - - "test/**" - - "public/**" - # Workflows that can impact tests - - ".github/workflows/test*.yml" - # top-level files - - "package*.json" - - ".nvrmc" # Updates to node version can break tests - - "vite.*.ts" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts - - "tsconfig*.json" # tsconfig.json tweaking can impact compilation - - "global.d.ts" - - ".env.*" - # Blanket negations for files that cannot impact tests - - "!**/*.py" # No .py files - - "!**/*.sh" # No .sh files - - "!**/*.md" # No .md files - - "!**/.git*" # .gitkeep and family - pull_request: branches: - main # Trigger on pull request events targeting the main branch - beta # Trigger on pull request events targeting the beta branch - - release # Trigger on pull request events targeting the release branch - paths: # go upvote https://github.com/actions/runner/issues/1182 and yell at microsoft because until then we have to duplicate this - # src and test files - - "src/**" - - "test/**" - - "public/**" - # Workflows that can impact tests - - ".github/workflows/test*.yml" - # top-level files - - "package*.json" - - ".nvrmc" # Updates to node version can break tests - - "vite*" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts - - "tsconfig*.json" # tsconfig.json tweaking can impact compilation - - "global.d.ts" - - ".env.*" - # Blanket negations for files that cannot impact tests - - "!**/*.py" # No .py files - - "!**/*.sh" # No .sh files - - "!**/*.md" # No .md files - - "!**/.git*" # .gitkeep and family merge_group: types: [checks_requested] jobs: + check-path-change-filter: + runs-on: ubuntu-latest + permissions: + pull-requests: read + outputs: + all: ${{ steps.filter.outputs.all }} + steps: + - name: checkout + uses: actions/checkout@v4 + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 + with: + filters: .github/test-filters.yml + run-tests: name: Run Tests + needs: check-path-change-filter strategy: matrix: shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] @@ -67,3 +39,4 @@ jobs: project: main shard: ${{ matrix.shard }} totalShards: 10 + skip: ${{ needs.check-path-change-filter.outputs.all == 'false'}} From f0e806c50898526551368256d03759e56ce36a68 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Wed, 21 May 2025 22:18:24 -0500 Subject: [PATCH 16/44] [Misc] Move `allMoves` to `data-lists.ts` (#5860) --- src/battle-scene.ts | 2 +- src/data/abilities/ability.ts | 2 +- src/data/arena-tag.ts | 2 +- src/data/balance/egg-moves.ts | 2 +- src/data/battle-anims.ts | 3 ++- src/data/battler-tags.ts | 2 +- src/data/data-lists.ts | 2 ++ src/data/moves/move.ts | 7 ++---- .../encounters/bug-type-superfan-encounter.ts | 22 +++++-------------- src/data/pokemon-forms.ts | 2 +- src/field/pokemon.ts | 2 +- src/modifier/modifier-type.ts | 3 ++- src/modifier/modifier.ts | 2 +- src/phases/faint-phase.ts | 3 ++- src/phases/learn-move-phase.ts | 2 +- src/phases/move-phase.ts | 2 +- src/phases/select-target-phase.ts | 2 +- src/phases/switch-summon-phase.ts | 3 ++- src/phases/turn-start-phase.ts | 3 ++- src/system/game-data.ts | 2 +- src/ui/modifier-select-ui-handler.ts | 2 +- src/ui/party-ui-handler.ts | 3 ++- src/ui/pokedex-page-ui-handler.ts | 2 +- src/ui/pokedex-scan-ui-handler.ts | 2 +- src/ui/pokedex-ui-handler.ts | 2 +- src/ui/pokemon-hatch-info-container.ts | 2 +- src/ui/starter-select-ui-handler.ts | 2 +- test/abilities/aura_break.test.ts | 2 +- test/abilities/battery.test.ts | 2 +- test/abilities/battle_bond.test.ts | 3 ++- test/abilities/flower_veil.test.ts | 2 +- test/abilities/friend_guard.test.ts | 2 +- test/abilities/hustle.test.ts | 2 +- test/abilities/infiltrator.test.ts | 2 +- test/abilities/libero.test.ts | 2 +- test/abilities/magic_bounce.test.ts | 2 +- .../abilities/normal-move-type-change.test.ts | 2 +- test/abilities/normalize.test.ts | 2 +- test/abilities/power_spot.test.ts | 2 +- test/abilities/protean.test.ts | 2 +- test/abilities/sap_sipper.test.ts | 3 ++- test/abilities/serene_grace.test.ts | 2 +- test/abilities/sheer_force.test.ts | 3 ++- test/abilities/steely_spirit.test.ts | 2 +- test/abilities/supreme_overlord.test.ts | 2 +- test/abilities/unburden.test.ts | 3 ++- test/abilities/wimp_out.test.ts | 2 +- test/abilities/wonder_skin.test.ts | 2 +- test/arena/arena_gravity.test.ts | 2 +- test/arena/grassy_terrain.test.ts | 2 +- test/arena/weather_fog.test.ts | 2 +- test/arena/weather_strong_winds.test.ts | 2 +- test/battle/damage_calculation.test.ts | 2 +- test/battlerTags/substitute.test.ts | 2 +- test/enemy_command.test.ts | 2 +- test/items/reviver_seed.test.ts | 2 +- test/moves/astonish.test.ts | 2 +- test/moves/aurora_veil.test.ts | 3 ++- test/moves/burning_jealousy.test.ts | 2 +- test/moves/ceaseless_edge.test.ts | 2 +- test/moves/copycat.test.ts | 3 ++- test/moves/destiny_bond.test.ts | 2 +- test/moves/diamond_storm.test.ts | 2 +- test/moves/dig.test.ts | 2 +- test/moves/dragon_tail.test.ts | 2 +- test/moves/dynamax_cannon.test.ts | 2 +- test/moves/effectiveness.test.ts | 2 +- test/moves/fell_stinger.test.ts | 2 +- test/moves/fly.test.ts | 2 +- test/moves/freezy_frost.test.ts | 2 +- test/moves/fusion_flare_bolt.test.ts | 2 +- test/moves/glaive_rush.test.ts | 2 +- test/moves/hard_press.test.ts | 2 +- test/moves/hyper_beam.test.ts | 2 +- test/moves/lash_out.test.ts | 2 +- test/moves/last_respects.test.ts | 2 +- test/moves/light_screen.test.ts | 3 ++- test/moves/magic_coat.test.ts | 2 +- test/moves/metronome.test.ts | 3 ++- test/moves/moongeist_beam.test.ts | 3 ++- test/moves/pledge_moves.test.ts | 3 ++- test/moves/protect.test.ts | 2 +- test/moves/rage_fist.test.ts | 2 +- test/moves/reflect.test.ts | 3 ++- test/moves/retaliate.test.ts | 2 +- test/moves/rollout.test.ts | 2 +- test/moves/round.test.ts | 2 +- test/moves/scale_shot.test.ts | 2 +- test/moves/secret_power.test.ts | 2 +- test/moves/shell_side_arm.test.ts | 3 ++- test/moves/shell_trap.test.ts | 2 +- test/moves/sketch.test.ts | 3 ++- test/moves/solar_beam.test.ts | 2 +- test/moves/sparkly_swirl.test.ts | 2 +- test/moves/spectral_thief.test.ts | 2 +- test/moves/spit_up.test.ts | 2 +- test/moves/steamroller.test.ts | 2 +- test/moves/substitute.test.ts | 3 ++- test/moves/telekinesis.test.ts | 2 +- test/moves/tera_blast.test.ts | 3 ++- test/moves/toxic.test.ts | 2 +- test/moves/triple_arrows.test.ts | 3 ++- 102 files changed, 130 insertions(+), 121 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 5835ee08af5..cbaf07d579c 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -51,7 +51,7 @@ import { initGameSpeed } from "#app/system/game-speed"; import { Arena, ArenaBase } from "#app/field/arena"; import { GameData } from "#app/system/game-data"; import { addTextObject, getTextColor, TextStyle } from "#app/ui/text"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "./data/data-lists"; import { MusicPreference } from "#app/system/settings/settings"; import { getDefaultModifierTypeForTier, diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index ff86937622b..b677dd2bd11 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -9,7 +9,6 @@ import { FlinchAttr, OneHitKOAttr, HitHealAttr, - allMoves, StatusMove, SelfStatusMove, VariablePowerAttr, @@ -21,6 +20,7 @@ import { NeutralDamageAgainstFlyingTypeMultiplierAttr, FixedDamageAttr, } from "#app/data/moves/move"; +import { allMoves } from "../data-lists"; import { ArenaTagSide } from "#app/data/arena-tag"; import { BerryModifier, HitHealModifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; import { TerrainType } from "#app/data/terrain"; diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts index 19c94a8a045..1955b51e8e0 100644 --- a/src/data/arena-tag.ts +++ b/src/data/arena-tag.ts @@ -2,7 +2,7 @@ import { globalScene } from "#app/global-scene"; import type { Arena } from "#app/field/arena"; import { PokemonType } from "#enums/pokemon-type"; import { BooleanHolder, NumberHolder, toDmgValue } from "#app/utils/common"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "./data-lists"; import { MoveTarget } from "#enums/MoveTarget"; import { MoveCategory } from "#enums/MoveCategory"; import { getPokemonNameWithAffix } from "#app/messages"; diff --git a/src/data/balance/egg-moves.ts b/src/data/balance/egg-moves.ts index 289ac60bcc5..73c6300166b 100644 --- a/src/data/balance/egg-moves.ts +++ b/src/data/balance/egg-moves.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "../data-lists"; import { getEnumKeys, getEnumValues } from "#app/utils/common"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index 454bd40130c..f395c3bb832 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -1,5 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { AttackMove, BeakBlastHeaderAttr, DelayedAttackAttr, SelfStatusMove, allMoves } from "./moves/move"; +import { AttackMove, BeakBlastHeaderAttr, DelayedAttackAttr, SelfStatusMove } from "./moves/move"; +import { allMoves } from "./data-lists"; import { MoveFlags } from "#enums/MoveFlags"; import type Pokemon from "../field/pokemon"; import { type nil, getFrameMs, getEnumKeys, getEnumValues, animationFileName } from "../utils/common"; diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 34fdd5409c8..c284fcd5130 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -12,12 +12,12 @@ import { allAbilities } from "./data-lists"; import { ChargeAnim, CommonAnim, CommonBattleAnim, MoveChargeAnim } from "#app/data/battle-anims"; import type Move from "#app/data/moves/move"; import { - allMoves, applyMoveAttrs, ConsecutiveUseDoublePowerAttr, HealOnAllyAttr, StatusCategoryOnAllyAttr, } from "#app/data/moves/move"; +import { allMoves } from "./data-lists"; import { MoveFlags } from "#enums/MoveFlags"; import { MoveCategory } from "#enums/MoveCategory"; import { SpeciesFormChangeAbilityTrigger } from "#app/data/pokemon-forms"; diff --git a/src/data/data-lists.ts b/src/data/data-lists.ts index d3c31abc851..c763a001280 100644 --- a/src/data/data-lists.ts +++ b/src/data/data-lists.ts @@ -1,3 +1,5 @@ import type { Ability } from "./abilities/ability-class"; +import type Move from "./moves/move"; export const allAbilities: Ability[] = []; +export const allMoves: Move[] = []; diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 71807288abc..31ad3337926 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -66,7 +66,7 @@ import { VariableMovePowerAbAttr, WonderSkinAbAttr, } from "../abilities/ability"; -import { allAbilities } from "../data-lists"; +import { allAbilities, allMoves } from "../data-lists"; import { AttackTypeBoosterModifier, BerryModifier, @@ -8261,14 +8261,11 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT return { targets: set.filter(p => p?.isActive(true)).map(p => p.getBattlerIndex()).filter(t => t !== undefined), multiple }; } -export const allMoves: Move[] = [ - new SelfStatusMove(Moves.NONE, PokemonType.NORMAL, MoveCategory.STATUS, -1, -1, 0, 1), -]; - export const selfStatLowerMoves: Moves[] = []; export function initMoves() { allMoves.push( + new SelfStatusMove(Moves.NONE, PokemonType.NORMAL, MoveCategory.STATUS, -1, -1, 0, 1), new AttackMove(Moves.POUND, PokemonType.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, -1, 0, 1), new AttackMove(Moves.KARATE_CHOP, PokemonType.FIGHTING, MoveCategory.PHYSICAL, 50, 100, 25, -1, 0, 1) .attr(HighCritAttr), diff --git a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts index 87b223d5245..17c1c31d55e 100644 --- a/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts +++ b/src/data/mystery-encounters/encounters/bug-type-superfan-encounter.ts @@ -50,7 +50,7 @@ import { } from "#app/modifier/modifier"; import i18next from "i18next"; import MoveInfoOverlay from "#app/ui/move-info-overlay"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { ModifierTier } from "#app/modifier/modifier-tier"; import { CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES } from "#app/constants"; import { getSpriteKeysFromSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; @@ -144,20 +144,14 @@ const POOL_3_POKEMON: { species: Species; formIndex?: number }[] = [ const POOL_4_POKEMON = [Species.GENESECT, Species.SLITHER_WING, Species.BUZZWOLE, Species.PHEROMOSA]; -const PHYSICAL_TUTOR_MOVES = [ - Moves.MEGAHORN, - Moves.ATTACK_ORDER, - Moves.BUG_BITE, - Moves.FIRST_IMPRESSION, - Moves.LUNGE -]; +const PHYSICAL_TUTOR_MOVES = [Moves.MEGAHORN, Moves.ATTACK_ORDER, Moves.BUG_BITE, Moves.FIRST_IMPRESSION, Moves.LUNGE]; const SPECIAL_TUTOR_MOVES = [ Moves.SILVER_WIND, Moves.SIGNAL_BEAM, Moves.BUG_BUZZ, Moves.POLLEN_PUFF, - Moves.STRUGGLE_BUG + Moves.STRUGGLE_BUG, ]; const STATUS_TUTOR_MOVES = [ @@ -165,16 +159,10 @@ const STATUS_TUTOR_MOVES = [ Moves.DEFEND_ORDER, Moves.RAGE_POWDER, Moves.STICKY_WEB, - Moves.SILK_TRAP + Moves.SILK_TRAP, ]; -const MISC_TUTOR_MOVES = [ - Moves.LEECH_LIFE, - Moves.U_TURN, - Moves.HEAL_ORDER, - Moves.QUIVER_DANCE, - Moves.INFESTATION, -]; +const MISC_TUTOR_MOVES = [Moves.LEECH_LIFE, Moves.U_TURN, Moves.HEAL_ORDER, Moves.QUIVER_DANCE, Moves.INFESTATION]; /** * Wave breakpoints that determine how strong to make the Bug-Type Superfan's team diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index f76462d2725..da594f7c27f 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -1,7 +1,7 @@ import { PokemonFormChangeItemModifier } from "../modifier/modifier"; import type Pokemon from "../field/pokemon"; import { StatusEffect } from "#enums/status-effect"; -import { allMoves } from "./moves/move"; +import { allMoves } from "./data-lists"; import { MoveCategory } from "#enums/MoveCategory"; import type { Constructor, nil } from "#app/utils/common"; import { Abilities } from "#enums/abilities"; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 74ccb0c7f49..62ec8081c5d 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -16,7 +16,6 @@ import { applyMoveAttrs, FixedDamageAttr, VariableAtkAttr, - allMoves, TypelessAttr, CritOnlyAttr, getMoveTargets, @@ -41,6 +40,7 @@ import { VariableMoveTypeChartAttr, HpSplitAttr, } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MoveTarget } from "#enums/MoveTarget"; import { MoveCategory } from "#enums/MoveCategory"; import type { PokemonSpeciesForm } from "#app/data/pokemon-species"; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 608eca1157e..4c61123eb2d 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -2,7 +2,8 @@ import { globalScene } from "#app/global-scene"; import { EvolutionItem, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; import { tmPoolTiers, tmSpecies } from "#app/data/balance/tms"; import { getBerryEffectDescription, getBerryName } from "#app/data/berry"; -import { allMoves, AttackMove } from "#app/data/moves/move"; +import { AttackMove } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { getNatureName, getNatureStatMultiplier } from "#app/data/nature"; import { getPokeballCatchMultiplier, getPokeballName, MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball"; import { diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 94bb0e3419a..42e0155bdd8 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -1,7 +1,7 @@ import { FusionSpeciesFormEvolution, pokemonEvolutions } from "#app/data/balance/pokemon-evolutions"; import { getBerryEffectFunc, getBerryPredicate } from "#app/data/berry"; import { getLevelTotalExp } from "#app/data/exp"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MAX_PER_TYPE_POKEBALLS } from "#app/data/pokeball"; import { type FormChangeItem, SpeciesFormChangeItemTrigger } from "#app/data/pokemon-forms"; import { getStatusEffectHealText } from "#app/data/status-effect"; diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts index 1aa24d59fa0..bf0adf77061 100644 --- a/src/phases/faint-phase.ts +++ b/src/phases/faint-phase.ts @@ -11,7 +11,8 @@ import { } from "#app/data/abilities/ability"; import { BattlerTagLapseType } from "#app/data/battler-tags"; import { battleSpecDialogue } from "#app/data/dialogue"; -import { allMoves, PostVictoryStatStageChangeAttr } from "#app/data/moves/move"; +import { PostVictoryStatStageChangeAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; import { BattleSpec } from "#app/enums/battle-spec"; import { StatusEffect } from "#app/enums/status-effect"; diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index 515ce492b92..c585679ba4f 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -1,7 +1,7 @@ import { globalScene } from "#app/global-scene"; import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; import type Move from "#app/data/moves/move"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms"; import { Moves } from "#enums/moves"; import { getPokemonNameWithAffix } from "#app/messages"; diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index 5d63fe6efea..d7cbf1b9a6f 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -16,7 +16,6 @@ import { CommonAnim } from "#app/data/battle-anims"; import { BattlerTagLapseType, CenterOfAttentionTag } from "#app/data/battler-tags"; import { AddArenaTrapTagAttr, - allMoves, applyMoveAttrs, BypassRedirectAttr, BypassSleepAttr, @@ -27,6 +26,7 @@ import { PreMoveMessageAttr, PreUseInterruptAttr, } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MoveFlags } from "#enums/MoveFlags"; import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms"; import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect"; diff --git a/src/phases/select-target-phase.ts b/src/phases/select-target-phase.ts index c969b9ca421..f8a8ecfbf18 100644 --- a/src/phases/select-target-phase.ts +++ b/src/phases/select-target-phase.ts @@ -5,7 +5,7 @@ import { UiMode } from "#enums/ui-mode"; import { CommandPhase } from "./command-phase"; import { PokemonPhase } from "./pokemon-phase"; import i18next from "#app/plugins/i18n"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; export class SelectTargetPhase extends PokemonPhase { // biome-ignore lint/complexity/noUselessConstructor: This makes `fieldIndex` required diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index a063b6e6863..c61eb73118f 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -6,7 +6,8 @@ import { PreSummonAbAttr, PreSwitchOutAbAttr, } from "#app/data/abilities/ability"; -import { allMoves, ForceSwitchOutAttr } from "#app/data/moves/move"; +import { ForceSwitchOutAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { getPokeballTintColor } from "#app/data/pokeball"; import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; import { TrainerSlot } from "#enums/trainer-slot"; diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts index b802780bbb8..de510ef07d7 100644 --- a/src/phases/turn-start-phase.ts +++ b/src/phases/turn-start-phase.ts @@ -1,5 +1,6 @@ import { applyAbAttrs, BypassSpeedChanceAbAttr, PreventBypassSpeedChanceAbAttr } from "#app/data/abilities/ability"; -import { allMoves, MoveHeaderAttr } from "#app/data/moves/move"; +import { MoveHeaderAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { Stat } from "#app/enums/stat"; import type Pokemon from "#app/field/pokemon"; diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 0c5e0b349ed..5711ad338c3 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -30,7 +30,7 @@ import { Nature } from "#enums/nature"; import { GameStats } from "#app/system/game-stats"; import { Tutorial } from "#app/tutorial"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { TrainerVariant } from "#app/field/trainer"; import type { Variant } from "#app/sprites/variant"; import { setSettingGamepad, SettingGamepad, settingGamepadDefaults } from "#app/system/settings/settings-gamepad"; diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts index 9ba54491175..7f5bf997f88 100644 --- a/src/ui/modifier-select-ui-handler.ts +++ b/src/ui/modifier-select-ui-handler.ts @@ -9,7 +9,7 @@ import { LockModifierTiersModifier, PokemonHeldItemModifier, HealShopCostModifie import { handleTutorial, Tutorial } from "../tutorial"; import { Button } from "#enums/buttons"; import MoveInfoOverlay from "./move-info-overlay"; -import { allMoves } from "../data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { formatMoney, NumberHolder } from "#app/utils/common"; import Overrides from "#app/overrides"; import i18next from "i18next"; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 6e947796d63..f6105c51ee3 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -11,7 +11,8 @@ import { PokemonHeldItemModifier, SwitchEffectTransferModifier, } from "#app/modifier/modifier"; -import { allMoves, ForceSwitchOutAttr } from "#app/data/moves/move"; +import { ForceSwitchOutAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; import { StatusEffect } from "#enums/status-effect"; import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts index 051d267259f..ab729db8c26 100644 --- a/src/ui/pokedex-page-ui-handler.ts +++ b/src/ui/pokedex-page-ui-handler.ts @@ -9,7 +9,7 @@ import { allAbilities } from "#app/data/data-lists"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; import { GrowthRate, getGrowthRateColor } from "#app/data/exp"; import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { getNatureName } from "#app/data/nature"; import type { SpeciesFormChange } from "#app/data/pokemon-forms"; import { pokemonFormChanges } from "#app/data/pokemon-forms"; diff --git a/src/ui/pokedex-scan-ui-handler.ts b/src/ui/pokedex-scan-ui-handler.ts index 45092d461a3..df3e7cbc8c4 100644 --- a/src/ui/pokedex-scan-ui-handler.ts +++ b/src/ui/pokedex-scan-ui-handler.ts @@ -7,7 +7,7 @@ import { isNullOrUndefined } from "#app/utils/common"; import { UiMode } from "#enums/ui-mode"; import { FilterTextRow } from "./filter-text"; import { allAbilities } from "#app/data/data-lists"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { allSpecies } from "#app/data/pokemon-species"; import i18next from "i18next"; diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts index 935c9adfeb8..08fe5d7442f 100644 --- a/src/ui/pokedex-ui-handler.ts +++ b/src/ui/pokedex-ui-handler.ts @@ -37,7 +37,7 @@ import { addWindow } from "./ui-theme"; import type { OptionSelectConfig } from "./abstact-option-select-ui-handler"; import { FilterText, FilterTextRow } from "./filter-text"; import { allAbilities } from "#app/data/data-lists"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { speciesTmMoves } from "#app/data/balance/tms"; import { pokemonStarters } from "#app/data/balance/pokemon-evolutions"; import { Biome } from "#enums/biome"; diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/pokemon-hatch-info-container.ts index f3095cb48bf..5471a769d95 100644 --- a/src/ui/pokemon-hatch-info-container.ts +++ b/src/ui/pokemon-hatch-info-container.ts @@ -4,7 +4,7 @@ import { PokemonType } from "#enums/pokemon-type"; import { rgbHexToRgba, padInt } from "#app/utils/common"; import { TextStyle, addTextObject } from "#app/ui/text"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Species } from "#enums/species"; import { getEggTierForSpecies } from "#app/data/egg"; import { starterColors } from "#app/global-vars/starter-colors"; diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index f24a3ff9265..80acac6a6b4 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -13,7 +13,7 @@ import { allAbilities } from "#app/data/data-lists"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; import { GrowthRate, getGrowthRateColor } from "#app/data/exp"; import { Gender, getGenderColor, getGenderSymbol } from "#app/data/gender"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { getNatureName } from "#app/data/nature"; import { pokemonFormChanges } from "#app/data/pokemon-forms"; import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; diff --git a/test/abilities/aura_break.test.ts b/test/abilities/aura_break.test.ts index 523a2773c99..f88d7d875bf 100644 --- a/test/abilities/aura_break.test.ts +++ b/test/abilities/aura_break.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/battery.test.ts b/test/abilities/battery.test.ts index 6a1f77f4b27..251ca6ccf16 100644 --- a/test/abilities/battery.test.ts +++ b/test/abilities/battery.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/abilities/battle_bond.test.ts b/test/abilities/battle_bond.test.ts index d599b3212f9..d9f7b0bd0dc 100644 --- a/test/abilities/battle_bond.test.ts +++ b/test/abilities/battle_bond.test.ts @@ -1,4 +1,5 @@ -import { allMoves, MultiHitAttr } from "#app/data/moves/move"; +import { MultiHitAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MultiHitType } from "#enums/MultiHitType"; import { Status } from "#app/data/status-effect"; import { Abilities } from "#enums/abilities"; diff --git a/test/abilities/flower_veil.test.ts b/test/abilities/flower_veil.test.ts index 1fd7dbb3ed7..ce45906c4a9 100644 --- a/test/abilities/flower_veil.test.ts +++ b/test/abilities/flower_veil.test.ts @@ -7,7 +7,7 @@ import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#enums/battler-tag-type"; import { allAbilities } from "#app/data/data-lists"; diff --git a/test/abilities/friend_guard.test.ts b/test/abilities/friend_guard.test.ts index 43a378c47a2..0afe678b175 100644 --- a/test/abilities/friend_guard.test.ts +++ b/test/abilities/friend_guard.test.ts @@ -6,7 +6,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { BattlerIndex } from "#app/battle"; import { allAbilities } from "#app/data/data-lists"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MoveCategory } from "#enums/MoveCategory"; describe("Moves - Friend Guard", () => { diff --git a/test/abilities/hustle.test.ts b/test/abilities/hustle.test.ts index bf2889eab63..85b6e611d6d 100644 --- a/test/abilities/hustle.test.ts +++ b/test/abilities/hustle.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { Stat } from "#app/enums/stat"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/infiltrator.test.ts b/test/abilities/infiltrator.test.ts index 1a9f802dd9c..aeeb681e73c 100644 --- a/test/abilities/infiltrator.test.ts +++ b/test/abilities/infiltrator.test.ts @@ -1,5 +1,5 @@ import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Stat } from "#enums/stat"; diff --git a/test/abilities/libero.test.ts b/test/abilities/libero.test.ts index 4adb828180e..a6942b18aad 100644 --- a/test/abilities/libero.test.ts +++ b/test/abilities/libero.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { PokemonType } from "#enums/pokemon-type"; import { Weather } from "#app/data/weather"; import type { PlayerPokemon } from "#app/field/pokemon"; diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic_bounce.test.ts index 11131640a0f..78e4114724c 100644 --- a/test/abilities/magic_bounce.test.ts +++ b/test/abilities/magic_bounce.test.ts @@ -1,7 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { allAbilities } from "#app/data/data-lists"; import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Stat } from "#app/enums/stat"; diff --git a/test/abilities/normal-move-type-change.test.ts b/test/abilities/normal-move-type-change.test.ts index 50c8e04af1f..88a7b49e26b 100644 --- a/test/abilities/normal-move-type-change.test.ts +++ b/test/abilities/normal-move-type-change.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; diff --git a/test/abilities/normalize.test.ts b/test/abilities/normalize.test.ts index 3256f0188d1..a299294f543 100644 --- a/test/abilities/normalize.test.ts +++ b/test/abilities/normalize.test.ts @@ -1,5 +1,5 @@ import { TYPE_BOOST_ITEM_BOOST_PERCENT } from "#app/constants"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { toDmgValue } from "#app/utils/common"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; diff --git a/test/abilities/power_spot.test.ts b/test/abilities/power_spot.test.ts index 3e4f79d7445..c3accdb04f8 100644 --- a/test/abilities/power_spot.test.ts +++ b/test/abilities/power_spot.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/abilities/protean.test.ts b/test/abilities/protean.test.ts index 8f7633e1327..8e6b69dabd6 100644 --- a/test/abilities/protean.test.ts +++ b/test/abilities/protean.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { PokemonType } from "#enums/pokemon-type"; import { Weather } from "#app/data/weather"; import type { PlayerPokemon } from "#app/field/pokemon"; diff --git a/test/abilities/sap_sipper.test.ts b/test/abilities/sap_sipper.test.ts index 2157177b84c..03a6ee5d398 100644 --- a/test/abilities/sap_sipper.test.ts +++ b/test/abilities/sap_sipper.test.ts @@ -9,7 +9,8 @@ import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; +import { RandomMoveAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; // See also: TypeImmunityAbAttr describe("Abilities - Sap Sipper", () => { diff --git a/test/abilities/serene_grace.test.ts b/test/abilities/serene_grace.test.ts index 2547971a4b8..191d5a44f19 100644 --- a/test/abilities/serene_grace.test.ts +++ b/test/abilities/serene_grace.test.ts @@ -4,7 +4,7 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { FlinchAttr } from "#app/data/moves/move"; diff --git a/test/abilities/sheer_force.test.ts b/test/abilities/sheer_force.test.ts index ce3232a1869..6bb0a631124 100644 --- a/test/abilities/sheer_force.test.ts +++ b/test/abilities/sheer_force.test.ts @@ -7,7 +7,8 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves, FlinchAttr } from "#app/data/moves/move"; +import { FlinchAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; describe("Abilities - Sheer Force", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/steely_spirit.test.ts b/test/abilities/steely_spirit.test.ts index be759724c3a..09805d61e14 100644 --- a/test/abilities/steely_spirit.test.ts +++ b/test/abilities/steely_spirit.test.ts @@ -1,5 +1,5 @@ import { allAbilities } from "#app/data/data-lists"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/abilities/supreme_overlord.test.ts b/test/abilities/supreme_overlord.test.ts index 8af0a0ac37c..6cc52de64bf 100644 --- a/test/abilities/supreme_overlord.test.ts +++ b/test/abilities/supreme_overlord.test.ts @@ -7,7 +7,7 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; describe("Abilities - Supreme Overlord", () => { let phaserGame: Phaser.Game; diff --git a/test/abilities/unburden.test.ts b/test/abilities/unburden.test.ts index 2af889d1da4..ff28c3b6a09 100644 --- a/test/abilities/unburden.test.ts +++ b/test/abilities/unburden.test.ts @@ -1,6 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { PostItemLostAbAttr } from "#app/data/abilities/ability"; -import { allMoves, StealHeldItemChanceAttr } from "#app/data/moves/move"; +import { StealHeldItemChanceAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type Pokemon from "#app/field/pokemon"; import type { ContactHeldItemTransferChanceModifier } from "#app/modifier/modifier"; import { Abilities } from "#enums/abilities"; diff --git a/test/abilities/wimp_out.test.ts b/test/abilities/wimp_out.test.ts index f558efdb103..67885a82163 100644 --- a/test/abilities/wimp_out.test.ts +++ b/test/abilities/wimp_out.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import GameManager from "#test/testUtils/gameManager"; import { toDmgValue } from "#app/utils/common"; import { Abilities } from "#enums/abilities"; diff --git a/test/abilities/wonder_skin.test.ts b/test/abilities/wonder_skin.test.ts index d039ba1e6a7..fd4cc77bd1c 100644 --- a/test/abilities/wonder_skin.test.ts +++ b/test/abilities/wonder_skin.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; diff --git a/test/arena/arena_gravity.test.ts b/test/arena/arena_gravity.test.ts index 0ce5ac0ea4c..33a1631ad18 100644 --- a/test/arena/arena_gravity.test.ts +++ b/test/arena/arena_gravity.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattlerTagType } from "#enums/battler-tag-type"; diff --git a/test/arena/grassy_terrain.test.ts b/test/arena/grassy_terrain.test.ts index f8ca07bd65e..05b57d210de 100644 --- a/test/arena/grassy_terrain.test.ts +++ b/test/arena/grassy_terrain.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/arena/weather_fog.test.ts b/test/arena/weather_fog.test.ts index b1edf75704b..ae41c9d14e8 100644 --- a/test/arena/weather_fog.test.ts +++ b/test/arena/weather_fog.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Moves } from "#enums/moves"; diff --git a/test/arena/weather_strong_winds.test.ts b/test/arena/weather_strong_winds.test.ts index 9fcdb18c872..b996d8bf62a 100644 --- a/test/arena/weather_strong_winds.test.ts +++ b/test/arena/weather_strong_winds.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { StatusEffect } from "#app/enums/status-effect"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { Abilities } from "#enums/abilities"; diff --git a/test/battle/damage_calculation.test.ts b/test/battle/damage_calculation.test.ts index 26772cbc4f0..1d027a96792 100644 --- a/test/battle/damage_calculation.test.ts +++ b/test/battle/damage_calculation.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type { EnemyPersistentModifier } from "#app/modifier/modifier"; import { modifierTypes } from "#app/modifier/modifier-type"; import { Abilities } from "#enums/abilities"; diff --git a/test/battlerTags/substitute.test.ts b/test/battlerTags/substitute.test.ts index c2a99299716..827b9f48f85 100644 --- a/test/battlerTags/substitute.test.ts +++ b/test/battlerTags/substitute.test.ts @@ -7,7 +7,7 @@ import { BattlerTagLapseType, BindTag, SubstituteTag } from "#app/data/battler-t import { Moves } from "#app/enums/moves"; import { PokemonAnimType } from "#app/enums/pokemon-anim-type"; import * as messages from "#app/messages"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/enemy_command.test.ts b/test/enemy_command.test.ts index ae1f2918798..e5199847702 100644 --- a/test/enemy_command.test.ts +++ b/test/enemy_command.test.ts @@ -1,5 +1,5 @@ import type BattleScene from "#app/battle-scene"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MoveCategory } from "#enums/MoveCategory"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; diff --git a/test/items/reviver_seed.test.ts b/test/items/reviver_seed.test.ts index 3c67481a904..13aaf98249e 100644 --- a/test/items/reviver_seed.test.ts +++ b/test/items/reviver_seed.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { PokemonInstantReviveModifier } from "#app/modifier/modifier"; import { Abilities } from "#enums/abilities"; diff --git a/test/moves/astonish.test.ts b/test/moves/astonish.test.ts index 1713df1de15..accddcd545d 100644 --- a/test/moves/astonish.test.ts +++ b/test/moves/astonish.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { BerryPhase } from "#app/phases/berry-phase"; import { CommandPhase } from "#app/phases/command-phase"; diff --git a/test/moves/aurora_veil.test.ts b/test/moves/aurora_veil.test.ts index e9ab66d4203..96e74ec5a9e 100644 --- a/test/moves/aurora_veil.test.ts +++ b/test/moves/aurora_veil.test.ts @@ -1,7 +1,8 @@ import type BattleScene from "#app/battle-scene"; import { ArenaTagSide } from "#app/data/arena-tag"; import type Move from "#app/data/moves/move"; -import { allMoves, CritOnlyAttr } from "#app/data/moves/move"; +import { CritOnlyAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/moves/burning_jealousy.test.ts b/test/moves/burning_jealousy.test.ts index ea02bf5f4f5..1d9ba974687 100644 --- a/test/moves/burning_jealousy.test.ts +++ b/test/moves/burning_jealousy.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { StatusEffect } from "#app/enums/status-effect"; import { Moves } from "#enums/moves"; diff --git a/test/moves/ceaseless_edge.test.ts b/test/moves/ceaseless_edge.test.ts index 72e552bef6f..e88b301239d 100644 --- a/test/moves/ceaseless_edge.test.ts +++ b/test/moves/ceaseless_edge.test.ts @@ -1,5 +1,5 @@ import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; diff --git a/test/moves/copycat.test.ts b/test/moves/copycat.test.ts index 2e6e8098835..96c21723ab9 100644 --- a/test/moves/copycat.test.ts +++ b/test/moves/copycat.test.ts @@ -1,5 +1,6 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; +import { RandomMoveAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Stat } from "#app/enums/stat"; import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; diff --git a/test/moves/destiny_bond.test.ts b/test/moves/destiny_bond.test.ts index 6e6446f464f..16014677f39 100644 --- a/test/moves/destiny_bond.test.ts +++ b/test/moves/destiny_bond.test.ts @@ -1,6 +1,6 @@ import type { ArenaTrapTag } from "#app/data/arena-tag"; import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; diff --git a/test/moves/diamond_storm.test.ts b/test/moves/diamond_storm.test.ts index 9ba62bbc52d..1e64babacfb 100644 --- a/test/moves/diamond_storm.test.ts +++ b/test/moves/diamond_storm.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/dig.test.ts b/test/moves/dig.test.ts index 80d51a5c2d5..e8f39c05fd8 100644 --- a/test/moves/dig.test.ts +++ b/test/moves/dig.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; diff --git a/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts index 31e5560d4e0..0e7cd04d078 100644 --- a/test/moves/dragon_tail.test.ts +++ b/test/moves/dragon_tail.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Status } from "#app/data/status-effect"; import { Challenges } from "#enums/challenges"; import { StatusEffect } from "#enums/status-effect"; diff --git a/test/moves/dynamax_cannon.test.ts b/test/moves/dynamax_cannon.test.ts index 84def8a821f..6c4f1a321e3 100644 --- a/test/moves/dynamax_cannon.test.ts +++ b/test/moves/dynamax_cannon.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Moves } from "#enums/moves"; diff --git a/test/moves/effectiveness.test.ts b/test/moves/effectiveness.test.ts index fb03f1c10a0..9fc6c7b8ce7 100644 --- a/test/moves/effectiveness.test.ts +++ b/test/moves/effectiveness.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { TrainerSlot } from "#enums/trainer-slot"; import { PokemonType } from "#enums/pokemon-type"; diff --git a/test/moves/fell_stinger.test.ts b/test/moves/fell_stinger.test.ts index 11731d8a06f..50813029c05 100644 --- a/test/moves/fell_stinger.test.ts +++ b/test/moves/fell_stinger.test.ts @@ -7,7 +7,7 @@ import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { StatusEffect } from "#app/enums/status-effect"; import { WeatherType } from "#app/enums/weather-type"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; describe("Moves - Fell Stinger", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/fly.test.ts b/test/moves/fly.test.ts index f200e976704..74f8bc4a770 100644 --- a/test/moves/fly.test.ts +++ b/test/moves/fly.test.ts @@ -8,7 +8,7 @@ import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect, vi } from "vitest"; import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; describe("Moves - Fly", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/freezy_frost.test.ts b/test/moves/freezy_frost.test.ts index 4eb3114a5ba..7cee9bfb372 100644 --- a/test/moves/freezy_frost.test.ts +++ b/test/moves/freezy_frost.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { CommandPhase } from "#app/phases/command-phase"; describe("Moves - Freezy Frost", () => { diff --git a/test/moves/fusion_flare_bolt.test.ts b/test/moves/fusion_flare_bolt.test.ts index ce6bb62d1d0..da2d48a7cdb 100644 --- a/test/moves/fusion_flare_bolt.test.ts +++ b/test/moves/fusion_flare_bolt.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; diff --git a/test/moves/glaive_rush.test.ts b/test/moves/glaive_rush.test.ts index 3c2bcea7884..979c26ca20f 100644 --- a/test/moves/glaive_rush.test.ts +++ b/test/moves/glaive_rush.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; diff --git a/test/moves/hard_press.test.ts b/test/moves/hard_press.test.ts index 8fe768cb8e4..e1a01c0109d 100644 --- a/test/moves/hard_press.test.ts +++ b/test/moves/hard_press.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; diff --git a/test/moves/hyper_beam.test.ts b/test/moves/hyper_beam.test.ts index 5b370f49e4c..e6b3955ef0d 100644 --- a/test/moves/hyper_beam.test.ts +++ b/test/moves/hyper_beam.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Moves } from "#app/enums/moves"; diff --git a/test/moves/lash_out.test.ts b/test/moves/lash_out.test.ts index c80a8ce348a..e45df4fc998 100644 --- a/test/moves/lash_out.test.ts +++ b/test/moves/lash_out.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/last_respects.test.ts b/test/moves/last_respects.test.ts index a69ecb2e989..89c4896ae56 100644 --- a/test/moves/last_respects.test.ts +++ b/test/moves/last_respects.test.ts @@ -3,7 +3,7 @@ import { BattlerIndex } from "#app/battle"; import { Species } from "#enums/species"; import { Abilities } from "#enums/abilities"; import GameManager from "#test/testUtils/gameManager"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import Phaser from "phaser"; diff --git a/test/moves/light_screen.test.ts b/test/moves/light_screen.test.ts index cea26f29542..93d51ad7372 100644 --- a/test/moves/light_screen.test.ts +++ b/test/moves/light_screen.test.ts @@ -1,7 +1,8 @@ import type BattleScene from "#app/battle-scene"; import { ArenaTagSide } from "#app/data/arena-tag"; import type Move from "#app/data/moves/move"; -import { allMoves, CritOnlyAttr } from "#app/data/moves/move"; +import { CritOnlyAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; diff --git a/test/moves/magic_coat.test.ts b/test/moves/magic_coat.test.ts index 23deef97318..4e0bd7f0a98 100644 --- a/test/moves/magic_coat.test.ts +++ b/test/moves/magic_coat.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Stat } from "#app/enums/stat"; diff --git a/test/moves/metronome.test.ts b/test/moves/metronome.test.ts index bf177fb1a93..75b4b7190e6 100644 --- a/test/moves/metronome.test.ts +++ b/test/moves/metronome.test.ts @@ -1,5 +1,6 @@ import { RechargingTag, SemiInvulnerableTag } from "#app/data/battler-tags"; -import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; +import { RandomMoveAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { Stat } from "#app/enums/stat"; import { CommandPhase } from "#app/phases/command-phase"; diff --git a/test/moves/moongeist_beam.test.ts b/test/moves/moongeist_beam.test.ts index 82a2567377b..29398776f7f 100644 --- a/test/moves/moongeist_beam.test.ts +++ b/test/moves/moongeist_beam.test.ts @@ -1,4 +1,5 @@ -import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; +import { RandomMoveAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/pledge_moves.test.ts b/test/moves/pledge_moves.test.ts index 2bfd408e5fb..9dbf2b4cb02 100644 --- a/test/moves/pledge_moves.test.ts +++ b/test/moves/pledge_moves.test.ts @@ -1,7 +1,8 @@ import { BattlerIndex } from "#app/battle"; import { allAbilities } from "#app/data/data-lists"; import { ArenaTagSide } from "#app/data/arena-tag"; -import { allMoves, FlinchAttr } from "#app/data/moves/move"; +import { FlinchAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { PokemonType } from "#enums/pokemon-type"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Stat } from "#enums/stat"; diff --git a/test/moves/protect.test.ts b/test/moves/protect.test.ts index 183430f8654..14844019b31 100644 --- a/test/moves/protect.test.ts +++ b/test/moves/protect.test.ts @@ -5,7 +5,7 @@ import { Species } from "#enums/species"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; import { BattlerIndex } from "#app/battle"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/rage_fist.test.ts b/test/moves/rage_fist.test.ts index f215c5955c6..0aabb717f1b 100644 --- a/test/moves/rage_fist.test.ts +++ b/test/moves/rage_fist.test.ts @@ -2,7 +2,7 @@ import { BattlerIndex } from "#app/battle"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/reflect.test.ts b/test/moves/reflect.test.ts index b8338cea8cf..268d9ebb71b 100644 --- a/test/moves/reflect.test.ts +++ b/test/moves/reflect.test.ts @@ -1,7 +1,8 @@ import type BattleScene from "#app/battle-scene"; import { ArenaTagSide } from "#app/data/arena-tag"; import type Move from "#app/data/moves/move"; -import { allMoves, CritOnlyAttr } from "#app/data/moves/move"; +import { CritOnlyAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#app/enums/abilities"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import type Pokemon from "#app/field/pokemon"; diff --git a/test/moves/retaliate.test.ts b/test/moves/retaliate.test.ts index 9ad7cd7853b..81ea353a120 100644 --- a/test/moves/retaliate.test.ts +++ b/test/moves/retaliate.test.ts @@ -3,7 +3,7 @@ import Phaser from "phaser"; import GameManager from "#test/testUtils/gameManager"; import { Species } from "#enums/species"; import { Moves } from "#enums/moves"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; describe("Moves - Retaliate", () => { diff --git a/test/moves/rollout.test.ts b/test/moves/rollout.test.ts index b477fd8274f..dab9ef67596 100644 --- a/test/moves/rollout.test.ts +++ b/test/moves/rollout.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; diff --git a/test/moves/round.test.ts b/test/moves/round.test.ts index a58efb730f8..43e505705ae 100644 --- a/test/moves/round.test.ts +++ b/test/moves/round.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; diff --git a/test/moves/scale_shot.test.ts b/test/moves/scale_shot.test.ts index 4731ccf9574..49e68c75450 100644 --- a/test/moves/scale_shot.test.ts +++ b/test/moves/scale_shot.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { DamageAnimPhase } from "#app/phases/damage-anim-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { MoveEndPhase } from "#app/phases/move-end-phase"; diff --git a/test/moves/secret_power.test.ts b/test/moves/secret_power.test.ts index cbc0cded28b..f6870c5ed1d 100644 --- a/test/moves/secret_power.test.ts +++ b/test/moves/secret_power.test.ts @@ -2,7 +2,7 @@ import { Abilities } from "#enums/abilities"; import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Species } from "#enums/species"; import GameManager from "#test/testUtils/gameManager"; import Phaser from "phaser"; diff --git a/test/moves/shell_side_arm.test.ts b/test/moves/shell_side_arm.test.ts index e43bf6db037..4d7ae7025a1 100644 --- a/test/moves/shell_side_arm.test.ts +++ b/test/moves/shell_side_arm.test.ts @@ -1,5 +1,6 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves, ShellSideArmCategoryAttr } from "#app/data/moves/move"; +import { ShellSideArmCategoryAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; diff --git a/test/moves/shell_trap.test.ts b/test/moves/shell_trap.test.ts index f6501c2cd9e..313d02b4d73 100644 --- a/test/moves/shell_trap.test.ts +++ b/test/moves/shell_trap.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/sketch.test.ts b/test/moves/sketch.test.ts index c9755189a71..fc38d6a1147 100644 --- a/test/moves/sketch.test.ts +++ b/test/moves/sketch.test.ts @@ -7,7 +7,8 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { StatusEffect } from "#app/enums/status-effect"; import { BattlerIndex } from "#app/battle"; -import { allMoves, RandomMoveAttr } from "#app/data/moves/move"; +import { RandomMoveAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; describe("Moves - Sketch", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/solar_beam.test.ts b/test/moves/solar_beam.test.ts index 49605a70c66..8566859a4bc 100644 --- a/test/moves/solar_beam.test.ts +++ b/test/moves/solar_beam.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#enums/battler-tag-type"; import { WeatherType } from "#enums/weather-type"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/sparkly_swirl.test.ts b/test/moves/sparkly_swirl.test.ts index b9df302933c..9eb018d4be7 100644 --- a/test/moves/sparkly_swirl.test.ts +++ b/test/moves/sparkly_swirl.test.ts @@ -1,4 +1,4 @@ -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { StatusEffect } from "#app/enums/status-effect"; import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; diff --git a/test/moves/spectral_thief.test.ts b/test/moves/spectral_thief.test.ts index 2654ab1ad8d..4c2e9f96274 100644 --- a/test/moves/spectral_thief.test.ts +++ b/test/moves/spectral_thief.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#enums/abilities"; import { BattlerIndex } from "#app/battle"; import { Stat } from "#enums/stat"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; diff --git a/test/moves/spit_up.test.ts b/test/moves/spit_up.test.ts index c034117bc64..7197d9b75c3 100644 --- a/test/moves/spit_up.test.ts +++ b/test/moves/spit_up.test.ts @@ -1,6 +1,6 @@ import { Stat } from "#enums/stat"; import { StockpilingTag } from "#app/data/battler-tags"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { TurnMove } from "#app/field/pokemon"; import { MoveResult } from "#app/field/pokemon"; diff --git a/test/moves/steamroller.test.ts b/test/moves/steamroller.test.ts index b32b4551c81..a77a30321e1 100644 --- a/test/moves/steamroller.test.ts +++ b/test/moves/steamroller.test.ts @@ -1,5 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import type { DamageCalculationResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; diff --git a/test/moves/substitute.test.ts b/test/moves/substitute.test.ts index 7f4a2e69f9e..6d0995d3a26 100644 --- a/test/moves/substitute.test.ts +++ b/test/moves/substitute.test.ts @@ -1,7 +1,8 @@ import { BattlerIndex } from "#app/battle"; import { ArenaTagSide } from "#app/data/arena-tag"; import { SubstituteTag, TrappedTag } from "#app/data/battler-tags"; -import { allMoves, StealHeldItemChanceAttr } from "#app/data/moves/move"; +import { StealHeldItemChanceAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { MoveResult } from "#app/field/pokemon"; import type { CommandPhase } from "#app/phases/command-phase"; import GameManager from "#test/testUtils/gameManager"; diff --git a/test/moves/telekinesis.test.ts b/test/moves/telekinesis.test.ts index d11cc0861f0..e889926b5c8 100644 --- a/test/moves/telekinesis.test.ts +++ b/test/moves/telekinesis.test.ts @@ -1,5 +1,5 @@ import { BattlerTagType } from "#enums/battler-tag-type"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/test/moves/tera_blast.test.ts b/test/moves/tera_blast.test.ts index efdb75e8156..c18c7f25498 100644 --- a/test/moves/tera_blast.test.ts +++ b/test/moves/tera_blast.test.ts @@ -1,6 +1,7 @@ import { BattlerIndex } from "#app/battle"; import { Stat } from "#enums/stat"; -import { allMoves, TeraMoveCategoryAttr } from "#app/data/moves/move"; +import { TeraMoveCategoryAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import type Move from "#app/data/moves/move"; import { PokemonType } from "#enums/pokemon-type"; import { Abilities } from "#app/enums/abilities"; diff --git a/test/moves/toxic.test.ts b/test/moves/toxic.test.ts index f908d27ec7e..c773abb5bd3 100644 --- a/test/moves/toxic.test.ts +++ b/test/moves/toxic.test.ts @@ -5,7 +5,7 @@ import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { StatusEffect } from "#enums/status-effect"; import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; describe("Moves - Toxic", () => { let phaserGame: Phaser.Game; diff --git a/test/moves/triple_arrows.test.ts b/test/moves/triple_arrows.test.ts index 58ce8a9c528..bd061f4059d 100644 --- a/test/moves/triple_arrows.test.ts +++ b/test/moves/triple_arrows.test.ts @@ -1,4 +1,5 @@ -import { allMoves, FlinchAttr, StatStageChangeAttr } from "#app/data/moves/move"; +import { FlinchAttr, StatStageChangeAttr } from "#app/data/moves/move"; +import { allMoves } from "#app/data/data-lists"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import type Move from "#app/data/moves/move"; From da6cdaf187dbecddfe7ca42603604fc04435fa05 Mon Sep 17 00:00:00 2001 From: pom-eranian Date: Wed, 21 May 2025 23:25:07 -0400 Subject: [PATCH 17/44] [Sprite][Color][QoL] Removed unchanged entries in variant json (#5765) * Removed unchanged color entries (front) * Removed unchanged color entries (back) * Removed unchanged color entries (exp) * Removed unchanged color entries (exp back) * Removed unchanged color entries (female front, back, exp) --- public/images/pokemon/variant/1.json | 6 -- public/images/pokemon/variant/100.json | 2 - public/images/pokemon/variant/1000.json | 3 - public/images/pokemon/variant/1001.json | 12 +-- public/images/pokemon/variant/1003.json | 4 - public/images/pokemon/variant/1004.json | 8 +- public/images/pokemon/variant/1006.json | 2 - .../pokemon/variant/1008-ultimate-mode.json | 18 +---- public/images/pokemon/variant/101.json | 6 -- public/images/pokemon/variant/1010.json | 8 +- public/images/pokemon/variant/1018.json | 2 - public/images/pokemon/variant/1022.json | 4 - public/images/pokemon/variant/1023.json | 12 +-- public/images/pokemon/variant/111.json | 10 +-- public/images/pokemon/variant/112.json | 14 +--- public/images/pokemon/variant/114.json | 6 -- public/images/pokemon/variant/116.json | 6 -- public/images/pokemon/variant/117.json | 4 - public/images/pokemon/variant/118.json | 4 - public/images/pokemon/variant/119.json | 3 - public/images/pokemon/variant/120.json | 2 - public/images/pokemon/variant/121.json | 2 - public/images/pokemon/variant/123.json | 26 +----- public/images/pokemon/variant/125.json | 4 - public/images/pokemon/variant/126.json | 4 - public/images/pokemon/variant/127-mega.json | 12 +-- public/images/pokemon/variant/127.json | 8 +- public/images/pokemon/variant/129.json | 5 +- public/images/pokemon/variant/130-mega.json | 5 -- public/images/pokemon/variant/130.json | 3 - .../pokemon/variant/131-gigantamax.json | 6 -- public/images/pokemon/variant/131.json | 5 -- public/images/pokemon/variant/132.json | 2 - .../images/pokemon/variant/133-partner.json | 4 - public/images/pokemon/variant/133.json | 4 - public/images/pokemon/variant/134.json | 10 +-- public/images/pokemon/variant/135.json | 3 - public/images/pokemon/variant/136.json | 6 -- public/images/pokemon/variant/137.json | 2 - public/images/pokemon/variant/138.json | 2 - public/images/pokemon/variant/139.json | 4 +- public/images/pokemon/variant/140.json | 4 - public/images/pokemon/variant/142-mega.json | 4 - public/images/pokemon/variant/142.json | 6 -- public/images/pokemon/variant/144.json | 6 +- public/images/pokemon/variant/145.json | 9 --- public/images/pokemon/variant/146.json | 18 +---- public/images/pokemon/variant/147.json | 2 - public/images/pokemon/variant/148.json | 2 - public/images/pokemon/variant/149.json | 12 +-- public/images/pokemon/variant/150-mega-x.json | 4 - public/images/pokemon/variant/150-mega-y.json | 5 -- public/images/pokemon/variant/150.json | 4 - public/images/pokemon/variant/151.json | 6 -- public/images/pokemon/variant/161.json | 5 +- public/images/pokemon/variant/162.json | 7 +- public/images/pokemon/variant/163.json | 10 +-- public/images/pokemon/variant/169.json | 13 +-- public/images/pokemon/variant/173.json | 4 +- public/images/pokemon/variant/175.json | 4 - public/images/pokemon/variant/176.json | 3 - public/images/pokemon/variant/177.json | 10 +-- public/images/pokemon/variant/179.json | 4 - public/images/pokemon/variant/181-mega.json | 2 - public/images/pokemon/variant/181.json | 2 - public/images/pokemon/variant/182.json | 4 - public/images/pokemon/variant/183.json | 1 - public/images/pokemon/variant/185.json | 2 - public/images/pokemon/variant/19.json | 12 +-- public/images/pokemon/variant/190.json | 10 +-- public/images/pokemon/variant/193.json | 2 - public/images/pokemon/variant/196.json | 8 +- public/images/pokemon/variant/197.json | 3 - public/images/pokemon/variant/199.json | 6 -- public/images/pokemon/variant/2.json | 4 +- public/images/pokemon/variant/20.json | 2 - public/images/pokemon/variant/200.json | 6 -- public/images/pokemon/variant/201-a.json | 3 +- public/images/pokemon/variant/201-b.json | 3 +- public/images/pokemon/variant/201-c.json | 3 +- public/images/pokemon/variant/201-d.json | 6 +- public/images/pokemon/variant/201-e.json | 3 +- .../pokemon/variant/201-exclamation.json | 3 +- public/images/pokemon/variant/201-f.json | 3 +- public/images/pokemon/variant/201-g.json | 3 +- public/images/pokemon/variant/201-h.json | 3 +- public/images/pokemon/variant/201-i.json | 3 +- public/images/pokemon/variant/201-j.json | 6 +- public/images/pokemon/variant/201-k.json | 3 +- public/images/pokemon/variant/201-l.json | 6 +- public/images/pokemon/variant/201-m.json | 3 +- public/images/pokemon/variant/201-n.json | 3 +- public/images/pokemon/variant/201-o.json | 3 +- public/images/pokemon/variant/201-p.json | 3 +- public/images/pokemon/variant/201-q.json | 3 +- .../images/pokemon/variant/201-question.json | 3 +- public/images/pokemon/variant/201-r.json | 3 +- public/images/pokemon/variant/201-s.json | 3 +- public/images/pokemon/variant/201-t.json | 3 +- public/images/pokemon/variant/201-u.json | 3 +- public/images/pokemon/variant/201-v.json | 3 +- public/images/pokemon/variant/201-w.json | 3 +- public/images/pokemon/variant/201-x.json | 6 +- public/images/pokemon/variant/201-y.json | 3 +- public/images/pokemon/variant/201-z.json | 3 +- public/images/pokemon/variant/2027.json | 10 +-- public/images/pokemon/variant/2028.json | 4 - public/images/pokemon/variant/203.json | 4 - public/images/pokemon/variant/2052.json | 6 -- public/images/pokemon/variant/2053.json | 6 +- public/images/pokemon/variant/206.json | 8 +- public/images/pokemon/variant/212-mega.json | 25 +----- public/images/pokemon/variant/212.json | 19 +---- public/images/pokemon/variant/213.json | 2 - public/images/pokemon/variant/215.json | 3 - public/images/pokemon/variant/216.json | 21 +---- public/images/pokemon/variant/217.json | 19 +---- public/images/pokemon/variant/222.json | 3 - public/images/pokemon/variant/227.json | 3 - public/images/pokemon/variant/228.json | 13 +-- public/images/pokemon/variant/229-mega.json | 8 -- public/images/pokemon/variant/229.json | 9 +-- public/images/pokemon/variant/23.json | 4 - public/images/pokemon/variant/230.json | 2 - public/images/pokemon/variant/231.json | 6 +- public/images/pokemon/variant/232.json | 6 -- public/images/pokemon/variant/233.json | 3 - public/images/pokemon/variant/235.json | 12 +-- public/images/pokemon/variant/239.json | 10 +-- public/images/pokemon/variant/24.json | 6 -- public/images/pokemon/variant/240.json | 8 -- public/images/pokemon/variant/243.json | 2 - public/images/pokemon/variant/245.json | 2 - public/images/pokemon/variant/246.json | 4 - public/images/pokemon/variant/247.json | 3 - public/images/pokemon/variant/248-mega.json | 56 ++++++------- public/images/pokemon/variant/248.json | 4 - public/images/pokemon/variant/251.json | 5 +- public/images/pokemon/variant/255.json | 4 - public/images/pokemon/variant/256.json | 6 -- public/images/pokemon/variant/257-mega.json | 2 - public/images/pokemon/variant/257.json | 1 - public/images/pokemon/variant/261.json | 12 +-- public/images/pokemon/variant/262.json | 14 +--- public/images/pokemon/variant/263.json | 10 +-- public/images/pokemon/variant/264.json | 8 +- public/images/pokemon/variant/2670.json | 2 - public/images/pokemon/variant/278.json | 3 - public/images/pokemon/variant/279.json | 2 +- public/images/pokemon/variant/282.json | 8 -- public/images/pokemon/variant/285.json | 5 -- public/images/pokemon/variant/286.json | 10 +-- public/images/pokemon/variant/29.json | 10 +-- public/images/pokemon/variant/290.json | 4 - public/images/pokemon/variant/292.json | 1 - .../images/pokemon/variant/3-gigantamax.json | 4 - public/images/pokemon/variant/3.json | 8 +- public/images/pokemon/variant/30.json | 12 +-- public/images/pokemon/variant/300.json | 3 - public/images/pokemon/variant/301.json | 9 --- public/images/pokemon/variant/302-mega.json | 2 - public/images/pokemon/variant/302.json | 2 - public/images/pokemon/variant/303-mega.json | 11 --- public/images/pokemon/variant/303.json | 8 +- public/images/pokemon/variant/304.json | 3 - public/images/pokemon/variant/305.json | 3 - public/images/pokemon/variant/306-mega.json | 11 +-- public/images/pokemon/variant/306.json | 3 - public/images/pokemon/variant/307.json | 13 +-- public/images/pokemon/variant/308-mega.json | 8 +- public/images/pokemon/variant/308.json | 2 - public/images/pokemon/variant/309.json | 6 -- public/images/pokemon/variant/31.json | 14 +--- public/images/pokemon/variant/310-mega.json | 4 - public/images/pokemon/variant/310.json | 10 +-- public/images/pokemon/variant/311.json | 9 +-- public/images/pokemon/variant/312.json | 4 - public/images/pokemon/variant/315.json | 2 - public/images/pokemon/variant/320.json | 8 -- public/images/pokemon/variant/321.json | 8 +- public/images/pokemon/variant/327.json | 2 - public/images/pokemon/variant/328.json | 12 +-- public/images/pokemon/variant/329.json | 2 - public/images/pokemon/variant/330.json | 4 - public/images/pokemon/variant/333.json | 8 +- public/images/pokemon/variant/334-mega.json | 3 +- public/images/pokemon/variant/336.json | 4 - public/images/pokemon/variant/337.json | 2 - public/images/pokemon/variant/338.json | 2 - public/images/pokemon/variant/339.json | 3 - public/images/pokemon/variant/340.json | 2 - public/images/pokemon/variant/35.json | 2 - public/images/pokemon/variant/351-rainy.json | 5 -- public/images/pokemon/variant/351-snowy.json | 15 +--- public/images/pokemon/variant/351-sunny.json | 1 - public/images/pokemon/variant/352.json | 13 +-- public/images/pokemon/variant/353.json | 2 - public/images/pokemon/variant/354-mega.json | 3 - public/images/pokemon/variant/354.json | 3 - public/images/pokemon/variant/357.json | 3 - public/images/pokemon/variant/358.json | 2 - public/images/pokemon/variant/36.json | 8 +- public/images/pokemon/variant/361.json | 7 +- public/images/pokemon/variant/362-mega.json | 1 - public/images/pokemon/variant/369.json | 2 - public/images/pokemon/variant/37.json | 4 - public/images/pokemon/variant/370.json | 3 - public/images/pokemon/variant/371.json | 12 +-- public/images/pokemon/variant/372.json | 4 - public/images/pokemon/variant/373.json | 4 - public/images/pokemon/variant/374.json | 2 - public/images/pokemon/variant/375.json | 3 - public/images/pokemon/variant/376-mega.json | 2 - public/images/pokemon/variant/376.json | 2 - public/images/pokemon/variant/38.json | 4 - public/images/pokemon/variant/380-mega.json | 4 - public/images/pokemon/variant/380.json | 4 - public/images/pokemon/variant/381-mega.json | 4 - public/images/pokemon/variant/381.json | 4 - public/images/pokemon/variant/382-primal.json | 4 - public/images/pokemon/variant/382.json | 4 - public/images/pokemon/variant/383-primal.json | 6 -- public/images/pokemon/variant/383.json | 2 - public/images/pokemon/variant/384-mega.json | 4 +- public/images/pokemon/variant/384.json | 10 +-- public/images/pokemon/variant/385.json | 6 -- public/images/pokemon/variant/387.json | 7 +- public/images/pokemon/variant/388.json | 12 +-- public/images/pokemon/variant/389.json | 2 - public/images/pokemon/variant/393.json | 3 - public/images/pokemon/variant/394.json | 3 - public/images/pokemon/variant/395.json | 9 +-- public/images/pokemon/variant/399.json | 7 +- public/images/pokemon/variant/4.json | 4 - public/images/pokemon/variant/400.json | 5 -- public/images/pokemon/variant/401.json | 2 - public/images/pokemon/variant/402.json | 5 -- public/images/pokemon/variant/4052.json | 5 -- public/images/pokemon/variant/406.json | 10 +-- public/images/pokemon/variant/407.json | 2 - public/images/pokemon/variant/4077.json | 8 +- public/images/pokemon/variant/4078.json | 4 - public/images/pokemon/variant/4079.json | 6 -- public/images/pokemon/variant/4080.json | 6 -- public/images/pokemon/variant/41.json | 10 +-- public/images/pokemon/variant/412-plant.json | 5 -- public/images/pokemon/variant/412-trash.json | 3 - public/images/pokemon/variant/413-sandy.json | 6 -- public/images/pokemon/variant/413-trash.json | 6 -- public/images/pokemon/variant/414.json | 2 - public/images/pokemon/variant/418.json | 7 -- public/images/pokemon/variant/419.json | 5 -- public/images/pokemon/variant/4199.json | 4 - public/images/pokemon/variant/42.json | 8 -- public/images/pokemon/variant/422-east.json | 9 --- public/images/pokemon/variant/422-west.json | 6 -- public/images/pokemon/variant/4222.json | 2 - public/images/pokemon/variant/423-east.json | 11 --- public/images/pokemon/variant/423-west.json | 21 +---- public/images/pokemon/variant/424.json | 10 +-- public/images/pokemon/variant/425.json | 2 - public/images/pokemon/variant/426.json | 2 - public/images/pokemon/variant/4263.json | 4 - public/images/pokemon/variant/4264.json | 4 - public/images/pokemon/variant/427.json | 10 +-- public/images/pokemon/variant/428-mega.json | 4 - public/images/pokemon/variant/428.json | 4 - public/images/pokemon/variant/429.json | 6 -- public/images/pokemon/variant/43.json | 2 - public/images/pokemon/variant/433.json | 12 +-- public/images/pokemon/variant/436.json | 2 - public/images/pokemon/variant/437.json | 2 - public/images/pokemon/variant/438.json | 5 +- public/images/pokemon/variant/44.json | 2 - public/images/pokemon/variant/440.json | 2 - public/images/pokemon/variant/441.json | 2 - public/images/pokemon/variant/442.json | 6 -- public/images/pokemon/variant/443.json | 13 --- public/images/pokemon/variant/444.json | 15 +--- public/images/pokemon/variant/445-mega.json | 24 +----- public/images/pokemon/variant/445.json | 15 ---- public/images/pokemon/variant/447.json | 10 +-- public/images/pokemon/variant/448-mega.json | 5 -- public/images/pokemon/variant/448.json | 7 +- public/images/pokemon/variant/45.json | 2 - public/images/pokemon/variant/456.json | 4 - public/images/pokemon/variant/4562.json | 6 -- public/images/pokemon/variant/457.json | 8 +- public/images/pokemon/variant/458.json | 4 - public/images/pokemon/variant/46.json | 6 -- public/images/pokemon/variant/461.json | 3 - public/images/pokemon/variant/462.json | 8 +- public/images/pokemon/variant/464.json | 7 -- public/images/pokemon/variant/466.json | 9 +-- public/images/pokemon/variant/467.json | 14 +--- public/images/pokemon/variant/468.json | 3 - public/images/pokemon/variant/47.json | 3 - public/images/pokemon/variant/470.json | 10 +-- public/images/pokemon/variant/471.json | 3 - public/images/pokemon/variant/474.json | 3 - public/images/pokemon/variant/475.json | 8 -- public/images/pokemon/variant/478.json | 1 - public/images/pokemon/variant/479-fan.json | 4 - public/images/pokemon/variant/479-frost.json | 4 - public/images/pokemon/variant/479-heat.json | 4 - public/images/pokemon/variant/479-mow.json | 5 -- public/images/pokemon/variant/479-wash.json | 4 - public/images/pokemon/variant/479.json | 4 - public/images/pokemon/variant/480.json | 6 -- public/images/pokemon/variant/481.json | 6 -- public/images/pokemon/variant/482.json | 10 +-- public/images/pokemon/variant/485.json | 4 - .../images/pokemon/variant/487-altered.json | 2 - public/images/pokemon/variant/487-origin.json | 3 - public/images/pokemon/variant/488.json | 6 +- public/images/pokemon/variant/489.json | 14 ---- public/images/pokemon/variant/490.json | 7 -- public/images/pokemon/variant/491.json | 4 - public/images/pokemon/variant/492-land.json | 2 - public/images/pokemon/variant/492-sky.json | 2 - public/images/pokemon/variant/494.json | 15 +--- public/images/pokemon/variant/495.json | 4 - public/images/pokemon/variant/496.json | 10 +-- public/images/pokemon/variant/497.json | 2 - public/images/pokemon/variant/5.json | 8 -- public/images/pokemon/variant/50.json | 4 - public/images/pokemon/variant/51.json | 4 - public/images/pokemon/variant/517.json | 4 - public/images/pokemon/variant/518.json | 8 +- .../images/pokemon/variant/52-gigantamax.json | 9 --- public/images/pokemon/variant/52.json | 13 --- public/images/pokemon/variant/524.json | 2 - public/images/pokemon/variant/525.json | 2 - public/images/pokemon/variant/53.json | 17 +--- public/images/pokemon/variant/531-mega.json | 2 - public/images/pokemon/variant/531.json | 11 +-- public/images/pokemon/variant/532.json | 6 -- public/images/pokemon/variant/533.json | 4 - public/images/pokemon/variant/534.json | 8 +- public/images/pokemon/variant/538.json | 8 +- public/images/pokemon/variant/540.json | 14 +--- public/images/pokemon/variant/541.json | 8 +- public/images/pokemon/variant/542.json | 4 - public/images/pokemon/variant/544.json | 1 - public/images/pokemon/variant/545.json | 3 - public/images/pokemon/variant/546.json | 2 - public/images/pokemon/variant/547.json | 11 +-- public/images/pokemon/variant/548.json | 13 +-- public/images/pokemon/variant/549.json | 5 +- public/images/pokemon/variant/551.json | 6 -- public/images/pokemon/variant/552.json | 4 - public/images/pokemon/variant/553.json | 4 - public/images/pokemon/variant/556.json | 2 - public/images/pokemon/variant/559.json | 25 +----- public/images/pokemon/variant/56.json | 8 +- public/images/pokemon/variant/560.json | 17 ---- public/images/pokemon/variant/562.json | 6 +- public/images/pokemon/variant/563.json | 2 - .../pokemon/variant/569-gigantamax.json | 2 - public/images/pokemon/variant/569.json | 5 +- public/images/pokemon/variant/570.json | 6 -- public/images/pokemon/variant/571.json | 7 +- public/images/pokemon/variant/577.json | 9 --- public/images/pokemon/variant/578.json | 3 - public/images/pokemon/variant/579.json | 4 - public/images/pokemon/variant/586-autumn.json | 9 +-- public/images/pokemon/variant/586-spring.json | 9 +-- public/images/pokemon/variant/586-summer.json | 3 - public/images/pokemon/variant/586-winter.json | 5 +- public/images/pokemon/variant/592.json | 2 - public/images/pokemon/variant/593.json | 10 +-- public/images/pokemon/variant/594.json | 2 - public/images/pokemon/variant/595.json | 4 - public/images/pokemon/variant/596.json | 10 +-- .../images/pokemon/variant/6-gigantamax.json | 1 - public/images/pokemon/variant/6-mega-x.json | 2 - public/images/pokemon/variant/6-mega-y.json | 5 +- public/images/pokemon/variant/602.json | 2 - public/images/pokemon/variant/603.json | 3 - public/images/pokemon/variant/604.json | 2 - public/images/pokemon/variant/605.json | 6 -- public/images/pokemon/variant/606.json | 4 - public/images/pokemon/variant/609.json | 2 - public/images/pokemon/variant/610.json | 6 -- public/images/pokemon/variant/6100.json | 4 - public/images/pokemon/variant/6101.json | 12 +-- public/images/pokemon/variant/611.json | 4 - public/images/pokemon/variant/612.json | 2 - public/images/pokemon/variant/618.json | 4 - public/images/pokemon/variant/619.json | 7 +- public/images/pokemon/variant/620.json | 6 -- public/images/pokemon/variant/6215.json | 10 +-- public/images/pokemon/variant/622.json | 1 - public/images/pokemon/variant/623.json | 2 - public/images/pokemon/variant/633.json | 2 - public/images/pokemon/variant/634.json | 10 +-- public/images/pokemon/variant/635.json | 8 +- public/images/pokemon/variant/640.json | 2 - .../images/pokemon/variant/647-ordinary.json | 13 +-- .../images/pokemon/variant/647-resolute.json | 12 +-- public/images/pokemon/variant/648-aria.json | 2 - .../images/pokemon/variant/648-pirouette.json | 1 - public/images/pokemon/variant/649-burn.json | 14 +--- public/images/pokemon/variant/649-chill.json | 12 +-- public/images/pokemon/variant/649-douse.json | 14 +--- public/images/pokemon/variant/649-shock.json | 14 +--- public/images/pokemon/variant/649.json | 14 +--- public/images/pokemon/variant/653.json | 8 +- public/images/pokemon/variant/654.json | 10 +-- public/images/pokemon/variant/6549.json | 5 +- public/images/pokemon/variant/655.json | 5 -- public/images/pokemon/variant/6570.json | 7 +- public/images/pokemon/variant/6571.json | 3 - public/images/pokemon/variant/664.json | 6 -- public/images/pokemon/variant/665.json | 4 - .../pokemon/variant/666-archipelago.json | 20 +---- .../pokemon/variant/666-continental.json | 20 +---- .../images/pokemon/variant/666-elegant.json | 20 +---- public/images/pokemon/variant/666-fancy.json | 56 +++++-------- public/images/pokemon/variant/666-garden.json | 18 +---- .../pokemon/variant/666-high-plains.json | 22 +---- .../images/pokemon/variant/666-icy-snow.json | 18 +---- public/images/pokemon/variant/666-jungle.json | 20 +---- public/images/pokemon/variant/666-marine.json | 18 +---- public/images/pokemon/variant/666-meadow.json | 20 +---- public/images/pokemon/variant/666-modern.json | 20 +---- .../images/pokemon/variant/666-monsoon.json | 48 ++++------- public/images/pokemon/variant/666-ocean.json | 20 +---- .../images/pokemon/variant/666-poke-ball.json | 12 +-- public/images/pokemon/variant/666-polar.json | 20 +---- public/images/pokemon/variant/666-river.json | 54 ++++--------- .../images/pokemon/variant/666-sandstorm.json | 20 +---- .../images/pokemon/variant/666-savanna.json | 20 +---- public/images/pokemon/variant/666-sun.json | 20 +---- public/images/pokemon/variant/666-tundra.json | 18 +---- public/images/pokemon/variant/669-orange.json | 1 - public/images/pokemon/variant/669-red.json | 9 +-- public/images/pokemon/variant/669-white.json | 8 -- public/images/pokemon/variant/669-yellow.json | 1 - public/images/pokemon/variant/6705.json | 5 +- public/images/pokemon/variant/671-blue.json | 5 -- public/images/pokemon/variant/671-orange.json | 7 -- public/images/pokemon/variant/671-red.json | 5 -- public/images/pokemon/variant/671-white.json | 5 -- public/images/pokemon/variant/671-yellow.json | 5 -- public/images/pokemon/variant/6713.json | 2 - public/images/pokemon/variant/672.json | 1 - public/images/pokemon/variant/673.json | 2 - public/images/pokemon/variant/677.json | 8 +- public/images/pokemon/variant/678-female.json | 4 - public/images/pokemon/variant/678.json | 4 - public/images/pokemon/variant/690.json | 2 - public/images/pokemon/variant/691.json | 1 - public/images/pokemon/variant/696.json | 70 +++++----------- public/images/pokemon/variant/697.json | 65 +++++++-------- public/images/pokemon/variant/698.json | 6 -- public/images/pokemon/variant/699.json | 4 - public/images/pokemon/variant/70.json | 2 - public/images/pokemon/variant/700.json | 2 - public/images/pokemon/variant/702.json | 4 - public/images/pokemon/variant/703.json | 3 - public/images/pokemon/variant/704.json | 2 - public/images/pokemon/variant/705.json | 2 - public/images/pokemon/variant/706.json | 4 - public/images/pokemon/variant/708.json | 2 - public/images/pokemon/variant/709.json | 2 - public/images/pokemon/variant/71.json | 4 - public/images/pokemon/variant/710.json | 2 - public/images/pokemon/variant/711.json | 3 - public/images/pokemon/variant/712.json | 7 +- public/images/pokemon/variant/713.json | 8 +- public/images/pokemon/variant/714.json | 4 - public/images/pokemon/variant/715.json | 76 +++++++++-------- public/images/pokemon/variant/716-active.json | 4 - .../images/pokemon/variant/716-neutral.json | 4 - public/images/pokemon/variant/717.json | 8 +- .../images/pokemon/variant/720-unbound.json | 12 +-- public/images/pokemon/variant/720.json | 3 - public/images/pokemon/variant/728.json | 4 - public/images/pokemon/variant/729.json | 6 -- public/images/pokemon/variant/730.json | 8 +- public/images/pokemon/variant/734.json | 7 -- public/images/pokemon/variant/735.json | 7 -- public/images/pokemon/variant/747.json | 8 +- public/images/pokemon/variant/748.json | 3 - public/images/pokemon/variant/752.json | 3 - public/images/pokemon/variant/753.json | 2 - public/images/pokemon/variant/754.json | 2 - public/images/pokemon/variant/755.json | 2 - public/images/pokemon/variant/756.json | 1 - public/images/pokemon/variant/761.json | 7 +- public/images/pokemon/variant/762.json | 7 -- public/images/pokemon/variant/763.json | 12 +-- public/images/pokemon/variant/767.json | 8 +- public/images/pokemon/variant/768.json | 7 +- public/images/pokemon/variant/77.json | 4 - public/images/pokemon/variant/771.json | 4 - public/images/pokemon/variant/772.json | 2 - public/images/pokemon/variant/773.json | 5 -- public/images/pokemon/variant/776.json | 4 - public/images/pokemon/variant/777.json | 5 -- .../images/pokemon/variant/778-disguised.json | 2 +- public/images/pokemon/variant/779.json | 10 +-- public/images/pokemon/variant/78.json | 4 - public/images/pokemon/variant/789.json | 12 --- public/images/pokemon/variant/79.json | 13 --- public/images/pokemon/variant/790.json | 9 --- .../pokemon/variant/791-radiant-sun.json | 4 - public/images/pokemon/variant/791.json | 8 +- .../images/pokemon/variant/792-full-moon.json | 9 --- public/images/pokemon/variant/792.json | 7 -- public/images/pokemon/variant/793.json | 6 +- public/images/pokemon/variant/797.json | 2 - public/images/pokemon/variant/798.json | 2 - public/images/pokemon/variant/80-mega.json | 6 -- public/images/pokemon/variant/80.json | 6 -- .../pokemon/variant/800-dawn-wings.json | 2 - .../images/pokemon/variant/800-dusk-mane.json | 8 +- public/images/pokemon/variant/800-ultra.json | 9 +-- public/images/pokemon/variant/800.json | 3 - public/images/pokemon/variant/802.json | 8 +- public/images/pokemon/variant/803.json | 2 - public/images/pokemon/variant/804.json | 2 - public/images/pokemon/variant/808.json | 8 +- .../pokemon/variant/809-gigantamax.json | 7 +- public/images/pokemon/variant/809.json | 8 +- public/images/pokemon/variant/81.json | 3 - public/images/pokemon/variant/816.json | 8 +- public/images/pokemon/variant/817.json | 4 - .../pokemon/variant/818-gigantamax.json | 9 +-- public/images/pokemon/variant/818.json | 4 - public/images/pokemon/variant/82.json | 3 - public/images/pokemon/variant/821.json | 6 -- public/images/pokemon/variant/822.json | 4 - public/images/pokemon/variant/823.json | 5 +- public/images/pokemon/variant/829.json | 3 - public/images/pokemon/variant/830.json | 2 - public/images/pokemon/variant/835.json | 12 +-- public/images/pokemon/variant/84.json | 7 -- public/images/pokemon/variant/85.json | 11 --- public/images/pokemon/variant/850.json | 14 +--- .../pokemon/variant/851-gigantamax.json | 11 +-- public/images/pokemon/variant/851.json | 5 -- public/images/pokemon/variant/854.json | 3 - public/images/pokemon/variant/855.json | 6 +- public/images/pokemon/variant/856.json | 2 - .../pokemon/variant/858-gigantamax.json | 4 - public/images/pokemon/variant/858.json | 8 +- public/images/pokemon/variant/859.json | 5 -- public/images/pokemon/variant/86.json | 11 +-- public/images/pokemon/variant/860.json | 5 -- .../pokemon/variant/861-gigantamax.json | 5 -- public/images/pokemon/variant/861.json | 7 -- public/images/pokemon/variant/862.json | 9 +-- public/images/pokemon/variant/863.json | 4 - public/images/pokemon/variant/864.json | 2 - public/images/pokemon/variant/867.json | 2 - public/images/pokemon/variant/87.json | 7 -- public/images/pokemon/variant/872.json | 15 +--- public/images/pokemon/variant/873.json | 4 - public/images/pokemon/variant/876-female.json | 2 - public/images/pokemon/variant/876.json | 2 - public/images/pokemon/variant/877-hangry.json | 14 ---- public/images/pokemon/variant/877.json | 21 ----- public/images/pokemon/variant/880.json | 3 - public/images/pokemon/variant/881.json | 2 - public/images/pokemon/variant/882.json | 2 - public/images/pokemon/variant/883.json | 2 - .../pokemon/variant/884-gigantamax.json | 3 - public/images/pokemon/variant/884.json | 2 - public/images/pokemon/variant/885.json | 3 - public/images/pokemon/variant/886.json | 7 +- public/images/pokemon/variant/887.json | 2 - .../images/pokemon/variant/888-crowned.json | 4 - public/images/pokemon/variant/888.json | 4 - .../images/pokemon/variant/889-crowned.json | 4 - public/images/pokemon/variant/889.json | 8 +- .../images/pokemon/variant/890-eternamax.json | 2 - public/images/pokemon/variant/890.json | 6 +- public/images/pokemon/variant/8901.json | 25 +----- public/images/pokemon/variant/891.json | 11 --- .../pokemon/variant/892-gigantamax-rapid.json | 4 - .../variant/892-gigantamax-single.json | 4 - .../pokemon/variant/892-rapid-strike.json | 17 +--- public/images/pokemon/variant/892.json | 11 --- public/images/pokemon/variant/896.json | 3 - public/images/pokemon/variant/897.json | 2 - public/images/pokemon/variant/898-ice.json | 6 -- public/images/pokemon/variant/898-shadow.json | 10 --- public/images/pokemon/variant/898.json | 5 -- .../images/pokemon/variant/9-gigantamax.json | 5 -- public/images/pokemon/variant/900.json | 20 +---- public/images/pokemon/variant/901.json | 9 +-- public/images/pokemon/variant/903.json | 2 - public/images/pokemon/variant/911.json | 15 +--- public/images/pokemon/variant/912.json | 4 - public/images/pokemon/variant/914.json | 2 - public/images/pokemon/variant/919.json | 8 -- public/images/pokemon/variant/924.json | 3 - public/images/pokemon/variant/925-four.json | 2 - public/images/pokemon/variant/925-three.json | 2 - public/images/pokemon/variant/93.json | 9 --- public/images/pokemon/variant/932.json | 2 - public/images/pokemon/variant/933.json | 7 +- public/images/pokemon/variant/934.json | 2 - .../images/pokemon/variant/94-gigantamax.json | 3 - public/images/pokemon/variant/94.json | 5 -- public/images/pokemon/variant/940.json | 5 -- public/images/pokemon/variant/941.json | 4 - public/images/pokemon/variant/948.json | 2 - public/images/pokemon/variant/949.json | 12 +-- public/images/pokemon/variant/951.json | 2 - public/images/pokemon/variant/952.json | 8 -- public/images/pokemon/variant/953.json | 2 - public/images/pokemon/variant/954.json | 2 - public/images/pokemon/variant/957.json | 5 +- public/images/pokemon/variant/958.json | 2 - public/images/pokemon/variant/962.json | 3 - public/images/pokemon/variant/967.json | 11 +-- public/images/pokemon/variant/969.json | 2 - public/images/pokemon/variant/970.json | 2 - public/images/pokemon/variant/974.json | 8 -- public/images/pokemon/variant/98.json | 10 +-- public/images/pokemon/variant/981.json | 6 -- .../pokemon/variant/982-three-segment.json | 3 - public/images/pokemon/variant/982.json | 3 - public/images/pokemon/variant/987.json | 12 +-- public/images/pokemon/variant/988.json | 4 - .../images/pokemon/variant/99-gigantamax.json | 2 - public/images/pokemon/variant/99.json | 6 -- public/images/pokemon/variant/993.json | 5 -- public/images/pokemon/variant/994.json | 6 -- public/images/pokemon/variant/995.json | 7 +- public/images/pokemon/variant/996.json | 4 - public/images/pokemon/variant/997.json | 4 - public/images/pokemon/variant/998.json | 2 - public/images/pokemon/variant/999.json | 7 -- public/images/pokemon/variant/back/1.json | 8 +- public/images/pokemon/variant/back/100.json | 7 +- public/images/pokemon/variant/back/1000.json | 13 +-- public/images/pokemon/variant/back/1001.json | 2 - public/images/pokemon/variant/back/1003.json | 2 - public/images/pokemon/variant/back/1004.json | 8 +- public/images/pokemon/variant/back/1006.json | 3 - .../variant/back/1008-ultimate-mode.json | 19 +---- public/images/pokemon/variant/back/101.json | 9 +-- public/images/pokemon/variant/back/1010.json | 8 +- public/images/pokemon/variant/back/1018.json | 5 -- public/images/pokemon/variant/back/1023.json | 6 -- public/images/pokemon/variant/back/111.json | 10 +-- public/images/pokemon/variant/back/112.json | 10 +-- public/images/pokemon/variant/back/113.json | 3 - public/images/pokemon/variant/back/114.json | 2 - public/images/pokemon/variant/back/116.json | 6 -- public/images/pokemon/variant/back/117.json | 10 +-- public/images/pokemon/variant/back/118.json | 3 - public/images/pokemon/variant/back/119.json | 4 - public/images/pokemon/variant/back/120.json | 2 - public/images/pokemon/variant/back/121.json | 6 +- public/images/pokemon/variant/back/123.json | 27 +------ public/images/pokemon/variant/back/125.json | 7 +- public/images/pokemon/variant/back/126.json | 4 - .../images/pokemon/variant/back/127-mega.json | 16 +--- public/images/pokemon/variant/back/127.json | 8 +- public/images/pokemon/variant/back/129.json | 5 +- .../images/pokemon/variant/back/130-mega.json | 13 +-- public/images/pokemon/variant/back/130.json | 5 +- .../pokemon/variant/back/131-gigantamax.json | 6 -- public/images/pokemon/variant/back/131.json | 6 -- public/images/pokemon/variant/back/132.json | 6 +- .../pokemon/variant/back/133-partner.json | 2 - public/images/pokemon/variant/back/133.json | 2 - public/images/pokemon/variant/back/134.json | 2 - public/images/pokemon/variant/back/135.json | 11 +-- public/images/pokemon/variant/back/136.json | 3 - public/images/pokemon/variant/back/137.json | 4 - public/images/pokemon/variant/back/138.json | 2 - public/images/pokemon/variant/back/139.json | 9 +-- public/images/pokemon/variant/back/140.json | 4 - public/images/pokemon/variant/back/141.json | 2 - .../images/pokemon/variant/back/142-mega.json | 4 - public/images/pokemon/variant/back/142.json | 6 -- public/images/pokemon/variant/back/144.json | 20 +---- public/images/pokemon/variant/back/145.json | 6 -- public/images/pokemon/variant/back/146.json | 18 +---- public/images/pokemon/variant/back/147.json | 2 - public/images/pokemon/variant/back/148.json | 2 - public/images/pokemon/variant/back/149.json | 12 +-- .../pokemon/variant/back/150-mega-x.json | 5 -- .../pokemon/variant/back/150-mega-y.json | 6 +- public/images/pokemon/variant/back/150.json | 4 - public/images/pokemon/variant/back/151.json | 2 - public/images/pokemon/variant/back/161.json | 2 - public/images/pokemon/variant/back/162.json | 4 - public/images/pokemon/variant/back/163.json | 10 +-- public/images/pokemon/variant/back/164.json | 12 +-- public/images/pokemon/variant/back/169.json | 2 - public/images/pokemon/variant/back/173.json | 2 - public/images/pokemon/variant/back/175.json | 4 - public/images/pokemon/variant/back/176.json | 3 - public/images/pokemon/variant/back/177.json | 10 +-- public/images/pokemon/variant/back/179.json | 4 - public/images/pokemon/variant/back/180.json | 2 - .../images/pokemon/variant/back/181-mega.json | 2 - public/images/pokemon/variant/back/181.json | 5 -- public/images/pokemon/variant/back/182.json | 2 - public/images/pokemon/variant/back/183.json | 2 - public/images/pokemon/variant/back/184.json | 8 +- public/images/pokemon/variant/back/185.json | 2 - public/images/pokemon/variant/back/19.json | 6 -- public/images/pokemon/variant/back/190.json | 2 - public/images/pokemon/variant/back/193.json | 2 - public/images/pokemon/variant/back/196.json | 3 - public/images/pokemon/variant/back/197.json | 2 - public/images/pokemon/variant/back/199.json | 6 -- public/images/pokemon/variant/back/2.json | 9 +-- public/images/pokemon/variant/back/20.json | 12 +-- public/images/pokemon/variant/back/200.json | 1 - public/images/pokemon/variant/back/2027.json | 4 - public/images/pokemon/variant/back/2028.json | 2 - public/images/pokemon/variant/back/203.json | 4 - public/images/pokemon/variant/back/2052.json | 4 - public/images/pokemon/variant/back/2053.json | 2 - public/images/pokemon/variant/back/206.json | 2 - public/images/pokemon/variant/back/207.json | 2 - .../images/pokemon/variant/back/212-mega.json | 18 ----- public/images/pokemon/variant/back/212.json | 19 +---- public/images/pokemon/variant/back/213.json | 2 - public/images/pokemon/variant/back/215.json | 5 +- public/images/pokemon/variant/back/216.json | 18 +---- public/images/pokemon/variant/back/217.json | 21 +---- public/images/pokemon/variant/back/222.json | 2 - public/images/pokemon/variant/back/226.json | 2 - public/images/pokemon/variant/back/227.json | 5 +- public/images/pokemon/variant/back/228.json | 10 +-- .../images/pokemon/variant/back/229-mega.json | 6 -- public/images/pokemon/variant/back/229.json | 11 +-- public/images/pokemon/variant/back/23.json | 8 +- public/images/pokemon/variant/back/230.json | 2 - public/images/pokemon/variant/back/231.json | 5 +- public/images/pokemon/variant/back/232.json | 2 - public/images/pokemon/variant/back/233.json | 7 +- public/images/pokemon/variant/back/235.json | 2 - public/images/pokemon/variant/back/239.json | 8 +- public/images/pokemon/variant/back/24.json | 10 +-- public/images/pokemon/variant/back/240.json | 10 +-- public/images/pokemon/variant/back/242.json | 3 - public/images/pokemon/variant/back/243.json | 4 - public/images/pokemon/variant/back/245.json | 5 -- public/images/pokemon/variant/back/246.json | 4 - public/images/pokemon/variant/back/247.json | 2 - .../images/pokemon/variant/back/248-mega.json | 40 +++++---- public/images/pokemon/variant/back/248.json | 9 --- public/images/pokemon/variant/back/249.json | 2 - public/images/pokemon/variant/back/250.json | 12 +-- public/images/pokemon/variant/back/251.json | 6 +- public/images/pokemon/variant/back/255.json | 8 +- public/images/pokemon/variant/back/256.json | 2 - .../images/pokemon/variant/back/257-mega.json | 2 - public/images/pokemon/variant/back/257.json | 4 - public/images/pokemon/variant/back/261.json | 10 +-- public/images/pokemon/variant/back/262.json | 14 +--- public/images/pokemon/variant/back/263.json | 7 +- public/images/pokemon/variant/back/264.json | 6 -- public/images/pokemon/variant/back/2670.json | 2 - public/images/pokemon/variant/back/278.json | 6 +- public/images/pokemon/variant/back/279.json | 8 -- .../images/pokemon/variant/back/282-mega.json | 5 -- public/images/pokemon/variant/back/282.json | 8 +- public/images/pokemon/variant/back/285.json | 5 -- public/images/pokemon/variant/back/286.json | 6 +- public/images/pokemon/variant/back/29.json | 6 -- public/images/pokemon/variant/back/290.json | 4 - public/images/pokemon/variant/back/298.json | 2 - .../pokemon/variant/back/3-gigantamax.json | 8 +- public/images/pokemon/variant/back/3.json | 8 +- public/images/pokemon/variant/back/30.json | 13 +-- public/images/pokemon/variant/back/300.json | 3 - public/images/pokemon/variant/back/301.json | 3 - .../images/pokemon/variant/back/302-mega.json | 2 - public/images/pokemon/variant/back/302.json | 2 - .../images/pokemon/variant/back/303-mega.json | 14 ---- public/images/pokemon/variant/back/303.json | 6 -- public/images/pokemon/variant/back/304.json | 5 -- public/images/pokemon/variant/back/305.json | 3 - .../images/pokemon/variant/back/306-mega.json | 3 - public/images/pokemon/variant/back/306.json | 3 - public/images/pokemon/variant/back/307.json | 2 - .../images/pokemon/variant/back/308-mega.json | 3 - public/images/pokemon/variant/back/308.json | 3 - public/images/pokemon/variant/back/309.json | 8 +- public/images/pokemon/variant/back/31.json | 12 +-- .../images/pokemon/variant/back/310-mega.json | 9 +-- public/images/pokemon/variant/back/310.json | 10 +-- public/images/pokemon/variant/back/311.json | 3 - public/images/pokemon/variant/back/312.json | 2 - public/images/pokemon/variant/back/315.json | 2 - public/images/pokemon/variant/back/320.json | 2 - public/images/pokemon/variant/back/321.json | 3 - public/images/pokemon/variant/back/327.json | 2 - public/images/pokemon/variant/back/328.json | 4 - public/images/pokemon/variant/back/329.json | 4 - public/images/pokemon/variant/back/330.json | 7 +- public/images/pokemon/variant/back/333.json | 8 +- .../images/pokemon/variant/back/334-mega.json | 2 - public/images/pokemon/variant/back/334.json | 2 - public/images/pokemon/variant/back/336.json | 4 - public/images/pokemon/variant/back/337.json | 2 - public/images/pokemon/variant/back/338.json | 2 - public/images/pokemon/variant/back/339.json | 1 - public/images/pokemon/variant/back/340.json | 6 +- public/images/pokemon/variant/back/341.json | 6 -- public/images/pokemon/variant/back/35.json | 8 +- .../pokemon/variant/back/351-rainy.json | 10 --- .../pokemon/variant/back/351-snowy.json | 11 +-- .../pokemon/variant/back/351-sunny.json | 2 - public/images/pokemon/variant/back/351.json | 2 - public/images/pokemon/variant/back/352.json | 12 +-- public/images/pokemon/variant/back/353.json | 2 - .../images/pokemon/variant/back/354-mega.json | 2 - public/images/pokemon/variant/back/354.json | 2 - public/images/pokemon/variant/back/357.json | 1 - public/images/pokemon/variant/back/358.json | 6 -- public/images/pokemon/variant/back/36.json | 5 +- public/images/pokemon/variant/back/361.json | 2 - .../images/pokemon/variant/back/362-mega.json | 2 - public/images/pokemon/variant/back/362.json | 5 +- public/images/pokemon/variant/back/37.json | 2 - public/images/pokemon/variant/back/371.json | 16 +--- public/images/pokemon/variant/back/372.json | 4 - .../images/pokemon/variant/back/373-mega.json | 8 +- public/images/pokemon/variant/back/373.json | 7 +- public/images/pokemon/variant/back/374.json | 2 - public/images/pokemon/variant/back/375.json | 2 - .../images/pokemon/variant/back/376-mega.json | 6 +- public/images/pokemon/variant/back/376.json | 2 - public/images/pokemon/variant/back/38.json | 2 - .../images/pokemon/variant/back/380-mega.json | 2 - public/images/pokemon/variant/back/380.json | 4 - .../images/pokemon/variant/back/381-mega.json | 2 - public/images/pokemon/variant/back/381.json | 4 - .../pokemon/variant/back/382-primal.json | 4 - public/images/pokemon/variant/back/382.json | 8 +- .../pokemon/variant/back/383-primal.json | 14 +--- public/images/pokemon/variant/back/383.json | 10 +-- .../images/pokemon/variant/back/384-mega.json | 8 +- public/images/pokemon/variant/back/384.json | 11 +-- public/images/pokemon/variant/back/385.json | 3 - public/images/pokemon/variant/back/387.json | 4 +- public/images/pokemon/variant/back/388.json | 12 +-- public/images/pokemon/variant/back/389.json | 2 - public/images/pokemon/variant/back/393.json | 3 - public/images/pokemon/variant/back/394.json | 2 - public/images/pokemon/variant/back/395.json | 2 - public/images/pokemon/variant/back/399.json | 1 - public/images/pokemon/variant/back/4.json | 10 +-- public/images/pokemon/variant/back/400.json | 3 - public/images/pokemon/variant/back/401.json | 2 - public/images/pokemon/variant/back/402.json | 3 - public/images/pokemon/variant/back/4052.json | 4 - public/images/pokemon/variant/back/406.json | 2 - public/images/pokemon/variant/back/407.json | 2 - public/images/pokemon/variant/back/4077.json | 2 - public/images/pokemon/variant/back/4078.json | 4 - public/images/pokemon/variant/back/4079.json | 10 +-- public/images/pokemon/variant/back/4080.json | 8 -- public/images/pokemon/variant/back/41.json | 12 +-- .../pokemon/variant/back/412-plant.json | 6 +- .../pokemon/variant/back/412-trash.json | 3 - .../pokemon/variant/back/413-plant.json | 3 - .../pokemon/variant/back/413-sandy.json | 3 - .../pokemon/variant/back/413-trash.json | 5 -- public/images/pokemon/variant/back/414.json | 2 - public/images/pokemon/variant/back/418.json | 7 -- public/images/pokemon/variant/back/419.json | 7 -- public/images/pokemon/variant/back/4199.json | 4 - public/images/pokemon/variant/back/42.json | 2 - .../images/pokemon/variant/back/422-east.json | 6 -- .../images/pokemon/variant/back/422-west.json | 6 -- public/images/pokemon/variant/back/4222.json | 2 - .../images/pokemon/variant/back/423-east.json | 3 - .../images/pokemon/variant/back/423-west.json | 4 - public/images/pokemon/variant/back/424.json | 2 - public/images/pokemon/variant/back/425.json | 2 - public/images/pokemon/variant/back/426.json | 2 - public/images/pokemon/variant/back/4263.json | 10 +-- public/images/pokemon/variant/back/4264.json | 4 - public/images/pokemon/variant/back/427.json | 3 - .../images/pokemon/variant/back/428-mega.json | 2 - public/images/pokemon/variant/back/428.json | 2 - public/images/pokemon/variant/back/429.json | 12 +-- public/images/pokemon/variant/back/43.json | 2 - public/images/pokemon/variant/back/433.json | 3 - public/images/pokemon/variant/back/436.json | 2 - public/images/pokemon/variant/back/437.json | 2 - public/images/pokemon/variant/back/438.json | 2 - public/images/pokemon/variant/back/44.json | 2 - public/images/pokemon/variant/back/440.json | 4 - public/images/pokemon/variant/back/441.json | 1 - public/images/pokemon/variant/back/442.json | 9 +-- public/images/pokemon/variant/back/443.json | 11 --- public/images/pokemon/variant/back/444.json | 15 +--- .../images/pokemon/variant/back/445-mega.json | 12 --- public/images/pokemon/variant/back/445.json | 12 --- public/images/pokemon/variant/back/447.json | 11 +-- .../images/pokemon/variant/back/448-mega.json | 15 +--- public/images/pokemon/variant/back/448.json | 15 +--- public/images/pokemon/variant/back/45.json | 2 - public/images/pokemon/variant/back/453.json | 1 - public/images/pokemon/variant/back/454.json | 1 - public/images/pokemon/variant/back/456.json | 10 +-- public/images/pokemon/variant/back/4562.json | 4 - public/images/pokemon/variant/back/457.json | 2 - public/images/pokemon/variant/back/46.json | 3 - public/images/pokemon/variant/back/461.json | 3 - public/images/pokemon/variant/back/462.json | 3 - public/images/pokemon/variant/back/464.json | 9 +-- public/images/pokemon/variant/back/465.json | 4 +- public/images/pokemon/variant/back/466.json | 5 +- public/images/pokemon/variant/back/467.json | 6 -- public/images/pokemon/variant/back/468.json | 3 - public/images/pokemon/variant/back/47.json | 3 - public/images/pokemon/variant/back/470.json | 1 - public/images/pokemon/variant/back/471.json | 14 +--- public/images/pokemon/variant/back/474.json | 3 - public/images/pokemon/variant/back/475.json | 6 -- public/images/pokemon/variant/back/478.json | 1 - .../images/pokemon/variant/back/479-fan.json | 9 +-- .../pokemon/variant/back/479-frost.json | 9 +-- .../images/pokemon/variant/back/479-heat.json | 3 - .../images/pokemon/variant/back/479-mow.json | 6 +- .../images/pokemon/variant/back/479-wash.json | 8 +- public/images/pokemon/variant/back/479.json | 4 - public/images/pokemon/variant/back/480.json | 3 - public/images/pokemon/variant/back/481.json | 6 +- public/images/pokemon/variant/back/482.json | 3 - public/images/pokemon/variant/back/485.json | 9 +-- .../pokemon/variant/back/487-altered.json | 2 - .../pokemon/variant/back/487-origin.json | 6 +- public/images/pokemon/variant/back/488.json | 4 - public/images/pokemon/variant/back/489.json | 3 - public/images/pokemon/variant/back/490.json | 3 - public/images/pokemon/variant/back/491.json | 11 +-- .../images/pokemon/variant/back/492-land.json | 2 - .../images/pokemon/variant/back/492-sky.json | 2 - public/images/pokemon/variant/back/494.json | 4 - public/images/pokemon/variant/back/495.json | 4 - public/images/pokemon/variant/back/496.json | 6 -- public/images/pokemon/variant/back/497.json | 3 - public/images/pokemon/variant/back/5.json | 8 -- public/images/pokemon/variant/back/50.json | 2 - public/images/pokemon/variant/back/51.json | 2 - public/images/pokemon/variant/back/517.json | 8 +- public/images/pokemon/variant/back/518.json | 2 - .../pokemon/variant/back/52-gigantamax.json | 9 --- public/images/pokemon/variant/back/52.json | 8 -- public/images/pokemon/variant/back/524.json | 2 - public/images/pokemon/variant/back/525.json | 2 - public/images/pokemon/variant/back/526.json | 2 - public/images/pokemon/variant/back/53.json | 3 - public/images/pokemon/variant/back/530.json | 3 - .../images/pokemon/variant/back/531-mega.json | 2 - public/images/pokemon/variant/back/531.json | 3 - public/images/pokemon/variant/back/532.json | 6 -- public/images/pokemon/variant/back/533.json | 2 - public/images/pokemon/variant/back/534.json | 2 - public/images/pokemon/variant/back/540.json | 2 - public/images/pokemon/variant/back/541.json | 2 - public/images/pokemon/variant/back/542.json | 2 - public/images/pokemon/variant/back/543.json | 1 - public/images/pokemon/variant/back/544.json | 2 - public/images/pokemon/variant/back/545.json | 2 - public/images/pokemon/variant/back/546.json | 2 - public/images/pokemon/variant/back/547.json | 4 - public/images/pokemon/variant/back/548.json | 3 - public/images/pokemon/variant/back/549.json | 4 - public/images/pokemon/variant/back/551.json | 2 - public/images/pokemon/variant/back/552.json | 2 - public/images/pokemon/variant/back/553.json | 2 - public/images/pokemon/variant/back/556.json | 2 - public/images/pokemon/variant/back/559.json | 25 +----- public/images/pokemon/variant/back/56.json | 3 - public/images/pokemon/variant/back/560.json | 18 ----- public/images/pokemon/variant/back/562.json | 9 +-- public/images/pokemon/variant/back/563.json | 2 - public/images/pokemon/variant/back/568.json | 2 - .../pokemon/variant/back/569-gigantamax.json | 3 - public/images/pokemon/variant/back/569.json | 2 - public/images/pokemon/variant/back/57.json | 8 +- public/images/pokemon/variant/back/570.json | 2 - public/images/pokemon/variant/back/571.json | 8 +- public/images/pokemon/variant/back/577.json | 4 - public/images/pokemon/variant/back/578.json | 3 - public/images/pokemon/variant/back/579.json | 3 - .../pokemon/variant/back/585-summer.json | 2 - .../pokemon/variant/back/586-autumn.json | 7 -- .../pokemon/variant/back/586-spring.json | 2 - .../pokemon/variant/back/586-summer.json | 3 - .../pokemon/variant/back/586-winter.json | 5 +- public/images/pokemon/variant/back/592.json | 4 +- public/images/pokemon/variant/back/593.json | 2 - public/images/pokemon/variant/back/594.json | 4 +- public/images/pokemon/variant/back/595.json | 2 - public/images/pokemon/variant/back/596.json | 3 - .../pokemon/variant/back/6-gigantamax.json | 1 - .../images/pokemon/variant/back/6-mega-x.json | 4 +- .../images/pokemon/variant/back/6-mega-y.json | 7 +- public/images/pokemon/variant/back/602.json | 2 - public/images/pokemon/variant/back/603.json | 3 - public/images/pokemon/variant/back/604.json | 2 - public/images/pokemon/variant/back/605.json | 3 - public/images/pokemon/variant/back/606.json | 4 - public/images/pokemon/variant/back/609.json | 2 - public/images/pokemon/variant/back/610.json | 6 -- public/images/pokemon/variant/back/6100.json | 8 -- public/images/pokemon/variant/back/6101.json | 9 +-- public/images/pokemon/variant/back/611.json | 4 - public/images/pokemon/variant/back/612.json | 2 - public/images/pokemon/variant/back/618.json | 5 -- public/images/pokemon/variant/back/619.json | 7 +- public/images/pokemon/variant/back/620.json | 4 - public/images/pokemon/variant/back/6215.json | 6 -- public/images/pokemon/variant/back/622.json | 2 - public/images/pokemon/variant/back/633.json | 2 - public/images/pokemon/variant/back/634.json | 10 +-- public/images/pokemon/variant/back/635.json | 4 - .../pokemon/variant/back/647-ordinary.json | 13 +-- .../pokemon/variant/back/647-resolute.json | 12 +-- .../pokemon/variant/back/648-pirouette.json | 5 +- .../images/pokemon/variant/back/649-burn.json | 8 -- .../pokemon/variant/back/649-chill.json | 6 -- .../pokemon/variant/back/649-douse.json | 8 -- .../pokemon/variant/back/649-shock.json | 8 -- public/images/pokemon/variant/back/649.json | 8 -- public/images/pokemon/variant/back/653.json | 2 - public/images/pokemon/variant/back/654.json | 10 +-- public/images/pokemon/variant/back/6549.json | 12 +-- public/images/pokemon/variant/back/655.json | 6 -- public/images/pokemon/variant/back/6570.json | 2 - public/images/pokemon/variant/back/6571.json | 5 +- public/images/pokemon/variant/back/664.json | 2 - public/images/pokemon/variant/back/665.json | 3 - .../pokemon/variant/back/666-archipelago.json | 19 +---- .../pokemon/variant/back/666-continental.json | 19 +---- .../pokemon/variant/back/666-elegant.json | 17 +--- .../pokemon/variant/back/666-fancy.json | 54 +++++-------- .../pokemon/variant/back/666-garden.json | 15 +--- .../pokemon/variant/back/666-high-plains.json | 21 +---- .../pokemon/variant/back/666-icy-snow.json | 15 +--- .../pokemon/variant/back/666-jungle.json | 19 +---- .../pokemon/variant/back/666-marine.json | 15 +--- .../pokemon/variant/back/666-meadow.json | 17 +--- .../pokemon/variant/back/666-modern.json | 19 +---- .../pokemon/variant/back/666-monsoon.json | 48 ++++------- .../pokemon/variant/back/666-ocean.json | 20 +---- .../pokemon/variant/back/666-poke-ball.json | 11 +-- .../pokemon/variant/back/666-polar.json | 19 +---- .../pokemon/variant/back/666-river.json | 54 ++++--------- .../pokemon/variant/back/666-sandstorm.json | 19 +---- .../pokemon/variant/back/666-savanna.json | 17 +--- .../images/pokemon/variant/back/666-sun.json | 17 +--- .../pokemon/variant/back/666-tundra.json | 15 +--- .../images/pokemon/variant/back/669-blue.json | 5 -- .../pokemon/variant/back/669-orange.json | 5 -- .../images/pokemon/variant/back/669-red.json | 5 -- .../pokemon/variant/back/669-white.json | 6 -- .../pokemon/variant/back/669-yellow.json | 5 -- .../images/pokemon/variant/back/670-blue.json | 7 +- .../pokemon/variant/back/670-orange.json | 7 +- .../images/pokemon/variant/back/670-red.json | 7 +- .../pokemon/variant/back/670-white.json | 11 +-- .../pokemon/variant/back/670-yellow.json | 7 +- public/images/pokemon/variant/back/6705.json | 7 +- .../images/pokemon/variant/back/671-blue.json | 7 +- .../pokemon/variant/back/671-orange.json | 7 +- .../images/pokemon/variant/back/671-red.json | 7 +- .../pokemon/variant/back/671-white.json | 9 +-- .../pokemon/variant/back/671-yellow.json | 7 +- public/images/pokemon/variant/back/6713.json | 2 - public/images/pokemon/variant/back/672.json | 2 - public/images/pokemon/variant/back/673.json | 2 - public/images/pokemon/variant/back/677.json | 6 +- .../pokemon/variant/back/678-female.json | 2 - public/images/pokemon/variant/back/678.json | 2 - public/images/pokemon/variant/back/69.json | 5 -- public/images/pokemon/variant/back/690.json | 2 - public/images/pokemon/variant/back/691.json | 2 - public/images/pokemon/variant/back/696.json | 70 +++++----------- public/images/pokemon/variant/back/697.json | 52 ++++++------ public/images/pokemon/variant/back/698.json | 10 +-- public/images/pokemon/variant/back/699.json | 4 - public/images/pokemon/variant/back/700.json | 2 - public/images/pokemon/variant/back/702.json | 2 - public/images/pokemon/variant/back/703.json | 3 - public/images/pokemon/variant/back/704.json | 2 - public/images/pokemon/variant/back/705.json | 2 - public/images/pokemon/variant/back/706.json | 4 - public/images/pokemon/variant/back/708.json | 2 - public/images/pokemon/variant/back/709.json | 2 - public/images/pokemon/variant/back/71.json | 5 -- public/images/pokemon/variant/back/710.json | 2 - public/images/pokemon/variant/back/711.json | 3 - public/images/pokemon/variant/back/712.json | 7 +- public/images/pokemon/variant/back/713.json | 6 +- public/images/pokemon/variant/back/714.json | 2 - public/images/pokemon/variant/back/715.json | 66 +++++++-------- .../pokemon/variant/back/716-active.json | 6 -- .../pokemon/variant/back/716-neutral.json | 2 - public/images/pokemon/variant/back/717.json | 1 - .../pokemon/variant/back/720-unbound.json | 3 - public/images/pokemon/variant/back/720.json | 3 - public/images/pokemon/variant/back/728.json | 4 - public/images/pokemon/variant/back/729.json | 9 +-- public/images/pokemon/variant/back/730.json | 8 +- public/images/pokemon/variant/back/734.json | 2 - public/images/pokemon/variant/back/735.json | 2 - public/images/pokemon/variant/back/747.json | 2 - public/images/pokemon/variant/back/748.json | 8 +- public/images/pokemon/variant/back/751.json | 9 +-- public/images/pokemon/variant/back/752.json | 4 - public/images/pokemon/variant/back/753.json | 10 +-- public/images/pokemon/variant/back/755.json | 2 - public/images/pokemon/variant/back/756.json | 2 - public/images/pokemon/variant/back/761.json | 7 +- public/images/pokemon/variant/back/762.json | 5 -- public/images/pokemon/variant/back/763.json | 6 -- public/images/pokemon/variant/back/767.json | 2 - public/images/pokemon/variant/back/768.json | 7 +- public/images/pokemon/variant/back/77.json | 4 - public/images/pokemon/variant/back/771.json | 4 - public/images/pokemon/variant/back/772.json | 2 - public/images/pokemon/variant/back/773.json | 4 - public/images/pokemon/variant/back/776.json | 2 - public/images/pokemon/variant/back/777.json | 3 - .../pokemon/variant/back/778-busted.json | 1 - .../pokemon/variant/back/778-disguised.json | 3 +- public/images/pokemon/variant/back/779.json | 10 +-- public/images/pokemon/variant/back/78.json | 4 - public/images/pokemon/variant/back/789.json | 14 ---- public/images/pokemon/variant/back/79.json | 15 +--- public/images/pokemon/variant/back/790.json | 10 --- .../pokemon/variant/back/791-radiant-sun.json | 2 - public/images/pokemon/variant/back/791.json | 2 - .../pokemon/variant/back/792-full-moon.json | 3 - public/images/pokemon/variant/back/792.json | 4 - public/images/pokemon/variant/back/793.json | 6 +- public/images/pokemon/variant/back/797.json | 2 - public/images/pokemon/variant/back/798.json | 1 - .../images/pokemon/variant/back/80-mega.json | 6 -- public/images/pokemon/variant/back/80.json | 8 -- .../pokemon/variant/back/800-dawn-wings.json | 2 - .../pokemon/variant/back/800-dusk-mane.json | 3 - .../pokemon/variant/back/800-ultra.json | 2 - public/images/pokemon/variant/back/800.json | 6 +- public/images/pokemon/variant/back/802.json | 3 - public/images/pokemon/variant/back/803.json | 2 - public/images/pokemon/variant/back/804.json | 2 - public/images/pokemon/variant/back/808.json | 8 +- .../pokemon/variant/back/809-gigantamax.json | 7 +- public/images/pokemon/variant/back/809.json | 7 +- public/images/pokemon/variant/back/81.json | 3 - public/images/pokemon/variant/back/816.json | 6 +- public/images/pokemon/variant/back/817.json | 8 +- .../pokemon/variant/back/818-gigantamax.json | 7 -- public/images/pokemon/variant/back/818.json | 4 - public/images/pokemon/variant/back/82.json | 3 - public/images/pokemon/variant/back/821.json | 2 - public/images/pokemon/variant/back/822.json | 4 - public/images/pokemon/variant/back/823.json | 4 - public/images/pokemon/variant/back/829.json | 3 - public/images/pokemon/variant/back/830.json | 6 +- public/images/pokemon/variant/back/835.json | 3 - public/images/pokemon/variant/back/836.json | 4 - public/images/pokemon/variant/back/84.json | 7 -- public/images/pokemon/variant/back/85.json | 11 --- public/images/pokemon/variant/back/850.json | 6 +- .../pokemon/variant/back/851-gigantamax.json | 5 -- public/images/pokemon/variant/back/851.json | 6 +- public/images/pokemon/variant/back/854.json | 2 - public/images/pokemon/variant/back/855.json | 2 - public/images/pokemon/variant/back/856.json | 2 - .../pokemon/variant/back/858-gigantamax.json | 2 - public/images/pokemon/variant/back/858.json | 2 - public/images/pokemon/variant/back/859.json | 2 - public/images/pokemon/variant/back/86.json | 6 -- public/images/pokemon/variant/back/860.json | 2 - .../pokemon/variant/back/861-gigantamax.json | 2 - public/images/pokemon/variant/back/861.json | 2 - public/images/pokemon/variant/back/862.json | 9 +-- public/images/pokemon/variant/back/863.json | 3 - public/images/pokemon/variant/back/864.json | 6 +- public/images/pokemon/variant/back/867.json | 2 - public/images/pokemon/variant/back/87.json | 18 +---- public/images/pokemon/variant/back/872.json | 6 -- public/images/pokemon/variant/back/873.json | 9 +-- .../pokemon/variant/back/876-female.json | 2 - public/images/pokemon/variant/back/876.json | 2 - .../pokemon/variant/back/877-hangry.json | 7 -- public/images/pokemon/variant/back/877.json | 12 --- public/images/pokemon/variant/back/880.json | 3 - public/images/pokemon/variant/back/881.json | 3 - public/images/pokemon/variant/back/882.json | 2 - public/images/pokemon/variant/back/883.json | 2 - .../pokemon/variant/back/884-gigantamax.json | 2 - public/images/pokemon/variant/back/884.json | 2 - public/images/pokemon/variant/back/885.json | 3 - public/images/pokemon/variant/back/886.json | 4 - public/images/pokemon/variant/back/887.json | 4 - .../pokemon/variant/back/888-crowned.json | 2 - public/images/pokemon/variant/back/888.json | 2 - .../pokemon/variant/back/889-crowned.json | 2 - public/images/pokemon/variant/back/889.json | 2 - .../pokemon/variant/back/890-eternamax.json | 2 - public/images/pokemon/variant/back/890.json | 6 -- public/images/pokemon/variant/back/8901.json | 20 +---- public/images/pokemon/variant/back/891.json | 6 -- .../variant/back/892-gigantamax-rapid.json | 5 -- .../variant/back/892-gigantamax-single.json | 5 -- .../variant/back/892-rapid-strike.json | 5 -- public/images/pokemon/variant/back/892.json | 5 -- public/images/pokemon/variant/back/896.json | 3 - public/images/pokemon/variant/back/897.json | 7 -- .../images/pokemon/variant/back/898-ice.json | 13 +-- .../pokemon/variant/back/898-shadow.json | 11 --- public/images/pokemon/variant/back/898.json | 5 -- .../pokemon/variant/back/9-gigantamax.json | 5 -- public/images/pokemon/variant/back/900.json | 20 +---- public/images/pokemon/variant/back/901.json | 15 +--- public/images/pokemon/variant/back/903.json | 4 - public/images/pokemon/variant/back/909.json | 8 +- public/images/pokemon/variant/back/911.json | 9 +-- public/images/pokemon/variant/back/912.json | 2 - public/images/pokemon/variant/back/913.json | 2 - public/images/pokemon/variant/back/914.json | 2 - public/images/pokemon/variant/back/919.json | 13 +-- public/images/pokemon/variant/back/920.json | 12 --- public/images/pokemon/variant/back/924.json | 3 - .../images/pokemon/variant/back/925-four.json | 3 - .../pokemon/variant/back/925-three.json | 3 - public/images/pokemon/variant/back/93.json | 15 +--- public/images/pokemon/variant/back/932.json | 2 - public/images/pokemon/variant/back/933.json | 2 - public/images/pokemon/variant/back/934.json | 2 - public/images/pokemon/variant/back/936.json | 11 --- public/images/pokemon/variant/back/937.json | 4 - .../pokemon/variant/back/94-gigantamax.json | 3 - .../images/pokemon/variant/back/94-mega.json | 3 - public/images/pokemon/variant/back/94.json | 3 - public/images/pokemon/variant/back/940.json | 4 - public/images/pokemon/variant/back/941.json | 6 -- public/images/pokemon/variant/back/948.json | 2 - public/images/pokemon/variant/back/949.json | 6 -- public/images/pokemon/variant/back/951.json | 4 - public/images/pokemon/variant/back/952.json | 2 - public/images/pokemon/variant/back/953.json | 2 - public/images/pokemon/variant/back/954.json | 2 - public/images/pokemon/variant/back/957.json | 3 - public/images/pokemon/variant/back/958.json | 3 - public/images/pokemon/variant/back/959.json | 7 -- public/images/pokemon/variant/back/962.json | 3 - public/images/pokemon/variant/back/967.json | 11 +-- public/images/pokemon/variant/back/968.json | 15 +--- public/images/pokemon/variant/back/969.json | 2 - public/images/pokemon/variant/back/970.json | 1 - public/images/pokemon/variant/back/973.json | 11 --- public/images/pokemon/variant/back/974.json | 2 - public/images/pokemon/variant/back/975.json | 9 +-- .../pokemon/variant/back/978-stretchy.json | 2 - public/images/pokemon/variant/back/979.json | 7 +- public/images/pokemon/variant/back/98.json | 6 -- public/images/pokemon/variant/back/981.json | 6 -- .../variant/back/982-three-segment.json | 2 - public/images/pokemon/variant/back/982.json | 2 - public/images/pokemon/variant/back/987.json | 3 - public/images/pokemon/variant/back/988.json | 6 -- .../pokemon/variant/back/99-gigantamax.json | 2 - public/images/pokemon/variant/back/99.json | 3 - public/images/pokemon/variant/back/993.json | 4 - public/images/pokemon/variant/back/994.json | 6 -- public/images/pokemon/variant/back/995.json | 8 -- public/images/pokemon/variant/back/996.json | 5 -- public/images/pokemon/variant/back/997.json | 2 - public/images/pokemon/variant/back/998.json | 3 - public/images/pokemon/variant/back/999.json | 7 -- .../pokemon/variant/back/female/111.json | 10 +-- .../pokemon/variant/back/female/112.json | 10 +-- .../pokemon/variant/back/female/118.json | 3 - .../pokemon/variant/back/female/119.json | 2 - .../pokemon/variant/back/female/123.json | 27 +------ .../pokemon/variant/back/female/129.json | 2 - .../pokemon/variant/back/female/130.json | 2 - .../pokemon/variant/back/female/185.json | 2 - .../pokemon/variant/back/female/19.json | 6 -- .../pokemon/variant/back/female/190.json | 2 - .../pokemon/variant/back/female/20.json | 7 +- .../pokemon/variant/back/female/203.json | 4 - .../pokemon/variant/back/female/212.json | 19 +---- .../pokemon/variant/back/female/215.json | 5 +- .../pokemon/variant/back/female/217.json | 21 +---- .../pokemon/variant/back/female/229.json | 12 +-- .../pokemon/variant/back/female/232.json | 2 - .../pokemon/variant/back/female/255.json | 8 +- .../pokemon/variant/back/female/256.json | 2 - .../pokemon/variant/back/female/257.json | 2 - .../images/pokemon/variant/back/female/3.json | 8 +- .../pokemon/variant/back/female/307.json | 2 - .../pokemon/variant/back/female/308.json | 3 - .../pokemon/variant/back/female/315.json | 2 - .../pokemon/variant/back/female/369.json | 4 - .../pokemon/variant/back/female/399.json | 3 - .../pokemon/variant/back/female/400.json | 3 - .../pokemon/variant/back/female/401.json | 2 - .../pokemon/variant/back/female/402.json | 2 - .../pokemon/variant/back/female/407.json | 5 -- .../pokemon/variant/back/female/41.json | 10 +-- .../pokemon/variant/back/female/419.json | 7 -- .../pokemon/variant/back/female/42.json | 2 - .../pokemon/variant/back/female/424.json | 2 - .../pokemon/variant/back/female/44.json | 3 - .../pokemon/variant/back/female/443.json | 11 --- .../pokemon/variant/back/female/444.json | 15 +--- .../pokemon/variant/back/female/445.json | 12 --- .../pokemon/variant/back/female/45.json | 2 - .../pokemon/variant/back/female/453.json | 1 - .../pokemon/variant/back/female/454.json | 1 - .../pokemon/variant/back/female/456.json | 10 +-- .../pokemon/variant/back/female/457.json | 4 - .../pokemon/variant/back/female/461.json | 6 +- .../pokemon/variant/back/female/464.json | 9 +-- .../pokemon/variant/back/female/465.json | 2 - .../pokemon/variant/back/female/592.json | 12 +-- .../pokemon/variant/back/female/593.json | 3 - .../pokemon/variant/back/female/6215.json | 6 -- .../pokemon/variant/back/female/84.json | 9 --- .../pokemon/variant/back/female/85.json | 11 --- public/images/pokemon/variant/exp/1001.json | 14 +--- public/images/pokemon/variant/exp/1003.json | 2 - public/images/pokemon/variant/exp/1004.json | 46 +---------- public/images/pokemon/variant/exp/1006.json | 1 - .../variant/exp/1008-ultimate-mode.json | 15 ---- .../images/pokemon/variant/exp/127-mega.json | 14 +--- .../images/pokemon/variant/exp/181-mega.json | 2 - public/images/pokemon/variant/exp/2027.json | 4 - public/images/pokemon/variant/exp/2028.json | 5 +- public/images/pokemon/variant/exp/2052.json | 4 - public/images/pokemon/variant/exp/2053.json | 2 - .../images/pokemon/variant/exp/212-mega.json | 24 +----- .../images/pokemon/variant/exp/229-mega.json | 8 -- .../images/pokemon/variant/exp/248-mega.json | 56 ++++++------- .../images/pokemon/variant/exp/257-mega.json | 2 - .../images/pokemon/variant/exp/302-mega.json | 2 - .../images/pokemon/variant/exp/303-mega.json | 8 -- .../images/pokemon/variant/exp/306-mega.json | 8 +- .../images/pokemon/variant/exp/334-mega.json | 1 - .../images/pokemon/variant/exp/354-mega.json | 10 +-- .../images/pokemon/variant/exp/362-mega.json | 4 +- .../images/pokemon/variant/exp/373-mega.json | 11 --- .../images/pokemon/variant/exp/376-mega.json | 2 - .../images/pokemon/variant/exp/380-mega.json | 2 +- .../images/pokemon/variant/exp/381-mega.json | 2 +- .../pokemon/variant/exp/382-primal.json | 22 +---- .../pokemon/variant/exp/383-primal.json | 6 -- .../images/pokemon/variant/exp/384-mega.json | 4 +- public/images/pokemon/variant/exp/4052.json | 11 +-- public/images/pokemon/variant/exp/4077.json | 4 - public/images/pokemon/variant/exp/4078.json | 4 - public/images/pokemon/variant/exp/4079.json | 6 -- public/images/pokemon/variant/exp/4080.json | 6 -- public/images/pokemon/variant/exp/4199.json | 4 - public/images/pokemon/variant/exp/4222.json | 2 - public/images/pokemon/variant/exp/4263.json | 4 - public/images/pokemon/variant/exp/4264.json | 4 - .../images/pokemon/variant/exp/428-mega.json | 4 - .../images/pokemon/variant/exp/445-mega.json | 18 +---- public/images/pokemon/variant/exp/4562.json | 4 - .../images/pokemon/variant/exp/531-mega.json | 2 - public/images/pokemon/variant/exp/6100.json | 2 - public/images/pokemon/variant/exp/6101.json | 12 +-- public/images/pokemon/variant/exp/6215.json | 12 +-- public/images/pokemon/variant/exp/653.json | 8 +- public/images/pokemon/variant/exp/654.json | 6 -- public/images/pokemon/variant/exp/6549.json | 6 +- public/images/pokemon/variant/exp/655.json | 2 - public/images/pokemon/variant/exp/6570.json | 7 +- public/images/pokemon/variant/exp/6571.json | 7 -- public/images/pokemon/variant/exp/664.json | 6 -- public/images/pokemon/variant/exp/665.json | 4 - .../pokemon/variant/exp/666-archipelago.json | 20 +---- .../pokemon/variant/exp/666-continental.json | 20 +---- .../pokemon/variant/exp/666-elegant.json | 20 +---- .../images/pokemon/variant/exp/666-fancy.json | 56 +++++-------- .../pokemon/variant/exp/666-garden.json | 18 +---- .../pokemon/variant/exp/666-high-plains.json | 22 +---- .../pokemon/variant/exp/666-icy-snow.json | 18 +---- .../pokemon/variant/exp/666-jungle.json | 20 +---- .../pokemon/variant/exp/666-marine.json | 18 +---- .../pokemon/variant/exp/666-meadow.json | 52 +++++------- .../pokemon/variant/exp/666-modern.json | 20 +---- .../pokemon/variant/exp/666-monsoon.json | 48 ++++------- .../images/pokemon/variant/exp/666-ocean.json | 20 +---- .../pokemon/variant/exp/666-poke-ball.json | 12 +-- .../images/pokemon/variant/exp/666-polar.json | 20 +---- .../images/pokemon/variant/exp/666-river.json | 54 ++++--------- .../pokemon/variant/exp/666-sandstorm.json | 20 +---- .../pokemon/variant/exp/666-savanna.json | 20 +---- .../images/pokemon/variant/exp/666-sun.json | 20 +---- .../pokemon/variant/exp/666-tundra.json | 18 +---- .../images/pokemon/variant/exp/669-blue.json | 3 - .../images/pokemon/variant/exp/669-white.json | 3 - .../pokemon/variant/exp/669-yellow.json | 3 - .../images/pokemon/variant/exp/670-blue.json | 16 +--- .../pokemon/variant/exp/670-orange.json | 16 +--- .../images/pokemon/variant/exp/670-red.json | 16 +--- .../images/pokemon/variant/exp/670-white.json | 18 +---- .../pokemon/variant/exp/670-yellow.json | 16 +--- public/images/pokemon/variant/exp/6705.json | 5 +- .../images/pokemon/variant/exp/671-blue.json | 8 +- .../pokemon/variant/exp/671-orange.json | 8 +- .../images/pokemon/variant/exp/671-red.json | 8 +- .../images/pokemon/variant/exp/671-white.json | 8 +- .../pokemon/variant/exp/671-yellow.json | 14 +--- public/images/pokemon/variant/exp/6713.json | 2 - public/images/pokemon/variant/exp/672.json | 4 - public/images/pokemon/variant/exp/673.json | 4 - public/images/pokemon/variant/exp/677.json | 8 +- .../pokemon/variant/exp/678-female.json | 4 - public/images/pokemon/variant/exp/678.json | 9 +-- public/images/pokemon/variant/exp/691.json | 1 - public/images/pokemon/variant/exp/696.json | 80 +++++++----------- public/images/pokemon/variant/exp/697.json | 81 +++++++++---------- public/images/pokemon/variant/exp/699.json | 4 - public/images/pokemon/variant/exp/700.json | 56 ++++++------- public/images/pokemon/variant/exp/702.json | 4 - public/images/pokemon/variant/exp/704.json | 2 - public/images/pokemon/variant/exp/705.json | 2 - public/images/pokemon/variant/exp/706.json | 4 - public/images/pokemon/variant/exp/709.json | 2 - public/images/pokemon/variant/exp/710.json | 2 - public/images/pokemon/variant/exp/711.json | 4 - public/images/pokemon/variant/exp/712.json | 7 +- public/images/pokemon/variant/exp/713.json | 8 +- public/images/pokemon/variant/exp/715.json | 34 ++++---- .../pokemon/variant/exp/716-active.json | 8 +- .../pokemon/variant/exp/716-neutral.json | 2 - public/images/pokemon/variant/exp/728.json | 6 -- public/images/pokemon/variant/exp/729.json | 6 -- public/images/pokemon/variant/exp/730.json | 8 +- public/images/pokemon/variant/exp/734.json | 16 +--- public/images/pokemon/variant/exp/735.json | 7 -- public/images/pokemon/variant/exp/748.json | 3 - public/images/pokemon/variant/exp/752.json | 5 -- public/images/pokemon/variant/exp/753.json | 2 - public/images/pokemon/variant/exp/754.json | 2 - public/images/pokemon/variant/exp/755.json | 2 - public/images/pokemon/variant/exp/756.json | 2 - public/images/pokemon/variant/exp/761.json | 8 +- public/images/pokemon/variant/exp/762.json | 5 -- public/images/pokemon/variant/exp/763.json | 5 -- public/images/pokemon/variant/exp/767.json | 8 +- public/images/pokemon/variant/exp/768.json | 7 +- public/images/pokemon/variant/exp/771.json | 4 +- public/images/pokemon/variant/exp/772.json | 2 - public/images/pokemon/variant/exp/773.json | 5 -- public/images/pokemon/variant/exp/776.json | 4 - public/images/pokemon/variant/exp/777.json | 5 -- .../pokemon/variant/exp/778-busted.json | 3 - .../pokemon/variant/exp/778-disguised.json | 4 +- public/images/pokemon/variant/exp/779.json | 10 +-- public/images/pokemon/variant/exp/789.json | 8 -- public/images/pokemon/variant/exp/790.json | 9 --- public/images/pokemon/variant/exp/792.json | 18 +---- public/images/pokemon/variant/exp/797.json | 2 - public/images/pokemon/variant/exp/798.json | 2 - .../images/pokemon/variant/exp/80-mega.json | 6 -- .../pokemon/variant/exp/800-dawn-wings.json | 21 +---- .../images/pokemon/variant/exp/800-ultra.json | 10 +-- public/images/pokemon/variant/exp/800.json | 3 - public/images/pokemon/variant/exp/802.json | 5 -- public/images/pokemon/variant/exp/803.json | 2 - public/images/pokemon/variant/exp/804.json | 8 +- public/images/pokemon/variant/exp/808.json | 8 +- public/images/pokemon/variant/exp/809.json | 8 +- public/images/pokemon/variant/exp/816.json | 8 +- public/images/pokemon/variant/exp/817.json | 4 - public/images/pokemon/variant/exp/818.json | 7 -- public/images/pokemon/variant/exp/822.json | 4 - public/images/pokemon/variant/exp/823.json | 5 +- public/images/pokemon/variant/exp/830.json | 2 - public/images/pokemon/variant/exp/835.json | 12 +-- public/images/pokemon/variant/exp/850.json | 14 +--- public/images/pokemon/variant/exp/851.json | 5 -- public/images/pokemon/variant/exp/854.json | 3 - public/images/pokemon/variant/exp/855.json | 8 +- public/images/pokemon/variant/exp/856.json | 2 - public/images/pokemon/variant/exp/858.json | 2 - public/images/pokemon/variant/exp/859.json | 5 -- public/images/pokemon/variant/exp/860.json | 7 -- public/images/pokemon/variant/exp/861.json | 7 -- public/images/pokemon/variant/exp/862.json | 5 -- public/images/pokemon/variant/exp/863.json | 13 +-- public/images/pokemon/variant/exp/864.json | 2 +- public/images/pokemon/variant/exp/867.json | 2 - public/images/pokemon/variant/exp/872.json | 15 +--- public/images/pokemon/variant/exp/873.json | 4 - .../pokemon/variant/exp/876-female.json | 2 - public/images/pokemon/variant/exp/876.json | 5 -- .../pokemon/variant/exp/877-hangry.json | 14 ---- public/images/pokemon/variant/exp/877.json | 22 +---- public/images/pokemon/variant/exp/880.json | 48 +---------- public/images/pokemon/variant/exp/881.json | 2 - public/images/pokemon/variant/exp/883.json | 2 - public/images/pokemon/variant/exp/884.json | 2 - public/images/pokemon/variant/exp/885.json | 3 - public/images/pokemon/variant/exp/886.json | 5 -- public/images/pokemon/variant/exp/887.json | 3 - .../pokemon/variant/exp/888-crowned.json | 6 -- public/images/pokemon/variant/exp/888.json | 10 +-- .../pokemon/variant/exp/889-crowned.json | 6 -- public/images/pokemon/variant/exp/889.json | 10 +-- .../pokemon/variant/exp/890-eternamax.json | 2 - public/images/pokemon/variant/exp/890.json | 6 +- public/images/pokemon/variant/exp/891.json | 10 --- .../pokemon/variant/exp/892-rapid-strike.json | 17 +--- public/images/pokemon/variant/exp/892.json | 17 +--- public/images/pokemon/variant/exp/896.json | 3 - public/images/pokemon/variant/exp/897.json | 7 -- .../images/pokemon/variant/exp/898-ice.json | 7 -- .../pokemon/variant/exp/898-shadow.json | 11 --- public/images/pokemon/variant/exp/898.json | 5 -- public/images/pokemon/variant/exp/900.json | 17 +--- public/images/pokemon/variant/exp/901.json | 17 +--- public/images/pokemon/variant/exp/903.json | 3 - public/images/pokemon/variant/exp/909.json | 23 +----- public/images/pokemon/variant/exp/912.json | 2 - public/images/pokemon/variant/exp/913.json | 2 - public/images/pokemon/variant/exp/914.json | 5 +- public/images/pokemon/variant/exp/919.json | 6 -- public/images/pokemon/variant/exp/920.json | 12 --- public/images/pokemon/variant/exp/934.json | 2 - public/images/pokemon/variant/exp/940.json | 7 -- public/images/pokemon/variant/exp/941.json | 10 --- public/images/pokemon/variant/exp/948.json | 2 - public/images/pokemon/variant/exp/949.json | 2 - public/images/pokemon/variant/exp/951.json | 3 - public/images/pokemon/variant/exp/952.json | 12 --- public/images/pokemon/variant/exp/953.json | 4 +- public/images/pokemon/variant/exp/954.json | 2 - public/images/pokemon/variant/exp/962.json | 52 +----------- public/images/pokemon/variant/exp/967.json | 9 --- public/images/pokemon/variant/exp/968.json | 19 +---- public/images/pokemon/variant/exp/969.json | 2 - public/images/pokemon/variant/exp/973.json | 26 +----- public/images/pokemon/variant/exp/974.json | 8 -- public/images/pokemon/variant/exp/975.json | 8 +- public/images/pokemon/variant/exp/981.json | 6 -- .../variant/exp/982-three-segment.json | 9 +-- public/images/pokemon/variant/exp/982.json | 3 - public/images/pokemon/variant/exp/987.json | 6 -- public/images/pokemon/variant/exp/988.json | 4 - public/images/pokemon/variant/exp/993.json | 50 +----------- public/images/pokemon/variant/exp/994.json | 2 - public/images/pokemon/variant/exp/995.json | 15 +--- public/images/pokemon/variant/exp/996.json | 3 - public/images/pokemon/variant/exp/999.json | 2 - .../images/pokemon/variant/exp/back/1000.json | 13 +-- .../images/pokemon/variant/exp/back/1001.json | 2 - .../images/pokemon/variant/exp/back/1003.json | 2 - .../images/pokemon/variant/exp/back/1004.json | 8 +- .../variant/exp/back/1008-ultimate-mode.json | 19 +---- .../pokemon/variant/exp/back/127-mega.json | 16 +--- .../pokemon/variant/exp/back/130-mega.json | 13 +-- .../pokemon/variant/exp/back/142-mega.json | 2 - .../pokemon/variant/exp/back/150-mega-x.json | 5 -- .../pokemon/variant/exp/back/181-mega.json | 6 +- .../images/pokemon/variant/exp/back/2027.json | 10 +-- .../images/pokemon/variant/exp/back/2028.json | 8 +- .../images/pokemon/variant/exp/back/2052.json | 4 - .../images/pokemon/variant/exp/back/2053.json | 8 +- .../pokemon/variant/exp/back/212-mega.json | 27 ------- .../pokemon/variant/exp/back/229-mega.json | 12 --- .../pokemon/variant/exp/back/248-mega.json | 40 +++++---- .../pokemon/variant/exp/back/257-mega.json | 2 - .../pokemon/variant/exp/back/282-mega.json | 5 -- .../pokemon/variant/exp/back/302-mega.json | 2 - .../pokemon/variant/exp/back/303-mega.json | 9 --- .../pokemon/variant/exp/back/308-mega.json | 3 - .../pokemon/variant/exp/back/310-mega.json | 9 +-- .../pokemon/variant/exp/back/354-mega.json | 2 - .../pokemon/variant/exp/back/362-mega.json | 2 - .../pokemon/variant/exp/back/373-mega.json | 1 - .../pokemon/variant/exp/back/376-mega.json | 8 +- .../pokemon/variant/exp/back/380-mega.json | 2 - .../pokemon/variant/exp/back/381-mega.json | 2 - .../pokemon/variant/exp/back/382-primal.json | 24 +----- .../pokemon/variant/exp/back/383-primal.json | 10 --- .../pokemon/variant/exp/back/384-mega.json | 8 +- .../images/pokemon/variant/exp/back/4052.json | 8 -- .../images/pokemon/variant/exp/back/4077.json | 2 - .../images/pokemon/variant/exp/back/4078.json | 6 -- .../images/pokemon/variant/exp/back/4079.json | 10 +-- .../images/pokemon/variant/exp/back/4199.json | 4 - .../images/pokemon/variant/exp/back/4222.json | 2 - .../images/pokemon/variant/exp/back/4263.json | 8 -- .../images/pokemon/variant/exp/back/4264.json | 10 +-- .../pokemon/variant/exp/back/428-mega.json | 2 - .../pokemon/variant/exp/back/445-mega.json | 18 ----- .../pokemon/variant/exp/back/448-mega.json | 24 +----- .../images/pokemon/variant/exp/back/4562.json | 4 - .../pokemon/variant/exp/back/531-mega.json | 8 +- .../pokemon/variant/exp/back/6-mega-y.json | 6 +- .../images/pokemon/variant/exp/back/6100.json | 8 -- .../images/pokemon/variant/exp/back/6101.json | 9 +-- .../images/pokemon/variant/exp/back/6215.json | 6 -- .../images/pokemon/variant/exp/back/653.json | 2 - .../images/pokemon/variant/exp/back/654.json | 6 -- .../images/pokemon/variant/exp/back/6549.json | 12 +-- .../images/pokemon/variant/exp/back/6570.json | 2 - .../images/pokemon/variant/exp/back/6571.json | 7 +- .../images/pokemon/variant/exp/back/664.json | 4 +- .../images/pokemon/variant/exp/back/665.json | 3 - .../variant/exp/back/666-archipelago.json | 50 ++++-------- .../variant/exp/back/666-continental.json | 20 +---- .../pokemon/variant/exp/back/666-elegant.json | 49 ++++------- .../pokemon/variant/exp/back/666-fancy.json | 54 +++++-------- .../pokemon/variant/exp/back/666-garden.json | 47 ++++------- .../variant/exp/back/666-high-plains.json | 53 ++++-------- .../variant/exp/back/666-icy-snow.json | 46 ++++------- .../pokemon/variant/exp/back/666-jungle.json | 49 ++++------- .../pokemon/variant/exp/back/666-marine.json | 47 ++++------- .../pokemon/variant/exp/back/666-meadow.json | 49 ++++------- .../pokemon/variant/exp/back/666-modern.json | 47 ++++------- .../pokemon/variant/exp/back/666-monsoon.json | 48 ++++------- .../pokemon/variant/exp/back/666-ocean.json | 49 ++++------- .../variant/exp/back/666-poke-ball.json | 55 ++++++------- .../pokemon/variant/exp/back/666-polar.json | 49 ++++------- .../pokemon/variant/exp/back/666-river.json | 54 ++++--------- .../variant/exp/back/666-sandstorm.json | 49 ++++------- .../pokemon/variant/exp/back/666-savanna.json | 49 ++++------- .../pokemon/variant/exp/back/666-sun.json | 51 +++++------- .../pokemon/variant/exp/back/666-tundra.json | 47 ++++------- .../pokemon/variant/exp/back/670-orange.json | 3 - .../pokemon/variant/exp/back/670-red.json | 3 - .../pokemon/variant/exp/back/670-white.json | 4 - .../pokemon/variant/exp/back/670-yellow.json | 3 - .../images/pokemon/variant/exp/back/6705.json | 5 +- .../pokemon/variant/exp/back/671-blue.json | 11 +-- .../pokemon/variant/exp/back/671-orange.json | 11 +-- .../pokemon/variant/exp/back/671-red.json | 11 +-- .../pokemon/variant/exp/back/671-white.json | 11 +-- .../pokemon/variant/exp/back/671-yellow.json | 11 +-- .../images/pokemon/variant/exp/back/6713.json | 2 - .../images/pokemon/variant/exp/back/672.json | 4 +- .../images/pokemon/variant/exp/back/673.json | 4 +- .../images/pokemon/variant/exp/back/677.json | 2 - .../pokemon/variant/exp/back/678-female.json | 6 +- .../images/pokemon/variant/exp/back/678.json | 2 - .../images/pokemon/variant/exp/back/690.json | 2 - .../images/pokemon/variant/exp/back/691.json | 2 - .../images/pokemon/variant/exp/back/696.json | 55 ++++++------- .../images/pokemon/variant/exp/back/697.json | 62 +++++++------- .../images/pokemon/variant/exp/back/700.json | 56 ++++++------- .../images/pokemon/variant/exp/back/702.json | 4 - .../images/pokemon/variant/exp/back/704.json | 2 - .../images/pokemon/variant/exp/back/705.json | 38 +++++---- .../images/pokemon/variant/exp/back/706.json | 2 - .../images/pokemon/variant/exp/back/709.json | 3 - .../images/pokemon/variant/exp/back/710.json | 6 -- .../images/pokemon/variant/exp/back/711.json | 6 -- .../images/pokemon/variant/exp/back/712.json | 7 +- .../images/pokemon/variant/exp/back/713.json | 6 +- .../images/pokemon/variant/exp/back/715.json | 4 - .../pokemon/variant/exp/back/716-active.json | 9 --- .../pokemon/variant/exp/back/716-neutral.json | 8 +- .../images/pokemon/variant/exp/back/717.json | 1 - .../images/pokemon/variant/exp/back/720.json | 3 - .../images/pokemon/variant/exp/back/728.json | 6 -- .../images/pokemon/variant/exp/back/729.json | 6 -- .../images/pokemon/variant/exp/back/730.json | 8 +- .../images/pokemon/variant/exp/back/734.json | 8 +- .../images/pokemon/variant/exp/back/735.json | 3 - .../images/pokemon/variant/exp/back/748.json | 8 +- .../images/pokemon/variant/exp/back/751.json | 4 - .../images/pokemon/variant/exp/back/752.json | 6 -- .../images/pokemon/variant/exp/back/753.json | 10 +-- .../images/pokemon/variant/exp/back/754.json | 1 - .../images/pokemon/variant/exp/back/755.json | 2 - .../images/pokemon/variant/exp/back/756.json | 2 - .../images/pokemon/variant/exp/back/761.json | 7 +- .../images/pokemon/variant/exp/back/762.json | 5 -- .../images/pokemon/variant/exp/back/763.json | 5 -- .../images/pokemon/variant/exp/back/767.json | 2 - .../images/pokemon/variant/exp/back/768.json | 9 +-- .../images/pokemon/variant/exp/back/771.json | 4 - .../images/pokemon/variant/exp/back/772.json | 2 - .../images/pokemon/variant/exp/back/773.json | 6 -- .../images/pokemon/variant/exp/back/777.json | 6 +- .../pokemon/variant/exp/back/778-busted.json | 6 +- .../variant/exp/back/778-disguised.json | 4 +- .../images/pokemon/variant/exp/back/779.json | 9 +-- .../images/pokemon/variant/exp/back/789.json | 9 +-- .../images/pokemon/variant/exp/back/790.json | 10 --- .../images/pokemon/variant/exp/back/792.json | 14 +--- .../images/pokemon/variant/exp/back/793.json | 6 -- .../images/pokemon/variant/exp/back/797.json | 2 - .../images/pokemon/variant/exp/back/798.json | 4 - .../pokemon/variant/exp/back/80-mega.json | 6 -- .../variant/exp/back/800-dawn-wings.json | 7 -- .../pokemon/variant/exp/back/800-ultra.json | 6 +- .../images/pokemon/variant/exp/back/800.json | 6 +- .../images/pokemon/variant/exp/back/802.json | 9 +-- .../images/pokemon/variant/exp/back/803.json | 2 - .../images/pokemon/variant/exp/back/804.json | 2 - .../images/pokemon/variant/exp/back/808.json | 8 +- .../images/pokemon/variant/exp/back/809.json | 9 +-- .../images/pokemon/variant/exp/back/816.json | 6 +- .../images/pokemon/variant/exp/back/817.json | 8 +- .../images/pokemon/variant/exp/back/818.json | 4 - .../images/pokemon/variant/exp/back/821.json | 2 - .../images/pokemon/variant/exp/back/822.json | 8 -- .../images/pokemon/variant/exp/back/823.json | 5 -- .../images/pokemon/variant/exp/back/829.json | 3 - .../images/pokemon/variant/exp/back/830.json | 6 +- .../images/pokemon/variant/exp/back/835.json | 3 - .../images/pokemon/variant/exp/back/836.json | 4 - .../images/pokemon/variant/exp/back/850.json | 6 +- .../images/pokemon/variant/exp/back/851.json | 6 +- .../images/pokemon/variant/exp/back/854.json | 2 - .../images/pokemon/variant/exp/back/855.json | 2 - .../images/pokemon/variant/exp/back/856.json | 2 - .../images/pokemon/variant/exp/back/858.json | 2 - .../images/pokemon/variant/exp/back/859.json | 2 - .../images/pokemon/variant/exp/back/860.json | 4 - .../images/pokemon/variant/exp/back/861.json | 2 - .../images/pokemon/variant/exp/back/862.json | 9 +-- .../images/pokemon/variant/exp/back/863.json | 11 +-- .../images/pokemon/variant/exp/back/864.json | 6 +- .../images/pokemon/variant/exp/back/867.json | 2 - .../images/pokemon/variant/exp/back/872.json | 6 -- .../images/pokemon/variant/exp/back/873.json | 9 +-- .../pokemon/variant/exp/back/876-female.json | 2 - .../images/pokemon/variant/exp/back/876.json | 2 - .../pokemon/variant/exp/back/877-hangry.json | 7 -- .../images/pokemon/variant/exp/back/877.json | 10 --- .../images/pokemon/variant/exp/back/880.json | 3 - .../images/pokemon/variant/exp/back/881.json | 3 - .../images/pokemon/variant/exp/back/882.json | 2 - .../images/pokemon/variant/exp/back/883.json | 4 - .../images/pokemon/variant/exp/back/884.json | 2 - .../images/pokemon/variant/exp/back/885.json | 3 - .../images/pokemon/variant/exp/back/886.json | 6 +- .../images/pokemon/variant/exp/back/887.json | 4 - .../pokemon/variant/exp/back/888-crowned.json | 18 +---- .../images/pokemon/variant/exp/back/888.json | 2 - .../pokemon/variant/exp/back/889-crowned.json | 2 - .../images/pokemon/variant/exp/back/889.json | 2 - .../images/pokemon/variant/exp/back/890.json | 6 -- .../images/pokemon/variant/exp/back/891.json | 6 -- .../variant/exp/back/892-rapid-strike.json | 7 -- .../images/pokemon/variant/exp/back/892.json | 5 -- .../images/pokemon/variant/exp/back/896.json | 12 +-- .../images/pokemon/variant/exp/back/897.json | 7 -- .../pokemon/variant/exp/back/898-ice.json | 21 +---- .../pokemon/variant/exp/back/898-shadow.json | 11 --- .../images/pokemon/variant/exp/back/898.json | 5 -- .../images/pokemon/variant/exp/back/900.json | 20 +---- .../images/pokemon/variant/exp/back/901.json | 15 +--- .../images/pokemon/variant/exp/back/903.json | 4 - .../images/pokemon/variant/exp/back/909.json | 12 +-- .../images/pokemon/variant/exp/back/911.json | 14 +--- .../images/pokemon/variant/exp/back/912.json | 2 - .../images/pokemon/variant/exp/back/913.json | 2 - .../images/pokemon/variant/exp/back/919.json | 13 +-- .../images/pokemon/variant/exp/back/920.json | 12 --- .../images/pokemon/variant/exp/back/932.json | 2 - .../images/pokemon/variant/exp/back/933.json | 5 -- .../images/pokemon/variant/exp/back/934.json | 2 - .../pokemon/variant/exp/back/94-mega.json | 5 -- .../images/pokemon/variant/exp/back/940.json | 4 - .../images/pokemon/variant/exp/back/941.json | 12 +-- .../images/pokemon/variant/exp/back/948.json | 2 - .../images/pokemon/variant/exp/back/949.json | 6 -- .../images/pokemon/variant/exp/back/951.json | 4 - .../images/pokemon/variant/exp/back/952.json | 1 - .../images/pokemon/variant/exp/back/953.json | 2 - .../images/pokemon/variant/exp/back/954.json | 2 - .../images/pokemon/variant/exp/back/957.json | 10 +-- .../images/pokemon/variant/exp/back/958.json | 10 --- .../images/pokemon/variant/exp/back/959.json | 4 - .../images/pokemon/variant/exp/back/962.json | 5 +- .../images/pokemon/variant/exp/back/967.json | 9 +-- .../images/pokemon/variant/exp/back/969.json | 2 - .../images/pokemon/variant/exp/back/970.json | 1 - .../images/pokemon/variant/exp/back/973.json | 22 +---- .../images/pokemon/variant/exp/back/974.json | 2 - .../images/pokemon/variant/exp/back/975.json | 2 - .../variant/exp/back/978-stretchy.json | 2 - .../images/pokemon/variant/exp/back/979.json | 7 +- .../images/pokemon/variant/exp/back/981.json | 6 -- .../variant/exp/back/982-three-segment.json | 3 - .../images/pokemon/variant/exp/back/982.json | 5 -- .../images/pokemon/variant/exp/back/987.json | 3 - .../images/pokemon/variant/exp/back/988.json | 6 -- .../images/pokemon/variant/exp/back/993.json | 4 - .../images/pokemon/variant/exp/back/994.json | 9 +-- .../images/pokemon/variant/exp/back/995.json | 16 +--- .../images/pokemon/variant/exp/back/996.json | 5 -- .../images/pokemon/variant/exp/back/997.json | 6 +- .../images/pokemon/variant/exp/back/998.json | 3 - .../images/pokemon/variant/exp/back/999.json | 11 +-- .../pokemon/variant/exp/back/female/6215.json | 6 -- .../pokemon/variant/exp/female/6215.json | 12 +-- public/images/pokemon/variant/female/111.json | 10 +-- public/images/pokemon/variant/female/112.json | 14 +--- public/images/pokemon/variant/female/118.json | 2 - public/images/pokemon/variant/female/119.json | 4 - public/images/pokemon/variant/female/123.json | 26 +----- public/images/pokemon/variant/female/129.json | 8 +- public/images/pokemon/variant/female/130.json | 2 - public/images/pokemon/variant/female/185.json | 2 - public/images/pokemon/variant/female/19.json | 12 +-- public/images/pokemon/variant/female/190.json | 10 +-- public/images/pokemon/variant/female/20.json | 2 - public/images/pokemon/variant/female/203.json | 4 - public/images/pokemon/variant/female/212.json | 19 +---- public/images/pokemon/variant/female/215.json | 3 - public/images/pokemon/variant/female/217.json | 19 +---- public/images/pokemon/variant/female/229.json | 12 +-- public/images/pokemon/variant/female/232.json | 6 -- public/images/pokemon/variant/female/255.json | 4 - public/images/pokemon/variant/female/256.json | 12 +-- public/images/pokemon/variant/female/257.json | 2 - public/images/pokemon/variant/female/3.json | 6 +- public/images/pokemon/variant/female/307.json | 13 +-- public/images/pokemon/variant/female/308.json | 6 -- public/images/pokemon/variant/female/315.json | 2 - public/images/pokemon/variant/female/369.json | 4 - public/images/pokemon/variant/female/399.json | 12 +-- public/images/pokemon/variant/female/400.json | 6 -- public/images/pokemon/variant/female/401.json | 3 - public/images/pokemon/variant/female/407.json | 2 - public/images/pokemon/variant/female/41.json | 10 +-- public/images/pokemon/variant/female/418.json | 7 -- public/images/pokemon/variant/female/419.json | 2 - public/images/pokemon/variant/female/42.json | 8 -- public/images/pokemon/variant/female/424.json | 10 +-- public/images/pokemon/variant/female/44.json | 2 - public/images/pokemon/variant/female/443.json | 12 --- public/images/pokemon/variant/female/444.json | 15 +--- public/images/pokemon/variant/female/445.json | 15 ---- public/images/pokemon/variant/female/45.json | 2 - public/images/pokemon/variant/female/456.json | 4 - public/images/pokemon/variant/female/457.json | 8 +- public/images/pokemon/variant/female/461.json | 3 - public/images/pokemon/variant/female/464.json | 7 -- public/images/pokemon/variant/female/592.json | 6 -- public/images/pokemon/variant/female/593.json | 14 +--- .../images/pokemon/variant/female/6215.json | 10 +-- public/images/pokemon/variant/female/84.json | 7 -- public/images/pokemon/variant/female/85.json | 11 --- 1859 files changed, 2035 insertions(+), 11840 deletions(-) diff --git a/public/images/pokemon/variant/1.json b/public/images/pokemon/variant/1.json index 4c53b4ca522..e5ac0df229e 100644 --- a/public/images/pokemon/variant/1.json +++ b/public/images/pokemon/variant/1.json @@ -2,7 +2,6 @@ "1": { "526329": "4a1117", "a5d642": "ff745e", - "101010": "101010", "194a4a": "57003d", "73ad31": "b34952", "3a9494": "9c195c", @@ -10,16 +9,13 @@ "317373": "6e034e", "63d6b5": "de3570", "bdff73": "ffc5a3", - "cecece": "cecece", "ef213a": "712f8f", "ad0031": "3f1375", - "ffffff": "ffffff", "ff6b63": "a266b0" }, "2": { "526329": "022e59", "a5d642": "80c3d9", - "101010": "101010", "194a4a": "782c00", "73ad31": "446b94", "3a9494": "d46d00", @@ -27,10 +23,8 @@ "317373": "5c410d", "63d6b5": "faac05", "bdff73": "befaf1", - "cecece": "cecece", "ef213a": "1d540c", "ad0031": "3c8227", - "ffffff": "ffffff", "ff6b63": "86bf75" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/100.json b/public/images/pokemon/variant/100.json index a37f7e045be..32f619876dd 100644 --- a/public/images/pokemon/variant/100.json +++ b/public/images/pokemon/variant/100.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "841010": "983d00", "d63142": "c76d14", "ff5221": "f0b64a", @@ -12,7 +11,6 @@ "b5adbd": "d6b0a5" }, "2": { - "101010": "101010", "841010": "27145d", "d63142": "482683", "ff5221": "7240a2", diff --git a/public/images/pokemon/variant/1000.json b/public/images/pokemon/variant/1000.json index e7451cd51d0..1e8bb087c88 100644 --- a/public/images/pokemon/variant/1000.json +++ b/public/images/pokemon/variant/1000.json @@ -3,7 +3,6 @@ "917228": "a33612", "ffdba6": "ffb667", "ffd52d": "ee883f", - "0f0f0f": "0f0f0f", "f7a62d": "a64700", "d9880f": "9b3e00", "484415": "6d1906", @@ -20,7 +19,6 @@ "917228": "622f43", "ffdba6": "f3e3e4", "ffd52d": "e1ced1", - "0f0f0f": "0f0f0f", "f7a62d": "96747e", "d9880f": "7a4e5d", "484415": "4b1a32", @@ -37,7 +35,6 @@ "917228": "3d717b", "ffdba6": "ffffff", "ffd52d": "e5fffc", - "0f0f0f": "0f0f0f", "f7a62d": "89d1d6", "d9880f": "5a9aa3", "484415": "214048", diff --git a/public/images/pokemon/variant/1001.json b/public/images/pokemon/variant/1001.json index 84ef616b389..b3fd1825cd6 100644 --- a/public/images/pokemon/variant/1001.json +++ b/public/images/pokemon/variant/1001.json @@ -3,7 +3,6 @@ "505551": "754e3b", "b8bebd": "ebe6c0", "313430": "4f2711", - "010101": "010101", "7e615a": "1f1e1c", "48492e": "0a0907", "a28b76": "383734", @@ -13,16 +12,12 @@ "524a36": "754607", "b99c60": "e2a845", "7b7253": "b87416", - "f97c20": "a5af8b", - "fdfdfd": "fdfdfd", - "212421": "212421", - "212021": "212021" + "f97c20": "a5af8b" }, "2": { "505551": "322733", "b8bebd": "dbcce8", "313430": "1b101c", - "010101": "010101", "7e615a": "e6aec8", "48492e": "9c4b6f", "a28b76": "fce6f0", @@ -32,9 +27,6 @@ "524a36": "420f0f", "b99c60": "bd405d", "7b7253": "5e1b1b", - "f97c20": "f536f5", - "fdfdfd": "fdfdfd", - "212421": "212421", - "212021": "212021" + "f97c20": "f536f5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/1003.json b/public/images/pokemon/variant/1003.json index a0b7fb54c9e..28805ce18a9 100644 --- a/public/images/pokemon/variant/1003.json +++ b/public/images/pokemon/variant/1003.json @@ -2,9 +2,7 @@ "1": { "283331": "96562e", "a6b4a7": "e7cb7e", - "4a4a4a": "4a4a4a", "486863": "be8550", - "0f0f0f": "0f0f0f", "73958b": "daa666", "5e4622": "352831", "5c3127": "861d0f", @@ -20,9 +18,7 @@ "2": { "283331": "472d7c", "a6b4a7": "cfa0f3", - "4a4a4a": "4a4a4a", "486863": "6c4aac", - "0f0f0f": "0f0f0f", "73958b": "8d6acc", "5e4622": "434377", "5c3127": "313246", diff --git a/public/images/pokemon/variant/1004.json b/public/images/pokemon/variant/1004.json index f8370292ad5..dc6c13f5f47 100644 --- a/public/images/pokemon/variant/1004.json +++ b/public/images/pokemon/variant/1004.json @@ -2,7 +2,6 @@ "1": { "a23724": "b06f00", "f4342f": "f2b200", - "0f0f0f": "0f0f0f", "f35e38": "ffc81b", "f9824f": "ffe13a", "b15236": "dca300", @@ -13,13 +12,11 @@ "1c4021": "3e3e84", "5b985a": "5c71c1", "83b884": "7a9ae0", - "3c3f3a": "27276a", - "f8f8f0": "f8f8f0" + "3c3f3a": "27276a" }, "2": { "a23724": "76074d", "f4342f": "a525d3", - "0f0f0f": "0f0f0f", "f35e38": "3449f6", "f9824f": "49c9f6", "b15236": "6233a3", @@ -30,7 +27,6 @@ "1c4021": "655a59", "5b985a": "b09f97", "83b884": "d7cbb5", - "3c3f3a": "4b4444", - "f8f8f0": "f8f8f0" + "3c3f3a": "4b4444" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/1006.json b/public/images/pokemon/variant/1006.json index 420456dcd93..e6a76a533fd 100644 --- a/public/images/pokemon/variant/1006.json +++ b/public/images/pokemon/variant/1006.json @@ -2,10 +2,8 @@ "2": { "2d384a": "2a224e", "595f6a": "181440", - "f4f8f7": "f4f8f7", "4b8383": "3e2d63", "6db0b4": "585995", - "0f0f0f": "0f0f0f", "264d24": "483d5c", "5ab46a": "c2c8dc", "41835a": "79728e", diff --git a/public/images/pokemon/variant/1008-ultimate-mode.json b/public/images/pokemon/variant/1008-ultimate-mode.json index 3c1fb26f6ff..935e8e6a220 100644 --- a/public/images/pokemon/variant/1008-ultimate-mode.json +++ b/public/images/pokemon/variant/1008-ultimate-mode.json @@ -1,21 +1,15 @@ { "0": { "4ba5cf": "8955b5", - "fefefe": "fefefe", "d7c2c1": "d7c3f7", "c883d1": "7fd8cf", "1a1c42": "393a3e", "5c4370": "3e446d", "fcdf14": "427eff", - "878594": "878594", - "c1bddf": "c1bddf", - "e6e3f2": "e6e3f2", "643fa3": "c8c8c8", - "0e0e12": "0e0e12", "4d3672": "858585", "392855": "616161", - "2e3176": "868686", - "ffffff": "ffffff" + "2e3176": "868686" }, "1": { "4ba5cf": "31808e", @@ -27,13 +21,10 @@ "fcdf14": "2cc151", "878594": "89a5ff", "c1bddf": "b7d8ff", - "e6e3f2": "e6e3f2", "643fa3": "626877", - "0e0e12": "0e0e12", "4d3672": "444b66", "392855": "393e51", - "2e3176": "3aff75", - "ffffff": "ffffff" + "2e3176": "3aff75" }, "2": { "4ba5cf": "8e3c84", @@ -41,16 +32,13 @@ "d7c2c1": "ff93d4", "c883d1": "ffc26d", "1a1c42": "29253f", - "5c4370": "5c4370", "fcdf14": "cc5767", "878594": "ad9e9d", "c1bddf": "e0e0e0", "e6e3f2": "eae8f4", "643fa3": "3b4986", - "0e0e12": "0e0e12", "4d3672": "2a3768", "392855": "192142", - "2e3176": "cf3e57", - "ffffff": "ffffff" + "2e3176": "cf3e57" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/101.json b/public/images/pokemon/variant/101.json index 335af910d8a..46735c1d98a 100644 --- a/public/images/pokemon/variant/101.json +++ b/public/images/pokemon/variant/101.json @@ -1,11 +1,8 @@ { "1": { - "5a5252": "5a5252", "cecede": "d6b0a5", "efefef": "f7e4da", - "101010": "101010", "ffffff": "fffdfb", - "a59c9c": "a59c9c", "d68494": "d59679", "c52942": "c76d14", "f7a58c": "ffd86f", @@ -14,12 +11,9 @@ "841010": "983d00" }, "2": { - "5a5252": "5a5252", "cecede": "94b1c9", "efefef": "cde3ef", - "101010": "101010", "ffffff": "f3fdff", - "a59c9c": "a59c9c", "d68494": "887db5", "c52942": "482683", "f7a58c": "c27bec", diff --git a/public/images/pokemon/variant/1010.json b/public/images/pokemon/variant/1010.json index f216f9f184a..75461e5d114 100644 --- a/public/images/pokemon/variant/1010.json +++ b/public/images/pokemon/variant/1010.json @@ -6,13 +6,11 @@ "c51333": "4a6329", "ff5f7c": "638c10", "ffb2c0": "9cce52", - "0b0b0b": "0b0b0b", "aedf87": "ef8ca5", "343631": "313436", "61635b": "5b6263", "8a8d85": "858d8c", - "c0c1be": "bec1c0", - "1d1d1c": "1d1d1c" + "c0c1be": "bec1c0" }, "2": { "1e5238": "834b04", @@ -21,12 +19,10 @@ "c51333": "9131a3", "ff5f7c": "e565fd", "ffb2c0": "eeeeee", - "0b0b0b": "0b0b0b", "aedf87": "e3d520", "343631": "54544c", "61635b": "a1a19b", "8a8d85": "cacac6", - "c0c1be": "eeeeee", - "1d1d1c": "1d1d1c" + "c0c1be": "eeeeee" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/1018.json b/public/images/pokemon/variant/1018.json index ed50c6015c8..47ac432cdb4 100644 --- a/public/images/pokemon/variant/1018.json +++ b/public/images/pokemon/variant/1018.json @@ -1,7 +1,6 @@ { "1": { "691701": "871e14", - "000000": "000000", "aa3810": "ed7746", "7d5c02": "b53d07", "272b87": "1d542f", @@ -19,7 +18,6 @@ }, "2": { "691701": "062449", - "000000": "000000", "aa3810": "2077a6", "7d5c02": "126fa3", "272b87": "fede7d", diff --git a/public/images/pokemon/variant/1022.json b/public/images/pokemon/variant/1022.json index e4eb3ac16b2..249ba1e3afc 100644 --- a/public/images/pokemon/variant/1022.json +++ b/public/images/pokemon/variant/1022.json @@ -3,11 +3,9 @@ "382929": "5e1111", "604640": "9c120b", "7a5a4b": "ce2e25", - "050505": "050505", "adadad": "9a9696", "cfcfcf": "c1baba", "b87b21": "0a8d7f", - "eeeeee": "eeeeee", "8a8e8a": "817c7c", "dfa939": "22c7b6", "5a5a56": "56534c", @@ -19,11 +17,9 @@ "382929": "744c08", "604640": "bba010", "7a5a4b": "e3d520", - "050505": "050505", "adadad": "a1a19b", "cfcfcf": "cacac6", "b87b21": "9131a3", - "eeeeee": "eeeeee", "8a8e8a": "74746b", "dfa939": "e565fd", "5a5a56": "54544c", diff --git a/public/images/pokemon/variant/1023.json b/public/images/pokemon/variant/1023.json index 19d232e9566..8250aea2677 100644 --- a/public/images/pokemon/variant/1023.json +++ b/public/images/pokemon/variant/1023.json @@ -2,8 +2,6 @@ "1": { "00a6ad": "92c72a", "62f7f7": "bcfb3f", - "f9ffff": "f9ffff", - "050505": "050505", "f0c720": "c5f6e6", "89570c": "52766a", "b4961f": "88b8a8", @@ -11,17 +9,13 @@ "163d43": "133453", "45cbc8": "5ca6ea", "389cad": "3673aa", - "242322": "242322", "858ca7": "7b7b7b", "c9cfda": "bdbdbd", - "454a54": "4f4d4d", - "7092be": "7092be" + "454a54": "4f4d4d" }, "2": { "00a6ad": "852098", "62f7f7": "d046e8", - "f9ffff": "f9ffff", - "050505": "050505", "f0c720": "b6d4d2", "89570c": "627675", "b4961f": "9bb4b3", @@ -29,10 +23,8 @@ "163d43": "5c3c06", "45cbc8": "d9cd25", "389cad": "c1991d", - "242322": "242322", "858ca7": "a9a7a2", "c9cfda": "d5d5d1", - "454a54": "72716d", - "7092be": "7092be" + "454a54": "72716d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/111.json b/public/images/pokemon/variant/111.json index 163e82ae742..f21cec533c5 100644 --- a/public/images/pokemon/variant/111.json +++ b/public/images/pokemon/variant/111.json @@ -1,22 +1,16 @@ { "1": { "5a5a7b": "241e2f", - "101010": "101010", "bdbdce": "6a547a", "e6e6ef": "9781ab", "8484ad": "402f51", - "3a3a52": "261e2d", - "ffffff": "ffffff", - "ad3a29": "ad3a29" + "3a3a52": "261e2d" }, "2": { "5a5a7b": "ab4355", - "101010": "101010", "bdbdce": "e18db3", "e6e6ef": "f7b4d1", "8484ad": "d76688", - "3a3a52": "6d2935", - "ffffff": "ffffff", - "ad3a29": "ad3a29" + "3a3a52": "6d2935" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/112.json b/public/images/pokemon/variant/112.json index 621308c3297..dceef9b6ed9 100644 --- a/public/images/pokemon/variant/112.json +++ b/public/images/pokemon/variant/112.json @@ -1,32 +1,22 @@ { "1": { "8c8c94": "523c5c", - "101010": "101010", "c5c5bd": "6a547a", "52525a": "3c2945", "e6e6de": "9781ab", "735a31": "6b6373", "ffefc5": "cecede", "b5a573": "948cad", - "ffffff": "ffffff", - "a53110": "a53110", - "e6523a": "e6523a", - "e6d6ad": "cecede", - "732110": "732110" + "e6d6ad": "cecede" }, "2": { "8c8c94": "ab3f5c", - "101010": "101010", "c5c5bd": "cb568a", "52525a": "642224", "e6e6de": "ef86b5", "735a31": "6d586d", "ffefc5": "dacad3", "b5a573": "be9bb6", - "ffffff": "ffffff", - "a53110": "a53110", - "e6523a": "e6523a", - "e6d6ad": "dacad3", - "732110": "732110" + "e6d6ad": "dacad3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/114.json b/public/images/pokemon/variant/114.json index fa07a96b55d..d57d431a799 100644 --- a/public/images/pokemon/variant/114.json +++ b/public/images/pokemon/variant/114.json @@ -4,9 +4,6 @@ "427b94": "654294", "5aa5ce": "755ace", "94d6f7": "a479ff", - "101010": "101010", - "b5b5b5": "b5b5b5", - "ffffff": "ffffff", "732929": "2b7329", "ad2942": "2dad29", "de4a6b": "7bde4a", @@ -17,9 +14,6 @@ "427b94": "ad875a", "5aa5ce": "ebc582", "94d6f7": "ffedb6", - "101010": "101010", - "b5b5b5": "b5b5b5", - "ffffff": "ffffff", "732929": "332119", "ad2942": "4d2c1d", "de4a6b": "7a4932", diff --git a/public/images/pokemon/variant/116.json b/public/images/pokemon/variant/116.json index 978af835a5c..90904480c4d 100644 --- a/public/images/pokemon/variant/116.json +++ b/public/images/pokemon/variant/116.json @@ -4,10 +4,7 @@ "bddeff": "7ed683", "a5c5ef": "5bab65", "6b94b5": "3d7b4f", - "101010": "101010", - "ffffff": "ffffff", "ff7373": "34b9af", - "d6d6d6": "d6d6d6", "dec54a": "91bf49", "9c844a": "548133", "ffffad": "fff370" @@ -17,10 +14,7 @@ "bddeff": "fffaa1", "a5c5ef": "ffe675", "6b94b5": "edb766", - "101010": "101010", - "ffffff": "ffffff", "ff7373": "9973c7", - "d6d6d6": "d6d6d6", "dec54a": "4e878a", "9c844a": "314e5e", "ffffad": "7bc9bb" diff --git a/public/images/pokemon/variant/117.json b/public/images/pokemon/variant/117.json index 81b047d6142..6dab6d19277 100644 --- a/public/images/pokemon/variant/117.json +++ b/public/images/pokemon/variant/117.json @@ -4,12 +4,10 @@ "21425a": "122647", "a5cee6": "45b38f", "84adce": "2e8b7b", - "101010": "101010", "4a6b84": "143c4f", "7b6321": "3f8a49", "dec552": "87c563", "ffffad": "b5e37f", - "ffffff": "ffffff", "9c9c9c": "243b61" }, "2": { @@ -17,12 +15,10 @@ "21425a": "702525", "a5cee6": "ffd166", "84adce": "ffab66", - "101010": "101010", "4a6b84": "c74c4c", "7b6321": "4e878a", "dec552": "7bc9bb", "ffffad": "b3f2d8", - "ffffff": "ffffff", "9c9c9c": "ff9a47" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/118.json b/public/images/pokemon/variant/118.json index 19f98fd8911..3c64ebd5879 100644 --- a/public/images/pokemon/variant/118.json +++ b/public/images/pokemon/variant/118.json @@ -2,9 +2,7 @@ "0": { "52525a": "734733", "ffffff": "fff7ee", - "101010": "101010", "8c8c94": "966f58", - "ceb57b": "ceb57b", "efefef": "e7d7c9", "d6d6de": "cbb7aa", "ffc57b": "ffda73", @@ -19,7 +17,6 @@ "1": { "52525a": "492d5c", "ffffff": "e7d1ea", - "101010": "101010", "8c8c94": "6c5277", "ceb57b": "7e3eb1", "efefef": "b9a0bf", @@ -36,7 +33,6 @@ "2": { "52525a": "2b4a54", "ffffff": "d5e6e4", - "101010": "101010", "8c8c94": "526d71", "ceb57b": "45895b", "efefef": "aecac8", diff --git a/public/images/pokemon/variant/119.json b/public/images/pokemon/variant/119.json index 9c211993e1f..5201cd2ce9c 100644 --- a/public/images/pokemon/variant/119.json +++ b/public/images/pokemon/variant/119.json @@ -6,7 +6,6 @@ "5a5a63": "734733", "52525a": "522b23", "cec5c5": "e1caba", - "101010": "101010", "943119": "8c5003", "e67342": "f5c767", "f79463": "ffe499", @@ -23,7 +22,6 @@ "5a5a63": "6c5277", "52525a": "39195d", "cec5c5": "ac90b2", - "101010": "101010", "943119": "582488", "e67342": "9e5fcb", "f79463": "ba82d9", @@ -40,7 +38,6 @@ "5a5a63": "526d71", "52525a": "2b4a54", "cec5c5": "9ab8b8", - "101010": "101010", "943119": "0e3c1e", "e67342": "5fad67", "f79463": "92c494", diff --git a/public/images/pokemon/variant/120.json b/public/images/pokemon/variant/120.json index f9970a1f814..1de1061e5e1 100644 --- a/public/images/pokemon/variant/120.json +++ b/public/images/pokemon/variant/120.json @@ -2,7 +2,6 @@ "1": { "633131": "07293b", "9c6b3a": "1b7272", - "000000": "000000", "deb563": "4bd09b", "7b523a": "0f4c58", "d69c52": "2d9683", @@ -19,7 +18,6 @@ "2": { "633131": "1d5198", "9c6b3a": "3eb7e5", - "000000": "000000", "deb563": "9cffff", "7b523a": "2c81bc", "d69c52": "74e7f7", diff --git a/public/images/pokemon/variant/121.json b/public/images/pokemon/variant/121.json index 82840e49783..8e59d32fc21 100644 --- a/public/images/pokemon/variant/121.json +++ b/public/images/pokemon/variant/121.json @@ -2,7 +2,6 @@ "1": { "5a529c": "8b4a52", "8c73bd": "de6262", - "000000": "000000", "313a73": "631c26", "d6adef": "ffc5b4", "b58cd6": "ee9494", @@ -19,7 +18,6 @@ "2": { "5a529c": "9eb4ff", "8c73bd": "c5d5ff", - "000000": "000000", "313a73": "597cdb", "d6adef": "ffffff", "b58cd6": "d6e8ff", diff --git a/public/images/pokemon/variant/123.json b/public/images/pokemon/variant/123.json index 53f7ef977f7..c3f41aa1ede 100644 --- a/public/images/pokemon/variant/123.json +++ b/public/images/pokemon/variant/123.json @@ -2,43 +2,23 @@ "0": { "425a21": "632929", "bde673": "f76b6b", - "101010": "101010", "9c8c31": "9494a5", "fff7d6": "ffffff", "8cce73": "d63a3a", "e6d6ad": "b5b5ce", - "5a9c4a": "a52929", - "ffffff": "ffffff", - "dedede": "dedede", - "bdbdbd": "bdbdbd", - "737373": "737373" + "5a9c4a": "a52929" }, "1": { "425a21": "484e75", "bde673": "7c9ac5", - "101010": "101010", - "9c8c31": "9c8c31", - "fff7d6": "fff7d6", "8cce73": "92b0db", - "e6d6ad": "e6d6ad", - "5a9c4a": "7b94d6", - "ffffff": "ffffff", - "dedede": "dedede", - "bdbdbd": "bdbdbd", - "737373": "737373" + "5a9c4a": "7b94d6" }, "2": { "425a21": "8f3907", "bde673": "f8f581", - "101010": "101010", - "9c8c31": "9c8c31", - "fff7d6": "fff7d6", "8cce73": "f0c947", - "e6d6ad": "e6d6ad", "5a9c4a": "e6a027", - "ffffff": "ffffff", - "dedede": "f0c947", - "bdbdbd": "bdbdbd", - "737373": "737373" + "dedede": "f0c947" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/125.json b/public/images/pokemon/variant/125.json index 4b265d02a60..4948e455c46 100644 --- a/public/images/pokemon/variant/125.json +++ b/public/images/pokemon/variant/125.json @@ -3,13 +3,11 @@ "c5a510": "b34d2b", "5a4a08": "752c0b", "ffe63a": "ff8b3a", - "101010": "101010", "fff7b5": "ffd4b5", "e6c521": "e66a21", "292921": "211d29", "3a4252": "3f3a52", "6b6b63": "57526e", - "ffffff": "ffffff", "c5c5d6": "c5ccd6", "b53a6b": "b53a59", "e66394": "e66380" @@ -18,13 +16,11 @@ "c5a510": "2dbd73", "5a4a08": "235c3c", "ffe63a": "59f7d0", - "101010": "101010", "fff7b5": "c8ffea", "e6c521": "43e6b7", "292921": "282a24", "3a4252": "424554", "6b6b63": "6a6982", - "ffffff": "ffffff", "c5c5d6": "cfd2dc", "b53a6b": "b85195", "e66394": "ed89c2" diff --git a/public/images/pokemon/variant/126.json b/public/images/pokemon/variant/126.json index 8c90e069d6d..a0bbca87284 100644 --- a/public/images/pokemon/variant/126.json +++ b/public/images/pokemon/variant/126.json @@ -1,16 +1,12 @@ { "2": { "7b5231": "699296", - "000000": "000000", "ffef4a": "eaffff", "c57b10": "9ec9cf", "e6bd31": "c6edf2", "6b2121": "303d58", "ce1042": "4065b0", "ff4a31": "5398cf", - "636363": "636363", - "ffffff": "ffffff", - "c5c5c5": "c5c5c5", "ff8c63": "b2a0b1", "ffcebd": "cabac8", "fff7ce": "ffffff" diff --git a/public/images/pokemon/variant/127-mega.json b/public/images/pokemon/variant/127-mega.json index a5d06441236..eea226c236f 100644 --- a/public/images/pokemon/variant/127-mega.json +++ b/public/images/pokemon/variant/127-mega.json @@ -3,32 +3,24 @@ "837362": "7e5649", "c0b5ab": "b1846f", "fdf7e6": "eccb90", - "101010": "101010", "4a4139": "441a0f", "e1d7cc": "d29f88", - "f0831d": "f0831d", "836a52": "3b554d", "5a4131": "172a22", "c5ac8b": "72988e", "a48b6a": "54796f", - "e6d5b4": "92bab1", - "ffde62": "ffde62", - "f8f8f8": "f8f8f8" + "e6d5b4": "92bab1" }, "2": { "837362": "868686", "c0b5ab": "b7b7b7", "fdf7e6": "ffffff", - "101010": "101010", "4a4139": "484848", "e1d7cc": "d5d5d5", - "f0831d": "f0831d", "836a52": "8c2c40", "5a4131": "5c0026", "c5ac8b": "d56a70", "a48b6a": "b44954", - "e6d5b4": "fa958c", - "ffde62": "ffde62", - "f8f8f8": "f8f8f8" + "e6d5b4": "fa958c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/127.json b/public/images/pokemon/variant/127.json index d0c615686f6..dd09ba44692 100644 --- a/public/images/pokemon/variant/127.json +++ b/public/images/pokemon/variant/127.json @@ -4,27 +4,23 @@ "b5a594": "b1846f", "efe6ce": "eccb90", "4a423a": "441a0f", - "000000": "000000", "d6c5b5": "d29f88", "846b52": "3b554d", "5a4231": "172a22", "c5ad8c": "72988e", "e6d6b5": "92bab1", - "a58c6b": "54796f", - "ffffff": "ffffff" + "a58c6b": "54796f" }, "2": { "847363": "868686", "b5a594": "b7b7b7", "efe6ce": "ffffff", "4a423a": "484848", - "000000": "000000", "d6c5b5": "d5d5d5", "846b52": "8c2c40", "5a4231": "5c0026", "c5ad8c": "d56a70", "e6d6b5": "fa958c", - "a58c6b": "b44954", - "ffffff": "ffffff" + "a58c6b": "b44954" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/129.json b/public/images/pokemon/variant/129.json index ad9817f4aa7..8274a684944 100644 --- a/public/images/pokemon/variant/129.json +++ b/public/images/pokemon/variant/129.json @@ -7,7 +7,6 @@ "f76319": "ac9bbc", "840042": "312b45", "c5ad73": "d0784b", - "000000": "000000", "525263": "896e5d", "bd4242": "6f6380", "ffffff": "fffcf3", @@ -24,13 +23,11 @@ "f76319": "f25090", "840042": "6c0261", "c5ad73": "bcaf98", - "000000": "000000", "525263": "74619a", "bd4242": "cd2b78", "ffffff": "f9efff", "8c8ca5": "af97ce", "ceced6": "d1bae7", - "ff9c63": "ff9dbb", - "ffe6c5": "ffe6c5" + "ff9c63": "ff9dbb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/130-mega.json b/public/images/pokemon/variant/130-mega.json index e551e93baec..82fd8fd6b87 100644 --- a/public/images/pokemon/variant/130-mega.json +++ b/public/images/pokemon/variant/130-mega.json @@ -3,16 +3,13 @@ "132d5b": "611d07", "2192e4": "eea747", "1b68a7": "c67429", - "101010": "101010", "cdb47b": "bd9b8e", "144f7e": "923d13", - "5a4120": "5a4120", "3c3f47": "c32625", "67686b": "dd493b", "980e31": "8691d5", "e43343": "c9d4ff", "f6e6ac": "fff3ec", - "f8f8f8": "f8f8f8", "383b42": "682a23", "d5def6": "f37754" }, @@ -20,7 +17,6 @@ "132d5b": "200d46", "2192e4": "7b43a1", "1b68a7": "582c81", - "101010": "101010", "cdb47b": "d7aec0", "144f7e": "411f70", "5a4120": "855a71", @@ -29,7 +25,6 @@ "980e31": "a62869", "e43343": "e15693", "f6e6ac": "ffedf4", - "f8f8f8": "f8f8f8", "383b42": "202b47", "d5def6": "ffdb85" } diff --git a/public/images/pokemon/variant/130.json b/public/images/pokemon/variant/130.json index fd6a18134d0..6ec3446c6a6 100644 --- a/public/images/pokemon/variant/130.json +++ b/public/images/pokemon/variant/130.json @@ -6,12 +6,10 @@ "d6def7": "d2bdb4", "196394": "a85104", "194273": "873503", - "191919": "191919", "7bd6ef": "fed076", "42b5ef": "f2aa45", "f7e6ad": "fff3ec", "ceb57b": "bd9b8e", - "5a4221": "5a4221", "bd3163": "6274e1", "6b1921": "3b42b5", "ef6342": "95abff" @@ -23,7 +21,6 @@ "d6def7": "f3c3de", "196394": "431a77", "194273": "1f0a47", - "191919": "191919", "7bd6ef": "9e5cc8", "42b5ef": "7f43b3", "f7e6ad": "e8b4d4", diff --git a/public/images/pokemon/variant/131-gigantamax.json b/public/images/pokemon/variant/131-gigantamax.json index 3cb6eb5dc1b..323c758a5e6 100644 --- a/public/images/pokemon/variant/131-gigantamax.json +++ b/public/images/pokemon/variant/131-gigantamax.json @@ -1,12 +1,10 @@ { "1": { - "101010": "101010", "41a4e6": "85cfef", "184152": "133363", "73c5f6": "ffc0e7", "397ba4": "3595c4", "51fffb": "ff8de5", - "fffad6": "fffad6", "8ba494": "a7b2ab", "dec583": "dac99e", "52526a": "3c1838", @@ -17,18 +15,14 @@ "f6deac": "f1e9d9" }, "2": { - "101010": "101010", "41a4e6": "49b18c", - "184152": "184152", "73c5f6": "8bd3b6", "397ba4": "3a8770", "51fffb": "0085b2", - "fffad6": "fffad6", "8ba494": "8ca594", "dec583": "baafaa", "52526a": "282548", "a49494": "666b8b", - "fefefe": "fefefe", "d5cdc5": "969dbc", "807573": "454565", "f6deac": "e8e3e0" diff --git a/public/images/pokemon/variant/131.json b/public/images/pokemon/variant/131.json index 603bff575b2..7fed0f8336b 100644 --- a/public/images/pokemon/variant/131.json +++ b/public/images/pokemon/variant/131.json @@ -1,7 +1,6 @@ { "1": { "194252": "133363", - "000000": "000000", "42a5e6": "85cfef", "3a7ba5": "4b9bc3", "73c5f7": "c4f6ff", @@ -17,15 +16,11 @@ }, "2": { "194252": "06383e", - "000000": "000000", "42a5e6": "49b18c", "3a7ba5": "3a8770", "73c5f7": "8bd3b6", - "f7efe6": "f7efe6", "6b5219": "18418d", "dec584": "baafaa", - "8ca594": "8ca594", - "5a4a42": "5a4a42", "52526b": "383851", "d6cec5": "969dbc", "a59494": "666b8b", diff --git a/public/images/pokemon/variant/132.json b/public/images/pokemon/variant/132.json index bb2e7bf9ef2..06d421c2fc5 100644 --- a/public/images/pokemon/variant/132.json +++ b/public/images/pokemon/variant/132.json @@ -1,7 +1,6 @@ { "1": { "5a1994": "2a6d20", - "000000": "000000", "9c5ab5": "5aa03d", "ffceff": "ffffc2", "c57be6": "9dce55", @@ -10,7 +9,6 @@ }, "2": { "5a1994": "0e0c1c", - "000000": "000000", "9c5ab5": "131432", "ffceff": "83bdff", "c57be6": "2b3154", diff --git a/public/images/pokemon/variant/133-partner.json b/public/images/pokemon/variant/133-partner.json index 1939d16ec22..a69dce56708 100644 --- a/public/images/pokemon/variant/133-partner.json +++ b/public/images/pokemon/variant/133-partner.json @@ -3,22 +3,18 @@ "a5634a": "5982b7", "734a4a": "334b7d", "d69c4a": "90c1f1", - "000000": "000000", "523121": "13235c", "e6c594": "9db5d8", "bd9c7b": "5f6f94", - "ffffff": "ffffff", "ffe6ad": "d7ebff" }, "2": { "a5634a": "915ea3", "734a4a": "5e3372", "d69c4a": "bf88cb", - "000000": "000000", "523121": "461144", "e6c594": "d7b8ba", "bd9c7b": "a07c83", - "ffffff": "ffffff", "ffe6ad": "f3e6e3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/133.json b/public/images/pokemon/variant/133.json index 1939d16ec22..a69dce56708 100644 --- a/public/images/pokemon/variant/133.json +++ b/public/images/pokemon/variant/133.json @@ -3,22 +3,18 @@ "a5634a": "5982b7", "734a4a": "334b7d", "d69c4a": "90c1f1", - "000000": "000000", "523121": "13235c", "e6c594": "9db5d8", "bd9c7b": "5f6f94", - "ffffff": "ffffff", "ffe6ad": "d7ebff" }, "2": { "a5634a": "915ea3", "734a4a": "5e3372", "d69c4a": "bf88cb", - "000000": "000000", "523121": "461144", "e6c594": "d7b8ba", "bd9c7b": "a07c83", - "ffffff": "ffffff", "ffe6ad": "f3e6e3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/134.json b/public/images/pokemon/variant/134.json index f801da9a8e0..c3e06b60196 100644 --- a/public/images/pokemon/variant/134.json +++ b/public/images/pokemon/variant/134.json @@ -4,7 +4,6 @@ "107394": "7054e7", "bdad5a": "a26b30", "6b6321": "663a18", - "101010": "101010", "8c8c8c": "754949", "ffffff": "ffe6db", "ffe6a5": "f4cb60", @@ -12,16 +11,13 @@ "84deff": "c497e5", "5ac5e6": "a271e1", "429cbd": "764abf", - "521073": "18359b", - "7b0829": "7b0829", - "d65273": "d65273" + "521073": "18359b" }, "2": { "104a63": "5e1120", "107394": "b75846", "bdad5a": "7d2f67", "6b6321": "4a1642", - "101010": "101010", "8c8c8c": "655081", "ffffff": "fee1fa", "ffe6a5": "a65687", @@ -29,8 +25,6 @@ "84deff": "e1c66e", "5ac5e6": "d29d48", "429cbd": "a66829", - "521073": "13517b", - "7b0829": "7b0829", - "d65273": "d65273" + "521073": "13517b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/135.json b/public/images/pokemon/variant/135.json index 9203e23b72e..81198118b43 100644 --- a/public/images/pokemon/variant/135.json +++ b/public/images/pokemon/variant/135.json @@ -1,6 +1,5 @@ { "0": { - "000000": "000000", "5a4a10": "7b3e14", "cead4a": "e4a254", "ad8c3a": "975720", @@ -13,7 +12,6 @@ "c5c5c5": "aacbc7" }, "1": { - "000000": "000000", "5a4a10": "202448", "cead4a": "5e5a84", "ad8c3a": "35346d", @@ -26,7 +24,6 @@ "c5c5c5": "8e99b5" }, "2": { - "000000": "000000", "5a4a10": "2c3182", "cead4a": "47b4e9", "ad8c3a": "4351d7", diff --git a/public/images/pokemon/variant/136.json b/public/images/pokemon/variant/136.json index d3ce6e156f5..b3dd572687c 100644 --- a/public/images/pokemon/variant/136.json +++ b/public/images/pokemon/variant/136.json @@ -3,39 +3,33 @@ "732119": "64391a", "c5a56b": "ac9276", "d64252": "b1772e", - "000000": "000000", "735a42": "5e4828", "ffefa5": "f5f4e2", "f7734a": "e6af4a", "debd8c": "e5d9c3", "21216b": "0e4481", - "ffffff": "ffffff", "a54252": "8c5219" }, "1": { "732119": "1b5255", "c5a56b": "b1a58c", "d64252": "3aad8b", - "000000": "000000", "735a42": "766a5b", "ffefa5": "f5f3df", "f7734a": "5dde9d", "debd8c": "d9c9ac", "21216b": "541433", - "ffffff": "ffffff", "a54252": "2c736b" }, "2": { "732119": "4c0013", "c5a56b": "564c51", "d64252": "8c2426", - "000000": "000000", "735a42": "2d252a", "ffefa5": "a89da0", "f7734a": "b54144", "debd8c": "82787c", "21216b": "4d1b00", - "ffffff": "ffffff", "a54252": "771823" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/137.json b/public/images/pokemon/variant/137.json index 81f82938bcc..497c86c2979 100644 --- a/public/images/pokemon/variant/137.json +++ b/public/images/pokemon/variant/137.json @@ -7,7 +7,6 @@ "efad9c": "f8a8cd", "085a73": "4d030f", "5abde6": "e9635a", - "000000": "000000", "ff6363": "e9778e", "0884a5": "841023", "08add6": "ba333b", @@ -22,7 +21,6 @@ "efad9c": "82391d", "085a73": "a1562c", "5abde6": "ffd9ab", - "000000": "000000", "ff6363": "491c0c", "0884a5": "cf8556", "08add6": "efb787", diff --git a/public/images/pokemon/variant/138.json b/public/images/pokemon/variant/138.json index 1801e9e8a0a..1f9e9a02000 100644 --- a/public/images/pokemon/variant/138.json +++ b/public/images/pokemon/variant/138.json @@ -5,7 +5,6 @@ "635231": "821e16", "e6de84": "e67443", "c5ad73": "d04e2a", - "000000": "000000", "3a4284": "2c0c19", "426bad": "48172f", "ffffff": "f3fdff", @@ -21,7 +20,6 @@ "635231": "0c0f28", "e6de84": "404c5f", "c5ad73": "2a344b", - "000000": "000000", "3a4284": "0c5540", "426bad": "1a7e5c", "ffffff": "ffa788", diff --git a/public/images/pokemon/variant/139.json b/public/images/pokemon/variant/139.json index 76a3db354f5..40fe7fd0b33 100644 --- a/public/images/pokemon/variant/139.json +++ b/public/images/pokemon/variant/139.json @@ -4,14 +4,12 @@ "e6de84": "db764a", "635242": "5f1e19", "c5ad73": "c04e2f", - "000000": "000000", "ffefc5": "fdad7d", "426bad": "39121f", "63bdf7": "885374", "3a9cce": "602a48", "3a4284": "2c0c19", "424242": "3c1313", - "fff79c": "ffca9c", - "ffffff": "ffffff" + "fff79c": "ffca9c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/140.json b/public/images/pokemon/variant/140.json index 0739e7baea2..5c7a5e96729 100644 --- a/public/images/pokemon/variant/140.json +++ b/public/images/pokemon/variant/140.json @@ -2,8 +2,6 @@ "1": { "7b5229": "600006", "4a2900": "52060e", - "ffffff": "ffffff", - "000000": "000000", "c58429": "9f1105", "a56b29": "870100", "ff8cad": "ff5bda", @@ -15,8 +13,6 @@ "2": { "7b5229": "2821ab", "4a2900": "271381", - "ffffff": "ffffff", - "000000": "000000", "c58429": "4b64e6", "a56b29": "3440cb", "ff8cad": "ffed85", diff --git a/public/images/pokemon/variant/142-mega.json b/public/images/pokemon/variant/142-mega.json index 7306fb27ac5..49fd230e379 100644 --- a/public/images/pokemon/variant/142-mega.json +++ b/public/images/pokemon/variant/142-mega.json @@ -6,12 +6,10 @@ "957fa0": "945f65", "a79ed4": "b58788", "57406d": "582e34", - "010101": "010101", "79559f": "c54522", "9767d2": "df6d3c", "c5bfe3": "e4b7b2", "317329": "2150d9", - "fafafa": "fafafa", "832041": "a31048", "ae87e2": "ee9152", "d95b6b": "ee526f" @@ -23,12 +21,10 @@ "957fa0": "a8bdcc", "a79ed4": "cae0ec", "57406d": "596876", - "010101": "010101", "79559f": "1e5e54", "9767d2": "348f78", "c5bfe3": "d7ecf4", "317329": "c00c39", - "fafafa": "fafafa", "832041": "941c2d", "ae87e2": "5ebf9c", "d95b6b": "e76e67" diff --git a/public/images/pokemon/variant/142.json b/public/images/pokemon/variant/142.json index 0a31b67ad8b..e7cd2d299aa 100644 --- a/public/images/pokemon/variant/142.json +++ b/public/images/pokemon/variant/142.json @@ -1,14 +1,11 @@ { "1": { "9484a5": "6c3c43", - "000000": "000000", "adadd6": "945f65", "cecee6": "b58788", "524273": "411921", "31196b": "671707", "317329": "2150d9", - "cecece": "cecece", - "ffffff": "ffffff", "735294": "c54522", "ce3a4a": "d92f62", "842142": "a31048", @@ -18,14 +15,11 @@ }, "2": { "9484a5": "7c8e9f", - "000000": "000000", "adadd6": "a8bdcc", "cecee6": "cae0ec", "524273": "374659", "31196b": "0b3433", "317329": "c00c39", - "cecece": "cecece", - "ffffff": "ffffff", "735294": "1e5e54", "ce3a4a": "d03e3f", "842142": "941c2d", diff --git a/public/images/pokemon/variant/144.json b/public/images/pokemon/variant/144.json index 3117db9f49d..956a8386699 100644 --- a/public/images/pokemon/variant/144.json +++ b/public/images/pokemon/variant/144.json @@ -3,17 +3,13 @@ "005273": "642c89", "94c5ff": "f1dfff", "4a84d6": "7b42ab", - "000000": "000000", "6badf7": "d7adff", "003152": "461660", "007bbd": "a142c8", "5a3a19": "221531", "b59473": "736581", "8c6b52": "372841", - "ffffff": "ffffff", "bd293a": "2d6cb0", - "cee6ff": "fef5ff", - "525252": "525252", - "cecece": "cecece" + "cee6ff": "fef5ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/145.json b/public/images/pokemon/variant/145.json index 3104d408a9f..8a0354f6ed7 100644 --- a/public/images/pokemon/variant/145.json +++ b/public/images/pokemon/variant/145.json @@ -5,11 +5,8 @@ "101010": "000000", "d6ad08": "cc4e17", "9c7b10": "991500", - "ffffff": "ffffff", - "dedede": "dedede", "f79419": "6c4645", "c56b19": "442526", - "6b6b6b": "6b6b6b", "7b6b19": "2f1517", "9c8c31": "290f13" }, @@ -19,11 +16,8 @@ "101010": "000000", "d6ad08": "e3b68e", "9c7b10": "ac7c5b", - "ffffff": "ffffff", - "dedede": "dedede", "f79419": "ff9a33", "c56b19": "dd6b10", - "6b6b6b": "6b6b6b", "7b6b19": "885024", "9c8c31": "6e4216" }, @@ -33,11 +27,8 @@ "101010": "000000", "d6ad08": "a32a71", "9c7b10": "94007e", - "ffffff": "ffffff", - "dedede": "dedede", "f79419": "ffdeff", "c56b19": "c992cb", - "6b6b6b": "6b6b6b", "7b6b19": "970083", "9c8c31": "ce24a8" } diff --git a/public/images/pokemon/variant/146.json b/public/images/pokemon/variant/146.json index 8f9a5337298..fa210ac4bac 100644 --- a/public/images/pokemon/variant/146.json +++ b/public/images/pokemon/variant/146.json @@ -6,15 +6,11 @@ "ffa54a": "e01291", "734210": "220f23", "de9410": "431d43", - "000000": "000000", "ffc54a": "512d4e", "ffef63": "755c73", "523a29": "460241", "8c634a": "8c0c75", - "cecece": "cecece", - "ffffff": "ffffff", - "b58c63": "dd2559", - "636363": "636363" + "b58c63": "dd2559" }, "1": { "d60808": "00877f", @@ -23,15 +19,11 @@ "ffa54a": "90e932", "734210": "706127", "de9410": "c2b562", - "000000": "000000", "ffc54a": "f1eca3", "ffef63": "feffe1", "523a29": "840000", "8c634a": "ad1910", - "cecece": "cecece", - "ffffff": "ffffff", - "b58c63": "de423a", - "636363": "636363" + "b58c63": "de423a" }, "2": { "d60808": "053889", @@ -40,14 +32,10 @@ "ffa54a": "26b1e1", "734210": "0c4f6b", "de9410": "58abdb", - "000000": "000000", "ffc54a": "9dd5ff", "ffef63": "dae9ff", "523a29": "3e0b03", "8c634a": "78230b", - "cecece": "cecece", - "ffffff": "ffffff", - "b58c63": "b05329", - "636363": "636363" + "b58c63": "b05329" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/147.json b/public/images/pokemon/variant/147.json index acc6eb7909e..83715497ae9 100644 --- a/public/images/pokemon/variant/147.json +++ b/public/images/pokemon/variant/147.json @@ -3,7 +3,6 @@ "9c948c": "79a2a3", "ffffff": "def1ef", "5a5a5a": "54787d", - "000000": "000000", "ded6de": "a2c7c7", "5a63bd": "b24729", "293184": "a82d17", @@ -15,7 +14,6 @@ "9c948c": "c2a7a3", "ffffff": "fff5f0", "5a5a5a": "8c7270", - "000000": "000000", "ded6de": "dfc8c2", "5a63bd": "1b5f6f", "293184": "134557", diff --git a/public/images/pokemon/variant/148.json b/public/images/pokemon/variant/148.json index b05769f1f8f..abb514c0adf 100644 --- a/public/images/pokemon/variant/148.json +++ b/public/images/pokemon/variant/148.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "a59ca5": "79a2a3", "ffffff": "def1ef", "5a525a": "54787d", @@ -16,7 +15,6 @@ "425aff": "359bbd" }, "2": { - "000000": "000000", "a59ca5": "c29490", "ffffff": "ffedde", "5a525a": "895e5c", diff --git a/public/images/pokemon/variant/149.json b/public/images/pokemon/variant/149.json index aade1494b1f..e7c2222f75f 100644 --- a/public/images/pokemon/variant/149.json +++ b/public/images/pokemon/variant/149.json @@ -3,34 +3,26 @@ "5a3a21": "102908", "ffefbd": "def1ef", "ef9c3a": "e9917b", - "000000": "000000", "de733a": "d15b67", "efbd8c": "a2c7c7", "9c5a4a": "5a394e", "f7bd5a": "f8b58f", - "cecece": "cecece", - "ffffff": "ffffff", "196b63": "359bbd", "21a57b": "61cce2", "104231": "1b6794", - "ad8c42": "79a2a3", - "636363": "636363" + "ad8c42": "79a2a3" }, "2": { "5a3a21": "102908", "ffefbd": "f8dfce", "ef9c3a": "55a39f", - "000000": "000000", "de733a": "2d636d", "efbd8c": "c0a59d", "9c5a4a": "895e5c", "f7bd5a": "8ed9c4", - "cecece": "cecece", - "ffffff": "ffffff", "196b63": "a44a91", "21a57b": "f86ebf", "104231": "9c4a94", - "ad8c42": "ad7e7a", - "636363": "636363" + "ad8c42": "ad7e7a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/150-mega-x.json b/public/images/pokemon/variant/150-mega-x.json index b25e997cab9..9d645e5895d 100644 --- a/public/images/pokemon/variant/150-mega-x.json +++ b/public/images/pokemon/variant/150-mega-x.json @@ -5,11 +5,9 @@ "b4acc5": "db8aaf", "ded5e6": "ffb5d6", "eee6ee": "ffd6ef", - "101010": "101010", "6a319c": "196b5b", "9441bd": "4bac9a", "2b68b3": "4bac9a", - "fdfdfd": "fdfdfd", "b44aee": "c4fff4", "57acdf": "89cabe", "392052": "105144" @@ -20,11 +18,9 @@ "b4acc5": "edaf5b", "ded5e6": "ffdd98", "eee6ee": "ffeeb6", - "101010": "101010", "6a319c": "6b2619", "9441bd": "ac4f4b", "2b68b3": "da2e29", - "fdfdfd": "fdfdfd", "b44aee": "ffffff", "57acdf": "ea5f5b", "392052": "531b10" diff --git a/public/images/pokemon/variant/150-mega-y.json b/public/images/pokemon/variant/150-mega-y.json index 0a13977e42d..cc0aa0c43e8 100644 --- a/public/images/pokemon/variant/150-mega-y.json +++ b/public/images/pokemon/variant/150-mega-y.json @@ -7,9 +7,7 @@ "393952": "5a2952", "6a319c": "196b5b", "9441bd": "4bac9a", - "fdfdfd": "fdfdfd", "c83535": "4bac9a", - "101010": "101010", "ea5f5b": "89cabe", "392052": "12493f", "b44aee": "c4fff4" @@ -22,10 +20,7 @@ "393952": "884c17", "6a319c": "6b2619", "9441bd": "ac4f4b", - "fdfdfd": "fdfdfd", "c83535": "da2e29", - "101010": "101010", - "ea5f5b": "ea5f5b", "392052": "491b12", "b44aee": "ffffff" } diff --git a/public/images/pokemon/variant/150.json b/public/images/pokemon/variant/150.json index 7f64d98f731..69e437fe113 100644 --- a/public/images/pokemon/variant/150.json +++ b/public/images/pokemon/variant/150.json @@ -6,10 +6,8 @@ "3a3a52": "5a2952", "6b319c": "196b5b", "9442bd": "4bac9a", - "000000": "000000", "efe6ef": "ffd6ef", "3a2152": "12493f", - "ffffff": "ffffff", "b54aef": "c4fff4" }, "2": { @@ -19,10 +17,8 @@ "3a3a52": "884c17", "6b319c": "6b2619", "9442bd": "ac4f4b", - "000000": "000000", "efe6ef": "ffeeb6", "3a2152": "491b12", - "ffffff": "ffffff", "b54aef": "ffffff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/151.json b/public/images/pokemon/variant/151.json index 5506cdbc7c9..aed8f4c467f 100644 --- a/public/images/pokemon/variant/151.json +++ b/public/images/pokemon/variant/151.json @@ -3,11 +3,8 @@ "b56394": "895ac3", "5a2952": "5c2da1", "ffb5d6": "d3b8e8", - "000000": "000000", "ef84b5": "ab87cf", "ffd6ef": "eed7fa", - "cecece": "cecece", - "ffffff": "ffffff", "193a6b": "ca241d", "2963e6": "e85040", "84adf7": "ff9180" @@ -16,11 +13,8 @@ "b56394": "d68f40", "5a2952": "884c17", "ffb5d6": "ffdd98", - "000000": "000000", "ef84b5": "edaf5b", "ffd6ef": "ffeeb6", - "cecece": "cecece", - "ffffff": "ffffff", "193a6b": "067576", "2963e6": "11948c", "84adf7": "74f5e3" diff --git a/public/images/pokemon/variant/161.json b/public/images/pokemon/variant/161.json index 3c8b46ed63f..b8e51656235 100644 --- a/public/images/pokemon/variant/161.json +++ b/public/images/pokemon/variant/161.json @@ -3,15 +3,12 @@ "4a3121": "252054", "634231": "46387d", "3a0800": "15143c", - "101010": "101010", "b52142": "921a4b", "de424a": "a44362", "8c5a42": "744e9b", "cea584": "eec1ff", "bd845a": "cc95eb", "a5734a": "a374c7", - "ffffff": "ffffff", - "3a1910": "161443", - "cecec5": "cecec5" + "3a1910": "161443" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/162.json b/public/images/pokemon/variant/162.json index 635da722c22..24794d4cb47 100644 --- a/public/images/pokemon/variant/162.json +++ b/public/images/pokemon/variant/162.json @@ -3,28 +3,23 @@ "522921": "151c34", "e6c54a": "988fc7", "7b423a": "2d2766", - "212129": "212129", "9c634a": "46387d", "c59c42": "7266a2", "ffef94": "b7abde", "ad8429": "716aa8", "ffffc5": "d3c8ec", - "ffffff": "ffffff", "737373": "3a8591", - "9c0000": "9c1f00", - "ff9463": "ff9463" + "9c0000": "9c1f00" }, "2": { "522921": "222f3c", "e6c54a": "b4d1dc", "7b423a": "56697a", - "212129": "212129", "9c634a": "7a8e9b", "c59c42": "8aaabb", "ffef94": "daeff5", "ad8429": "67748a", "ffffc5": "f9feff", - "ffffff": "ffffff", "737373": "cc3b46", "9c0000": "00379c", "ff9463": "1e78c6" diff --git a/public/images/pokemon/variant/163.json b/public/images/pokemon/variant/163.json index dc7b7424543..9ac5eef1aad 100644 --- a/public/images/pokemon/variant/163.json +++ b/public/images/pokemon/variant/163.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "424242": "462f68", "734a19": "4d438b", "523100": "25245c", @@ -12,12 +11,9 @@ "bd5a29": "663e5f", "efad94": "87627e", "ffe6c5": "cdd9ee", - "debd9c": "a3b0d2", - "ffffff": "ffffff", - "7b7b7b": "7b7b7b" + "debd9c": "a3b0d2" }, "2": { - "101010": "101010", "424242": "232d44", "734a19": "435170", "523100": "1f2a4e", @@ -29,8 +25,6 @@ "bd5a29": "36282b", "efad94": "4f4143", "ffe6c5": "e3e9eb", - "debd9c": "ccd4d9", - "ffffff": "ffffff", - "7b7b7b": "7b7b7b" + "debd9c": "ccd4d9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/169.json b/public/images/pokemon/variant/169.json index 751102ef4a0..2d32d0c0610 100644 --- a/public/images/pokemon/variant/169.json +++ b/public/images/pokemon/variant/169.json @@ -3,30 +3,21 @@ "7b4a9c": "2f2a5f", "63197b": "14093b", "a55ace": "3d4381", - "101010": "101010", "b57bce": "666fb4", "08426b": "b06130", "ce0021": "1200b5", "ffd600": "20e0ff", "d69400": "099ac3", - "216b94": "ffb049", - "ffffff": "ffffff", - "a5a5a5": "a5a5a5", - "6b6b6b": "6b6b6b" + "216b94": "ffb049" }, "2": { "7b4a9c": "80607b", "63197b": "3c1e39", "a55ace": "b49db2", - "101010": "101010", "b57bce": "c8b6c2", "08426b": "901606", - "ce0021": "ce0021", "ffd600": "ffa028", "d69400": "ff7b00", - "216b94": "b52c0c", - "ffffff": "ffffff", - "a5a5a5": "a5a5a5", - "6b6b6b": "6b6b6b" + "216b94": "b52c0c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/173.json b/public/images/pokemon/variant/173.json index 8f6346693a1..b0a2e6b6422 100644 --- a/public/images/pokemon/variant/173.json +++ b/public/images/pokemon/variant/173.json @@ -4,12 +4,10 @@ "632119": "3d2e66", "ffc5ad": "c19fe3", "ffa594": "9579c9", - "101010": "101010", "523100": "44004a", "de7b6b": "7c52ba", "6b4a31": "494299", "c58c29": "5ca3bf", - "a56b00": "647cb3", - "ffffff": "ffffff" + "a56b00": "647cb3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/175.json b/public/images/pokemon/variant/175.json index 0d99c606a43..c56b1593eda 100644 --- a/public/images/pokemon/variant/175.json +++ b/public/images/pokemon/variant/175.json @@ -1,13 +1,11 @@ { "0": { "94735a": "844466", - "000000": "000000", "f7efc5": "f7c9c5", "ce9c73": "a7738f", "734a4a": "5b2847", "f7d6a5": "e4b2bb", "b5b5c5": "c5b5b5", - "ffffff": "ffffff", "ad2121": "811a5f", "d6dede": "ded6d6", "c54242": "409e80", @@ -18,7 +16,6 @@ }, "1": { "94735a": "734350", - "000000": "000000", "f7efc5": "f7c5ce", "ce9c73": "a26867", "734a4a": "452030", @@ -35,7 +32,6 @@ }, "2": { "94735a": "404d5b", - "000000": "000000", "f7efc5": "ddeaef", "ce9c73": "8093a5", "734a4a": "1f293b", diff --git a/public/images/pokemon/variant/176.json b/public/images/pokemon/variant/176.json index 612920b2e34..740a71a7396 100644 --- a/public/images/pokemon/variant/176.json +++ b/public/images/pokemon/variant/176.json @@ -1,7 +1,6 @@ { "0": { "737b84": "6b3552", - "000000": "000000", "ffffff": "eee0db", "adc5bd": "ceacac", "d6efef": "dbc9c5", @@ -12,7 +11,6 @@ }, "1": { "737b84": "734350", - "000000": "000000", "ffffff": "f3cbcb", "adc5bd": "ae7675", "d6efef": "c79397", @@ -23,7 +21,6 @@ }, "2": { "737b84": "384d72", - "000000": "000000", "ffffff": "c1dfe9", "adc5bd": "81aaca", "d6efef": "91b6cf", diff --git a/public/images/pokemon/variant/177.json b/public/images/pokemon/variant/177.json index f1736061523..412ee5f3228 100644 --- a/public/images/pokemon/variant/177.json +++ b/public/images/pokemon/variant/177.json @@ -3,30 +3,24 @@ "842900": "001d3f", "ff424a": "4b798a", "d63131": "174d69", - "292929": "292929", "296b29": "b36848", "73bd42": "ffbe79", "94d642": "ffe88e", "4a9442": "d1915e", - "ffffff": "ffffff", "846321": "356f6d", "d6ad29": "4ca690", - "ffde29": "8ddcaf", - "cecece": "cecece" + "ffde29": "8ddcaf" }, "2": { "842900": "3b060c", "ff424a": "9a3841", "d63131": "662340", - "292929": "292929", "296b29": "224181", "73bd42": "62a1e8", "94d642": "82d4fc", "4a9442": "4973c7", - "ffffff": "ffffff", "846321": "382c78", "d6ad29": "554196", - "ffde29": "8767bf", - "cecece": "cecece" + "ffde29": "8767bf" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/179.json b/public/images/pokemon/variant/179.json index 0d1f5d32faf..79c50f2af23 100644 --- a/public/images/pokemon/variant/179.json +++ b/public/images/pokemon/variant/179.json @@ -6,8 +6,6 @@ "e6cea5": "deccb2", "e6ad00": "eaa60f", "ffde00": "ffe85a", - "ffffff": "ffffff", - "101010": "101010", "525252": "392229", "a5a5a5": "4f3a3d", "004a94": "461e1b", @@ -23,8 +21,6 @@ "e6cea5": "352b53", "e6ad00": "c33486", "ffde00": "ee74c1", - "ffffff": "ffffff", - "101010": "101010", "525252": "221b1f", "a5a5a5": "2d282a", "004a94": "42579d", diff --git a/public/images/pokemon/variant/181-mega.json b/public/images/pokemon/variant/181-mega.json index b8976b8cd03..571cc3a7650 100644 --- a/public/images/pokemon/variant/181-mega.json +++ b/public/images/pokemon/variant/181-mega.json @@ -2,7 +2,6 @@ "1": { "737373": "58341f", "f8f8f8": "ffe8b2", - "101010": "101010", "bf370a": "e28f09", "bfbfbf": "e5c079", "ff490d": "ffe85a", @@ -15,7 +14,6 @@ "2": { "737373": "5d412a", "f8f8f8": "fff1d0", - "101010": "101010", "bf370a": "d26b00", "bfbfbf": "ebbb78", "ff490d": "ffab34", diff --git a/public/images/pokemon/variant/181.json b/public/images/pokemon/variant/181.json index c898dfb6d7a..5b1f92cdefc 100644 --- a/public/images/pokemon/variant/181.json +++ b/public/images/pokemon/variant/181.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "636b6b": "4a1e19", "ffc510": "9f5834", "845a31": "492602", @@ -15,7 +14,6 @@ "e6e6e6": "e6c285" }, "2": { - "101010": "101010", "636b6b": "3e2752", "ffc510": "6189db", "845a31": "1c2a6d", diff --git a/public/images/pokemon/variant/182.json b/public/images/pokemon/variant/182.json index 11f04f60f96..da8f5b2a6b2 100644 --- a/public/images/pokemon/variant/182.json +++ b/public/images/pokemon/variant/182.json @@ -4,13 +4,11 @@ "f76b00": "79f6d5", "840000": "338497", "e6d66b": "5c51b9", - "101010": "101010", "b5a53a": "3a2c7d", "847319": "231c5a", "73ad31": "a2d281", "9cd64a": "d8ecb1", "526329": "659251", - "ffffff": "ffffff", "3a9400": "6370b3", "105210": "373c8b", "52ce31": "90a4d7" @@ -20,13 +18,11 @@ "f76b00": "eaed6e", "840000": "a7801f", "e6d66b": "eb4f50", - "101010": "101010", "b5a53a": "ca3442", "847319": "a21b36", "73ad31": "804428", "9cd64a": "b68356", "526329": "592819", - "ffffff": "ffffff", "3a9400": "b8462a", "105210": "901a17", "52ce31": "e87940" diff --git a/public/images/pokemon/variant/183.json b/public/images/pokemon/variant/183.json index 9fa6031e129..a3b79858fee 100644 --- a/public/images/pokemon/variant/183.json +++ b/public/images/pokemon/variant/183.json @@ -8,7 +8,6 @@ "941010": "7b3cd6", "bd2931": "778dd1", "de4252": "9fcae2", - "ffffff": "ffffff", "101010": "32392e", "b5d6ff": "ffd9f3", "636363": "7c6a7d", diff --git a/public/images/pokemon/variant/185.json b/public/images/pokemon/variant/185.json index 9935620d320..1b7c8ba77fa 100644 --- a/public/images/pokemon/variant/185.json +++ b/public/images/pokemon/variant/185.json @@ -3,7 +3,6 @@ "635a4a": "322a22", "c5a54a": "7b7670", "ad845a": "5d564e", - "101010": "101010", "315a19": "3d1e0c", "4ac542": "8a6a24", "5a8c5a": "6c4616", @@ -17,7 +16,6 @@ "635a4a": "2d2164", "c5a54a": "5c80c0", "ad845a": "4058a8", - "101010": "101010", "315a19": "cf985e", "4ac542": "efe1b2", "5a8c5a": "e0c282", diff --git a/public/images/pokemon/variant/19.json b/public/images/pokemon/variant/19.json index 3347f6b9529..1e32b660c54 100644 --- a/public/images/pokemon/variant/19.json +++ b/public/images/pokemon/variant/19.json @@ -4,33 +4,25 @@ "8c4a8c": "4e5e7e", "d69cd6": "88a0b1", "4a2942": "262f4f", - "101010": "101010", "a57308": "a17c7d", "e6ce73": "b79897", "634a08": "765358", "efdeb5": "e8cec9", "a5193a": "2d945e", - "cecece": "cecece", - "ffffff": "ffffff", "e65a73": "61d8c1", - "cead63": "c4a3a1", - "5a5a5a": "5a5a5a" + "cead63": "c4a3a1" }, "2": { "b573bd": "efdcd1", "8c4a8c": "d6b2a6", "d69cd6": "fff5eb", "4a2942": "865c54", - "101010": "101010", "a57308": "ba476f", "e6ce73": "c6667d", "634a08": "7e3754", "efdeb5": "efb5c0", "a5193a": "a91507", - "cecece": "cecece", - "ffffff": "ffffff", "e65a73": "d85926", - "cead63": "d98a9f", - "5a5a5a": "5a5a5a" + "cead63": "d98a9f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/190.json b/public/images/pokemon/variant/190.json index 3a8e737b470..911d18e7347 100644 --- a/public/images/pokemon/variant/190.json +++ b/public/images/pokemon/variant/190.json @@ -2,27 +2,21 @@ "1": { "8442ad": "ad452f", "bd7bde": "dea95a", - "000000": "000000", "52216b": "701523", "a55ac5": "c47440", "8c6b42": "8c7457", "bd8c63": "bd9a7e", "c5ad6b": "c4b487", - "ffdea5": "ffeccc", - "ffffff": "ffffff", - "adada5": "adada5" + "ffdea5": "ffeccc" }, "2": { "8442ad": "a6a297", "bd7bde": "e5dfdf", - "000000": "000000", "52216b": "807870", "a55ac5": "bfbeb4", "8c6b42": "632339", "bd8c63": "802d44", "c5ad6b": "99455d", - "ffdea5": "ed8286", - "ffffff": "ffffff", - "adada5": "adada5" + "ffdea5": "ed8286" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/193.json b/public/images/pokemon/variant/193.json index 90199bf510b..aef5305e261 100644 --- a/public/images/pokemon/variant/193.json +++ b/public/images/pokemon/variant/193.json @@ -2,7 +2,6 @@ "1": { "632900": "a13a80", "f75a52": "fc95c5", - "101010": "101010", "ad3119": "e069b1", "94adbd": "c9859d", "e6ffff": "f0afbc", @@ -19,7 +18,6 @@ "2": { "632900": "913919", "f75a52": "eba64d", - "101010": "101010", "ad3119": "cf6838", "94adbd": "81a690", "e6ffff": "f3ffe6", diff --git a/public/images/pokemon/variant/196.json b/public/images/pokemon/variant/196.json index ce41a030de1..cbff9a81321 100644 --- a/public/images/pokemon/variant/196.json +++ b/public/images/pokemon/variant/196.json @@ -1,44 +1,38 @@ { "0": { "7b4a7b": "204024", - "101010": "101010", "efbdef": "bddd9e", "e7a5d6": "6c9e63", "b57bb5": "416240", "314273": "a86a2c", "4a73b5": "ffb554", "c62152": "ffa80e", - "ffffff": "ffffff", "8c2152": "c54200", "8463b5": "ffa72a", "c6c6c6": "c5c5c5" }, "1": { "7b4a7b": "581747", - "101010": "101010", "efbdef": "e99eae", "e7a5d6": "d1759c", "b57bb5": "953b6c", "314273": "537fde", "4a73b5": "90b7f9", "c62152": "31d9ff", - "ffffff": "ffffff", "8c2152": "15a7d2", "8463b5": "1662bf", "c6c6c6": "c5c5c5" }, "2": { "7b4a7b": "9b5250", - "101010": "101010", "efbdef": "f5f3e1", "e7a5d6": "ded0af", "b57bb5": "ce987a", "314273": "194540", "4a73b5": "39816d", "c62152": "00de92", - "ffffff": "ffffff", "8c2152": "00ad7f", "8463b5": "006b5b", "c6c6c6": "c5c5c5" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/197.json b/public/images/pokemon/variant/197.json index 87cee244bd7..cbeb67fdf45 100644 --- a/public/images/pokemon/variant/197.json +++ b/public/images/pokemon/variant/197.json @@ -2,19 +2,16 @@ "1": { "29314a": "3a2534", "63637b": "896c75", - "101010": "101010", "424252": "553849", "525200": "9b0f33", "efd652": "ff5153", "b59429": "c72343", "6b2110": "e37e22", - "ffefde": "ffefde", "ad424a": "ffbb49" }, "2": { "29314a": "9f8981", "63637b": "eddbcf", - "101010": "101010", "424252": "d3bcb1", "525200": "974623", "efd652": "e7af5d", diff --git a/public/images/pokemon/variant/199.json b/public/images/pokemon/variant/199.json index 22e345030c0..f0ee6325d3f 100644 --- a/public/images/pokemon/variant/199.json +++ b/public/images/pokemon/variant/199.json @@ -1,15 +1,12 @@ { "1": { - "101010": "101010", "63636b": "734927", "d6d6d6": "f1d191", "ada5a5": "bf9562", "b52919": "2b191b", - "ffffff": "ffffff", "ef736b": "5b3332", "ce5252": "4c2523", "ff9c94": "885345", - "d1cdc9": "d1cdc9", "ad6310": "a25a53", "deb531": "b97565", "ffff8c": "e0b69d", @@ -18,16 +15,13 @@ "ff5a4a": "93de76" }, "2": { - "101010": "101010", "63636b": "192b32", "d6d6d6": "4c7668", "ada5a5": "2b4a48", "b52919": "893d28", - "ffffff": "ffffff", "ef736b": "de9048", "ce5252": "b0613c", "ff9c94": "edbc69", - "d1cdc9": "d1cdc9", "ad6310": "a12d18", "deb531": "ba5127", "ffff8c": "d16d36", diff --git a/public/images/pokemon/variant/2.json b/public/images/pokemon/variant/2.json index 69bf62863f8..687263c7683 100644 --- a/public/images/pokemon/variant/2.json +++ b/public/images/pokemon/variant/2.json @@ -4,7 +4,6 @@ "d6425a": "2e6902", "ffada5": "c5d95f", "ff7b7b": "88b043", - "101010": "101010", "104a3a": "022e59", "7bd673": "bef0fa", "317b52": "446b94", @@ -12,7 +11,6 @@ "10424a": "733502", "84e6d6": "ffbb45", "5acebd": "faa405", - "219484": "c76102", - "ffffff": "ffffff" + "219484": "c76102" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/20.json b/public/images/pokemon/variant/20.json index dbc0e0afaee..b3ffae21dd6 100644 --- a/public/images/pokemon/variant/20.json +++ b/public/images/pokemon/variant/20.json @@ -7,7 +7,6 @@ "deb54a": "635653", "c5943a": "4a3331", "6b3a00": "261518", - "101010": "101010", "ffffff": "fff2e4", "f7f7a5": "d2b2ad", "845a29": "48272e", @@ -24,7 +23,6 @@ "deb54a": "fff8ef", "c5943a": "e2cbb9", "6b3a00": "7f645c", - "101010": "101010", "ffffff": "fffaf4", "f7f7a5": "ba5e68", "845a29": "34171d", diff --git a/public/images/pokemon/variant/200.json b/public/images/pokemon/variant/200.json index 75ec1831f2e..6a12b2b75a4 100644 --- a/public/images/pokemon/variant/200.json +++ b/public/images/pokemon/variant/200.json @@ -1,7 +1,6 @@ { "0": { "631942": "71370f", - "101010": "101010", "de63a5": "f6b557", "9c3a4a": "c7722c", "4a84a5": "8366ab", @@ -10,14 +9,12 @@ "3a6384": "603f90", "bd9431": "c08ecb", "a5295a": "d3941a", - "ffffff": "ffffff", "efe663": "e5c9e9", "de4284": "ffdd67", "731031": "9b490e" }, "1": { "631942": "00535b", - "101010": "101010", "de63a5": "099394", "9c3a4a": "42c3bc", "4a84a5": "c7d8e1", @@ -26,14 +23,12 @@ "3a6384": "4a6077", "bd9431": "149c9d", "a5295a": "c87819", - "ffffff": "ffffff", "efe663": "55e6de", "de4284": "ffc668", "731031": "7b3c08" }, "2": { "631942": "5d4a2f", - "101010": "101010", "de63a5": "fff7dd", "9c3a4a": "fae3ad", "4a84a5": "fecb77", @@ -42,7 +37,6 @@ "3a6384": "e1983d", "bd9431": "66d0e5", "a5295a": "7a1511", - "ffffff": "ffffff", "efe663": "a6f0f8", "de4284": "b83a31", "731031": "430a09" diff --git a/public/images/pokemon/variant/201-a.json b/public/images/pokemon/variant/201-a.json index 93929b1d6ff..46efa61cc3f 100644 --- a/public/images/pokemon/variant/201-a.json +++ b/public/images/pokemon/variant/201-a.json @@ -4,8 +4,7 @@ "dedede": "ffe1bd", "a5a5a5": "ffad4b", "101010": "201100", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "905438", diff --git a/public/images/pokemon/variant/201-b.json b/public/images/pokemon/variant/201-b.json index b3aa945a57d..1b9497bdab4 100644 --- a/public/images/pokemon/variant/201-b.json +++ b/public/images/pokemon/variant/201-b.json @@ -4,8 +4,7 @@ "525252": "a45900", "737373": "e67d00", "dedede": "ffe1bd", - "a5a5a5": "ffad4b", - "ffffff": "ffffff" + "a5a5a5": "ffad4b" }, "2": { "101010": "411600", diff --git a/public/images/pokemon/variant/201-c.json b/public/images/pokemon/variant/201-c.json index 237244aa2d7..663065c07ec 100644 --- a/public/images/pokemon/variant/201-c.json +++ b/public/images/pokemon/variant/201-c.json @@ -4,8 +4,7 @@ "101010": "201100", "737373": "e67d00", "a5a5a5": "ffad4b", - "dedede": "ffe1bd", - "ffffff": "ffffff" + "dedede": "ffe1bd" }, "2": { "525252": "6f090c", diff --git a/public/images/pokemon/variant/201-d.json b/public/images/pokemon/variant/201-d.json index e51f09a105f..5470f3ed693 100644 --- a/public/images/pokemon/variant/201-d.json +++ b/public/images/pokemon/variant/201-d.json @@ -4,15 +4,13 @@ "101010": "201100", "737373": "e67d00", "dedede": "ffe1bd", - "a5a5a5": "ffad4b", - "ffffff": "ffffff" + "a5a5a5": "ffad4b" }, "2": { "525252": "6498c2", "101010": "041b3f", "737373": "c4edf1", "dedede": "ffffff", - "a5a5a5": "f2ffff", - "ffffff": "ffffff" + "a5a5a5": "f2ffff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/201-e.json b/public/images/pokemon/variant/201-e.json index 1a057eb1e3c..6a17a8d1814 100644 --- a/public/images/pokemon/variant/201-e.json +++ b/public/images/pokemon/variant/201-e.json @@ -4,8 +4,7 @@ "525252": "a45900", "737373": "e67d00", "dedede": "ffe1bd", - "a5a5a5": "ffad4b", - "ffffff": "ffffff" + "a5a5a5": "ffad4b" }, "2": { "101010": "002618", diff --git a/public/images/pokemon/variant/201-exclamation.json b/public/images/pokemon/variant/201-exclamation.json index 718b96facd1..58fdaf1c7ad 100644 --- a/public/images/pokemon/variant/201-exclamation.json +++ b/public/images/pokemon/variant/201-exclamation.json @@ -4,8 +4,7 @@ "101010": "201100", "a5a5a5": "ffad4b", "737373": "e67d00", - "dedede": "ffe1bd", - "ffffff": "ffffff" + "dedede": "ffe1bd" }, "2": { "525252": "a1122b", diff --git a/public/images/pokemon/variant/201-f.json b/public/images/pokemon/variant/201-f.json index a7d7e053ac1..d7d29982076 100644 --- a/public/images/pokemon/variant/201-f.json +++ b/public/images/pokemon/variant/201-f.json @@ -4,8 +4,7 @@ "101010": "201100", "737373": "e67d00", "dedede": "ffe1bd", - "a5a5a5": "ffad4b", - "ffffff": "ffffff" + "a5a5a5": "ffad4b" }, "2": { "525252": "b34394", diff --git a/public/images/pokemon/variant/201-g.json b/public/images/pokemon/variant/201-g.json index d92920facd2..083df9b4cce 100644 --- a/public/images/pokemon/variant/201-g.json +++ b/public/images/pokemon/variant/201-g.json @@ -4,8 +4,7 @@ "525252": "a45900", "737373": "e67d00", "a5a5a5": "ffad4b", - "dedede": "ffe1bd", - "ffffff": "ffffff" + "dedede": "ffe1bd" }, "2": { "101010": "471100", diff --git a/public/images/pokemon/variant/201-h.json b/public/images/pokemon/variant/201-h.json index 476a6560eb2..468b13b50f5 100644 --- a/public/images/pokemon/variant/201-h.json +++ b/public/images/pokemon/variant/201-h.json @@ -4,8 +4,7 @@ "101010": "201100", "737373": "e67d00", "a5a5a5": "ffad4b", - "dedede": "ffe1bd", - "ffffff": "ffffff" + "dedede": "ffe1bd" }, "2": { "525252": "aa1731", diff --git a/public/images/pokemon/variant/201-i.json b/public/images/pokemon/variant/201-i.json index e9caaa30132..3785c7096f5 100644 --- a/public/images/pokemon/variant/201-i.json +++ b/public/images/pokemon/variant/201-i.json @@ -4,8 +4,7 @@ "dedede": "ffe1bd", "a5a5a5": "ffad4b", "101010": "201100", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "483a74", diff --git a/public/images/pokemon/variant/201-j.json b/public/images/pokemon/variant/201-j.json index 0d0812ce955..0396693c527 100644 --- a/public/images/pokemon/variant/201-j.json +++ b/public/images/pokemon/variant/201-j.json @@ -4,15 +4,13 @@ "525252": "a45900", "a5a5a5": "ffad4b", "737373": "e67d00", - "dedede": "ffe1bd", - "ffffff": "ffffff" + "dedede": "ffe1bd" }, "2": { "101010": "392b32", "525252": "ac8e97", "a5a5a5": "eee3e5", "737373": "d6c8cb", - "dedede": "fff7f8", - "ffffff": "ffffff" + "dedede": "fff7f8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/201-k.json b/public/images/pokemon/variant/201-k.json index b2e1fbc6aaf..e84d26f8ce4 100644 --- a/public/images/pokemon/variant/201-k.json +++ b/public/images/pokemon/variant/201-k.json @@ -4,8 +4,7 @@ "a5a5a5": "ffad4b", "101010": "201100", "dedede": "ffe1bd", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "6eab2c", diff --git a/public/images/pokemon/variant/201-l.json b/public/images/pokemon/variant/201-l.json index 9cd531b948c..e88727eabcd 100644 --- a/public/images/pokemon/variant/201-l.json +++ b/public/images/pokemon/variant/201-l.json @@ -4,15 +4,13 @@ "101010": "201100", "dedede": "ffe1bd", "a5a5a5": "ffad4b", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "bb8e77", "101010": "290808", "dedede": "fff4e5", "a5a5a5": "f3ddc5", - "737373": "e2bea2", - "ffffff": "ffffff" + "737373": "e2bea2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/201-m.json b/public/images/pokemon/variant/201-m.json index fcebfe7b6bc..e3e691eb2b5 100644 --- a/public/images/pokemon/variant/201-m.json +++ b/public/images/pokemon/variant/201-m.json @@ -4,8 +4,7 @@ "101010": "201100", "737373": "e67d00", "dedede": "ffe1bd", - "a5a5a5": "ffad4b", - "ffffff": "ffffff" + "a5a5a5": "ffad4b" }, "2": { "525252": "1a917f", diff --git a/public/images/pokemon/variant/201-n.json b/public/images/pokemon/variant/201-n.json index 1d27cb75039..28d88a5b131 100644 --- a/public/images/pokemon/variant/201-n.json +++ b/public/images/pokemon/variant/201-n.json @@ -4,8 +4,7 @@ "a5a5a5": "ffad4b", "101010": "201100", "dedede": "ffe1bd", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "351e67", diff --git a/public/images/pokemon/variant/201-o.json b/public/images/pokemon/variant/201-o.json index 4257ccecc03..bfe33dd1c16 100644 --- a/public/images/pokemon/variant/201-o.json +++ b/public/images/pokemon/variant/201-o.json @@ -4,8 +4,7 @@ "525252": "a45900", "737373": "e67d00", "a5a5a5": "ffad4b", - "dedede": "ffe1bd", - "ffffff": "ffffff" + "dedede": "ffe1bd" }, "2": { "101010": "000000", diff --git a/public/images/pokemon/variant/201-p.json b/public/images/pokemon/variant/201-p.json index 7932df09f12..7da0cd744bc 100644 --- a/public/images/pokemon/variant/201-p.json +++ b/public/images/pokemon/variant/201-p.json @@ -4,8 +4,7 @@ "101010": "201100", "dedede": "ffe1bd", "a5a5a5": "ffad4b", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "ad540f", diff --git a/public/images/pokemon/variant/201-q.json b/public/images/pokemon/variant/201-q.json index 8283eabfdcf..241daf37027 100644 --- a/public/images/pokemon/variant/201-q.json +++ b/public/images/pokemon/variant/201-q.json @@ -4,8 +4,7 @@ "737373": "e67d00", "101010": "201100", "dedede": "ffe1bd", - "a5a5a5": "ffad4b", - "ffffff": "ffffff" + "a5a5a5": "ffad4b" }, "2": { "525252": "bd8f26", diff --git a/public/images/pokemon/variant/201-question.json b/public/images/pokemon/variant/201-question.json index 919cc7676a2..f7109a6e579 100644 --- a/public/images/pokemon/variant/201-question.json +++ b/public/images/pokemon/variant/201-question.json @@ -4,8 +4,7 @@ "dedede": "ffe1bd", "a5a5a5": "ffad4b", "737373": "e67d00", - "525252": "a45900", - "ffffff": "ffffff" + "525252": "a45900" }, "2": { "101010": "000020", diff --git a/public/images/pokemon/variant/201-r.json b/public/images/pokemon/variant/201-r.json index 176f97fec1a..8b425529d01 100644 --- a/public/images/pokemon/variant/201-r.json +++ b/public/images/pokemon/variant/201-r.json @@ -4,8 +4,7 @@ "101010": "201100", "737373": "e67d00", "dedede": "ffe1bd", - "a5a5a5": "ffad4b", - "ffffff": "ffffff" + "a5a5a5": "ffad4b" }, "2": { "525252": "44251f", diff --git a/public/images/pokemon/variant/201-s.json b/public/images/pokemon/variant/201-s.json index 3cf0d17b4bb..6b55531bf5b 100644 --- a/public/images/pokemon/variant/201-s.json +++ b/public/images/pokemon/variant/201-s.json @@ -4,8 +4,7 @@ "dedede": "ffe1bd", "a5a5a5": "ffad4b", "101010": "201100", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "266526", diff --git a/public/images/pokemon/variant/201-t.json b/public/images/pokemon/variant/201-t.json index 95239e5731b..040a1f84451 100644 --- a/public/images/pokemon/variant/201-t.json +++ b/public/images/pokemon/variant/201-t.json @@ -4,8 +4,7 @@ "737373": "e67d00", "525252": "a45900", "a5a5a5": "ffad4b", - "dedede": "ffe1bd", - "ffffff": "ffffff" + "dedede": "ffe1bd" }, "2": { "101010": "22003c", diff --git a/public/images/pokemon/variant/201-u.json b/public/images/pokemon/variant/201-u.json index f52b6d86827..95b8a0fa4bd 100644 --- a/public/images/pokemon/variant/201-u.json +++ b/public/images/pokemon/variant/201-u.json @@ -4,8 +4,7 @@ "a5a5a5": "ffad4b", "737373": "e67d00", "101010": "201100", - "dedede": "ffe1bd", - "ffffff": "ffffff" + "dedede": "ffe1bd" }, "2": { "525252": "551b2c", diff --git a/public/images/pokemon/variant/201-v.json b/public/images/pokemon/variant/201-v.json index 0824e793d9c..6cc08547da1 100644 --- a/public/images/pokemon/variant/201-v.json +++ b/public/images/pokemon/variant/201-v.json @@ -4,8 +4,7 @@ "525252": "a45900", "737373": "e67d00", "dedede": "ffe1bd", - "a5a5a5": "ffad4b", - "ffffff": "ffffff" + "a5a5a5": "ffad4b" }, "2": { "101010": "371000", diff --git a/public/images/pokemon/variant/201-w.json b/public/images/pokemon/variant/201-w.json index 5515d25e5d5..bb310de7bed 100644 --- a/public/images/pokemon/variant/201-w.json +++ b/public/images/pokemon/variant/201-w.json @@ -4,8 +4,7 @@ "dedede": "ffe1bd", "a5a5a5": "ffad4b", "101010": "201100", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "9975bb", diff --git a/public/images/pokemon/variant/201-x.json b/public/images/pokemon/variant/201-x.json index 52d07cb0750..482724308e6 100644 --- a/public/images/pokemon/variant/201-x.json +++ b/public/images/pokemon/variant/201-x.json @@ -4,15 +4,13 @@ "101010": "201100", "dedede": "ffe1bd", "a5a5a5": "ffad4b", - "737373": "e67d00", - "ffffff": "ffffff" + "737373": "e67d00" }, "2": { "525252": "60a6b5", "101010": "001434", "dedede": "e9fff7", "a5a5a5": "cdf4ec", - "737373": "91e9e4", - "ffffff": "ffffff" + "737373": "91e9e4" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/201-y.json b/public/images/pokemon/variant/201-y.json index 744581d4b77..e092f989c53 100644 --- a/public/images/pokemon/variant/201-y.json +++ b/public/images/pokemon/variant/201-y.json @@ -4,8 +4,7 @@ "dedede": "ffe1bd", "a5a5a5": "ffad4b", "737373": "e67d00", - "101010": "201100", - "ffffff": "ffffff" + "101010": "201100" }, "2": { "525252": "d1762f", diff --git a/public/images/pokemon/variant/201-z.json b/public/images/pokemon/variant/201-z.json index 810a933dcfc..97b7a3ab5aa 100644 --- a/public/images/pokemon/variant/201-z.json +++ b/public/images/pokemon/variant/201-z.json @@ -4,8 +4,7 @@ "dedede": "ffe1bd", "a5a5a5": "ffad4b", "737373": "e67d00", - "101010": "201100", - "ffffff": "ffffff" + "101010": "201100" }, "2": { "525252": "21402e", diff --git a/public/images/pokemon/variant/2027.json b/public/images/pokemon/variant/2027.json index b479f8e2283..3560616640f 100644 --- a/public/images/pokemon/variant/2027.json +++ b/public/images/pokemon/variant/2027.json @@ -2,31 +2,25 @@ "1": { "518d9f": "a24c68", "354e73": "752e42", - "fefefe": "fefefe", "b6dbe7": "ffdac2", "84b3ce": "d27c80", - "101010": "101010", "10397b": "212d55", "897e67": "aaaa96", "297bcd": "3b5e82", "d1c592": "d3d3c6", "fefea9": "fffffc", - "ebe2b1": "e9e9e0", - "cfd3d8": "cfd3d8" + "ebe2b1": "e9e9e0" }, "2": { "518d9f": "6a439e", "354e73": "3d2c78", - "fefefe": "fefefe", "b6dbe7": "dbb1eb", "84b3ce": "a87bcf", - "101010": "101010", "10397b": "1d6268", "897e67": "2e163d", "297bcd": "3a9b8a", "d1c592": "44225a", "fefea9": "6f3480", - "ebe2b1": "552668", - "cfd3d8": "cfd3d8" + "ebe2b1": "552668" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/2028.json b/public/images/pokemon/variant/2028.json index 955b24576a2..3222a22072f 100644 --- a/public/images/pokemon/variant/2028.json +++ b/public/images/pokemon/variant/2028.json @@ -1,7 +1,6 @@ { "1": { "3c88b4": "966281", - "101010": "101010", "52b0cf": "e2877b", "f1f1f4": "fffffc", "b0e5f8": "fffed9", @@ -12,12 +11,10 @@ "b7e3e7": "ffb59e", "77a2bb": "d9746e", "606060": "6f525d", - "8b8b8b": "8b8b8b", "bdbdcd": "d0c0b6" }, "2": { "3c88b4": "515fa9", - "101010": "101010", "52b0cf": "57a5c5", "f1f1f4": "e3f0ff", "b0e5f8": "f8f5b0", @@ -28,7 +25,6 @@ "b7e3e7": "5f2e71", "77a2bb": "381d4d", "606060": "3a3a54", - "8b8b8b": "8b8b8b", "bdbdcd": "acb7d0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/203.json b/public/images/pokemon/variant/203.json index a4391436a20..10e0040644a 100644 --- a/public/images/pokemon/variant/203.json +++ b/public/images/pokemon/variant/203.json @@ -1,7 +1,6 @@ { "1": { "424a73": "351810", - "ffffff": "ffffff", "adb5d6": "8f6f66", "6b8cb5": "512b21", "4a3a3a": "231117", @@ -9,7 +8,6 @@ "9c7b42": "571522", "efde52": "9c3e3e", "9c3a5a": "ab9d75", - "101010": "101010", "ce6b94": "d8d1ad", "947b6b": "1f4062", "635252": "112246", @@ -18,7 +16,6 @@ }, "2": { "424a73": "27091d", - "ffffff": "ffffff", "adb5d6": "c5b0b7", "6b8cb5": "4a1b33", "4a3a3a": "091225", @@ -26,7 +23,6 @@ "9c7b42": "15545d", "efde52": "2a9d8f", "9c3a5a": "52ab5f", - "101010": "101010", "ce6b94": "a8e781", "947b6b": "1a2e43", "635252": "111d34", diff --git a/public/images/pokemon/variant/2052.json b/public/images/pokemon/variant/2052.json index adcd32d0470..a78ae48b8c2 100644 --- a/public/images/pokemon/variant/2052.json +++ b/public/images/pokemon/variant/2052.json @@ -1,32 +1,26 @@ { "1": { "45505f": "8c583b", - "101010": "101010", "91a3bf": "ffda5c", "262b3c": "41185e", "995433": "493473", "627986": "de974e", - "f3f3f3": "f3f3f3", "e3cc2b": "a66db5", "ca833c": "7a519a", "798071": "7a4888", "b5b6b9": "bb92d5", - "bcbdc0": "bcbdc0", "f0f0f0": "f4ceff" }, "2": { "45505f": "271420", - "101010": "101010", "91a3bf": "7c4e42", "262b3c": "1d1b33", "995433": "45328e", "627986": "5f3036", - "f3f3f3": "f3f3f3", "e3cc2b": "b5b8f9", "ca833c": "7b7fda", "798071": "5f5c7e", "b5b6b9": "7b7895", - "bcbdc0": "bcbdc0", "f0f0f0": "d1daf5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/2053.json b/public/images/pokemon/variant/2053.json index 9c5fcd4c20b..aa5dec5609b 100644 --- a/public/images/pokemon/variant/2053.json +++ b/public/images/pokemon/variant/2053.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "464457": "8c583b", "262b3c": "41185e", "45505f": "512d6c", @@ -8,13 +7,10 @@ "6c7791": "de974e", "9ba8b7": "ffda5c", "1784d5": "6945aa", - "fdfdfd": "fdfdfd", "11b8f7": "9d67d8", - "1149a8": "2e2575", - "b6b6b6": "b6b6b6" + "1149a8": "2e2575" }, "2": { - "101010": "101010", "464457": "271420", "262b3c": "111323", "45505f": "1d1b33", diff --git a/public/images/pokemon/variant/206.json b/public/images/pokemon/variant/206.json index 1a765507cd6..e16e94cefa0 100644 --- a/public/images/pokemon/variant/206.json +++ b/public/images/pokemon/variant/206.json @@ -4,29 +4,25 @@ "f7e67b": "ececec", "debd3a": "aeaeae", "bd8c21": "757575", - "101010": "101010", "d6e6f7": "c1d7e2", "5a6373": "5d6970", "f7ffff": "f6ffff", "fff7c5": "fdfdfd", "6bbdce": "748da4", "216b84": "2a413f", - "318ca5": "4a6165", - "bdcee6": "bdcee6" + "318ca5": "4a6165" }, "2": { "735a42": "462a3e", "f7e67b": "db4069", "debd3a": "a12e55", "bd8c21": "692342", - "101010": "101010", "d6e6f7": "f4ce91", "5a6373": "5c4a4d", "f7ffff": "fdffdc", "fff7c5": "e97798", "6bbdce": "b5f2ec", "216b84": "1d737a", - "318ca5": "38a8a6", - "bdcee6": "bdcee6" + "318ca5": "38a8a6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/212-mega.json b/public/images/pokemon/variant/212-mega.json index 5534f751f83..883352cde2d 100644 --- a/public/images/pokemon/variant/212-mega.json +++ b/public/images/pokemon/variant/212-mega.json @@ -2,43 +2,24 @@ "0": { "622929": "215a2d", "f66a6a": "8cce73", - "101010": "101010", "d53939": "4a9c53", - "a42929": "2f794e", - "39394a": "39394a", - "fdfdfd": "fdfdfd", - "9494a4": "9494a4", - "b4b4cd": "b4b4cd", - "0090b4": "0090b4", - "20d6f4": "20d6f4", - "343444": "343444" + "a42929": "2f794e" }, "1": { "622929": "2f2962", "f66a6a": "639cf7", - "101010": "101010", "d53939": "4263ef", - "a42929": "29429c", - "39394a": "39394a", - "fdfdfd": "fdfdfd", - "9494a4": "9494a4", - "b4b4cd": "b4b4cd", - "0090b4": "0090b4", - "20d6f4": "20d6f4", - "343444": "343444" + "a42929": "29429c" }, "2": { "622929": "645117", "f66a6a": "c59f29", - "101010": "101010", "d53939": "ffca2a", "a42929": "b88619", "39394a": "282d2c", - "fdfdfd": "fdfdfd", "9494a4": "3c4543", "b4b4cd": "cdccb4", "0090b4": "b49800", - "20d6f4": "f4e920", - "343444": "343444" + "20d6f4": "f4e920" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/212.json b/public/images/pokemon/variant/212.json index 55fcc0858ac..5240f4f81e3 100644 --- a/public/images/pokemon/variant/212.json +++ b/public/images/pokemon/variant/212.json @@ -2,24 +2,14 @@ "0": { "632929": "215a2d", "f76b6b": "8cce73", - "101010": "101010", - "3a3a4a": "3a3a4a", - "ffffff": "ffffff", "d63a3a": "4a9c53", - "b5b5ce": "b5b5ce", - "9494a5": "9494a5", - "a52929": "2f794e", - "dec510": "dec510", - "9c6b21": "9c6b21" + "a52929": "2f794e" }, "1": { "632929": "2f2962", "f76b6b": "639cf7", - "101010": "101010", "3a3a4a": "3c3c50", - "ffffff": "ffffff", "d63a3a": "4263ef", - "b5b5ce": "b5b5ce", "9494a5": "6262a4", "a52929": "29429c", "dec510": "10bdde", @@ -28,14 +18,9 @@ "2": { "632929": "645117", "f76b6b": "c59f29", - "101010": "101010", "3a3a4a": "282d2c", - "ffffff": "ffffff", "d63a3a": "ffca2a", - "b5b5ce": "b5b5ce", "9494a5": "3c4543", - "a52929": "b88619", - "dec510": "dec510", - "9c6b21": "9c6b21" + "a52929": "b88619" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/213.json b/public/images/pokemon/variant/213.json index 3ce19ff580c..04c2e0b8064 100644 --- a/public/images/pokemon/variant/213.json +++ b/public/images/pokemon/variant/213.json @@ -4,7 +4,6 @@ "efc54a": "cc5b74", "735210": "5d1931", "ffff5a": "d68b71", - "101010": "101010", "842100": "0d1f2d", "6b633a": "8e4d31", "d6ceb5": "fcc86f", @@ -18,7 +17,6 @@ "efc54a": "5bbfaa", "735210": "254d59", "ffff5a": "aaedbe", - "101010": "101010", "842100": "2c1b2a", "6b633a": "1f1f1f", "d6ceb5": "4f3e46", diff --git a/public/images/pokemon/variant/215.json b/public/images/pokemon/variant/215.json index dabf55363bb..9058de23c8e 100644 --- a/public/images/pokemon/variant/215.json +++ b/public/images/pokemon/variant/215.json @@ -6,7 +6,6 @@ "316373": "6d1631", "f75273": "637696", "3a94ad": "ac373e", - "000000": "000000", "42849c": "902738", "a57b3a": "c3701b", "dece73": "ffcd68", @@ -22,13 +21,11 @@ "316373": "d4874f", "f75273": "7ac3f0", "3a94ad": "fbdba1", - "000000": "000000", "42849c": "eab273", "a57b3a": "d04e6d", "dece73": "ff8ce0", "4a4a4a": "383d51", "bdbdc5": "a1a0c3", - "f7f7ff": "f7f7ff", "8cc5ce": "d1d1ee" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/216.json b/public/images/pokemon/variant/216.json index c6e00a3e844..d0ff8a89b16 100644 --- a/public/images/pokemon/variant/216.json +++ b/public/images/pokemon/variant/216.json @@ -2,43 +2,28 @@ "0": { "6b4219": "225c35", "b56321": "4cae50", - "101010": "101010", "ff843a": "90db6d", "de7331": "6ac669", "dece9c": "d6f794", "ffe6a5": "ffffb5", - "ffffff": "ffffff", - "6b6b7b": "6b6b7b", - "efad52": "ffe66b", - "dedede": "dedede", - "b5b5bd": "b5b5bd" + "efad52": "ffe66b" }, "1": { "6b4219": "5e0c28", "b56321": "9e253b", - "101010": "101010", "ff843a": "e44642", "de7331": "c42f3e", "dece9c": "ddb49d", "ffe6a5": "f7eee1", - "ffffff": "ffffff", - "6b6b7b": "6b6b7b", - "efad52": "f2cab8", - "dedede": "dedede", - "b5b5bd": "b5b5bd" + "efad52": "f2cab8" }, "2": { "6b4219": "1e2249", "b56321": "323760", - "101010": "101010", "ff843a": "46527a", "de7331": "3c456e", "dece9c": "85deff", "ffe6a5": "b5fffc", - "ffffff": "ffffff", - "6b6b7b": "6b6b7b", - "efad52": "75aaff", - "dedede": "dedede", - "b5b5bd": "b5b5bd" + "efad52": "75aaff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/217.json b/public/images/pokemon/variant/217.json index 88ac9da8225..076e45c965b 100644 --- a/public/images/pokemon/variant/217.json +++ b/public/images/pokemon/variant/217.json @@ -1,47 +1,30 @@ { "0": { - "7b7b8c": "7b7b8c", - "101010": "101010", "634229": "1d3d26", - "ffffff": "ffffff", "945221": "2f6324", "422919": "112114", - "dedede": "dedede", "bd7342": "6a8a46", "ffef84": "f7ffa5", - "b5b5bd": "b5b5bd", "c59c4a": "ceb552", "f7c563": "f7de7b", "841931": "a52942", "de3a5a": "ef526b" }, "1": { - "7b7b8c": "7b7b8c", - "101010": "101010", "634229": "6b1d38", - "ffffff": "ffffff", "945221": "8c2a37", "422919": "2d0e1f", - "dedede": "dedede", "bd7342": "b74543", "ffef84": "f9eddb", - "b5b5bd": "b5b5bd", "c59c4a": "c48e81", - "f7c563": "f2cab8", - "841931": "841931", - "de3a5a": "de3a5a" + "f7c563": "f2cab8" }, "2": { - "7b7b8c": "7b7b8c", - "101010": "101010", "634229": "1e2249", - "ffffff": "ffffff", "945221": "323760", "422919": "111433", - "dedede": "dedede", "bd7342": "46527a", "ffef84": "adf2f7", - "b5b5bd": "b5b5bd", "c59c4a": "45a2f9", "f7c563": "5ccaf2", "841931": "a52942", diff --git a/public/images/pokemon/variant/222.json b/public/images/pokemon/variant/222.json index 61681ff421a..a184a41df10 100644 --- a/public/images/pokemon/variant/222.json +++ b/public/images/pokemon/variant/222.json @@ -1,12 +1,10 @@ { "1": { - "101010": "101010", "ffcee6": "f5eab0", "bd004a": "b76600", "ffa5c5": "f6cc70", "e66394": "f39806", "f77bb5": "f6b64e", - "ffffff": "ffffff", "dee6f7": "d9fafa", "adc5de": "9fdbd8", "5a7bad": "0095a1" @@ -18,7 +16,6 @@ "ffa5c5": "c7e5a0", "e66394": "85ba58", "f77bb5": "adca66", - "ffffff": "ffffff", "dee6f7": "1da7a3", "adc5de": "207a80", "5a7bad": "1c5469" diff --git a/public/images/pokemon/variant/227.json b/public/images/pokemon/variant/227.json index 592d33eea65..aebecf36444 100644 --- a/public/images/pokemon/variant/227.json +++ b/public/images/pokemon/variant/227.json @@ -6,14 +6,12 @@ "bdcee6": "6d93a4", "deefff": "97bcce", "637bad": "062233", - "101010": "101010", "941019": "4a0451", "c5314a": "912790", "ff8494": "c47acc", "ef5a63": "ad57ba", "ce9400": "d34b21", "ffde00": "f87642", - "841921": "841921", "ffffff": "97bcce" }, "2": { @@ -23,7 +21,6 @@ "bdcee6": "ac6f7d", "deefff": "c8aeae", "637bad": "231429", - "101010": "101010", "941019": "10255a", "c5314a": "245a98", "ff8494": "9ef8e2", diff --git a/public/images/pokemon/variant/228.json b/public/images/pokemon/variant/228.json index e9634ee0a05..aa2cc00e0c8 100644 --- a/public/images/pokemon/variant/228.json +++ b/public/images/pokemon/variant/228.json @@ -1,40 +1,29 @@ { "1": { "101921": "321b32", - "080808": "080808", "4a4a52": "76546b", "46435c": "471d23", "767085": "a84b50", "ffffff": "f3bd87", "a59cad": "c87966", "292931": "553454", - "292929": "292929", - "f8f9ff": "f8f9ff", - "f1fcff": "f1fcff", "f7a57b": "f8f1e7", "734229": "77545b", "1b1b23": "352241", - "ad7352": "ceb0a5", - "e2e0e3": "e2e0e3", - "8c1900": "8c1900" + "ad7352": "ceb0a5" }, "2": { "101921": "2c2335", - "080808": "080808", "4a4a52": "f8faf3", "46435c": "171635", "767085": "223657", "ffffff": "5c8d95", "a59cad": "38576c", "292931": "b1a3b1", - "292929": "292929", - "f8f9ff": "f8f9ff", - "f1fcff": "f1fcff", "f7a57b": "72557e", "734229": "311f3a", "1b1b23": "ecb592", "ad7352": "533960", - "e2e0e3": "e2e0e3", "8c1900": "a87ea3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/229-mega.json b/public/images/pokemon/variant/229-mega.json index 7f2956d6bb0..ea6d7d04687 100644 --- a/public/images/pokemon/variant/229-mega.json +++ b/public/images/pokemon/variant/229-mega.json @@ -4,18 +4,13 @@ "a49cac": "a84b50", "cdd5d5": "c87966", "fcfcfc": "f3bd87", - "010101": "010101", "622910": "77545b", "182029": "321b32", "a45a4a": "ceb0a5", "4a4a52": "76546b", "f69c83": "f8f1e7", "313139": "553454", - "c5cdd1": "c5cdd1", "ce0a10": "455d92", - "f8f9ff": "f8f9ff", - "000000": "000000", - "e2e0e3": "e2e0e3", "cb070d": "aa8c82" }, "2": { @@ -23,7 +18,6 @@ "a49cac": "223657", "cdd5d5": "38576c", "fcfcfc": "5c8d95", - "010101": "010101", "622910": "311f3a", "182029": "321b32", "a45a4a": "533960", @@ -33,8 +27,6 @@ "c5cdd1": "100f27", "ce0a10": "e58142", "f8f9ff": "223657", - "000000": "000000", - "e2e0e3": "e2e0e3", "cb070d": "534b6a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/229.json b/public/images/pokemon/variant/229.json index fe532e0c908..ffe3de858f0 100644 --- a/public/images/pokemon/variant/229.json +++ b/public/images/pokemon/variant/229.json @@ -6,16 +6,11 @@ "a59cad": "a84244", "192129": "431129", "4a4a52": "85324a", - "000000": "000000", "a55a4a": "ceb0a5", "f79c84": "f8f1e7", "841021": "41578c", "31313a": "631e3f", - "ada5b3": "ada5b3", - "632910": "8c6362", - "f8f9ff": "f8f9ff", - "e2e0e3": "e2e0e3", - "9c293a": "9c293a" + "632910": "8c6362" }, "2": { "84738c": "111a33", @@ -24,7 +19,6 @@ "a59cad": "223657", "192129": "616f8c", "4a4a52": "e8f8ff", - "000000": "000000", "a55a4a": "4a3a5e", "f79c84": "665a83", "841021": "f37755", @@ -32,7 +26,6 @@ "ada5b3": "111a33", "632910": "2d203c", "f8f9ff": "223657", - "e2e0e3": "e2e0e3", "9c293a": "9e6b77" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/23.json b/public/images/pokemon/variant/23.json index f0f5f749d4d..9edd18b1d5d 100644 --- a/public/images/pokemon/variant/23.json +++ b/public/images/pokemon/variant/23.json @@ -9,8 +9,6 @@ "845210": "6f483e", "ffd66b": "f3f1d4", "e6ad5a": "d6c7a2", - "101010": "101010", - "ffffff": "ffffff", "9c1000": "9e352b", "c54219": "c76740", "f7734a": "e59d59", @@ -26,8 +24,6 @@ "845210": "1d265b", "ffd66b": "4d759b", "e6ad5a": "3b5a87", - "101010": "101010", - "ffffff": "ffffff", "9c1000": "67305a", "c54219": "904864", "f7734a": "a75e6d", diff --git a/public/images/pokemon/variant/230.json b/public/images/pokemon/variant/230.json index 83212a90de2..e7a6095423f 100644 --- a/public/images/pokemon/variant/230.json +++ b/public/images/pokemon/variant/230.json @@ -2,7 +2,6 @@ "1": { "4a5a94": "2a2750", "639cce": "2f4861", - "101010": "101010", "8cbdef": "396979", "cee6f7": "5dac9b", "add6ff": "3e8383", @@ -17,7 +16,6 @@ "2": { "4a5a94": "54133f", "639cce": "b53f49", - "101010": "101010", "8cbdef": "d64b52", "cee6f7": "ffb273", "add6ff": "f27461", diff --git a/public/images/pokemon/variant/231.json b/public/images/pokemon/variant/231.json index ad75f38a1d3..fc21b2003a8 100644 --- a/public/images/pokemon/variant/231.json +++ b/public/images/pokemon/variant/231.json @@ -4,21 +4,17 @@ "add6ef": "e8e8e8", "525294": "4d5271", "9cbdef": "bac4ca", - "101010": "101010", "bd3a31": "4b6aa1", "840000": "394e85", "f76b52": "859abf", - "ffffff": "ffffff", "6b9cce": "97a5b5", - "8c8c8c": "8c8baa", - "d6d6d6": "d6d6d6" + "8c8c8c": "8c8baa" }, "2": { "527bb5": "4f2955", "add6ef": "a56898", "525294": "3a2043", "9cbdef": "814c79", - "101010": "101010", "bd3a31": "cea141", "840000": "b17333", "f76b52": "f1d35b", diff --git a/public/images/pokemon/variant/232.json b/public/images/pokemon/variant/232.json index 97f598a8545..c90b8815809 100644 --- a/public/images/pokemon/variant/232.json +++ b/public/images/pokemon/variant/232.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "6b7373": "7fa0d7", "4a5252": "5f74c7", "3a3a3a": "333a77", @@ -11,8 +10,6 @@ "d6ded6": "f4f4f4", "424242": "2f3441", "738484": "6c7488", - "f9f9f9": "f9f9f9", - "d6d6d6": "d6d6d6", "bdc5c5": "cdd1dc", "707f7f": "b6511d", "bdbdbd": "de913e", @@ -20,7 +17,6 @@ "dedede": "edbb5e" }, "2": { - "101010": "101010", "6b7373": "d17e47", "4a5252": "994e30", "3a3a3a": "6f2219", @@ -31,8 +27,6 @@ "d6ded6": "665263", "424242": "2c1f2e", "738484": "1e1225", - "f9f9f9": "f9f9f9", - "d6d6d6": "d6d6d6", "bdc5c5": "584158", "707f7f": "1d2a54", "bdbdbd": "3b70c3", diff --git a/public/images/pokemon/variant/233.json b/public/images/pokemon/variant/233.json index dd2b7299736..cff3f5d31f1 100644 --- a/public/images/pokemon/variant/233.json +++ b/public/images/pokemon/variant/233.json @@ -4,8 +4,6 @@ "ef5a63": "f8a8cd", "5a3a4a": "d9546f", "ff94b5": "fccee9", - "ffffff": "ffffff", - "101010": "101010", "31739c": "6d224c", "8cd6ff": "9e4971", "4a9cd6": "833462", @@ -19,7 +17,6 @@ "5a3a4a": "31150e", "ff94b5": "a04c27", "ffffff": "ffe4d4", - "101010": "101010", "31739c": "cf8556", "8cd6ff": "ffd9ab", "4a9cd6": "efb787", diff --git a/public/images/pokemon/variant/235.json b/public/images/pokemon/variant/235.json index 1da37a2624d..668c0c7c1dc 100644 --- a/public/images/pokemon/variant/235.json +++ b/public/images/pokemon/variant/235.json @@ -5,16 +5,10 @@ "4a3a10": "431a2e", "6b5a31": "672f44", "adad8c": "b1767f", - "101010": "101010", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", - "94949c": "94949c", "199c00": "113041", "086300": "091728", "6bde42": "347c78", - "42c519": "1f5259", - "b50000": "b50000", - "f78400": "f78400" + "42c519": "1f5259" }, "2": { "8c8452": "3a3f47", @@ -22,10 +16,6 @@ "4a3a10": "141622", "6b5a31": "262b39", "adad8c": "8a909b", - "101010": "101010", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", - "94949c": "94949c", "199c00": "111321", "086300": "080811", "6bde42": "272b39", diff --git a/public/images/pokemon/variant/239.json b/public/images/pokemon/variant/239.json index e35d5491405..f7e4cc0a914 100644 --- a/public/images/pokemon/variant/239.json +++ b/public/images/pokemon/variant/239.json @@ -4,9 +4,7 @@ "b56b00": "a83018", "ffce31": "ff844b", "ce8c00": "d44b2c", - "101010": "101010", "a5a5a5": "adadad", - "ffffff": "ffffff", "cecece": "d8d8d8", "6b6b6b": "6e3048", "e6ad19": "f2673d", @@ -17,12 +15,6 @@ "b56b00": "33b571", "ffce31": "6bff9e", "ce8c00": "52ba8b", - "101010": "101010", - "a5a5a5": "a5a5a5", - "ffffff": "ffffff", - "cecece": "cecece", - "6b6b6b": "6b6b6b", - "e6ad19": "53e680", - "313131": "313131" + "e6ad19": "53e680" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/24.json b/public/images/pokemon/variant/24.json index 6faaf4b0c4e..05acdd202cc 100644 --- a/public/images/pokemon/variant/24.json +++ b/public/images/pokemon/variant/24.json @@ -4,9 +4,6 @@ "c5a5ef": "8feae4", "523a7b": "113a53", "a584c5": "30abb3", - "101010": "101010", - "ffffff": "ffffff", - "c5c5c5": "c5c5c5", "9c1000": "aa352b", "f7734a": "e3aa74", "c54219": "c27048", @@ -17,9 +14,6 @@ "c5a5ef": "fff9e5", "523a7b": "875a5f", "a584c5": "eed3b1", - "101010": "101010", - "ffffff": "ffffff", - "c5c5c5": "c5c5c5", "9c1000": "393c81", "f7734a": "6388ac", "c54219": "4f5a98", diff --git a/public/images/pokemon/variant/240.json b/public/images/pokemon/variant/240.json index 06b748f4cb7..aeb798619eb 100644 --- a/public/images/pokemon/variant/240.json +++ b/public/images/pokemon/variant/240.json @@ -3,10 +3,6 @@ "d6523a": "372d49", "ff7b63": "524b6f", "943121": "272034", - "101010": "101010", - "c5c5c5": "c5c5c5", - "73737b": "73737b", - "ffffff": "ffffff", "ffffb5": "f5ad27", "f7d63a": "fb832b", "d6ad00": "db4d19", @@ -16,10 +12,6 @@ "d6523a": "4065b0", "ff7b63": "5398cf", "943121": "303d58", - "101010": "101010", - "c5c5c5": "c5c5c5", - "73737b": "73737b", - "ffffff": "ffffff", "ffffb5": "ffffff", "f7d63a": "eaffff", "d6ad00": "c6edf2", diff --git a/public/images/pokemon/variant/243.json b/public/images/pokemon/variant/243.json index e42b832d153..0a431c7cf27 100644 --- a/public/images/pokemon/variant/243.json +++ b/public/images/pokemon/variant/243.json @@ -2,7 +2,6 @@ "1": { "846ba5": "732c40", "52296b": "481532", - "101010": "101010", "bd8cc5": "b74f57", "6b6b6b": "3c3c4e", "9cd6ff": "ffcb59", @@ -18,7 +17,6 @@ "2": { "846ba5": "dc9779", "52296b": "994d3d", - "101010": "101010", "bd8cc5": "f5d4c0", "6b6b6b": "3c3c4e", "9cd6ff": "ffb23a", diff --git a/public/images/pokemon/variant/245.json b/public/images/pokemon/variant/245.json index da4dd9edf29..36359b042d9 100644 --- a/public/images/pokemon/variant/245.json +++ b/public/images/pokemon/variant/245.json @@ -1,7 +1,6 @@ { "1": { "31428c": "271a56", - "101010": "101010", "7bbdff": "6b62c0", "5a7bd6": "4c4097", "7b5ab5": "bd4530", @@ -18,7 +17,6 @@ }, "2": { "31428c": "854607", - "101010": "101010", "7bbdff": "f5c042", "5a7bd6": "d67f17", "7b5ab5": "863062", diff --git a/public/images/pokemon/variant/246.json b/public/images/pokemon/variant/246.json index b05a319791b..12465da965d 100644 --- a/public/images/pokemon/variant/246.json +++ b/public/images/pokemon/variant/246.json @@ -4,10 +4,8 @@ "4a5a3a": "0b4367", "d6e6ce": "4fa6e0", "adce9c": "4493c7", - "101010": "101010", "bd3a21": "cd8f30", "6b2100": "a86e14", - "ffffff": "ffffff", "ef5229": "efca4f", "ffa55a": "fff69f" }, @@ -16,10 +14,8 @@ "4a5a3a": "a5494d", "d6e6ce": "ecd292", "adce9c": "e5a267", - "101010": "101010", "bd3a21": "67478f", "6b2100": "403266", - "ffffff": "ffffff", "ef5229": "875cdb", "ffa55a": "a56db5" } diff --git a/public/images/pokemon/variant/247.json b/public/images/pokemon/variant/247.json index c21ea3a3c0e..5ca07bb53c7 100644 --- a/public/images/pokemon/variant/247.json +++ b/public/images/pokemon/variant/247.json @@ -2,11 +2,8 @@ "1": { "295a84": "4a5a39", "bde6ff": "dee6cd", - "101010": "101010", "739cc5": "739c62", "8cc5ef": "accd9c", - "adadad": "adadad", - "ffffff": "ffffff", "b54200": "0098fc" }, "2": { diff --git a/public/images/pokemon/variant/248-mega.json b/public/images/pokemon/variant/248-mega.json index 589b3616079..38bd9b9edce 100644 --- a/public/images/pokemon/variant/248-mega.json +++ b/public/images/pokemon/variant/248-mega.json @@ -1,34 +1,34 @@ { "1": { -"4a5a39": "533334", -"821610": "004194", -"942900": "004194", -"d0243b": "006fb3", -"d55200": "0098fc", -"ff3e40": "0098fc", -"f24159": "088a72", -"f55e72": "18b8a0", -"ff6668": "1cd9ff", -"739c62": "915957", -"ff8385": "00e0fc", -"ffa3a4": "00ffc8", -"accd9c": "c78482", -"dee6cd": "dbb1b5" + "4a5a39": "533334", + "821610": "004194", + "942900": "004194", + "d0243b": "006fb3", + "d55200": "0098fc", + "ff3e40": "0098fc", + "f24159": "088a72", + "f55e72": "18b8a0", + "ff6668": "1cd9ff", + "739c62": "915957", + "ff8385": "00e0fc", + "ffa3a4": "00ffc8", + "accd9c": "c78482", + "dee6cd": "dbb1b5" }, "2": { -"4a5a39": "06092f", -"821610": "ee7b06", -"942900": "ee7b06", -"d0243b": "ffa904", -"d55200": "ffa904", -"ff3e40": "ffef76", -"f24159": "ff9224", -"f55e72": "ffba36", -"ff6668": "fff28f", -"739c62": "2c3071", -"ff8385": "fff49a", -"ffa3a4": "fff9ce", -"accd9c": "625695", -"dee6cd": "7068b2" + "4a5a39": "06092f", + "821610": "ee7b06", + "942900": "ee7b06", + "d0243b": "ffa904", + "d55200": "ffa904", + "ff3e40": "ffef76", + "f24159": "ff9224", + "f55e72": "ffba36", + "ff6668": "fff28f", + "739c62": "2c3071", + "ff8385": "fff49a", + "ffa3a4": "fff9ce", + "accd9c": "625695", + "dee6cd": "7068b2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/248.json b/public/images/pokemon/variant/248.json index a08e0fe55cc..bc35cfd8637 100644 --- a/public/images/pokemon/variant/248.json +++ b/public/images/pokemon/variant/248.json @@ -17,12 +17,8 @@ "2": { "4a5a3a": "06092f", "adce9c": "625695", - "101010": "101010", "dee6ce": "7068b2", "739c63": "2c3071", - "ffffff": "ffffff", - "c5c5c5": "c5c5c5", - "737373": "737373", "942900": "ee7b06", "d65200": "ffa904", "217bbd": "ffa904", diff --git a/public/images/pokemon/variant/251.json b/public/images/pokemon/variant/251.json index a26cc859cff..0abf162a72b 100644 --- a/public/images/pokemon/variant/251.json +++ b/public/images/pokemon/variant/251.json @@ -3,7 +3,6 @@ "73a531": "599b91", "a5de52": "9cc6ae", "528cad": "9b296f", - "101010": "101010", "8cb5ce": "d763a0", "0063b5": "681151", "4a7321": "28696a", @@ -11,14 +10,12 @@ "ffffde": "f4e5d9", "b5c55a": "cbc5af", "deef94": "ddd7c2", - "ffffff": "fff5f5", - "6b7384": "6b7384" + "ffffff": "fff5f5" }, "2": { "73a531": "5f234e", "a5de52": "8c387a", "528cad": "b82053", - "101010": "101010", "8cb5ce": "e33d69", "0063b5": "640d3a", "4a7321": "3f0e2a", diff --git a/public/images/pokemon/variant/255.json b/public/images/pokemon/variant/255.json index 78d2d1d13dd..5a950c8c19f 100644 --- a/public/images/pokemon/variant/255.json +++ b/public/images/pokemon/variant/255.json @@ -3,26 +3,22 @@ "ad8c00": "298084", "efbd31": "34ad90", "f7de6b": "58dfa5", - "000000": "000000", "ad4210": "b93a23", "ff8c31": "ff9039", "e65a21": "e86434", "ffad52": "ffde8e", "7b4a19": "6f1214", - "ffffff": "ffffff", "8c5221": "1d5461" }, "2": { "ad8c00": "550d28", "efbd31": "811c2c", "f7de6b": "ad3633", - "000000": "000000", "ad4210": "b3817d", "ff8c31": "f3e5cf", "e65a21": "d3afa0", "ffad52": "fffef6", "7b4a19": "364464", - "ffffff": "ffffff", "8c5221": "400724" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/256.json b/public/images/pokemon/variant/256.json index 130891974ba..80c0e94444f 100644 --- a/public/images/pokemon/variant/256.json +++ b/public/images/pokemon/variant/256.json @@ -1,16 +1,13 @@ { "1": { "de5a29": "1f9ba4", - "181818": "181818", "ff7b4a": "3dd0b0", "9c3110": "11526f", "9c7329": "a7471f", - "191919": "191919", "efde73": "ffc148", "efbd4a": "f19830", "d63131": "9083aa", "962d0d": "605c8d", - "ffffff": "ffffff", "d05325": "414f7b", "6b6b73": "413d75", "dedece": "9386b8", @@ -21,16 +18,13 @@ }, "2": { "de5a29": "cdb09b", - "181818": "181818", "ff7b4a": "fff7e1", "9c3110": "8a685f", "9c7329": "641835", - "191919": "191919", "efde73": "c4584d", "efbd4a": "962b39", "d63131": "89bed0", "962d0d": "5f7faa", - "ffffff": "ffffff", "d05325": "39487b", "6b6b73": "192132", "dedece": "494f67", diff --git a/public/images/pokemon/variant/257-mega.json b/public/images/pokemon/variant/257-mega.json index e97fd77c50f..c5526ad284c 100644 --- a/public/images/pokemon/variant/257-mega.json +++ b/public/images/pokemon/variant/257-mega.json @@ -4,7 +4,6 @@ "62524a": "55607d", "dedeb4": "f0fbff", "948362": "8095b3", - "010101": "010101", "bdb494": "a8c7da", "832929": "9b422a", "ee6262": "f7ca4b", @@ -23,7 +22,6 @@ "62524a": "5b143d", "dedeb4": "bc474d", "948362": "842446", - "010101": "010101", "bdb494": "a1304d", "832929": "9c7c70", "ee6262": "fffae1", diff --git a/public/images/pokemon/variant/257.json b/public/images/pokemon/variant/257.json index e56213da4a7..7a56c280b91 100644 --- a/public/images/pokemon/variant/257.json +++ b/public/images/pokemon/variant/257.json @@ -1,7 +1,6 @@ { "1": { "b93e3e": "46649c", - "000000": "000000", "bdb594": "a8c7da", "948463": "8095b3", "ee5e5e": "598dc1", diff --git a/public/images/pokemon/variant/261.json b/public/images/pokemon/variant/261.json index ec04e5dbf43..78ff43fa223 100644 --- a/public/images/pokemon/variant/261.json +++ b/public/images/pokemon/variant/261.json @@ -2,7 +2,6 @@ "1": { "636363": "803c2c", "c5c5c5": "d4a172", - "000000": "000000", "a5a5a5": "b26c55", "424242": "380927", "595963": "71231f", @@ -10,15 +9,11 @@ "9c2942": "222d84", "e6193a": "3a56b1", "bd8c42": "a968a1", - "ffffff": "ffffff", - "f7f75a": "c59aaa", - "6b6b84": "6b6b84", - "ff0018": "ff0018" + "f7f75a": "c59aaa" }, "2": { "636363": "24103c", "c5c5c5": "753e93", - "000000": "000000", "a5a5a5": "402067", "424242": "4e9ea3", "595963": "0a0f43", @@ -26,9 +21,6 @@ "9c2942": "182556", "e6193a": "263f74", "bd8c42": "8aa8cd", - "ffffff": "ffffff", - "f7f75a": "bdd9f2", - "6b6b84": "6b6b84", - "ff0018": "ff0018" + "f7f75a": "bdd9f2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/262.json b/public/images/pokemon/variant/262.json index 3451ee0f16f..f9128d09f4c 100644 --- a/public/images/pokemon/variant/262.json +++ b/public/images/pokemon/variant/262.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "525252": "7a3424", "94949c": "ad5c41", "bdbdc5": "d2975f", @@ -8,16 +7,10 @@ "4d4d4d": "71231f", "4a4a4a": "711956", "de2942": "a32c60", - "f7ef5a": "f7ef5a", - "bd8c42": "bd8c42", "ad1021": "761b51", - "323232": "5a1c15", - "bd4a7b": "bd4a7b", - "ffffff": "ffffff", - "949cad": "949cad" + "323232": "5a1c15" }, "2": { - "000000": "000000", "525252": "230f3b", "94949c": "402067", "bdbdc5": "753e93", @@ -28,9 +21,6 @@ "f7ef5a": "ffb98c", "bd8c42": "d36b58", "ad1021": "45809a", - "323232": "0a0b3d", - "bd4a7b": "bd4a7b", - "ffffff": "ffffff", - "949cad": "949cad" + "323232": "0a0b3d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/263.json b/public/images/pokemon/variant/263.json index f470554de32..3529755bb82 100644 --- a/public/images/pokemon/variant/263.json +++ b/public/images/pokemon/variant/263.json @@ -3,23 +3,18 @@ "bdad9c": "be94bb", "e6dece": "e1c7dc", "73635a": "481f4e", - "000000": "000000", "b59c8c": "8e588f", "947b6b": "85355a", "5a524a": "3c1332", "424242": "52283f", - "ffffff": "ffffff", "524231": "1795be", "6b5231": "41f3ff", - "212129": "311737", - "a51900": "a51900", - "c5c5bd": "c5c5bd" + "212129": "311737" }, "2": { "bdad9c": "3d2661", "e6dece": "5f4e9c", "73635a": "29155a", - "000000": "000000", "b59c8c": "aebcff", "947b6b": "7e86d2", "5a524a": "1e133e", @@ -28,7 +23,6 @@ "524231": "d0037a", "6b5231": "ff429b", "212129": "31134d", - "a51900": "d0037a", - "c5c5bd": "c5c5bd" + "a51900": "d0037a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/264.json b/public/images/pokemon/variant/264.json index 54bbcffec10..b6719a37f15 100644 --- a/public/images/pokemon/variant/264.json +++ b/public/images/pokemon/variant/264.json @@ -1,28 +1,22 @@ { "1": { "6b6363": "481f4e", - "000000": "000000", "846b5a": "85355a", "ad9c8c": "be94bb", "decebd": "e1c7dc", "a58c7b": "8e588f", "5a4a3a": "59193d", - "423a21": "423a21", "296b94": "1795be", - "ffffff": "ffffff", "6badc5": "41f3ff", - "94847b": "643369", - "737373": "737373" + "94847b": "643369" }, "2": { "6b6363": "1e133e", - "000000": "000000", "846b5a": "90a2f4", "ad9c8c": "3d2661", "decebd": "5f4e9c", "a58c7b": "535db9", "5a4a3a": "465aab", - "423a21": "423a21", "296b94": "d0037a", "ffffff": "ffe6e2", "6badc5": "ff429b", diff --git a/public/images/pokemon/variant/2670.json b/public/images/pokemon/variant/2670.json index a2a1fde327e..028e17e4966 100644 --- a/public/images/pokemon/variant/2670.json +++ b/public/images/pokemon/variant/2670.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "666161": "516378", "403d3d": "222547", "802d2d": "302a9c", @@ -15,7 +14,6 @@ "fffbfb": "f8f4f4" }, "2": { - "101010": "101010", "666161": "fff9f2", "403d3d": "b5c6c3", "802d2d": "20877a", diff --git a/public/images/pokemon/variant/278.json b/public/images/pokemon/variant/278.json index 201aa0450ab..543b44e764b 100644 --- a/public/images/pokemon/variant/278.json +++ b/public/images/pokemon/variant/278.json @@ -1,7 +1,6 @@ { "0": { "525252": "542b2b", - "000000": "000000", "ffffff": "ecd8d4", "d6cee6": "ba928c", "296b94": "3f4c13", @@ -16,7 +15,6 @@ }, "1": { "525252": "2b3e68", - "000000": "000000", "ffffff": "c7dff4", "d6cee6": "80a2d0", "296b94": "143a72", @@ -31,7 +29,6 @@ }, "2": { "525252": "732a22", - "000000": "000000", "ffffff": "f5e1d1", "d6cee6": "d19e92", "296b94": "5d0803", diff --git a/public/images/pokemon/variant/279.json b/public/images/pokemon/variant/279.json index 5c193f7939b..f33224e222b 100644 --- a/public/images/pokemon/variant/279.json +++ b/public/images/pokemon/variant/279.json @@ -46,4 +46,4 @@ "ced6ef": "d19e92", "31638c": "610f0e" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/282.json b/public/images/pokemon/variant/282.json index 87d890934fa..7b2fcc28f6b 100644 --- a/public/images/pokemon/variant/282.json +++ b/public/images/pokemon/variant/282.json @@ -5,12 +5,10 @@ "8ce68c": "ebc984", "73bd73": "c08f44", "7b8cb5": "d59c80", - "000000": "000000", "efefff": "f8efde", "cecee6": "ffc4a6", "d64a73": "da3e4f", "ff7b94": "ca2033", - "ffffff": "ffffff", "a5b5ce": "d59c80", "84294a": "b80e2f" }, @@ -19,14 +17,8 @@ "b5f794": "5b5790", "8ce68c": "3f427f", "73bd73": "282c5d", - "7b8cb5": "7b8cb5", - "000000": "000000", - "efefff": "efefff", - "cecee6": "cecee6", "d64a73": "d846c1", "ff7b94": "ed50f7", - "ffffff": "ffffff", - "a5b5ce": "a5b5ce", "84294a": "9e2a7c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/285.json b/public/images/pokemon/variant/285.json index ec433b12e77..d23c9adaa31 100644 --- a/public/images/pokemon/variant/285.json +++ b/public/images/pokemon/variant/285.json @@ -1,21 +1,16 @@ { "1": { - "73634a": "73634a", - "5a4a42": "5a4a42", "efd6b5": "efc4b5", - "000000": "000000", "c5a584": "c59584", "94b57b": "b57bad", "c5c594": "c394c5", "849c7b": "9c7b9b", - "f7efd6": "f7efd6", "526b42": "6b425f" }, "2": { "73634a": "575370", "5a4a42": "3e3651", "efd6b5": "e3ded8", - "000000": "000000", "c5a584": "b7ada2", "94b57b": "3e6f96", "c5c594": "6b9ab6", diff --git a/public/images/pokemon/variant/286.json b/public/images/pokemon/variant/286.json index c1908f97269..4a3f8a18157 100644 --- a/public/images/pokemon/variant/286.json +++ b/public/images/pokemon/variant/286.json @@ -5,14 +5,10 @@ "639452": "945291", "84213a": "842155", "f7636b": "f763ca", - "000000": "000000", "bd314a": "bd31b7", "b59c7b": "b5857b", "634a3a": "63573a", - "debd8c": "dea98c", - "fff7bd": "fff7bd", - "f7dead": "f7dead", - "ffffff": "ffffff" + "debd8c": "dea98c" }, "2": { "215231": "102141", @@ -20,13 +16,11 @@ "639452": "244162", "84213a": "43206b", "f7636b": "c763cf", - "000000": "000000", "bd314a": "682a88", "b59c7b": "857367", "634a3a": "6b4b3d", "debd8c": "b7ada2", "fff7bd": "f3eee6", - "f7dead": "e3ded8", - "ffffff": "ffffff" + "f7dead": "e3ded8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/29.json b/public/images/pokemon/variant/29.json index 1ed0ecf0d99..1e720505aaa 100644 --- a/public/images/pokemon/variant/29.json +++ b/public/images/pokemon/variant/29.json @@ -5,13 +5,10 @@ "d6d6ff": "f28566", "adadce": "c94d40", "efefff": "fed0aa", - "101010": "101010", "bd314a": "2141ac", "ff5242": "386ecf", - "ffffff": "ffffff", "199c94": "668cdd", - "3a6b94": "3750a4", - "dedede": "dedede" + "3a6b94": "3750a4" }, "2": { "424284": "371e5d", @@ -19,12 +16,9 @@ "d6d6ff": "8175d6", "adadce": "6044ac", "efefff": "b0abff", - "101010": "101010", "bd314a": "c54910", "ff5242": "da781a", - "ffffff": "ffffff", "199c94": "e5b471", - "3a6b94": "c77d3a", - "dedede": "dedede" + "3a6b94": "c77d3a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/290.json b/public/images/pokemon/variant/290.json index d290ab1fef2..ad5c4e2cf9b 100644 --- a/public/images/pokemon/variant/290.json +++ b/public/images/pokemon/variant/290.json @@ -1,7 +1,6 @@ { "0": { "427b52": "0e5502", - "000000": "000000", "b5de73": "77ce53", "6b6b63": "803b0b", "73ad5a": "1e7709", @@ -11,14 +10,12 @@ "fffff7": "fff3ba", "524a4a": "692a05", "cedece": "e5af4f", - "634a42": "634a42", "cebd9c": "f7ecd7", "9c8473": "bfa483", "ad947b": "e8d6b6" }, "1": { "427b52": "7a4f7c", - "000000": "000000", "b5de73": "c3b4c0", "6b6b63": "060931", "73ad5a": "886883", @@ -35,7 +32,6 @@ }, "2": { "427b52": "88134e", - "000000": "000000", "b5de73": "d9537b", "6b6b63": "125460", "73ad5a": "ac265e", diff --git a/public/images/pokemon/variant/292.json b/public/images/pokemon/variant/292.json index 13e73ded788..f4ddafc6ff5 100644 --- a/public/images/pokemon/variant/292.json +++ b/public/images/pokemon/variant/292.json @@ -7,7 +7,6 @@ "5a5242": "261846", "deb573": "5f4c7a", "b5945a": "443859", - "101010": "101010", "f7d684": "8467a4", "94847b": "594684", "736b5a": "1a103b", diff --git a/public/images/pokemon/variant/3-gigantamax.json b/public/images/pokemon/variant/3-gigantamax.json index 9b74b1131ba..ee3f7faa822 100644 --- a/public/images/pokemon/variant/3-gigantamax.json +++ b/public/images/pokemon/variant/3-gigantamax.json @@ -9,14 +9,12 @@ "ff7b73": "712f8f", "de4141": "3f1375", "ffbdbd": "a266b0", - "101010": "101010", "107b6a": "9e1976", "105241": "4f2800", "83de7b": "a37707", "2e5529": "38001c", "5a9c39": "705207", "20b49c": "de3592", - "fdfdfd": "fdfdfd", "5ad5c5": "f062a4" }, "2": { @@ -29,14 +27,12 @@ "ff7b73": "9db042", "de4141": "3c8227", "ffbdbd": "e7e385", - "101010": "101010", "107b6a": "d44300", "105241": "381601", "83de7b": "80ced9", "2e5519": "011c38", "5a9c39": "446b94", "20b49c": "fa8405", - "fdfdfd": "fdfdfd", "5ad5c5": "faa405" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/3.json b/public/images/pokemon/variant/3.json index bdcc30edcbf..c9784ba3382 100644 --- a/public/images/pokemon/variant/3.json +++ b/public/images/pokemon/variant/3.json @@ -7,7 +7,6 @@ "debd29": "078a8f", "bd6b31": "168a69", "de4242": "3f1375", - "101010": "101010", "ffef52": "37d6de", "105242": "190038", "107b6b": "9e1976", @@ -15,8 +14,7 @@ "84de7b": "ff745e", "5ad6c5": "f062a4", "2e5519": "38001c", - "21b59c": "de3592", - "ffffff": "ffffff" + "21b59c": "de3592" }, "2": { "843100": "420514", @@ -26,7 +24,6 @@ "debd29": "a30a66", "bd6b31": "852a41", "de4242": "3c8227", - "101010": "101010", "ffef52": "f75ea8", "105242": "381601", "107b6b": "d44300", @@ -34,7 +31,6 @@ "84de7b": "80ced9", "5ad6c5": "faa405", "2e5519": "011c38", - "21b59c": "fa8405", - "ffffff": "ffffff" + "21b59c": "fa8405" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/30.json b/public/images/pokemon/variant/30.json index d7ebdb40b48..0247dcaae0e 100644 --- a/public/images/pokemon/variant/30.json +++ b/public/images/pokemon/variant/30.json @@ -4,31 +4,23 @@ "c5e6ef": "f28566", "3a5a63": "6b1524", "8cc5ce": "c94d40", - "101010": "101010", "193a73": "3750a4", "1063b5": "131f65", "4a84f7": "668cdd", - "ffffff": "ffffff", "c52110": "2141ac", "ff9c8c": "65a4e7", - "ef4a3a": "386ecf", - "d6d6d6": "d6d6d6", - "848484": "848484" + "ef4a3a": "386ecf" }, "2": { "5a94b5": "402489", "c5e6ef": "8175d6", "3a5a63": "260f4a", "8cc5ce": "6044ac", - "101010": "101010", "193a73": "c77d3a", "1063b5": "883f16", "4a84f7": "e5b471", - "ffffff": "ffffff", "c52110": "c54910", "ff9c8c": "f2ae45", - "ef4a3a": "da781a", - "d6d6d6": "d6d6d6", - "848484": "848484" + "ef4a3a": "da781a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/300.json b/public/images/pokemon/variant/300.json index f015beb050f..28961c7d218 100644 --- a/public/images/pokemon/variant/300.json +++ b/public/images/pokemon/variant/300.json @@ -2,7 +2,6 @@ "0": { "9c3142": "66054d", "7b6342": "663d58", - "101010": "101010", "f79cb5": "ff5959", "f7dead": "e5ced2", "efbd7b": "cca3b0", @@ -15,7 +14,6 @@ "1": { "9c3142": "46518c", "7b6342": "996b82", - "101010": "101010", "f79cb5": "adcad8", "f7dead": "ffffff", "efbd7b": "e5ced2", @@ -28,7 +26,6 @@ "2": { "9c3142": "661422", "7b6342": "1f304c", - "101010": "101010", "f79cb5": "e58f67", "f7dead": "b2dfff", "efbd7b": "7a94cc", diff --git a/public/images/pokemon/variant/301.json b/public/images/pokemon/variant/301.json index 89f742731c2..fddd9e82273 100644 --- a/public/images/pokemon/variant/301.json +++ b/public/images/pokemon/variant/301.json @@ -3,45 +3,36 @@ "634a7b": "991657", "422963": "66054d", "a573c5": "ff5959", - "000000": "000000", "8452a5": "cc3359", "e6b563": "cca3b0", "73523a": "663d58", "fff7bd": "f2e6e6", - "52525a": "52525a", "ffde8c": "e5ced2", "f7f7de": "ffffff", - "9c9c9c": "9c9c9c", "ce944a": "996b82" }, "1": { "634a7b": "948eb2", "422963": "65597f", "a573c5": "ffffff", - "000000": "000000", "8452a5": "cecee5", "e6b563": "cc7a7a", "73523a": "66283d", "fff7bd": "ffcccc", - "52525a": "52525a", "ffde8c": "ffbfb2", "f7f7de": "ffffff", - "9c9c9c": "9c9c9c", "ce944a": "994c59" }, "2": { "634a7b": "ea9360", "422963": "a84859", "a573c5": "f9f8a4", - "000000": "000000", "8452a5": "efbd7c", "e6b563": "597ccc", "73523a": "1f304c", "fff7bd": "99d4ff", - "52525a": "52525a", "ffde8c": "79c6ff", "f7f7de": "ffffff", - "9c9c9c": "9c9c9c", "ce944a": "3a498e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/302-mega.json b/public/images/pokemon/variant/302-mega.json index b54dc545c4d..254c56b23fc 100644 --- a/public/images/pokemon/variant/302-mega.json +++ b/public/images/pokemon/variant/302-mega.json @@ -5,7 +5,6 @@ "ff7587": "f45abe", "ffa8b5": "ff8fcf", "393952": "123812", - "000000": "000000", "5a4a94": "416a3d", "aca4f6": "b2ca9b", "cc3f7c": "90177a", @@ -20,7 +19,6 @@ "ff7587": "3aa9de", "ffa8b5": "61d6f2", "393952": "580a16", - "000000": "000000", "5a4a94": "7e141c", "aca4f6": "e0604e", "cc3f7c": "093a89", diff --git a/public/images/pokemon/variant/302.json b/public/images/pokemon/variant/302.json index 1f27fd23c2a..f058d698135 100644 --- a/public/images/pokemon/variant/302.json +++ b/public/images/pokemon/variant/302.json @@ -3,7 +3,6 @@ "5a4a94": "416a3d", "ada5f7": "b2ca9b", "3a3a52": "123812", - "000000": "000000", "8c73d6": "86ad74", "735aad": "5d8853", "84c5d6": "e560b7", @@ -19,7 +18,6 @@ "5a4a94": "7e141c", "ada5f7": "e0604e", "3a3a52": "580a16", - "000000": "000000", "8c73d6": "be3933", "735aad": "9f2123", "84c5d6": "8a7ad6", diff --git a/public/images/pokemon/variant/303-mega.json b/public/images/pokemon/variant/303-mega.json index cb0b81b464b..cc6709b1d14 100644 --- a/public/images/pokemon/variant/303-mega.json +++ b/public/images/pokemon/variant/303-mega.json @@ -1,15 +1,11 @@ { "0": { "363636": "55163b", - "101010": "101010", "9ca494": "e175b4", "737373": "c14c82", "525252": "6f264f", - "7b5a29": "7b5a29", "ffc55a": "e4c997", "de9441": "ad8867", - "f8f8f8": "f8f8f8", - "cdcdcd": "cdcdcd", "9c4a6a": "1f194c", "d583ac": "31296a", "732041": "201434", @@ -18,15 +14,11 @@ }, "1": { "363636": "0e313c", - "101010": "101010", "9ca494": "4fa285", "737373": "347c7d", "525252": "193e49", - "7b5a29": "7b5a29", "ffc55a": "d6c491", "de9441": "bc8a52", - "f8f8f8": "f8f8f8", - "cdcdcd": "cdcdcd", "9c4a6a": "c73323", "d583ac": "ff725a", "732041": "162843", @@ -35,15 +27,12 @@ }, "2": { "363636": "271a58", - "101010": "101010", "9ca494": "ba94e6", "737373": "8a62d0", "525252": "332c76", "7b5a29": "706d80", "ffc55a": "cfc8e4", "de9441": "b1a3ca", - "f8f8f8": "f8f8f8", - "cdcdcd": "cdcdcd", "9c4a6a": "a81931", "d583ac": "f04948", "732041": "2b1c3f", diff --git a/public/images/pokemon/variant/303.json b/public/images/pokemon/variant/303.json index c5d389b45f7..0422a837887 100644 --- a/public/images/pokemon/variant/303.json +++ b/public/images/pokemon/variant/303.json @@ -9,11 +9,9 @@ "525252": "285c66", "9c4a6b": "b53a29", "7b5a29": "6b5424", - "cecece": "cecece", "ffde8c": "e9e1b5", "bd638c": "de4a42", - "d684ad": "ff635a", - "ffffff": "ffffff" + "d684ad": "ff635a" }, "2": { "000000": "101010", @@ -25,10 +23,8 @@ "525252": "5f43b1", "9c4a6b": "b53a29", "7b5a29": "706d80", - "cecece": "cecece", "ffde8c": "f3e4f7", "bd638c": "de4a42", - "d684ad": "ff635a", - "ffffff": "ffffff" + "d684ad": "ff635a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/304.json b/public/images/pokemon/variant/304.json index 7b03cc133f1..e42b49f5e55 100644 --- a/public/images/pokemon/variant/304.json +++ b/public/images/pokemon/variant/304.json @@ -5,7 +5,6 @@ "8c949c": "bca88c", "3a3a4a": "122919", "ffffff": "fff2e5", - "000000": "000000", "316b9c": "8acc0e", "6bbdff": "d6ff42", "525263": "2c4531", @@ -17,7 +16,6 @@ "8c949c": "686dc0", "3a3a4a": "371219", "ffffff": "cdd9fa", - "000000": "000000", "316b9c": "e9a217", "6bbdff": "ffcf47", "525263": "611f26", @@ -29,7 +27,6 @@ "8c949c": "a45f34", "3a3a4a": "192c45", "ffffff": "ffcc7d", - "000000": "000000", "316b9c": "05b1ad", "6bbdff": "2aebcf", "525263": "2c4368", diff --git a/public/images/pokemon/variant/305.json b/public/images/pokemon/variant/305.json index 13ceb93336c..d4b59c61843 100644 --- a/public/images/pokemon/variant/305.json +++ b/public/images/pokemon/variant/305.json @@ -3,7 +3,6 @@ "6b6b7b": "6c5440", "7b8494": "947d63", "ffffff": "fff2e5", - "000000": "000000", "c5ced6": "cbc4a2", "424a52": "825d3f", "9c9cad": "bca88c", @@ -19,7 +18,6 @@ "6b6b7b": "2b265d", "7b8494": "3d3c8c", "ffffff": "cdd9fa", - "000000": "000000", "c5ced6": "91a1e3", "424a52": "433f93", "9c9cad": "686dc0", @@ -35,7 +33,6 @@ "6b6b7b": "722f15", "7b8494": "89441f", "ffffff": "ffcc7d", - "000000": "000000", "c5ced6": "d2954e", "424a52": "7c3619", "9c9cad": "a45f34", diff --git a/public/images/pokemon/variant/306-mega.json b/public/images/pokemon/variant/306-mega.json index d729c252e2d..a36e49283b6 100644 --- a/public/images/pokemon/variant/306-mega.json +++ b/public/images/pokemon/variant/306-mega.json @@ -2,7 +2,6 @@ "0": { "52524a": "15321e", "6a6a6a": "224228", - "101010": "101010", "5a5a62": "4b382a", "acacac": "69ad6c", "838394": "a48d76", @@ -10,14 +9,11 @@ "8b8b8b": "3e6244", "cdcdcd": "cbc4a2", "a4a4ac": "bca88c", - "6abdff": "ff78fa", - "9c3141": "9c3141", - "de5252": "de5252" + "6abdff": "ff78fa" }, "1": { "52524a": "47121b", "6a6a6a": "6e1e26", - "101010": "101010", "5a5a62": "2b265d", "acacac": "d4857c", "838394": "3d3c8c", @@ -32,7 +28,6 @@ "2": { "52524a": "0e213a", "6a6a6a": "1d365e", - "101010": "101010", "5a5a62": "722f15", "acacac": "7d95bf", "838394": "833d19", @@ -40,8 +35,6 @@ "8b8b8b": "385594", "cdcdcd": "d48e3c", "a4a4ac": "a45f34", - "6abdff": "2aebcf", - "9c3141": "9c3141", - "de5252": "de5252" + "6abdff": "2aebcf" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/306.json b/public/images/pokemon/variant/306.json index 931059f334b..935cb607740 100644 --- a/public/images/pokemon/variant/306.json +++ b/public/images/pokemon/variant/306.json @@ -2,7 +2,6 @@ "0": { "848494": "947d63", "5a5a63": "6c5440", - "000000": "000000", "ffffff": "fff2e5", "cecece": "cbc4a2", "a5a5ad": "bca88c", @@ -17,7 +16,6 @@ "1": { "848494": "3d3c8c", "5a5a63": "2b265d", - "000000": "000000", "ffffff": "cdd9fa", "cecece": "91a1e3", "a5a5ad": "686dc0", @@ -32,7 +30,6 @@ "2": { "848494": "89441f", "5a5a63": "722f15", - "000000": "000000", "ffffff": "ffcc7d", "cecece": "d48e3c", "a5a5ad": "a45f34", diff --git a/public/images/pokemon/variant/307.json b/public/images/pokemon/variant/307.json index d3e6a2437f1..2037cf72054 100644 --- a/public/images/pokemon/variant/307.json +++ b/public/images/pokemon/variant/307.json @@ -1,34 +1,25 @@ { "1": { "7b6b6b": "7a5f5f", - "000000": "000000", "e6dede": "deccc3", "b5adad": "9f8383", - "4a4242": "4a4242", - "ffffff": "ffffff", "3a4a5a": "5a2859", "b5d6ff": "f4a8c8", "6bcee6": "ce7bb0", "d65252": "d65287", - "84424a": "84424a", "3a84b5": "7e4377", - "5aa5ce": "b95ba1", - "d65273": "d65273" + "5aa5ce": "b95ba1" }, "2": { "7b6b6b": "314b76", - "000000": "000000", "e6dede": "c2cfdb", "b5adad": "6f89aa", "4a4242": "1e2f52", - "ffffff": "ffffff", "3a4a5a": "113926", "b5d6ff": "7edfb7", "6bcee6": "66c3a3", "d65252": "c067c7", - "84424a": "84424a", "3a84b5": "375a47", - "5aa5ce": "579578", - "d65273": "d65273" + "5aa5ce": "579578" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/308-mega.json b/public/images/pokemon/variant/308-mega.json index 6e8e6fee4d3..556a06deebf 100644 --- a/public/images/pokemon/variant/308-mega.json +++ b/public/images/pokemon/variant/308-mega.json @@ -1,7 +1,6 @@ { "1": { "83414a": "59141d", - "101010": "101010", "8b838b": "5a4357", "b44a5a": "83272c", "e6738b": "a53835", @@ -13,12 +12,10 @@ "a47329": "722966", "f6de83": "ee9bd5", "eebd5a": "ce5cb6", - "00b4e0": "efa360", - "fcfcff": "fcfcff" + "00b4e0": "efa360" }, "2": { "83414a": "461f5d", - "101010": "101010", "8b838b": "445a7e", "b44a5a": "633971", "e6738b": "7d5187", @@ -30,7 +27,6 @@ "a47329": "205a9e", "f6de83": "5abbef", "eebd5a": "3a8dca", - "00b4e0": "3dc7b6", - "fcfcff": "fcfcff" + "00b4e0": "3dc7b6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/308.json b/public/images/pokemon/variant/308.json index 6f974743a6d..dd647a36e72 100644 --- a/public/images/pokemon/variant/308.json +++ b/public/images/pokemon/variant/308.json @@ -1,7 +1,6 @@ { "2": { "84424a": "461f5d", - "101010": "101010", "e6738c": "7d5187", "ef9ca5": "a37aac", "ce5a73": "71467d", @@ -13,7 +12,6 @@ "b54a5a": "633971", "f7de84": "5abbef", "efbd5a": "3a8dca", - "ffffff": "ffffff", "a57329": "205a9e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/309.json b/public/images/pokemon/variant/309.json index 1a0ff287a78..5eb43b65611 100644 --- a/public/images/pokemon/variant/309.json +++ b/public/images/pokemon/variant/309.json @@ -2,30 +2,24 @@ "1": { "846b42": "a50d24", "ffef42": "ff4039", - "101010": "101010", "639c63": "1a3269", "3a5a52": "091545", "b5ef9c": "6692c4", "84d67b": "3e6194", "cea53a": "d11a2d", "63bd63": "314f86", - "bdbdc5": "bdbdc5", - "ffffff": "ffffff", "844a63": "73033e", "e66ba5": "a40e49" }, "2": { "846b42": "b818ab", "ffef42": "ef60c5", - "101010": "101010", "639c63": "a78ab3", "3a5a52": "593c6c", "b5ef9c": "f9e7ee", "84d67b": "d5c1d9", "cea53a": "d03ab2", "63bd63": "c4abcb", - "bdbdc5": "bdbdc5", - "ffffff": "ffffff", "844a63": "5f2971", "e66ba5": "9954a4" } diff --git a/public/images/pokemon/variant/31.json b/public/images/pokemon/variant/31.json index 53f16a10671..77fe31d599d 100644 --- a/public/images/pokemon/variant/31.json +++ b/public/images/pokemon/variant/31.json @@ -4,27 +4,18 @@ "5ab5ce": "bd94c5", "314a4a": "5f366d", "9cd6de": "eed3f3", - "101010": "101010", "c5ad5a": "c5c5a4", "735a29": "73735a", - "ffffff": "ffffff", - "d6cece": "d6cece", - "a52942": "a52942", "efe6a5": "ffffff", - "ce6b6b": "ce6b6b", - "e6ce8c": "e6e6d5", - "ff9c8c": "ff9c8c" + "e6ce8c": "e6e6d5" }, "1": { "638cad": "88241f", "5ab5ce": "be4234", "314a4a": "441327", "9cd6de": "e58060", - "101010": "101010", "c5ad5a": "c29f9a", "735a29": "734b48", - "ffffff": "ffffff", - "d6cece": "d6cece", "a52942": "6c1a33", "efe6a5": "ffede7", "ce6b6b": "b34d28", @@ -36,11 +27,8 @@ "5ab5ce": "5f4897", "314a4a": "210d3b", "9cd6de": "8770c7", - "101010": "101010", "c5ad5a": "eab56b", "735a29": "ad5923", - "ffffff": "ffffff", - "d6cece": "d6cece", "a52942": "1c3666", "efe6a5": "fff6d6", "ce6b6b": "445fd7", diff --git a/public/images/pokemon/variant/310-mega.json b/public/images/pokemon/variant/310-mega.json index ad22fc10dd0..e17f406097b 100644 --- a/public/images/pokemon/variant/310-mega.json +++ b/public/images/pokemon/variant/310-mega.json @@ -1,12 +1,10 @@ { "1": { "8f6841": "630013", - "101010": "101010", "fff06d": "d4302a", "d0a446": "a6101a", "3d4a75": "0d1843", "b50b0b": "c0610e", - "fcfcfc": "fcfcfc", "4b75a1": "1a3269", "f44242": "ffc058", "52a8d4": "3e6194", @@ -15,12 +13,10 @@ }, "2": { "8f6841": "810040", - "101010": "101010", "fff06d": "e545b6", "d0a446": "c32574", "3d4a75": "3f5476", "b50b0b": "4a0698", - "fcfcfc": "fcfcfc", "4b75a1": "6f8caa", "f44242": "893edf", "52a8d4": "c1ddeb", diff --git a/public/images/pokemon/variant/310.json b/public/images/pokemon/variant/310.json index a41c1e0b66d..40110b45014 100644 --- a/public/images/pokemon/variant/310.json +++ b/public/images/pokemon/variant/310.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736352": "550010", "ffef63": "d7231c", "c5ad5a": "9b0c24", @@ -10,13 +9,10 @@ "639cc5": "284781", "5a84ad": "1a3269", "ce2121": "c0610e", - "ffffff": "ffffff", "ff7373": "ffc058", - "94cede": "5e8fb8", - "bdbde6": "bdbde6" + "94cede": "5e8fb8" }, "2": { - "101010": "101010", "736352": "810040", "ffef63": "e545b6", "c5ad5a": "c32574", @@ -26,9 +22,7 @@ "639cc5": "c4bfd9", "5a84ad": "a399bd", "ce2121": "893edf", - "ffffff": "ffffff", "ff7373": "9663ef", - "94cede": "e2e7f9", - "bdbde6": "bdbde6" + "94cede": "e2e7f9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/311.json b/public/images/pokemon/variant/311.json index 4371be50e3b..474932256f9 100644 --- a/public/images/pokemon/variant/311.json +++ b/public/images/pokemon/variant/311.json @@ -3,36 +3,29 @@ "b53131": "c24e9e", "de4a42": "e070a9", "ef8484": "f89bc2", - "101010": "101010", "ffefb5": "feda99", "7b6352": "c08242", "e6c573": "ebb657", - "b59c63": "c08242", - "ffffff": "ffffff", - "ad4229": "ad4229" + "b59c63": "c08242" }, "1": { "b53131": "b7653c", "de4a42": "d17e4d", "ef8484": "efa772", - "101010": "101010", "ffefb5": "e9f5ff", "7b6352": "7e89bc", "e6c573": "becef1", "b59c63": "7e89bc", - "ffffff": "ffffff", "ad4229": "ac4b1b" }, "2": { "b53131": "b7ac55", "de4a42": "e2dba3", "ef8484": "fbf6e0", - "101010": "101010", "ffefb5": "be4637", "7b6352": "620b05", "e6c573": "891e32", "b59c63": "620b05", - "ffffff": "ffffff", "ad4229": "220400" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/312.json b/public/images/pokemon/variant/312.json index d55b0f800de..8dbb8503a8c 100644 --- a/public/images/pokemon/variant/312.json +++ b/public/images/pokemon/variant/312.json @@ -2,12 +2,10 @@ "1": { "4252de": "533bb0", "739cf7": "c5ade5", - "101010": "101010", "5a84ef": "8f6cd0", "ffefb5": "d7f1ff", "7b7352": "74acac", "b59c63": "93c6da", - "ffffff": "ffffff", "e6c573": "b4dfe5", "a52921": "533bb0", "d64a5a": "8f6cd0" @@ -15,12 +13,10 @@ "2": { "4252de": "7cc5a5", "739cf7": "e6f8ee", - "101010": "101010", "5a84ef": "c4ddd2", "ffefb5": "475aad", "7b7352": "031426", "b59c63": "011f45", - "ffffff": "ffffff", "e6c573": "2e3a7f", "a52921": "031426", "d64a5a": "e6f8ee" diff --git a/public/images/pokemon/variant/315.json b/public/images/pokemon/variant/315.json index 4fb39ab46d1..cb4ffeb75b2 100644 --- a/public/images/pokemon/variant/315.json +++ b/public/images/pokemon/variant/315.json @@ -4,7 +4,6 @@ "3a5229": "0b2337", "a5314a": "9c5910", "a5de73": "4d8393", - "000000": "000000", "f75a84": "d28f31", "ffa5bd": "efc754", "73c55a": "215569", @@ -21,7 +20,6 @@ "3a5229": "2f1c52", "a5314a": "9c2407", "a5de73": "9e76bb", - "000000": "000000", "f75a84": "cb5a1b", "ffa5bd": "ec883b", "73c55a": "764f9c", diff --git a/public/images/pokemon/variant/320.json b/public/images/pokemon/variant/320.json index 51967d7420d..a1e4101e6c1 100644 --- a/public/images/pokemon/variant/320.json +++ b/public/images/pokemon/variant/320.json @@ -5,12 +5,8 @@ "4a84b5": "ce323d", "315a94": "a4172f", "21314a": "510019", - "000000": "000000", - "b5bdc5": "b5bdc5", "6b634a": "6c3f51", - "ffffff": "ffffff", "efd6a5": "ffe6f8", - "848c9c": "848c9c", "ffefce": "ffeef7", "ceb584": "cba6b8", "9c8c63": "986a7a" @@ -21,12 +17,8 @@ "4a84b5": "503769", "315a94": "34224b", "21314a": "1a0a30", - "000000": "000000", - "b5bdc5": "b5bdc5", "6b634a": "4d4056", - "ffffff": "ffffff", "efd6a5": "eed9ef", - "848c9c": "848c9c", "ffefce": "fcebf6", "ceb584": "b7a3bf", "9c8c63": "8c7897" diff --git a/public/images/pokemon/variant/321.json b/public/images/pokemon/variant/321.json index 946b3d5278a..97c17c6df7d 100644 --- a/public/images/pokemon/variant/321.json +++ b/public/images/pokemon/variant/321.json @@ -10,9 +10,7 @@ "d6cede": "d3b5c4", "94adff": "f5796d", "524a4a": "5c263d", - "efe6ff": "ffe6f8", - "101010": "101010", - "29527b": "29527b" + "efe6ff": "ffe6f8" }, "2": { "293a9c": "22123a", @@ -25,8 +23,6 @@ "d6cede": "eed9ef", "94adff": "b484ce", "524a4a": "563564", - "efe6ff": "fcebf6", - "101010": "101010", - "29527b": "29527b" + "efe6ff": "fcebf6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/327.json b/public/images/pokemon/variant/327.json index 14d757e1002..a206d228e4b 100644 --- a/public/images/pokemon/variant/327.json +++ b/public/images/pokemon/variant/327.json @@ -2,7 +2,6 @@ "1": { "7b4231": "0a1b2e", "e6d6a5": "b2dcd7", - "101010": "101010", "735242": "122c3b", "cea573": "6ca9ac", "e66373": "df6341", @@ -13,7 +12,6 @@ "2": { "7b4231": "522014", "e6d6a5": "be5f3c", - "101010": "101010", "735242": "52180f", "cea573": "93381f", "e66373": "de625a", diff --git a/public/images/pokemon/variant/328.json b/public/images/pokemon/variant/328.json index 667a4f50828..23403188ba8 100644 --- a/public/images/pokemon/variant/328.json +++ b/public/images/pokemon/variant/328.json @@ -4,25 +4,17 @@ "ff947b": "ffffbc", "ef7342": "c9da97", "734242": "254226", - "212121": "212121", - "292929": "292929", "cecec5": "e99339", - "ffffff": "ffffff", "a5ada5": "bc6427", - "848484": "89370b", - "424231": "424231" + "848484": "89370b" }, "2": { "c55a4a": "3e9cb7", "ff947b": "84f6e4", "ef7342": "5dd7db", "734242": "17465e", - "212121": "212121", - "292929": "292929", "cecec5": "e4a056", - "ffffff": "ffffff", "a5ada5": "cd7537", - "848484": "a84e20", - "424231": "424231" + "848484": "a84e20" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/329.json b/public/images/pokemon/variant/329.json index 48f3d8d04d6..25117a4e0d4 100644 --- a/public/images/pokemon/variant/329.json +++ b/public/images/pokemon/variant/329.json @@ -9,8 +9,6 @@ "737352": "1e4320", "bdad7b": "89af58", "e6d68c": "b6cd74", - "bdbdde": "bdbdde", - "ffffff": "ffffff", "ffffa5": "f0f088", "94de84": "fdfb89" } diff --git a/public/images/pokemon/variant/330.json b/public/images/pokemon/variant/330.json index 71dfe226dfc..9d7bde24554 100644 --- a/public/images/pokemon/variant/330.json +++ b/public/images/pokemon/variant/330.json @@ -3,13 +3,11 @@ "84293a": "752d0c", "315a5a": "7a4205", "de6373": "e99339", - "101010": "101010", "6ba573": "d8b430", "5a7b52": "8b6009", "ce3a4a": "bc6427", "94d69c": "f6e85f", "b5de73": "e4ee9e", - "ffffff": "ffffff", "ffa5b5": "f5cd2d", "8ca552": "b3c46a", "84bd63": "8aa963", @@ -20,13 +18,11 @@ "84293a": "a84e20", "315a5a": "171997", "de6373": "f79021", - "101010": "101010", "6ba573": "465fd4", "5a7b52": "2836af", "ce3a4a": "cd7537", "94d69c": "80a1f5", "b5de73": "94e3ff", - "ffffff": "ffffff", "ffa5b5": "ffd52c", "8ca552": "4dabe8", "84bd63": "3587a9", diff --git a/public/images/pokemon/variant/333.json b/public/images/pokemon/variant/333.json index ca25669dfcb..a3df7bf0e4c 100644 --- a/public/images/pokemon/variant/333.json +++ b/public/images/pokemon/variant/333.json @@ -7,9 +7,7 @@ "cecee6": "5251bd", "7bceff": "e9d9fa", "63ade6": "cab1ec", - "101010": "101010", - "848494": "392166", - "5a5a73": "5a5a73" + "848494": "392166" }, "2": { "9c9cc5": "bf6744", @@ -19,8 +17,6 @@ "cecee6": "eb9d6a", "7bceff": "ff9ebd", "63ade6": "e677a5", - "101010": "101010", - "848494": "892f26", - "5a5a73": "5a5a73" + "848494": "892f26" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/334-mega.json b/public/images/pokemon/variant/334-mega.json index dff8102c90b..67a27b7e7a8 100644 --- a/public/images/pokemon/variant/334-mega.json +++ b/public/images/pokemon/variant/334-mega.json @@ -11,7 +11,6 @@ "c1e8f4": "ff93ac", "deadc4": "c63057", "a4889f": "7c103a", - "ffc5ee": "e7536d", - "101010": "101010" + "ffc5ee": "e7536d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/336.json b/public/images/pokemon/variant/336.json index bcdd68e2035..45fb50d25eb 100644 --- a/public/images/pokemon/variant/336.json +++ b/public/images/pokemon/variant/336.json @@ -9,11 +9,9 @@ "3a4252": "4c2e57", "735a94": "908ea4", "a573e6": "d5cce0", - "000000": "000000", "631919": "20525a", "ad423a": "2d6a77", "d6524a": "108bac", - "ffffff": "ffffff", "de4252": "60bdd6" }, "2": { @@ -26,11 +24,9 @@ "3a4252": "acb4cd", "735a94": "b43952", "a573e6": "e6628b", - "000000": "000000", "631919": "192121", "ad423a": "293131", "d6524a": "5a6262", - "ffffff": "ffffff", "de4252": "8b9494" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/337.json b/public/images/pokemon/variant/337.json index 4681d4cd48d..bb48121d2b8 100644 --- a/public/images/pokemon/variant/337.json +++ b/public/images/pokemon/variant/337.json @@ -5,7 +5,6 @@ "efde8c": "8396a8", "846b42": "161617", "cebd6b": "505c71", - "101010": "101010", "3a423a": "20282b", "841029": "611267", "d65a73": "ec40c7", @@ -17,7 +16,6 @@ "efde8c": "a63c22", "846b42": "2f0616", "cebd6b": "8a1211", - "101010": "101010", "3a423a": "341413", "841029": "08adad", "d65a73": "73ffff", diff --git a/public/images/pokemon/variant/338.json b/public/images/pokemon/variant/338.json index d511e24c4a3..827850a08bf 100644 --- a/public/images/pokemon/variant/338.json +++ b/public/images/pokemon/variant/338.json @@ -1,7 +1,6 @@ { "1": { "634a19": "2b272d", - "101010": "101010", "f7e663": "8d8b7f", "deb519": "605a4a", "c59442": "404042", @@ -16,7 +15,6 @@ }, "2": { "634a19": "80849a", - "101010": "101010", "f7e663": "dbe4ee", "deb519": "b1becb", "c59442": "96a2ae", diff --git a/public/images/pokemon/variant/339.json b/public/images/pokemon/variant/339.json index fb1ecc7e5b7..a1040be47d3 100644 --- a/public/images/pokemon/variant/339.json +++ b/public/images/pokemon/variant/339.json @@ -3,7 +3,6 @@ "315a84": "764c27", "1073ad": "8f612a", "31b5e6": "bba665", - "000000": "000000", "63cef7": "ebd48e", "293142": "3e1e1e", "525252": "322c22", @@ -16,9 +15,7 @@ "315a84": "402769", "1073ad": "762c9f", "31b5e6": "ff7bcd", - "000000": "000000", "63cef7": "fbabcc", - "293142": "293142", "525252": "413aad", "d6d6de": "aaffd5", "bdbdc5": "5bd5d5", diff --git a/public/images/pokemon/variant/340.json b/public/images/pokemon/variant/340.json index e53a744da32..d6fc747d6f9 100644 --- a/public/images/pokemon/variant/340.json +++ b/public/images/pokemon/variant/340.json @@ -6,14 +6,12 @@ "29314a": "302322", "84deff": "e27f9f", "73ade6": "bd5f55", - "000000": "000000", "3a4a9c": "443636", "637bce": "856d6d", "4263b5": "655050", "adb584": "d7ac74", "6384bd": "885b57", "7bb5e6": "885b57", - "ffffff": "ffffff", "ce4a5a": "9360c1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/35.json b/public/images/pokemon/variant/35.json index c229263e3d7..f00e064f41a 100644 --- a/public/images/pokemon/variant/35.json +++ b/public/images/pokemon/variant/35.json @@ -6,10 +6,8 @@ "ffd6bd": "c7a1e4", "5a3121": "20475b", "9c8473": "72899d", - "101010": "101010", "ffadad": "9786e3", "949494": "40496b", - "ffffff": "ffffff", "ef423a": "ed9abb", "b53a29": "a14795" } diff --git a/public/images/pokemon/variant/351-rainy.json b/public/images/pokemon/variant/351-rainy.json index 426db252603..27494952faa 100644 --- a/public/images/pokemon/variant/351-rainy.json +++ b/public/images/pokemon/variant/351-rainy.json @@ -1,16 +1,11 @@ { "0": { "526384": "527384", - "8ccede": "8ccede", - "84b5c5": "84b5c5", - "3a425a": "3a425a", - "ffffff": "ffffff", "6373bd": "379aa9", "94b5ce": "5fd4b5", "738cd6": "48c2b4", "ceeff7": "79ff5e", "5a5a52": "4f555a", - "191919": "191919", "b5c5de": "85de7e", "c5c5c5": "9db4c5", "948c94": "6b8494" diff --git a/public/images/pokemon/variant/351-snowy.json b/public/images/pokemon/variant/351-snowy.json index a5d57b3d9b0..bb28819e69c 100644 --- a/public/images/pokemon/variant/351-snowy.json +++ b/public/images/pokemon/variant/351-snowy.json @@ -1,17 +1,10 @@ { "0": { - "73a58c": "73a58c", "bde6e6": "bee3e6", - "8ccead": "8ccead", - "29523a": "29523a", - "52736b": "52736b", - "191919": "191919", "634a73": "4a4a73", "8c73d6": "738cd6", "c5b5ff": "f7ff7e", "7b52bd": "5260bd", - "4a524a": "4a524a", - "ffffff": "ffffff", "9c9cc5": "c8c87a" }, "1": { @@ -20,14 +13,10 @@ "8ccead": "c4dcdc", "29523a": "335c68", "52736b": "688e94", - "191919": "191919", "634a73": "1f2567", "8c73d6": "3f59a0", - "c5b5ff": "c5b5ff", "7b52bd": "323e85", - "4a524a": "2f3355", - "ffffff": "ffffff", - "9c9cc5": "9c9cc5" + "4a524a": "2f3355" }, "2": { "73a58c": "245b68", @@ -35,13 +24,11 @@ "8ccead": "47989e", "29523a": "15364b", "52736b": "5e98a5", - "191919": "191919", "634a73": "2f4954", "8c73d6": "b6e7e8", "c5b5ff": "535c85", "7b52bd": "7eafbf", "4a524a": "27255c", - "ffffff": "ffffff", "9c9cc5": "464d85" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/351-sunny.json b/public/images/pokemon/variant/351-sunny.json index bbee6a647bf..a35a050752d 100644 --- a/public/images/pokemon/variant/351-sunny.json +++ b/public/images/pokemon/variant/351-sunny.json @@ -6,7 +6,6 @@ "ffffff": "f0dee7", "d6844a": "d6994a", "ff9c42": "ff566c", - "191919": "191919", "ef7b4a": "ff566c", "fff76b": "ffb282", "ce5a4a": "bf4b6a", diff --git a/public/images/pokemon/variant/352.json b/public/images/pokemon/variant/352.json index a265711a49c..24e7d7960b9 100644 --- a/public/images/pokemon/variant/352.json +++ b/public/images/pokemon/variant/352.json @@ -2,24 +2,20 @@ "0": { "8c7b5a": "824c0b", "42635a": "296161", - "000000": "000000", "f7ef7b": "f7dd7b", "5abd73": "5db5a8", "5a9473": "418b87", "dec55a": "e5b740", "bda552": "cd9a2b", - "c5de7b": "c5de7b", "7bd684": "7bd6b4", "a5ef9c": "9cefbc", "a54284": "296389", "73315a": "0e3354", - "d663ad": "54a3ca", - "ffffff": "ffffff" + "d663ad": "54a3ca" }, "1": { "8c7b5a": "7b2577", "42635a": "762f0f", - "000000": "000000", "f7ef7b": "ed7cd8", "5abd73": "c98640", "5a9473": "a7612a", @@ -30,13 +26,11 @@ "a5ef9c": "ffd577", "a54284": "3d48b2", "73315a": "202065", - "d663ad": "8597d6", - "ffffff": "ffffff" + "d663ad": "8597d6" }, "2": { "8c7b5a": "307855", "42635a": "58214c", - "000000": "000000", "f7ef7b": "affec6", "5abd73": "d775b5", "5a9473": "b45599", @@ -47,7 +41,6 @@ "a5ef9c": "ffd2ee", "a54284": "64152b", "73315a": "400e2a", - "d663ad": "ab2f43", - "ffffff": "ffffff" + "d663ad": "ab2f43" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/353.json b/public/images/pokemon/variant/353.json index 09a77ba1f2b..c3ba675384e 100644 --- a/public/images/pokemon/variant/353.json +++ b/public/images/pokemon/variant/353.json @@ -1,7 +1,6 @@ { "1": { "635a8c": "9c4572", - "000000": "000000", "a5add6": "e2a8b2", "8484ad": "d57b96", "3a4a7b": "5c203e", @@ -17,7 +16,6 @@ }, "2": { "635a8c": "487c5d", - "000000": "000000", "a5add6": "b8c2a8", "8484ad": "93aa7f", "3a4a7b": "1d4547", diff --git a/public/images/pokemon/variant/354-mega.json b/public/images/pokemon/variant/354-mega.json index a781dfe624c..25e03fcfe31 100644 --- a/public/images/pokemon/variant/354-mega.json +++ b/public/images/pokemon/variant/354-mega.json @@ -3,7 +3,6 @@ "4d464f": "592145", "523900": "361a2d", "7c777d": "934861", - "010101": "010101", "d59c39": "7d656d", "eebd5a": "b78d90", "7b5a29": "624858", @@ -12,14 +11,12 @@ "918c92": "b0697b", "d74477": "37838b", "ea7bb6": "73bdbd", - "f9f9f9": "f9f9f9", "80313d": "1c4d5d" }, "2": { "4d464f": "5b777b", "523900": "151433", "7c777d": "9cbf81", - "010101": "010101", "d59c39": "3b3d54", "eebd5a": "4d4f5b", "7b5a29": "292941", diff --git a/public/images/pokemon/variant/354.json b/public/images/pokemon/variant/354.json index f51713573a2..50a835ce22b 100644 --- a/public/images/pokemon/variant/354.json +++ b/public/images/pokemon/variant/354.json @@ -4,11 +4,9 @@ "3a3142": "2e0920", "9c9ca5": "934861", "7b7b84": "6c2f4c", - "000000": "000000", "b5adbd": "b0697b", "ad293a": "00667f", "c5425a": "1697a6", - "ffffff": "ffffff", "e66373": "6bc1c9", "523a00": "361a2d", "a57b10": "715568", @@ -21,7 +19,6 @@ "3a3142": "2b454a", "9c9ca5": "9ed18a", "7b7b84": "84bd95", - "000000": "000000", "b5adbd": "cbeab9", "ad293a": "4f0209", "c5425a": "751a1c", diff --git a/public/images/pokemon/variant/357.json b/public/images/pokemon/variant/357.json index a731ebf1aed..00bcf93bbde 100644 --- a/public/images/pokemon/variant/357.json +++ b/public/images/pokemon/variant/357.json @@ -5,7 +5,6 @@ "52ad52": "f5c266", "3a8c4a": "e58b48", "6bc56b": "ffeeae", - "ffffff": "ffffff", "523a31": "754a30", "947352": "eeccab", "b5946b": "ffefd5", @@ -18,12 +17,10 @@ "ffff6b": "b5feff" }, "2": { - "000000": "000000", "216321": "101121", "52ad52": "2d3c5c", "3a8c4a": "1f2547", "6bc56b": "48637c", - "ffffff": "ffffff", "523a31": "28345c", "947352": "45899e", "b5946b": "78c9c9", diff --git a/public/images/pokemon/variant/358.json b/public/images/pokemon/variant/358.json index fcca3087804..918899dd73a 100644 --- a/public/images/pokemon/variant/358.json +++ b/public/images/pokemon/variant/358.json @@ -5,7 +5,6 @@ "ffe694": "faedcd", "ffd65a": "ebd4b0", "000000": "101010", - "ffffff": "ffffff", "424a6b": "29346b", "c5e6ff": "afadcd", "9cc5e6": "888ab1", @@ -21,7 +20,6 @@ "ffe694": "f4c89d", "ffd65a": "ee9b65", "000000": "101010", - "ffffff": "ffffff", "424a6b": "5b4950", "c5e6ff": "e8d6d6", "9cc5e6": "c29ea6", diff --git a/public/images/pokemon/variant/36.json b/public/images/pokemon/variant/36.json index 81d6431641d..c307da0c807 100644 --- a/public/images/pokemon/variant/36.json +++ b/public/images/pokemon/variant/36.json @@ -2,7 +2,6 @@ "1": { "52423a": "335566", "de6363": "6638a6", - "101010": "101010", "7b6b63": "617c91", "ffc5b5": "b098e3", "8c4a52": "382275", @@ -10,7 +9,6 @@ "52314a": "3c4259", "d67ba5": "4ca49c", "bd5a7b": "427273", - "ffffff": "ffffff", "d67b8c": "7e62cc", "de3a5a": "db74ab", "848484": "4d5f9d" @@ -18,17 +16,13 @@ "2": { "52423a": "59435c", "de6363": "958fe6", - "101010": "101010", "7b6b63": "ab6f83", "ffc5b5": "e5faf2", "8c4a52": "7e4b9c", "ef9494": "abcbff", - "52314a": "52314a", "d67ba5": "f5c4e0", "bd5a7b": "d1829b", - "ffffff": "ffffff", "d67b8c": "958fe6", - "de3a5a": "ed746f", - "848484": "848484" + "de3a5a": "ed746f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/361.json b/public/images/pokemon/variant/361.json index a3ea63cc61a..268ee73604d 100644 --- a/public/images/pokemon/variant/361.json +++ b/public/images/pokemon/variant/361.json @@ -4,24 +4,19 @@ "94634a": "851d63", "ffefa5": "f5a4c6", "efc56b": "c36193", - "000000": "000000", "ff735a": "ffe7b2", "3a3131": "2e161b", "4a4a4a": "4b2d2d", "b55a31": "ddb478", "737373": "5c413e", "8cd6ff": "ffd1a9", - "4294d6": "dd6f2c", - "dedede": "dedede", - "ffffff": "ffffff", - "b5adad": "b5adad" + "4294d6": "dd6f2c" }, "2": { "ce8c5a": "0f2b0d", "94634a": "08250b", "ffefa5": "5f884c", "efc56b": "1f4419", - "000000": "000000", "ff735a": "071f12", "3a3131": "2c3e38", "4a4a4a": "8c9f94", diff --git a/public/images/pokemon/variant/362-mega.json b/public/images/pokemon/variant/362-mega.json index 9352e485dc6..b3f4144f46f 100644 --- a/public/images/pokemon/variant/362-mega.json +++ b/public/images/pokemon/variant/362-mega.json @@ -17,7 +17,6 @@ "20315e": "460025" }, "2": { - "010101": "010101", "2b74a8": "0c4b3a", "bbeeff": "5ce11a", "393941": "221315", diff --git a/public/images/pokemon/variant/369.json b/public/images/pokemon/variant/369.json index 1be34201a4b..9c1c0339ac7 100644 --- a/public/images/pokemon/variant/369.json +++ b/public/images/pokemon/variant/369.json @@ -4,7 +4,6 @@ "efcea5": "757e99", "ceb594": "4b5368", "52423a": "16181d", - "000000": "000000", "524242": "91603c", "b59c9c": "fcbc8e", "8c734a": "282f41", @@ -21,7 +20,6 @@ "efcea5": "85a558", "ceb594": "6b8745", "52423a": "4b523a", - "000000": "000000", "524242": "21234a", "b59c9c": "5459a2", "8c734a": "42532c", diff --git a/public/images/pokemon/variant/37.json b/public/images/pokemon/variant/37.json index e82a2f00914..447b7cb09e5 100644 --- a/public/images/pokemon/variant/37.json +++ b/public/images/pokemon/variant/37.json @@ -6,12 +6,10 @@ "5a3100": "511f4c", "f7bd7b": "f2b4e4", "e6946b": "dc91d5", - "101010": "101010", "845231": "743a67", "ff945a": "c18fcf", "bd735a": "ba6cbd", "a57342": "865175", - "ffffff": "ffffff", "ffe6b5": "e8e0d1", "ffde94": "d4c5b6" }, @@ -22,12 +20,10 @@ "5a3100": "100f1b", "f7bd7b": "68689f", "e6946b": "45457c", - "101010": "101010", "845231": "1b1b47", "ff945a": "a8516c", "bd735a": "33325e", "a57342": "2a3457", - "ffffff": "ffffff", "ffe6b5": "d8e4e8", "ffde94": "9fb3c1" } diff --git a/public/images/pokemon/variant/370.json b/public/images/pokemon/variant/370.json index 946ff2d9385..10c1dc5613c 100644 --- a/public/images/pokemon/variant/370.json +++ b/public/images/pokemon/variant/370.json @@ -3,11 +3,9 @@ "a56b52": "3b766b", "733a31": "173f3d", "ffc5d6": "a1edc6", - "000000": "000000", "f794b5": "82d7b4", "e6739c": "52a08a", "314aad": "a1221e", - "ffffff": "ffffff", "295af7": "e36f50", "e6adde": "d6e1e0", "c5738c": "235b57", @@ -17,7 +15,6 @@ "a56b52": "49529f", "733a31": "2b3179", "ffc5d6": "bfcded", - "000000": "000000", "f794b5": "9dadd9", "e6739c": "6b7cbc", "314aad": "6c1e4a", diff --git a/public/images/pokemon/variant/371.json b/public/images/pokemon/variant/371.json index bf2eeace213..e312d9ba79d 100644 --- a/public/images/pokemon/variant/371.json +++ b/public/images/pokemon/variant/371.json @@ -4,33 +4,25 @@ "4a5263": "4f342a", "f7f7ff": "fff8ec", "d6cede": "ead1b5", - "000000": "000000", "a59cb5": "bc997e", "5a84ad": "a8662e", "efde6b": "375794", - "ffffff": "ffffff", "bda573": "28407d", "63ade6": "d19656", "94d6ff": "efc687", - "847352": "2e4688", - "9c4219": "9c4219", - "d67342": "d67342" + "847352": "2e4688" }, "2": { "849494": "89624e", "4a5263": "55111e", "f7f7ff": "f4ecd1", "d6cede": "eacb8e", - "000000": "000000", "a59cb5": "c79961", "5a84ad": "8c2736", "efde6b": "fff9e5", - "ffffff": "ffffff", "bda573": "c79961", "63ade6": "b33c47", "94d6ff": "c7515c", - "847352": "e5cdab", - "9c4219": "9c4219", - "d67342": "d67342" + "847352": "e5cdab" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/372.json b/public/images/pokemon/variant/372.json index b638e142324..ced469a4d09 100644 --- a/public/images/pokemon/variant/372.json +++ b/public/images/pokemon/variant/372.json @@ -1,7 +1,6 @@ { "1": { "525263": "704a3b", - "191919": "191919", "d6d6d6": "ead1b5", "adadb5": "bc997e", "7b7384": "99755e", @@ -9,14 +8,12 @@ "4a423a": "5e2710", "efe663": "61caf7", "7b7b73": "d19656", - "ffffce": "ffffce", "ad2942": "28407d", "63313a": "182759", "bd4252": "375794" }, "2": { "525263": "7b4e2e", - "191919": "191919", "d6d6d6": "f2d9a9", "adadb5": "d0a674", "7b7384": "a16f44", @@ -24,7 +21,6 @@ "4a423a": "501116", "efe663": "ffaf4a", "7b7b73": "b03d48", - "ffffce": "ffffce", "ad2942": "e4d9c0", "63313a": "885b63", "bd4252": "fff9e5" diff --git a/public/images/pokemon/variant/373.json b/public/images/pokemon/variant/373.json index e9338f0a933..c9d64ce41b2 100644 --- a/public/images/pokemon/variant/373.json +++ b/public/images/pokemon/variant/373.json @@ -4,13 +4,11 @@ "de8494": "4572a2", "bd526b": "1c4076", "a53a4a": "132760", - "191919": "191919", "29637b": "66300e", "42849c": "9f5727", "84cee6": "f3be6d", "4aa5ce": "c77939", "adada5": "f1dbc0", - "ffffff": "ffffff", "832041": "66162b", "cb3f51": "ba415d", "d95b6b": "cd5d6b", @@ -22,13 +20,11 @@ "de8494": "fff5fb", "bd526b": "ddc9d5", "a53a4a": "b596ab", - "191919": "191919", "29637b": "310823", "42849c": "420c26", "84cee6": "8b2539", "4aa5ce": "631734", "adada5": "ddbc94", - "ffffff": "ffffff", "832041": "761c6f", "cb3f51": "ae369a", "d95b6b": "d95bb2", diff --git a/public/images/pokemon/variant/374.json b/public/images/pokemon/variant/374.json index a1947b28e06..7e9f119c384 100644 --- a/public/images/pokemon/variant/374.json +++ b/public/images/pokemon/variant/374.json @@ -4,7 +4,6 @@ "424a84": "550611", "94b5ef": "ff795f", "4a6ba5": "851421", - "101010": "101010", "73b5f7": "eb4c43", "ff6b6b": "67ffe2", "844a4a": "13a4c3", @@ -20,7 +19,6 @@ "424a84": "0d4346", "94b5ef": "7ef5d1", "4a6ba5": "1e716e", - "101010": "101010", "73b5f7": "70e1bf", "ff6b6b": "41ed76", "844a4a": "11c23f", diff --git a/public/images/pokemon/variant/375.json b/public/images/pokemon/variant/375.json index 3708ec8f9b3..50925a63629 100644 --- a/public/images/pokemon/variant/375.json +++ b/public/images/pokemon/variant/375.json @@ -1,8 +1,6 @@ { "1": { "636b8c": "8d4010", - "c5c5ce": "c5c5ce", - "101010": "101010", "ffffff": "ffed80", "3a426b": "550611", "9c9cad": "ce7c29", @@ -18,7 +16,6 @@ "2": { "636b8c": "7e280e", "c5c5ce": "eb763d", - "101010": "101010", "ffffff": "ffb752", "3a426b": "0d4346", "9c9cad": "bd582c", diff --git a/public/images/pokemon/variant/376-mega.json b/public/images/pokemon/variant/376-mega.json index 6ec3c34f4b5..a97bec70294 100644 --- a/public/images/pokemon/variant/376-mega.json +++ b/public/images/pokemon/variant/376-mega.json @@ -7,7 +7,6 @@ "736a73": "703b08", "cdcdcd": "ffc753", "a1a1a1": "a76911", - "101010": "101010", "e7e7e7": "ffe07c", "b44100": "8d4010", "e69c00": "ce7c29", @@ -23,7 +22,6 @@ "736a73": "6f2c17", "cdcdcd": "f57e37", "a1a1a1": "9f4219", - "101010": "101010", "e7e7e7": "ffdb64", "b44100": "962c10", "e69c00": "d6632a", diff --git a/public/images/pokemon/variant/376.json b/public/images/pokemon/variant/376.json index 71c925078aa..92eee45c942 100644 --- a/public/images/pokemon/variant/376.json +++ b/public/images/pokemon/variant/376.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "313a63": "550611", "7ba5f7": "ea4037", "4a84c5": "bf2e2d", @@ -16,7 +15,6 @@ "948c94": "a76911" }, "2": { - "101010": "101010", "313a63": "0b3739", "7ba5f7": "67ddbe", "4a84c5": "41b4a1", diff --git a/public/images/pokemon/variant/38.json b/public/images/pokemon/variant/38.json index 0d9c4c3f940..998b005aa2b 100644 --- a/public/images/pokemon/variant/38.json +++ b/public/images/pokemon/variant/38.json @@ -1,11 +1,9 @@ { "1": { "846319": "613260", - "101010": "101010", "e6c552": "ca91ba", "f7e67b": "f0c2dc", "ce9c4a": "b16da0", - "ffffff": "ffffff", "b51000": "3c44d9", "de2110": "368abd", "ff6b29": "3664bd", @@ -14,11 +12,9 @@ }, "2": { "846319": "0b0b2a", - "101010": "101010", "e6c552": "293272", "f7e67b": "3f548b", "ce9c4a": "1a1a52", - "ffffff": "ffffff", "b51000": "e3382d", "de2110": "b83e0e", "ff6b29": "a42920", diff --git a/public/images/pokemon/variant/380-mega.json b/public/images/pokemon/variant/380-mega.json index bf71ded9127..1a0adffe295 100644 --- a/public/images/pokemon/variant/380-mega.json +++ b/public/images/pokemon/variant/380-mega.json @@ -1,27 +1,23 @@ { "1": { "525e61": "9a6853", - "101010": "101010", "d3d9dc": "f3e6df", "a0a7a9": "e3cfc1", "7d8486": "b48f79", "523977": "97440c", "784db9": "b35e17", "9876c6": "d08528", - "fafafa": "fafafa", "cda44a": "6734bf", "ffcd5a": "9b75ff" }, "2": { "525e61": "8d5a8f", - "101010": "101010", "d3d9dc": "eedaea", "a0a7a9": "e4c7e1", "7d8486": "c78ac4", "523977": "2393a2", "784db9": "2cbcbd", "9876c6": "5de2d5", - "fafafa": "fafafa", "cda44a": "dd6800", "ffcd5a": "e88a00" } diff --git a/public/images/pokemon/variant/380.json b/public/images/pokemon/variant/380.json index 1fe2df47529..4468edd6b3a 100644 --- a/public/images/pokemon/variant/380.json +++ b/public/images/pokemon/variant/380.json @@ -2,7 +2,6 @@ "1": { "7b73a5": "896d62", "efefff": "f3e6df", - "000000": "000000", "ceceef": "e3cfc1", "8c294a": "741c00", "ff6363": "cb621c", @@ -10,7 +9,6 @@ "ffa573": "e18459", "bd4242": "8e2c03", "cea54a": "7646e5", - "ffffff": "ffffff", "ffce5a": "9b75ff", "ada5d6": "ac9485", "73adef": "a480f8", @@ -19,7 +17,6 @@ "2": { "7b73a5": "ad5682", "efefff": "f2bddf", - "000000": "000000", "ceceef": "d899bd", "8c294a": "480a81", "ff6363": "9344b8", @@ -27,7 +24,6 @@ "ffa573": "862b99", "bd4242": "5a1e8c", "cea54a": "ab2635", - "ffffff": "ffffff", "ffce5a": "cf3d45", "ada5d6": "c56399", "73adef": "e64c4b", diff --git a/public/images/pokemon/variant/381-mega.json b/public/images/pokemon/variant/381-mega.json index 92cda32e287..50f4cab301e 100644 --- a/public/images/pokemon/variant/381-mega.json +++ b/public/images/pokemon/variant/381-mega.json @@ -1,27 +1,23 @@ { "1": { "525e61": "7e447b", - "101010": "101010", "d3d9dc": "f9cfed", "a0a7a9": "dfa1d2", "7d8486": "b673ad", "523977": "29165d", "784db9": "382a7b", "9876c6": "453c90", - "fafafa": "fafafa", "c5395a": "d05718", "d16f88": "f78232" }, "2": { "525e61": "98485e", - "101010": "101010", "d3d9dc": "f7d9ec", "a0a7a9": "e4abcc", "7d8486": "d086ac", "523977": "52060f", "784db9": "721119", "9876c6": "97241f", - "fafafa": "fafafa", "c5395a": "70309f", "d16f88": "9344b8" } diff --git a/public/images/pokemon/variant/381.json b/public/images/pokemon/variant/381.json index 4ad3ae57555..ed2dde0090b 100644 --- a/public/images/pokemon/variant/381.json +++ b/public/images/pokemon/variant/381.json @@ -4,7 +4,6 @@ "ded6ce": "d6bfc5", "6b636b": "653c7e", "b5b5ad": "c09faa", - "101010": "101010", "dedede": "ecdbde", "9cceff": "87589f", "4a63b5": "3e1f5a", @@ -12,7 +11,6 @@ "293173": "2a0f43", "5273d6": "4f2c6a", "c53a5a": "d05718", - "ffffff": "ffffff", "ff5a52": "f78232" }, "2": { @@ -20,7 +18,6 @@ "ded6ce": "dab1d7", "6b636b": "733e7c", "b5b5ad": "bb8dbb", - "101010": "101010", "dedede": "e9cae4", "9cceff": "f3b070", "4a63b5": "b54800", @@ -28,7 +25,6 @@ "293173": "892300", "5273d6": "ce6700", "c53a5a": "1586bc", - "ffffff": "ffffff", "ff5a52": "16a4c5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/382-primal.json b/public/images/pokemon/variant/382-primal.json index ec1b34be70f..4ff4763b865 100644 --- a/public/images/pokemon/variant/382-primal.json +++ b/public/images/pokemon/variant/382-primal.json @@ -1,7 +1,6 @@ { "1": { "082a78": "d96714", - "101010": "101010", "768ac4": "ffb44c", "c7eafe": "f6e4e0", "101c4c": "791309", @@ -10,7 +9,6 @@ "fab672": "a2ee62", "fff493": "e1ff9f", "f8d58b": "91d37f", - "64626c": "64626c", "fbfbfb": "fff7f4", "00bfec": "ff3200", "0788d6": "c5253a", @@ -18,7 +16,6 @@ }, "2": { "082a78": "780613", - "101010": "101010", "768ac4": "ea512b", "c7eafe": "f2d9dc", "101c4c": "3c0818", @@ -27,7 +24,6 @@ "fab672": "67a6f4", "fff493": "90ffde", "f8d58b": "5ad6ef", - "64626c": "64626c", "fbfbfb": "ffe9e6", "00bfec": "ffc546", "0788d6": "ea7c18", diff --git a/public/images/pokemon/variant/382.json b/public/images/pokemon/variant/382.json index 0cd69afd0ab..f1ea72f8bf2 100644 --- a/public/images/pokemon/variant/382.json +++ b/public/images/pokemon/variant/382.json @@ -1,7 +1,5 @@ { "1": { - "101010": "101010", - "5a526b": "5a526b", "313a73": "d85c0d", "dedede": "fff7f4", "4a84d6": "ffa938", @@ -17,8 +15,6 @@ "ffce31": "30ff6d" }, "2": { - "101010": "101010", - "5a526b": "5a526b", "313a73": "6a0515", "dedede": "ffe9e6", "4a84d6": "ce3118", diff --git a/public/images/pokemon/variant/383-primal.json b/public/images/pokemon/variant/383-primal.json index da20585cc60..04ff6c48796 100644 --- a/public/images/pokemon/variant/383-primal.json +++ b/public/images/pokemon/variant/383-primal.json @@ -2,29 +2,23 @@ "1": { "9d2929": "11421e", "fe736b": "279930", - "010101": "010101", "fe2129": "2b5b32", "fab672": "ff8571", "fff493": "ffd493", "7c2129": "011e0b", "fe6336": "ff203f", - "272324": "272324", "3f3b3c": "383540", "595355": "625769", - "64626c": "64626c", "fbfbfb": "fff6de", "cdccd0": "e5d4b6" }, "2": { "9d2929": "20516c", "fe736b": "68cfd0", - "010101": "010101", "fe2129": "3e8b9f", "fab672": "61ee93", "fff493": "d2ff93", "7c2129": "0a2c43", - "fe6336": "fe6336", - "272324": "272324", "3f3b3c": "2b3c4e", "595355": "4e5169", "64626c": "7373a6", diff --git a/public/images/pokemon/variant/383.json b/public/images/pokemon/variant/383.json index c3db9af1fec..557f9334795 100644 --- a/public/images/pokemon/variant/383.json +++ b/public/images/pokemon/variant/383.json @@ -1,7 +1,6 @@ { "1": { "7b2129": "032a10", - "000000": "000000", "9c2929": "11421e", "ffbdbd": "35b93b", "ff2129": "2b5b32", @@ -18,7 +17,6 @@ }, "2": { "7b2129": "123953", - "000000": "000000", "9c2929": "20516c", "ffbdbd": "73e7e8", "ff2129": "3e8b9f", diff --git a/public/images/pokemon/variant/384-mega.json b/public/images/pokemon/variant/384-mega.json index d5e3456b6ea..53a3f48844a 100644 --- a/public/images/pokemon/variant/384-mega.json +++ b/public/images/pokemon/variant/384-mega.json @@ -4,7 +4,6 @@ "fc9436": "098faf", "836231": "003082", "f6de00": "17e2d6", - "010101": "010101", "22523e": "650f04", "3d7d6d": "84120f", "c5a400": "0db1b1", @@ -13,7 +12,6 @@ "60d293": "f1785e", "e4b629": "036486", "9c2952": "063f67", - "e65273": "2083e7", - "fcfcfc": "fcfcfc" + "e65273": "2083e7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/384.json b/public/images/pokemon/variant/384.json index cdd2e3bfbde..69f37d3662c 100644 --- a/public/images/pokemon/variant/384.json +++ b/public/images/pokemon/variant/384.json @@ -4,31 +4,25 @@ "4a8473": "66637b", "5abd8c": "b3aec1", "94deb5": "e4e0ee", - "000000": "000000", "9c2952": "1cb450", "73293a": "0a642c", "846331": "064c1e", "c5a500": "27c750", "f7de00": "4ff869", "e65273": "4cd870", - "ffffff": "ffffff", - "bd638c": "98285b", - "ded6ef": "ded6ef" + "bd638c": "98285b" }, "2": { "295242": "540709", "4a8473": "821815", "5abd8c": "ca4636", "94deb5": "f99365", - "000000": "000000", "9c2952": "117a7a", "73293a": "003082", "846331": "380100", "c5a500": "098faf", "f7de00": "17e2d6", "e65273": "17e2d6", - "ffffff": "ffffff", - "bd638c": "2083e7", - "ded6ef": "ded6ef" + "bd638c": "2083e7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/385.json b/public/images/pokemon/variant/385.json index 7d3f8636614..21122ae0004 100644 --- a/public/images/pokemon/variant/385.json +++ b/public/images/pokemon/variant/385.json @@ -1,7 +1,6 @@ { "0": { "ad8431": "925108", - "000000": "000000", "ffff94": "f7e980", "ffe65a": "f3bf5c", "e6bd52": "db942d", @@ -10,13 +9,11 @@ "63d6de": "f87d82", "c5cede": "cea9b3", "e6eff7": "ddd4d6", - "ffffff": "ffffff", "6b7373": "6e2d47", "9ca5ad": "965771" }, "1": { "ad8431": "874100", - "000000": "000000", "ffff94": "f7be5d", "ffe65a": "de9128", "e6bd52": "ba670d", @@ -25,13 +22,11 @@ "63d6de": "7dea9b", "c5cede": "decbc5", "e6eff7": "f7ece6", - "ffffff": "ffffff", "6b7373": "816566", "9ca5ad": "ad9d9c" }, "2": { "ad8431": "234664", - "000000": "000000", "ffff94": "b1dbe8", "ffe65a": "6fb6da", "e6bd52": "427aa3", @@ -40,7 +35,6 @@ "63d6de": "f6a5e0", "c5cede": "d6c5de", "e6eff7": "eee6f7", - "ffffff": "ffffff", "6b7373": "7f6581", "9ca5ad": "aa9cad" } diff --git a/public/images/pokemon/variant/387.json b/public/images/pokemon/variant/387.json index 04e2eb81fea..88a87e5d0d4 100644 --- a/public/images/pokemon/variant/387.json +++ b/public/images/pokemon/variant/387.json @@ -5,15 +5,13 @@ "7bd66b": "f5def0", "634a3a": "320a2a", "8c6b42": "511b41", - "000000": "000000", "5a7b42": "320a2a", "b58452": "934974", "94ad5a": "b1516b", "dee68c": "f7a8af", "bdce84": "e37d90", "f7e65a": "8fae94", - "c5bd3a": "4b6b63", - "ffffff": "ffffff" + "c5bd3a": "4b6b63" }, "2": { "3aa542": "d6e1e9", @@ -28,7 +26,6 @@ "dee68c": "958790", "bdce84": "7d6d7a", "f7e65a": "8bcadd", - "c5bd3a": "3875a1", - "ffffff": "ffffff" + "c5bd3a": "3875a1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/388.json b/public/images/pokemon/variant/388.json index 42702aefa93..f602e9e97b5 100644 --- a/public/images/pokemon/variant/388.json +++ b/public/images/pokemon/variant/388.json @@ -3,7 +3,6 @@ "3a8c42": "e79ac2", "3a5a29": "3b1228", "63b56b": "ffd3f2", - "101019": "101019", "634a3a": "0d2520", "b58452": "3f5e4c", "8c6b42": "19322b", @@ -11,16 +10,12 @@ "efd642": "9cc096", "6b8c4a": "773859", "94ad5a": "954e6c", - "adc563": "b07587", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6", - "949494": "949494" + "adc563": "b07587" }, "2": { "3a8c42": "d6e1e9", "3a5a29": "1c1a1a", "63b56b": "ffffff", - "101019": "101019", "634a3a": "251c3d", "b58452": "2c4a78", "8c6b42": "20284e", @@ -28,9 +23,6 @@ "efd642": "8bcadd", "6b8c4a": "362f2f", "94ad5a": "463d3e", - "adc563": "756667", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6", - "949494": "949494" + "adc563": "756667" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/389.json b/public/images/pokemon/variant/389.json index 799d606ff37..1f7a9efd94e 100644 --- a/public/images/pokemon/variant/389.json +++ b/public/images/pokemon/variant/389.json @@ -3,7 +3,6 @@ "196319": "ba597b", "318c3a": "e799bb", "42ad42": "fddcf6", - "101010": "101010", "a5a5a5": "365f49", "6b737b": "1f4133", "e6e6e6": "8faf89", @@ -18,7 +17,6 @@ "196319": "738d9d", "318c3a": "a7bcc9", "42ad42": "d6e1e9", - "101010": "101010", "a5a5a5": "2c4a78", "6b737b": "20284e", "e6e6e6": "8bcadd", diff --git a/public/images/pokemon/variant/393.json b/public/images/pokemon/variant/393.json index 1449d14b88f..c67dc4f302a 100644 --- a/public/images/pokemon/variant/393.json +++ b/public/images/pokemon/variant/393.json @@ -4,10 +4,8 @@ "104a73": "244941", "318cd6": "44a36b", "6ba5e6": "54c461", - "ffffff": "ffffff", "bdcede": "e2d7a5", "63a5c5": "ce8a56", - "101010": "101010", "9cd6f7": "e8ce81", "637b94": "c68a67", "ad843a": "81899b", @@ -24,7 +22,6 @@ "ffffff": "f4ede8", "bdcede": "ccb9af", "63a5c5": "4a172e", - "101010": "101010", "9cd6f7": "782439", "637b94": "877e78", "ad843a": "368089", diff --git a/public/images/pokemon/variant/394.json b/public/images/pokemon/variant/394.json index 559eaa8b020..05726277fd7 100644 --- a/public/images/pokemon/variant/394.json +++ b/public/images/pokemon/variant/394.json @@ -4,13 +4,11 @@ "ffe684": "bec8d1", "7b5242": "1e202b", "efce63": "81899b", - "101010": "101010", "21426b": "2b544b", "215a94": "338757", "639cf7": "c97d4e", "9cceff": "e8ce81", "deefff": "ffefde", - "ffffff": "ffffff", "3a7bb5": "b24125", "bdcede": "e5dca5", "225c96": "8c2419", @@ -21,7 +19,6 @@ "ffe684": "baf3e4", "7b5242": "265255", "efce63": "82d3d0", - "101010": "101010", "21426b": "c44a7c", "215a94": "f880a0", "639cf7": "670f2f", diff --git a/public/images/pokemon/variant/395.json b/public/images/pokemon/variant/395.json index ad87c323be3..4a3c2cbdf6a 100644 --- a/public/images/pokemon/variant/395.json +++ b/public/images/pokemon/variant/395.json @@ -3,7 +3,6 @@ "bd8c6b": "363b56", "ffe684": "bec8d1", "efce63": "81899b", - "101010": "101010", "103a73": "23603f", "103c75": "7f1711", "528ce6": "cc8043", @@ -16,27 +15,23 @@ "deefff": "cbede1", "73a5ef": "e0b757", "5891e8": "77ba95", - "f9fcfb": "eaf9f4", - "000000": "000000" + "f9fcfb": "eaf9f4" }, "2": { "bd8c6b": "2c7787", "ffe684": "8af3dc", "efce63": "4bb3b1", - "101010": "101010", "103a73": "ffa5b2", "103c75": "32092a", "528ce6": "4f1438", "9cceff": "7e2b44", "4a73ad": "400e30", - "f9fcff": "f9fcff", "295a94": "380b2a", "102142": "da6785", "7b5242": "184555", "deefff": "7e1939", "73a5ef": "641b3c", "5891e8": "962849", - "f9fcfb": "ad2b41", - "000000": "000000" + "f9fcfb": "ad2b41" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/399.json b/public/images/pokemon/variant/399.json index 251f073613e..64538ba2077 100644 --- a/public/images/pokemon/variant/399.json +++ b/public/images/pokemon/variant/399.json @@ -4,7 +4,6 @@ "9c6331": "d46378", "c58c42": "e5a5bb", "634a31": "70323f", - "101010": "101010", "cebd84": "eba978", "ffefbd": "fff5d1", "ffffff": "f7f7f7", @@ -18,13 +17,9 @@ "9c6331": "3e5ca8", "c58c42": "617dda", "634a31": "313d63", - "101010": "101010", "cebd84": "8497ce", "ffefbd": "bdcfff", - "ffffff": "ffffff", "5a4229": "42295a", - "ef5a4a": "4a9bef", - "cec5c5": "cec5c5", - "848484": "848484" + "ef5a4a": "4a9bef" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/4.json b/public/images/pokemon/variant/4.json index a8cdf9d99ac..a4cc504775c 100644 --- a/public/images/pokemon/variant/4.json +++ b/public/images/pokemon/variant/4.json @@ -4,11 +4,9 @@ "8c2900": "0f3234", "ff9442": "26837c", "ffc563": "38bc90", - "101010": "101010", "e63a00": "5033ce", "083a8c": "8e0b25", "198cb5": "c40f0f", - "ffffff": "ffffff", "31adef": "f23113", "ffd608": "e9bfff", "f7a500": "9e59db", @@ -20,11 +18,9 @@ "8c2900": "20346f", "ff9442": "3a78b7", "ffc563": "54a3d8", - "101010": "101010", "e63a00": "4c83d4", "083a8c": "0021a8", "198cb5": "0059ff", - "ffffff": "ffffff", "31adef": "1e8eff", "ffd608": "f9fffa", "f7a500": "96e8e8", diff --git a/public/images/pokemon/variant/400.json b/public/images/pokemon/variant/400.json index 1e1bcaa4d20..3c1412f91bb 100644 --- a/public/images/pokemon/variant/400.json +++ b/public/images/pokemon/variant/400.json @@ -2,13 +2,10 @@ "1": { "5a3a31": "70323f", "bd844a": "dba0ac", - "101010": "101010", "8c5a31": "c46269", "e6d69c": "fff5d1", "ad947b": "bd9171", "c5c5b5": "b7b9d0", - "ffffff": "ffffff", - "3a3129": "3a3129", "63523a": "824561", "de4a4a": "ffa488", "423a31": "3e3040" @@ -16,12 +13,10 @@ "2": { "5a3a31": "313d63", "bd844a": "617dda", - "101010": "101010", "8c5a31": "3e5ca8", "e6d69c": "bdcfff", "ad947b": "8497ce", "c5c5b5": "b5b6c5", - "ffffff": "ffffff", "3a3129": "2c183f", "63523a": "42295a", "de4a4a": "4a9bef", diff --git a/public/images/pokemon/variant/401.json b/public/images/pokemon/variant/401.json index 9e1fd614922..78db2283687 100644 --- a/public/images/pokemon/variant/401.json +++ b/public/images/pokemon/variant/401.json @@ -3,7 +3,6 @@ "524a42": "cf8439", "9c9c94": "ffeea0", "7b7363": "f6bb47", - "101010": "101010", "8c6b08": "272344", "e6c56b": "454389", "ffefad": "56769d", @@ -19,7 +18,6 @@ "524a42": "453565", "9c9c94": "ae85ba", "7b7363": "71558c", - "101010": "101010", "8c6b08": "784341", "e6c56b": "e59a75", "ffefad": "ffd47c", diff --git a/public/images/pokemon/variant/402.json b/public/images/pokemon/variant/402.json index 26008d941d1..64dc58b78f2 100644 --- a/public/images/pokemon/variant/402.json +++ b/public/images/pokemon/variant/402.json @@ -2,10 +2,8 @@ "1": { "633100": "272344", "de5a52": "afd3df", - "101010": "101010", "9c4231": "498ebe", "31293a": "592a22", - "fff3e3": "fff3e3", "524a42": "cf8439", "7b7363": "f6bb47", "945219": "973939", @@ -15,17 +13,14 @@ "bd9c63": "454389", "9c9c94": "26264b", "ffd684": "56769d", - "000000": "000000", "424252": "0e0e23", "ffffff": "454389" }, "2": { "633100": "2a545f", "de5a52": "70af85", - "101010": "101010", "9c4231": "2f9378", "31293a": "281c41", - "fff3e3": "fff3e3", "524a42": "453565", "7b7363": "71558c", "945219": "b5567a", diff --git a/public/images/pokemon/variant/4052.json b/public/images/pokemon/variant/4052.json index 4dae5cc07dd..b6d6aec3339 100644 --- a/public/images/pokemon/variant/4052.json +++ b/public/images/pokemon/variant/4052.json @@ -1,25 +1,20 @@ { "1": { - "181a1d": "181a1d", "3d4547": "4e385a", "ada09a": "c3c5d4", "5b4e4d": "57567e", "84726f": "7b7aa5", "9aa094": "9ea9b5", - "f3f3f3": "f3f3f3", - "010101": "010101", "272d2e": "342b49", "f3d91d": "ffff89" }, "2": { - "181a1d": "181a1d", "3d4547": "417778", "ada09a": "603b54", "5b4e4d": "171127", "84726f": "3c2841", "9aa094": "cc9a5f", "f3f3f3": "f4d294", - "010101": "010101", "272d2e": "234a56", "f3d91d": "c4e857" } diff --git a/public/images/pokemon/variant/406.json b/public/images/pokemon/variant/406.json index 5f47761b081..1deec5a8940 100644 --- a/public/images/pokemon/variant/406.json +++ b/public/images/pokemon/variant/406.json @@ -3,30 +3,24 @@ "73a54a": "153a51", "b5ef73": "5fadaf", "3a5a29": "0b2337", - "000000": "000000", "7bd65a": "215869", "948400": "856454", "ffef6b": "e4d0c2", "e6bd3a": "c7a999", "21524a": "a92239", "317b63": "d6454a", - "4a9473": "ed6e67", - "ce0031": "ce0031", - "f76363": "f76363" + "4a9473": "ed6e67" }, "2": { "73a54a": "52347a", "b5ef73": "c098dd", "3a5a29": "2d1a4e", - "000000": "000000", "7bd65a": "7d4f9c", "948400": "44336d", "ffef6b": "f2e4ff", "e6bd3a": "c9b6e1", "21524a": "2d55a9", "317b63": "4f81d8", - "4a9473": "83bef3", - "ce0031": "ce0031", - "f76363": "f76363" + "4a9473": "83bef3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/407.json b/public/images/pokemon/variant/407.json index 457c76d4159..4f2d8bc49b0 100644 --- a/public/images/pokemon/variant/407.json +++ b/public/images/pokemon/variant/407.json @@ -4,7 +4,6 @@ "ffffff": "fff1cb", "297b52": "153a51", "d6cede": "e1bf95", - "000000": "000000", "7b3a5a": "9c5910", "bd426b": "d28f31", "ff6384": "efc754", @@ -21,7 +20,6 @@ "ffffff": "fcf8ff", "297b52": "503277", "d6cede": "d6c7e6", - "000000": "000000", "7b3a5a": "9c2407", "bd426b": "c15a21", "ff6384": "ec883b", diff --git a/public/images/pokemon/variant/4077.json b/public/images/pokemon/variant/4077.json index f80e6124c18..40d3cfe71f3 100644 --- a/public/images/pokemon/variant/4077.json +++ b/public/images/pokemon/variant/4077.json @@ -7,14 +7,12 @@ "de9fff": "ff884c", "d2daff": "ffb44c", "59237e": "312c49", - "101010": "101010", "78499b": "514766", "ffffe3": "8cd8ff", "646357": "192666", "ded5ae": "5b93cc", "8e39c1": "990c00", - "a3a49f": "355699", - "fdfdfd": "fdfdfd" + "a3a49f": "355699" }, "2": { "64c2d7": "cc1e83", @@ -24,13 +22,11 @@ "de9fff": "483e7c", "d2daff": "b247a0", "59237e": "312c49", - "101010": "101010", "78499b": "514766", "ffffe3": "ff99dd", "646357": "361e66", "ded5ae": "cc66cc", "8e39c1": "161f4c", - "a3a49f": "7a3d99", - "fdfdfd": "fdfdfd" + "a3a49f": "7a3d99" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/4078.json b/public/images/pokemon/variant/4078.json index a57e9d6f066..0eefedacf98 100644 --- a/public/images/pokemon/variant/4078.json +++ b/public/images/pokemon/variant/4078.json @@ -1,10 +1,8 @@ { "1": { - "0c0c0c": "0c0c0c", "44bf75": "cc9470", "737ba4": "514766", "85fabf": "ffd9a5", - "2b3055": "2b3055", "109865": "995944", "ffffe3": "8cd8ff", "636357": "192666", @@ -19,11 +17,9 @@ "4ed68b": "cc9470" }, "2": { - "0c0c0c": "0c0c0c", "44bf75": "cc1e4c", "737ba4": "514766", "85fabf": "ff3255", - "2b3055": "2b3055", "109865": "990f3d", "ffffe3": "ff99dd", "636357": "361e66", diff --git a/public/images/pokemon/variant/4079.json b/public/images/pokemon/variant/4079.json index f1fd0c2ca2a..eb3e2d5d7d1 100644 --- a/public/images/pokemon/variant/4079.json +++ b/public/images/pokemon/variant/4079.json @@ -6,10 +6,7 @@ "aa4a6b": "613934", "f88daf": "bb694b", "7c2847": "452a29", - "d5cdcd": "d5cdcd", - "fcfcfc": "fcfcfc", "d76d96": "8f5345", - "101010": "101010", "dea462": "e0799c", "8b5a18": "a84071", "ffe6b4": "ff9eba" @@ -21,10 +18,7 @@ "aa4a6b": "846467", "f88daf": "ecdcbe", "7c2847": "503941", - "d5cdcd": "d5cdcd", - "fcfcfc": "fcfcfc", "d76d96": "c6aead", - "101010": "101010", "dea462": "ca8e74", "8b5a18": "a45c58", "ffe6b4": "eec596" diff --git a/public/images/pokemon/variant/4080.json b/public/images/pokemon/variant/4080.json index 8a4b733e0ee..727a540ddc2 100644 --- a/public/images/pokemon/variant/4080.json +++ b/public/images/pokemon/variant/4080.json @@ -2,10 +2,7 @@ "1": { "723f7c": "edc59e", "a565c0": "ffedcc", - "181818": "181818", "d76792": "905446", - "c9c9c9": "c9c9c9", - "fbfbfb": "fbfbfb", "7b6987": "a94172", "f985aa": "bb694b", "ede2ef": "ff9fbb", @@ -22,10 +19,7 @@ "2": { "723f7c": "963e59", "a565c0": "d9736b", - "181818": "181818", "d76792": "c6aead", - "c9c9c9": "c9c9c9", - "fbfbfb": "fbfbfb", "7b6987": "a45c58", "f985aa": "ecdcbe", "ede2ef": "efc697", diff --git a/public/images/pokemon/variant/41.json b/public/images/pokemon/variant/41.json index 99ab116de02..88572737c89 100644 --- a/public/images/pokemon/variant/41.json +++ b/public/images/pokemon/variant/41.json @@ -1,26 +1,20 @@ { "1": { - "101010": "101010", "637bb5": "12325c", "4a427b": "14093b", "bdceff": "868ecc", "8cb5ef": "205182", "b5529c": "d58e41", "73215a": "b6591e", - "d673bd": "f0ad57", - "ffffff": "ffffff", - "636363": "636363" + "d673bd": "f0ad57" }, "2": { - "101010": "101010", "637bb5": "916c8b", "4a427b": "4d3259", "bdceff": "e8d2e6", "8cb5ef": "cbabca", "b5529c": "94241c", "73215a": "670f10", - "d673bd": "bc3b1d", - "ffffff": "ffffff", - "636363": "636363" + "d673bd": "bc3b1d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/412-plant.json b/public/images/pokemon/variant/412-plant.json index 5a4fcc17bce..63277d41b8e 100644 --- a/public/images/pokemon/variant/412-plant.json +++ b/public/images/pokemon/variant/412-plant.json @@ -4,7 +4,6 @@ "84847b": "5f709f", "5a5a5a": "455081", "3a3a42": "262b56", - "101010": "101010", "314a3a": "274530", "7b9c4a": "6c956d", "527342": "446649", @@ -14,11 +13,9 @@ "634a3a": "4f3f36" }, "1": { - "292931": "292931", "84847b": "9f8a8f", "5a5a5a": "725c67", "3a3a42": "392933", - "101010": "101010", "314a3a": "452c30", "7b9c4a": "9d8781", "527342": "7c5d5e", @@ -28,11 +25,9 @@ "634a3a": "261a1a" }, "2": { - "292931": "292931", "84847b": "c69ab0", "5a5a5a": "ab7492", "3a3a42": "724063", - "101010": "101010", "314a3a": "203460", "7b9c4a": "5d9ac0", "527342": "3c689b", diff --git a/public/images/pokemon/variant/412-trash.json b/public/images/pokemon/variant/412-trash.json index 92dbf56e4ee..1c95606a860 100644 --- a/public/images/pokemon/variant/412-trash.json +++ b/public/images/pokemon/variant/412-trash.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "292931": "191c46", "5a5a5a": "455081", "84847b": "5f709f", @@ -15,7 +14,6 @@ "737b7b": "572d73" }, "1": { - "101010": "101010", "292931": "1d1929", "5a5a5a": "594f69", "84847b": "7e768c", @@ -30,7 +28,6 @@ "737b7b": "403c48" }, "2": { - "101010": "101010", "292931": "273f2c", "5a5a5a": "b5d6b2", "84847b": "daeed5", diff --git a/public/images/pokemon/variant/413-sandy.json b/public/images/pokemon/variant/413-sandy.json index 42177c21025..84e8f7ef251 100644 --- a/public/images/pokemon/variant/413-sandy.json +++ b/public/images/pokemon/variant/413-sandy.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "5a5a5a": "455081", "3a3a42": "30366b", "737b6b": "526390", @@ -9,14 +8,12 @@ "634a3a": "5a453b", "635252": "926f57", "ad9473": "b89b78", - "ffffff": "ffffff", "8c4a3a": "7d212c", "d6c573": "e4d3b0", "ef7352": "bc4c43", "847363": "735040" }, "1": { - "101010": "101010", "5a5a5a": "64403f", "3a3a42": "533032", "737b6b": "835d57", @@ -25,14 +22,12 @@ "634a3a": "54212a", "635252": "3e2025", "ad9473": "734443", - "ffffff": "ffffff", "8c4a3a": "c58839", "d6c573": "8e6457", "ef7352": "e4c565", "847363": "4e2d2d" }, "2": { - "101010": "101010", "5a5a5a": "aeb2cd", "3a3a42": "8385a6", "737b6b": "dfe6f1", @@ -41,7 +36,6 @@ "634a3a": "1c3a5e", "635252": "1a1830", "ad9473": "5a5f7f", - "ffffff": "ffffff", "8c4a3a": "1b4758", "d6c573": "7c8397", "ef7352": "61c8d9", diff --git a/public/images/pokemon/variant/413-trash.json b/public/images/pokemon/variant/413-trash.json index 5e11d943d93..984cd225d47 100644 --- a/public/images/pokemon/variant/413-trash.json +++ b/public/images/pokemon/variant/413-trash.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "5a5a5a": "455081", "3a3a42": "30366b", "737b6b": "526390", @@ -9,11 +8,9 @@ "844a73": "572d73", "7b4a5a": "92427c", "b56b7b": "c373a4", - "ffffff": "ffffff", "ef949c": "df9dbf" }, "1": { - "101010": "101010", "5a5a5a": "594f69", "3a3a42": "403850", "737b6b": "8e869c", @@ -22,11 +19,9 @@ "844a73": "723542", "7b4a5a": "3d3b56", "b56b7b": "5a5a79", - "ffffff": "ffffff", "ef949c": "828498" }, "2": { - "101010": "101010", "5a5a5a": "b5d6b2", "3a3a42": "7aa17b", "737b6b": "daeed5", @@ -35,7 +30,6 @@ "844a73": "39343f", "7b4a5a": "1b6b2e", "b56b7b": "399746", - "ffffff": "ffffff", "ef949c": "69bd6a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/414.json b/public/images/pokemon/variant/414.json index f8a8ab67845..e609549b309 100644 --- a/public/images/pokemon/variant/414.json +++ b/public/images/pokemon/variant/414.json @@ -2,7 +2,6 @@ "1": { "734221": "99745b", "e66b29": "f2daba", - "101010": "101010", "a54a00": "d2a884", "f7d67b": "97534e", "6b5a4a": "471415", @@ -17,7 +16,6 @@ "2": { "734221": "90412e", "e66b29": "e8b479", - "101010": "101010", "a54a00": "d2895c", "f7d67b": "8556b0", "6b5a4a": "382463", diff --git a/public/images/pokemon/variant/418.json b/public/images/pokemon/variant/418.json index 628252e5296..7100520550d 100644 --- a/public/images/pokemon/variant/418.json +++ b/public/images/pokemon/variant/418.json @@ -3,12 +3,8 @@ "ad5a21": "7d1e39", "ef7b19": "9c354f", "7b4221": "611b35", - "191919": "191919", "dec584": "cea49d", "f7f7b5": "e8d4cc", - "ffffff": "ffffff", - "6b6b6b": "6b6b6b", - "d6d6ce": "d6d6ce", "ffde00": "d2e5e8", "9c6300": "995e5c", "e6a531": "a0b3ba", @@ -20,12 +16,9 @@ "ad5a21": "cd91aa", "ef7b19": "e8c3ce", "7b4221": "84466b", - "191919": "191919", "dec584": "8a4370", "f7f7b5": "a8688f", - "ffffff": "ffffff", "6b6b6b": "432e38", - "d6d6ce": "d6d6ce", "ffde00": "eda342", "9c6300": "642858", "e6a531": "ca6e26", diff --git a/public/images/pokemon/variant/419.json b/public/images/pokemon/variant/419.json index 414cd251187..d3c4729024f 100644 --- a/public/images/pokemon/variant/419.json +++ b/public/images/pokemon/variant/419.json @@ -2,7 +2,6 @@ "1": { "7b4221": "611b35", "ef7b19": "9c354f", - "191919": "191919", "ce6b19": "851d3e", "ad5a21": "7d1e39", "9c6300": "995e5c", @@ -10,8 +9,6 @@ "cebd84": "cea49d", "99693c": "6a808c", "e6a531": "a0b3ba", - "6b6b6b": "6b6b6b", - "ffffff": "ffffff", "ffde00": "d2e5e8", "2163a5": "385e11", "63bde6": "6a9539" @@ -19,7 +16,6 @@ "2": { "7b4221": "9e6a86", "ef7b19": "debfc8", - "191919": "191919", "ce6b19": "dca5b5", "ad5a21": "cd91aa", "9c6300": "672e5d", @@ -28,7 +24,6 @@ "99693c": "8e410e", "e6a531": "d4812f", "6b6b6b": "726481", - "ffffff": "ffffff", "ffde00": "eda342", "2163a5": "4b2a70", "63bde6": "744d99" diff --git a/public/images/pokemon/variant/4199.json b/public/images/pokemon/variant/4199.json index 1b17bcc8234..e6136479ab0 100644 --- a/public/images/pokemon/variant/4199.json +++ b/public/images/pokemon/variant/4199.json @@ -3,12 +3,10 @@ "493e66": "831e2b", "a191b5": "de504e", "7a6a98": "ad3139", - "101010": "101010", "654493": "7e3351", "413668": "622344", "403468": "4f0926", "269a36": "f28783", - "f8f8f8": "f8f8f8", "a090b5": "ff9eba", "63577d": "a84071", "723f7c": "d0bca2", @@ -27,12 +25,10 @@ "493e66": "2a6122", "a191b5": "b0dc72", "7a6a98": "71ae48", - "101010": "101010", "654493": "38735c", "413668": "1d4c46", "403468": "9f3637", "269a36": "e68c5d", - "f8f8f8": "f8f8f8", "a090b5": "efc697", "63577d": "a55d59", "723f7c": "ae4653", diff --git a/public/images/pokemon/variant/42.json b/public/images/pokemon/variant/42.json index af784a0fd2c..7891449360e 100644 --- a/public/images/pokemon/variant/42.json +++ b/public/images/pokemon/variant/42.json @@ -6,11 +6,7 @@ "631052": "892d03", "ce6bb5": "f1a139", "adceff": "3c74b1", - "000000": "000000", "ad52ad": "d5711b", - "636363": "636363", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6", "943a7b": "af4e0c" }, "2": { @@ -20,11 +16,7 @@ "631052": "54070c", "ce6bb5": "bc3b1d", "adceff": "e8d2e6", - "000000": "000000", "ad52ad": "94241c", - "636363": "636363", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6", "943a7b": "670f10" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/422-east.json b/public/images/pokemon/variant/422-east.json index cb5b031b3f2..c3209e3e025 100644 --- a/public/images/pokemon/variant/422-east.json +++ b/public/images/pokemon/variant/422-east.json @@ -2,8 +2,6 @@ "0": { "636394": "61819f", "bdceef": "b8d4e6", - "ffffff": "ffffff", - "101010": "101010", "52527b": "636b7b", "84deff": "b9f7d4", "6bb5f7": "82e1c0", @@ -11,7 +9,6 @@ "ffde73": "ffdf75", "a58c3a": "a68e3c", "524a3a": "554d3c", - "d63aa5": "d63aa5", "5a8452": "b8d4e6", "424a3a": "61819f", "8cb552": "ffffff" @@ -19,8 +16,6 @@ "1": { "636394": "314173", "bdceef": "b8d4e6", - "ffffff": "ffffff", - "101010": "101010", "52527b": "293852", "84deff": "5271bd", "6bb5f7": "485f9c", @@ -28,7 +23,6 @@ "ffde73": "82e1c0", "a58c3a": "649bb2", "524a3a": "455f73", - "d63aa5": "d63aa5", "5a8452": "b8d4e6", "424a3a": "61819f", "8cb552": "ffffff" @@ -36,8 +30,6 @@ "2": { "636394": "6d427b", "bdceef": "c5deef", - "ffffff": "ffffff", - "101010": "101010", "52527b": "451e4c", "84deff": "ad75e8", "6bb5f7": "955dbe", @@ -45,7 +37,6 @@ "ffde73": "ffc975", "a58c3a": "e5693d", "524a3a": "933f04", - "d63aa5": "d63aa5", "5a8452": "df5e7d", "424a3a": "914d43", "8cb552": "ff8ca1" diff --git a/public/images/pokemon/variant/422-west.json b/public/images/pokemon/variant/422-west.json index f5f94becd75..6f9e575dee9 100644 --- a/public/images/pokemon/variant/422-west.json +++ b/public/images/pokemon/variant/422-west.json @@ -1,7 +1,6 @@ { "0": { "73426b": "8b3553", - "101010": "101010", "e652a5": "c66264", "ff8cc5": "ff9269", "6b3a52": "7a3425", @@ -9,7 +8,6 @@ "ffb5e6": "ffbea6", "ffde73": "ffd275", "a58c3a": "ca8b46", - "ffffff": "ffffff", "524a3a": "645346", "c5428c": "bd294a", "b5b5c5": "ca8b46", @@ -18,7 +16,6 @@ }, "1": { "73426b": "573d64", - "101010": "101010", "e652a5": "7960a1", "ff8cc5": "aa8be8", "6b3a52": "573d64", @@ -26,7 +23,6 @@ "ffb5e6": "c1a5ff", "ffde73": "ffb8c5", "a58c3a": "da6f7b", - "ffffff": "ffffff", "524a3a": "993d48", "c5428c": "bd294a", "b5b5c5": "d1b07c", @@ -35,7 +31,6 @@ }, "2": { "73426b": "281e4c", - "101010": "101010", "e652a5": "48427b", "ff8cc5": "5d64be", "6b3a52": "281e4c", @@ -43,7 +38,6 @@ "ffb5e6": "7588e8", "ffde73": "ffc975", "a58c3a": "e5693d", - "ffffff": "ffffff", "524a3a": "933f04", "c5428c": "bd294a", "b5b5c5": "00a172", diff --git a/public/images/pokemon/variant/4222.json b/public/images/pokemon/variant/4222.json index 15e23a6d468..d271fb7a8e3 100644 --- a/public/images/pokemon/variant/4222.json +++ b/public/images/pokemon/variant/4222.json @@ -9,7 +9,6 @@ "e3c4f2": "d7d2f6", "9c94a3": "58929f", "cbc2d1": "a9e4e3", - "101010": "101010", "af9e9e": "44a0af", "ffa4c5": "76c6ff", "e66294": "0099ff", @@ -25,7 +24,6 @@ "e3c4f2": "567f83", "9c94a3": "4b1f28", "cbc2d1": "773050", - "101010": "101010", "af9e9e": "b0919b", "ffa4c5": "8ff3a3", "e66294": "15c05f", diff --git a/public/images/pokemon/variant/423-east.json b/public/images/pokemon/variant/423-east.json index f002fc3efb4..95e095396bd 100644 --- a/public/images/pokemon/variant/423-east.json +++ b/public/images/pokemon/variant/423-east.json @@ -10,7 +10,6 @@ "a58c3a": "a58e3b", "524a3a": "574e3e", "736363": "574e3e", - "ffffff": "ffffff", "6b7bad": "679ab2", "6bb5f7": "80e2bf", "b5295a": "b42a59", @@ -18,36 +17,26 @@ }, "1": { "3a4231": "293852", - "101010": "101010", "5a944a": "485f9c", "426b31": "314173", "7bbd52": "5271bd", "ffde73": "82e1c0", - "313129": "313129", "a58c3a": "649bb2", "524a3a": "455f73", - "736363": "736363", - "ffffff": "ffffff", "6b7bad": "b8d4e6", "6bb5f7": "ffffff", - "b5295a": "b5295a", "5a527b": "61819f" }, "2": { "3a4231": "451e4c", - "101010": "101010", "5a944a": "955dbe", "426b31": "6d427b", "7bbd52": "ad75e8", "ffde73": "ffc975", - "313129": "313129", "a58c3a": "e5693d", "524a3a": "933f04", - "736363": "736363", - "ffffff": "ffffff", "6b7bad": "df5e7d", "6bb5f7": "ff8ca1", - "b5295a": "b5295a", "5a527b": "914d43" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/423-west.json b/public/images/pokemon/variant/423-west.json index d9b876d07e7..b0cd26a7201 100644 --- a/public/images/pokemon/variant/423-west.json +++ b/public/images/pokemon/variant/423-west.json @@ -1,53 +1,38 @@ { "0": { "4a3a3a": "101010", - "101010": "101010", "a56b3a": "c66264", "6b4a3a": "8b3553", "c5944a": "ff9269", "a58c3a": "ca8b46", "ffde73": "ffd275", - "313129": "313129", "524a3a": "645346", - "736363": "736363", - "ffffff": "ffffff", "ad6394": "c66264", "ff8cc5": "ff9269", - "6b3a52": "7a3425", - "b5295a": "b5295a" + "6b3a52": "7a3425" }, "1": { "4a3a3a": "573d64", - "101010": "101010", "a56b3a": "aa8be8", "6b4a3a": "7960a1", "c5944a": "c1a5ff", "a58c3a": "da6f7b", "ffde73": "ffb8c5", - "313129": "313129", "524a3a": "993d48", - "736363": "736363", - "ffffff": "ffffff", "ad6394": "d1b07c", "ff8cc5": "f7f0b4", - "6b3a52": "8a7b68", - "b5295a": "b5295a" + "6b3a52": "8a7b68" }, "2": { "4a3a3a": "281e4c", - "101010": "101010", "a56b3a": "5d64be", "6b4a3a": "48427b", "c5944a": "7588e8", "a58c3a": "e5693d", "ffde73": "ffc975", - "313129": "313129", "524a3a": "933f04", - "736363": "736363", - "ffffff": "ffffff", "ad6394": "00a172", "ff8cc5": "3cc59b", - "6b3a52": "00706a", - "b5295a": "b5295a" + "6b3a52": "00706a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/424.json b/public/images/pokemon/variant/424.json index 4e00c3c1234..eace71f2a3a 100644 --- a/public/images/pokemon/variant/424.json +++ b/public/images/pokemon/variant/424.json @@ -3,7 +3,6 @@ "734a42": "415c73", "ad5242": "428dad", "ff735a": "5ae9ff", - "101010": "101010", "debd73": "c4b487", "ffefa5": "ffeccc", "8c6b42": "8c7457", @@ -13,15 +12,12 @@ "9c4ac5": "c47440", "bd9473": "bd9a7e", "ab5141": "293b94", - "ffffff": "ffffff", - "fc7158": "3973e5", - "adada5": "adada5" + "fc7158": "3973e5" }, "2": { "734a42": "593802", "ad5242": "946212", "ff735a": "ffb338", - "101010": "101010", "debd73": "99455d", "ffefa5": "ed8286", "8c6b42": "632339", @@ -31,8 +27,6 @@ "9c4ac5": "bfbeb4", "bd9473": "802d44", "ab5141": "8c1c2f", - "ffffff": "ffffff", - "fc7158": "b33636", - "adada5": "adada5" + "fc7158": "b33636" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/425.json b/public/images/pokemon/variant/425.json index f28dbd93c07..b490bf42686 100644 --- a/public/images/pokemon/variant/425.json +++ b/public/images/pokemon/variant/425.json @@ -3,7 +3,6 @@ "c5d6e6": "c2f5d4", "ffffff": "e8ffed", "5a5a63": "5e7466", - "101010": "101010", "7b42a5": "497b91", "946be6": "64acb1", "633184": "39677a", @@ -17,7 +16,6 @@ "c5d6e6": "c2f5d4", "ffffff": "e8ffed", "5a5a63": "5e7466", - "101010": "101010", "7b42a5": "93a383", "946be6": "c0c7ab", "633184": "697c63", diff --git a/public/images/pokemon/variant/426.json b/public/images/pokemon/variant/426.json index fcbd8f4ce35..fd8e92ce451 100644 --- a/public/images/pokemon/variant/426.json +++ b/public/images/pokemon/variant/426.json @@ -3,7 +3,6 @@ "c5c5e6": "7ca786", "ffffff": "b0d1b8", "5a5a63": "536661", - "101010": "101010", "423a5a": "1e3f42", "5a427b": "1d524d", "8452ad": "20787c", @@ -20,7 +19,6 @@ "c5c5e6": "7ca786", "ffffff": "b0d1b8", "5a5a63": "536661", - "101010": "101010", "423a5a": "42382c", "5a427b": "686458", "8452ad": "9fa994", diff --git a/public/images/pokemon/variant/4263.json b/public/images/pokemon/variant/4263.json index 035d011d7a0..5d2e8d90ecc 100644 --- a/public/images/pokemon/variant/4263.json +++ b/public/images/pokemon/variant/4263.json @@ -1,14 +1,12 @@ { "1": { "1b2627": "00312d", - "010101": "010101", "3e4042": "01473a", "60656a": "1c8155", "5b5958": "397e4a", "f5f5f6": "f5ffea", "b2b3b2": "a3ce9e", "d94a7f": "d414dd", - "fcfcfc": "fcfcfc", "e2729a": "ff69fa", "6e3b51": "9b00b4", "9b4f69": "d414dd", @@ -16,14 +14,12 @@ }, "2": { "1b2627": "080929", - "010101": "010101", "3e4042": "412991", "60656a": "8e5aef", "5b5958": "100d2d", "f5f5f6": "3c335d", "b2b3b2": "201b47", "d94a7f": "0099ce", - "fcfcfc": "fcfcfc", "e2729a": "54f1ff", "6e3b51": "004a8b", "9b4f69": "0099ce", diff --git a/public/images/pokemon/variant/4264.json b/public/images/pokemon/variant/4264.json index 5c118e7edc8..bbbaf135a4d 100644 --- a/public/images/pokemon/variant/4264.json +++ b/public/images/pokemon/variant/4264.json @@ -4,9 +4,7 @@ "797570": "397e4a", "414141": "1c8155", "abadaf": "95c090", - "010101": "010101", "f5f5f6": "f5ffea", - "1c1917": "1c1917", "ff4e89": "ff69fa", "bc3065": "d414dd", "68696a": "27323a", @@ -17,9 +15,7 @@ "797570": "080929", "414141": "7c4cd6", "abadaf": "1e1a3b", - "010101": "010101", "f5f5f6": "342d4c", - "1c1917": "1c1917", "ff4e89": "54f1ff", "bc3065": "0099ce", "68696a": "2a1b4e", diff --git a/public/images/pokemon/variant/427.json b/public/images/pokemon/variant/427.json index 2571159d29b..5ed6103857c 100644 --- a/public/images/pokemon/variant/427.json +++ b/public/images/pokemon/variant/427.json @@ -3,28 +3,22 @@ "846b5a": "991e47", "c5a57b": "cc3d55", "efdea5": "ff6666", - "101010": "101010", "b57b4a": "ffcc99", "523a3a": "994c3d", "8c5a42": "cc8866", "7b3a42": "948eb2", "ff8ca5": "ffffff", - "c55a7b": "cecee5", - "ffffff": "ffffff", - "3a313a": "3a313a" + "c55a7b": "cecee5" }, "2": { "846b5a": "948eb2", "c5a57b": "cecee5", "efdea5": "ffffff", - "101010": "101010", "b57b4a": "8cd8ff", "523a3a": "355699", "8c5a42": "5b93cc", "7b3a42": "99548d", "ff8ca5": "ffbfdf", - "c55a7b": "cc84b4", - "ffffff": "ffffff", - "3a313a": "3a313a" + "c55a7b": "cc84b4" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/428-mega.json b/public/images/pokemon/variant/428-mega.json index d58a03ca175..e61bbdf0142 100644 --- a/public/images/pokemon/variant/428-mega.json +++ b/public/images/pokemon/variant/428-mega.json @@ -2,14 +2,12 @@ "1": { "836a5a": "991e47", "eedea4": "ff6666", - "101010": "101010", "c5a47b": "cc3d55", "532d30": "994c3d", "aa6840": "ffcc99", "894d3b": "cc8866", "7b3941": "472866", "c55a7b": "7f4c99", - "f8f8f8": "f8f8f8", "ee5a4a": "bd7acc", "2c2423": "0d0b16", "3a3130": "161626", @@ -18,14 +16,12 @@ "2": { "836a5a": "948eb2", "eedea4": "ffffff", - "101010": "101010", "c5a47b": "cecee5", "532d30": "355699", "aa6840": "8cd8ff", "894d3b": "5b93cc", "7b3941": "990c00", "c55a7b": "cc4328", - "f8f8f8": "f8f8f8", "ee5a4a": "ff884c", "2c2423": "191933", "3a3130": "312c49", diff --git a/public/images/pokemon/variant/428.json b/public/images/pokemon/variant/428.json index 46c653b17b0..3978fe7c610 100644 --- a/public/images/pokemon/variant/428.json +++ b/public/images/pokemon/variant/428.json @@ -1,7 +1,6 @@ { "1": { "523a3a": "994c3d", - "101010": "101010", "846b5a": "991e47", "b57b4a": "ffcc99", "efdea5": "ff6666", @@ -10,12 +9,10 @@ "7b3a42": "472866", "c5a57b": "cc3d55", "634a42": "660a38", - "ffffff": "ffffff", "ef5a4a": "bd7acc" }, "2": { "523a3a": "355699", - "101010": "101010", "846b5a": "948eb2", "b57b4a": "8cd8ff", "efdea5": "ffffff", @@ -24,7 +21,6 @@ "7b3a42": "990c00", "c5a57b": "cecee5", "634a42": "65597f", - "ffffff": "ffffff", "ef5a4a": "ff884c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/429.json b/public/images/pokemon/variant/429.json index 07e458a0baa..576fda4a949 100644 --- a/public/images/pokemon/variant/429.json +++ b/public/images/pokemon/variant/429.json @@ -4,11 +4,9 @@ "845284": "d3941a", "b563b5": "ffdd67", "31213a": "132443", - "101010": "101010", "4a3a5a": "244260", "6b4a94": "387fa7", "ce9c00": "c08ecb", - "ffffff": "ffffff", "943a5a": "71370f", "f7de3a": "e5c9e9", "ef3a10": "cc762f" @@ -18,11 +16,9 @@ "845284": "1dbdb9", "b563b5": "3df7ed", "31213a": "244358", - "101010": "101010", "4a3a5a": "7396b4", "6b4a94": "a1c8db", "ce9c00": "149c9d", - "ffffff": "ffffff", "943a5a": "7b3c08", "f7de3a": "55e6de", "ef3a10": "e28c27" @@ -32,11 +28,9 @@ "845284": "eece8c", "b563b5": "fff7dd", "31213a": "603305", - "101010": "101010", "4a3a5a": "b56f2a", "6b4a94": "e6aa47", "ce9c00": "66d0e5", - "ffffff": "ffffff", "943a5a": "7a1511", "f7de3a": "a6f0f8", "ef3a10": "b83a31" diff --git a/public/images/pokemon/variant/43.json b/public/images/pokemon/variant/43.json index 382d5ea10ad..7cfdf44679a 100644 --- a/public/images/pokemon/variant/43.json +++ b/public/images/pokemon/variant/43.json @@ -4,7 +4,6 @@ "8cad31": "3f419d", "c5e67b": "90a1d7", "9cd64a": "606dbb", - "101010": "101010", "5a6b84": "7946a9", "7394a5": "a564c7", "94b5c5": "d688e6", @@ -17,7 +16,6 @@ "8cad31": "8b4a13", "c5e67b": "e8b737", "9cd64a": "b88026", - "101010": "101010", "5a6b84": "79152a", "7394a5": "b3292e", "94b5c5": "de6042", diff --git a/public/images/pokemon/variant/433.json b/public/images/pokemon/variant/433.json index 9f770cfc89d..53f2aa0d25d 100644 --- a/public/images/pokemon/variant/433.json +++ b/public/images/pokemon/variant/433.json @@ -5,13 +5,11 @@ "e66352": "f37cdf", "d6d6f7": "e7d6e8", "a5a5ce": "a189a6", - "000000": "000000", "63524a": "7d492f", "ffd65a": "ffce5a", "bd9c4a": "e6a54a", "ffe694": "ffd1a4", - "846b4a": "a6673b", - "ffffff": "ffffff" + "846b4a": "a6673b" }, "1": { "6b3a31": "14404e", @@ -19,13 +17,11 @@ "e66352": "4a94ad", "d6d6f7": "ebd4b0", "a5a5ce": "cca375", - "000000": "000000", "63524a": "404c85", "ffd65a": "afadcd", "bd9c4a": "888ab1", "ffe694": "e0dbf5", - "846b4a": "5b6596", - "ffffff": "ffffff" + "846b4a": "5b6596" }, "2": { "6b3a31": "102837", @@ -33,12 +29,10 @@ "e66352": "4d8891", "d6d6f7": "f7e6e5", "a5a5ce": "c29ea6", - "000000": "000000", "63524a": "6d2018", "ffd65a": "f0a878", "bd9c4a": "c86b3e", "ffe694": "ffd1a4", - "846b4a": "934123", - "ffffff": "ffffff" + "846b4a": "934123" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/436.json b/public/images/pokemon/variant/436.json index b695af1a3fc..e2fa4e0d532 100644 --- a/public/images/pokemon/variant/436.json +++ b/public/images/pokemon/variant/436.json @@ -4,7 +4,6 @@ "2984a5": "9192a6", "195a7b": "737185", "42a5c5": "c3c3de", - "101010": "101010", "ffde73": "ed87ff", "94b58c": "a15ed9", "63c5e6": "dfe1f4" @@ -14,7 +13,6 @@ "2984a5": "9d4e16", "195a7b": "7e2b15", "42a5c5": "d0662a", - "101010": "101010", "ffde73": "82d562", "94b58c": "899945", "63c5e6": "e98851" diff --git a/public/images/pokemon/variant/437.json b/public/images/pokemon/variant/437.json index d5dedea3748..a278b01e36f 100644 --- a/public/images/pokemon/variant/437.json +++ b/public/images/pokemon/variant/437.json @@ -4,7 +4,6 @@ "73d6ef": "eeeaff", "214a5a": "202429", "42adce": "dedede", - "101010": "101010", "3194b5": "9c9db4", "bdd6de": "bd9173", "a5c5ce": "a27661", @@ -17,7 +16,6 @@ "73d6ef": "f4a97f", "214a5a": "3a1812", "42adce": "d58151", - "101010": "101010", "3194b5": "9d5f33", "bdd6de": "e0da82", "a5c5ce": "ccbd73", diff --git a/public/images/pokemon/variant/438.json b/public/images/pokemon/variant/438.json index 11b250edd0c..46689927197 100644 --- a/public/images/pokemon/variant/438.json +++ b/public/images/pokemon/variant/438.json @@ -4,7 +4,6 @@ "5a8c5a": "6c4616", "9cde7b": "b6a747", "4ac542": "8a6a24", - "000000": "000000", "846b42": "4c443b", "524231": "322a22", "ad845a": "5d564e", @@ -18,13 +17,11 @@ "5a8c5a": "b9ac9d", "9cde7b": "fffdee", "4ac542": "e8e6d7", - "000000": "000000", "846b42": "3c389d", "524231": "2d2164", "ad845a": "4058a8", "c5a54a": "5c80c0", "ffef7b": "c1e0f3", - "f7ce3a": "8fb5dc", - "a5424a": "a5424a" + "f7ce3a": "8fb5dc" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/44.json b/public/images/pokemon/variant/44.json index 143a57297ec..872ed4d67d7 100644 --- a/public/images/pokemon/variant/44.json +++ b/public/images/pokemon/variant/44.json @@ -1,7 +1,6 @@ { "1": { "5a2900": "162486", - "101010": "101010", "ad523a": "4d75b6", "843a19": "2c489f", "ffbd42": "55bb7e", @@ -17,7 +16,6 @@ }, "2": { "5a2900": "680b10", - "101010": "101010", "ad523a": "bd4e2d", "843a19": "8d1e11", "ffbd42": "e8d65e", diff --git a/public/images/pokemon/variant/440.json b/public/images/pokemon/variant/440.json index 090daa258ac..55aa924a89f 100644 --- a/public/images/pokemon/variant/440.json +++ b/public/images/pokemon/variant/440.json @@ -2,7 +2,6 @@ "0": { "a55a7b": "925382", "ffc5d6": "f6cae1", - "101010": "101010", "c58ca5": "c57cad", "73425a": "6c1f9e", "ffffff": "fff4fb", @@ -13,7 +12,6 @@ "1": { "a55a7b": "81256f", "ffc5d6": "ebbada", - "101010": "101010", "c58ca5": "bd61a4", "73425a": "4f0e22", "ffffff": "fff4fb", diff --git a/public/images/pokemon/variant/441.json b/public/images/pokemon/variant/441.json index 1fce9238ec2..bd6244727fe 100644 --- a/public/images/pokemon/variant/441.json +++ b/public/images/pokemon/variant/441.json @@ -3,7 +3,6 @@ "292931": "331d29", "42424a": "573244", "5a5a63": "8f5a70", - "000000": "000000", "ffffff": "deacce", "c5c5c5": "ffeef7", "e67b9c": "ffd067", @@ -19,7 +18,6 @@ "292931": "212530", "42424a": "2e333d", "5a5a63": "3c4047", - "000000": "000000", "ffffff": "dec0ac", "c5c5c5": "fff1dc", "e67b9c": "f37878", diff --git a/public/images/pokemon/variant/442.json b/public/images/pokemon/variant/442.json index 56ab0f334e8..39129cccf64 100644 --- a/public/images/pokemon/variant/442.json +++ b/public/images/pokemon/variant/442.json @@ -7,13 +7,9 @@ "ffde10": "db8241", "31634a": "00145e", "4a8c42": "d77548", - "101010": "101010", "314231": "423131", "734a7b": "1d1d70", "52426b": "42426b", - "b59c94": "b59c94", - "9c846b": "9c846b", - "846b63": "846b63", "524252": "524242" }, "2": { @@ -24,8 +20,6 @@ "ffde10": "a61145", "31634a": "4d559d", "4a8c42": "42598c", - "101010": "101010", - "314231": "314231", "734a7b": "671b35", "52426b": "7d354e", "b59c94": "59001f", diff --git a/public/images/pokemon/variant/443.json b/public/images/pokemon/variant/443.json index 2863290a668..344bcafdebf 100644 --- a/public/images/pokemon/variant/443.json +++ b/public/images/pokemon/variant/443.json @@ -5,15 +5,9 @@ "8cc5d6": "42a5f7", "426b84": "085284", "101010": "101921", - "42d6de": "42d6de", - "c5ced6": "c5ced6", - "3aadc5": "3aadc5", - "ffffff": "ffffff", - "5a6363": "5a6363", "7b1910": "731029", "ad3a10": "a57c10", "de5a29": "e6c529", - "ce7373": "ce7373", "5a1000": "524200" }, "1": { @@ -23,14 +17,10 @@ "426b84": "522521", "101010": "101921", "42d6de": "54b0ff", - "c5ced6": "c5ced6", "3aadc5": "2878e1", - "ffffff": "ffffff", - "5a6363": "5a6363", "7b1910": "731029", "ad3a10": "92a9b2", "de5a29": "d9f0f1", - "ce7373": "ce7373", "5a1000": "524200" }, "2": { @@ -40,10 +30,7 @@ "426b84": "223a4a", "101010": "101921", "42d6de": "6fe6a3", - "c5ced6": "c5ced6", "3aadc5": "23b8a8", - "ffffff": "ffffff", - "5a6363": "5a6363", "7b1910": "7b1a43", "ad3a10": "be472f", "de5a29": "dd845e", diff --git a/public/images/pokemon/variant/444.json b/public/images/pokemon/variant/444.json index e9a652ad8c2..c928f82a213 100644 --- a/public/images/pokemon/variant/444.json +++ b/public/images/pokemon/variant/444.json @@ -11,10 +11,7 @@ "de9c19": "e53d3f", "5a1000": "502209", "ad314a": "ad7b08", - "c5ced6": "c5ced6", - "ffffff": "ffffff", - "de5a29": "f7b834", - "737b84": "737b84" + "de5a29": "f7b834" }, "1": { "102952": "3d0a17", @@ -28,10 +25,7 @@ "de9c19": "d9900e", "5a1000": "211e33", "ad314a": "829ca6", - "c5ced6": "c5ced6", - "ffffff": "ffffff", - "de5a29": "c2dedf", - "737b84": "737b84" + "de5a29": "c2dedf" }, "2": { "102952": "092136", @@ -45,9 +39,6 @@ "de9c19": "2c8bf7", "5a1000": "521000", "ad314a": "be472f", - "c5ced6": "c5ced6", - "ffffff": "ffffff", - "de5a29": "ee723e", - "737b84": "737b84" + "de5a29": "ee723e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/445-mega.json b/public/images/pokemon/variant/445-mega.json index 0e67f00ecd9..f74cd6fd1cf 100644 --- a/public/images/pokemon/variant/445-mega.json +++ b/public/images/pokemon/variant/445-mega.json @@ -5,15 +5,9 @@ "41418b": "19446e", "ffd518": "42d6de", "c59410": "3aadc5", - "101010": "101010", "7e2121": "502209", - "f5f5f5": "f5f5f5", "bd3941": "9e5201", - "e64a31": "f7ac34", - "6a395a": "6a395a", - "bd737b": "bd737b", - "737b83": "737b83", - "c5cdd5": "c5cdd5" + "e64a31": "f7ac34" }, "1": { "292952": "632f1b", @@ -21,15 +15,9 @@ "41418b": "b67252", "ffd518": "4caaff", "c59410": "255dd7", - "101010": "101010", "7e2121": "393648", - "f5f5f5": "f5f5f5", "bd3941": "9fb6bf", - "e64a31": "dce8e8", - "6a395a": "6a395a", - "bd737b": "bd737b", - "737b83": "737b83", - "c5cdd5": "c5cdd5" + "e64a31": "dce8e8" }, "2": { "292952": "051a2e", @@ -37,14 +25,8 @@ "41418b": "152c3b", "ffd518": "6fe6a3", "c59410": "23b8a8", - "101010": "101010", "7e2121": "521000", - "f5f5f5": "f5f5f5", "bd3941": "b23219", - "e64a31": "ec642c", - "6a395a": "6a395a", - "bd737b": "bd737b", - "737b83": "737b83", - "c5cdd5": "c5cdd5" + "e64a31": "ec642c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/445.json b/public/images/pokemon/variant/445.json index 5e0b917b349..664a505d419 100644 --- a/public/images/pokemon/variant/445.json +++ b/public/images/pokemon/variant/445.json @@ -6,12 +6,7 @@ "292952": "0a1347", "5a63ad": "226596", "ffd619": "42d6de", - "737b84": "737b84", - "101010": "101010", - "ffffff": "ffffff", - "c5ced6": "c5ced6", "6b3a5a": "6b4a29", - "bd737b": "bd737b", "e64a31": "f7ac34", "5a1000": "502209", "bd3a42": "b2630f" @@ -23,12 +18,7 @@ "292952": "3d0a17", "5a63ad": "deae7a", "ffd619": "4caaff", - "737b84": "737b84", - "101010": "101010", - "ffffff": "ffffff", - "c5ced6": "c5ced6", "6b3a5a": "6b4a29", - "bd737b": "bd737b", "e64a31": "dce8e8", "5a1000": "393648", "bd3a42": "9fb6bf" @@ -40,12 +30,7 @@ "292952": "051a2e", "5a63ad": "2f434b", "ffd619": "6fe6a3", - "737b84": "737b84", - "101010": "101010", - "ffffff": "ffffff", - "c5ced6": "c5ced6", "6b3a5a": "6b4a29", - "bd737b": "bd737b", "e64a31": "ee723e", "5a1000": "521000", "bd3a42": "be472f" diff --git a/public/images/pokemon/variant/447.json b/public/images/pokemon/variant/447.json index a6c8ea5f5cd..80147a9e70a 100644 --- a/public/images/pokemon/variant/447.json +++ b/public/images/pokemon/variant/447.json @@ -1,13 +1,10 @@ { "0": { - "101010": "101010", "104a7b": "6c3e20", "29739c": "a56d2f", "4a9cef": "e2ce75", "5a5a5a": "2c486e", "3a3a3a": "12334a", - "a53131": "a53131", - "de4242": "de4242", "ffffff": "fff8f1", "8c843a": "b6957f", "dec573": "e6d5b9", @@ -15,7 +12,6 @@ "b5b5b5": "fff8f1" }, "1": { - "101010": "101010", "104a7b": "410814", "29739c": "7f1e2f", "4a9cef": "b85251", @@ -30,7 +26,6 @@ "b5b5b5": "fcc161" }, "2": { - "101010": "101010", "104a7b": "2e1547", "29739c": "513674", "4a9cef": "735c9e", @@ -38,10 +33,7 @@ "3a3a3a": "26153f", "a53131": "b8461f", "de4242": "de8141", - "ffffff": "ffffff", "8c843a": "373566", - "dec573": "51668e", - "848484": "848484", - "b5b5b5": "b5b5b5" + "dec573": "51668e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/448-mega.json b/public/images/pokemon/variant/448-mega.json index 09c18f8521b..242019be218 100644 --- a/public/images/pokemon/variant/448-mega.json +++ b/public/images/pokemon/variant/448-mega.json @@ -2,13 +2,11 @@ "0": { "173968": "6c3e20", "407cdc": "e2ce75", - "101010": "101010", "2e5c85": "a56d2f", "5a5a5a": "2c2f4c", "393939": "171932", "838383": "3a5376", "9a2626": "8a332f", - "fcfcfc": "fcfcfc", "de4141": "d85e40", "e6d083": "719cbe", "b09a4d": "51689c", @@ -17,7 +15,6 @@ "1": { "173968": "3f0916", "407cdc": "b85251", - "101010": "101010", "2e5c85": "7f1e2f", "5a5a5a": "202931", "393939": "202931", @@ -32,13 +29,11 @@ "2": { "173968": "2e1547", "407cdc": "735c9e", - "101010": "101010", "2e5c85": "513674", "5a5a5a": "2c2339", "393939": "291838", "838383": "453a5a", "9a2626": "b8461f", - "fcfcfc": "fcfcfc", "de4141": "de8141", "e6d083": "51668e", "b09a4d": "373566", diff --git a/public/images/pokemon/variant/448.json b/public/images/pokemon/variant/448.json index e573f087e67..e7854e081d7 100644 --- a/public/images/pokemon/variant/448.json +++ b/public/images/pokemon/variant/448.json @@ -2,7 +2,6 @@ "0": { "104a7b": "6c3e20", "4a9cef": "e2ce75", - "101010": "101010", "29739c": "a56d2f", "3a3a3a": "0a2734", "5a5a5a": "223754", @@ -17,7 +16,6 @@ "1": { "104a7b": "410814", "4a9cef": "b85251", - "101010": "101010", "29739c": "7f1e2f", "3a3a3a": "3d1919", "5a5a5a": "262032", @@ -32,16 +30,13 @@ "2": { "104a7b": "2e1547", "4a9cef": "735c9e", - "101010": "101010", "29739c": "513674", "3a3a3a": "291838", "5a5a5a": "2c2339", "848484": "453a5a", "a53131": "b8461f", - "ffffff": "ffffff", "de4242": "de8141", "b5b563": "47439c", - "e6e69c": "6c8bc7", - "d6d6d6": "d6d6d6" + "e6e69c": "6c8bc7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/45.json b/public/images/pokemon/variant/45.json index a1dfd2e7558..358817678d6 100644 --- a/public/images/pokemon/variant/45.json +++ b/public/images/pokemon/variant/45.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "731910": "091d79", "f78c8c": "8cbef7", "f77373": "5e8fde", @@ -18,7 +17,6 @@ "7384a5": "966fbb" }, "2": { - "101010": "101010", "731910": "97696f", "f78c8c": "ebe8d1", "f77373": "d2cbb2", diff --git a/public/images/pokemon/variant/456.json b/public/images/pokemon/variant/456.json index d73c8b48616..bdbd1a816c3 100644 --- a/public/images/pokemon/variant/456.json +++ b/public/images/pokemon/variant/456.json @@ -2,7 +2,6 @@ "1": { "526b8c": "966764", "94d6e6": "f3e1c6", - "101010": "101010", "7394ad": "cda38c", "833171": "d3633a", "29293a": "4f2846", @@ -10,14 +9,12 @@ "c5e6f7": "fffbf2", "c54591": "f19e53", "426b84": "aa6985", - "efffff": "efffff", "c54a94": "8bbcd9", "ad8cbd": "ffca7b" }, "2": { "526b8c": "181e52", "94d6e6": "34507e", - "101010": "101010", "7394ad": "1c335b", "833171": "366ea4", "29293a": "b66736", @@ -25,7 +22,6 @@ "c5e6f7": "49749b", "c54591": "50a8c2", "426b84": "fff8b0", - "efffff": "efffff", "c54a94": "7b1615", "ad8cbd": "3979a1" } diff --git a/public/images/pokemon/variant/4562.json b/public/images/pokemon/variant/4562.json index 52855aa484a..a2c3bd41ea6 100644 --- a/public/images/pokemon/variant/4562.json +++ b/public/images/pokemon/variant/4562.json @@ -2,11 +2,8 @@ "1": { "313131": "145555", "525252": "257e6a", - "101010": "101010", "672b82": "7e173e", "ab38d1": "b0264c", - "371d3f": "371d3f", - "000000": "000000", "6f5c6b": "743949", "c5b9bb": "c69981", "cb414b": "18265b", @@ -17,11 +14,8 @@ "2": { "313131": "69162c", "525252": "90222b", - "101010": "101010", "672b82": "57a0b9", "ab38d1": "c2ffe2", - "371d3f": "371d3f", - "000000": "000000", "6f5c6b": "0a4340", "c5b9bb": "298a61", "cb414b": "ffad58", diff --git a/public/images/pokemon/variant/457.json b/public/images/pokemon/variant/457.json index 2c9766d905b..0a698b077ae 100644 --- a/public/images/pokemon/variant/457.json +++ b/public/images/pokemon/variant/457.json @@ -1,7 +1,6 @@ { "1": { "526b8c": "966764", - "101010": "101010", "c5e6f7": "fffbf2", "94d6e6": "f3e1c6", "29293a": "4f2846", @@ -10,12 +9,10 @@ "c54591": "ffc369", "9e357b": "c7703c", "73427b": "6f75a0", - "c54a94": "aadff3", - "efffff": "efffff" + "c54a94": "aadff3" }, "2": { "526b8c": "0f154a", - "101010": "101010", "c5e6f7": "5781c7", "94d6e6": "34507e", "29293a": "ffa849", @@ -24,7 +21,6 @@ "c54591": "50a8c2", "9e357b": "366ea4", "73427b": "7b1213", - "c54a94": "983121", - "efffff": "efffff" + "c54a94": "983121" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/458.json b/public/images/pokemon/variant/458.json index cac7ad8d381..5fd291d1021 100644 --- a/public/images/pokemon/variant/458.json +++ b/public/images/pokemon/variant/458.json @@ -5,11 +5,9 @@ "1052ad": "d98223", "639cd6": "ffbe49", "102952": "4b1e00", - "000000": "000000", "9cb5de": "cebea5", "b5deff": "eae0cb", "7b94a5": "a48e76", - "ffffff": "ffffff", "4a6373": "8d6c43" }, "2": { @@ -18,11 +16,9 @@ "1052ad": "9ec050", "639cd6": "c6e188", "102952": "233e05", - "000000": "000000", "9cb5de": "e5ca9c", "b5deff": "f3e6cc", "7b94a5": "cbaa7a", - "ffffff": "ffffff", "4a6373": "8d6c43" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/46.json b/public/images/pokemon/variant/46.json index d053c5e40b8..877ed57db83 100644 --- a/public/images/pokemon/variant/46.json +++ b/public/images/pokemon/variant/46.json @@ -5,14 +5,12 @@ "f76b6b": "d7b5b1", "c5b521": "d9c9b9", "ffd652": "f3e8dc", - "101010": "101010", "734a19": "521e0a", "3a2910": "311c07", "e68429": "bc4b23", "b56321": "85251b", "ffad63": "cf6423", "5a5a5a": "774718", - "fff7ff": "fff7ff", "a5a5ce": "ddaf52", "cecece": "f6dc7f" }, @@ -22,14 +20,12 @@ "f76b6b": "e83557", "c5b521": "e5d59c", "ffd652": "fffedf", - "101010": "101010", "734a19": "5a392d", "3a2910": "3a2108", "e68429": "d1afa3", "b56321": "98655f", "ffad63": "f3d8cb", "5a5a5a": "312b68", - "fff7ff": "fff7ff", "a5a5ce": "7070ea", "cecece": "92a4f0" }, @@ -39,14 +35,12 @@ "f76b6b": "5668f8", "c5b521": "b4c5d0", "ffd652": "ddf1f8", - "101010": "101010", "734a19": "3d2b4e", "3a2910": "1e152d", "e68429": "9779a6", "b56321": "6a507b", "ffad63": "bf9edd", "5a5a5a": "760013", - "fff7ff": "fff7ff", "a5a5ce": "e83557", "cecece": "ff878d" } diff --git a/public/images/pokemon/variant/461.json b/public/images/pokemon/variant/461.json index a3af436f1e1..e770a53d4ec 100644 --- a/public/images/pokemon/variant/461.json +++ b/public/images/pokemon/variant/461.json @@ -4,7 +4,6 @@ "c52973": "3a3d60", "ff94a5": "94a3c5", "f75273": "636896", - "101010": "101010", "424a84": "691043", "7384bd": "ac3755", "6b6bad": "8b274b", @@ -21,12 +20,10 @@ "c52973": "3d81c5", "ff94a5": "78ebfc", "f75273": "5cb0eb", - "101010": "101010", "424a84": "ecaa84", "7384bd": "ffeed4", "6b6bad": "ffd3a7", "293152": "96543f", - "ffffff": "ffffff", "c58c08": "8f1a8d", "ffd642": "e6509f", "c5bdce": "afd3e9", diff --git a/public/images/pokemon/variant/462.json b/public/images/pokemon/variant/462.json index 808b79b6da4..69da17dc2de 100644 --- a/public/images/pokemon/variant/462.json +++ b/public/images/pokemon/variant/462.json @@ -3,24 +3,18 @@ "ad8419": "8fb9cc", "f7ce52": "cee7f2", "635a6b": "90495b", - "ffffff": "ffffff", - "101010": "101010", "7b7b84": "90495b", "adadb5": "c36c77", "424252": "612e40", "8494c5": "ffc4b8", "9cbdef": "ffe9e5", - "6b739c": "f99596", - "d64a29": "d64a29", - "a53a29": "a53a29", - "732929": "732929" + "6b739c": "f99596" }, "2": { "ad8419": "6a9ca0", "f7ce52": "a7dcaa", "635a6b": "662e00", "ffffff": "fffb93", - "101010": "101010", "7b7b84": "662e00", "adadb5": "8c500b", "424252": "401d00", diff --git a/public/images/pokemon/variant/464.json b/public/images/pokemon/variant/464.json index 835bdca7c47..0d1ed67d49d 100644 --- a/public/images/pokemon/variant/464.json +++ b/public/images/pokemon/variant/464.json @@ -1,25 +1,18 @@ { "1": { - "6b6373": "6b6373", "3a3a4a": "3b2d40", "5a4a63": "514259", - "101010": "101010", - "efefff": "efefff", "29293a": "1f1028", "523100": "3b1f58", "7b6b7b": "6e5d7b", - "948cad": "948cad", "943a00": "4c2f6e", "ef5200": "6f4d9f", - "cecede": "cecede", - "ad2900": "ad2900", "bd4200": "60418a" }, "2": { "6b6373": "b66360", "3a3a4a": "701f38", "5a4a63": "8f2c41", - "101010": "101010", "efefff": "ffdfd1", "29293a": "442339", "523100": "492133", diff --git a/public/images/pokemon/variant/466.json b/public/images/pokemon/variant/466.json index b0a2bd12820..d81269246f2 100644 --- a/public/images/pokemon/variant/466.json +++ b/public/images/pokemon/variant/466.json @@ -4,29 +4,24 @@ "731900": "004f87", "ffde21": "f07224", "5a4a42": "5e3a3a", - "000000": "000000", "b53a19": "3194ce", "f7523a": "63c5ef", "ffef94": "e8aa8b", "312929": "2d2629", "c5ad42": "bd4c3a", "ffffff": "e8e8e8", - "b5b5c5": "b5bdc5", - "6b6b6b": "6b6b6b" + "b5b5c5": "b5bdc5" }, "1": { "9c844a": "668198", "731900": "73376d", "ffde21": "35ffab", "5a4a42": "465b69", - "000000": "000000", "b53a19": "a45ead", "f7523a": "f795f6", "ffef94": "baffde", "312929": "333931", "c5ad42": "4abaae", - "ffffff": "ffffff", - "b5b5c5": "e6d5da", - "6b6b6b": "6b6b6b" + "b5b5c5": "e6d5da" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/467.json b/public/images/pokemon/variant/467.json index 684a34c97fa..cd1ee711a46 100644 --- a/public/images/pokemon/variant/467.json +++ b/public/images/pokemon/variant/467.json @@ -5,19 +5,14 @@ "ffc53a": "fb8c3b", "cea53a": "db4d19", "f76331": "ee7f2d", - "4a4a42": "4a4a42", "9e344a": "8c3313", "ad3a52": "372d49", "642423": "272034", "4e251d": "581d08", - "101010": "101010", "e64231": "524b6f", "ff94a5": "777066", "c55a6b": "474139", - "ffffff": "ffffff", - "ced6e6": "ced6e6", - "9b3c56": "3f352f", - "2a2523": "2a2523" + "9b3c56": "3f352f" }, "2": { "846321": "699296", @@ -25,18 +20,13 @@ "ffc53a": "eaffff", "cea53a": "c6edf2", "f76331": "478bc0", - "4a4a42": "4a4a42", "9e344a": "4065b0", "ad3a52": "4065b0", "642423": "303d58", "4e251d": "303d58", - "101010": "101010", "e64231": "5398cf", "ff94a5": "abc7de", "c55a6b": "7f90a9", - "ffffff": "ffffff", - "ced6e6": "ced6e6", - "9b3c56": "586271", - "2a2523": "2a2523" + "9b3c56": "586271" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/468.json b/public/images/pokemon/variant/468.json index f29881dcb1b..3196edc8f95 100644 --- a/public/images/pokemon/variant/468.json +++ b/public/images/pokemon/variant/468.json @@ -6,7 +6,6 @@ "4a5a73": "593237", "ce4a31": "1c7b7e", "bdc5de": "ceacac", - "101010": "101010", "4284ef": "d44779", "94b5ff": "ff7986", "bd8484": "28a6a5", @@ -19,7 +18,6 @@ "4a5a73": "452030", "ce4a31": "f6bd58", "bdc5de": "c2888c", - "101010": "101010", "4284ef": "ef884d", "94b5ff": "ffc490", "bd8484": "ffdbaa", @@ -32,7 +30,6 @@ "4a5a73": "254985", "ce4a31": "d97741", "bdc5de": "81aaca", - "101010": "101010", "4284ef": "db79db", "94b5ff": "e89fe5", "bd8484": "e48d41", diff --git a/public/images/pokemon/variant/47.json b/public/images/pokemon/variant/47.json index 4d953e02dcf..c55cc1f25f0 100644 --- a/public/images/pokemon/variant/47.json +++ b/public/images/pokemon/variant/47.json @@ -10,7 +10,6 @@ "b5423a": "85251b", "631000": "521e0a", "de6b31": "bc4b23", - "101010": "101010", "9c8ca5": "774718", "fff7ff": "f6dc7f", "d6d6d6": "ddaf52" @@ -26,7 +25,6 @@ "b5423a": "98655f", "631000": "5a392d", "de6b31": "d1afa3", - "101010": "101010", "9c8ca5": "312b68", "fff7ff": "92a4f0", "d6d6d6": "7070ea" @@ -42,7 +40,6 @@ "b5423a": "6a507b", "631000": "3d2b4e", "de6b31": "9779a6", - "101010": "101010", "9c8ca5": "aa1810", "fff7ff": "ee5a3b", "d6d6d6": "cb381f" diff --git a/public/images/pokemon/variant/470.json b/public/images/pokemon/variant/470.json index 227c74bb524..8af1cf54438 100644 --- a/public/images/pokemon/variant/470.json +++ b/public/images/pokemon/variant/470.json @@ -2,7 +2,6 @@ "0": { "31635a": "076849", "319c73": "17b579", - "101010": "101010", "6bbd8c": "6aec9e", "635242": "736151", "5a4221": "1c59a6", @@ -10,15 +9,11 @@ "bd9463": "c5a87a", "946331": "1c85a7", "3a2919": "0b1747", - "efffff": "efffff", - "846b42": "846b42", - "d6b573": "e8d09f", - "423a42": "423a42" + "d6b573": "e8d09f" }, "1": { "31635a": "024335", "319c73": "67a27a", - "101010": "101010", "6bbd8c": "a9d9ab", "635242": "736151", "5a4221": "541741", @@ -26,7 +21,6 @@ "bd9463": "975e45", "946331": "7a2c56", "3a2919": "0a2c33", - "efffff": "efffff", "846b42": "824734", "d6b573": "b78160", "423a42": "4b2629" @@ -34,7 +28,6 @@ "2": { "31635a": "9f5d29", "319c73": "d8a452", - "101010": "101010", "6bbd8c": "edd898", "635242": "4e230e", "5a4221": "803825", @@ -42,7 +35,6 @@ "bd9463": "6d4f33", "946331": "a95c3e", "3a2919": "552c12", - "efffff": "efffff", "846b42": "4a391e", "d6b573": "816242", "423a42": "310f06" diff --git a/public/images/pokemon/variant/471.json b/public/images/pokemon/variant/471.json index 14cc5e429e8..4240babbcae 100644 --- a/public/images/pokemon/variant/471.json +++ b/public/images/pokemon/variant/471.json @@ -1,15 +1,12 @@ { "0": { - "101010": "101010", "7b9cb5": "dad9ea", "94e6ef": "f8f7ff", "525a84": "636b94", "52639c": "54bbd2", "3a3a52": "1a6782", "529cde": "a0e7f7", - "313a4a": "313a4a", "425a6b": "3597ac", - "efffff": "efffff", "94b5ce": "e6e3f3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/474.json b/public/images/pokemon/variant/474.json index 83d717503a6..6ec1f7edef1 100644 --- a/public/images/pokemon/variant/474.json +++ b/public/images/pokemon/variant/474.json @@ -3,10 +3,8 @@ "5a3a4a": "9e264e", "94426b": "d95492", "ef5a63": "f8a8e6", - "101010": "101010", "bd4a6b": "e883c8", "ff94b5": "fccef2", - "ffffff": "ffffff", "313a63": "110a25", "8cd6ff": "5e4868", "31739c": "271a3e", @@ -19,7 +17,6 @@ "5a3a4a": "31150e", "94426b": "491c0c", "ef5a63": "82391d", - "101010": "101010", "bd4a6b": "612a17", "ff94b5": "a04c27", "ffffff": "ffe4d4", diff --git a/public/images/pokemon/variant/475.json b/public/images/pokemon/variant/475.json index 68f3a5a6432..2b1cb0e6173 100644 --- a/public/images/pokemon/variant/475.json +++ b/public/images/pokemon/variant/475.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "7394a5": "fff1c0", "7bc5b5": "ebc984", "527b84": "17042f", @@ -11,24 +10,17 @@ "c5cede": "ffc4a6", "efefff": "f8efde", "a5b5ce": "ffc4a6", - "ffffff": "ffffff", "e6523a": "da3e4f", "ff9c84": "ca2033", "7b5252": "b80e2f" }, "2": { - "101010": "101010", "7394a5": "5b5790", "7bc5b5": "3f427f", "527b84": "2e2746", "3a5252": "34345d", "42845a": "242745", "5ab56b": "282c5d", - "7b8cad": "7b8cad", - "c5cede": "c5cede", - "efefff": "efefff", - "a5b5ce": "a5b5ce", - "ffffff": "ffffff", "e6523a": "d846c1", "ff9c84": "b035ae", "7b5252": "9e2a7c" diff --git a/public/images/pokemon/variant/478.json b/public/images/pokemon/variant/478.json index a27441bba77..cb6fdbce804 100644 --- a/public/images/pokemon/variant/478.json +++ b/public/images/pokemon/variant/478.json @@ -3,7 +3,6 @@ "527bb5": "189c28", "42528c": "0f8c40", "73b5d6": "65d64d", - "101010": "101010", "42426b": "123120", "8c8cad": "244f32", "ffffff": "558752", diff --git a/public/images/pokemon/variant/479-fan.json b/public/images/pokemon/variant/479-fan.json index 6f4818f6770..8fd87e5db9b 100644 --- a/public/images/pokemon/variant/479-fan.json +++ b/public/images/pokemon/variant/479-fan.json @@ -8,7 +8,6 @@ "ffffff": "fbffbd", "ef7329": "417131", "ffad84": "819d56", - "101010": "101010", "4a4a52": "2e3f18", "bdbdbd": "d8e082", "ffde73": "7aa26f", @@ -20,12 +19,9 @@ "ffefa5": "edf2fa", "c54a19": "cbb240", "7b3a21": "ad7d28", - "ffffff": "ffffff", "ef7329": "e4de6d", "ffad84": "fcfebf", - "101010": "101010", "4a4a52": "374f6c", - "bdbdbd": "bdbdbd", "ffde73": "e99499", "e67319": "d36172" } diff --git a/public/images/pokemon/variant/479-frost.json b/public/images/pokemon/variant/479-frost.json index a45e4bea735..4277eb9dc63 100644 --- a/public/images/pokemon/variant/479-frost.json +++ b/public/images/pokemon/variant/479-frost.json @@ -7,7 +7,6 @@ "ffad84": "819d56", "7b3a21": "183b29", "ef7329": "417131", - "101010": "101010", "ffffff": "fbffbd", "9484de": "9ea436", "6b3aad": "648c50", @@ -22,11 +21,8 @@ "ffad84": "e9edfe", "7b3a21": "536d8c", "ef7329": "c5cbe5", - "101010": "101010", - "ffffff": "ffffff", "9484de": "f0e096", "6b3aad": "d3a94c", - "bdbdbd": "bdbdbd", "4a4a52": "2f4865" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/479-heat.json b/public/images/pokemon/variant/479-heat.json index b0cf3c22876..b9d3c248833 100644 --- a/public/images/pokemon/variant/479-heat.json +++ b/public/images/pokemon/variant/479-heat.json @@ -11,7 +11,6 @@ "bdbdbd": "d8e082", "ff7373": "9ea436", "ce313a": "648c50", - "101010": "101010", "292929": "183b29", "4a4a52": "505a46" }, @@ -19,15 +18,12 @@ "bd2929": "cbbf4c", "ff4231": "f5f4ab", "ff9c94": "fdffe1", - "ffffff": "ffffff", "c54a19": "d06280", "7b3a21": "9e3867", "ef7329": "ff8493", "ffad84": "ffd5d0", - "bdbdbd": "bdbdbd", "ff7373": "37c983", "ce313a": "1b976a", - "101010": "101010", "292929": "581944", "4a4a52": "793142" } diff --git a/public/images/pokemon/variant/479-mow.json b/public/images/pokemon/variant/479-mow.json index ef080956443..31daefc660c 100644 --- a/public/images/pokemon/variant/479-mow.json +++ b/public/images/pokemon/variant/479-mow.json @@ -7,7 +7,6 @@ "8cf7ad": "9ea436", "ef7329": "417131", "ffad84": "819d56", - "101010": "101010", "4a4a52": "183b29", "21b552": "9ea436", "ffffff": "fbffbd", @@ -22,11 +21,7 @@ "8cf7ad": "ffbcc2", "ef7329": "279e69", "ffad84": "6ada9c", - "101010": "101010", - "4a4a52": "4a4a52", "21b552": "83d0ec", - "ffffff": "ffffff", - "bdbdbd": "bdbdbd", "087b42": "40b4de" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/479-wash.json b/public/images/pokemon/variant/479-wash.json index 05366c8e80f..d24a1094568 100644 --- a/public/images/pokemon/variant/479-wash.json +++ b/public/images/pokemon/variant/479-wash.json @@ -11,7 +11,6 @@ "ffffff": "fbffbd", "317bef": "9ea436", "0842ad": "648c50", - "101010": "101010", "4a4a52": "183b29" }, "2": { @@ -22,11 +21,8 @@ "ef7329": "86d7ec", "7b3a21": "255e90", "ffad84": "bbf7fe", - "bdbdbd": "bdbdbd", - "ffffff": "ffffff", "317bef": "73757f", "0842ad": "53555e", - "101010": "101010", "4a4a52": "3f3f4e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/479.json b/public/images/pokemon/variant/479.json index 1ecfab64f61..2ae2cf23642 100644 --- a/public/images/pokemon/variant/479.json +++ b/public/images/pokemon/variant/479.json @@ -8,7 +8,6 @@ "ef7329": "417131", "ffad84": "819d56", "ffffff": "fbffbd", - "101010": "101010", "bdbdbd": "d8e082", "317bef": "89a271", "0842ad": "648c50" @@ -21,9 +20,6 @@ "7b3a21": "242834", "ef7329": "4d5262", "ffad84": "777b88", - "ffffff": "ffffff", - "101010": "101010", - "bdbdbd": "bdbdbd", "317bef": "e9919c", "0842ad": "c95367" } diff --git a/public/images/pokemon/variant/480.json b/public/images/pokemon/variant/480.json index d65bc170282..de8d9f0f7c1 100644 --- a/public/images/pokemon/variant/480.json +++ b/public/images/pokemon/variant/480.json @@ -1,7 +1,6 @@ { "0": { "735a42": "86340d", - "101010": "101010", "f7c573": "e8824f", "ffde9c": "ffb376", "ad8c42": "ba5327", @@ -10,13 +9,11 @@ "424242": "542416", "ef4242": "e141ed", "5a3a42": "440e8c", - "ffffff": "ffffff", "949cc5": "d49472", "ad4242": "ad2dd7" }, "1": { "735a42": "0b1f51", - "101010": "101010", "f7c573": "3675ba", "ffde9c": "5099d9", "ad8c42": "1e4891", @@ -25,13 +22,11 @@ "424242": "162460", "ef4242": "ffbd73", "5a3a42": "aa4e1c", - "ffffff": "ffffff", "949cc5": "6085d4", "ad4242": "ef8d45" }, "2": { "735a42": "123723", - "101010": "101010", "f7c573": "4d967d", "ffde9c": "92dabb", "ad8c42": "24594a", @@ -40,7 +35,6 @@ "424242": "47684e", "ef4242": "c45cec", "5a3a42": "5f1c68", - "ffffff": "ffffff", "949cc5": "a5bca8", "ad4242": "ab32ce" } diff --git a/public/images/pokemon/variant/481.json b/public/images/pokemon/variant/481.json index 54a3e938751..14b00812c7d 100644 --- a/public/images/pokemon/variant/481.json +++ b/public/images/pokemon/variant/481.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "84426b": "691149", "ef73ad": "b35596", "b55284": "93397b", @@ -8,7 +7,6 @@ "ef4242": "ffa85f", "5a3a42": "bf5614", "7b7394": "8d4275", - "ffffff": "ffffff", "b5cef7": "fbc8e1", "949cc5": "d295b9", "ad4242": "ef8134", @@ -17,7 +15,6 @@ "424242": "591c4b" }, "1": { - "101010": "101010", "84426b": "371959", "ef73ad": "785194", "b55284": "59367e", @@ -25,7 +22,6 @@ "ef4242": "28c75c", "5a3a42": "076033", "7b7394": "6b4b75", - "ffffff": "ffffff", "b5cef7": "e7d6ea", "949cc5": "b89cbb", "ad4242": "17a352", @@ -34,7 +30,6 @@ "424242": "51385c" }, "2": { - "101010": "101010", "84426b": "813401", "ef73ad": "ebab24", "b55284": "d97e2b", @@ -42,7 +37,6 @@ "ef4242": "ce569c", "5a3a42": "7c2060", "7b7394": "896149", - "ffffff": "ffffff", "b5cef7": "f7e0b5", "949cc5": "c5ac94", "ad4242": "bb3e8d", diff --git a/public/images/pokemon/variant/482.json b/public/images/pokemon/variant/482.json index 8665895fa59..5b48766e609 100644 --- a/public/images/pokemon/variant/482.json +++ b/public/images/pokemon/variant/482.json @@ -5,16 +5,12 @@ "b5cef7": "c5e1ef", "424242": "3e5a9d", "5a94c5": "27bac2", - "101010": "101010", "426394": "0f7293", "949cc5": "86abcc", "5a3a42": "500c66", "ef4242": "a045e1", "ad4242": "7c1caa", - "73ade6": "44e9e1", - "ffffff": "ffffff", - "ffb521": "ffb521", - "ad8c42": "ad8c42" + "73ade6": "44e9e1" }, "1": { "7b7394": "5d8e91", @@ -22,14 +18,12 @@ "b5cef7": "b5f7df", "424242": "3c6268", "5a94c5": "488356", - "101010": "101010", "426394": "32613b", "949cc5": "7ab5ad", "5a3a42": "9e3b0f", "ef4242": "eb914d", "ad4242": "d26725", "73ade6": "82be84", - "ffffff": "ffffff", "ffb521": "553178", "ad8c42": "9c5fb8" }, @@ -39,14 +33,12 @@ "b5cef7": "dbc6e6", "424242": "573d79", "5a94c5": "ce569c", - "101010": "101010", "426394": "a4327e", "949cc5": "ae8bc7", "5a3a42": "845104", "ef4242": "dfb132", "ad4242": "cb901d", "73ade6": "ec84be", - "ffffff": "ffffff", "ffb521": "2acf53", "ad8c42": "52e589" } diff --git a/public/images/pokemon/variant/485.json b/public/images/pokemon/variant/485.json index 91ff1824b7a..3a9144ba9c5 100644 --- a/public/images/pokemon/variant/485.json +++ b/public/images/pokemon/variant/485.json @@ -1,6 +1,5 @@ { "1": { - "737373": "737373", "5a3131": "313f5a", "e6e6ef": "ffffff", "c5c5c5": "e3e3e3", @@ -10,13 +9,11 @@ "949494": "bfa9a9", "ce8429": "29ce5a", "ffa510": "10ff6b", - "ffffff": "ffffff", "525252": "767676", "b54229": "b5a529", "ff523a": "fcff3a" }, "2": { - "737373": "737373", "5a3131": "462151", "e6e6ef": "b0b0b0", "c5c5c5": "949494", @@ -26,7 +23,6 @@ "949494": "636363", "ce8429": "ce2988", "ffa510": "f110ff", - "ffffff": "ffffff", "525252": "514949", "b54229": "4ab529", "ff523a": "7aff3a" diff --git a/public/images/pokemon/variant/487-altered.json b/public/images/pokemon/variant/487-altered.json index 8b1ce80eac6..929526b87b7 100644 --- a/public/images/pokemon/variant/487-altered.json +++ b/public/images/pokemon/variant/487-altered.json @@ -9,7 +9,6 @@ "9494a5": "535e7e", "c5ced6": "84a1b9", "ad7b00": "084740", - "000000": "000000", "ff4252": "ff78ef", "a5213a": "b23dad", "4a4a5a": "2f3154", @@ -25,7 +24,6 @@ "9494a5": "3e5056", "c5ced6": "597379", "ad7b00": "7b623f", - "000000": "000000", "ff4252": "46e92a", "a5213a": "16b811", "4a4a5a": "273c30", diff --git a/public/images/pokemon/variant/487-origin.json b/public/images/pokemon/variant/487-origin.json index dc396105b93..1d19e13cc14 100644 --- a/public/images/pokemon/variant/487-origin.json +++ b/public/images/pokemon/variant/487-origin.json @@ -13,7 +13,6 @@ "c5ced6": "acb6d8", "9494a5": "8485b9", "ffefc5": "9fffd4", - "000000": "000000", "6b6b7b": "7a58a6" }, "2": { @@ -29,8 +28,6 @@ "ce9c00": "e2d4af", "c5ced6": "818a7c", "9494a5": "495f64", - "ffefc5": "ffefc5", - "000000": "000000", "6b6b7b": "37434b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/488.json b/public/images/pokemon/variant/488.json index 53e8b23da16..59e1c46f74c 100644 --- a/public/images/pokemon/variant/488.json +++ b/public/images/pokemon/variant/488.json @@ -1,7 +1,6 @@ { "1": { "6b5231": "5a3c2a", - "101010": "101010", "ffefbd": "fdf0d6", "ad945a": "bc977d", "ffd673": "ddbfa4", @@ -9,12 +8,10 @@ "d68cce": "dd8d2e", "8c427b": "721e01", "523a5a": "420600", - "ffffff": "ffffff", "e6c5ef": "ffd28c", "8494f7": "4863b6", "526bb5": "304190", - "3a427b": "181d46", - "c5b5b5": "c5b5b5" + "3a427b": "181d46" }, "2": { "6b5231": "67858a", @@ -26,7 +23,6 @@ "d68cce": "7fe14b", "8c427b": "168557", "523a5a": "084c38", - "ffffff": "ffffff", "e6c5ef": "e0ff8c", "8494f7": "4a4f5f", "526bb5": "1f2435", diff --git a/public/images/pokemon/variant/489.json b/public/images/pokemon/variant/489.json index f7e55dad2a7..5fad38db4e7 100644 --- a/public/images/pokemon/variant/489.json +++ b/public/images/pokemon/variant/489.json @@ -1,48 +1,34 @@ { "0": { "317bad": "399271", - "101010": "101010", "3a529c": "185b4f", "9ce6ff": "c3ffcd", "6bc5f7": "9bf3b7", "199cd6": "69c796", "ceefff": "e3ffe3", "196bde": "326260", - "ffffff": "ffffff", - "948c9c": "948c9c", - "4a526b": "4a526b", "ad3a29": "c37a31", "de849c": "ffcb68", "e64210": "d19449" }, "1": { "317bad": "964d17", - "101010": "101010", "3a529c": "682307", "9ce6ff": "ffd289", "6bc5f7": "f5a54e", "199cd6": "c27138", - "ceefff": "ceefff", "196bde": "23395b", - "ffffff": "ffffff", - "948c9c": "948c9c", - "4a526b": "4a526b", "ad3a29": "3c68ad", "de849c": "b9e6ff", "e64210": "4d9ac4" }, "2": { "317bad": "a43b74", - "101010": "101010", "3a529c": "84255f", "9ce6ff": "efa0b2", "6bc5f7": "e484a8", "199cd6": "c65086", - "ceefff": "ceefff", "196bde": "45135e", - "ffffff": "ffffff", - "948c9c": "948c9c", - "4a526b": "4a526b", "ad3a29": "652386", "de849c": "a884ff", "e64210": "893ac2" diff --git a/public/images/pokemon/variant/490.json b/public/images/pokemon/variant/490.json index 2b0ca7f8c23..c14dba48eea 100644 --- a/public/images/pokemon/variant/490.json +++ b/public/images/pokemon/variant/490.json @@ -2,14 +2,12 @@ "0": { "317bad": "399271", "199cd6": "69c796", - "101010": "101010", "6bc5f7": "9bf3b7", "294a84": "185b4f", "9ce6ff": "cdffd7", "ceefff": "eaffeb", "ffde52": "215957", "e6ad52": "143c3e", - "ffffff": "ffffff", "ad3a29": "c37a31", "de849c": "ffcb68", "e64210": "d19449" @@ -17,14 +15,12 @@ "1": { "317bad": "964d17", "199cd6": "c27138", - "101010": "101010", "6bc5f7": "f5a54e", "294a84": "682307", "9ce6ff": "ffd289", "ceefff": "ffeecc", "ffde52": "38577c", "e6ad52": "23395b", - "ffffff": "ffffff", "ad3a29": "3c68ad", "de849c": "b9e6ff", "e64210": "4d9ac4" @@ -32,14 +28,11 @@ "2": { "317bad": "b8488c", "199cd6": "cc659c", - "101010": "101010", "6bc5f7": "de89b3", "294a84": "912b6e", "9ce6ff": "e7a6c3", - "ceefff": "ceefff", "ffde52": "692a88", "e6ad52": "45135e", - "ffffff": "ffffff", "ad3a29": "652386", "de849c": "a884ff", "e64210": "893ac2" diff --git a/public/images/pokemon/variant/491.json b/public/images/pokemon/variant/491.json index 51bdf9a431f..13289bf4c2f 100644 --- a/public/images/pokemon/variant/491.json +++ b/public/images/pokemon/variant/491.json @@ -3,28 +3,24 @@ "848484": "3b6771", "adb5bd": "7cbcc1", "524a4a": "53818e", - "101010": "101010", "313131": "274656", "dee6ef": "bcdddd", "520000": "0a436c", "942942": "1e849a", "108cad": "a32819", "29e6ff": "d7502b", - "ffffff": "ffffff", "e63a29": "4fe0cd" }, "2": { "848484": "694624", "adb5bd": "ce9c7a", "524a4a": "b42f40", - "101010": "101010", "313131": "7a1d36", "dee6ef": "ffcdbc", "520000": "6a2c00", "942942": "ba5a19", "108cad": "25a6c7", "29e6ff": "76f7ff", - "ffffff": "ffffff", "e63a29": "ffa645" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/492-land.json b/public/images/pokemon/variant/492-land.json index 32deb188493..46b355d108d 100644 --- a/public/images/pokemon/variant/492-land.json +++ b/public/images/pokemon/variant/492-land.json @@ -3,13 +3,11 @@ "8cad63": "aa671e", "5a7342": "743510", "adde63": "f0a852", - "ffef7b": "ffef7b", "844a6b": "326a9a", "ef8ca5": "81bdd3", "635a6b": "a7604e", "bdc5d6": "e0bba1", "ffffff": "fff4ea", - "101010": "101010", "3a9442": "9f422a", "ce6b8c": "67a9c6", "31633a": "521605", diff --git a/public/images/pokemon/variant/492-sky.json b/public/images/pokemon/variant/492-sky.json index 5ca67b4871a..f22d2130ba7 100644 --- a/public/images/pokemon/variant/492-sky.json +++ b/public/images/pokemon/variant/492-sky.json @@ -7,7 +7,6 @@ "52525a": "78492a", "ffffff": "fffae9", "ceced6": "e0cea9", - "101010": "101010", "bd4a5a": "ce4626", "7b3a52": "8f210d", "f74a42": "ee7b56" @@ -20,7 +19,6 @@ "52525a": "7a3126", "ffffff": "fff4ea", "ceced6": "e0bba1", - "101010": "101010", "bd4a5a": "7e399c", "7b3a52": "531f72", "f74a42": "b96bd2" diff --git a/public/images/pokemon/variant/494.json b/public/images/pokemon/variant/494.json index 78e5a04a275..a096e70d70b 100644 --- a/public/images/pokemon/variant/494.json +++ b/public/images/pokemon/variant/494.json @@ -3,34 +3,23 @@ "8c3110": "563a0a", "ff6b19": "fff1ce", "bd4a00": "706040", - "000000": "000000", "c59c5a": "d96030", "ffe6ad": "ee8e3e", "6b4a10": "902300", - "3a3a3a": "3a3a3a", "846b3a": "c43d21", "3a5aad": "084f4c", - "ffffff": "ffffff", - "c5bdbd": "c5bdbd", - "73adff": "34a696", - "a55a5a": "a55a5a", - "c57373": "c57373" + "73adff": "34a696" }, "2": { "8c3110": "813a61", "ff6b19": "ffb7e0", "bd4a00": "b9648d", - "000000": "000000", "c59c5a": "45465d", "ffe6ad": "72758a", "6b4a10": "1e1b36", "3a3a3a": "120d26", "846b3a": "2b2a40", "3a5aad": "710643", - "ffffff": "ffffff", - "c5bdbd": "c5bdbd", - "73adff": "cd5fa5", - "a55a5a": "a55a5a", - "c57373": "c57373" + "73adff": "cd5fa5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/495.json b/public/images/pokemon/variant/495.json index c1cb2c10db1..07fc4b6b717 100644 --- a/public/images/pokemon/variant/495.json +++ b/public/images/pokemon/variant/495.json @@ -2,7 +2,6 @@ "1": { "005200": "1f153d", "00b500": "585fa0", - "080808": "080808", "ffde29": "ff884c", "fff7bd": "ffe5b2", "8c7b31": "7f533f", @@ -10,14 +9,12 @@ "c59c00": "cc4328", "943a00": "4c3d99", "5a2100": "1e1e66", - "ffffff": "ffffff", "de7b42": "8766cc", "088400": "363270" }, "2": { "005200": "7f194c", "00b500": "e55b77", - "080808": "080808", "ffde29": "ffffff", "fff7bd": "fff2f8", "8c7b31": "664c61", @@ -25,7 +22,6 @@ "c59c00": "cecee5", "943a00": "168399", "5a2100": "054566", - "ffffff": "ffffff", "de7b42": "33cccc", "088400": "b23561" } diff --git a/public/images/pokemon/variant/496.json b/public/images/pokemon/variant/496.json index 6c9f5ab6096..1e2661a7f40 100644 --- a/public/images/pokemon/variant/496.json +++ b/public/images/pokemon/variant/496.json @@ -6,12 +6,9 @@ "8c7b31": "7f533f", "21943a": "433e7c", "fff7bd": "ffe5b2", - "000000": "000000", "734210": "4c3d99", "bd4a21": "8766cc", - "ffffff": "ffffff", - "c5bd63": "cca37a", - "081010": "081010" + "c5bd63": "cca37a" }, "2": { "105229": "7f194c", @@ -20,11 +17,8 @@ "8c7b31": "664c61", "21943a": "b23561", "fff7bd": "fff2f8", - "000000": "000000", "734210": "4a52a5", "bd4a21": "778fd8", - "ffffff": "ffffff", - "c5bd63": "ccadc1", - "081010": "081010" + "c5bd63": "ccadc1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/497.json b/public/images/pokemon/variant/497.json index 3fff190062b..d84d71dd3d4 100644 --- a/public/images/pokemon/variant/497.json +++ b/public/images/pokemon/variant/497.json @@ -1,11 +1,9 @@ { "1": { - "8c8cad": "8c8cad", "6b733a": "99261e", "ffce29": "ff9966", "10733a": "1b0f3f", "081010": "06010c", - "ffffff": "ffffff", "d69c08": "cc523d", "199c4a": "2e2872", "c5c5d6": "c5c5d5", diff --git a/public/images/pokemon/variant/5.json b/public/images/pokemon/variant/5.json index 3bb5b8d92f6..9647a507698 100644 --- a/public/images/pokemon/variant/5.json +++ b/public/images/pokemon/variant/5.json @@ -4,16 +4,12 @@ "942110": "10292c", "ff846b": "40a78f", "ff524a": "2a6e70", - "101010": "101010", - "b5b5b5": "b5b5b5", - "ffffff": "ffffff", "005aff": "ce1010", "ff4200": "5033ce", "ffa500": "9e59db", "e6cead": "99f4f7", "cead7b": "6ee3e5", "ffde29": "e9bfff", - "6b6b6b": "6b6b6b", "b58c5a": "60c5c8" }, "2": { @@ -21,16 +17,12 @@ "942110": "101a70", "ff846b": "418ae2", "ff524a": "2564bc", - "101010": "101010", - "b5b5b5": "b5b5b5", - "ffffff": "ffffff", "005aff": "2b75ff", "ff4200": "4c83d4", "ffa500": "96e8e8", "e6cead": "5e238e", "cead7b": "47177a", "ffde29": "f9fffa", - "6b6b6b": "6b6b6b", "b58c5a": "340d6b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/50.json b/public/images/pokemon/variant/50.json index e12b740720f..dd71578dd77 100644 --- a/public/images/pokemon/variant/50.json +++ b/public/images/pokemon/variant/50.json @@ -4,8 +4,6 @@ "c57342": "4eb578", "a55a5a": "2b8d62", "de9c5a": "7ade9a", - "101010": "101010", - "ffffff": "ffffff", "d63a4a": "ef4da0", "730019": "882859", "ffad94": "ffc6cf", @@ -20,8 +18,6 @@ "c57342": "f2ad3d", "a55a5a": "cc8029", "de9c5a": "ffde62", - "101010": "101010", - "ffffff": "ffffff", "d63a4a": "c3ccd9", "730019": "62738c", "ffad94": "ffffff", diff --git a/public/images/pokemon/variant/51.json b/public/images/pokemon/variant/51.json index 969ea6baa27..cc4e4419a61 100644 --- a/public/images/pokemon/variant/51.json +++ b/public/images/pokemon/variant/51.json @@ -4,8 +4,6 @@ "5a3119": "10644e", "de9c5a": "7ade9a", "c57342": "4eb578", - "101010": "101010", - "ffffff": "ffffff", "730019": "882859", "d63a4a": "ef4da0", "ffad94": "ffc6cf", @@ -20,8 +18,6 @@ "5a3119": "a66010", "de9c5a": "ffde62", "c57342": "f2ad3d", - "101010": "101010", - "ffffff": "ffffff", "730019": "62738c", "d63a4a": "c3ccd9", "ffad94": "ffffff", diff --git a/public/images/pokemon/variant/517.json b/public/images/pokemon/variant/517.json index 012ed3a717c..eb14a152580 100644 --- a/public/images/pokemon/variant/517.json +++ b/public/images/pokemon/variant/517.json @@ -4,13 +4,11 @@ "ffc5ce": "7ed1a3", "844263": "2d7a6e", "845a94": "087173", - "101010": "101010", "ad7bce": "119b87", "ffd6de": "b9ecbf", "f78cd6": "5fafdf", "de7bbd": "3175b5", "ad2942": "ca2793", - "ffffff": "ffffff", "de2942": "f455a8", "e6adc5": "5cb391", "634a6b": "003f4f" @@ -20,13 +18,11 @@ "ffc5ce": "3f88ba", "844263": "182c53", "845a94": "923a35", - "101010": "101010", "ad7bce": "d6654d", "ffd6de": "71c1e4", "f78cd6": "efc375", "de7bbd": "cd8042", "ad2942": "9b1112", - "ffffff": "ffffff", "de2942": "bd3a25", "e6adc5": "3070b5", "634a6b": "6a111c" diff --git a/public/images/pokemon/variant/518.json b/public/images/pokemon/variant/518.json index cdc86872a18..0113fb54ba1 100644 --- a/public/images/pokemon/variant/518.json +++ b/public/images/pokemon/variant/518.json @@ -8,10 +8,8 @@ "947bde": "e4845e", "9c5a63": "854655", "ffc5ce": "f5dddf", - "101010": "101010", "ce9c94": "efbcc9", - "525252": "a86c76", - "6b314a": "6b314a" + "525252": "a86c76" }, "2": { "bd73ad": "314da0", @@ -22,9 +20,7 @@ "947bde": "ffdcaa", "9c5a63": "151c59", "ffc5ce": "384a8f", - "101010": "101010", "ce9c94": "233175", - "525252": "0b0f3c", - "6b314a": "6b314a" + "525252": "0b0f3c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/52-gigantamax.json b/public/images/pokemon/variant/52-gigantamax.json index 2910872ad30..5a688f9ffa2 100644 --- a/public/images/pokemon/variant/52-gigantamax.json +++ b/public/images/pokemon/variant/52-gigantamax.json @@ -4,12 +4,7 @@ "7f5745": "5b4a3b", "fbf7e6": "ece3c7", "f0dea2": "c7b497", - "101010": "101010", - "986100": "986100", "d46140": "ac68b5", - "f9d400": "f9d400", - "f6f6f6": "f6f6f6", - "cca700": "cca700", "fced87": "ffd156", "944100": "751e7c", "c5810b": "b146ac", @@ -20,11 +15,9 @@ "7f5745": "552e15", "fbf7e6": "e5bc79", "f0dea2": "c08647", - "101010": "101010", "986100": "683700", "d46140": "dd4c2a", "f9d400": "ffbf3f", - "f6f6f6": "f6f6f6", "cca700": "a96c00", "fced87": "55d0eb", "944100": "2948ad", @@ -36,11 +29,9 @@ "7f5745": "2a221c", "fbf7e6": "807d77", "f0dea2": "524f4a", - "101010": "101010", "986100": "986f00", "d46140": "ffd0c5", "f9d400": "f9e600", - "f6f6f6": "f6f6f6", "cca700": "efc300", "fced87": "77e84e", "944100": "256a24", diff --git a/public/images/pokemon/variant/52.json b/public/images/pokemon/variant/52.json index 622f878120b..00ff0470ef3 100644 --- a/public/images/pokemon/variant/52.json +++ b/public/images/pokemon/variant/52.json @@ -2,16 +2,10 @@ "0": { "8c6b00": "5b4a3b", "ffe684": "c7b497", - "101010": "101010", - "cea500": "cea500", - "ffd600": "ffd600", - "ffffff": "ffffff", "d65a3a": "af4dbc", "ff7352": "e177de", - "945a00": "945a00", "debd3a": "816f5c", "ffffb5": "ece3c7", - "e6e6e6": "e6e6e6", "944200": "86358c", "ef9c31": "d577c9", "c57b08": "be5fba" @@ -19,16 +13,12 @@ "1": { "8c6b00": "552e15", "ffe684": "c08647", - "101010": "101010", "cea500": "a96c00", "ffd600": "ffbf3f", - "ffffff": "ffffff", "d65a3a": "b62315", "ff7352": "dd4c2a", - "945a00": "945a00", "debd3a": "915d2f", "ffffb5": "e5bc79", - "e6e6e6": "e6e6e6", "944200": "2948ad", "ef9c31": "7bf7f7", "c57b08": "52add6" @@ -36,16 +26,13 @@ "2": { "8c6b00": "241d18", "ffe684": "524f4a", - "101010": "101010", "cea500": "d2ac00", "ffd600": "f9e600", - "ffffff": "ffffff", "d65a3a": "d06e6b", "ff7352": "fab2a1", "945a00": "986f00", "debd3a": "322d28", "ffffb5": "807d77", - "e6e6e6": "e6e6e6", "944200": "3c693b", "ef9c31": "c1e8b2", "c57b08": "88c082" diff --git a/public/images/pokemon/variant/524.json b/public/images/pokemon/variant/524.json index a13526e2c5e..f03b1ec5152 100644 --- a/public/images/pokemon/variant/524.json +++ b/public/images/pokemon/variant/524.json @@ -1,7 +1,6 @@ { "1": { "3a2119": "4d8c77", - "000000": "000000", "7b5a4a": "97d9c3", "5a4231": "63a690", "19213a": "292538", @@ -13,7 +12,6 @@ }, "2": { "3a2119": "292933", - "000000": "000000", "7b5a4a": "979bb3", "5a4231": "515266", "19213a": "584245", diff --git a/public/images/pokemon/variant/525.json b/public/images/pokemon/variant/525.json index dd485da0763..3821f88f78d 100644 --- a/public/images/pokemon/variant/525.json +++ b/public/images/pokemon/variant/525.json @@ -1,7 +1,6 @@ { "1": { "293a6b": "464558", - "101010": "101010", "42528c": "656273", "21293a": "292538", "ad2919": "0d6d58", @@ -14,7 +13,6 @@ }, "2": { "293a6b": "9b7570", - "101010": "101010", "42528c": "cdac94", "21293a": "584245", "ad2919": "a7323b", diff --git a/public/images/pokemon/variant/53.json b/public/images/pokemon/variant/53.json index af32e750d29..9d42a70b47d 100644 --- a/public/images/pokemon/variant/53.json +++ b/public/images/pokemon/variant/53.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "947b21": "af4dbc", "bda54a": "e177de", "845200": "5b4a3b", @@ -9,13 +8,9 @@ "735a10": "de6363", "b58429": "816f5c", "f75242": "e9bb00", - "ffffff": "ffffff", - "ffbd9c": "ffbd9c", - "a51000": "b56e00", - "dedede": "dedede" + "a51000": "b56e00" }, "1": { - "101010": "101010", "947b21": "b62315", "bda54a": "dd4c2a", "845200": "552e15", @@ -24,13 +19,10 @@ "735a10": "de6363", "b58429": "431a0e", "f75242": "52add6", - "ffffff": "ffffff", "ffbd9c": "dd4c2a", - "a51000": "2948ad", - "dedede": "dedede" + "a51000": "2948ad" }, "2": { - "101010": "101010", "947b21": "d06e6b", "bda54a": "fab2a1", "845200": "241d18", @@ -39,9 +31,6 @@ "735a10": "de6363", "b58429": "28221e", "f75242": "5ed835", - "ffffff": "ffffff", - "ffbd9c": "ffbd9c", - "a51000": "3ba624", - "dedede": "dedede" + "a51000": "3ba624" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/531-mega.json b/public/images/pokemon/variant/531-mega.json index eedd2b17f19..851a0277af4 100644 --- a/public/images/pokemon/variant/531-mega.json +++ b/public/images/pokemon/variant/531-mega.json @@ -7,7 +7,6 @@ "ffb3ae": "f5a779", "ffe1ec": "f17475", "fbfbfb": "f0728d", - "181818": "181818", "c4b3b6": "cc3a74", "df7b95": "870505", "ffebee": "fcb7c5", @@ -22,7 +21,6 @@ "ffb3ae": "f6e3a8", "ffe1ec": "637971", "fbfbfb": "323c52", - "181818": "181818", "c4b3b6": "202537", "df7b95": "e8a245", "ffebee": "fdf2ce", diff --git a/public/images/pokemon/variant/531.json b/public/images/pokemon/variant/531.json index fb0689f6784..140fe5c4646 100644 --- a/public/images/pokemon/variant/531.json +++ b/public/images/pokemon/variant/531.json @@ -1,6 +1,5 @@ { "1": { - "ce6b73": "ce6b73", "de8c94": "f5a779", "734a4a": "b64231", "6b634a": "874231", @@ -8,11 +7,8 @@ "ceb584": "d6bfb4", "1963ad": "ae0771", "a58c63": "a86d57", - "101010": "101010", - "ffffff": "ffffff", "63636b": "782b3e", - "d6d6e6": "cd5178", - "c55a3a": "c55a3a" + "d6d6e6": "cd5178" }, "2": { "ce6b73": "cf9a4a", @@ -23,10 +19,7 @@ "ceb584": "29878f", "1963ad": "841f21", "a58c63": "195359", - "101010": "101010", - "ffffff": "ffffff", "63636b": "13253c", - "d6d6e6": "394d6d", - "c55a3a": "c55a3a" + "d6d6e6": "394d6d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/532.json b/public/images/pokemon/variant/532.json index f94a3c7afeb..fa21ebcc8e0 100644 --- a/public/images/pokemon/variant/532.json +++ b/public/images/pokemon/variant/532.json @@ -1,14 +1,11 @@ { "1": { "5a4a4a": "30503b", - "101010": "101010", "c5bdad": "779f7d", "9c8c84": "5f836c", "843142": "3a3931", "ef7b8c": "6c6958", "c55a73": "545148", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", "5a3a08": "4c1d14", "ad7308": "954734", "7b5208": "663326", @@ -18,14 +15,11 @@ }, "2": { "5a4a4a": "546162", - "101010": "101010", "c5bdad": "95abab", "9c8c84": "70858b", "843142": "201f36", "ef7b8c": "504f66", "c55a73": "2f2b42", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", "5a3a08": "6f4b33", "ad7308": "b3774d", "7b5208": "825536", diff --git a/public/images/pokemon/variant/533.json b/public/images/pokemon/variant/533.json index 89f7248b05f..aa51abd4856 100644 --- a/public/images/pokemon/variant/533.json +++ b/public/images/pokemon/variant/533.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "84293a": "666b72", "de525a": "8d949f", "bd3a4a": "707885", @@ -11,12 +10,10 @@ "733152": "382c22", "9c4a84": "4e443b", "d66bb5": "6e675e", - "ffffff": "ffffff", "732942": "402652", "ad2942": "5a2d72" }, "2": { - "101010": "101010", "84293a": "6e869f", "de525a": "d6e6f5", "bd3a4a": "acc2d7", @@ -27,7 +24,6 @@ "733152": "121830", "9c4a84": "222a4a", "d66bb5": "37415c", - "ffffff": "ffffff", "732942": "5e5d53", "ad2942": "b5b18f" } diff --git a/public/images/pokemon/variant/534.json b/public/images/pokemon/variant/534.json index 9aa39b463fd..bf39355ad7d 100644 --- a/public/images/pokemon/variant/534.json +++ b/public/images/pokemon/variant/534.json @@ -3,7 +3,6 @@ "8c6b5a": "17524f", "5a3a21": "0d382d", "c59c73": "2a726e", - "101010": "101010", "3a3a31": "6e7878", "8c8c84": "becfd1", "6b6b63": "94a6a9", @@ -11,14 +10,12 @@ "c56bb5": "766b5f", "9c4a84": "5c5048", "732942": "2c2c3e", - "ad2942": "544c6e", - "ffffff": "ffffff" + "ad2942": "544c6e" }, "2": { "8c6b5a": "68797a", "5a3a21": "505252", "c59c73": "90aba8", - "101010": "101010", "3a3a31": "5c5830", "8c8c84": "e3c682", "6b6b63": "a78f4c", @@ -26,7 +23,6 @@ "c56bb5": "65377e", "9c4a84": "442a6c", "732942": "958d71", - "ad2942": "b5b18f", - "ffffff": "ffffff" + "ad2942": "b5b18f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/538.json b/public/images/pokemon/variant/538.json index 5bd4ac34471..f1b804a9bf7 100644 --- a/public/images/pokemon/variant/538.json +++ b/public/images/pokemon/variant/538.json @@ -2,25 +2,21 @@ "1": { "631919": "2a6045", "de5a5a": "5fb55f", - "101010": "101010", "ad3131": "348350", "3a3a3a": "70543d", "efe6d6": "d7b06a", "292921": "3e2514", "948c84": "8b6036", - "c5bdad": "a97745", - "f7f7f7": "f7f7f7" + "c5bdad": "a97745" }, "2": { "631919": "255268", "de5a5a": "638ed9", - "101010": "101010", "ad3131": "396999", "3a3a3a": "681a1a", "efe6d6": "cf3737", "292921": "360b0b", "948c84": "912727", - "c5bdad": "7e1e1e", - "f7f7f7": "f7f7f7" + "c5bdad": "7e1e1e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/540.json b/public/images/pokemon/variant/540.json index 32a8b416443..a77507fa553 100644 --- a/public/images/pokemon/variant/540.json +++ b/public/images/pokemon/variant/540.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "3a6319": "7b4a5a", "5a9c31": "b56b7b", "94ce08": "ef949c", @@ -8,15 +7,10 @@ "9c7b08": "67412e", "fff7ad": "967768", "ffde31": "6f4c3b", - "ffffff": "ffffff", - "4a4a4a": "4a4a4a", "e68408": "eabb81", - "945219": "b8875c", - "ceced6": "ceced6", - "ffad4a": "ffad4a" + "945219": "b8875c" }, "2": { - "000000": "000000", "3a6319": "171f5b", "5a9c31": "1a2388", "94ce08": "1152d8", @@ -24,11 +18,7 @@ "9c7b08": "674e2e", "fff7ad": "ffffff", "ffde31": "ead3c1", - "ffffff": "ffffff", - "4a4a4a": "4a4a4a", "e68408": "d4bb66", - "945219": "a89860", - "ceced6": "ceced6", - "ffad4a": "ffad4a" + "945219": "a89860" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/541.json b/public/images/pokemon/variant/541.json index 6f4c802251b..e1f10dcc93c 100644 --- a/public/images/pokemon/variant/541.json +++ b/public/images/pokemon/variant/541.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "3a6319": "7b4a5a", "94ce08": "ef949c", "5a9c31": "b56b7b", @@ -10,11 +9,9 @@ "b5a529": "6f4c3b", "ffef3a": "967768", "5a5a3a": "67412e", - "7b733a": "553829", - "ffffff": "ffffff" + "7b733a": "553829" }, "2": { - "101010": "101010", "3a6319": "1e1e67", "94ce08": "0d3fa6", "5a9c31": "0d267d", @@ -24,7 +21,6 @@ "b5a529": "ead3c1", "ffef3a": "ffffff", "5a5a3a": "67412e", - "7b733a": "553829", - "ffffff": "ffffff" + "7b733a": "553829" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/542.json b/public/images/pokemon/variant/542.json index e48e883ecf0..b1d99b5f949 100644 --- a/public/images/pokemon/variant/542.json +++ b/public/images/pokemon/variant/542.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "bdad10": "6b4d3e", "8c7b10": "573728", "fff721": "6f4c3b", @@ -9,14 +8,12 @@ "5a9c31": "b56b7b", "ffff9c": "967768", "843142": "316d84", - "ffffff": "ffffff", "ff314a": "31ceff", "10423a": "5f3f49", "299c52": "b46877", "19734a": "8e525e" }, "2": { - "000000": "000000", "bdad10": "7b6053", "8c7b10": "846851", "fff721": "ead3c1", @@ -25,7 +22,6 @@ "5a9c31": "183da4", "ffff9c": "ffffff", "843142": "9e5e25", - "ffffff": "ffffff", "ff314a": "ff7800", "10423a": "122455", "299c52": "183da4", diff --git a/public/images/pokemon/variant/544.json b/public/images/pokemon/variant/544.json index 2cd6862c924..3aacb7a38b8 100644 --- a/public/images/pokemon/variant/544.json +++ b/public/images/pokemon/variant/544.json @@ -1,7 +1,6 @@ { "1": { "5a4a63": "0a3939", - "000000": "000000", "84739c": "135c56", "c5195a": "a63c9f", "bd5294": "0d635c", diff --git a/public/images/pokemon/variant/545.json b/public/images/pokemon/variant/545.json index c7c78da1a55..f281eb92015 100644 --- a/public/images/pokemon/variant/545.json +++ b/public/images/pokemon/variant/545.json @@ -2,7 +2,6 @@ "1": { "631010": "0b4a45", "c5195a": "238071", - "101010": "101010", "6b216b": "831774", "8c3a9c": "a63c9f", "ad297b": "0d635c", @@ -17,13 +16,11 @@ "2": { "631010": "8f795c", "c5195a": "dddaaf", - "101010": "101010", "6b216b": "b37830", "8c3a9c": "d7b444", "ad297b": "b37830", "9c1042": "bdaf8a", "4a0000": "6d5435", - "212931": "212931", "424a63": "5a93a5", "84084a": "965840", "3a3a4a": "466f90", diff --git a/public/images/pokemon/variant/546.json b/public/images/pokemon/variant/546.json index d4216c57f1e..a2e1f8b8865 100644 --- a/public/images/pokemon/variant/546.json +++ b/public/images/pokemon/variant/546.json @@ -4,7 +4,6 @@ "dee6c5": "e4b397", "7b846b": "914e3a", "4a5a52": "663023", - "101010": "101010", "ffffff": "e1cac5", "ceced6": "d2a19a", "427b42": "9d62bc", @@ -18,7 +17,6 @@ "dee6c5": "bf7c6a", "7b846b": "662c26", "4a5a52": "521819", - "101010": "101010", "ffffff": "f7dbd1", "ceced6": "d89185", "427b42": "559c7a", diff --git a/public/images/pokemon/variant/547.json b/public/images/pokemon/variant/547.json index 15e08aa18a7..6ab3bb114da 100644 --- a/public/images/pokemon/variant/547.json +++ b/public/images/pokemon/variant/547.json @@ -4,7 +4,6 @@ "6b5a42": "663023", "e6dece": "dda585", "c5b58c": "b77153", - "101010": "101010", "194a19": "512143", "427b42": "924a75", "52a54a": "c27199", @@ -12,25 +11,19 @@ "523a29": "56191d", "ad6b10": "127498", "735242": "693535", - "ffffff": "ffffff", - "e68400": "28adc7", - "ad4a63": "ad4a63" + "e68400": "28adc7" }, "2": { "ad945a": "4b1918", "6b5a42": "360e10", "e6dece": "a86250", "c5b58c": "70322b", - "101010": "101010", "194a19": "a13618", "427b42": "ec7441", "52a54a": "ffa97c", "946b42": "fdca95", - "523a29": "523a29", "ad6b10": "c95d1a", "735242": "e79e64", - "ffffff": "ffffff", - "e68400": "ffa34c", - "ad4a63": "ad4a63" + "e68400": "ffa34c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/548.json b/public/images/pokemon/variant/548.json index ac7c564eeae..c8a60d65937 100644 --- a/public/images/pokemon/variant/548.json +++ b/public/images/pokemon/variant/548.json @@ -3,33 +3,24 @@ "315a31": "31425a", "3aad3a": "76bfc7", "3a844a": "307489", - "101010": "101010", "9cbd4a": "adb563", "637b31": "636329", - "c5ef7b": "d6ef7b", - "cecebd": "cecebd", - "ffffff": "ffffff", - "bd8c94": "bd8c94", - "7b313a": "7b313a" + "c5ef7b": "d6ef7b" }, "1": { "315a31": "8c1d34", "3aad3a": "ef5e55", "3a844a": "bd2d40", - "101010": "101010", "9cbd4a": "8e954d", "637b31": "73733c", "c5ef7b": "bfd17f", "cecebd": "beb1a3", - "ffffff": "f6eaea", - "bd8c94": "bd8c94", - "7b313a": "7b313a" + "ffffff": "f6eaea" }, "2": { "315a31": "351c49", "3aad3a": "8d57a4", "3a844a": "663982", - "101010": "101010", "9cbd4a": "b39436", "637b31": "5c4510", "c5ef7b": "ded26f", diff --git a/public/images/pokemon/variant/549.json b/public/images/pokemon/variant/549.json index 8fb9272c5fa..45ac71244cf 100644 --- a/public/images/pokemon/variant/549.json +++ b/public/images/pokemon/variant/549.json @@ -1,19 +1,16 @@ { "1": { - "101010": "101010", "734221": "09445f", "ff6b3a": "54c5eb", "bd633a": "228ac5", "bda552": "77909a", "ffde42": "b6c7cc", "ffb59c": "78e6f7", - "ffffff": "ffffff", "315a31": "80152b", "4a844a": "bd2d40", "3aad3a": "ef5755", "526329": "5a5a2c", "c5ef7b": "bfd17f", - "9cb563": "8e954d", - "cec5bd": "cec5bd" + "9cb563": "8e954d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/551.json b/public/images/pokemon/variant/551.json index 9e4903a6701..0f12156ef75 100644 --- a/public/images/pokemon/variant/551.json +++ b/public/images/pokemon/variant/551.json @@ -4,11 +4,8 @@ "212121": "262347", "debd84": "f29973", "523a10": "27172f", - "101010": "101010", "c59c5a": "d8693a", "42424a": "343958", - "b5b5bd": "b5b5bd", - "525263": "525263", "ce737b": "307681", "ef94a5": "4cbda2" }, @@ -17,11 +14,8 @@ "212121": "290c2a", "debd84": "8688a0", "523a10": "1c2231", - "101010": "101010", "c59c5a": "646781", "42424a": "301f40", - "b5b5bd": "b5b5bd", - "525263": "525263", "ce737b": "91a1b7", "ef94a5": "d6e2eb" } diff --git a/public/images/pokemon/variant/552.json b/public/images/pokemon/variant/552.json index efb650485c4..92bdcca9ddd 100644 --- a/public/images/pokemon/variant/552.json +++ b/public/images/pokemon/variant/552.json @@ -4,9 +4,7 @@ "523a10": "261d35", "c59c5a": "d8693a", "debd84": "f29973", - "101010": "101010", "292931": "343958", - "b5b5bd": "b5b5bd", "191921": "232044", "5a5a6b": "7c4c1f", "ffffff": "ebce81", @@ -20,9 +18,7 @@ "523a10": "161b23", "c59c5a": "646781", "debd84": "8688a0", - "101010": "101010", "292931": "412853", - "b5b5bd": "b5b5bd", "191921": "281842", "5a5a6b": "27353d", "ffffff": "90a0a7", diff --git a/public/images/pokemon/variant/553.json b/public/images/pokemon/variant/553.json index 5bc0be23fb5..45365e1d89b 100644 --- a/public/images/pokemon/variant/553.json +++ b/public/images/pokemon/variant/553.json @@ -5,9 +5,7 @@ "c55252": "1b7871", "191921": "131735", "212129": "192540", - "101010": "101010", "e67b73": "40a592", - "52525a": "52525a", "b5b5b5": "c98e5c", "8c948c": "d8693a", "ffffff": "ffefa7", @@ -21,9 +19,7 @@ "c55252": "c5cbd0", "191921": "3d1947", "212129": "58265a", - "101010": "101010", "e67b73": "e8e9eb", - "52525a": "52525a", "b5b5b5": "45545d", "8c948c": "171b20", "ffffff": "69777e", diff --git a/public/images/pokemon/variant/556.json b/public/images/pokemon/variant/556.json index 4c43ef55532..30356639a3a 100644 --- a/public/images/pokemon/variant/556.json +++ b/public/images/pokemon/variant/556.json @@ -3,7 +3,6 @@ "b53173": "7191ca", "8c1957": "454792", "e66ba5": "aad7ec", - "101010": "101010", "857510": "8d4026", "ffd600": "ff9b3b", "214a21": "375460", @@ -18,7 +17,6 @@ "b53173": "dc9bbd", "8c1957": "b06ea0", "e66ba5": "ffcadc", - "101010": "101010", "857510": "c78366", "ffd600": "fff1ac", "214a21": "68023b", diff --git a/public/images/pokemon/variant/559.json b/public/images/pokemon/variant/559.json index d844e2314af..8aca440eb71 100644 --- a/public/images/pokemon/variant/559.json +++ b/public/images/pokemon/variant/559.json @@ -6,11 +6,6 @@ "e63a42": "e18abd", "bd9c00": "896b14", "ffce00": "d7c475", - "212121": "212121", - "424242": "424242", - "ffffff": "ffffff", - "63635a": "63635a", - "adada5": "adada5", "7b7352": "5f533d", "c5bd84": "c7bea5", "fff7b5": "ecead9" @@ -21,15 +16,7 @@ "7b6308": "8b8352", "e63a42": "82809f", "bd9c00": "bdbc82", - "ffce00": "fffcdd", - "212121": "212121", - "424242": "424242", - "ffffff": "ffffff", - "63635a": "63635a", - "adada5": "adada5", - "7b7352": "7b7352", - "c5bd84": "c5bd84", - "fff7b5": "fff7b5" + "ffce00": "fffcdd" }, "2": { "b52931": "2d852b", @@ -37,14 +24,6 @@ "7b6308": "6f9d3d", "e63a42": "7cce68", "bd9c00": "98c053", - "ffce00": "e5ff87", - "212121": "212121", - "424242": "424242", - "ffffff": "ffffff", - "63635a": "63635a", - "adada5": "adada5", - "7b7352": "7b7352", - "c5bd84": "c5bd84", - "fff7b5": "fff7b5" + "ffce00": "e5ff87" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/56.json b/public/images/pokemon/variant/56.json index d349c7003dc..2bae876562d 100644 --- a/public/images/pokemon/variant/56.json +++ b/public/images/pokemon/variant/56.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "ffc584": "98b5cb", "6b4a29": "5f4e8a", "d6ad9c": "867ba4", @@ -8,11 +7,6 @@ "f7deb5": "ada2cd", "dea573": "7b96ab", "734200": "476983", - "fff7ce": "c8bfe3", - "ffffff": "ffffff", - "dedede": "dedede", - "ef7363": "ef7363", - "b54231": "b54231", - "efb58c": "efb58c" + "fff7ce": "c8bfe3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/560.json b/public/images/pokemon/variant/560.json index 7c5a1841d70..511de5cf888 100644 --- a/public/images/pokemon/variant/560.json +++ b/public/images/pokemon/variant/560.json @@ -2,15 +2,10 @@ "0": { "7b3a29": "5c392e", "e66373": "e18abd", - "212121": "212121", "de293a": "b1578c", "c55a19": "aea489", "f77b21": "d9d7bf", "4a4a4a": "652f56", - "949494": "949494", - "ffffff": "ffffff", - "e6e6e6": "e6e6e6", - "bdbdbd": "bdbdbd", "636363": "b8749c", "6b5229": "66470e", "f7ce10": "d7c475", @@ -19,16 +14,9 @@ "1": { "7b3a29": "251c34", "e66373": "82809f", - "212121": "212121", "de293a": "4f4967", "c55a19": "988658", "f77b21": "c3b889", - "4a4a4a": "4a4a4a", - "949494": "949494", - "ffffff": "ffffff", - "e6e6e6": "e6e6e6", - "bdbdbd": "bdbdbd", - "636363": "636363", "6b5229": "8b8352", "f7ce10": "fffcdd", "b59419": "bdbc82" @@ -36,15 +24,10 @@ "2": { "7b3a29": "24360d", "e66373": "8bb089", - "212121": "212121", "de293a": "3f5d3e", "c55a19": "c5bd84", "f77b21": "fff7b5", "4a4a4a": "1c342e", - "949494": "949494", - "ffffff": "ffffff", - "e6e6e6": "e6e6e6", - "bdbdbd": "bdbdbd", "636363": "3b6253", "6b5229": "627f2e", "f7ce10": "d8f769", diff --git a/public/images/pokemon/variant/562.json b/public/images/pokemon/variant/562.json index 07dafa01aa7..f6ff8c151ce 100644 --- a/public/images/pokemon/variant/562.json +++ b/public/images/pokemon/variant/562.json @@ -2,20 +2,16 @@ "1": { "313131": "741136", "525252": "a63051", - "101010": "101010", "ad0000": "4fe0b6", "ff0000": "a0f7ff", - "5a0000": "5a0000", "8c5a21": "551f1d", "ffde7b": "d29887", "f7ad29": "ae6a5d", - "ce8410": "90493f", - "dedede": "dedede" + "ce8410": "90493f" }, "2": { "313131": "2a895c", "525252": "49bc7a", - "101010": "101010", "ad0000": "e5b7e7", "ff0000": "ffd8ef", "5a0000": "955b85", diff --git a/public/images/pokemon/variant/563.json b/public/images/pokemon/variant/563.json index 0657f362348..56b495e27f9 100644 --- a/public/images/pokemon/variant/563.json +++ b/public/images/pokemon/variant/563.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "216b7b": "18265c", "294a4a": "242b71", "3194ad": "32459b", @@ -14,7 +13,6 @@ "393941": "521f2d" }, "2": { - "101010": "101010", "216b7b": "923c1c", "294a4a": "591105", "3194ad": "e03241", diff --git a/public/images/pokemon/variant/569-gigantamax.json b/public/images/pokemon/variant/569-gigantamax.json index 52344562aa4..deddcfe2304 100644 --- a/public/images/pokemon/variant/569-gigantamax.json +++ b/public/images/pokemon/variant/569-gigantamax.json @@ -1,6 +1,5 @@ { "1": { - "010101": "010101", "7b6a5a": "162632", "5a4a41": "101829", "a48b73": "273947", @@ -29,7 +28,6 @@ "798489": "4c546c" }, "2": { - "010101": "010101", "7b6a5a": "d3b492", "5a4a41": "96684c", "a48b73": "f4eccf", diff --git a/public/images/pokemon/variant/569.json b/public/images/pokemon/variant/569.json index 7af6106672e..ac1f82c209c 100644 --- a/public/images/pokemon/variant/569.json +++ b/public/images/pokemon/variant/569.json @@ -1,7 +1,6 @@ { "1": { "7b6b5a": "162632", - "000000": "000000", "5a4a42": "101829", "a58c73": "273947", "bd317b": "2aaf52", @@ -17,7 +16,6 @@ }, "2": { "7b6b5a": "d3b492", - "000000": "000000", "5a4a42": "9d7862", "a58c73": "f4eccf", "bd317b": "be5285", @@ -28,7 +26,6 @@ "296b4a": "773835", "194a31": "59221f", "bdbdbd": "da975a", - "737373": "9d5038", - "ffffff": "ffffff" + "737373": "9d5038" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/570.json b/public/images/pokemon/variant/570.json index 5c9acf9b3fc..c2bce8bd6f8 100644 --- a/public/images/pokemon/variant/570.json +++ b/public/images/pokemon/variant/570.json @@ -4,11 +4,7 @@ "ad1042": "c359e6", "5a5a73": "475378", "212131": "1b1b47", - "101010": "101010", "424252": "2f375a", - "19b5b5": "19b5b5", - "318484": "318484", - "ffffff": "ffffff", "313142": "283766" }, "2": { @@ -16,11 +12,9 @@ "ad1042": "01d5bb", "5a5a73": "a1a1c0", "212131": "163956", - "101010": "101010", "424252": "746a98", "19b5b5": "e879d6", "318484": "bd3eb8", - "ffffff": "ffffff", "313142": "60808f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/571.json b/public/images/pokemon/variant/571.json index d69b017886b..ecfc34ddbfe 100644 --- a/public/images/pokemon/variant/571.json +++ b/public/images/pokemon/variant/571.json @@ -1,21 +1,16 @@ { "1": { - "101010": "101010", "293142": "283766", "212131": "0a133f", "7b2942": "8e2270", "4a1029": "540548", "ad1042": "cc2f94", - "7b7b84": "7b7b84", "63636b": "4e4664", "4a4a52": "2d2b43", - "cecece": "cecece", "318484": "00766a", - "19b5b5": "0ab5b3", - "ce4a5a": "ce4a5a" + "19b5b5": "0ab5b3" }, "2": { - "101010": "101010", "293142": "283766", "212131": "121b47", "7b2942": "125091", diff --git a/public/images/pokemon/variant/577.json b/public/images/pokemon/variant/577.json index cd19056738d..bcba18b965a 100644 --- a/public/images/pokemon/variant/577.json +++ b/public/images/pokemon/variant/577.json @@ -6,14 +6,12 @@ "94e6ad": "cab8f1", "6b6329": "597070", "5a845a": "5e2c58", - "101010": "101010", "e6de73": "afdfce", "cee6bd": "ebc7d9", "a59c31": "88aca5", "9cad8c": "975b88", "316342": "442e7a", "94314a": "84197e", - "c54252": "c54252", "b5cea5": "c696b4" }, "1": { @@ -23,31 +21,24 @@ "94e6ad": "ee8c91", "6b6329": "522849", "5a845a": "961d3c", - "101010": "101010", "e6de73": "9d65b1", "cee6bd": "dfab9f", "a59c31": "824885", "9cad8c": "b86d6a", "316342": "3b031b", - "94314a": "94314a", - "c54252": "c54252", "b5cea5": "cd9790" }, "2": { "428c5a": "a968a4", "5ab57b": "ce8ec2", - "ffffff": "ffffff", "94e6ad": "f7c6e5", "6b6329": "3e8c82", "5a845a": "9d4e4c", - "101010": "101010", "e6de73": "74d6b3", "cee6bd": "f0c9ba", "a59c31": "5ab3a2", "9cad8c": "ba7066", "316342": "713c85", - "94314a": "94314a", - "c54252": "c54252", "b5cea5": "d69887" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/578.json b/public/images/pokemon/variant/578.json index 83db4394938..a0fb38f3064 100644 --- a/public/images/pokemon/variant/578.json +++ b/public/images/pokemon/variant/578.json @@ -6,7 +6,6 @@ "c5deb5": "ebc7e1", "317b4a": "6b2981", "9cbd8c": "9b65ac", - "101010": "101010", "e6ffde": "fff9fb", "84dea5": "c3b8f1", "b54242": "ad4252", @@ -19,7 +18,6 @@ "c5deb5": "d69289", "317b4a": "3b031b", "9cbd8c": "b0605c", - "101010": "101010", "e6ffde": "fff3f3", "84dea5": "ee8c91", "b54242": "ad4252", @@ -32,7 +30,6 @@ "c5deb5": "f0c9ba", "317b4a": "732971", "9cbd8c": "d69887", - "101010": "101010", "e6ffde": "ffffff", "84dea5": "f7c6e5", "b54242": "ad4252", diff --git a/public/images/pokemon/variant/579.json b/public/images/pokemon/variant/579.json index 168a4470b9c..a12a26d3902 100644 --- a/public/images/pokemon/variant/579.json +++ b/public/images/pokemon/variant/579.json @@ -6,7 +6,6 @@ "4a8c63": "40516c", "d6efc5": "bfdadd", "9cbd8c": "7f9fb5", - "101010": "101010", "ffffff": "f1feff", "de6363": "7bfff7", "a55252": "4aad8c", @@ -22,7 +21,6 @@ "4a8c63": "862f2d", "d6efc5": "d69289", "9cbd8c": "b0605c", - "101010": "101010", "ffffff": "fff3f3", "de6363": "e39744", "a55252": "bb6620", @@ -38,8 +36,6 @@ "4a8c63": "9d4e4c", "d6efc5": "e8baac", "9cbd8c": "c5887f", - "101010": "101010", - "ffffff": "ffffff", "de6363": "74d6b3", "a55252": "5ab3a2", "debd7b": "a29fbd", diff --git a/public/images/pokemon/variant/586-autumn.json b/public/images/pokemon/variant/586-autumn.json index e56a7af7d02..9345bdee6c4 100644 --- a/public/images/pokemon/variant/586-autumn.json +++ b/public/images/pokemon/variant/586-autumn.json @@ -1,18 +1,11 @@ { "0": { - "842131": "842131", - "bd3a3a": "bd3a3a", - "5a1919": "5a1919", - "000000": "000000", "422110": "9d4f62", "4a0808": "7f334a", "dec56b": "ffd5f6", "633121": "c66479", "7b5231": "d98997", "a57b4a": "e1b2d7", - "de8c29": "ffecfb", - "dedede": "dedede", - "adadad": "adadad", - "311010": "311010" + "de8c29": "ffecfb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/586-spring.json b/public/images/pokemon/variant/586-spring.json index 14f8eded105..2518667eb20 100644 --- a/public/images/pokemon/variant/586-spring.json +++ b/public/images/pokemon/variant/586-spring.json @@ -1,18 +1,11 @@ { "0": { - "311010": "311010", - "000000": "000000", "4a1008": "7f334a", - "ff739c": "ff739c", - "731931": "731931", "dec56b": "ffd5f6", - "ce4263": "ce4263", "633a21": "c66479", "422119": "9d4f62", "de9429": "ffecfb", "7b5a31": "d98997", - "a57b4a": "e1b2d7", - "dedede": "dedede", - "adadad": "adadad" + "a57b4a": "e1b2d7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/586-summer.json b/public/images/pokemon/variant/586-summer.json index 97a0efa33ce..0f89496c1fc 100644 --- a/public/images/pokemon/variant/586-summer.json +++ b/public/images/pokemon/variant/586-summer.json @@ -2,7 +2,6 @@ "0": { "193a29": "314a29", "088c42": "4a8b4a", - "000000": "000000", "195a31": "416a39", "dec56b": "ffd5f6", "4a1008": "783046", @@ -11,8 +10,6 @@ "7b5a31": "cc818e", "a57b4a": "e1b2d7", "de9429": "ffecfb", - "dedede": "dedede", - "adadad": "adadad", "311010": "582333" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/586-winter.json b/public/images/pokemon/variant/586-winter.json index a4ece9d251e..352a4c57920 100644 --- a/public/images/pokemon/variant/586-winter.json +++ b/public/images/pokemon/variant/586-winter.json @@ -2,9 +2,7 @@ "0": { "6b6b6b": "cf9bc4", "424a42": "b184a8", - "311010": "311010", "ffffff": "ffd5f6", - "000000": "000000", "adadad": "e1b2d7", "4a1008": "7f334a", "dec56b": "ffecfb", @@ -12,7 +10,6 @@ "7b5a31": "d98997", "633a21": "c66479", "a57b4a": "e1b2d7", - "de9429": "ffecfb", - "dedede": "dedede" + "de9429": "ffecfb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/592.json b/public/images/pokemon/variant/592.json index 2307621e36e..7c37f370752 100644 --- a/public/images/pokemon/variant/592.json +++ b/public/images/pokemon/variant/592.json @@ -1,12 +1,10 @@ { "1": { "3a5a6b": "933b94", - "101010": "101010", "b5c5e6": "e3b8ec", "d6e6ff": "fee8ff", "5aa5c5": "c35ec7", "84d6ff": "ef94eb", - "ffffff": "ffffff", "3a63c5": "981741", "de2910": "de4a29" } diff --git a/public/images/pokemon/variant/593.json b/public/images/pokemon/variant/593.json index 88dc5472de5..d9eb0136c16 100644 --- a/public/images/pokemon/variant/593.json +++ b/public/images/pokemon/variant/593.json @@ -2,23 +2,17 @@ "1": { "213a6b": "6a236f", "9cadd6": "e3b8ec", - "101010": "101010", "d6e6ff": "fee8ff", "29529c": "933b94", "3a84ce": "c35ec7", - "3ac5f7": "ef94eb", - "de4a29": "de4a29", - "ffffff": "ffffff" + "3ac5f7": "ef94eb" }, "2": { "213a6b": "6e1b12", "9cadd6": "d24d25", - "101010": "101010", "d6e6ff": "ec7542", "29529c": "8e2b16", "3a84ce": "cb7048", - "3ac5f7": "ffc195", - "de4a29": "de4a29", - "ffffff": "ffffff" + "3ac5f7": "ffc195" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/594.json b/public/images/pokemon/variant/594.json index 18aa79a0569..700107d7c37 100644 --- a/public/images/pokemon/variant/594.json +++ b/public/images/pokemon/variant/594.json @@ -3,7 +3,6 @@ "8c4263": "aa3a18", "ffbdbd": "f9c976", "c55a7b": "ca4f16", - "000000": "000000", "633a42": "882915", "ff8cad": "f5a454", "f77384": "e37830", @@ -13,7 +12,6 @@ "002931": "310000", "005263": "681f16", "9c8c10": "a74c8e", - "ffffff": "ffffff", "d6d63a": "dc8ec6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/595.json b/public/images/pokemon/variant/595.json index 159e4c78bef..e610e4c52ea 100644 --- a/public/images/pokemon/variant/595.json +++ b/public/images/pokemon/variant/595.json @@ -1,23 +1,19 @@ { "1": { "735208": "583e28", - "101010": "101010", "f7de42": "e9ae7e", "cead08": "b57353", "083163": "3f210d", "848c52": "5e341a", - "dedeef": "dedeef", "636be6": "684529", "315ac5": "7c4620" }, "2": { "735208": "46494d", - "101010": "101010", "f7de42": "aab3bf", "cead08": "7b828b", "083163": "a1400e", "848c52": "d1630f", - "dedeef": "dedeef", "636be6": "834333", "315ac5": "ff8e1e" } diff --git a/public/images/pokemon/variant/596.json b/public/images/pokemon/variant/596.json index b494b9ee23a..b877aab21a0 100644 --- a/public/images/pokemon/variant/596.json +++ b/public/images/pokemon/variant/596.json @@ -3,28 +3,22 @@ "293a7b": "5e341a", "192942": "3f210d", "3a52b5": "7c4620", - "101010": "101010", - "3a3a42": "3a3a42", "cead00": "995b37", "ffde52": "be8454", "9c849c": "9d2f07", "6b523a": "4f2a1d", "9c8419": "7d422c", - "736b6b": "712002", - "ffffff": "ffffff" + "736b6b": "712002" }, "2": { "293a7b": "cc5e14", "192942": "943710", "3a52b5": "ff9327", - "101010": "101010", - "3a3a42": "3a3a42", "cead00": "7b828b", "ffde52": "aab3bf", "9c849c": "007dea", "6b523a": "46494d", "9c8419": "575b62", - "736b6b": "0048ab", - "ffffff": "ffffff" + "736b6b": "0048ab" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/6-gigantamax.json b/public/images/pokemon/variant/6-gigantamax.json index 8cdb79ca267..cb84f4fdedb 100644 --- a/public/images/pokemon/variant/6-gigantamax.json +++ b/public/images/pokemon/variant/6-gigantamax.json @@ -6,7 +6,6 @@ "843119": "552982", "ef8429": "b77cb2", "ce5242": "9052af", - "101010": "101010", "ffe877": "adffcc", "fcfcfc": "eafff4", "efb55a": "d8a3e2", diff --git a/public/images/pokemon/variant/6-mega-x.json b/public/images/pokemon/variant/6-mega-x.json index 67924c8d011..400005513ca 100644 --- a/public/images/pokemon/variant/6-mega-x.json +++ b/public/images/pokemon/variant/6-mega-x.json @@ -4,14 +4,12 @@ "60a6c8": "82d179", "5a5a5a": "317396", "99d9f7": "e6ffcc", - "080808": "080808", "009de1": "3da542", "383838": "163d82", "1e4167": "4c1f76", "92a09c": "66afcc", "2b629c": "7341a6", "00b1e6": "af66ff", - "f8f8f8": "f8f8f8", "ce1010": "aa299d", "e481b5": "ff91cb" } diff --git a/public/images/pokemon/variant/6-mega-y.json b/public/images/pokemon/variant/6-mega-y.json index 9429b1d1773..189c3bdd6c3 100644 --- a/public/images/pokemon/variant/6-mega-y.json +++ b/public/images/pokemon/variant/6-mega-y.json @@ -2,16 +2,13 @@ "1": { "833118": "552982", "ee8329": "b27cbc", - "101010": "101010", "cd5241": "8053b2", "eeb45a": "d8a3e2", - "f8f8f8": "f8f8f8", "207394": "41a86e", "084152": "196045", "eede7b": "fae5ff", "f6a410": "9e59db", "e64110": "5033ce", - "ffd510": "e9bfff", - "cdcdcd": "cdcdcd" + "ffd510": "e9bfff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/602.json b/public/images/pokemon/variant/602.json index 7a73a049e47..f9ccb092de2 100644 --- a/public/images/pokemon/variant/602.json +++ b/public/images/pokemon/variant/602.json @@ -5,7 +5,6 @@ "cedee6": "b291d6", "efffff": "e8ddff", "7b8494": "6b357a", - "191921": "191921", "ce4a00": "42296e", "942100": "58418c", "ffe67b": "55b5d6", @@ -19,7 +18,6 @@ "cedee6": "8ecbaf", "efffff": "c7f0d5", "7b8494": "315775", - "191921": "191921", "ce4a00": "2f5c70", "942100": "18314e", "ffe67b": "9a2957", diff --git a/public/images/pokemon/variant/603.json b/public/images/pokemon/variant/603.json index 1c04d573309..720d1510f68 100644 --- a/public/images/pokemon/variant/603.json +++ b/public/images/pokemon/variant/603.json @@ -3,7 +3,6 @@ "c5ad7b": "8dd8d0", "847342": "4f8194", "efdea5": "b9f1d3", - "191921": "191921", "103a4a": "884993", "215a63": "957bd0", "949c4a": "ff772d", @@ -12,14 +11,12 @@ "de7352": "8c1a6a", "deb500": "d89d77", "ffd600": "f7e1a6", - "ffffff": "ffffff", "bdbdbd": "8babbd" }, "2": { "c5ad7b": "283b4e", "847342": "0d1a31", "efdea5": "3a5865", - "191921": "191921", "103a4a": "6faa3c", "215a63": "bbdf64", "949c4a": "dd0d70", diff --git a/public/images/pokemon/variant/604.json b/public/images/pokemon/variant/604.json index de39eb8b3a0..5a04687d1cd 100644 --- a/public/images/pokemon/variant/604.json +++ b/public/images/pokemon/variant/604.json @@ -4,7 +4,6 @@ "002131": "501d59", "216373": "957bd0", "73b5ce": "b29fe8", - "101019": "101019", "847342": "4f8194", "c5ad7b": "8dd8d0", "949c4a": "ff7e34", @@ -21,7 +20,6 @@ "002131": "225517", "216373": "bbdf64", "73b5ce": "e1ed9e", - "101019": "101019", "847342": "0d1a31", "c5ad7b": "283b4e", "949c4a": "a5183d", diff --git a/public/images/pokemon/variant/605.json b/public/images/pokemon/variant/605.json index cbd0fcb750b..e287c8070c9 100644 --- a/public/images/pokemon/variant/605.json +++ b/public/images/pokemon/variant/605.json @@ -4,12 +4,10 @@ "3a7352": "121545", "639484": "3c508b", "a5cebd": "617eb8", - "101010": "101010", "6b6b73": "39498b", "424242": "1b1f5a", "105229": "034652", "219c10": "2ecbc2", - "ffffff": "ffffff", "7b2929": "3f1c7b", "ce0000": "954bd8", "6b6310": "54760c", @@ -20,12 +18,10 @@ "3a7352": "702c2c", "639484": "9f5952", "a5cebd": "be847a", - "101010": "101010", "6b6b73": "854340", "424242": "3d1c1c", "105229": "600c41", "219c10": "f052a8", - "ffffff": "ffffff", "7b2929": "3a219a", "ce0000": "615ad4", "6b6310": "a13815", @@ -36,12 +32,10 @@ "3a7352": "1f1f34", "639484": "38394c", "a5cebd": "5b5e68", - "101010": "101010", "6b6b73": "2b2b3d", "424242": "0c0916", "105229": "471180", "219c10": "8952dc", - "ffffff": "ffffff", "7b2929": "9a2031", "ce0000": "ee5962", "6b6310": "8b3dbe", diff --git a/public/images/pokemon/variant/606.json b/public/images/pokemon/variant/606.json index a187ecafe90..0090b08f518 100644 --- a/public/images/pokemon/variant/606.json +++ b/public/images/pokemon/variant/606.json @@ -4,7 +4,6 @@ "de9c7b": "9f534b", "634229": "5a2133", "a5634a": "7d3134", - "101010": "101010", "292929": "230909", "216329": "002d55", "219c3a": "1585b1", @@ -21,7 +20,6 @@ "de9c7b": "a0e4e6", "634229": "2f536f", "a5634a": "6eb2bf", - "101010": "101010", "292929": "071824", "216329": "6e0928", "219c3a": "c63150", @@ -38,11 +36,9 @@ "de9c7b": "e5d1cc", "634229": "834f57", "a5634a": "c09a97", - "101010": "101010", "292929": "3e1426", "216329": "35116c", "219c3a": "884acc", - "8c2929": "8c2929", "ce0000": "d3335a", "c5a57b": "bc3295", "8c5a3a": "7e176b", diff --git a/public/images/pokemon/variant/609.json b/public/images/pokemon/variant/609.json index 12941964218..da9ad678c36 100644 --- a/public/images/pokemon/variant/609.json +++ b/public/images/pokemon/variant/609.json @@ -7,7 +7,6 @@ "313131": "11247b", "5a5a5a": "123684", "c5d6d6": "8e7c96", - "ffffff": "ffffff", "ffe621": "78e8cd", "7b8c8c": "bb9fbc" }, @@ -19,7 +18,6 @@ "313131": "a15f42", "5a5a5a": "8d412b", "c5d6d6": "dcceae", - "ffffff": "ffffff", "ffe621": "ffbb55", "7b8c8c": "eee6ca" } diff --git a/public/images/pokemon/variant/610.json b/public/images/pokemon/variant/610.json index 23ba21cd699..d7d726d15e5 100644 --- a/public/images/pokemon/variant/610.json +++ b/public/images/pokemon/variant/610.json @@ -3,12 +3,9 @@ "313a29": "0a0b31", "636b4a": "4b409d", "4a523a": "27105b", - "000000": "000000", "94a55a": "514776", "6b7b4a": "3f3562", "ce0000": "9d9d9d", - "ffffff": "ffffff", - "b5b5d6": "b5b5d6", "630000": "361a06", "d6e694": "d8d8d8", "adbd63": "737370", @@ -19,12 +16,9 @@ "313a29": "0e1f3d", "636b4a": "35679c", "4a523a": "193769", - "000000": "000000", "94a55a": "983f50", "6b7b4a": "681c2a", "ce0000": "00b5ce", - "ffffff": "ffffff", - "b5b5d6": "b5b5d6", "630000": "2f0010", "d6e694": "379aff", "adbd63": "1f4fbf", diff --git a/public/images/pokemon/variant/6100.json b/public/images/pokemon/variant/6100.json index a9790f043db..8585360e3ac 100644 --- a/public/images/pokemon/variant/6100.json +++ b/public/images/pokemon/variant/6100.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "7c2506": "2e333b", "c04a1c": "4e6170", "ec6f00": "69a6b4", @@ -10,12 +9,10 @@ "ddccc8": "bfebee", "d9a866": "a5aab7", "fefefe": "ecfffc", - "6f625e": "6f625e", "b8752e": "838797", "f3d181": "c9cdd6" }, "2": { - "101010": "101010", "7c2506": "5d0a26", "c04a1c": "72142b", "ec6f00": "a62833", @@ -25,7 +22,6 @@ "ddccc8": "ecd3c1", "d9a866": "3a272e", "fefefe": "fff9ee", - "6f625e": "6f625e", "b8752e": "2d2327", "f3d181": "502b32" } diff --git a/public/images/pokemon/variant/6101.json b/public/images/pokemon/variant/6101.json index 37f99d5cc8a..a1f15929920 100644 --- a/public/images/pokemon/variant/6101.json +++ b/public/images/pokemon/variant/6101.json @@ -3,30 +3,22 @@ "845c35": "373e4c", "d9a866": "a5aab7", "f3d181": "c9cdd6", - "101010": "101010", "f7dfa8": "e8ebf0", "a9763d": "838797", "c04a1c": "386583", "ec6f00": "69a6b4", "dc5d00": "4f879f", - "7c2506": "2e333b", - "ddccc8": "ddccc8", - "fefefe": "fefefe", - "6f625e": "6f625e" + "7c2506": "2e333b" }, "2": { "845c35": "231b20", "d9a866": "452d35", "f3d181": "5e343c", - "101010": "101010", "f7dfa8": "864549", "a9763d": "35262c", "c04a1c": "72142b", "ec6f00": "a62833", "dc5d00": "8f1b2c", - "7c2506": "4a061d", - "ddccc8": "ddccc8", - "fefefe": "fefefe", - "6f625e": "6f625e" + "7c2506": "4a061d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/611.json b/public/images/pokemon/variant/611.json index 210611b4290..30bce9d0e26 100644 --- a/public/images/pokemon/variant/611.json +++ b/public/images/pokemon/variant/611.json @@ -2,14 +2,12 @@ "1": { "314a29": "650b18", "4a8c4a": "b52439", - "101010": "101010", "426b3a": "98182b", "737373": "3f3562", "5a5a52": "342047", "630000": "3a3a3a", "de4242": "c4c4c3", "3a3a3a": "2a0e29", - "ffffff": "ffffff", "b52121": "737373", "9c9c9c": "736198", "7b7b7b": "514776", @@ -19,14 +17,12 @@ "2": { "314a29": "0d0e27", "4a8c4a": "35679c", - "101010": "101010", "426b3a": "102a5b", "737373": "681c2a", "5a5a52": "3b0820", "630000": "0d1e7c", "de4242": "379aff", "3a3a3a": "2c0216", - "ffffff": "ffffff", "b52121": "1f4fbf", "9c9c9c": "983f50", "7b7b7b": "823140", diff --git a/public/images/pokemon/variant/612.json b/public/images/pokemon/variant/612.json index 028d5953136..be0a1e2c33b 100644 --- a/public/images/pokemon/variant/612.json +++ b/public/images/pokemon/variant/612.json @@ -1,7 +1,6 @@ { "1": { "520000": "383838", - "000000": "000000", "8c0000": "84847e", "3a3a4a": "342047", "c50000": "c4c4c3", @@ -11,7 +10,6 @@ "636b10": "650b18", "a5ad19": "b52439", "29293a": "2a0e29", - "ffffff": "ffffff", "73424a": "893a4d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/618.json b/public/images/pokemon/variant/618.json index dcce711b155..5e3b7bb3e97 100644 --- a/public/images/pokemon/variant/618.json +++ b/public/images/pokemon/variant/618.json @@ -3,15 +3,12 @@ "cebd00": "bdac99", "ffff00": "f3e6dd", "6b6319": "987b6d", - "081019": "081019", "52423a": "312118", "6b524a": "4a342a", "bd846b": "8c3841", "846b63": "6b3838", "d69c84": "ad4c4c", "efce42": "eac2bd", - "d6cec5": "d6cec5", - "ffffff": "ffffff", "081018": "081019", "735a52": "564038", "9c8473": "a08773", @@ -21,7 +18,6 @@ "cebd00": "58536b", "ffff00": "707488", "6b6319": "39314a", - "081019": "081019", "52423a": "5a2e2e", "6b524a": "804e48", "bd846b": "cec9b1", diff --git a/public/images/pokemon/variant/619.json b/public/images/pokemon/variant/619.json index 8c813beccb4..3cb2a2b4403 100644 --- a/public/images/pokemon/variant/619.json +++ b/public/images/pokemon/variant/619.json @@ -6,12 +6,9 @@ "634a29": "5b3724", "ad9c4a": "9d8169", "7b7b7b": "572821", - "000000": "000000", "a54252": "b64619", "de637b": "dd7736", - "7b213a": "922308", - "ffffff": "ffffff", - "73293a": "73293a" + "7b213a": "922308" }, "2": { "947b52": "8d3e21", @@ -20,11 +17,9 @@ "634a29": "722611", "ad9c4a": "b15932", "7b7b7b": "552136", - "000000": "000000", "a54252": "56307f", "de637b": "764ebb", "7b213a": "3e0a70", - "ffffff": "ffffff", "73293a": "3c0c6a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/620.json b/public/images/pokemon/variant/620.json index 15546e0ced1..892424f79e6 100644 --- a/public/images/pokemon/variant/620.json +++ b/public/images/pokemon/variant/620.json @@ -2,7 +2,6 @@ "1": { "5a4231": "2a5a8c", "ce8c52": "4a86c5", - "000000": "000000", "735263": "855348", "b59c9c": "ddb2a5", "e6d6d6": "f3d9ce", @@ -10,16 +9,13 @@ "8463ad": "b82f34", "ad8cc5": "db6059", "a52121": "e1811a", - "4a2121": "4a2121", "ffad63": "abe5ff", - "ffffff": "ffffff", "424242": "63332d", "bda5a5": "e4c3b7" }, "2": { "5a4231": "8c0224", "ce8c52": "e61b42", - "000000": "000000", "735263": "654162", "b59c9c": "ba89a1", "e6d6d6": "e2b7db", @@ -27,9 +23,7 @@ "8463ad": "2f4c81", "ad8cc5": "3979ad", "a52121": "7b25cf", - "4a2121": "4a2121", "ffad63": "ff425d", - "ffffff": "ffffff", "424242": "3a193c", "bda5a5": "d39dda" } diff --git a/public/images/pokemon/variant/6215.json b/public/images/pokemon/variant/6215.json index 99e0c880142..56ee351cd66 100644 --- a/public/images/pokemon/variant/6215.json +++ b/public/images/pokemon/variant/6215.json @@ -1,7 +1,6 @@ { "1": { "503678": "0f5d6d", - "080808": "080808", "514a80": "402010", "956cbe": "31dabb", "9c9bce": "ae8976", @@ -12,13 +11,10 @@ "ffde7b": "a7a7a7", "584d80": "562627", "28234b": "220d0a", - "c52973": "ea903f", - "bdbdc5": "bdbdc5", - "f6f6ff": "f6f6ff" + "c52973": "ea903f" }, "2": { "503678": "601522", - "080808": "080808", "514a80": "14273a", "956cbe": "cc5427", "9c9bce": "3c8775", @@ -29,8 +25,6 @@ "ffde7b": "ffe07e", "584d80": "1c3942", "28234b": "0a191e", - "c52973": "f49633", - "bdbdc5": "bdbdc5", - "f6f6ff": "f6f6ff" + "c52973": "f49633" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/622.json b/public/images/pokemon/variant/622.json index 9d3d631c473..d7c42cb47eb 100644 --- a/public/images/pokemon/variant/622.json +++ b/public/images/pokemon/variant/622.json @@ -3,7 +3,6 @@ "106b63": "732d02", "004a52": "4c1b11", "84cece": "c78b3f", - "191921": "191921", "29848c": "65331c", "298c8c": "793907", "5aada5": "9d5915", diff --git a/public/images/pokemon/variant/623.json b/public/images/pokemon/variant/623.json index 2a9f0774f9a..7e9f52b0474 100644 --- a/public/images/pokemon/variant/623.json +++ b/public/images/pokemon/variant/623.json @@ -6,7 +6,6 @@ "195a7b": "4d0a00", "84c5ce": "e0854c", "003a52": "471205", - "191921": "191921", "ffefa5": "5fc8ff", "bdad73": "35a3ee", "dece94": "1b7ccb", @@ -21,7 +20,6 @@ "195a7b": "3c0702", "84c5ce": "9d3f1f", "003a52": "280008", - "191921": "191921", "ffefa5": "50ddaf", "bdad73": "3cb897", "dece94": "25957d", diff --git a/public/images/pokemon/variant/633.json b/public/images/pokemon/variant/633.json index ad02ba594d4..9e5c8c1c3aa 100644 --- a/public/images/pokemon/variant/633.json +++ b/public/images/pokemon/variant/633.json @@ -2,7 +2,6 @@ "1": { "292129": "140d35", "5a5252": "4c297a", - "101010": "101010", "525252": "4c297a", "423a42": "331c62", "19316b": "35475d", @@ -16,7 +15,6 @@ "2": { "292129": "1c2313", "5a5252": "3a452d", - "101010": "101010", "525252": "3a452d", "423a42": "2b351e", "19316b": "6a6a51", diff --git a/public/images/pokemon/variant/634.json b/public/images/pokemon/variant/634.json index 68039ec9ea8..197a398555e 100644 --- a/public/images/pokemon/variant/634.json +++ b/public/images/pokemon/variant/634.json @@ -1,7 +1,6 @@ { "1": { "423a42": "331c62", - "101010": "101010", "292129": "140d35", "525252": "4c297a", "3a63a5": "728197", @@ -9,14 +8,11 @@ "6394de": "bdd2e2", "732919": "7a1545", "9c4231": "bc3962", - "e6dede": "e6dede", "9c3a6b": "3a80b8", - "632142": "1f4c90", - "adadad": "adadad" + "632142": "1f4c90" }, "2": { "423a42": "2b351e", - "101010": "101010", "292129": "1c2313", "525252": "3a452d", "3a63a5": "a5a685", @@ -24,9 +20,7 @@ "6394de": "d9d9aa", "732919": "640303", "9c4231": "950505", - "e6dede": "e6dede", "9c3a6b": "ba5744", - "632142": "813530", - "adadad": "adadad" + "632142": "813530" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/635.json b/public/images/pokemon/variant/635.json index 9f00b8d3f09..d13d1388937 100644 --- a/public/images/pokemon/variant/635.json +++ b/public/images/pokemon/variant/635.json @@ -5,14 +5,12 @@ "292129": "140d35", "8c2963": "3a80b8", "bd527b": "65bfed", - "101010": "101010", "632142": "1f4c90", "19316b": "35475d", "5a84ce": "bdd2e2", "3a5a9c": "728197", "9c4231": "bc3962", - "732919": "7a1545", - "e6dede": "e6dede" + "732919": "7a1545" }, "2": { "423a42": "2b351e", @@ -20,13 +18,11 @@ "292129": "1c2313", "8c2963": "ba5744", "bd527b": "e78256", - "101010": "101010", "632142": "813530", "19316b": "6a6a51", "5a84ce": "d9d9aa", "3a5a9c": "a5a685", "9c4231": "950505", - "732919": "640303", - "e6dede": "e6dede" + "732919": "640303" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/640.json b/public/images/pokemon/variant/640.json index 2b85b86d986..da3a22eb676 100644 --- a/public/images/pokemon/variant/640.json +++ b/public/images/pokemon/variant/640.json @@ -10,7 +10,6 @@ "ad426b": "833018", "de738c": "b86a54", "7b103a": "651702", - "ffffff": "ffffff", "f7f7d6": "e1b0a0", "adb56b": "a77e72", "6b6b4a": "2d0c02" @@ -26,7 +25,6 @@ "ad426b": "1e7392", "de738c": "4694b1", "7b103a": "11495d", - "ffffff": "ffffff", "f7f7d6": "e5d7bd", "adb56b": "ccc1ad", "6b6b4a": "8e8169" diff --git a/public/images/pokemon/variant/647-ordinary.json b/public/images/pokemon/variant/647-ordinary.json index 0475084ff21..e425e289fee 100644 --- a/public/images/pokemon/variant/647-ordinary.json +++ b/public/images/pokemon/variant/647-ordinary.json @@ -1,24 +1,17 @@ { "1": { "7b3129": "96711f", - "212121": "212121", "de4221": "fdbb3e", "ad3121": "c2912f", - "6b6b52": "6b6b52", - "fff7bd": "fff7bd", "19295a": "922517", "217ba5": "f15c5d", - "b5ad84": "b5ad84", "4a6bce": "ef4635", "63bdff": "f69284", "314a8c": "c3382a", - "addeff": "fbcfcb", - "ffffff": "ffffff", - "525252": "525252" + "addeff": "fbcfcb" }, "2": { "7b3129": "81304a", - "212121": "212121", "de4221": "de5d83", "ad3121": "a84564", "6b6b52": "6a4863", @@ -29,8 +22,6 @@ "4a6bce": "524881", "63bdff": "e4d7ff", "314a8c": "3b3160", - "addeff": "f1ecff", - "ffffff": "ffffff", - "525252": "525252" + "addeff": "f1ecff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/647-resolute.json b/public/images/pokemon/variant/647-resolute.json index 85975acfdc7..1e0f5c75d5c 100644 --- a/public/images/pokemon/variant/647-resolute.json +++ b/public/images/pokemon/variant/647-resolute.json @@ -1,23 +1,16 @@ { "1": { - "101010": "101010", "314a8c": "c3382a", "843a29": "c2912f", "63bdff": "f69284", - "4a5252": "4a5252", "ff9421": "d84a9a", "4a6bce": "ef4635", "de4a31": "fdbb3e", "193163": "922517", "3ab53a": "993f88", - "21848c": "be4848", - "b5ad73": "b5ad73", - "fff7ad": "fff7ad", - "635a29": "635a29", - "ffffff": "ffffff" + "21848c": "be4848" }, "2": { - "101010": "101010", "314a8c": "3b3160", "843a29": "81304a", "63bdff": "e4d7ff", @@ -30,7 +23,6 @@ "21848c": "b89edb", "b5ad73": "b573a8", "fff7ad": "d89cc6", - "635a29": "6a4863", - "ffffff": "ffffff" + "635a29": "6a4863" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/648-aria.json b/public/images/pokemon/variant/648-aria.json index b755f35b778..dc562c08be4 100644 --- a/public/images/pokemon/variant/648-aria.json +++ b/public/images/pokemon/variant/648-aria.json @@ -12,8 +12,6 @@ "428c7b": "750461", "947b5a": "6a8e93", "31c5a5": "ad1e71", - "de7b8c": "de7b8c", - "b55263": "b55263", "5a5252": "4d7b84" }, "2": { diff --git a/public/images/pokemon/variant/648-pirouette.json b/public/images/pokemon/variant/648-pirouette.json index 4b9a068eb65..c7e96d1122d 100644 --- a/public/images/pokemon/variant/648-pirouette.json +++ b/public/images/pokemon/variant/648-pirouette.json @@ -24,7 +24,6 @@ "73423a": "553a35", "ef7352": "ca956d", "635a52": "625246", - "423131": "423131", "fffff7": "fff4e0", "c5b594": "c9b190", "c5315a": "553a35", diff --git a/public/images/pokemon/variant/649-burn.json b/public/images/pokemon/variant/649-burn.json index ba34e8ba203..f34c5a14c0c 100644 --- a/public/images/pokemon/variant/649-burn.json +++ b/public/images/pokemon/variant/649-burn.json @@ -5,15 +5,10 @@ "9c5ac5": "7baec3", "101010": "081662", "ceb5ff": "87feff", - "5a2110": "5a2110", - "ef2100": "ef2100", - "a53121": "a53121", "a584bd": "62c4e6", "733129": "26a624", "f75221": "ddffb0", - "b54221": "97e083", - "ffffff": "ffffff", - "737373": "737373" + "b54221": "97e083" }, "2": { "52294a": "1e1d33", @@ -21,14 +16,9 @@ "9c5ac5": "484553", "101010": "000000", "ceb5ff": "f56e6e", - "5a2110": "5a2110", - "ef2100": "ef2100", - "a53121": "a53121", "a584bd": "b72852", "733129": "91283b", "f75221": "ff9b90", - "b54221": "c9514e", - "ffffff": "ffffff", - "737373": "737373" + "b54221": "c9514e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/649-chill.json b/public/images/pokemon/variant/649-chill.json index acdb58ceb61..6e719cbc091 100644 --- a/public/images/pokemon/variant/649-chill.json +++ b/public/images/pokemon/variant/649-chill.json @@ -5,14 +5,10 @@ "9c5ac5": "7baec3", "101010": "081662", "ceb5ff": "87feff", - "42423a": "42423a", - "ffffff": "ffffff", - "a5a5ad": "a5a5ad", "a584bd": "62c4e6", "733129": "26a624", "f75221": "ddffb0", - "b54221": "97e083", - "737373": "737373" + "b54221": "97e083" }, "2": { "52294a": "1e1d33", @@ -20,13 +16,9 @@ "9c5ac5": "484553", "101010": "000000", "ceb5ff": "ccf7fe", - "42423a": "42423a", - "ffffff": "ffffff", - "a5a5ad": "a5a5ad", "a584bd": "8dc7e3", "733129": "4b8fba", "f75221": "aafaff", - "b54221": "7cc9e0", - "737373": "737373" + "b54221": "7cc9e0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/649-douse.json b/public/images/pokemon/variant/649-douse.json index b3796b6ac79..54b13882365 100644 --- a/public/images/pokemon/variant/649-douse.json +++ b/public/images/pokemon/variant/649-douse.json @@ -5,15 +5,10 @@ "9c5ac5": "7baec3", "101010": "081662", "ceb5ff": "87feff", - "00424a": "00424a", - "00ceff": "00ceff", - "0084b5": "0084b5", "a584bd": "62c4e6", "733129": "26a624", "f75221": "ddffb0", - "b54221": "97e083", - "ffffff": "ffffff", - "737373": "737373" + "b54221": "97e083" }, "2": { "52294a": "1e1d33", @@ -21,14 +16,9 @@ "9c5ac5": "484553", "101010": "000000", "ceb5ff": "7bbde3", - "00424a": "00424a", - "00ceff": "00ceff", - "0084b5": "0084b5", "a584bd": "4994da", "733129": "2048bd", "f75221": "a4c8ff", - "b54221": "6c92e0", - "ffffff": "ffffff", - "737373": "737373" + "b54221": "6c92e0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/649-shock.json b/public/images/pokemon/variant/649-shock.json index 5e9fab695c2..b81def26a0c 100644 --- a/public/images/pokemon/variant/649-shock.json +++ b/public/images/pokemon/variant/649-shock.json @@ -5,15 +5,10 @@ "9c5ac5": "7baec3", "101010": "081662", "ceb5ff": "87feff", - "4a4208": "4a4208", - "deff00": "deff00", - "b5b500": "b5b500", "a584bd": "62c4e6", "733129": "26a624", "f75221": "ddffb0", - "b54221": "97e083", - "ffffff": "ffffff", - "737373": "737373" + "b54221": "97e083" }, "2": { "52294a": "1e1d33", @@ -21,14 +16,9 @@ "9c5ac5": "484553", "101010": "000000", "ceb5ff": "ffee5e", - "4a4208": "4a4208", - "deff00": "deff00", - "b5b500": "b5b500", "a584bd": "ecb549", "733129": "c69634", "f75221": "fff7aa", - "b54221": "eccc67", - "ffffff": "ffffff", - "737373": "737373" + "b54221": "eccc67" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/649.json b/public/images/pokemon/variant/649.json index 8dd2e6919e1..1d3c6dd1539 100644 --- a/public/images/pokemon/variant/649.json +++ b/public/images/pokemon/variant/649.json @@ -5,15 +5,10 @@ "9c5ac5": "7baec3", "101010": "081662", "ceb5ff": "87feff", - "6b4a08": "6b4a08", - "efbd00": "efbd00", - "c58400": "c58400", "a584bd": "62c4e6", "733129": "26a624", "f75221": "ddffb0", - "b54221": "97e083", - "ffffff": "ffffff", - "737373": "737373" + "b54221": "97e083" }, "2": { "52294a": "1e1d33", @@ -21,14 +16,9 @@ "9c5ac5": "484553", "101010": "000000", "ceb5ff": "f7ae6a", - "6b4a08": "6b4a08", - "efbd00": "efbd00", - "c58400": "c58400", "a584bd": "e2854c", "733129": "c6684b", "f75221": "fbba7f", - "b54221": "e0875a", - "ffffff": "ffffff", - "737373": "737373" + "b54221": "e0875a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/653.json b/public/images/pokemon/variant/653.json index be967d6c9c2..d603337fb8c 100644 --- a/public/images/pokemon/variant/653.json +++ b/public/images/pokemon/variant/653.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736028": "9f398a", "ffd659": "e190c3", "ccab47": "c35ba3", @@ -9,11 +8,9 @@ "b34724": "502c81", "737373": "68326b", "f8f8f8": "fbecff", - "bfbfbf": "c093c3", - "404040": "404040" + "bfbfbf": "c093c3" }, "2": { - "101010": "101010", "736028": "172547", "ffd659": "3a6a93", "ccab47": "264166", @@ -22,7 +19,6 @@ "b34724": "0aaa77", "737373": "75553c", "f8f8f8": "fff8ec", - "bfbfbf": "d4b996", - "404040": "404040" + "bfbfbf": "d4b996" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/654.json b/public/images/pokemon/variant/654.json index ce87bf218fb..7d9c5adae93 100644 --- a/public/images/pokemon/variant/654.json +++ b/public/images/pokemon/variant/654.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736028": "061530", "ffd659": "b55390", "ccab47": "872b59", @@ -10,12 +9,9 @@ "f8f8f8": "f7e4fc", "737373": "5c255f", "bfbfbf": "c093c3", - "804913": "c5b3ca", - "262626": "262626", - "404040": "404040" + "804913": "c5b3ca" }, "2": { - "101010": "101010", "736028": "061530", "ffd659": "2b5f8a", "ccab47": "173864", @@ -25,8 +21,6 @@ "f8f8f8": "fff2dd", "737373": "75553c", "bfbfbf": "d4b996", - "804913": "098794", - "262626": "262626", - "404040": "404040" + "804913": "098794" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/6549.json b/public/images/pokemon/variant/6549.json index 30afb7ebadf..264064b1e4c 100644 --- a/public/images/pokemon/variant/6549.json +++ b/public/images/pokemon/variant/6549.json @@ -2,7 +2,6 @@ "1": { "70365a": "29547d", "bd59a2": "5094c0", - "101010": "101010", "315a31": "5a5a2c", "ff84bd": "73bad9", "39ac39": "bfd17f", @@ -13,13 +12,11 @@ "526229": "80152b", "4a834a": "8e954d", "c5ee7b": "ef5755", - "9cb462": "bd2d40", - "cdc5bd": "cdc5bd" + "9cb462": "bd2d40" }, "2": { "70365a": "8a1a3c", "bd59a2": "d64065", - "101010": "101010", "315a31": "643312", "ff84bd": "e8617a", "39ac39": "ebc460", diff --git a/public/images/pokemon/variant/655.json b/public/images/pokemon/variant/655.json index 9b4721929c1..63e142f0b48 100644 --- a/public/images/pokemon/variant/655.json +++ b/public/images/pokemon/variant/655.json @@ -7,7 +7,6 @@ "816528": "331035", "ffda5a": "e7caef", "deb048": "c093c3", - "101010": "101010", "a7673a": "7a4b9f", "f8f8f8": "ffeef1", "bfbfbf": "d2b3ba", @@ -24,11 +23,7 @@ "816528": "75553c", "ffda5a": "fff2dd", "deb048": "d4b996", - "101010": "101010", "a7673a": "098794", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "6e6d6a": "6e6d6a", "62211b": "061530", "ae3d32": "215679", "893027": "13325b" diff --git a/public/images/pokemon/variant/6570.json b/public/images/pokemon/variant/6570.json index 0cb91cc3490..083f6275b4c 100644 --- a/public/images/pokemon/variant/6570.json +++ b/public/images/pokemon/variant/6570.json @@ -4,17 +4,13 @@ "d53a3e": "e8512a", "5f0002": "5d0019", "f07376": "ff6d26", - "4a4d53": "4a4d53", "f7acae": "fdc9a2", "fafafa": "f3dac4", - "101010": "101010", "b3b3bb": "d6b7b1", "cbcfd8": "7b7897", "6d4d62": "e1d2d3", "928d96": "303443", - "a7484f": "9e111f", - "ffae1a": "ffae1a", - "df7806": "df7806" + "a7484f": "9e111f" }, "2": { "942429": "09523d", @@ -24,7 +20,6 @@ "4a4d53": "6f4332", "f7acae": "79d38d", "fafafa": "f0decd", - "101010": "101010", "b3b3bb": "c6ab99", "cbcfd8": "d79568", "6d4d62": "813059", diff --git a/public/images/pokemon/variant/6571.json b/public/images/pokemon/variant/6571.json index c87a105447a..3b1482f8a61 100644 --- a/public/images/pokemon/variant/6571.json +++ b/public/images/pokemon/variant/6571.json @@ -2,7 +2,6 @@ "1": { "942429": "4a1921", "d53a3e": "782d41", - "101010": "101010", "928d96": "4a4759", "fafafa": "e1d2d2", "f7acae": "ce646c", @@ -19,7 +18,6 @@ "2": { "942429": "143130", "d53a3e": "2e625a", - "101010": "101010", "928d96": "885f49", "fafafa": "f0decd", "f7acae": "6aa899", @@ -29,7 +27,6 @@ "a7484f": "2a6062", "4a4d53": "411c1a", "cbcfd8": "bc9072", - "4b163b": "4b163b", "6d4d62": "c2589c", "f6ee6c": "98f25f" } diff --git a/public/images/pokemon/variant/664.json b/public/images/pokemon/variant/664.json index bd4164ca7db..932e2399bb9 100644 --- a/public/images/pokemon/variant/664.json +++ b/public/images/pokemon/variant/664.json @@ -2,29 +2,23 @@ "1": { "4d4d4d": "9d6260", "f8f8f8": "ffffff", - "101010": "101010", "b3b3b3": "e9c7c4", "363636": "4c2855", "747474": "a97dbb", "4e4e4e": "895a9f", "9d7247": "838b53", "d1bf6b": "a0c896", - "b2b2b2": "b2b2b2", - "f7f7f7": "f7f7f7", "855d31": "626649" }, "2": { "4d4d4d": "590015", "f8f8f8": "c83e4c", - "101010": "101010", "b3b3b3": "a70d37", "363636": "05312f", "747474": "73bdae", "4e4e4e": "377772", "9d7247": "dda476", "d1bf6b": "ffe0ba", - "b2b2b2": "b2b2b2", - "f7f7f7": "f7f7f7", "855d31": "bf8961" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/665.json b/public/images/pokemon/variant/665.json index 6d828dadb5d..ac2d2e6c336 100644 --- a/public/images/pokemon/variant/665.json +++ b/public/images/pokemon/variant/665.json @@ -6,8 +6,6 @@ "4e4e4e": "895a9f", "747474": "a97dbb", "bfbfbf": "b294be", - "101010": "101010", - "fdfdfd": "fdfdfd", "8c8c8c": "895a9f", "4d4d4d": "9c615f", "f8f8f8": "ffffff", @@ -23,8 +21,6 @@ "4e4e4e": "377772", "747474": "73bdae", "bfbfbf": "a70d37", - "101010": "101010", - "fdfdfd": "fdfdfd", "8c8c8c": "590015", "4d4d4d": "590015", "f8f8f8": "c83e4c", diff --git a/public/images/pokemon/variant/666-archipelago.json b/public/images/pokemon/variant/666-archipelago.json index 5895b2e4836..c3017840a5b 100644 --- a/public/images/pokemon/variant/666-archipelago.json +++ b/public/images/pokemon/variant/666-archipelago.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "c8373c": "c8373c", - "d2bf96": "d2bf96", - "30c171": "30c171", "303030": "402746", - "c27351": "c27351", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "a2523b": "a2523b", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "b28e67": "b28e67" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "824719", - "c8373c": "c8373c", - "d2bf96": "d2bf96", - "30c171": "30c171", "303030": "642703", - "c27351": "c27351", "675220": "741300", "ceab62": "a22414", "707068": "a22414", "504a4a": "741300", - "a2523b": "a2523b", - "c3c3c3": "e7caa5", - "811c1c": "811c1c", - "b28e67": "b28e67" + "c3c3c3": "e7caa5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-continental.json b/public/images/pokemon/variant/666-continental.json index 92614fb346c..2c40d87b19e 100644 --- a/public/images/pokemon/variant/666-continental.json +++ b/public/images/pokemon/variant/666-continental.json @@ -1,38 +1,22 @@ { "1": { - "101010": "101010", "595959": "724b7a", "555353": "724b7a", - "d18257": "d18257", - "f9bd55": "f9bd55", "303030": "402746", - "f8f05e": "f8f05e", - "d24c3e": "d24c3e", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "aa5844": "aa5844", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "e08528": "e08528" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "8f551e", "555353": "e99b44", - "d18257": "d18257", - "f9bd55": "f9bd55", "303030": "6d2d0d", - "f8f05e": "f8f05e", - "d24c3e": "d24c3e", "675220": "9c5c19", "ceab62": "e99b44", "707068": "e99b44", "504a4a": "9c5c19", - "aa5844": "aa5844", - "c3c3c3": "f8f27f", - "811c1c": "811c1c", - "308528": "308528" + "c3c3c3": "f8f27f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-elegant.json b/public/images/pokemon/variant/666-elegant.json index 7d4e199f74d..43f74da48db 100644 --- a/public/images/pokemon/variant/666-elegant.json +++ b/public/images/pokemon/variant/666-elegant.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "e6ddf8": "e6ddf8", - "f8de3f": "f8de3f", - "cf7ef3": "cf7ef3", "303030": "402746", - "875fb5": "875fb5", - "de4040": "de4040", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "56479d": "56479d", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "612776", - "e6ddf8": "e6ddf8", - "f8de3f": "f8de3f", - "cf7ef3": "cf7ef3", "303030": "351262", - "875fb5": "875fb5", - "de4040": "de4040", "675220": "7d1083", "ceab62": "a73fab", "707068": "a73fab", "504a4a": "7d1083", - "56479d": "56479d", - "c3c3c3": "f0ecff", - "811c1c": "811c1c" + "c3c3c3": "f0ecff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-fancy.json b/public/images/pokemon/variant/666-fancy.json index 1f31ac6983d..964324d96e5 100644 --- a/public/images/pokemon/variant/666-fancy.json +++ b/public/images/pokemon/variant/666-fancy.json @@ -1,38 +1,22 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "811c1c": "811c1c", - "de4040": "de4040", - "5faa3e": "5faa3e", - "ceab62": "d9edd4", - "b6d26d": "b6d26d", - "e9e052": "e9e052", - "cf7ef3": "cf7ef3", - "c3c3c3": "ffeaff", - "f2d4e3": "f2d4e3", - "ead2e3": "ffeaff" - }, - "2": { - "101010": "101010", - "303030": "00771b", - "675220": "b9c05a", - "504a4a": "b9c05a", - "595959": "6f9f42", - "707068": "e3e982", - "811c1c": "811c1c", - "de4040": "de4040", - "5faa3e": "5faa3e", - "ceab62": "e3e982", - "b6d26d": "b6d26d", - "e9e052": "e9e052", - "cf7ef3": "cf7ef3", - "c3c3c3": "fcf1ff", - "f2d4e3": "f2d4e3", - "ead2e3": "fcf1ff" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "c3c3c3": "ffeaff", + "ead2e3": "ffeaff" + }, + "2": { + "303030": "00771b", + "675220": "b9c05a", + "504a4a": "b9c05a", + "595959": "6f9f42", + "707068": "e3e982", + "ceab62": "e3e982", + "c3c3c3": "fcf1ff", + "ead2e3": "fcf1ff" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-garden.json b/public/images/pokemon/variant/666-garden.json index 3b88609e835..7cae3ceec5a 100644 --- a/public/images/pokemon/variant/666-garden.json +++ b/public/images/pokemon/variant/666-garden.json @@ -1,34 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "398351": "398351", - "3dba96": "3dba96", "303030": "402746", - "88d254": "88d254", "675220": "958c8a", "ceab62": "d9edd4", - "de4040": "de4040", "707068": "a97cbc", "504a4a": "7f6991", - "3f919a": "3f919a", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "006b55", - "398351": "398351", - "3dba96": "3dba96", "303030": "044553", - "88d254": "88d254", "675220": "055160", "ceab62": "227687", - "de4040": "de4040", "707068": "227687", "504a4a": "055160", - "3f919a": "3f919a", - "c3c3c3": "72d0a3", - "811c1c": "811c1c" + "c3c3c3": "72d0a3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-high-plains.json b/public/images/pokemon/variant/666-high-plains.json index 85a5eb24cc3..d5a9e9f5874 100644 --- a/public/images/pokemon/variant/666-high-plains.json +++ b/public/images/pokemon/variant/666-high-plains.json @@ -1,38 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f3a861": "f3a861", "303030": "402746", - "9a5a3b": "9a5a3b", - "e1764e": "e1764e", - "aa4343": "aa4343", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "337543": "337543", - "e8c815": "e8c815", - "773d21": "773d21" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "a55422", - "f3a861": "f3a861", "303030": "8f1d19", - "9a5a3b": "9a5a3b", - "e1764e": "e1764e", - "aa4343": "aa4343", "675220": "c97034", "ceab62": "f2975a", "707068": "f2975a", "504a4a": "c97034", - "c3c3c3": "edc67c", - "811c1c": "811c1c", - "337543": "337543", - "e8c815": "e8c815", - "773d21": "773d21" + "c3c3c3": "edc67c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-icy-snow.json b/public/images/pokemon/variant/666-icy-snow.json index d69d48d89e9..244c47d1863 100644 --- a/public/images/pokemon/variant/666-icy-snow.json +++ b/public/images/pokemon/variant/666-icy-snow.json @@ -1,34 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f0f0f8": "f0f0f8", "303030": "402746", - "cfd9cf": "cfd9cf", - "c5c5da": "c5c5da", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "c3c3c3": "ffeaff", - "acacc2": "acacc2", - "95a1a1": "95a1a1", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "60646a", - "f0f0f8": "f0f0f8", "303030": "364051", - "cfd9cf": "cfd9cf", - "c5c5da": "c5c5da", "675220": "666b7d", "ceab62": "8c91a4", "707068": "8c91a4", "504a4a": "666b7d", - "c3c3c3": "fefeff", - "acacc2": "acacc2", - "95a1a1": "95a1a1", - "811c1c": "811c1c" + "c3c3c3": "fefeff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-jungle.json b/public/images/pokemon/variant/666-jungle.json index ad4070f0378..919184c4dde 100644 --- a/public/images/pokemon/variant/666-jungle.json +++ b/public/images/pokemon/variant/666-jungle.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "638c63": "638c63", - "7cc48b": "7cc48b", "303030": "402746", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "567456": "567456", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "9a653e": "9a653e", - "c29566": "c29566", - "724e28": "724e28" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "285b3b", - "638c63": "638c63", - "7cc48b": "7cc48b", "303030": "20452e", "675220": "153922", "ceab62": "385c43", "707068": "385c43", "504a4a": "153922", - "567456": "567456", - "c3c3c3": "a9d9a0", - "811c1c": "811c1c", - "9a653e": "9a653e", - "c29566": "c29566", - "724e28": "724e28" + "c3c3c3": "a9d9a0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-marine.json b/public/images/pokemon/variant/666-marine.json index 027644dc62d..181da6b4c4b 100644 --- a/public/images/pokemon/variant/666-marine.json +++ b/public/images/pokemon/variant/666-marine.json @@ -1,34 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "2f8dc9": "2f8dc9", - "5acdf1": "5acdf1", "303030": "402746", "675220": "958c8a", "ceab62": "d9edd4", - "f2f2f2": "f2f2f2", - "367cb9": "367cb9", "707068": "a97cbc", "504a4a": "7f6991", - "315382": "315382", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "2a5894", - "2f8dc9": "2f8dc9", - "5acdf1": "5acdf1", "303030": "16244f", "675220": "264c85", "ceab62": "3070af", - "f2f2f2": "f2f2f2", - "367cb9": "367cb9", "707068": "3070af", "504a4a": "264c85", - "315382": "315382", - "c3c3c3": "f2f2f2", - "811c1c": "811c1c" + "c3c3c3": "f2f2f2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-meadow.json b/public/images/pokemon/variant/666-meadow.json index 058cb600ee3..e1a99ebebdd 100644 --- a/public/images/pokemon/variant/666-meadow.json +++ b/public/images/pokemon/variant/666-meadow.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "da6b7e": "da6b7e", - "f3a0ca": "f3a0ca", "303030": "402746", "675220": "958c8a", "ceab62": "d9edd4", - "b4295a": "b4295a", - "2d9b9b": "2d9b9b", - "f2f2f2": "f2f2f2", "707068": "a97cbc", "504a4a": "7f6991", - "e66fad": "e66fad", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "9e3941", - "da6b7e": "da6b7e", - "f3a0ca": "f3a0ca", "303030": "770921", "675220": "a2275e", "ceab62": "ce5283", - "b4295a": "b4295a", - "2d9b9b": "2d9b9b", - "f2f2f2": "f2f2f2", "707068": "ce5283", "504a4a": "a2275e", - "e66fad": "e66fad", - "c3c3c3": "f4c2ec", - "811c1c": "811c1c" + "c3c3c3": "f4c2ec" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-modern.json b/public/images/pokemon/variant/666-modern.json index 9ff33f89cea..73ed4020c5b 100644 --- a/public/images/pokemon/variant/666-modern.json +++ b/public/images/pokemon/variant/666-modern.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", "c3c3c3": "ffeaff", - "3b6cbb": "3b6cbb", - "f44f4f": "f44f4f", "303030": "402746", "675220": "958c8a", "ceab62": "d9edd4", - "f8f05c": "f8f05c", "707068": "a97cbc", - "504a4a": "7f6991", - "b83c3c": "b83c3c", - "cfc5d9": "cfc5d9", - "811c1c": "811c1c", - "405793": "405793" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "830012", "c3c3c3": "ffeae8", - "3b6cbb": "3b6cbb", - "f44f4f": "f44f4f", "303030": "4e0000", "675220": "801521", "ceab62": "ad2640", - "f8f05c": "f8f05c", "707068": "ad2640", - "504a4a": "801521", - "b83c3c": "b83c3c", - "cfc5d9": "cfc5d9", - "811c1c": "811c1c", - "405793": "405793" + "504a4a": "801521" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-monsoon.json b/public/images/pokemon/variant/666-monsoon.json index 915d471b2b1..5a127a43bbe 100644 --- a/public/images/pokemon/variant/666-monsoon.json +++ b/public/images/pokemon/variant/666-monsoon.json @@ -1,33 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "807676": "807676", - "ceab62": "d9edd4", - "5676de": "5676de", - "4eccd6": "4eccd6", - "989898": "989898", - "c3c3c3": "c3c3c3", - "f0f0f8": "f0f0f8" - }, - "2": { - "101010": "101010", - "303030": "3d3231", - "675220": "2c3593", - "504a4a": "2c3593", - "595959": "4f4645", - "707068": "5857bc", - "807676": "807676", - "ceab62": "5857bc", - "5676de": "5676de", - "4eccd6": "4eccd6", - "989898": "989898", - "92f4f4": "92f4f4", - "c3c3c3": "b8f9f9", - "f0f0f8": "f0f0f8" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "3d3231", + "675220": "2c3593", + "504a4a": "2c3593", + "595959": "4f4645", + "707068": "5857bc", + "ceab62": "5857bc", + "c3c3c3": "b8f9f9" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-ocean.json b/public/images/pokemon/variant/666-ocean.json index 23f8d48c681..5f46bf9343c 100644 --- a/public/images/pokemon/variant/666-ocean.json +++ b/public/images/pokemon/variant/666-ocean.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "e1384d": "e1384d", - "f4ad61": "f4ad61", - "f8ef6a": "f8ef6a", "303030": "402746", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "ebcf3f": "ebcf3f", - "c3c3c3": "ffeaff", - "4482c9": "4482c9", - "6bb2e9": "6bb2e9", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "e99a26", - "e1384d": "e1384d", - "f4ad61": "f4ad61", - "f8ef6a": "f8ef6a", "303030": "b54908", "675220": "bc601c", "ceab62": "ea8742", "707068": "ea8742", "504a4a": "bc601c", - "ebcf3f": "ebcf3f", - "c3c3c3": "f3c86b", - "4482c9": "4482c9", - "6bb2e9": "6bb2e9", - "811c1c": "811c1c" + "c3c3c3": "f3c86b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-poke-ball.json b/public/images/pokemon/variant/666-poke-ball.json index fe6b42f6ef3..048cb75ecfd 100644 --- a/public/images/pokemon/variant/666-poke-ball.json +++ b/public/images/pokemon/variant/666-poke-ball.json @@ -1,33 +1,23 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "b72c2c": "b72c2c", - "dc4b4b": "dc4b4b", "303030": "402746", "675220": "958c8a", "ceab62": "d9edd4", - "e97e7e": "e97e7e", - "971d1d": "971d1d", - "f8f8f8": "f8f8f8", "707068": "a97cbc", "504a4a": "7f6991", "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "a9a99e": "a9a99e", "2c2b2b": "402746" }, "2": { - "101010": "101010", "f8f8f8": "00006d", "303030": "ae001a", "2c2b2b": "660000", - "504a4a": "a70038", + "504a4a": "a70038", "595959": "df0036", "c3c3c3": "f0a6bf", "707068": "d5375a", "a9a99e": "000050", - "811c1c": "811c1c", "971d1d": "040046", "b72c2c": "00005e", "dc4b4b": "19007d", diff --git a/public/images/pokemon/variant/666-polar.json b/public/images/pokemon/variant/666-polar.json index 23ee3a94a79..8c8a681f1c6 100644 --- a/public/images/pokemon/variant/666-polar.json +++ b/public/images/pokemon/variant/666-polar.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "4d6cc1": "4d6cc1", "303030": "402746", - "f0f0f8": "f0f0f8", - "3b4b8a": "3b4b8a", - "bfbfbf": "bfbfbf", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "c3c3c3": "ffeaff", - "2d2d61": "2d2d61", - "811c1c": "811c1c", - "6aa2dc": "6aa2dc" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "2f3887", - "4d6cc1": "4d6cc1", "303030": "191b54", - "f0f0f8": "f0f0f8", - "3b4b8a": "3b4b8a", - "bfbfbf": "bfbfbf", "675220": "366098", "ceab62": "5f85c1", "707068": "5f85c1", "504a4a": "366098", - "c3c3c3": "ffffff", - "2d2d61": "2d2d61", - "811c1c": "811c1c", - "6aa2dc": "6aa2dc" + "c3c3c3": "ffffff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-river.json b/public/images/pokemon/variant/666-river.json index c7e5e288d05..5ba0084df9d 100644 --- a/public/images/pokemon/variant/666-river.json +++ b/public/images/pokemon/variant/666-river.json @@ -1,40 +1,18 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "4a412c": "4a412c", - "675220": "958c8a", - "634d20": "634d20", - "1d726a": "1d726a", - "504a4a": "7f6991", - "595959": "724b7a", - "625841": "625841", - "707068": "a97cbc", - "bc813f": "bc813f", - "9c9143": "9c9143", - "ceab62": "ceab62", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "c3c3c3": "c3c3c3", - "d2a862": "d9edd4" - }, - "2": { - "101010": "101010", - "303030": "7b2800", - "4a412c": "4a412c", - "675220": "ae7f41", - "634d20": "634d20", - "1d726a": "1d726a", - "504a4a": "ae7f41", - "595959": "8a5702", - "625841": "625841", - "707068": "d9a666", - "bc813f": "bc813f", - "9c9143": "9c9143", - "ceab62": "ceab62", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "c3c3c3": "e3c384", - "d2a862": "d2a862" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "d2a862": "d9edd4" + }, + "2": { + "303030": "7b2800", + "675220": "ae7f41", + "504a4a": "ae7f41", + "595959": "8a5702", + "707068": "d9a666", + "c3c3c3": "e3c384" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-sandstorm.json b/public/images/pokemon/variant/666-sandstorm.json index c1324548e3d..b80d841c0cc 100644 --- a/public/images/pokemon/variant/666-sandstorm.json +++ b/public/images/pokemon/variant/666-sandstorm.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f1d69e": "f1d69e", "303030": "402746", - "625843": "625843", - "ba8d68": "ba8d68", - "9b9148": "9b9148", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "d9b674": "d9b674", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "72604d": "72604d" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "88583e", - "f1d69e": "f1d69e", "303030": "443123", - "625843": "625843", - "ba8d68": "ba8d68", - "9b9148": "9b9148", "675220": "9c703b", "ceab62": "c6975f", "707068": "c6975f", "504a4a": "9c703b", - "d9b674": "d9b674", - "c3c3c3": "ece1a9", - "811c1c": "811c1c", - "72604d": "72604d" + "c3c3c3": "ece1a9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-savanna.json b/public/images/pokemon/variant/666-savanna.json index 48ecc051beb..a227c3ae8af 100644 --- a/public/images/pokemon/variant/666-savanna.json +++ b/public/images/pokemon/variant/666-savanna.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "61a0f5": "61a0f5", - "fffd77": "fffd77", - "55d3d9": "55d3d9", "303030": "402746", "675220": "958c8a", "ceab62": "d9edd4", - "dcc433": "dcc433", "707068": "a97cbc", "504a4a": "7f6991", - "3b67ac": "3b67ac", - "6cc6c6": "6cc6c6", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "4168bb", - "61a0f5": "61a0f5", - "fffd77": "fffd77", - "55d3d9": "55d3d9", "303030": "183576", "675220": "1d828b", "ceab62": "4faab3", - "dcc433": "dcc433", "707068": "4faab3", "504a4a": "1d828b", - "3b67ac": "3b67ac", - "6cc6c6": "6cc6c6", - "c3c3c3": "81e7e1", - "811c1c": "811c1c" + "c3c3c3": "81e7e1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-sun.json b/public/images/pokemon/variant/666-sun.json index d4b682c9804..aafa9a6cbc6 100644 --- a/public/images/pokemon/variant/666-sun.json +++ b/public/images/pokemon/variant/666-sun.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f1a26a": "f1a26a", - "f47491": "f47491", "303030": "402746", - "fcf372": "fcf372", - "f0ce44": "f0ce44", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "c94971": "c94971", - "e18248": "e18248", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "750500", - "f1a26a": "f1a26a", - "f47491": "f47491", "303030": "640000", - "fcf372": "fcf372", - "f0ce44": "f0ce44", "675220": "8c1850", "ceab62": "b83b74", "707068": "b83b74", "504a4a": "8c1850", - "c94971": "c94971", - "e18248": "e18248", - "c3c3c3": "fee3e7", - "811c1c": "811c1c" + "c3c3c3": "fee3e7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/666-tundra.json b/public/images/pokemon/variant/666-tundra.json index e5faa385d22..b458a78851d 100644 --- a/public/images/pokemon/variant/666-tundra.json +++ b/public/images/pokemon/variant/666-tundra.json @@ -1,34 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "a3def1": "a3def1", "303030": "402746", - "f0f0f8": "f0f0f8", - "74bbe9": "74bbe9", - "d0d0d0": "d0d0d0", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "c3c3c3": "ffeaff", - "539ad9": "539ad9", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "225b72", - "a3def1": "a3def1", "303030": "003d69", - "f0f0f8": "f0f0f8", - "74bbe9": "74bbe9", - "d0d0d0": "d0d0d0", "675220": "3a76a7", "ceab62": "659dd0", "707068": "659dd0", "504a4a": "3a76a7", - "c3c3c3": "cbfbfb", - "539ad9": "539ad9", - "811c1c": "811c1c" + "c3c3c3": "cbfbfb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/669-orange.json b/public/images/pokemon/variant/669-orange.json index bc1328bebf9..d6d416d0299 100644 --- a/public/images/pokemon/variant/669-orange.json +++ b/public/images/pokemon/variant/669-orange.json @@ -6,7 +6,6 @@ "595959": "712b2b", "f8f8f8": "fff1df", "bfbfbf": "f1beb3", - "101010": "101010", "686868": "712b2b", "fffbfb": "fff6f6", "e15455": "b84816", diff --git a/public/images/pokemon/variant/669-red.json b/public/images/pokemon/variant/669-red.json index 145228a41c2..eb95bd11117 100644 --- a/public/images/pokemon/variant/669-red.json +++ b/public/images/pokemon/variant/669-red.json @@ -1,10 +1,7 @@ { "1": { - "101010": "101010", "3d6629": "094740", "665a1f": "3e0547", - "595959": "595959", - "686868": "686868", "802d2d": "55061c", "d94c4c": "aa263c", "e15455": "dc6295", @@ -12,10 +9,7 @@ "65a943": "e493a1", "6bb347": "1d8057", "ccb43d": "6a094f", - "ffe14c": "9c235f", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8", - "fffbfb": "fffbfb" + "ffe14c": "9c235f" }, "2": { "665a1f": "393833", @@ -24,7 +18,6 @@ "595959": "800d3e", "f8f8f8": "ffd7db", "bfbfbf": "f1a2a9", - "101010": "101010", "686868": "800d3e", "fffbfb": "fff6f6", "e15455": "8e0a0a", diff --git a/public/images/pokemon/variant/669-white.json b/public/images/pokemon/variant/669-white.json index 4556e17f09b..48a1806db8f 100644 --- a/public/images/pokemon/variant/669-white.json +++ b/public/images/pokemon/variant/669-white.json @@ -3,11 +3,6 @@ "665a1f": "110732", "ffe14c": "4c495c", "ccb43d": "302b40", - "595959": "595959", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "101010": "101010", - "686868": "686868", "fffbfb": "f8f8f8", "e15455": "dc6295", "65a943": "e493a1", @@ -22,10 +17,7 @@ "ffe14c": "fdfffb", "ccb43d": "c4c6bf", "595959": "616a64", - "f8f8f8": "f8f8f8", "bfbfbf": "d4dcd5", - "101010": "101010", - "686868": "686868", "fffbfb": "fff6f6", "e15455": "273232", "65a943": "636a67", diff --git a/public/images/pokemon/variant/669-yellow.json b/public/images/pokemon/variant/669-yellow.json index 3ad52b61c15..ab2f958c46b 100644 --- a/public/images/pokemon/variant/669-yellow.json +++ b/public/images/pokemon/variant/669-yellow.json @@ -6,7 +6,6 @@ "595959": "6a532c", "f8f8f8": "fffde0", "bfbfbf": "ead295", - "101010": "101010", "686868": "6a532c", "fffbfb": "fff6f6", "e15455": "bf8f10", diff --git a/public/images/pokemon/variant/6705.json b/public/images/pokemon/variant/6705.json index 87efeef5278..75cbca989ed 100644 --- a/public/images/pokemon/variant/6705.json +++ b/public/images/pokemon/variant/6705.json @@ -6,15 +6,13 @@ "4d454d": "8a2166", "367456": "197497", "50ab89": "3aa8c4", - "101010": "101010", "60606c": "1f1233", "c5cce0": "513981", "aeb5c6": "442967", "949aab": "301848", "665980": "8b69c3", "b8a1e5": "c7a1e5", - "e3e8f4": "cfd6f7", - "8f7db3": "8f7db3" + "e3e8f4": "cfd6f7" }, "2": { "807380": "2b736f", @@ -23,7 +21,6 @@ "4d454d": "194f51", "367456": "a34205", "50ab89": "d27e26", - "101010": "101010", "60606c": "042329", "c5cce0": "176463", "aeb5c6": "0d484a", diff --git a/public/images/pokemon/variant/671-blue.json b/public/images/pokemon/variant/671-blue.json index cb538b357dc..3f60ceea3d1 100644 --- a/public/images/pokemon/variant/671-blue.json +++ b/public/images/pokemon/variant/671-blue.json @@ -6,15 +6,10 @@ "3d9ccc": "2938a3", "61c2f2": "3c54b8", "e5ffff": "69c9e3", - "101010": "101010", "1b594a": "aa1a58", "ffa64c": "ff3e3e", "2d806b": "dc5073", "3aa68b": "ff91a4", - "595959": "595959", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "262626": "262626", "fff6f6": "f8f8f8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/671-orange.json b/public/images/pokemon/variant/671-orange.json index 25ffaa4bec2..a7c9af94e41 100644 --- a/public/images/pokemon/variant/671-orange.json +++ b/public/images/pokemon/variant/671-orange.json @@ -6,15 +6,10 @@ "d98d41": "954c17", "ffb266": "cd8e31", "fff2e5": "ffbc77", - "101010": "101010", "1b594a": "aa1a58", "b36bb3": "fff35a", "2d806b": "dc5073", "3aa68b": "ff91a4", - "595959": "595959", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "262626": "262626", "fff6f6": "f8f8f8" }, "2": { @@ -24,7 +19,6 @@ "d98d41": "7f9f1f", "ffb266": "afcf4f", "fff2e5": "dfe3e1", - "101010": "101010", "1b594a": "800707", "b36bb3": "ffca98", "2d806b": "b1380f", @@ -32,7 +26,6 @@ "595959": "712b2b", "f8f8f8": "fff1df", "bfbfbf": "f1a695", - "262626": "262626", "fff6f6": "f9f9f9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/671-red.json b/public/images/pokemon/variant/671-red.json index a07f1bf5d25..23ca6c98f2b 100644 --- a/public/images/pokemon/variant/671-red.json +++ b/public/images/pokemon/variant/671-red.json @@ -6,15 +6,10 @@ "d94c4c": "95172c", "ff7373": "c64040", "ffb2cc": "ff90a2", - "101010": "101010", "1b594a": "aa1a58", "ffe14c": "ff7c39", "2d806b": "dc5073", "3aa68b": "ff91a4", - "595959": "595959", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "262626": "262626", "fff6f6": "f8f8f8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/671-white.json b/public/images/pokemon/variant/671-white.json index 1db360bee55..21344eab104 100644 --- a/public/images/pokemon/variant/671-white.json +++ b/public/images/pokemon/variant/671-white.json @@ -6,15 +6,10 @@ "d9d9d9": "3c3b47", "fefefe": "60616a", "ffbfca": "c2c1c6", - "101010": "101010", "1b594a": "aa1a58", "41d9d9": "ffffff", "2d806b": "dc5073", "3aa68b": "ff91a4", - "595959": "595959", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "262626": "262626", "fff6f6": "f8f8f8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/671-yellow.json b/public/images/pokemon/variant/671-yellow.json index f6e962d1f3f..dfbd260ec74 100644 --- a/public/images/pokemon/variant/671-yellow.json +++ b/public/images/pokemon/variant/671-yellow.json @@ -6,15 +6,10 @@ "d9cc41": "789c16", "fff266": "b0bf2b", "ffd2a6": "ffe593", - "101010": "101010", "1b594a": "aa1a58", "93b336": "5f30ff", "2d806b": "dc5073", "3aa68b": "ff91a4", - "595959": "595959", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "262626": "262626", "fff6f6": "f8f8f8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/6713.json b/public/images/pokemon/variant/6713.json index ce1113cb3f9..a23af6d279f 100644 --- a/public/images/pokemon/variant/6713.json +++ b/public/images/pokemon/variant/6713.json @@ -6,7 +6,6 @@ "6b5442": "732334", "335980": "994255", "fbffff": "ffebf2", - "101010": "101010", "492d25": "101010", "553e33": "4c131f", "927863": "994255", @@ -23,7 +22,6 @@ "6b5442": "2c7a75", "335980": "824628", "fbffff": "fff2ad", - "101010": "101010", "492d25": "00403d", "553e33": "006761", "927863": "5ba6a1", diff --git a/public/images/pokemon/variant/672.json b/public/images/pokemon/variant/672.json index 7ee3888e36d..8ed15346d6f 100644 --- a/public/images/pokemon/variant/672.json +++ b/public/images/pokemon/variant/672.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "737373": "9e2c3d", "404040": "73132e", "403830": "642509", diff --git a/public/images/pokemon/variant/673.json b/public/images/pokemon/variant/673.json index e6d03313a9f..313adada8a5 100644 --- a/public/images/pokemon/variant/673.json +++ b/public/images/pokemon/variant/673.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "404040": "73132e", "666666": "9e2c3d", "542914": "471405", @@ -16,7 +15,6 @@ "d6b778": "ce8648" }, "2": { - "101010": "101010", "404040": "161526", "666666": "2d2b40", "542914": "37224d", diff --git a/public/images/pokemon/variant/677.json b/public/images/pokemon/variant/677.json index 9708332f277..f26f7f73032 100644 --- a/public/images/pokemon/variant/677.json +++ b/public/images/pokemon/variant/677.json @@ -6,10 +6,8 @@ "8a8a99": "943b5d", "f8f8f8": "f1f0e4", "cca3cc": "43adaf", - "ffffff": "ffffff", "3f6273": "30237a", - "995c99": "29767f", - "101010": "101010" + "995c99": "29767f" }, "2": { "5c5c66": "243e41", @@ -18,9 +16,7 @@ "8a8a99": "426b62", "f8f8f8": "67415e", "cca3cc": "ff657d", - "ffffff": "ffffff", "3f6273": "69004e", - "995c99": "d13955", - "101010": "101010" + "995c99": "d13955" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/678-female.json b/public/images/pokemon/variant/678-female.json index 06f6eb9ca3b..ffd4c9a6cf3 100644 --- a/public/images/pokemon/variant/678-female.json +++ b/public/images/pokemon/variant/678-female.json @@ -5,10 +5,8 @@ "f8f8f8": "f8f5cd", "17294d": "47182e", "365fb3": "a5346b", - "101010": "101010", "264480": "76264d", "ffe54f": "3fbae2", - "ffffff": "ffffff", "d92121": "415493", "c9ad20": "4b86bd" }, @@ -18,10 +16,8 @@ "f8f8f8": "855577", "17294d": "1d3f33", "365fb3": "7bd38d", - "101010": "101010", "264480": "47946c", "ffe54f": "ff85ad", - "ffffff": "ffffff", "d92121": "9d0067", "c9ad20": "f2557b" } diff --git a/public/images/pokemon/variant/678.json b/public/images/pokemon/variant/678.json index a4ca1b86f3f..cf323c28b96 100644 --- a/public/images/pokemon/variant/678.json +++ b/public/images/pokemon/variant/678.json @@ -6,10 +6,8 @@ "17294d": "47182e", "365fb3": "a5346b", "264480": "76264d", - "101010": "101010", "7ff5f5": "74e8eb", "43c3a7": "1fa5bb", - "ffffff": "ffffff", "14864d": "415493" }, "2": { @@ -19,10 +17,8 @@ "17294d": "1d3f33", "365fb3": "7bd38d", "264480": "47946c", - "101010": "101010", "7ff5f5": "ff867c", "43c3a7": "df4272", - "ffffff": "ffffff", "14864d": "9a0066" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/690.json b/public/images/pokemon/variant/690.json index bc38775de62..77cd77e8069 100644 --- a/public/images/pokemon/variant/690.json +++ b/public/images/pokemon/variant/690.json @@ -4,7 +4,6 @@ "3f6273": "310511", "a6703a": "3e44a2", "a6e1ff": "792a48", - "101010": "101010", "7ec3e5": "6b1f42", "734d28": "22287b", "cc8f52": "6673c0", @@ -18,7 +17,6 @@ "3f6273": "340628", "a6703a": "2c5d64", "a6e1ff": "633060", - "101010": "101010", "7ec3e5": "481a42", "734d28": "123c47", "cc8f52": "37797c", diff --git a/public/images/pokemon/variant/691.json b/public/images/pokemon/variant/691.json index 91435005b4f..579dd697b58 100644 --- a/public/images/pokemon/variant/691.json +++ b/public/images/pokemon/variant/691.json @@ -1,7 +1,6 @@ { "1": { "4e4f26": "31246d", - "101010": "101010", "8b8c62": "403c94", "751e2a": "310511", "dc3d51": "5a152f", diff --git a/public/images/pokemon/variant/696.json b/public/images/pokemon/variant/696.json index 19a14cea4ea..2e5ebaa0a7b 100644 --- a/public/images/pokemon/variant/696.json +++ b/public/images/pokemon/variant/696.json @@ -1,53 +1,27 @@ { "1": { - "734517":"5e0b0b", - "ffa64c":"a50d0d", - "4a322c":"023425", - "404040":"4c3216", - "101010":"101010", - "65483a":"0b4c29", - "966858":"1b6430", - "f8f8f8":"dfdea7", - "8c8c8c":"ad8c63", - "bfbfbf":"cbbe8c", - "121212":"121212", - "bdbdbd":"cfc28f" + "734517": "5e0b0b", + "ffa64c": "a50d0d", + "4a322c": "023425", + "404040": "4c3216", + "65483a": "0b4c29", + "966858": "1b6430", + "f8f8f8": "dfdea7", + "8c8c8c": "ad8c63", + "bfbfbf": "cbbe8c", + "bdbdbd": "cfc28f" }, "2": { - "734517":"395cb7", - "ffa64c":"d2e9ff", - "4a322c":"3e1f18", - "404040":"250860", - "101010":"101010", - "65483a":"644943", - "966858":"83726e", - "f8f8f8":"6e46a7", - "8c8c8c":"411684", - "bfbfbf":"593097", - "121212":"decaff", - "bdbdbd":"79c8d3" + "734517": "395cb7", + "ffa64c": "d2e9ff", + "4a322c": "3e1f18", + "404040": "250860", + "65483a": "644943", + "966858": "83726e", + "f8f8f8": "6e46a7", + "8c8c8c": "411684", + "bfbfbf": "593097", + "121212": "decaff", + "bdbdbd": "79c8d3" } -} - - - - - - - - - - - - - - - - - - - - - - - +} \ No newline at end of file diff --git a/public/images/pokemon/variant/697.json b/public/images/pokemon/variant/697.json index 5932ca714e4..f0b1435d35d 100644 --- a/public/images/pokemon/variant/697.json +++ b/public/images/pokemon/variant/697.json @@ -1,39 +1,36 @@ { "1": { - "54434c":"4c3216", - "080808":"080808", - "fafafa":"dfdea7", - "964b1c":"5e0b0b", - "f19d5a":"b52424", - "bf7545":"971c1c", - "cccccc":"cbbe8c", - "50131e":"0b241e", - "963e4e":"285234", - "722533":"153626", - "32252c":"401f18", - "c9c9c9":"cfc28f", - "f7f7f7":"e0dfa8", - "9f9d98":"ad8c63", - "2f2329":"3e1e17", - "584650":"4a3115" + "54434c": "4c3216", + "fafafa": "dfdea7", + "964b1c": "5e0b0b", + "f19d5a": "b52424", + "bf7545": "971c1c", + "cccccc": "cbbe8c", + "50131e": "0b241e", + "963e4e": "285234", + "722533": "153626", + "32252c": "401f18", + "c9c9c9": "cfc28f", + "f7f7f7": "e0dfa8", + "9f9d98": "ad8c63", + "2f2329": "3e1e17", + "584650": "4a3115" }, "2": { - "54434c":"170c25", - "080808":"080808", - "fafafa":"4b2e64", - "964b1c":"9d5390", - "f19d5a":"f3daf5", - "bf7545":"cd7aca", - "cccccc":"33214f", - "50131e":"52352f", - "963e4e":"ab9b97", - "722533":"83726e", - "32252c":"0d0124", - "c9c9c9":"ce7ecc", - "f7f7f7":"f4dbf6", - "9f9d98":"26173b", - "2f2329":"c979c7", - "584650":"eed5f0" + "54434c": "170c25", + "fafafa": "4b2e64", + "964b1c": "9d5390", + "f19d5a": "f3daf5", + "bf7545": "cd7aca", + "cccccc": "33214f", + "50131e": "52352f", + "963e4e": "ab9b97", + "722533": "83726e", + "32252c": "0d0124", + "c9c9c9": "ce7ecc", + "f7f7f7": "f4dbf6", + "9f9d98": "26173b", + "2f2329": "c979c7", + "584650": "eed5f0" } -} - +} \ No newline at end of file diff --git a/public/images/pokemon/variant/698.json b/public/images/pokemon/variant/698.json index f4b95a1c7bf..2f7e4b2d4c7 100644 --- a/public/images/pokemon/variant/698.json +++ b/public/images/pokemon/variant/698.json @@ -5,11 +5,8 @@ "fff2b2": "9bffa9", "85b4cc": "cf755d", "a6e1ff": "efab87", - "cacaca": "cacaca", - "101010": "101010", "2eaeec": "4dc796", "1f75a0": "29988e", - "fdfdfd": "fdfdfd", "537180": "b04f4b", "217aa6": "7f99e1", "30b2f2": "b5dcff", @@ -22,11 +19,8 @@ "fff2b2": "eb88b9", "85b4cc": "654a8a", "a6e1ff": "936daa", - "cacaca": "cacaca", - "101010": "101010", "2eaeec": "ad4e6e", "1f75a0": "8d2656", - "fdfdfd": "fdfdfd", "537180": "392d65", "217aa6": "efaa51", "30b2f2": "ffd169", diff --git a/public/images/pokemon/variant/699.json b/public/images/pokemon/variant/699.json index 8aecfd2f2c2..aeae4cdce3c 100644 --- a/public/images/pokemon/variant/699.json +++ b/public/images/pokemon/variant/699.json @@ -10,10 +10,8 @@ "3689b3": "8487e1", "81a0dc": "e5756b", "ffffff": "ffeac0", - "f8f8f8": "f8f8f8", "4cc3ff": "c2d5ff", "657dac": "c44f5d", - "101010": "101010", "3d8eb6": "12545e", "53c5ff": "1c7376", "4b6f76": "b78460", @@ -31,10 +29,8 @@ "3689b3": "efbe63", "81a0dc": "3f648b", "ffffff": "bae8ff", - "f8f8f8": "f8f8f8", "4cc3ff": "ffea82", "657dac": "2f4978", - "101010": "101010", "3d8eb6": "852d6b", "53c5ff": "ab467e", "4b6f76": "1c183a", diff --git a/public/images/pokemon/variant/70.json b/public/images/pokemon/variant/70.json index a3c4f64f2c7..1b765e959ea 100644 --- a/public/images/pokemon/variant/70.json +++ b/public/images/pokemon/variant/70.json @@ -10,7 +10,6 @@ "d6c552": "ca4f59", "6bc552": "e59266", "fff7ad": "f9bfa6", - "ffffff": "ffffff", "b5424a": "5b284a", "ef9cad": "aa6172", "7b2929": "3d1138", @@ -27,7 +26,6 @@ "d6c552": "6aa6cd", "6bc552": "b0ccd7", "fff7ad": "bae7eb", - "ffffff": "ffffff", "b5424a": "18286f", "ef9cad": "4874b4", "7b2929": "0f1653", diff --git a/public/images/pokemon/variant/700.json b/public/images/pokemon/variant/700.json index dd61b5d1dc4..1aa7adcebd6 100644 --- a/public/images/pokemon/variant/700.json +++ b/public/images/pokemon/variant/700.json @@ -4,7 +4,6 @@ "235a99": "a63071", "fa8caa": "c7a6ee", "64c8f3": "e974db", - "101010": "101010", "528fcc": "d648b7", "d85a7a": "996cd2", "895c72": "5c6889", @@ -18,7 +17,6 @@ "235a99": "900d1b", "fa8caa": "7dec9d", "64c8f3": "ff9a68", - "101010": "101010", "528fcc": "dd3d4f", "d85a7a": "5dae7d", "895c72": "7f5c89", diff --git a/public/images/pokemon/variant/702.json b/public/images/pokemon/variant/702.json index 12feb29a0fd..adea0fb21eb 100644 --- a/public/images/pokemon/variant/702.json +++ b/public/images/pokemon/variant/702.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "262626": "2a3b5e", "4d4d4d": "6789b3", "bfbf86": "a3d1cc", @@ -10,12 +9,10 @@ "f2c261": "ffd3b6", "bf994c": "e49f84", "1d1d1d": "1a1c45", - "f8f8f8": "f8f8f8", "464646": "424b8f", "d97d21": "7cd6a1" }, "2": { - "101010": "101010", "262626": "072d38", "4d4d4d": "197870", "bfbf86": "aaa8d6", @@ -25,7 +22,6 @@ "f2c261": "5f3662", "bf994c": "432249", "1d1d1d": "02172d", - "f8f8f8": "f8f8f8", "464646": "17646c", "d97d21": "d2fff1" } diff --git a/public/images/pokemon/variant/703.json b/public/images/pokemon/variant/703.json index 46a8ec413b4..063a732a361 100644 --- a/public/images/pokemon/variant/703.json +++ b/public/images/pokemon/variant/703.json @@ -2,13 +2,11 @@ "1": { "6994bf": "e67c37", "474759": "292638", - "f8f8f8": "f8f8f8", "8cc6ff": "ffa633", "2e5073": "c35b2a", "8f8fb3": "4d496b", "adadd9": "68638e", "666680": "37344e", - "101010": "101010", "21abd9": "ff9b44", "595959": "e6ac60", "f2f2f2": "ffeed6", @@ -23,7 +21,6 @@ "8f8fb3": "e4cdf9", "adadd9": "faecff", "666680": "cca1db", - "101010": "101010", "21abd9": "de5f8e", "595959": "5a3d84", "f2f2f2": "a473bf", diff --git a/public/images/pokemon/variant/704.json b/public/images/pokemon/variant/704.json index 7c6e384891c..dfbcd3ecc58 100644 --- a/public/images/pokemon/variant/704.json +++ b/public/images/pokemon/variant/704.json @@ -4,7 +4,6 @@ "f2daf2": "fbb3d2", "bfacbf": "e56ca6", "4d454d": "8a2166", - "101010": "101010", "4d993d": "197497", "66cc52": "3aa8c4", "b8a1e5": "c7a1e5", @@ -16,7 +15,6 @@ "f2daf2": "92d8c8", "bfacbf": "63a99e", "4d454d": "134557", - "101010": "101010", "4d993d": "a34205", "66cc52": "d27e26", "b8a1e5": "4a9699", diff --git a/public/images/pokemon/variant/705.json b/public/images/pokemon/variant/705.json index 26e5d5527fd..165f951ed65 100644 --- a/public/images/pokemon/variant/705.json +++ b/public/images/pokemon/variant/705.json @@ -6,7 +6,6 @@ "4d454d": "8a2166", "307922": "aa6a00", "46b030": "ffd047", - "101010": "101010", "98bd51": "197497", "d2e79e": "3aa8c4", "647543": "0c5474", @@ -21,7 +20,6 @@ "4d454d": "194f51", "307922": "007d61", "46b030": "49ffbf", - "101010": "101010", "98bd51": "a34205", "d2e79e": "d27e26", "647543": "842401", diff --git a/public/images/pokemon/variant/706.json b/public/images/pokemon/variant/706.json index 5ede613c3cc..f369598d1b5 100644 --- a/public/images/pokemon/variant/706.json +++ b/public/images/pokemon/variant/706.json @@ -4,8 +4,6 @@ "807380": "8a2166", "bfacbf": "da75a5", "e6d4e7": "f1a4c5", - "f8f8f8": "f8f8f8", - "101010": "101010", "998a99": "b24c86", "307922": "0c5474", "46b030": "197497", @@ -21,8 +19,6 @@ "807380": "194f51", "bfacbf": "5db6a9", "e6d4e7": "9cead8", - "f8f8f8": "f8f8f8", - "101010": "101010", "998a99": "2b736f", "307922": "842401", "46b030": "a34205", diff --git a/public/images/pokemon/variant/708.json b/public/images/pokemon/variant/708.json index a92a69f34c1..e3d4958fccb 100644 --- a/public/images/pokemon/variant/708.json +++ b/public/images/pokemon/variant/708.json @@ -1,7 +1,6 @@ { "1": { "2b303c": "722023", - "101010": "101010", "494e5b": "a14743", "174d3b": "4d362e", "56372f": "36384f", @@ -13,7 +12,6 @@ }, "2": { "2b303c": "6f5f80", - "101010": "101010", "494e5b": "9c92a4", "174d3b": "a94079", "56372f": "31161d", diff --git a/public/images/pokemon/variant/709.json b/public/images/pokemon/variant/709.json index 21d5e210162..984c8b8da02 100644 --- a/public/images/pokemon/variant/709.json +++ b/public/images/pokemon/variant/709.json @@ -2,7 +2,6 @@ "1": { "2d241b": "17182f", "a37a4c": "575a6a", - "101010": "101010", "004321": "361f1b", "1ea762": "907f76", "007541": "4d362e", @@ -15,7 +14,6 @@ "2": { "2d241b": "47232b", "a37a4c": "7e5658", - "101010": "101010", "004321": "761d52", "1ea762": "da7ea8", "007541": "a94079", diff --git a/public/images/pokemon/variant/71.json b/public/images/pokemon/variant/71.json index 993b1749a04..a5b18472689 100644 --- a/public/images/pokemon/variant/71.json +++ b/public/images/pokemon/variant/71.json @@ -2,15 +2,12 @@ "1": { "4aa57b": "e28e58", "635229": "4f0537", - "000000": "000000", "10633a": "b0552e", "8cc57b": "f9be81", "a57b31": "781649", "841900": "50155e", "c55a21": "8d2f89", "ef8c52": "b352a5", - "ffffff": "ffffff", - "bdc5c5": "bdc5c5", "debd52": "983b3d", "efd66b": "b6514d", "f7ef94": "d37763" @@ -25,7 +22,6 @@ "841900": "1d198a", "c55a21": "2231a7", "ef8c52": "3250c7", - "ffffff": "ffffff", "bdc5c5": "b0c3c7", "debd52": "5966b0", "efd66b": "6880c2", diff --git a/public/images/pokemon/variant/710.json b/public/images/pokemon/variant/710.json index 599076fba4b..56ae838fe41 100644 --- a/public/images/pokemon/variant/710.json +++ b/public/images/pokemon/variant/710.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "332721": "213a22", "664e42": "72a966", "4d3b32": "478243", @@ -12,7 +11,6 @@ "b36859": "262626" }, "2": { - "101010": "101010", "332721": "0e2218", "664e42": "425947", "4d3b32": "2a4031", diff --git a/public/images/pokemon/variant/711.json b/public/images/pokemon/variant/711.json index aab77e6eebf..31420703595 100644 --- a/public/images/pokemon/variant/711.json +++ b/public/images/pokemon/variant/711.json @@ -5,7 +5,6 @@ "4c3a1b": "593a59", "894331": "171717", "bf634c": "262626", - "101010": "101010", "f49670": "404040", "ac733e": "aa7e43", "7b4425": "673b1b", @@ -21,7 +20,6 @@ "4c3a1b": "2c2c30", "894331": "153f18", "bf634c": "325b34", - "101010": "101010", "f49670": "4d7d4b", "ac733e": "baa78d", "7b4425": "5c4831", @@ -37,7 +35,6 @@ "4c3a1b": "ad3b33", "894331": "102316", "bf634c": "213c28", - "101010": "101010", "f49670": "36593d", "ac733e": "9b613a", "7b4425": "4a2618", diff --git a/public/images/pokemon/variant/712.json b/public/images/pokemon/variant/712.json index 9663215b117..98f5721bb80 100644 --- a/public/images/pokemon/variant/712.json +++ b/public/images/pokemon/variant/712.json @@ -5,14 +5,10 @@ "58647b": "bf566d", "719aa9": "d97389", "b3eaf8": "ffbfda", - "101010": "101010", "705c99": "732334", "f2ba49": "9dcc3e", "967acc": "994255", - "ffd98c": "cbe696", - "737373": "737373", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "ffd98c": "cbe696" }, "2": { "a5c4d2": "e69e2b", @@ -20,7 +16,6 @@ "58647b": "a8632a", "719aa9": "cc7b1e", "b3eaf8": "fcc95c", - "101010": "101010", "705c99": "006761", "f2ba49": "6cb3ae", "967acc": "2c7a75", diff --git a/public/images/pokemon/variant/713.json b/public/images/pokemon/variant/713.json index ca45360ecea..af98bddcc6d 100644 --- a/public/images/pokemon/variant/713.json +++ b/public/images/pokemon/variant/713.json @@ -7,12 +7,8 @@ "77b8d9": "d97389", "335980": "994255", "f2ffff": "ffebf2", - "101010": "101010", - "737373": "737373", - "bfbfbf": "bfbfbf", "efab34": "9dcc3e", - "ffe46a": "cbe696", - "f8f8f8": "f8f8f8" + "ffe46a": "cbe696" }, "2": { "608cba": "a8632a", @@ -22,8 +18,6 @@ "77b8d9": "cc7b1e", "335980": "824628", "f2ffff": "fff2ad", - "101010": "101010", - "737373": "737373", "bfbfbf": "6cb3ae", "efab34": "6cb3ae", "ffe46a": "b9f2ee", diff --git a/public/images/pokemon/variant/714.json b/public/images/pokemon/variant/714.json index d726bd0e87d..8c9cafc054d 100644 --- a/public/images/pokemon/variant/714.json +++ b/public/images/pokemon/variant/714.json @@ -2,28 +2,24 @@ "1": { "633674": "731338", "b459d5": "a42c54", - "101010": "101010", "85489b": "8e1d4b", "756175": "43167f", "a791a7": "7047ba", "d7bad7": "8d7be3", "3f3f3f": "202558", "ccb43d": "ff8a58", - "f8f8f8": "f8f8f8", "606060": "2f386b", "ffe14c": "ffc182" }, "2": { "633674": "5f151c", "b459d5": "c24430", - "101010": "101010", "85489b": "882c27", "756175": "945d56", "a791a7": "dfb6a8", "d7bad7": "f9e8dd", "3f3f3f": "5b1922", "ccb43d": "33d8d0", - "f8f8f8": "f8f8f8", "606060": "7c2928", "ffe14c": "49ffcd" } diff --git a/public/images/pokemon/variant/715.json b/public/images/pokemon/variant/715.json index e43af20a0de..83d43e5adf6 100644 --- a/public/images/pokemon/variant/715.json +++ b/public/images/pokemon/variant/715.json @@ -1,42 +1,38 @@ { - "1": { - "101010": "101010", - "2b2b2b": "43167f", - "343333": "563d8f", - "3b3b3b": "5f32b1", - "6a3f73": "0f103c", - "287366": "731338", - "575757": "7a5ccc", - "555454": "9166c8", - "801a1a": "5d173d", - "e52e2e": "903b78", - "ffe14c": "ff8a58", - "8e5499": "202558", - "bd70cc": "2f386b", - "3aa694": "a42c54", - "4cd9c1": "d04b6c", - "bfbfbf": "bb9adc", - "f8f8f8": "f8f8f8", - "f7f3f3": "d6c8f1" - }, - "2": { - "101010": "101010", - "2b2b2b": "5e3932", - "343333": "1d060c", - "3b3b3b": "c29484", - "6a3f73": "3b0c18", - "287366": "832714", - "575757": "ecd3c3", - "555454": "2f0d13", - "801a1a": "7c0907", - "e52e2e": "ad3419", - "ffe14c": "49ffcd", - "8e5499": "5b1922", - "bd70cc": "7c2928", - "3aa694": "b8552c", - "4cd9c1": "dd834c", - "bfbfbf": "43191e", - "f8f8f8": "f8f8f8", - "f7f3f3": "5a2a2b" - } + "1": { + "2b2b2b": "43167f", + "343333": "563d8f", + "3b3b3b": "5f32b1", + "6a3f73": "0f103c", + "287366": "731338", + "575757": "7a5ccc", + "555454": "9166c8", + "801a1a": "5d173d", + "e52e2e": "903b78", + "ffe14c": "ff8a58", + "8e5499": "202558", + "bd70cc": "2f386b", + "3aa694": "a42c54", + "4cd9c1": "d04b6c", + "bfbfbf": "bb9adc", + "f7f3f3": "d6c8f1" + }, + "2": { + "2b2b2b": "5e3932", + "343333": "1d060c", + "3b3b3b": "c29484", + "6a3f73": "3b0c18", + "287366": "832714", + "575757": "ecd3c3", + "555454": "2f0d13", + "801a1a": "7c0907", + "e52e2e": "ad3419", + "ffe14c": "49ffcd", + "8e5499": "5b1922", + "bd70cc": "7c2928", + "3aa694": "b8552c", + "4cd9c1": "dd834c", + "bfbfbf": "43191e", + "f7f3f3": "5a2a2b" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/716-active.json b/public/images/pokemon/variant/716-active.json index f56ac097702..fe5ff1c16b6 100644 --- a/public/images/pokemon/variant/716-active.json +++ b/public/images/pokemon/variant/716-active.json @@ -9,13 +9,11 @@ "f24949": "418fc9", "ffecb2": "f0c197", "547fe9": "b33ccd", - "101010": "101010", "f29d49": "51d6ad", "b857d9": "6c45da", "243659": "132b1b", "5c8ae5": "324c37", "3d5c99": "1e3824", - "fff9e6": "fff9e6", "262626": "518554", "404040": "7ca376" }, @@ -29,13 +27,11 @@ "f24949": "f65be1", "ffecb2": "553639", "547fe9": "d75343", - "101010": "101010", "f29d49": "8b67ff", "b857d9": "f7477f", "243659": "37134c", "5c8ae5": "884e9f", "3d5c99": "643071", - "fff9e6": "fff9e6", "262626": "d284b6", "404040": "faaed8" } diff --git a/public/images/pokemon/variant/716-neutral.json b/public/images/pokemon/variant/716-neutral.json index e6b5dab397b..7dd54065267 100644 --- a/public/images/pokemon/variant/716-neutral.json +++ b/public/images/pokemon/variant/716-neutral.json @@ -3,11 +3,9 @@ "364566": "603f3c", "84b4ce": "ac8781", "c0e0ec": "bfa19a", - "101010": "101010", "243659": "132b1b", "5c8ae5": "324c37", "3d5c99": "1e3824", - "fff9e6": "fff9e6", "2b2a2e": "518554", "404040": "7ca376" }, @@ -15,11 +13,9 @@ "364566": "230d1e", "84b4ce": "42283b", "c0e0ec": "613e56", - "101010": "101010", "243659": "37134c", "5c8ae5": "884e9f", "3d5c99": "643071", - "fff9e6": "fff9e6", "2b2a2e": "d285a7", "404040": "f6badb" } diff --git a/public/images/pokemon/variant/717.json b/public/images/pokemon/variant/717.json index 29b3fc77fb3..f809d0abdc1 100644 --- a/public/images/pokemon/variant/717.json +++ b/public/images/pokemon/variant/717.json @@ -3,7 +3,6 @@ "1a1b1e": "0f0b2c", "586369": "323b6b", "3c4247": "1d2250", - "010101": "010101", "282d31": "12133a", "6d6969": "c1ac9a", "a49897": "dbd4cd", @@ -13,14 +12,12 @@ "c43647": "8235a4", "ec4434": "9642b1", "5b1a2b": "3a0e5b", - "43c8cf": "57b3ff", - "fbfbfb": "fbfbfb" + "43c8cf": "57b3ff" }, "2": { "1a1b1e": "234596", "586369": "94cbf9", "3c4247": "5f9ee4", - "010101": "010101", "282d31": "356cbc", "6d6969": "bfb0f4", "a49897": "ded9ff", @@ -30,7 +27,6 @@ "c43647": "1a1c77", "ec4434": "222a90", "5b1a2b": "0e0742", - "43c8cf": "ff1519", - "fbfbfb": "fbfbfb" + "43c8cf": "ff1519" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/720-unbound.json b/public/images/pokemon/variant/720-unbound.json index 8fc7ab07db3..70acd449dba 100644 --- a/public/images/pokemon/variant/720-unbound.json +++ b/public/images/pokemon/variant/720-unbound.json @@ -3,7 +3,6 @@ "582840": "701507", "cf4f8f": "cb5e23", "9f3f6f": "902c0d", - "101010": "101010", "446475": "513b29", "302c2c": "3e162b", "afcfdf": "c6bba8", @@ -12,14 +11,12 @@ "6b8b98": "725f4d", "7f5f1f": "414a79", "ffdf3f": "becef5", - "bf9f3f": "9ca7d5", - "fefefe": "fefefe" + "bf9f3f": "9ca7d5" }, "1": { "582840": "280d46", "cf4f8f": "753f9b", "9f3f6f": "471c6b", - "101010": "101010", "446475": "4d244e", "302c2c": "632373", "afcfdf": "c3aabe", @@ -28,14 +25,12 @@ "6b8b98": "72496e", "7f5f1f": "853015", "ffdf3f": "ffc26a", - "bf9f3f": "e2885a", - "fefefe": "fefefe" + "bf9f3f": "e2885a" }, "2": { "582840": "150933", "cf4f8f": "35387c", "9f3f6f": "1d1a4b", - "101010": "101010", "446475": "1a3f35", "302c2c": "1c2433", "afcfdf": "a1c4c3", @@ -44,7 +39,6 @@ "6b8b98": "345a54", "7f5f1f": "682b16", "ffdf3f": "ed9b42", - "bf9f3f": "b05d2d", - "fefefe": "fefefe" + "bf9f3f": "b05d2d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/720.json b/public/images/pokemon/variant/720.json index e2d1409fbe3..b2cb8e2105d 100644 --- a/public/images/pokemon/variant/720.json +++ b/public/images/pokemon/variant/720.json @@ -5,7 +5,6 @@ "cc5c81": "902c0d", "676773": "3e162b", "8a8a99": "684252", - "101010": "101010", "dadaf2": "ffdb73", "807126": "414a79", "b8b8cc": "cc923c", @@ -22,7 +21,6 @@ "cc5c81": "471c6b", "676773": "632373", "8a8a99": "a947b4", - "101010": "101010", "dadaf2": "f7bae9", "807126": "853015", "b8b8cc": "ca79bd", @@ -39,7 +37,6 @@ "cc5c81": "1d1a4b", "676773": "1c2433", "8a8a99": "304757", - "101010": "101010", "dadaf2": "d5cce5", "807126": "682b16", "b8b8cc": "9e8fbb", diff --git a/public/images/pokemon/variant/728.json b/public/images/pokemon/variant/728.json index fb17e2c119e..cd73143937a 100644 --- a/public/images/pokemon/variant/728.json +++ b/public/images/pokemon/variant/728.json @@ -7,8 +7,6 @@ "436cbf": "009469", "b3627d": "e54c41", "6c90d9": "14af82", - "101010": "101010", - "808080": "808080", "bfbfbf": "c2beb4", "314f8c": "006355", "639ba6": "858d7d", @@ -24,8 +22,6 @@ "436cbf": "a6213f", "b3627d": "a7225c", "6c90d9": "be294a", - "101010": "101010", - "808080": "808080", "bfbfbf": "bfb4b9", "314f8c": "770f29", "639ba6": "b88389", diff --git a/public/images/pokemon/variant/729.json b/public/images/pokemon/variant/729.json index 491f0e1447d..fbf9b930c18 100644 --- a/public/images/pokemon/variant/729.json +++ b/public/images/pokemon/variant/729.json @@ -1,34 +1,28 @@ { "1": { - "808080": "808080", "f8f8f8": "fff6e2", "bfbfbf": "c2beb4", "476d72": "be665d", "8dafaf": "ff989e", - "101010": "101010", "326187": "006b65", "2d8ec4": "009a88", "bad8d8": "ffbd98", "1eb9ee": "0ccfa2", "733f50": "bb402f", "e57ea1": "ff9384", - "2d2e31": "2d2e31", "b3627d": "fb6051" }, "2": { - "808080": "808080", "f8f8f8": "f5edee", "bfbfbf": "bfb4b9", "476d72": "793f5e", "8dafaf": "b681a6", - "101010": "101010", "326187": "5a141b", "2d8ec4": "952c3f", "bad8d8": "deabce", "1eb9ee": "c6496f", "733f50": "620a33", "e57ea1": "dd3780", - "2d2e31": "2d2e31", "b3627d": "a7225c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/730.json b/public/images/pokemon/variant/730.json index eec815b0572..9ac00923a7a 100644 --- a/public/images/pokemon/variant/730.json +++ b/public/images/pokemon/variant/730.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "8d3f4a": "a62c20", "c76374": "e54c41", "0e6792": "b54f5f", @@ -18,11 +17,9 @@ "c0bdc1": "beaac0", "aac7e6": "ea7c5b", "f8f8f8": "fff2d4", - "faf8f8": "f1e8f1", - "fef8f8": "fef8f8" + "faf8f8": "f1e8f1" }, "2": { - "101010": "101010", "8d3f4a": "1d1638", "c76374": "391e62", "0e6792": "500518", @@ -40,7 +37,6 @@ "c0bdc1": "c0b4a5", "aac7e6": "e9a5c0", "f8f8f8": "f5edee", - "faf8f8": "f5f3e3", - "fef8f8": "fef8f8" + "faf8f8": "f5f3e3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/734.json b/public/images/pokemon/variant/734.json index e85de98e300..f4048ea2099 100644 --- a/public/images/pokemon/variant/734.json +++ b/public/images/pokemon/variant/734.json @@ -7,11 +7,6 @@ "9c5b50": "2a3f52", "ba836d": "35576b", "ea8c96": "c1715c", - "080808": "080808", - "f8f8f8": "f8f8f8", - "686d77": "686d77", - "433f3a": "433f3a", - "a5a8af": "a5a8af", "413d38": "523716" }, "2": { @@ -22,8 +17,6 @@ "9c5b50": "786a66", "ba836d": "a69c98", "ea8c96": "a38b89", - "080808": "080808", - "f8f8f8": "f8f8f8", "686d77": "6c6c6c", "433f3a": "3f3f3f", "a5a8af": "a7a7a7", diff --git a/public/images/pokemon/variant/735.json b/public/images/pokemon/variant/735.json index 7e6e6e65449..dc4575ce8c8 100644 --- a/public/images/pokemon/variant/735.json +++ b/public/images/pokemon/variant/735.json @@ -5,13 +5,9 @@ "8d473d": "2a3252", "602c24": "03102d", "af754e": "354c6b", - "101010": "101010", "b6973a": "7a6a6d", "393633": "5f3d1c", - "f8f8f8": "f8f8f8", - "787885": "787885", "ea6f91": "c1715c", - "a3a3ab": "a3a3ab", "2d2b28": "5a3215" }, "2": { @@ -20,10 +16,7 @@ "8d473d": "90827e", "602c24": "524b4b", "af754e": "ada5a4", - "101010": "101010", "b6973a": "362e2e", - "393633": "393633", - "f8f8f8": "f8f8f8", "787885": "6e6e7b", "ea6f91": "846a68", "a3a3ab": "989898", diff --git a/public/images/pokemon/variant/747.json b/public/images/pokemon/variant/747.json index 8c4b94e9149..f765e3a51f8 100644 --- a/public/images/pokemon/variant/747.json +++ b/public/images/pokemon/variant/747.json @@ -6,12 +6,10 @@ "ba8dbe": "edd5ca", "daac23": "aca5f3", "9265a3": "d29784", - "101010": "101010", "335780": "490a26", "6098b7": "b24b34", "dcafd6": "a21f90", - "9fd9d6": "e07b53", - "fdfdfd": "fdfdfd" + "9fd9d6": "e07b53" }, "2": { "be7c34": "9f4354", @@ -20,11 +18,9 @@ "ba8dbe": "2b6157", "daac23": "efa2ad", "9265a3": "1c524b", - "101010": "101010", "335780": "186443", "6098b7": "359d5d", "dcafd6": "ff3f5a", - "9fd9d6": "5bd97f", - "fdfdfd": "fdfdfd" + "9fd9d6": "5bd97f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/748.json b/public/images/pokemon/variant/748.json index 280c676293a..5ffc26903ab 100644 --- a/public/images/pokemon/variant/748.json +++ b/public/images/pokemon/variant/748.json @@ -1,7 +1,6 @@ { "1": { "943732": "490a3c", - "101010": "101010", "f28c4f": "a21f90", "e25025": "91138c", "6f97c4": "be583d", @@ -9,7 +8,6 @@ "93d1d7": "df7b52", "711a6a": "81463e", "d76fa5": "edd5ca", - "171539": "171539", "3a3f6d": "462952", "525898": "6c3776", "b7429a": "d29784", @@ -18,7 +16,6 @@ }, "2": { "943732": "c30e49", - "101010": "101010", "f28c4f": "ff3f5a", "e25025": "e12350", "6f97c4": "359d5d", diff --git a/public/images/pokemon/variant/752.json b/public/images/pokemon/variant/752.json index 448e2c5dbf5..551478e1bd9 100644 --- a/public/images/pokemon/variant/752.json +++ b/public/images/pokemon/variant/752.json @@ -3,8 +3,6 @@ "426b84": "7c3b51", "b7d7e6": "ffc8d1", "81afc9": "d187a0", - "fdfdfd": "fdfdfd", - "101010": "101010", "69670e": "3a112f", "9bad34": "4e1f42", "cedf42": "673252", @@ -21,7 +19,6 @@ "b7d7e6": "dce7ee", "81afc9": "a7a2bc", "fdfdfd": "f3fbff", - "101010": "101010", "69670e": "263756", "9bad34": "4980ac", "cedf42": "72add9", diff --git a/public/images/pokemon/variant/753.json b/public/images/pokemon/variant/753.json index 78eaa04fb78..d6ffc97c2da 100644 --- a/public/images/pokemon/variant/753.json +++ b/public/images/pokemon/variant/753.json @@ -3,7 +3,6 @@ "234028": "2e1643", "468050": "3e2253", "5ba668": "4e2c62", - "101010": "101010", "315945": "0e2616", "69bf94": "27452c", "549977": "1b3822", @@ -19,7 +18,6 @@ "234028": "812255", "468050": "ad3a87", "5ba668": "ce54b0", - "101010": "101010", "315945": "441342", "69bf94": "6e3472", "549977": "5a215a", diff --git a/public/images/pokemon/variant/754.json b/public/images/pokemon/variant/754.json index c8fcf792f01..07ba33a140a 100644 --- a/public/images/pokemon/variant/754.json +++ b/public/images/pokemon/variant/754.json @@ -6,7 +6,6 @@ "315945": "122a1a", "d98d9a": "c95623", "69bf94": "314e36", - "101010": "101010", "cc5266": "ac351f", "404040": "3c1717", "bfbfbf": "c9d6b7", @@ -20,7 +19,6 @@ "315945": "c940c4", "d98d9a": "2944a2", "69bf94": "f881ff", - "101010": "101010", "cc5266": "343381", "404040": "0c0a3f", "bfbfbf": "feccff", diff --git a/public/images/pokemon/variant/755.json b/public/images/pokemon/variant/755.json index 19c8b36ac41..05d00a042a9 100644 --- a/public/images/pokemon/variant/755.json +++ b/public/images/pokemon/variant/755.json @@ -3,7 +3,6 @@ "7a3f7a": "451233", "f1b6c8": "e76d5b", "e07c8d": "d64742", - "101010": "101010", "b591c4": "803a5c", "9d70b1": "5c2445", "6f80a8": "8c3338", @@ -18,7 +17,6 @@ "7a3f7a": "1d225e", "f1b6c8": "b0ffe1", "e07c8d": "7ae7c9", - "101010": "101010", "b591c4": "3a4b75", "9d70b1": "2c336b", "6f80a8": "179b8f", diff --git a/public/images/pokemon/variant/756.json b/public/images/pokemon/variant/756.json index 22e94d25718..e04f4c7b624 100644 --- a/public/images/pokemon/variant/756.json +++ b/public/images/pokemon/variant/756.json @@ -4,7 +4,6 @@ "b591c4": "e76d5b", "97b371": "866eaf", "cbd59f": "e5aff3", - "101010": "101010", "9867ad": "d64742", "764b67": "451233", "d08aab": "4e1f3b", diff --git a/public/images/pokemon/variant/761.json b/public/images/pokemon/variant/761.json index 2760b472e6a..48e6f8960df 100644 --- a/public/images/pokemon/variant/761.json +++ b/public/images/pokemon/variant/761.json @@ -3,20 +3,15 @@ "476629": "215e59", "6b993d": "398793", "8fcc52": "70d2e1", - "101010": "101010", "80334d": "251936", "b3476b": "7e5cdb", "e55c8a": "9f86e4", - "f8f8f8": "f8f8f8", - "ffe14c": "7e5cdb", - "737373": "737373", - "bfbfbf": "bfbfbf" + "ffe14c": "7e5cdb" }, "2": { "476629": "3e0a11", "6b993d": "5a0a16", "8fcc52": "86232e", - "101010": "101010", "80334d": "0f0f0f", "b3476b": "254536", "e55c8a": "2c574a", diff --git a/public/images/pokemon/variant/762.json b/public/images/pokemon/variant/762.json index a5662084e60..5eeac0d1de3 100644 --- a/public/images/pokemon/variant/762.json +++ b/public/images/pokemon/variant/762.json @@ -1,15 +1,10 @@ { "1": { "446328": "215e59", - "0f0f0f": "0f0f0f", "96c853": "70d2e1", "659344": "398793", "ebe130": "e66556", - "c7b8c4": "c7b8c4", - "72585f": "72585f", "ce466b": "a787ff", - "fdfdfd": "fdfdfd", - "fcfcfc": "fcfcfc", "962354": "45366e", "f26284": "7e5cdb", "6a1533": "251936", @@ -17,7 +12,6 @@ }, "2": { "446328": "3e0a11", - "0f0f0f": "0f0f0f", "96c853": "86232e", "659344": "5a0a16", "ebe130": "5c0505", @@ -25,7 +19,6 @@ "72585f": "574348", "ce466b": "124e3c", "fdfdfd": "e4c59e", - "fcfcfc": "fcfcfc", "962354": "162d25", "f26284": "2c574a", "6a1533": "0f0f0f", diff --git a/public/images/pokemon/variant/763.json b/public/images/pokemon/variant/763.json index e7d4566e507..501801f888d 100644 --- a/public/images/pokemon/variant/763.json +++ b/public/images/pokemon/variant/763.json @@ -9,12 +9,7 @@ "c5ae14": "af3e31", "96c853": "70d2e1", "659344": "398793", - "0f0f0f": "0f0f0f", - "fdfdfd": "fdfdfd", - "c7b8c4": "c7b8c4", - "ce466b": "7e5cdb", - "fcfcfc": "fcfcfc", - "72585f": "72585f" + "ce466b": "7e5cdb" }, "2": { "6a1533": "000000", @@ -26,11 +21,8 @@ "c5ae14": "391717", "96c853": "86232e", "659344": "5a0a16", - "0f0f0f": "0f0f0f", "fdfdfd": "e4c59e", "c7b8c4": "af8260", - "ce466b": "124e3c", - "fcfcfc": "fcfcfc", - "72585f": "72585f" + "ce466b": "124e3c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/767.json b/public/images/pokemon/variant/767.json index 5ece1ca679f..84114ed68e0 100644 --- a/public/images/pokemon/variant/767.json +++ b/public/images/pokemon/variant/767.json @@ -3,26 +3,22 @@ "46334f": "844008", "a65e97": "e8a92a", "713e70": "c86910", - "080808": "080808", "3f5252": "202733", "bed3cf": "6e6d6d", "5c7877": "293141", "867b73": "ecd42a", "8a9f9e": "494950", - "ede650": "7798b8", - "f7f7f7": "f7f7f7" + "ede650": "7798b8" }, "2": { "46334f": "091b52", "a65e97": "2849ac", "713e70": "1c306d", - "080808": "080808", "3f5252": "3d105f", "bed3cf": "844caf", "5c7877": "5722a6", "867b73": "8cdded", "8a9f9e": "452772", - "ede650": "d3f4fb", - "f7f7f7": "f7f7f7" + "ede650": "d3f4fb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/768.json b/public/images/pokemon/variant/768.json index 1b150c04b37..d617f494ce7 100644 --- a/public/images/pokemon/variant/768.json +++ b/public/images/pokemon/variant/768.json @@ -2,7 +2,6 @@ "1": { "546b57": "202733", "c8e1cd": "6e6d6d", - "101010": "101010", "81b68e": "494950", "498f6c": "e7cd19", "842886": "c85710", @@ -17,16 +16,12 @@ "2": { "546b57": "091b52", "c8e1cd": "2849ac", - "101010": "101010", "81b68e": "1c306d", "498f6c": "dfb6f3", "842886": "5722a6", "cc5fcf": "8b51e1", "9a6982": "452772", - "5c635e": "5c635e", "bd95a8": "844caf", - "7a4952": "3d105f", - "2f3330": "2f3330", - "404843": "404843" + "7a4952": "3d105f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/77.json b/public/images/pokemon/variant/77.json index e988ee2ef1b..7f2515b589d 100644 --- a/public/images/pokemon/variant/77.json +++ b/public/images/pokemon/variant/77.json @@ -7,10 +7,8 @@ "8c5231": "65597f", "733131": "2b2333", "ffefce": "ffffff", - "000000": "000000", "e6ce8c": "cecee5", "c59c6b": "948eb2", - "ffffff": "ffffff", "424a84": "191933", "737ba5": "312c49", "c5c5d6": "514766" @@ -23,10 +21,8 @@ "8c5231": "090b16", "733131": "03060c", "ffefce": "514766", - "000000": "000000", "e6ce8c": "312c49", "c59c6b": "191933", - "ffffff": "ffffff", "424a84": "59497a", "737ba5": "857cb2", "c5c5d6": "b5b5e2" diff --git a/public/images/pokemon/variant/771.json b/public/images/pokemon/variant/771.json index 6540f79d3dd..d80e7770f62 100644 --- a/public/images/pokemon/variant/771.json +++ b/public/images/pokemon/variant/771.json @@ -3,26 +3,22 @@ "73223d": "570a00", "992e52": "c95340", "d94174": "de884b", - "101010": "101010", "404040": "731b33", "737373": "b5284a", "262626": "4a1a30", "595959": "bd5e49", "f8f8f8": "dec890", - "1a1a1a": "1a1a1a", "bfbfbf": "e07f47" }, "2": { "73223d": "b94114", "992e52": "db7b43", "d94174": "ead059", - "101010": "101010", "404040": "dacece", "737373": "f5ede4", "262626": "b8a197", "595959": "1c1c2d", "f8f8f8": "4d4d65", - "1a1a1a": "1a1a1a", "bfbfbf": "383850" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/772.json b/public/images/pokemon/variant/772.json index 38afba110bf..1097be00976 100644 --- a/public/images/pokemon/variant/772.json +++ b/public/images/pokemon/variant/772.json @@ -4,7 +4,6 @@ "92a6a9": "889db1", "642515": "7e4f36", "6b777e": "526085", - "080808": "080808", "c55e3a": "eed8a1", "934031": "c8976c", "c0cecf": "bdc4e5", @@ -27,7 +26,6 @@ "92a6a9": "65657c", "642515": "444961", "6b777e": "3b3b51", - "080808": "080808", "c55e3a": "c1cfd8", "934031": "7f94b1", "c0cecf": "dbd8e8", diff --git a/public/images/pokemon/variant/773.json b/public/images/pokemon/variant/773.json index b64796b9bf9..15805bf76ec 100644 --- a/public/images/pokemon/variant/773.json +++ b/public/images/pokemon/variant/773.json @@ -9,7 +9,6 @@ "e3e6ec": "bdd1e5", "3f3b50": "1e172a", "aba7bc": "493d55", - "080808": "080808", "e64f5e": "f1944a", "483c39": "3a2d53", "79615e": "504a75", @@ -17,7 +16,6 @@ "e9eaf8": "e7ebed", "0073bf": "7a4949", "5399df": "b59489", - "fffef5": "fffef5", "251845": "753c32", "9618e0": "dc9c4d", "125d4b": "ce7f3f", @@ -31,9 +29,7 @@ "565969": "0f0f1b", "bcbbc5": "242433", "e3e6ec": "444455", - "3f3b50": "3f3b50", "aba7bc": "dbd8e8", - "080808": "080808", "e64f5e": "98ce58", "483c39": "778894", "79615e": "d6d4d4", @@ -41,7 +37,6 @@ "e9eaf8": "eef4f8", "0073bf": "6a6c75", "5399df": "92949e", - "fffef5": "fffef5", "251845": "425735", "9618e0": "ade265", "125d4b": "686981", diff --git a/public/images/pokemon/variant/776.json b/public/images/pokemon/variant/776.json index 295f413292e..7847d29e15f 100644 --- a/public/images/pokemon/variant/776.json +++ b/public/images/pokemon/variant/776.json @@ -1,7 +1,6 @@ { "1": { "281715": "39221d", - "080808": "080808", "71171a": "2c0f2d", "6b473c": "f4eba2", "e74545": "4f3d66", @@ -12,12 +11,10 @@ "ccccad": "b4b8c8", "969678": "887c97", "3c2b24": "d5966f", - "fdfdfd": "fdfdfd", "9b6500": "276da5" }, "2": { "281715": "0a413b", - "080808": "080808", "71171a": "be8a7a", "6b473c": "caee67", "e74545": "faeecd", @@ -28,7 +25,6 @@ "ccccad": "adc4e9", "969678": "7983c1", "3c2b24": "61b551", - "fdfdfd": "fdfdfd", "9b6500": "341a3c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/777.json b/public/images/pokemon/variant/777.json index f434d0446ea..549b0f6ba5c 100644 --- a/public/images/pokemon/variant/777.json +++ b/public/images/pokemon/variant/777.json @@ -1,21 +1,17 @@ { "1": { - "101010": "101010", "ffea80": "dec2f0", "ccb852": "ac8fbb", "4d4d4d": "362952", "b3b3b3": "8e71cd", "808080": "645393", "595959": "444147", - "f8f8f8": "f8f8f8", "8c8c8c": "99979b", - "fbfbfb": "fbfbfb", "bfbfbf": "d0dadb", "977d63": "d263b0", "73593f": "ae428a" }, "2": { - "101010": "101010", "ffea80": "d65d3c", "ccb852": "7b3c26", "4d4d4d": "294127", @@ -24,7 +20,6 @@ "595959": "342a20", "f8f8f8": "e5b38c", "8c8c8c": "634c41", - "fbfbfb": "fbfbfb", "bfbfbf": "b27f64", "977d63": "724b39", "73593f": "47240f" diff --git a/public/images/pokemon/variant/778-disguised.json b/public/images/pokemon/variant/778-disguised.json index 3fb6d0c98c2..3b8eca6ee7f 100644 --- a/public/images/pokemon/variant/778-disguised.json +++ b/public/images/pokemon/variant/778-disguised.json @@ -31,4 +31,4 @@ "805933": "6d80a4", "3c3838": "ff766e" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/779.json b/public/images/pokemon/variant/779.json index a550ffadda3..687adbe3000 100644 --- a/public/images/pokemon/variant/779.json +++ b/public/images/pokemon/variant/779.json @@ -3,7 +3,6 @@ "58295f": "a52121", "834589": "c62c2c", "b75eb7": "f65656", - "101010": "101010", "de5c8a": "602b7a", "97354e": "2e0c3f", "ef87b5": "84539d", @@ -11,15 +10,12 @@ "93d3e1": "caefff", "5e9fc4": "94c5da", "cfae3f": "d65e5e", - "efe85f": "faa28c", - "fdfdfd": "fdfdfd", - "969696": "969696" + "efe85f": "faa28c" }, "2": { "58295f": "4545c4", "834589": "6666e2", "b75eb7": "8585ff", - "101010": "101010", "de5c8a": "dca032", "97354e": "935b3b", "ef87b5": "ffd166", @@ -27,8 +23,6 @@ "93d3e1": "eeeeff", "5e9fc4": "afafe1", "cfae3f": "2d2c43", - "efe85f": "454457", - "fdfdfd": "fdfdfd", - "969696": "969696" + "efe85f": "454457" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/78.json b/public/images/pokemon/variant/78.json index 610f15ed2df..80e167ed347 100644 --- a/public/images/pokemon/variant/78.json +++ b/public/images/pokemon/variant/78.json @@ -9,9 +9,7 @@ "de1010": "995b3d", "c5946b": "948eb2", "efc58c": "cecee5", - "000000": "000000", "c5c5c5": "514766", - "ffffff": "ffffff", "424a52": "191933", "737b84": "312c49" }, @@ -25,9 +23,7 @@ "de1010": "660011", "c5946b": "191933", "efc58c": "312c49", - "000000": "000000", "c5c5c5": "b5b5e2", - "ffffff": "ffffff", "424a52": "59497a", "737b84": "857cb2" } diff --git a/public/images/pokemon/variant/789.json b/public/images/pokemon/variant/789.json index 79e0e78b047..6ae3e541843 100644 --- a/public/images/pokemon/variant/789.json +++ b/public/images/pokemon/variant/789.json @@ -3,16 +3,8 @@ "4e5cc7": "6a12dc", "169fda": "9255f2", "34eef8": "db34f8", - "fdfdfd": "fdfdfd", "422d66": "490f2c", - "101010": "101010", "503896": "64173e", - "9d5f00": "9d5f00", - "f8f229": "f8f229", - "283937": "283937", - "ba953e": "ba953e", - "1484de": "1484de", - "34c3fa": "34c3fa", "8c49a9": "dc48a7", "e2629f": "f77247" }, @@ -20,9 +12,7 @@ "4e5cc7": "f6a42d", "169fda": "ffdf49", "34eef8": "fff695", - "fdfdfd": "fdfdfd", "422d66": "830000", - "101010": "101010", "503896": "eb5b2a", "9d5f00": "6a738f", "f8f229": "e5efff", @@ -37,9 +27,7 @@ "4e5cc7": "3dc7e0", "169fda": "71ffd8", "34eef8": "c9ffe2", - "fdfdfd": "fdfdfd", "422d66": "030038", - "101010": "101010", "503896": "007ecc", "9d5f00": "61061f", "f8f229": "c22741", diff --git a/public/images/pokemon/variant/79.json b/public/images/pokemon/variant/79.json index 7c9fa7a0ba8..e737328a200 100644 --- a/public/images/pokemon/variant/79.json +++ b/public/images/pokemon/variant/79.json @@ -1,9 +1,5 @@ { "0": { - "6b6363": "6b6363", - "101010": "101010", - "d6cece": "d6cece", - "ffffff": "ffffff", "ffa5a5": "cebdff", "de637b": "846bbd", "ff8494": "ad94ff", @@ -11,14 +7,9 @@ "7b2131": "52397b", "dea563": "deb55a", "8c5a19": "8c6b10", - "efc58c": "efc58c", "ffe6b5": "fff7b5" }, "1": { - "6b6363": "6b6363", - "101010": "101010", - "d6cece": "d6cece", - "ffffff": "ffffff", "ffa5a5": "ad7459", "de637b": "5b3332", "ff8494": "885345", @@ -30,10 +21,6 @@ "ffe6b5": "e0b69d" }, "2": { - "6b6363": "6b6363", - "101010": "101010", - "d6cece": "d6cece", - "ffffff": "ffffff", "ffa5a5": "ffeb9b", "de637b": "dd8f47", "ff8494": "eebd6a", diff --git a/public/images/pokemon/variant/790.json b/public/images/pokemon/variant/790.json index cbc8fda0072..6b3d3f079da 100644 --- a/public/images/pokemon/variant/790.json +++ b/public/images/pokemon/variant/790.json @@ -1,22 +1,16 @@ { "1": { - "101010": "101010", "8a5911": "545d9e", "c87522": "7b89c4", "faf54e": "e5efff", "e8a61e": "aebde2", - "fdfdfd": "fdfdfd", "1d3e89": "a20b02", "169fda": "ffdf49", "764394": "ff4079", "2c5fab": "eb5b2a", - "1e232b": "1e232b", - "17a6e3": "17a6e3", - "1f4294": "1f4294", "e2629f": "f6a42d" }, "2": { - "101010": "101010", "8a5911": "730627", "c87522": "890425", "faf54e": "d4314c", @@ -26,9 +20,6 @@ "169fda": "71ffd8", "764394": "7e13bf", "2c5fab": "3dc7e0", - "1e232b": "1e232b", - "17a6e3": "17a6e3", - "1f4294": "1f4294", "e2629f": "3dc7e0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/791-radiant-sun.json b/public/images/pokemon/variant/791-radiant-sun.json index dd95b0e1a09..675c9dfd17b 100644 --- a/public/images/pokemon/variant/791-radiant-sun.json +++ b/public/images/pokemon/variant/791-radiant-sun.json @@ -2,27 +2,23 @@ "1": { "aa8735": "c72453", "f9f190": "ff7899", - "151515": "151515", "dcb75f": "f35785", "c2c7c6": "da6e40", "52525a": "062139", "f8f8f8": "ffcf88", "1d2787": "810300", "5aacec": "4ba4ff", - "fefefe": "fefefe", "868e8d": "a5381c" }, "2": { "aa8735": "730627", "f9f190": "c22741", - "151515": "151515", "dcb75f": "890425", "c2c7c6": "322e6c", "52525a": "062139", "f8f8f8": "584193", "1d2787": "1a224a", "5aacec": "f3633f", - "fefefe": "fefefe", "868e8d": "0b1f45" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/791.json b/public/images/pokemon/variant/791.json index cc5d499152d..18b4742babd 100644 --- a/public/images/pokemon/variant/791.json +++ b/public/images/pokemon/variant/791.json @@ -1,7 +1,6 @@ { "1": { "91510b": "7a80ab", - "080808": "080808", "efe85a": "edf4ff", "ab1605": "b51140", "52525a": "4c0200", @@ -13,12 +12,10 @@ "5c5c65": "b72011", "868e8d": "a5381c", "0900a8": "810300", - "5aacec": "677dff", - "fefefe": "fefefe" + "5aacec": "677dff" }, "2": { "91510b": "5b021d", - "080808": "080808", "efe85a": "ae1a3d", "ab1605": "d36d00", "52525a": "062139", @@ -30,7 +27,6 @@ "5c5c65": "0b2b57", "868e8d": "0b1f45", "0900a8": "1a224a", - "5aacec": "d51d3c", - "fefefe": "fefefe" + "5aacec": "d51d3c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/792-full-moon.json b/public/images/pokemon/variant/792-full-moon.json index f5717506c7b..7efc0e30ccb 100644 --- a/public/images/pokemon/variant/792-full-moon.json +++ b/public/images/pokemon/variant/792-full-moon.json @@ -2,24 +2,18 @@ "1": { "aa8735": "624427", "f9f190": "e6ded2", - "151515": "151515", "59b3c6": "971283", "acebf0": "ff87d1", "dcb75f": "afa191", - "fffef2": "fffef2", "fefefe": "ffdda2", "85d0e0": "de37cf", "cbc6ce": "ffa255", "7b807e": "811500", - "240f62": "240f62", - "510d8e": "510d8e", - "fcfcfc": "fcfcfc", "ff268f": "5290ff" }, "2": { "aa8735": "6b0420", "f9f190": "c22741", - "151515": "151515", "59b3c6": "2460ac", "acebf0": "58cbe9", "dcb75f": "980f2a", @@ -28,9 +22,6 @@ "85d0e0": "3797d0", "cbc6ce": "e19096", "7b807e": "7e343d", - "240f62": "240f62", - "510d8e": "510d8e", - "fcfcfc": "fcfcfc", "ff268f": "ff26f0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/792.json b/public/images/pokemon/variant/792.json index 3f1e077e0be..c8db5b2675a 100644 --- a/public/images/pokemon/variant/792.json +++ b/public/images/pokemon/variant/792.json @@ -2,7 +2,6 @@ "1": { "665d14": "675340", "e5da7f": "e6ded2", - "080808": "080808", "a69e5c": "afa191", "7b807e": "864110", "fefefe": "ffd386", @@ -10,26 +9,20 @@ "240f62": "60000c", "45348e": "bc1836", "bcb5c1": "d39143", - "fdfce8": "fdfce8", "510d8e": "53101c", - "fcfcfc": "fcfcfc", "ff268f": "5290ff", "73e6cd": "ff31e0" }, "2": { "665d14": "6b0420", "e5da7f": "c22741", - "080808": "080808", "a69e5c": "980f2a", "7b807e": "7e343d", "fefefe": "ffd1d1", "6046d8": "1550a1", - "240f62": "240f62", "45348e": "1a3186", "bcb5c1": "e19096", "fdfce8": "ff6d74", - "510d8e": "510d8e", - "fcfcfc": "fcfcfc", "ff268f": "ff26f0", "73e6cd": "58cbe9" } diff --git a/public/images/pokemon/variant/793.json b/public/images/pokemon/variant/793.json index 198e1081425..3408987b524 100644 --- a/public/images/pokemon/variant/793.json +++ b/public/images/pokemon/variant/793.json @@ -7,8 +7,7 @@ "308ebc": "1ecb76", "26507d": "109d6a", "6b868f": "47090d", - "53b0d9": "40ffcc", - "101010": "101010" + "53b0d9": "40ffcc" }, "2": { "adbec5": "5128c3", @@ -18,7 +17,6 @@ "308ebc": "24a7b0", "26507d": "2368b1", "6b868f": "120d6b", - "53b0d9": "6bebff", - "101010": "101010" + "53b0d9": "6bebff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/797.json b/public/images/pokemon/variant/797.json index 05e51ab62bd..3e41ffa9ef2 100644 --- a/public/images/pokemon/variant/797.json +++ b/public/images/pokemon/variant/797.json @@ -8,7 +8,6 @@ "82ada4": "506ee3", "bccfc4": "f2b97f", "b3e088": "ffc785", - "101010": "101010", "a3e2bb": "9db7f4", "53ca89": "f0f5f9", "193124": "09112e" @@ -22,7 +21,6 @@ "82ada4": "8b1933", "bccfc4": "242733", "b3e088": "232323", - "101010": "101010", "a3e2bb": "bd2f62", "53ca89": "bbf3ef", "193124": "330007" diff --git a/public/images/pokemon/variant/798.json b/public/images/pokemon/variant/798.json index 3e5c571addf..62561deeeae 100644 --- a/public/images/pokemon/variant/798.json +++ b/public/images/pokemon/variant/798.json @@ -4,7 +4,6 @@ "fdfdfd": "d8e169", "cfcfcf": "87ab39", "aeaeae": "588720", - "101010": "101010", "a86c1c": "07421f", "9b2c17": "2c180e", "ffd53a": "2c9435", @@ -20,7 +19,6 @@ "fdfdfd": "87d2da", "cfcfcf": "4a86b8", "aeaeae": "305895", - "101010": "101010", "a86c1c": "5a2036", "9b2c17": "8a482d", "ffd53a": "cc7d4f", diff --git a/public/images/pokemon/variant/80-mega.json b/public/images/pokemon/variant/80-mega.json index 9bf85259157..dbc6bddc733 100644 --- a/public/images/pokemon/variant/80-mega.json +++ b/public/images/pokemon/variant/80-mega.json @@ -1,12 +1,9 @@ { "1": { - "181818": "181818", "b55565": "3f2729", "e66a7b": "5b3332", "ff9494": "885345", "ffbdac": "ad7459", - "deded5": "deded5", - "f8f8f8": "f8f8f8", "835a20": "9f675f", "cda462": "b97565", "ffeeb4": "e0b69d", @@ -16,13 +13,10 @@ "8b9494": "bf9562" }, "2": { - "181818": "181818", "b55565": "c08746", "e66a7b": "de9048", "ff9494": "eebd6a", "ffbdac": "ffea9a", - "deded5": "deded5", - "f8f8f8": "f8f8f8", "835a20": "69080f", "cda462": "8f2622", "ffeeb4": "d16b34", diff --git a/public/images/pokemon/variant/80.json b/public/images/pokemon/variant/80.json index 83203a8cc62..17a3c0627c6 100644 --- a/public/images/pokemon/variant/80.json +++ b/public/images/pokemon/variant/80.json @@ -3,10 +3,7 @@ "7b3131": "3f2729", "e66b7b": "5c3433", "ff9494": "895446", - "191919": "191919", "ffbdad": "ae755a", - "deded6": "deded6", - "ffffff": "ffffff", "52525a": "8b5d37", "845a21": "9f675f", "8c9494": "bf9562", @@ -20,10 +17,7 @@ "7b3131": "a54729", "e66b7b": "dd8f47", "ff9494": "edbc69", - "191919": "191919", "ffbdad": "ffeb9b", - "deded6": "deded6", - "ffffff": "ffffff", "52525a": "192b32", "845a21": "69080f", "8c9494": "2a4947", diff --git a/public/images/pokemon/variant/800-dawn-wings.json b/public/images/pokemon/variant/800-dawn-wings.json index b54a0e54903..1433f782e15 100644 --- a/public/images/pokemon/variant/800-dawn-wings.json +++ b/public/images/pokemon/variant/800-dawn-wings.json @@ -2,7 +2,6 @@ "1": { "305fb6": "624427", "82c5f7": "e6ded2", - "080808": "080808", "6197e9": "afa191", "7b807e": "86102d", "fefefe": "ffd386", @@ -19,7 +18,6 @@ "2": { "305fb6": "3b0015", "82c5f7": "970b22", - "080808": "080808", "6197e9": "5b0318", "7b807e": "041243", "fefefe": "ffd1d1", diff --git a/public/images/pokemon/variant/800-dusk-mane.json b/public/images/pokemon/variant/800-dusk-mane.json index fe21d5d0b98..80721becae1 100644 --- a/public/images/pokemon/variant/800-dusk-mane.json +++ b/public/images/pokemon/variant/800-dusk-mane.json @@ -1,7 +1,6 @@ { "1": { "1b2021": "3a001c", - "080808": "080808", "424a50": "890425", "2b3233": "5f0021", "ae6200": "7a80ab", @@ -13,12 +12,10 @@ "768188": "c8245d", "fd2b2b": "35d5e8", "18f013": "9d63ff", - "53f2f2": "453ef2", - "fdfcf8": "fdfcf8" + "53f2f2": "453ef2" }, "2": { "1b2021": "240842", - "080808": "080808", "424a50": "602483", "2b3233": "3e135f", "ae6200": "5b021d", @@ -30,7 +27,6 @@ "768188": "b13dc8", "fd2b2b": "ffcb49", "18f013": "e73c37", - "53f2f2": "fd852b", - "fdfcf8": "fdfcf8" + "53f2f2": "fd852b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/800-ultra.json b/public/images/pokemon/variant/800-ultra.json index cf4a0d16f07..0bdc4f1d6f0 100644 --- a/public/images/pokemon/variant/800-ultra.json +++ b/public/images/pokemon/variant/800-ultra.json @@ -8,10 +8,7 @@ "fefac2": "ff7e75", "fcf167": "ee2033", "dcb92c": "bc0125", - "8e6924": "770031", - "151515": "151515", - "fd2b2b": "fd2b2b", - "00c2d2": "00c2d2" + "8e6924": "770031" }, "2": { "a08f6d": "e552ec", @@ -23,8 +20,6 @@ "fcf167": "ff49e7", "dcb92c": "d10cc7", "8e6924": "510059", - "151515": "151515", - "fd2b2b": "900090", - "00c2d2": "00c2d2" + "fd2b2b": "900090" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/800.json b/public/images/pokemon/variant/800.json index 0c0baf8d973..7f996fdbf81 100644 --- a/public/images/pokemon/variant/800.json +++ b/public/images/pokemon/variant/800.json @@ -4,11 +4,9 @@ "424a50": "890425", "2b3233": "5f0021", "768188": "c8245d", - "080808": "080808", "5fcfbe": "453ef2", "fd2b2b": "35d5e8", "ec925b": "9d63ff", - "0a5ec5": "0a5ec5", "9965c9": "6219a8", "18f013": "69fff0", "b5bbbf": "a266eb", @@ -19,7 +17,6 @@ "424a50": "602483", "2b3233": "3e135f", "768188": "b13dc8", - "080808": "080808", "5fcfbe": "b71334", "fd2b2b": "fd2bc1", "ec925b": "e73c37", diff --git a/public/images/pokemon/variant/802.json b/public/images/pokemon/variant/802.json index 95a92d8babc..489a2ede00b 100644 --- a/public/images/pokemon/variant/802.json +++ b/public/images/pokemon/variant/802.json @@ -3,19 +3,14 @@ "2c3e30": "111c12", "6a806d": "526555", "536155": "29352b", - "101010": "101010", "2d3137": "084434", "747778": "76bc8f", - "4e5356": "3a7e5d", - "f8f592": "f8f592", - "ff4506": "ff4506", - "f2a455": "f2a455" + "4e5356": "3a7e5d" }, "1": { "2c3e30": "7a758d", "6a806d": "cbc9e8", "536155": "b5b1ce", - "101010": "101010", "2d3137": "17145e", "747778": "515aad", "4e5356": "2f3079", @@ -27,7 +22,6 @@ "2c3e30": "508294", "6a806d": "a7eaee", "536155": "82b7c3", - "101010": "101010", "2d3137": "5a0423", "747778": "ce3e63", "4e5356": "97123b", diff --git a/public/images/pokemon/variant/803.json b/public/images/pokemon/variant/803.json index 1f612916938..2fa484408e6 100644 --- a/public/images/pokemon/variant/803.json +++ b/public/images/pokemon/variant/803.json @@ -2,7 +2,6 @@ "1": { "78757f": "449e93", "ccc0d8": "e3ffec", - "101010": "101010", "98295e": "27579e", "ff6ccc": "54cbdc", "d9338e": "3492b9", @@ -17,7 +16,6 @@ "2": { "78757f": "cd9b85", "ccc0d8": "ffefe0", - "101010": "101010", "98295e": "a12f63", "ff6ccc": "ff778d", "d9338e": "d6487a", diff --git a/public/images/pokemon/variant/804.json b/public/images/pokemon/variant/804.json index 53abed974c1..01257b89642 100644 --- a/public/images/pokemon/variant/804.json +++ b/public/images/pokemon/variant/804.json @@ -7,7 +7,6 @@ "ff6cd3": "e88354", "db3e94": "c74736", "793fbe": "284173", - "101010": "101010", "6d656d": "2b5d67", "aaeaff": "ffdfa3", "a896a9": "8edfd5", @@ -23,7 +22,6 @@ "ff6cd3": "fff8cc", "db3e94": "dcbb94", "793fbe": "095654", - "101010": "101010", "6d656d": "690940", "aaeaff": "475269", "a896a9": "96234e", diff --git a/public/images/pokemon/variant/808.json b/public/images/pokemon/variant/808.json index f21c7b2ea50..70d7dd21a53 100644 --- a/public/images/pokemon/variant/808.json +++ b/public/images/pokemon/variant/808.json @@ -4,9 +4,7 @@ "ab732b": "ce5a6f", "ffda45": "ffbeae", "fbf28d": "fff1d1", - "f9f9f9": "f9f9f9", "814f23": "85374d", - "101010": "101010", "59544e": "38585b", "3d3534": "2c4048", "67675f": "426e73", @@ -21,16 +19,12 @@ "ab732b": "2d2931", "ffda45": "9b6e98", "fbf28d": "bf99bc", - "f9f9f9": "f9f9f9", "814f23": "101010", - "101010": "101010", "59544e": "9e002e", "3d3534": "780000", "67675f": "ba2b41", "dcdcda": "ffbe6e", "b1b5a6": "f49769", - "8a8d7e": "d66352", - "741012": "741012", - "c2292e": "c2292e" + "8a8d7e": "d66352" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/809-gigantamax.json b/public/images/pokemon/variant/809-gigantamax.json index e008cbcd6e3..543e4007238 100644 --- a/public/images/pokemon/variant/809-gigantamax.json +++ b/public/images/pokemon/variant/809-gigantamax.json @@ -4,7 +4,6 @@ "8a8d7e": "6a8f97", "e8e8e8": "dff7f7", "dcdcda": "c2effc", - "f9f9f9": "f9f9f9", "59544e": "38585b", "211d1d": "232a2b", "ab732b": "ce5a6f", @@ -13,7 +12,6 @@ "67675f": "426e73", "3d3534": "2c4048", "e46d8b": "ffce6b", - "101010": "101010", "c2292e": "ffce6b" }, "2": { @@ -21,7 +19,6 @@ "8a8d7e": "d66352", "e8e8e8": "ffde6c", "dcdcda": "ffbe6e", - "f9f9f9": "f9f9f9", "59544e": "9e002e", "211d1d": "570000", "ab732b": "2d2931", @@ -29,8 +26,6 @@ "dea220": "64486f", "67675f": "ba2b41", "3d3534": "780000", - "e46d8b": "c2292e", - "101010": "101010", - "c2292e": "c2292e" + "e46d8b": "c2292e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/809.json b/public/images/pokemon/variant/809.json index a30297cdb08..ee99fc95991 100644 --- a/public/images/pokemon/variant/809.json +++ b/public/images/pokemon/variant/809.json @@ -10,10 +10,8 @@ "814f23": "85374d", "67675f": "426e73", "ffda45": "ffbeae", - "101010": "101010", "dcdcda": "c2effc", - "b1b5a6": "98d6f0", - "f9f9f9": "f9f9f9" + "b1b5a6": "98d6f0" }, "2": { "59544e": "9e002e", @@ -26,9 +24,7 @@ "814f23": "101010", "67675f": "ba2b41", "ffda45": "9b6e98", - "101010": "101010", "dcdcda": "ffbe6e", - "b1b5a6": "f49769", - "f9f9f9": "f9f9f9" + "b1b5a6": "f49769" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/81.json b/public/images/pokemon/variant/81.json index 9bbbe4471cd..37cb315af7a 100644 --- a/public/images/pokemon/variant/81.json +++ b/public/images/pokemon/variant/81.json @@ -6,8 +6,6 @@ "d6d6d6": "ffc4b8", "524a4a": "90495b", "2984ad": "8fb9cc", - "ffffff": "ffffff", - "101010": "101010", "ef1900": "e67468", "5a8463": "c36c77", "8cb5a5": "f99596", @@ -22,7 +20,6 @@ "524a4a": "8c500b", "2984ad": "a7dcaa", "ffffff": "fffb93", - "101010": "101010", "ef1900": "e6a845", "5a8463": "a65410", "8cb5a5": "bf7826", diff --git a/public/images/pokemon/variant/816.json b/public/images/pokemon/variant/816.json index 32174bf545b..55573466e55 100644 --- a/public/images/pokemon/variant/816.json +++ b/public/images/pokemon/variant/816.json @@ -9,11 +9,9 @@ "add7e7": "e6828e", "718b93": "a7664c", "5091c0": "b5464b", - "fbfbfb": "fbfbfb", "bdc6ca": "d9c5bc", "d2e7ec": "eecaa2", - "9fbac1": "e19b78", - "101010": "101010" + "9fbac1": "e19b78" }, "2": { "1f2d63": "6e1a4c", @@ -25,10 +23,8 @@ "add7e7": "fffbec", "718b93": "933644", "5091c0": "dea26c", - "fbfbfb": "fbfbfb", "bdc6ca": "c5e4ea", "d2e7ec": "ec8b48", - "9fbac1": "d5543c", - "101010": "101010" + "9fbac1": "d5543c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/817.json b/public/images/pokemon/variant/817.json index f6650317915..d148636069b 100644 --- a/public/images/pokemon/variant/817.json +++ b/public/images/pokemon/variant/817.json @@ -9,9 +9,7 @@ "70cce0": "eb8577", "31b5d0": "cf5b5d", "6ba01b": "a36d5d", - "101010": "101010", "ccc7cd": "c7c1bd", - "fefefe": "fefefe", "3d6424": "83403e", "8cd222": "d99f8d" }, @@ -25,9 +23,7 @@ "70cce0": "ffe5a3", "31b5d0": "fcbe6d", "6ba01b": "ba2c22", - "101010": "101010", "ccc7cd": "becee1", - "fefefe": "fefefe", "3d6424": "731317", "8cd222": "d85633" } diff --git a/public/images/pokemon/variant/818-gigantamax.json b/public/images/pokemon/variant/818-gigantamax.json index 82fc117bf7b..4d9197e5ac5 100644 --- a/public/images/pokemon/variant/818-gigantamax.json +++ b/public/images/pokemon/variant/818-gigantamax.json @@ -7,15 +7,10 @@ "01599a": "0ea6a8", "9cd2e2": "107ac0", "549bc3": "0060a4", - "101010": "101010", - "ee3e5c": "ee3e5c", "31302f": "989dac", "646565": "f7fbfc", "4a4a4d": "c4ccd4", - "5e9bc3": "0a60a4", - "b0faff": "b0faff", - "5cdada": "5cdada", - "fdfdfd": "fdfdfd" + "5e9bc3": "0a60a4" }, "1": { "003e6a": "4c1819", @@ -25,7 +20,6 @@ "01599a": "9c2734", "9cd2e2": "e1926f", "549bc3": "a45e4a", - "101010": "101010", "ee3e5c": "5885a2", "31302f": "251e1c", "646565": "4c4643", @@ -43,7 +37,6 @@ "01599a": "d8b284", "9cd2e2": "ffcd57", "549bc3": "e38544", - "101010": "101010", "ee3e5c": "5885a2", "31302f": "571342", "646565": "be3a7d", diff --git a/public/images/pokemon/variant/818.json b/public/images/pokemon/variant/818.json index d4563f39dd6..804dbaa3a6a 100644 --- a/public/images/pokemon/variant/818.json +++ b/public/images/pokemon/variant/818.json @@ -8,9 +8,7 @@ "01599a": "9c2734", "549bc3": "a55846", "9cd2e2": "e1926f", - "fdfdfd": "fdfdfd", "e3a32b": "5885a2", - "101010": "101010", "31302f": "251e1c", "646565": "4c4643", "4a4a4d": "342b2a", @@ -25,9 +23,7 @@ "01599a": "d8b284", "549bc3": "e38544", "9cd2e2": "ffcd57", - "fdfdfd": "fdfdfd", "e3a32b": "a13047", - "101010": "101010", "31302f": "571342", "646565": "be3a7d", "4a4a4d": "771b54", diff --git a/public/images/pokemon/variant/82.json b/public/images/pokemon/variant/82.json index 6af03f7f5b2..795e1f91d2d 100644 --- a/public/images/pokemon/variant/82.json +++ b/public/images/pokemon/variant/82.json @@ -2,10 +2,8 @@ "1": { "3a3131": "612e40", "d6d6d6": "ffc4b8", - "ffffff": "ffffff", "8c8c8c": "c36c77", "524a4a": "90495b", - "101010": "101010", "b5b5b5": "f99596", "ef1900": "e67468", "ff8c4a": "ffc4b8", @@ -22,7 +20,6 @@ "ffffff": "fffb93", "8c8c8c": "8c500b", "524a4a": "662e00", - "101010": "101010", "b5b5b5": "b27a20", "ef1900": "a65410", "ff8c4a": "e6a845", diff --git a/public/images/pokemon/variant/821.json b/public/images/pokemon/variant/821.json index 2ad0feb8b11..e41457b53e3 100644 --- a/public/images/pokemon/variant/821.json +++ b/public/images/pokemon/variant/821.json @@ -7,11 +7,8 @@ "403524": "845195", "6d1b29": "5722a6", "344172": "ad6f83", - "f4f4f4": "f4f4f4", - "aeaeae": "aeaeae", "e21d22": "8b51e1", "979b9e": "57445a", - "080808": "080808", "6c5d64": "2e262f", "ac9534": "f4a0b9", "e9e356": "ffdeeb" @@ -24,11 +21,8 @@ "403524": "be8410", "6d1b29": "5a0015", "344172": "b95212", - "f4f4f4": "f4f4f4", - "aeaeae": "aeaeae", "e21d22": "8f0021", "979b9e": "743419", - "080808": "080808", "6c5d64": "541705", "ac9534": "edd472", "e9e356": "fff2c0" diff --git a/public/images/pokemon/variant/822.json b/public/images/pokemon/variant/822.json index 7ff524139bf..21b08947fa3 100644 --- a/public/images/pokemon/variant/822.json +++ b/public/images/pokemon/variant/822.json @@ -6,10 +6,8 @@ "426eb2": "ffdeeb", "2f4577": "f4a0b9", "403524": "ad6f83", - "080808": "080808", "6d1b29": "5722a6", "e21d22": "8b51e1", - "f4f4f4": "f4f4f4", "95a1b6": "57445a", "444f59": "25282d", "f85947": "8b51e1", @@ -22,10 +20,8 @@ "426eb2": "edd472", "2f4577": "eaae36", "403524": "b95212", - "080808": "080808", "6d1b29": "5a0015", "e21d22": "8f0021", - "f4f4f4": "f4f4f4", "95a1b6": "743419", "444f59": "541705", "f85947": "8f0021", diff --git a/public/images/pokemon/variant/823.json b/public/images/pokemon/variant/823.json index 4877b9b4ab9..53532f02db8 100644 --- a/public/images/pokemon/variant/823.json +++ b/public/images/pokemon/variant/823.json @@ -5,14 +5,12 @@ "303360": "ad6f83", "646ca8": "ffdeeb", "4d5488": "f4a0b9", - "010101": "010101", "ffa8a8": "ffc586", "f30101": "df7b10", "4e4150": "57445a", "2c2b58": "845195", "18173d": "4b2a5e", - "3e3d6d": "bc7dc3", - "2e262f": "2e262f" + "3e3d6d": "bc7dc3" }, "2": { "251d4e": "612a0e", @@ -20,7 +18,6 @@ "303360": "b95212", "646ca8": "edd472", "4d5488": "eaae36", - "010101": "010101", "ffa8a8": "ff4a4a", "f30101": "e80000", "4e4150": "743419", diff --git a/public/images/pokemon/variant/829.json b/public/images/pokemon/variant/829.json index b4fbd7f76dc..ca67c326709 100644 --- a/public/images/pokemon/variant/829.json +++ b/public/images/pokemon/variant/829.json @@ -2,7 +2,6 @@ "1": { "9a632c": "0a6290", "f4d626": "4aebe3", - "101010": "101010", "e09b24": "1da3c2", "fef54b": "84fff5", "fef1a7": "96ffe0", @@ -19,7 +18,6 @@ "2": { "9a632c": "472359", "f4d626": "bc77ff", - "101010": "101010", "e09b24": "8236c0", "fef54b": "e8aaff", "fef1a7": "f6e6ff", @@ -30,7 +28,6 @@ "3fad71": "41658c", "fef0a0": "ede9d3", "6d6649": "4b1a5a", - "ab9b65": "ab9b65", "397558": "1d396f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/830.json b/public/images/pokemon/variant/830.json index 8c1e9dfdfb6..7f247585dfd 100644 --- a/public/images/pokemon/variant/830.json +++ b/public/images/pokemon/variant/830.json @@ -6,7 +6,6 @@ "e8d5c6": "a2d2e7", "828a3f": "358699", "b6b23d": "8be8e4", - "101010": "101010", "fef0a0": "ece7c8", "bab743": "c38ec6", "9f6137": "3b0122", @@ -22,7 +21,6 @@ "e8d5c6": "d5aee9", "828a3f": "8243b6", "b6b23d": "b87def", - "101010": "101010", "fef0a0": "f4f1de", "bab743": "6a9cbb", "9f6137": "14103b", diff --git a/public/images/pokemon/variant/835.json b/public/images/pokemon/variant/835.json index 708c7028bcd..fbb7122a337 100644 --- a/public/images/pokemon/variant/835.json +++ b/public/images/pokemon/variant/835.json @@ -1,7 +1,6 @@ { "1": { "844840": "051514", - "101010": "101010", "bd8d62": "e0bb76", "a26642": "aa8e5a", "6d943a": "28797b", @@ -11,26 +10,19 @@ "fbfbfb": "fdffe1", "cba685": "fbffc7", "9a6229": "13423f", - "f9f9f9": "f9f9f9", - "d1cccb": "e7c78d", - "837a76": "837a76", - "db6659": "db6659" + "d1cccb": "e7c78d" }, "2": { "844840": "313e38", - "101010": "101010", "bd8d62": "509468", "a26642": "3d5d59", "6d943a": "1e1a42", "76c745": "202758", "cf9529": "56447e", "f7da11": "776baf", - "fbfbfb": "fbfbfb", "cba685": "8cd3a5", "9a6229": "2b2042", - "f9f9f9": "f9f9f9", "d1cccb": "a0bcaa", - "837a76": "43554d", - "db6659": "db6659" + "837a76": "43554d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/84.json b/public/images/pokemon/variant/84.json index c30aeefe259..d50f701c4aa 100644 --- a/public/images/pokemon/variant/84.json +++ b/public/images/pokemon/variant/84.json @@ -4,9 +4,6 @@ "946b5a": "3a8951", "dead73": "a5e6a0", "bd8c52": "65bf75", - "636363": "636363", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "bba689", "635210": "7a614c", "efdead": "ece4ce", @@ -18,8 +15,6 @@ "dead73": "c35d88", "bd8c52": "9f4079", "636363": "3a2050", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "b35656", "635210": "84333c", "efdead": "efbcad", @@ -31,8 +26,6 @@ "dead73": "95bedc", "bd8c52": "618bbc", "636363": "7a355d", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "2f2745", "635210": "1b1436", "efdead": "584c6b", diff --git a/public/images/pokemon/variant/85.json b/public/images/pokemon/variant/85.json index 4220e737b91..cc60db8ddc0 100644 --- a/public/images/pokemon/variant/85.json +++ b/public/images/pokemon/variant/85.json @@ -1,13 +1,8 @@ { "0": { - "424242": "424242", - "848484": "848484", - "000000": "000000", "5a4221": "1b4e31", "ce9c52": "65bf75", "a57b5a": "3a8951", - "ffffff": "ffffff", - "d6cece": "d6cece", "635a42": "7a614c", "efdead": "ece4ce", "b5a57b": "bba689", @@ -19,12 +14,9 @@ "1": { "424242": "3a2050", "848484": "6b4685", - "000000": "000000", "5a4221": "48123f", "ce9c52": "9f4079", "a57b5a": "6f265a", - "ffffff": "ffffff", - "d6cece": "d6cece", "635a42": "84333c", "efdead": "efbcad", "b5a57b": "c46e6e", @@ -36,12 +28,9 @@ "2": { "424242": "553246", "848484": "8f6174", - "000000": "000000", "5a4221": "1b2c59", "ce9c52": "95bedc", "a57b5a": "618bbc", - "ffffff": "ffffff", - "d6cece": "d6cece", "635a42": "1d1636", "efdead": "584c6b", "b5a57b": "43385c", diff --git a/public/images/pokemon/variant/850.json b/public/images/pokemon/variant/850.json index 991f1782552..7c2431b7df5 100644 --- a/public/images/pokemon/variant/850.json +++ b/public/images/pokemon/variant/850.json @@ -1,32 +1,22 @@ { "1": { - "2f1610": "2f1610", "681607": "024f2d", "bf3922": "117956", "804a3e": "59365d", - "101010": "101010", "ff5839": "35c36c", "5b2f26": "36203c", "ff836c": "5ff58e", "f77c42": "89fbad", "f89e08": "67ef9c", "ffd901": "c8ffcc", - "be5409": "117956", - "fbfbfb": "fbfbfb" + "be5409": "117956" }, "2": { - "2f1610": "2f1610", "681607": "68063c", "bf3922": "ae1165", "804a3e": "475294", - "101010": "101010", "ff5839": "d73981", "5b2f26": "36426c", - "ff836c": "ff836c", - "f77c42": "f77c42", - "f89e08": "f89e08", - "ffd901": "ffc143", - "be5409": "be5409", - "fbfbfb": "fbfbfb" + "ffd901": "ffc143" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/851-gigantamax.json b/public/images/pokemon/variant/851-gigantamax.json index 44af1041c17..f1b3d6bcf4f 100644 --- a/public/images/pokemon/variant/851-gigantamax.json +++ b/public/images/pokemon/variant/851-gigantamax.json @@ -10,25 +10,18 @@ "9a2d21": "36203c", "5b2f26": "5e3d35", "804a3e": "745f47", - "2f1610": "2f1610", - "010000": "010000", - "f4ba01": "a3ffab", - "fbfbfb": "fbfbfb" + "f4ba01": "a3ffab" }, "2": { "e75814": "890f52", "f89e08": "d73981", "ffd901": "ffc143", - "941528": "941528", "5b0f0f": "121439", "e71d12": "36426c", "ff5839": "7866cb", "9a2d21": "222957", "5b2f26": "60144b", "804a3e": "973554", - "2f1610": "2f1610", - "010000": "010000", - "f4ba01": "e98a27", - "fbfbfb": "fbfbfb" + "f4ba01": "e98a27" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/851.json b/public/images/pokemon/variant/851.json index 62cbe9d8531..0f1e234d0aa 100644 --- a/public/images/pokemon/variant/851.json +++ b/public/images/pokemon/variant/851.json @@ -6,12 +6,10 @@ "2f1610": "24122b", "681607": "0a5660", "804a3e": "714272", - "101010": "101010", "ff5839": "35c3a8", "5b2f26": "503154", "bf3922": "1a8987", "b96f5d": "ad58ab", - "fbfbfb": "fbfbfb", "941528": "005f35", "42221c": "36203c" }, @@ -22,13 +20,10 @@ "2f1610": "121439", "681607": "6e0442", "804a3e": "475294", - "101010": "101010", "ff5839": "d73981", "5b2f26": "36426c", "bf3922": "ae1165", "b96f5d": "7866cb", - "fbfbfb": "fbfbfb", - "941528": "941528", "42221c": "222957" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/854.json b/public/images/pokemon/variant/854.json index 7c4e10fbead..3ebee0aaaea 100644 --- a/public/images/pokemon/variant/854.json +++ b/public/images/pokemon/variant/854.json @@ -1,6 +1,5 @@ { "1": { - "5e401f": "5e401f", "cf9a4c": "592626", "ffd45c": "b7763c", "c3bfe0": "f2bbaa", @@ -10,7 +9,6 @@ "d38095": "eb8328", "f79e67": "ffab61", "4bb2af": "6d142c", - "101010": "101010", "72cfcc": "7c2039", "9aedea": "b74f6c", "f5f9fa": "ecb6c5" @@ -26,7 +24,6 @@ "d38095": "c6c95e", "f79e67": "f4f394", "4bb2af": "333231", - "101010": "101010", "72cfcc": "7c7270", "9aedea": "c9c0b9", "f5f9fa": "fdfdfd" diff --git a/public/images/pokemon/variant/855.json b/public/images/pokemon/variant/855.json index 9ecc1422501..1d840d9f6cf 100644 --- a/public/images/pokemon/variant/855.json +++ b/public/images/pokemon/variant/855.json @@ -13,8 +13,7 @@ "f5f9fa": "f2bbaa", "f79e67": "eb8328", "d38095": "ef9e5c", - "733a87": "cc752f", - "101010": "101010" + "733a87": "cc752f" }, "2": { "5e401f": "463f2b", @@ -30,7 +29,6 @@ "f5f9fa": "524c4e", "f79e67": "f4f394", "d38095": "c6c95e", - "733a87": "49755c", - "101010": "101010" + "733a87": "49755c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/856.json b/public/images/pokemon/variant/856.json index 3d245b74324..bfc575d89d7 100644 --- a/public/images/pokemon/variant/856.json +++ b/public/images/pokemon/variant/856.json @@ -2,7 +2,6 @@ "1": { "727ab1": "1d4a3b", "c8e9ff": "5ec183", - "181818": "181818", "acbfdf": "3b9665", "bb6a99": "043232", "f9d5da": "298675", @@ -13,7 +12,6 @@ "2": { "727ab1": "6b0124", "c8e9ff": "cb304d", - "181818": "181818", "acbfdf": "a11437", "bb6a99": "30163d", "f9d5da": "523f73", diff --git a/public/images/pokemon/variant/858-gigantamax.json b/public/images/pokemon/variant/858-gigantamax.json index 5e8730f3850..02a34377288 100644 --- a/public/images/pokemon/variant/858-gigantamax.json +++ b/public/images/pokemon/variant/858-gigantamax.json @@ -2,7 +2,6 @@ "1": { "727ab1": "1d4a3b", "c8e9ff": "5ec183", - "101010": "101010", "c15974": "043232", "acbfdf": "3b9665", "f5bac2": "298675", @@ -12,13 +11,11 @@ "fefefe": "f7e4e4", "b4a2b7": "bf9ca0", "856d8b": "9c7a81", - "f9d5da": "f9d5da", "d9cedb": "dec1c2" }, "2": { "727ab1": "6b0124", "c8e9ff": "cb304d", - "101010": "101010", "c15974": "30163d", "acbfdf": "a11437", "f5bac2": "523f73", @@ -28,7 +25,6 @@ "fefefe": "fee9fa", "b4a2b7": "bc93b7", "856d8b": "976c95", - "f9d5da": "f9d5da", "d9cedb": "e4bcde" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/858.json b/public/images/pokemon/variant/858.json index 97e35677ec3..41e50e22464 100644 --- a/public/images/pokemon/variant/858.json +++ b/public/images/pokemon/variant/858.json @@ -3,7 +3,6 @@ "727ab1": "1d4a3b", "c8e9ff": "5ec183", "acbfdf": "3b9665", - "101010": "101010", "948fc2": "287b59", "d9cedb": "dec1c2", "e5e4ef": "f7e4e4", @@ -12,14 +11,12 @@ "c15974": "043232", "b4a2b7": "bf9ca0", "856d8b": "9c7a81", - "f5bac2": "298675", - "f9d5da": "f9d5da" + "f5bac2": "298675" }, "2": { "727ab1": "6b0124", "c8e9ff": "cb304d", "acbfdf": "a11437", - "101010": "101010", "948fc2": "8c0e32", "d9cedb": "e4bcde", "e5e4ef": "ffecf9", @@ -28,7 +25,6 @@ "c15974": "30163d", "b4a2b7": "bc93b7", "856d8b": "976c95", - "f5bac2": "523f73", - "f9d5da": "f9d5da" + "f5bac2": "523f73" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/859.json b/public/images/pokemon/variant/859.json index 703d5d67218..bb4e943fa79 100644 --- a/public/images/pokemon/variant/859.json +++ b/public/images/pokemon/variant/859.json @@ -8,9 +8,6 @@ "735aac": "a4332d", "947cd8": "cd643d", "f42252": "f55c14", - "101010": "101010", - "fdfdfd": "fdfdfd", - "c9c9c9": "c9c9c9", "8b73d5": "cc5836" }, "2": { @@ -22,8 +19,6 @@ "735aac": "f0c475", "947cd8": "d9975b", "f42252": "fc645a", - "101010": "101010", - "fdfdfd": "fdfdfd", "c9c9c9": "dad6bf", "8b73d5": "f9e9a4" } diff --git a/public/images/pokemon/variant/86.json b/public/images/pokemon/variant/86.json index e24d4c5c672..f44946f3dda 100644 --- a/public/images/pokemon/variant/86.json +++ b/public/images/pokemon/variant/86.json @@ -4,23 +4,16 @@ "e6e6f7": "f3c7aa", "949cb5": "a86f5b", "d6ceef": "c78f72", - "101010": "101010", - "ffffff": "ffffff", "6b5a10": "6b3410", "b59442": "a4622f", "f7e6bd": "f7e3bd", - "dec573": "bb9451", - "d6735a": "d6735a", - "8c3121": "8c3121", - "ffadad": "ffadad" + "dec573": "bb9451" }, "1": { "425284": "414e63", "e6e6f7": "b2c3d1", "949cb5": "5e6d7c", "d6ceef": "91a0ac", - "101010": "101010", - "ffffff": "ffffff", "6b5a10": "847b73", "b59442": "b5ada5", "f7e6bd": "efefe6", @@ -34,8 +27,6 @@ "e6e6f7": "7ecdca", "949cb5": "325062", "d6ceef": "558a98", - "101010": "101010", - "ffffff": "ffffff", "6b5a10": "5f3e2e", "b59442": "81604a", "f7e6bd": "d9caa5", diff --git a/public/images/pokemon/variant/860.json b/public/images/pokemon/variant/860.json index 784d8e3bb64..50da28c1002 100644 --- a/public/images/pokemon/variant/860.json +++ b/public/images/pokemon/variant/860.json @@ -8,9 +8,6 @@ "e93761": "638a48", "fd0b42": "d24309", "433568": "5a1d27", - "101010": "101010", - "c9c9c9": "c9c9c9", - "fdfdfd": "fdfdfd", "409555": "244849", "47be62": "366c59", "356a3c": "162a35" @@ -24,9 +21,7 @@ "e93761": "491337", "fd0b42": "f0443e", "433568": "c98e63", - "101010": "101010", "c9c9c9": "dad6bf", - "fdfdfd": "fdfdfd", "409555": "272664", "47be62": "3f386f", "356a3c": "090d50" diff --git a/public/images/pokemon/variant/861-gigantamax.json b/public/images/pokemon/variant/861-gigantamax.json index 45d7da58c75..e3c084d3374 100644 --- a/public/images/pokemon/variant/861-gigantamax.json +++ b/public/images/pokemon/variant/861-gigantamax.json @@ -2,15 +2,12 @@ "1": { "2f184e": "290527", "5d4694": "8b332d", - "101010": "101010", "433568": "5a1d27", "352954": "3b1528", "409555": "244849", "47be62": "366c59", "356a3c": "162a35", "fd0b42": "d24309", - "c9c9c9": "c9c9c9", - "fdfdfd": "fdfdfd", "f874a0": "ea812f", "e93761": "638a48", "f75c90": "7daf56" @@ -18,7 +15,6 @@ "2": { "2f184e": "6a2f3a", "5d4694": "dfc784", - "101010": "101010", "433568": "c98e63", "352954": "a26458", "409555": "272664", @@ -26,7 +22,6 @@ "356a3c": "090d50", "fd0b42": "f0443e", "c9c9c9": "dad6bf", - "fdfdfd": "fdfdfd", "f874a0": "f291bf", "e93761": "491337", "f75c90": "64233b" diff --git a/public/images/pokemon/variant/861.json b/public/images/pokemon/variant/861.json index f60f7b31a56..539009124d0 100644 --- a/public/images/pokemon/variant/861.json +++ b/public/images/pokemon/variant/861.json @@ -3,15 +3,11 @@ "356a3c": "162a35", "47be62": "366c59", "2f184e": "290527", - "101010": "101010", "5d4694": "8b332d", "409555": "244849", "fd0b42": "d24309", "433568": "5a1d27", - "c9c9c9": "c9c9c9", - "fdfdfd": "fdfdfd", "352954": "3b1528", - "7c8089": "7c8089", "e93761": "638a48", "f75c90": "7daf56" }, @@ -19,15 +15,12 @@ "356a3c": "090d50", "47be62": "3f386f", "2f184e": "6a2f3a", - "101010": "101010", "5d4694": "dfc784", "409555": "272664", "fd0b42": "f0443e", "433568": "c98e63", "c9c9c9": "dad6bf", - "fdfdfd": "fdfdfd", "352954": "a26458", - "7c8089": "7c8089", "e93761": "491337", "f75c90": "64233b" } diff --git a/public/images/pokemon/variant/862.json b/public/images/pokemon/variant/862.json index 8b25c875e3f..3b033382be4 100644 --- a/public/images/pokemon/variant/862.json +++ b/public/images/pokemon/variant/862.json @@ -1,8 +1,6 @@ { "1": { - "1b2627": "1b2627", "474749": "156a66", - "010101": "010101", "303034": "094448", "f5f5f6": "f5ffea", "b2b3b2": "90c093", @@ -11,13 +9,11 @@ "242428": "001b1a", "6f7071": "01473a", "df84ad": "ff69fa", - "9b4f69": "d414dd", - "fcfcfc": "fcfcfc" + "9b4f69": "d414dd" }, "2": { "1b2627": "060724", "474749": "8655e1", - "010101": "010101", "303034": "5a3eb9", "f5f5f6": "342d4c", "b2b3b2": "18133d", @@ -26,7 +22,6 @@ "242428": "161058", "6f7071": "2e1d7b", "df84ad": "54f1ff", - "9b4f69": "0099ce", - "fcfcfc": "fcfcfc" + "9b4f69": "0099ce" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/863.json b/public/images/pokemon/variant/863.json index 78002ec7085..fe1146fa213 100644 --- a/public/images/pokemon/variant/863.json +++ b/public/images/pokemon/variant/863.json @@ -2,14 +2,11 @@ "1": { "66716c": "59879a", "bfc1bf": "b4e0d3", - "010101": "010101", "8f9c95": "85c1c0", - "181a1d": "181a1d", "3d4547": "4e385a", "272d2e": "342b49", "ef9b50": "fbe663", "dd5e33": "df9834", - "f3f3f3": "f3f3f3", "9aa094": "9fb8bc", "84726f": "9591a7", "5b4e4d": "4e455c", @@ -18,7 +15,6 @@ "2": { "66716c": "331a37", "bfc1bf": "92264b", - "010101": "010101", "8f9c95": "6d0b3c", "181a1d": "0f2127", "3d4547": "417778", diff --git a/public/images/pokemon/variant/864.json b/public/images/pokemon/variant/864.json index 9dcd35fa713..971e15cc81c 100644 --- a/public/images/pokemon/variant/864.json +++ b/public/images/pokemon/variant/864.json @@ -12,7 +12,6 @@ "fcfcfc": "ffffff", "c6bbcb": "a7e6e5", "ffa4c5": "bed5ff", - "101010": "101010", "7f806a": "4d8894", "af9e9e": "42a2b1" }, @@ -29,7 +28,6 @@ "fcfcfc": "ffffff", "c6bbcb": "773050", "ffa4c5": "8ff3a3", - "101010": "101010", "7f806a": "4b1f28", "af9e9e": "48c492" } diff --git a/public/images/pokemon/variant/867.json b/public/images/pokemon/variant/867.json index fcf7e29867a..8b2b7fc38d9 100644 --- a/public/images/pokemon/variant/867.json +++ b/public/images/pokemon/variant/867.json @@ -1,7 +1,6 @@ { "1": { "393941": "69d9bf", - "101010": "101010", "d9d0d1": "d6b8a0", "c5b9bb": "c69981", "d66770": "334599", @@ -13,7 +12,6 @@ }, "2": { "393941": "a4222c", - "101010": "101010", "d9d0d1": "4fb66a", "c5b9bb": "298a61", "d66770": "ffe78d", diff --git a/public/images/pokemon/variant/87.json b/public/images/pokemon/variant/87.json index e32cf4fe2b9..6678cb61e8f 100644 --- a/public/images/pokemon/variant/87.json +++ b/public/images/pokemon/variant/87.json @@ -5,10 +5,8 @@ "e6e6f7": "f0b28a", "425263": "773630", "d6ceef": "bc7855", - "101010": "101010", "ffffff": "ffecd8", "847b7b": "5328a6", - "d6cece": "d6cece", "9c0000": "b03f2f", "d62921": "f68484" }, @@ -18,10 +16,7 @@ "e6e6f7": "96adbe", "425263": "2f3b50", "d6ceef": "5a7286", - "101010": "101010", "ffffff": "beeaf8", - "847b7b": "847b7b", - "d6cece": "d6cece", "9c0000": "9e3d77", "d62921": "d280ab" }, @@ -31,10 +26,8 @@ "e6e6f7": "86dfe2", "425263": "171d3f", "d6ceef": "5493ac", - "101010": "101010", "ffffff": "d4fffc", "847b7b": "125889", - "d6cece": "d6cece", "9c0000": "c74351", "d62921": "f37171" } diff --git a/public/images/pokemon/variant/872.json b/public/images/pokemon/variant/872.json index 1576f560018..763cf0d0250 100644 --- a/public/images/pokemon/variant/872.json +++ b/public/images/pokemon/variant/872.json @@ -3,33 +3,24 @@ "7b8b9b": "345f5c", "acc3cc": "669a8c", "d8e9f0": "b7f1d6", - "f5fdff": "f5fdff", "695e77": "275e43", - "101010": "101010", "edeae0": "a6d6a6", - "b3a7c2": "73a878", - "fdfdfb": "fdfdfb" + "b3a7c2": "73a878" }, "1": { "7b8b9b": "22504c", "acc3cc": "548e8f", "d8e9f0": "b6e7df", - "f5fdff": "f5fdff", "695e77": "354b63", - "101010": "101010", "edeae0": "c1ebf3", - "b3a7c2": "89a9be", - "fdfdfb": "fdfdfb" + "b3a7c2": "89a9be" }, "2": { "7b8b9b": "5a3993", "acc3cc": "a66ac2", "d8e9f0": "d5c3ff", - "f5fdff": "f5fdff", "695e77": "5f3465", - "101010": "101010", "edeae0": "e5a2da", - "b3a7c2": "a060a0", - "fdfdfb": "fdfdfb" + "b3a7c2": "a060a0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/873.json b/public/images/pokemon/variant/873.json index 5ea93b1c3bb..2bf9938b290 100644 --- a/public/images/pokemon/variant/873.json +++ b/public/images/pokemon/variant/873.json @@ -5,7 +5,6 @@ "e7e0e6": "a6d6a6", "b3b4bd": "73a878", "8f8f9f": "547b58", - "101010": "101010", "758174": "497e7a", "c0e4c2": "eefffc", "a0baa8": "aae3d9", @@ -20,13 +19,11 @@ "e7e0e6": "c1ebf3", "b3b4bd": "8ebbca", "8f8f9f": "648397", - "101010": "101010", "758174": "428586", "c0e4c2": "d7fff8", "a0baa8": "7bcbc0", "4662ce": "0fa5bd", "8e9fe1": "2dd3e0", - "3f4474": "3f4474", "c0df86": "eefffb" }, "2": { @@ -35,7 +32,6 @@ "e7e0e6": "d78dcb", "b3b4bd": "864c86", "8f8f9f": "5f3465", - "101010": "101010", "758174": "795a9e", "c0e4c2": "e1e3ff", "a0baa8": "9f87ca", diff --git a/public/images/pokemon/variant/876-female.json b/public/images/pokemon/variant/876-female.json index 3d34ed7afae..9372d190545 100644 --- a/public/images/pokemon/variant/876-female.json +++ b/public/images/pokemon/variant/876-female.json @@ -5,7 +5,6 @@ "564c6c": "4a282a", "2f2642": "2c1419", "6c64a6": "b72e3e", - "101010": "101010", "d872e7": "79e28d", "ccb7c2": "c4a691", "fefefe": "e8d4bf", @@ -21,7 +20,6 @@ "564c6c": "d58da4", "2f2642": "444a8e", "6c64a6": "78aae5", - "101010": "101010", "d872e7": "ff9cca", "ccb7c2": "cbdbe6", "fefefe": "f0f2f3", diff --git a/public/images/pokemon/variant/876.json b/public/images/pokemon/variant/876.json index 0f7b7dbd9d4..78478b9098b 100644 --- a/public/images/pokemon/variant/876.json +++ b/public/images/pokemon/variant/876.json @@ -2,7 +2,6 @@ "1": { "2e2641": "2c1419", "7d7493": "5a3736", - "101010": "101010", "564c6c": "4a282a", "2f2642": "2c1419", "6c64a6": "b72e3e", @@ -18,7 +17,6 @@ "2": { "2e2641": "314c7c", "7d7493": "a3c5e8", - "101010": "101010", "564c6c": "78a5d4", "2f2642": "7a316c", "6c64a6": "f589bb", diff --git a/public/images/pokemon/variant/877-hangry.json b/public/images/pokemon/variant/877-hangry.json index 100665220df..44e48631166 100644 --- a/public/images/pokemon/variant/877-hangry.json +++ b/public/images/pokemon/variant/877-hangry.json @@ -1,19 +1,13 @@ { "0": { - "101010": "101010", "383634": "540606", "6c6c6c": "952222", "4f4b47": "3a1010", "9958ce": "cebb58", "6b3d96": "967f3d", - "ff151c": "ff151c", - "f38bb7": "f38bb7", - "9f9f9f": "9f9f9f", - "fbfbfb": "fbfbfb", "493061": "615e30" }, "1": { - "101010": "101010", "383634": "212020", "6c6c6c": "3a3a3a", "4f4b47": "161514", @@ -21,21 +15,13 @@ "6b3d96": "a2512c", "ff151c": "ff6b00", "f38bb7": "f3a18b", - "9f9f9f": "9f9f9f", - "fbfbfb": "fbfbfb", "493061": "753e25" }, "2": { - "101010": "101010", - "383634": "383634", - "6c6c6c": "6c6c6c", - "4f4b47": "4f4b47", "9958ce": "7fba7f", "6b3d96": "568351", "ff151c": "065b06", "f38bb7": "468e46", - "9f9f9f": "9f9f9f", - "fbfbfb": "fbfbfb", "493061": "306135" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/877.json b/public/images/pokemon/variant/877.json index 1708b129eb0..a8757d6d822 100644 --- a/public/images/pokemon/variant/877.json +++ b/public/images/pokemon/variant/877.json @@ -1,50 +1,29 @@ { "0": { - "101010": "101010", "8a5e48": "383634", "cf9c66": "6c6c6c", - "383634": "383634", - "6c6c6c": "6c6c6c", "af7044": "4f4b47", - "4f4b47": "4f4b47", "f4f489": "b689f4", "d3b351": "8851d3", - "fbfbfb": "fbfbfb", - "5c5c5c": "5c5c5c", - "f38bb7": "f38bb7", - "b24244": "b24244", - "e76961": "e76961", "785b23": "8851d3" }, "1": { - "101010": "101010", "8a5e48": "2c439d", "cf9c66": "86aaff", - "383634": "383634", - "6c6c6c": "6c6c6c", "af7044": "2c439d", - "4f4b47": "4f4b47", "f4f489": "fff98f", "d3b351": "8b8853", - "fbfbfb": "fbfbfb", - "5c5c5c": "5c5c5c", "f38bb7": "1010b3", "b24244": "424eb2", "e76961": "61b6e7", "785b23": "8b8853" }, "2": { - "101010": "101010", "8a5e48": "4f8a48", "cf9c66": "71cf66", - "383634": "383634", - "6c6c6c": "6c6c6c", "af7044": "44af5b", - "4f4b47": "4f4b47", "f4f489": "f8f8f8", "d3b351": "b6b6b6", - "fbfbfb": "fbfbfb", - "5c5c5c": "5c5c5c", "f38bb7": "a1f38b", "b24244": "388040", "e76961": "95e69d", diff --git a/public/images/pokemon/variant/880.json b/public/images/pokemon/variant/880.json index 3e626f744bd..cdb83257d50 100644 --- a/public/images/pokemon/variant/880.json +++ b/public/images/pokemon/variant/880.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "975e17": "5b0610", "ffff84": "ee8563", "ead900": "c6362b", @@ -17,11 +16,9 @@ "39ad5a": "a2b5c8" }, "2": { - "101010": "101010", "975e17": "211b3d", "ffff84": "dceeeb", "ead900": "636287", - "8f261b": "8f261b", "e39e1e": "35365e", "ed4e76": "ca5939", "ff8d9f": "e28854", diff --git a/public/images/pokemon/variant/881.json b/public/images/pokemon/variant/881.json index 231947e9afd..24d7946cf75 100644 --- a/public/images/pokemon/variant/881.json +++ b/public/images/pokemon/variant/881.json @@ -2,7 +2,6 @@ "1": { "975e17": "5b0610", "ffff84": "ee8563", - "101010": "101010", "e39e1e": "9c1430", "ead900": "c6362b", "2abbfc": "ceb16f", @@ -21,7 +20,6 @@ "2": { "975e17": "211b3d", "ffff84": "dceeeb", - "101010": "101010", "e39e1e": "35365e", "ead900": "636287", "2abbfc": "26c248", diff --git a/public/images/pokemon/variant/882.json b/public/images/pokemon/variant/882.json index cffd202806d..0782d97fee3 100644 --- a/public/images/pokemon/variant/882.json +++ b/public/images/pokemon/variant/882.json @@ -6,7 +6,6 @@ "83bbed": "eaa561", "777ebd": "cc6235", "edf3f2": "faebc8", - "101010": "101010", "005e44": "564e6e", "ff3c6d": "312f47", "8f261b": "1d2238", @@ -23,7 +22,6 @@ "83bbed": "8c1f45", "777ebd": "6c1046", "edf3f2": "fbecff", - "101010": "101010", "005e44": "f1b45f", "ff3c6d": "ca5939", "8f261b": "215b68", diff --git a/public/images/pokemon/variant/883.json b/public/images/pokemon/variant/883.json index 1cc1087f458..5c62474e9a3 100644 --- a/public/images/pokemon/variant/883.json +++ b/public/images/pokemon/variant/883.json @@ -4,7 +4,6 @@ "83bbed": "eaa561", "777ebd": "cc6235", "172459": "771922", - "101010": "101010", "edf3f2": "faebc8", "09354d": "2f1f1a", "085d94": "714363", @@ -19,7 +18,6 @@ "83bbed": "8c1f45", "777ebd": "6c1046", "172459": "320432", - "101010": "101010", "edf3f2": "fcffe4", "09354d": "2f1a20", "085d94": "ad3b6c", diff --git a/public/images/pokemon/variant/884-gigantamax.json b/public/images/pokemon/variant/884-gigantamax.json index d3f84a91842..70de36f39ec 100644 --- a/public/images/pokemon/variant/884-gigantamax.json +++ b/public/images/pokemon/variant/884-gigantamax.json @@ -3,7 +3,6 @@ "a893a8": "9b715e", "837080": "5d392f", "e4e5f1": "f8e0cf", - "151515": "151515", "fefefe": "fff5ed", "c4bac5": "c19b85", "ffde59": "ed7746", @@ -20,7 +19,6 @@ "a893a8": "312857", "837080": "1a0e34", "e4e5f1": "6e5ca6", - "151515": "151515", "fefefe": "8477cf", "c4bac5": "443a6e", "ffde59": "6df4ff", @@ -30,7 +28,6 @@ "4e4f5f": "fede7d", "393a41": "ed7746", "707086": "ffffc6", - "28272d": "28272d", "2e6976": "a87220" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/884.json b/public/images/pokemon/variant/884.json index 962edf2d6da..f4e311bd455 100644 --- a/public/images/pokemon/variant/884.json +++ b/public/images/pokemon/variant/884.json @@ -2,7 +2,6 @@ "1": { "68353c": "871e14", "b96a6a": "cd452b", - "151515": "151515", "c4bac5": "c19b85", "e4e5f1": "f8e0cf", "837080": "5d392f", @@ -18,7 +17,6 @@ "2": { "68353c": "062449", "b96a6a": "2077a6", - "151515": "151515", "c4bac5": "3d3268", "e4e5f1": "6e5ca6", "837080": "1a0e34", diff --git a/public/images/pokemon/variant/885.json b/public/images/pokemon/variant/885.json index 046b01e6625..bc8d6dd1f8c 100644 --- a/public/images/pokemon/variant/885.json +++ b/public/images/pokemon/variant/885.json @@ -1,7 +1,6 @@ { "0": { "3a583c": "133056", - "101010": "101010", "fa5494": "efa93f", "cc4066": "cc8225", "476b48": "20486e", @@ -16,7 +15,6 @@ }, "1": { "3a583c": "2f040d", - "101010": "101010", "fa5494": "4590da", "cc4066": "3261b7", "476b48": "4e0e17", @@ -31,7 +29,6 @@ }, "2": { "3a583c": "1f0c2c", - "101010": "101010", "fa5494": "68c7c4", "cc4066": "2a8286", "476b48": "231234", diff --git a/public/images/pokemon/variant/886.json b/public/images/pokemon/variant/886.json index 521ce4e84b7..c32ce74f987 100644 --- a/public/images/pokemon/variant/886.json +++ b/public/images/pokemon/variant/886.json @@ -2,7 +2,6 @@ "0": { "444e62": "2d365a", "addcbc": "6accd6", - "101010": "101010", "5f875a": "2f6c89", "2c323f": "192250", "566f89": "465272", @@ -19,7 +18,6 @@ "1": { "444e62": "4a1621", "addcbc": "da6151", - "101010": "101010", "5f875a": "6b242e", "2c323f": "2e080d", "566f89": "602034", @@ -36,7 +34,6 @@ "2": { "444e62": "231b45", "addcbc": "927fa1", - "101010": "101010", "5f875a": "3c2750", "2c323f": "251b31", "566f89": "3b2e5d", @@ -46,8 +43,6 @@ "ffe322": "87ff46", "7fb3b1": "8b659f", "5b878c": "6c4d85", - "d5fffb": "d67ae7", - "b5a36a": "b5a36a", - "dbd39d": "dbd39d" + "d5fffb": "d67ae7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/887.json b/public/images/pokemon/variant/887.json index 9858e270bc0..89a0b872a99 100644 --- a/public/images/pokemon/variant/887.json +++ b/public/images/pokemon/variant/887.json @@ -3,7 +3,6 @@ "2c323f": "2e080d", "566f89": "6c273d", "444e62": "4a1621", - "101010": "101010", "fa5494": "4590da", "cc4066": "244f9f", "48a9b0": "8a212f", @@ -20,7 +19,6 @@ "2c323f": "1b163f", "566f89": "4c3f6f", "444e62": "332a59", - "101010": "101010", "fa5494": "68c7c4", "cc4066": "2a8286", "48a9b0": "482962", diff --git a/public/images/pokemon/variant/888-crowned.json b/public/images/pokemon/variant/888-crowned.json index 64509128dc6..6b85e432037 100644 --- a/public/images/pokemon/variant/888-crowned.json +++ b/public/images/pokemon/variant/888-crowned.json @@ -3,7 +3,6 @@ "8f4e2f": "2f4567", "d79a53": "5a829b", "f2db8a": "a1c9cd", - "080808": "080808", "3471b4": "b74323", "2d4377": "5c1a1d", "4999da": "ec813b", @@ -13,14 +12,12 @@ "fae2c0": "fff8cd", "d3a79a": "da9772", "34313e": "32171f", - "fdfdfd": "fdfdfd", "9d6862": "a85f49" }, "2": { "8f4e2f": "692e47", "d79a53": "964c5c", "f2db8a": "c4826b", - "080808": "080808", "3471b4": "9fa7d0", "2d4377": "615c7e", "4999da": "e6ecff", @@ -30,7 +27,6 @@ "fae2c0": "3d5b72", "d3a79a": "243149", "34313e": "1a1829", - "fdfdfd": "fdfdfd", "9d6862": "1c2238" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/888.json b/public/images/pokemon/variant/888.json index e6a4c1e784f..4941ed244e1 100644 --- a/public/images/pokemon/variant/888.json +++ b/public/images/pokemon/variant/888.json @@ -1,7 +1,6 @@ { "1": { "2d4377": "5c1a1d", - "080808": "080808", "4999da": "ec813b", "3471b4": "b74323", "f45353": "448b48", @@ -10,12 +9,10 @@ "34313e": "32171f", "be3c45": "224d42", "93262f": "0d2729", - "fdfdfd": "fdfdfd", "9d6862": "a85f49" }, "2": { "2d4377": "615c7e", - "080808": "080808", "4999da": "e6ecff", "3471b4": "9fa7d0", "f45353": "902d57", @@ -24,7 +21,6 @@ "34313e": "1a1829", "be3c45": "6c1d59", "93262f": "431042", - "fdfdfd": "fdfdfd", "9d6862": "1c2238" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/889-crowned.json b/public/images/pokemon/variant/889-crowned.json index 9a91c8a7939..2cd690856c1 100644 --- a/public/images/pokemon/variant/889-crowned.json +++ b/public/images/pokemon/variant/889-crowned.json @@ -1,7 +1,6 @@ { "1": { "2d2f7b": "102c2c", - "080808": "080808", "396dce": "70a757", "2d48a8": "3c6959", "8f4e2f": "2f4567", @@ -12,13 +11,11 @@ "731a27": "1c163d", "ae2836": "422b61", "34313e": "19142f", - "fdfdfd": "fdfdfd", "c2c3cf": "ffe0cc", "8887a8": "d69f97" }, "2": { "2d2f7b": "244e61", - "080808": "080808", "396dce": "6fc7c1", "2d48a8": "4797a4", "8f4e2f": "692e47", @@ -29,7 +26,6 @@ "731a27": "615c7e", "ae2836": "9fa7d0", "34313e": "22192c", - "fdfdfd": "fdfdfd", "c2c3cf": "694f69", "8887a8": "442e49" } diff --git a/public/images/pokemon/variant/889.json b/public/images/pokemon/variant/889.json index ec9903b04a3..3c172653f72 100644 --- a/public/images/pokemon/variant/889.json +++ b/public/images/pokemon/variant/889.json @@ -3,28 +3,24 @@ "2d2f7b": "102c2c", "396dce": "70a757", "2d48a8": "3c6959", - "080808": "080808", "f2db8a": "a1c9cd", "731a27": "1c163d", "eb363a": "614378", "ae2836": "422b61", "c2c3cf": "ffe0cc", "8887a8": "d69f97", - "34313e": "19142f", - "fdfdfd": "fdfdfd" + "34313e": "19142f" }, "2": { "2d2f7b": "244e61", "396dce": "6fc7c1", "2d48a8": "4797a4", - "080808": "080808", "f2db8a": "c4826b", "731a27": "615c7e", "eb363a": "e6ecff", "ae2836": "9fa7d0", "c2c3cf": "694f69", "8887a8": "442e49", - "34313e": "22192c", - "fdfdfd": "fdfdfd" + "34313e": "22192c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/890-eternamax.json b/public/images/pokemon/variant/890-eternamax.json index c34a226f4cb..654b1392e89 100644 --- a/public/images/pokemon/variant/890-eternamax.json +++ b/public/images/pokemon/variant/890-eternamax.json @@ -1,7 +1,6 @@ { "1": { "25134c": "162a52", - "010101": "010101", "3622a7": "406d89", "6461ba": "4989a6", "31245f": "264864", @@ -14,7 +13,6 @@ }, "2": { "25134c": "354e95", - "010101": "010101", "3622a7": "bfd1fa", "6461ba": "e1ecff", "31245f": "87a3dd", diff --git a/public/images/pokemon/variant/890.json b/public/images/pokemon/variant/890.json index 781b6e3821d..cb5bb7cd634 100644 --- a/public/images/pokemon/variant/890.json +++ b/public/images/pokemon/variant/890.json @@ -2,7 +2,6 @@ "1": { "26124d": "09113c", "3a15bc": "264864", - "010101": "010101", "b21833": "370c82", "eb1533": "5b5bc3", "9a2433": "561ab7", @@ -11,7 +10,6 @@ "fb2553": "3f2e91", "675cc5": "406d89", "ffbcbc": "508eff", - "12042d": "12042d", "e22dbc": "ee535a", "f18cd5": "ff7d54", "fefefe": "dbf2ff" @@ -19,7 +17,6 @@ "2": { "26124d": "4963af", "3a15bc": "bfd1fa", - "010101": "010101", "b21833": "7b2f0e", "eb1533": "cb7622", "9a2433": "732208", @@ -30,7 +27,6 @@ "ffbcbc": "de9335", "12042d": "2d276a", "e22dbc": "298fb9", - "f18cd5": "73e5dc", - "fefefe": "fefefe" + "f18cd5": "73e5dc" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/8901.json b/public/images/pokemon/variant/8901.json index 3029b8292b8..eb5c692452b 100644 --- a/public/images/pokemon/variant/8901.json +++ b/public/images/pokemon/variant/8901.json @@ -2,33 +2,12 @@ "0": { "4b271b": "491b24", "b8805f": "b24c57", - "764e38": "823343", - "564d4e": "564d4e", - "050505": "050505", - "bdb8b5": "bdb8b5", - "847c7a": "847c7a", - "34302e": "34302e", - "f83259": "f83259", - "f0bc75": "f0bc75", - "ff99ae": "ff99ae", - "be8b47": "be8b47", - "efefef": "efefef", - "47943f": "47943f" + "764e38": "823343" }, "1": { "4b271b": "20232d", "b8805f": "4d7269", "764e38": "354d4f", - "564d4e": "564d4e", - "050505": "050505", - "bdb8b5": "bdb8b5", - "847c7a": "847c7a", - "34302e": "34302e", - "f83259": "f83259", - "f0bc75": "f0bc75", - "ff99ae": "ff99ae", - "be8b47": "be8b47", - "efefef": "efefef", "47943f": "2781bc" }, "2": { @@ -36,7 +15,6 @@ "b8805f": "565084", "764e38": "423765", "564d4e": "5c486b", - "050505": "050505", "bdb8b5": "ede6eb", "847c7a": "c199ae", "34302e": "2a1a35", @@ -44,7 +22,6 @@ "f0bc75": "32c1ff", "ff99ae": "d3bfff", "be8b47": "2d76e2", - "efefef": "efefef", "47943f": "f83259" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/891.json b/public/images/pokemon/variant/891.json index 11fed4d7271..c0f6521085f 100644 --- a/public/images/pokemon/variant/891.json +++ b/public/images/pokemon/variant/891.json @@ -4,11 +4,8 @@ "d8d1cb": "d1c8ba", "b5ada6": "ad9a8a", "9194a2": "9e988d", - "101010": "101010", "fbfbfb": "f4f4f4", "c9cccd": "c8c4c3", - "262628": "262628", - "fefefe": "fefefe", "655e65": "5c5653", "cdab78": "c75d57", "f8f3a0": "f99350", @@ -20,15 +17,11 @@ "d8d1cb": "6e8b9b", "b5ada6": "475b68", "9194a2": "181b33", - "101010": "101010", "fbfbfb": "444f5b", "c9cccd": "2e3549", - "262628": "262628", - "fefefe": "fefefe", "655e65": "433e3f", "cdab78": "cd9e79", "f8f3a0": "f8cf9f", - "b37a55": "b37a55", "393539": "292124" }, "2": { @@ -36,15 +29,11 @@ "d8d1cb": "e8e8ff", "b5ada6": "9f9fcc", "9194a2": "7f1c27", - "101010": "101010", "fbfbfb": "d33b3d", "c9cccd": "a52139", - "262628": "262628", - "fefefe": "fefefe", "655e65": "8b8d99", "cdab78": "cc9278", "f8f3a0": "f7caa0", - "b37a55": "b37a55", "393539": "38383f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/892-gigantamax-rapid.json b/public/images/pokemon/variant/892-gigantamax-rapid.json index de6dfd18c04..297aa8f6e55 100644 --- a/public/images/pokemon/variant/892-gigantamax-rapid.json +++ b/public/images/pokemon/variant/892-gigantamax-rapid.json @@ -1,12 +1,8 @@ { "0": { - "100d4f": "100d4f", "303ff1": "4550e6", "282d26": "212028", - "2b337d": "2b337d", "605f4d": "5a525b", - "010101": "010101", - "86a0fd": "86a0fd", "f5f5f5": "f4efe8", "9e6225": "8b222f", "d5a926": "b95826", diff --git a/public/images/pokemon/variant/892-gigantamax-single.json b/public/images/pokemon/variant/892-gigantamax-single.json index 5f2a6dbc509..5bbeb6c3b9b 100644 --- a/public/images/pokemon/variant/892-gigantamax-single.json +++ b/public/images/pokemon/variant/892-gigantamax-single.json @@ -2,12 +2,8 @@ "0": { "282d26": "25141f", "605f4d": "513b46", - "010101": "010101", - "570f0f": "570f0f", "e7140a": "d03932", "42473a": "382334", - "922718": "922718", - "fe7d70": "fe7d70", "f5f5f5": "f4efe8", "9e6225": "8b222f", "fffa60": "ff9736", diff --git a/public/images/pokemon/variant/892-rapid-strike.json b/public/images/pokemon/variant/892-rapid-strike.json index d673eb22ed6..85633b70f6a 100644 --- a/public/images/pokemon/variant/892-rapid-strike.json +++ b/public/images/pokemon/variant/892-rapid-strike.json @@ -4,47 +4,36 @@ "605f4d": "513b46", "8d8c8e": "957961", "6b6574": "725444", - "010101": "010101", - "fcfcfc": "fcfcfc", "9e6225": "8b222f", "282d26": "25141f", "fffa60": "ff9736", "d5a926": "b95826", - "b9b9b9": "b9b9b9", - "42473a": "382334", - "b4b4b4": "b4b4b4", - "fefefe": "fefefe" + "42473a": "382334" }, "1": { "4f4b58": "242a3f", "605f4d": "444f5b", "8d8c8e": "809ba3", "6b6574": "4c6877", - "010101": "010101", "fcfcfc": "b3c0c6", "9e6225": "272735", "282d26": "181b33", "fffa60": "616368", "d5a926": "494b54", "b9b9b9": "768187", - "42473a": "2e3549", - "b4b4b4": "b4b4b4", - "fefefe": "fefefe" + "42473a": "2e3549" }, "2": { "4f4b58": "56546b", "605f4d": "213199", "8d8c8e": "e8e8ff", "6b6574": "9f9fcc", - "010101": "010101", "fcfcfc": "4169d3", "9e6225": "875537", "282d26": "07073f", "fffa60": "f7caa0", "d5a926": "cc9278", "b9b9b9": "2e4ed1", - "42473a": "111a6b", - "b4b4b4": "b4b4b4", - "fefefe": "fefefe" + "42473a": "111a6b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/892.json b/public/images/pokemon/variant/892.json index 678e64f952c..64c0182bf02 100644 --- a/public/images/pokemon/variant/892.json +++ b/public/images/pokemon/variant/892.json @@ -1,23 +1,17 @@ { "0": { "605f4d": "513b46", - "010101": "010101", - "fcfcfc": "fcfcfc", "4f4b58": "4a2e27", - "b9b9b9": "b9b9b9", "8d8c8e": "957961", "6b6574": "725444", "282d26": "25141f", "42473a": "382334", "9e6225": "8b222f", - "b4b4b4": "b4b4b4", "fffa60": "ff9736", - "fefefe": "fefefe", "d5a926": "b95826" }, "1": { "605f4d": "444f5b", - "010101": "010101", "fcfcfc": "b3c0c6", "4f4b58": "263138", "b9b9b9": "768187", @@ -26,14 +20,11 @@ "282d26": "181b33", "42473a": "2e3549", "9e6225": "272735", - "b4b4b4": "b4b4b4", "fffa60": "616368", - "fefefe": "fefefe", "d5a926": "494b54" }, "2": { "605f4d": "870e2a", - "010101": "010101", "fcfcfc": "d33b3d", "4f4b58": "56546b", "b9b9b9": "a52139", @@ -42,9 +33,7 @@ "282d26": "3d0015", "42473a": "51081e", "9e6225": "875537", - "b4b4b4": "b4b4b4", "fffa60": "f7caa0", - "fefefe": "fefefe", "d5a926": "cc9278" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/896.json b/public/images/pokemon/variant/896.json index afb9c0209a0..116eed94e9d 100644 --- a/public/images/pokemon/variant/896.json +++ b/public/images/pokemon/variant/896.json @@ -1,7 +1,6 @@ { "0": { "8cacdd": "8f84c9", - "101010": "101010", "bbd2ff": "b9abea", "eeeef3": "f6ebf6", "cbc1cc": "c9c0d4", @@ -13,7 +12,6 @@ }, "1": { "8cacdd": "41d5b3", - "101010": "101010", "bbd2ff": "9dffff", "eeeef3": "d7ffff", "cbc1cc": "90f6da", @@ -25,7 +23,6 @@ }, "2": { "8cacdd": "bc393b", - "101010": "101010", "bbd2ff": "f68c79", "eeeef3": "fde3d6", "cbc1cc": "f3bca6", diff --git a/public/images/pokemon/variant/897.json b/public/images/pokemon/variant/897.json index d0171d386fa..9e8ec916d03 100644 --- a/public/images/pokemon/variant/897.json +++ b/public/images/pokemon/variant/897.json @@ -1,7 +1,6 @@ { "1": { "3c3c3c": "622d51", - "101010": "101010", "525852": "904c75", "00285c": "6e1817", "49478f": "932f27", @@ -14,7 +13,6 @@ }, "2": { "3c3c3c": "3a6965", - "101010": "101010", "525852": "5c8a7b", "00285c": "0d2222", "49478f": "13312b", diff --git a/public/images/pokemon/variant/898-ice.json b/public/images/pokemon/variant/898-ice.json index b74cf26d567..3f01947a78d 100644 --- a/public/images/pokemon/variant/898-ice.json +++ b/public/images/pokemon/variant/898-ice.json @@ -1,7 +1,6 @@ { "0": { "8cacdd": "8f84c9", - "101010": "101010", "bbd2ff": "b9abea", "004037": "00403c", "007766": "00776f", @@ -9,7 +8,6 @@ "eeeef3": "f6ebf6", "4d524d": "6a5837", "cbc1cc": "c9c0d4", - "fbfbfb": "fbfbfb", "c6c7cc": "ccc6d1", "d1c8be": "d7c881", "9e8f87": "ae8b50", @@ -22,7 +20,6 @@ }, "1": { "8cacdd": "41d5b3", - "101010": "101010", "bbd2ff": "9dffff", "004037": "00124d", "007766": "345ab5", @@ -30,8 +27,6 @@ "eeeef3": "d7ffff", "4d524d": "38255f", "cbc1cc": "90f6da", - "fbfbfb": "fbfbfb", - "c6c7cc": "c6c7cc", "d1c8be": "ba9ded", "9e8f87": "927ec4", "003071": "014837", @@ -43,7 +38,6 @@ }, "2": { "8cacdd": "bc393b", - "101010": "101010", "bbd2ff": "f68c79", "004037": "3c1522", "007766": "88253e", diff --git a/public/images/pokemon/variant/898-shadow.json b/public/images/pokemon/variant/898-shadow.json index 8394ad0f19e..416ecb7861e 100644 --- a/public/images/pokemon/variant/898-shadow.json +++ b/public/images/pokemon/variant/898-shadow.json @@ -3,20 +3,14 @@ "004037": "00403c", "007766": "00776f", "00584b": "005852", - "3c3c3c": "3c3c3c", "4d524d": "6a5837", - "101010": "101010", "525852": "5d5458", - "fbfbfb": "fbfbfb", "00285c": "632741", "c7c8cd": "ccc6d1", "d1c8be": "d7c881", "9e8f87": "ae8b50", "49478f": "894061", "7c5bcf": "d05a82", - "d9a4e3": "d9a4e3", - "fcfcfc": "fcfcfc", - "755179": "755179", "3b3b3b": "6a5837", "00285b": "3b2948", "504e8e": "80447d", @@ -28,11 +22,8 @@ "00584b": "183986", "3c3c3c": "622d51", "4d524d": "38255f", - "101010": "101010", "525852": "904c75", - "fbfbfb": "fbfbfb", "00285c": "6e1817", - "c7c8cd": "c7c8cd", "d1c8be": "ba9ded", "9e8f87": "927ec4", "49478f": "932f27", @@ -51,7 +42,6 @@ "00584b": "601b35", "3c3c3c": "3a6965", "4d524d": "181935", - "101010": "101010", "525852": "5c8a7b", "fbfbfb": "fefdeb", "00285c": "0d2222", diff --git a/public/images/pokemon/variant/898.json b/public/images/pokemon/variant/898.json index ccc39d3a5eb..ac5b85b955f 100644 --- a/public/images/pokemon/variant/898.json +++ b/public/images/pokemon/variant/898.json @@ -6,9 +6,7 @@ "00584b": "005852", "504e8e": "71517a", "007766": "00776f", - "101010": "101010", "525852": "6a5837", - "fcfcfc": "fcfcfc", "c7c8cd": "ccc6d1", "9e8f87": "ae8b50", "d1c8be": "d7c881", @@ -22,9 +20,7 @@ "00584b": "183986", "504e8e": "c64883", "007766": "345ab5", - "101010": "101010", "525852": "38255f", - "fcfcfc": "fcfcfc", "c7c8cd": "ccc6d1", "9e8f87": "927ec4", "d1c8be": "ba9ded", @@ -38,7 +34,6 @@ "00584b": "601b35", "504e8e": "cc8c49", "007766": "88253e", - "101010": "101010", "525852": "181935", "fcfcfc": "fefdeb", "c7c8cd": "c4bdb3", diff --git a/public/images/pokemon/variant/9-gigantamax.json b/public/images/pokemon/variant/9-gigantamax.json index a173fe1b242..03200447167 100644 --- a/public/images/pokemon/variant/9-gigantamax.json +++ b/public/images/pokemon/variant/9-gigantamax.json @@ -1,17 +1,12 @@ { "1": { - "949494": "949494", "352e27": "2c2525", - "101010": "101010", - "cdcdd5": "cdcdd5", - "fdfdfd": "fdfdfd", "494136": "3e322f", "5f5647": "504945", "083962": "204c6d", "5a8bcd": "5fc7a3", "2062ac": "33808c", "6ce8d6": "9bffa4", - "4a4a4a": "4a4a4a", "c75435": "b44839", "94ace6": "50b176" } diff --git a/public/images/pokemon/variant/900.json b/public/images/pokemon/variant/900.json index 585467bea2a..3c341eaa899 100644 --- a/public/images/pokemon/variant/900.json +++ b/public/images/pokemon/variant/900.json @@ -1,30 +1,14 @@ { "1": { - "2b1f22": "2b1f22", - "3a2e2f": "3a2e2f", - "4d3d3e": "4d3d3e", - "080808": "080808", - "6a5856": "6a5856", - "96856d": "96856d", - "fcfcfc": "fcfcfc", "6b563a": "221a69", - "c8bdb7": "c8bdb7", "e2b561": "4b84d2", - "af7845": "354da7", - "e3d1ae": "e3d1ae" + "af7845": "354da7" }, "2": { - "2b1f22": "2b1f22", - "3a2e2f": "3a2e2f", "4d3d3e": "808080", - "080808": "080808", "6a5856": "424242", - "96856d": "96856d", - "fcfcfc": "fcfcfc", "6b563a": "a54200", - "c8bdb7": "c8bdb7", "e2b561": "ffde00", - "af7845": "e68400", - "e3d1ae": "e3d1ae" + "af7845": "e68400" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/901.json b/public/images/pokemon/variant/901.json index fe8f810700f..171e44c62ee 100644 --- a/public/images/pokemon/variant/901.json +++ b/public/images/pokemon/variant/901.json @@ -4,16 +4,9 @@ "231a18": "0c1515", "63443d": "31563f", "502f29": "273b32", - "0f0f0f": "0f0f0f", - "77655b": "77655b", - "9c8d86": "9c8d86", - "4b4236": "4b4236", "ca8b35": "c48e81", "fec643": "f7eee1", - "fcfcfc": "fcfcfc", "25521f": "557f24", - "fec672": "f2cab8", - "95908a": "95908a", - "b4b4b1": "b4b4b1" + "fec672": "f2cab8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/903.json b/public/images/pokemon/variant/903.json index 6e6eff76441..7414a6891f4 100644 --- a/public/images/pokemon/variant/903.json +++ b/public/images/pokemon/variant/903.json @@ -9,9 +9,7 @@ "b07528": "6e6f6f", "6a56b3": "722738", "ecb629": "a7a7a7", - "f8feff": "f8feff", "36326d": "210609", - "9b98a9": "9b98a9", "de2f41": "31dabb", "8e2458": "12968b", "eb357c": "31dabb" diff --git a/public/images/pokemon/variant/911.json b/public/images/pokemon/variant/911.json index b3beb1e23c3..a1c5345d79a 100644 --- a/public/images/pokemon/variant/911.json +++ b/public/images/pokemon/variant/911.json @@ -4,35 +4,24 @@ "f45511": "91dada", "ffd017": "b4e6e6", "ee8b08": "81d5d5", - "5b5c5e": "5b5c5e", "fcfcfc": "cccccc", "9fa0a2": "758a70", - "333c36": "333c36", "a334d8": "9524ca", "ff4a3c": "366565", - "0f0f0f": "0f0f0f", "741010": "152828", "ba3227": "234141", - "4e2c85": "4e2c85", - "ffa252": "dbf3f3", - "000000": "000000" + "ffa252": "dbf3f3" }, "2": { "d20000": "0ea631", "f45511": "2fe757", "ffd017": "4ffc75", "ee8b08": "08e739", - "5b5c5e": "5b5c5e", "fcfcfc": "e5ffec", "9fa0a2": "82977c", - "333c36": "333c36", - "a334d8": "a334d8", "ff4a3c": "38583f", - "0f0f0f": "0f0f0f", "741010": "162319", "ba3227": "243929", - "4e2c85": "4e2c85", - "ffa252": "a6ffba", - "000000": "000000" + "ffa252": "a6ffba" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/912.json b/public/images/pokemon/variant/912.json index c366d573c0a..b99e7fa7843 100644 --- a/public/images/pokemon/variant/912.json +++ b/public/images/pokemon/variant/912.json @@ -4,14 +4,12 @@ "3686b1": "d96536", "2fbee8": "e69c51", "84d7ff": "f7ca7b", - "0f0f0f": "0f0f0f", "f2fdff": "fff0d4", "4d6373": "a05f27", "becde4": "d79f63", "005ba2": "7f0e0b", "7999bd": "b9865a", "f6fbfc": "ffe3b0", - "ffffff": "ffffff", "6a6a41": "3b2e28", "aca462": "5b5450", "f6f64a": "868382" @@ -21,14 +19,12 @@ "3686b1": "1c7962", "2fbee8": "33b37e", "84d7ff": "58d299", - "0f0f0f": "0f0f0f", "f2fdff": "a6f5bb", "4d6373": "2d185d", "becde4": "5137a0", "005ba2": "0e3f31", "7999bd": "422c84", "f6fbfc": "6767e3", - "ffffff": "ffffff", "6a6a41": "601a0d", "aca462": "bb602f", "f6f64a": "f49651" diff --git a/public/images/pokemon/variant/914.json b/public/images/pokemon/variant/914.json index 1204b6c99a1..eeb547c68ba 100644 --- a/public/images/pokemon/variant/914.json +++ b/public/images/pokemon/variant/914.json @@ -2,7 +2,6 @@ "2": { "3d7a71": "541222", "55dbe6": "f15e76", - "0f0f0f": "0f0f0f", "394bee": "1d6c42", "282a4d": "072a2b", "419bc2": "a22f49", @@ -13,7 +12,6 @@ "a24720": "eac7b4", "eda936": "ffa564", "803213": "4b251b", - "ffffff": "ffffff", "efffff": "4b40be", "cb7e29": "c76740", "8ea6a8": "3b188e", diff --git a/public/images/pokemon/variant/919.json b/public/images/pokemon/variant/919.json index c06063fba68..c04f4510a9f 100644 --- a/public/images/pokemon/variant/919.json +++ b/public/images/pokemon/variant/919.json @@ -3,7 +3,6 @@ "434863": "312d28", "26253d": "1b1916", "607493": "4c463e", - "0f0f0f": "0f0f0f", "879ab2": "6c665d", "c5c2c5": "a39d62", "f7f7ff": "dbd4a2", @@ -19,13 +18,7 @@ "434863": "2a5549", "26253d": "162d2a", "607493": "4a9058", - "0f0f0f": "0f0f0f", "879ab2": "71bb74", - "c5c2c5": "c5c2c5", - "f7f7ff": "f7f7ff", - "6e6b82": "6e6b82", - "373547": "373547", - "efefef": "efefef", "7c451b": "80223b", "b59a13": "a93930", "ffc608": "c64e2f", @@ -35,7 +28,6 @@ "434863": "611d3a", "26253d": "350f21", "607493": "9a3545", - "0f0f0f": "0f0f0f", "879ab2": "c84d52", "c5c2c5": "343434", "f7f7ff": "4a4a4a", diff --git a/public/images/pokemon/variant/924.json b/public/images/pokemon/variant/924.json index 752fd7d8840..ce42f528bcb 100644 --- a/public/images/pokemon/variant/924.json +++ b/public/images/pokemon/variant/924.json @@ -4,7 +4,6 @@ "f9f9f9": "cddef1", "393a44": "344854", "b8b9c0": "9c89d2", - "0f0f0f": "0f0f0f", "888b97": "5a6e8f", "567d9a": "755382", "b8ccde": "a3a6ef", @@ -15,7 +14,6 @@ "f9f9f9": "b39090", "393a44": "3f0f0f", "b8b9c0": "785e5e", - "0f0f0f": "0f0f0f", "888b97": "6e4343", "567d9a": "a15d55", "b8ccde": "eaafb2", @@ -26,7 +24,6 @@ "f9f9f9": "757373", "393a44": "27272e", "b8b9c0": "4b4b4d", - "0f0f0f": "0f0f0f", "888b97": "3c3c3d", "567d9a": "471910", "b8ccde": "7a5b5d", diff --git a/public/images/pokemon/variant/925-four.json b/public/images/pokemon/variant/925-four.json index a72e775844b..17beec20972 100644 --- a/public/images/pokemon/variant/925-four.json +++ b/public/images/pokemon/variant/925-four.json @@ -4,7 +4,6 @@ "f9f9f9": "cddef1", "393a44": "344854", "b8b9c0": "9c89d2", - "0f0f0f": "0f0f0f", "888b97": "5a6e8f", "567d9a": "755382", "b8ccde": "a3a6ef", @@ -16,7 +15,6 @@ "f9f9f9": "b39090", "393a44": "3f0f0f", "b8b9c0": "785e5e", - "0f0f0f": "0f0f0f", "888b97": "6e4343", "567d9a": "a15d55", "b8ccde": "eaafb2", diff --git a/public/images/pokemon/variant/925-three.json b/public/images/pokemon/variant/925-three.json index 89577c9d44a..d0ee20c0536 100644 --- a/public/images/pokemon/variant/925-three.json +++ b/public/images/pokemon/variant/925-three.json @@ -16,7 +16,6 @@ "f9f9f9": "b39090", "393a44": "3f0f0f", "b8b9c0": "785e5e", - "0f0f0f": "0f0f0f", "888b97": "6e4343", "567d9a": "a15d55", "b8ccde": "eaafb2", @@ -28,7 +27,6 @@ "f9f9f9": "757373", "393a44": "27272e", "b8b9c0": "4b4b4d", - "0f0f0f": "0f0f0f", "888b97": "3c3c3d", "567d9a": "471910", "b8ccde": "7a5b5d", diff --git a/public/images/pokemon/variant/93.json b/public/images/pokemon/variant/93.json index 21243b8f93d..77cc3ca23f9 100644 --- a/public/images/pokemon/variant/93.json +++ b/public/images/pokemon/variant/93.json @@ -3,12 +3,9 @@ "845a6b": "8e699a", "524263": "52426b", "ad6bce": "caaddf", - "101010": "101010", "c58cce": "dfcaee", "b51919": "2963d6", "de4a31": "5a94ff", - "d6d6d6": "d6d6d6", - "ffffff": "ffffff", "d6a5de": "d6a5e6", "6b0000": "0831a5" }, @@ -16,12 +13,9 @@ "845a6b": "631b3f", "524263": "380508", "ad6bce": "8e395f", - "101010": "101010", "c58cce": "c06380", "b51919": "7ee75c", "de4a31": "e4f67c", - "d6d6d6": "d6d6d6", - "ffffff": "ffffff", "d6a5de": "ef8d9f", "6b0000": "2eb063" }, @@ -29,12 +23,9 @@ "845a6b": "302433", "524263": "1a1320", "ad6bce": "4c4354", - "101010": "101010", "c58cce": "82748c", "b51919": "e47750", "de4a31": "fae277", - "d6d6d6": "d6d6d6", - "ffffff": "ffffff", "d6a5de": "d6a5e6", "6b0000": "b72b47" } diff --git a/public/images/pokemon/variant/932.json b/public/images/pokemon/variant/932.json index cadab6eeec4..992a25b53e8 100644 --- a/public/images/pokemon/variant/932.json +++ b/public/images/pokemon/variant/932.json @@ -1,7 +1,6 @@ { "1": { "998694": "966480", - "564d57": "564d57", "fcfcfc": "f9c2cd", "8e5f57": "9ba7b0", "724747": "76828b", @@ -9,7 +8,6 @@ "c0937c": "deeaf3", "472727": "3d4952", "e4c2b6": "f9ffff", - "0f0f0f": "0f0f0f", "765c4b": "703e4c", "eeac31": "ed3336" } diff --git a/public/images/pokemon/variant/933.json b/public/images/pokemon/variant/933.json index e63b668cc87..3756a0a9706 100644 --- a/public/images/pokemon/variant/933.json +++ b/public/images/pokemon/variant/933.json @@ -1,6 +1,5 @@ { "1": { - "564d57": "564d57", "64514d": "6d7982", "fcfcfc": "f9c2cd", "bfb4ba": "bc8296", @@ -11,8 +10,7 @@ "8a7367": "a0acb6", "eeac31": "ed3336", "f6e21a": "ffe8f3", - "44332e": "3a464f", - "0f0f0f": "0f0f0f" + "44332e": "3a464f" }, "2": { "564d57": "444251", @@ -26,7 +24,6 @@ "8a7367": "608263", "eeac31": "551d8f", "f6e21a": "e1b1fb", - "44332e": "2b3f3f", - "0f0f0f": "0f0f0f" + "44332e": "2b3f3f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/934.json b/public/images/pokemon/variant/934.json index 4710c813afe..a99340c38be 100644 --- a/public/images/pokemon/variant/934.json +++ b/public/images/pokemon/variant/934.json @@ -7,7 +7,6 @@ "96675a": "adbac3", "8a7367": "949fa8", "c3927b": "d8e9f5", - "0f0f0f": "0f0f0f", "44332e": "3a464f", "64514d": "6d7982", "ea881c": "d63e6e", @@ -23,7 +22,6 @@ "96675a": "5d9157", "8a7367": "608263", "c3927b": "7fc17c", - "0f0f0f": "0f0f0f", "44332e": "2b3f3f", "64514d": "3d5e47", "ea881c": "551d8f", diff --git a/public/images/pokemon/variant/94-gigantamax.json b/public/images/pokemon/variant/94-gigantamax.json index 2e9d2f5824c..c8053904556 100644 --- a/public/images/pokemon/variant/94-gigantamax.json +++ b/public/images/pokemon/variant/94-gigantamax.json @@ -3,14 +3,11 @@ "5a4a9c": "a89dc4", "4a294a": "091659", "b48bbd": "fefefe", - "101010": "101010", "9473b4": "fcf4fc", "7b62a4": "d1bcd6", "ff8337": "010202", "ffff00": "21252a", "cc1e5b": "2963d6", - "fff6ff": "fff6ff", - "bdacbd": "bdacbd", "ba325a": "352936", "920634": "143e92", "743a5b": "7492d5", diff --git a/public/images/pokemon/variant/94.json b/public/images/pokemon/variant/94.json index c1d7c6358ae..5425501c462 100644 --- a/public/images/pokemon/variant/94.json +++ b/public/images/pokemon/variant/94.json @@ -3,21 +3,17 @@ "5a4a9c": "9e85a6", "4a294a": "634b63", "b58cbd": "ebdbf7", - "101010": "101010", "9473b5": "cbb7da", "7b63a5": "d1bcd6", "ff5a5a": "2963d6", "ff9494": "5a94ff", - "bdadbd": "bdadbd", "fff7ff": "ffffff", - "6b637b": "6b637b", "ded6de": "dedede" }, "1": { "5a4a9c": "4a1f36", "4a294a": "1b0917", "b58cbd": "c56f8a", - "101010": "101010", "9473b5": "8d3e61", "7b63a5": "6f284a", "ff5a5a": "e79c39", @@ -31,7 +27,6 @@ "5a4a9c": "302433", "4a294a": "1a1320", "b58cbd": "7b6888", - "101010": "101010", "9473b5": "3f324a", "7b63a5": "3b2b3e", "ff5a5a": "a9223d", diff --git a/public/images/pokemon/variant/940.json b/public/images/pokemon/variant/940.json index a84fb9ed44d..8613ad30761 100644 --- a/public/images/pokemon/variant/940.json +++ b/public/images/pokemon/variant/940.json @@ -5,11 +5,8 @@ "181a1b": "271945", "ffcd37": "7dffc0", "91a5c3": "e39fc5", - "f9f9f9": "f9f9f9", "be8f29": "5dd9c8", - "0f0f0f": "0f0f0f", "643c28": "433382", - "73bbbf": "73bbbf", "f1a156": "ce87fa", "c27741": "9a5fd9", "826426": "1b9ea1", @@ -23,9 +20,7 @@ "181a1b": "532d61", "ffcd37": "d9647b", "91a5c3": "ba73b2", - "f9f9f9": "f9f9f9", "be8f29": "b3466a", - "0f0f0f": "0f0f0f", "643c28": "2b2745", "73bbbf": "ffcf4a", "f1a156": "745b85", diff --git a/public/images/pokemon/variant/941.json b/public/images/pokemon/variant/941.json index 3c36d6a91da..a9b2ac62402 100644 --- a/public/images/pokemon/variant/941.json +++ b/public/images/pokemon/variant/941.json @@ -6,12 +6,10 @@ "aa7e24": "3dd1cc", "ffcd37": "6ef5c8", "8c898c": "9c5bd9", - "fdfdfd": "fdfdfd", "2b1717": "773185", "73bbbf": "de82ff", "441e21": "d16492", "692a2f": "ff9ec6", - "0f0f0f": "0f0f0f", "624a20": "217991", "37415a": "55348a", "272a2e": "3b227a", @@ -24,12 +22,10 @@ "aa7e24": "c44f6c", "ffcd37": "e3667d", "8c898c": "cf7827", - "fdfdfd": "fdfdfd", "2b1717": "3a3466", "73bbbf": "ffcf4a", "441e21": "51467a", "692a2f": "776294", - "0f0f0f": "0f0f0f", "624a20": "8a2f62", "37415a": "723b80", "272a2e": "56286b", diff --git a/public/images/pokemon/variant/948.json b/public/images/pokemon/variant/948.json index 01b0e57a61d..25ce7335bcb 100644 --- a/public/images/pokemon/variant/948.json +++ b/public/images/pokemon/variant/948.json @@ -7,7 +7,6 @@ "976924": "a50927", "ffec37": "ff6237", "fef8f5": "fff4f1", - "000000": "000000", "eaba2b": "b9352b", "d2bbac": "e2bea6", "886b59": "8d5740" @@ -20,7 +19,6 @@ "976924": "254087", "ffec37": "4b86bd", "fef8f5": "ffede5", - "000000": "000000", "eaba2b": "2e609b", "d2bbac": "d8bdab", "886b59": "ad927b" diff --git a/public/images/pokemon/variant/949.json b/public/images/pokemon/variant/949.json index efda1b10f0b..c04cc4b9d0d 100644 --- a/public/images/pokemon/variant/949.json +++ b/public/images/pokemon/variant/949.json @@ -3,38 +3,30 @@ "404040": "4b3073", "282828": "33134d", "5f5f5f": "7462ad", - "000000": "000000", "ede652": "1672a1", "86433c": "a50927", "ca7268": "d41929", "d6938b": "ff4737", "e7bcb8": "ff9d6d", - "ffffff": "ffffff", "cdae52": "0c4a83", "c2ae83": "b29785", "f5f9b9": "d6c1b1", - "f9f1b9": "f9f1b9", "94724b": "60473c", - "936839": "042259", - "bdbdbd": "bdbdbd" + "936839": "042259" }, "2": { "404040": "70150e", "282828": "460001", "5f5f5f": "c64d30", - "000000": "000000", "ede652": "dd7731", "86433c": "401e54", "ca7268": "613a8a", "d6938b": "8e65c1", "e7bcb8": "dd9dff", - "ffffff": "ffffff", "cdae52": "af3610", "c2ae83": "d9b591", "f5f9b9": "ffe8d6", - "f9f1b9": "f9f1b9", "94724b": "6f492c", - "936839": "7e1200", - "bdbdbd": "bdbdbd" + "936839": "7e1200" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/951.json b/public/images/pokemon/variant/951.json index 11e0575d7f4..50cf97f8ccf 100644 --- a/public/images/pokemon/variant/951.json +++ b/public/images/pokemon/variant/951.json @@ -6,7 +6,6 @@ "2e302f": "1f0c17", "3f9a5f": "be8a84", "2f683c": "9d6b5b", - "0f0f0f": "0f0f0f", "5c7c5c": "4c292f", "79b97b": "704f4f", "a6b496": "facf81", @@ -21,7 +20,6 @@ "2e302f": "3b2e3a", "3f9a5f": "a78bdc", "2f683c": "7456a8", - "0f0f0f": "0f0f0f", "5c7c5c": "8e7eb1", "79b97b": "cfbfe6", "a6b496": "fa95d1", diff --git a/public/images/pokemon/variant/952.json b/public/images/pokemon/variant/952.json index cdf83f43e8f..485d60ab51f 100644 --- a/public/images/pokemon/variant/952.json +++ b/public/images/pokemon/variant/952.json @@ -3,8 +3,6 @@ "294e25": "55321d", "51c444": "facf81", "3f8147": "d38c43", - "0f0f0f": "0f0f0f", - "1f1f1f": "1f1f1f", "641e1c": "8c2f0a", "a23424": "bb5a2b", "ef5131": "f8975d", @@ -12,7 +10,6 @@ "cdcdcd": "ffd2cc", "42804b": "9d6b5b", "dd5800": "ffb676", - "192021": "192021", "fffff7": "ffd2cc", "eff3e6": "ffd2cc", "476b51": "704f4f", @@ -23,8 +20,6 @@ "294e25": "3f3399", "51c444": "90c3ea", "3f8147": "627bcd", - "0f0f0f": "0f0f0f", - "1f1f1f": "1f1f1f", "641e1c": "8c1f39", "a23424": "cb486d", "ef5131": "f77baf", @@ -32,9 +27,6 @@ "cdcdcd": "f8f3fe", "42804b": "9884d3", "dd5800": "f597cf", - "192021": "192021", - "fffff7": "fffff7", - "eff3e6": "eff3e6", "476b51": "f8f3fe", "262826": "9986b3", "3c5042": "cfbfe6" diff --git a/public/images/pokemon/variant/953.json b/public/images/pokemon/variant/953.json index 417229d550b..4e0efbdcefa 100644 --- a/public/images/pokemon/variant/953.json +++ b/public/images/pokemon/variant/953.json @@ -8,7 +8,6 @@ "37332b": "104139", "b96c26": "2f7410", "575244": "18734a", - "0f0f0f": "0f0f0f", "777463": "199e46", "4d4530": "b29c3e", "b0a766": "f9fba2", @@ -25,7 +24,6 @@ "37332b": "261031", "b96c26": "4792bd", "575244": "5e2d72", - "0f0f0f": "0f0f0f", "777463": "8358a1", "4d4530": "534b8c", "b0a766": "c9dbac", diff --git a/public/images/pokemon/variant/954.json b/public/images/pokemon/variant/954.json index efdb5836805..b79e72aef37 100644 --- a/public/images/pokemon/variant/954.json +++ b/public/images/pokemon/variant/954.json @@ -9,7 +9,6 @@ "f8f8f8": "fbf3ab", "3f4f5c": "523223", "5ea2c6": "7d4538", - "181818": "181818", "6bc0dd": "b05858", "98979d": "d9bd6f", "c94c5a": "159464", @@ -25,7 +24,6 @@ "f8f8f8": "432f77", "3f4f5c": "21214c", "5ea2c6": "616481", - "181818": "181818", "6bc0dd": "9e9fb6", "98979d": "221a4c", "c94c5a": "4c92c5", diff --git a/public/images/pokemon/variant/957.json b/public/images/pokemon/variant/957.json index aa15c60152b..943e7876c41 100644 --- a/public/images/pokemon/variant/957.json +++ b/public/images/pokemon/variant/957.json @@ -4,7 +4,6 @@ "ecd0d0": "f2d5cb", "aa848f": "ad858d", "312b33": "3f2319", - "0f0f0f": "0f0f0f", "ada1c5": "cb836c", "897194": "8b5745", "4a3670": "532835", @@ -12,8 +11,6 @@ "ae597d": "e07d97", "644f9b": "6a3443", "a74167": "993868", - "ec558c": "c65f7e", - "fcfcfc": "fcfcfc", - "585ea3": "585ea3" + "ec558c": "c65f7e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/958.json b/public/images/pokemon/variant/958.json index 6ac6a705fdd..52b921a4d39 100644 --- a/public/images/pokemon/variant/958.json +++ b/public/images/pokemon/variant/958.json @@ -3,12 +3,10 @@ "522e45": "201a3d", "ecd0d0": "f3e0ff", "aa848f": "c0b3e2", - "0f0f0f": "0f0f0f", "e991b5": "a074b0", "ec558c": "7a4889", "ae597d": "795bad", "a74167": "44306b", - "fcfcfc": "fcfcfc", "585ea3": "42895c", "312b33": "1e1d30", "ada1c5": "5b5a68", diff --git a/public/images/pokemon/variant/962.json b/public/images/pokemon/variant/962.json index 53dfdb4f11b..fa419376421 100644 --- a/public/images/pokemon/variant/962.json +++ b/public/images/pokemon/variant/962.json @@ -2,7 +2,6 @@ "0": { "342930": "3e1d26", "4a3942": "60354a", - "0f0f0f": "0f0f0f", "665b60": "924f57", "b9aaaf": "dd9f9d", "efe3e1": "f6cbc4", @@ -18,7 +17,6 @@ "1": { "342930": "1e382a", "4a3942": "395740", - "0f0f0f": "0f0f0f", "665b60": "404b22", "b9aaaf": "c6ca8e", "efe3e1": "e8e8c0", @@ -34,7 +32,6 @@ "2": { "342930": "754156", "4a3942": "a5777f", - "0f0f0f": "0f0f0f", "665b60": "211f45", "b9aaaf": "453863", "efe3e1": "67548a", diff --git a/public/images/pokemon/variant/967.json b/public/images/pokemon/variant/967.json index 5f527aa11fd..55d9a079729 100644 --- a/public/images/pokemon/variant/967.json +++ b/public/images/pokemon/variant/967.json @@ -3,28 +3,19 @@ "384a35": "464354", "1c2916": "272431", "54654e": "67637a", - "b9b7b3": "b9b7b3", - "0f0f0f": "0f0f0f", "f16b32": "bead9d", "607d6d": "6e76a9", "75b07d": "9299c7", - "fcfcfc": "fcfcfc", - "34453d": "444a71", - "323943": "323943", - "222328": "222328", - "4b565c": "4b565c", - "e2e9d7": "e2e9d7" + "34453d": "444a71" }, "2": { "384a35": "5d0c0c", "1c2916": "43060b", "54654e": "942d22", "b9b7b3": "c0ab8b", - "0f0f0f": "0f0f0f", "f16b32": "8c63d2", "607d6d": "6b2c31", "75b07d": "a95d50", - "fcfcfc": "fcfcfc", "34453d": "531d27", "323943": "502b2a", "222328": "371516", diff --git a/public/images/pokemon/variant/969.json b/public/images/pokemon/variant/969.json index e1f44ca1ddd..96e3e78e40c 100644 --- a/public/images/pokemon/variant/969.json +++ b/public/images/pokemon/variant/969.json @@ -8,7 +8,6 @@ "3d464b": "44111b", "4d6076": "6b1933", "ffff31": "dde4e6", - "0f0f0f": "0f0f0f", "5a869c": "bd2646", "635181": "527492", "453b4d": "2c445a", @@ -25,7 +24,6 @@ "3d464b": "2d293a", "4d6076": "433e53", "ffff31": "c0efff", - "0f0f0f": "0f0f0f", "5a869c": "656b8b", "635181": "193a1c", "453b4d": "0d240f", diff --git a/public/images/pokemon/variant/970.json b/public/images/pokemon/variant/970.json index 3eda121f7d1..1d1805163fd 100644 --- a/public/images/pokemon/variant/970.json +++ b/public/images/pokemon/variant/970.json @@ -5,7 +5,6 @@ "5de0aa": "fbce5d", "262b6b": "323b51", "3253d6": "577b81", - "0f0f0f": "0f0f0f", "a02c75": "3f4a6f", "2c369a": "435469", "e0548f": "758eb4", @@ -22,7 +21,6 @@ "5de0aa": "df543b", "262b6b": "bb7154", "3253d6": "ffedd1", - "0f0f0f": "0f0f0f", "a02c75": "1b3842", "2c369a": "e1a47a", "e0548f": "235c65", diff --git a/public/images/pokemon/variant/974.json b/public/images/pokemon/variant/974.json index 6d2662547de..bba74da0831 100644 --- a/public/images/pokemon/variant/974.json +++ b/public/images/pokemon/variant/974.json @@ -4,16 +4,12 @@ "bebaba": "ee9065", "524951": "661427", "efefef": "ffcc9e", - "0f0f0f": "0f0f0f", "a29793": "c85442", "a44667": "2c7193", "c7639c": "48aeba", "f493c9": "71e2d3", - "fcfcfc": "fcfcfc", "832041": "6a193e", - "c9c9c9": "c9c9c9", "cd394a": "ac5070", - "5e5e5e": "5e5e5e", "dc7569": "e37c8e" }, "2": { @@ -21,16 +17,12 @@ "bebaba": "2a607f", "524951": "172651", "efefef": "438aa0", - "0f0f0f": "0f0f0f", "a29793": "1c426b", "a44667": "ae664a", "c7639c": "daa470", "f493c9": "ffdfa1", - "fcfcfc": "fcfcfc", "832041": "433363", - "c9c9c9": "c9c9c9", "cd394a": "775b8c", - "5e5e5e": "5e5e5e", "dc7569": "a87fae" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/98.json b/public/images/pokemon/variant/98.json index 972444eae32..6f84619fbf2 100644 --- a/public/images/pokemon/variant/98.json +++ b/public/images/pokemon/variant/98.json @@ -4,27 +4,21 @@ "ffa563": "c466f3", "ff7331": "9359ca", "843110": "3e3662", - "101010": "101010", "5a4221": "231947", "735210": "534681", "ffdebd": "c3d6ff", - "dedede": "dedede", "e6bd8c": "9ba3d9", - "b58442": "7c72b6", - "ffffff": "ffffff" + "b58442": "7c72b6" }, "2": { "de524a": "2678b8", "ffa563": "5ce6f3", "ff7331": "4abbd4", "843110": "23457e", - "101010": "101010", "5a4221": "040522", "735210": "0d0e3c", "ffdebd": "4c549a", - "dedede": "dedede", "e6bd8c": "342b78", - "b58442": "1b1d62", - "ffffff": "ffffff" + "b58442": "1b1d62" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/981.json b/public/images/pokemon/variant/981.json index 32e3fac7aa9..38b46463253 100644 --- a/public/images/pokemon/variant/981.json +++ b/public/images/pokemon/variant/981.json @@ -7,11 +7,8 @@ "9ca0ab": "665144", "8b704c": "3d6186", "322513": "091e34", - "0f0f0f": "0f0f0f", "fff42f": "c29925", - "fcfcfc": "fcfcfc", "deb43d": "dec93d", - "a8abb3": "a8abb3", "775c10": "774f10", "b1a75c": "7e262d", "fdec8a": "9c3e3e", @@ -32,11 +29,8 @@ "9ca0ab": "9c5978", "8b704c": "e4efcf", "322513": "337142", - "0f0f0f": "0f0f0f", "fff42f": "ed9233", - "fcfcfc": "fcfcfc", "deb43d": "ebbb72", - "a8abb3": "a8abb3", "775c10": "b35127", "b1a75c": "1e7884", "fdec8a": "2a9d8f", diff --git a/public/images/pokemon/variant/982-three-segment.json b/public/images/pokemon/variant/982-three-segment.json index 37662044457..16869ca244a 100644 --- a/public/images/pokemon/variant/982-three-segment.json +++ b/public/images/pokemon/variant/982-three-segment.json @@ -2,7 +2,6 @@ "1": { "1e6d7d": "2a413f", "66c4c4": "748da4", - "101010": "101010", "2f959e": "4a6165", "735a41": "53575a", "f6e67b": "ececec", @@ -10,7 +9,6 @@ "debd39": "aeaeae", "5a6273": "5d6970", "bdcde6": "c1d7e2", - "f6ffff": "f6ffff", "fff6c5": "fdfdfd", "d5e6f6": "d8edf3", "bd7d9c": "bfab7c" @@ -18,7 +16,6 @@ "2": { "1e6d7d": "1d737a", "66c4c4": "b5f2ec", - "101010": "101010", "2f959e": "38a8a6", "735a41": "462a3e", "f6e67b": "db4069", diff --git a/public/images/pokemon/variant/982.json b/public/images/pokemon/variant/982.json index 5efd0b4a83b..f0115e44404 100644 --- a/public/images/pokemon/variant/982.json +++ b/public/images/pokemon/variant/982.json @@ -2,7 +2,6 @@ "1": { "1e6d7d": "2a413f", "66c4c4": "748da4", - "101010": "101010", "2f959e": "4a6165", "735a41": "53575a", "f6e67b": "ececec", @@ -10,7 +9,6 @@ "debd39": "aeaeae", "5a6273": "5d6970", "bdcde6": "c1d7e2", - "f6ffff": "f6ffff", "d5e6f6": "d8edf3", "fff6c5": "fdfdfd", "bd7d9c": "bfab7c" @@ -18,7 +16,6 @@ "2": { "1e6d7d": "1d737a", "66c4c4": "b5f2ec", - "101010": "101010", "2f959e": "38a8a6", "735a41": "462a3e", "f6e67b": "db4069", diff --git a/public/images/pokemon/variant/987.json b/public/images/pokemon/variant/987.json index d05c49d8f07..24be6175ad7 100644 --- a/public/images/pokemon/variant/987.json +++ b/public/images/pokemon/variant/987.json @@ -2,7 +2,6 @@ "0": { "8a378a": "9b490e", "ee93e8": "ffdd67", - "0f0f0f": "0f0f0f", "314a62": "244260", "182941": "132443", "b36cc1": "d3941a", @@ -12,13 +11,11 @@ "de62a4": "ffc668", "a4295a": "cc762f", "bd9431": "cb79dd", - "eee662": "ffc7ff", - "f9f9f9": "f9f9f9" + "eee662": "ffc7ff" }, "1": { "8a378a": "0c8086", "ee93e8": "3df7ed", - "0f0f0f": "0f0f0f", "314a62": "7396b4", "182941": "2c384d", "b36cc1": "1dbdb9", @@ -28,13 +25,11 @@ "de62a4": "ffdf90", "a4295a": "e28c27", "bd9431": "66d0e5", - "eee662": "a6f0f8", - "f9f9f9": "f9f9f9" + "eee662": "a6f0f8" }, "2": { "8a378a": "5d4a2f", "ee93e8": "fff7dd", - "0f0f0f": "0f0f0f", "314a62": "b56f2a", "182941": "603305", "b36cc1": "eece8c", @@ -44,7 +39,6 @@ "de62a4": "e25038", "a4295a": "a62a21", "bd9431": "66d0e5", - "eee662": "a6f0f8", - "f9f9f9": "f9f9f9" + "eee662": "a6f0f8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/988.json b/public/images/pokemon/variant/988.json index b19d419c2cc..8268e990e77 100644 --- a/public/images/pokemon/variant/988.json +++ b/public/images/pokemon/variant/988.json @@ -5,13 +5,9 @@ "7b2000": "0b334c", "d8a33f": "56e4ba", "efd165": "66e9c2", - "35384f": "35384f", - "465175": "465175", - "f1f7f7": "f1f7f7", "9ade1d": "d7d346", "d1fd77": "e2fd77", "f04137": "17b79f", - "181820": "181820", "a9a9ab": "92c9b9", "ff3121": "2c9484", "e63529": "23ae9a", diff --git a/public/images/pokemon/variant/99-gigantamax.json b/public/images/pokemon/variant/99-gigantamax.json index ecf9643d77c..7cc082c0d67 100644 --- a/public/images/pokemon/variant/99-gigantamax.json +++ b/public/images/pokemon/variant/99-gigantamax.json @@ -4,7 +4,6 @@ "f6c58b": "9f60d5", "832908": "3b1c69", "ee8b4a": "8853bf", - "101010": "101010", "735210": "534681", "fdfdfd": "ffdbdb", "e1d0db": "d5869b", @@ -21,7 +20,6 @@ "f6c58b": "75e0e8", "832908": "22447d", "ee8b4a": "43adc4", - "101010": "101010", "735210": "1e1743", "fdfdfd": "b1f1cf", "e1d0db": "73c1c2", diff --git a/public/images/pokemon/variant/99.json b/public/images/pokemon/variant/99.json index d907c0f85fc..33b04dbb06b 100644 --- a/public/images/pokemon/variant/99.json +++ b/public/images/pokemon/variant/99.json @@ -4,13 +4,10 @@ "842908": "3b1c69", "ef8c4a": "8853bf", "f7c58c": "9f60d5", - "101010": "101010", "4a3121": "1c1f46", "5a4231": "2c3c61", "b57b5a": "7c72b6", "735210": "534681", - "dedef7": "dedef7", - "ffffff": "ffffff", "ffe6b5": "c3d6ff", "efbd8c": "9ba3d9" }, @@ -19,13 +16,10 @@ "842908": "23457e", "ef8c4a": "43adc4", "f7c58c": "75e0e8", - "101010": "101010", "4a3121": "1b1e3b", "5a4231": "2b354e", "b57b5a": "231d51", "735210": "1e1743", - "dedef7": "dedef7", - "ffffff": "ffffff", "ffe6b5": "464d89", "efbd8c": "31296f" } diff --git a/public/images/pokemon/variant/993.json b/public/images/pokemon/variant/993.json index 74fb021387d..2ae7dd659e9 100644 --- a/public/images/pokemon/variant/993.json +++ b/public/images/pokemon/variant/993.json @@ -4,11 +4,9 @@ "7a787a": "f8f5e2", "463741": "754711", "4f4d51": "c59b4b", - "0f0f0f": "0f0f0f", "952b7d": "585a5c", "ff4dcb": "b7c6d6", "4a424a": "533310", - "333539": "333539", "fcfcfc": "ffffff", "20459b": "3c236a", "172e57": "160832", @@ -22,12 +20,9 @@ "7a787a": "a4bfbe", "463741": "2a545a", "4f4d51": "467678", - "0f0f0f": "0f0f0f", "952b7d": "873954", "ff4dcb": "e3bbd3", "4a424a": "1e2b37", - "333539": "333539", - "fcfcfc": "fcfcfc", "20459b": "600f40", "172e57": "470e2c", "86abf0": "ba1e51", diff --git a/public/images/pokemon/variant/994.json b/public/images/pokemon/variant/994.json index aeb03ed5d63..87ce90e2229 100644 --- a/public/images/pokemon/variant/994.json +++ b/public/images/pokemon/variant/994.json @@ -7,9 +7,7 @@ "626262": "696983", "5e2d4e": "ae7a24", "be5a83": "fdc263", - "181820": "181820", "874070": "d79a38", - "313139": "313139", "959595": "9b9bb6", "dbdadc": "d9d9ea", "36485a": "3f357c", @@ -21,13 +19,9 @@ "c77923": "00759b", "f29c46": "00bfe1", "fac173": "7bf2ff", - "626262": "626262", "5e2d4e": "6e2140", "be5a83": "ff5e5e", - "181820": "181820", "874070": "e72158", - "313139": "313139", - "959595": "959595", "dbdadc": "e9dac7", "36485a": "664338", "6a8795": "ff926c", diff --git a/public/images/pokemon/variant/995.json b/public/images/pokemon/variant/995.json index 95453040c50..8d4d6c3cea8 100644 --- a/public/images/pokemon/variant/995.json +++ b/public/images/pokemon/variant/995.json @@ -2,23 +2,18 @@ "1": { "99c350": "ddcb86", "c4de98": "f6eebd", - "0f0f0f": "0f0f0f", "3c571e": "4f4528", "4b792d": "7b6a31", "78913e": "8d7f54", "8caa48": "b6a674", "1d9b70": "6a267e", "03fd9f": "ca72e4", - "393538": "393538", "37bd7a": "9d3eb9", - "ddeed7": "e9d7ee", - "252323": "252323", - "504a4a": "504a4a" + "ddeed7": "e9d7ee" }, "2": { "99c350": "6b737b", "c4de98": "949ca5", - "0f0f0f": "0f0f0f", "3c571e": "26292b", "4b792d": "383c40", "78913e": "464b51", diff --git a/public/images/pokemon/variant/996.json b/public/images/pokemon/variant/996.json index 9aeb5942284..e6311b9bdf9 100644 --- a/public/images/pokemon/variant/996.json +++ b/public/images/pokemon/variant/996.json @@ -7,7 +7,6 @@ "af9b0a": "3b69d3", "f9d800": "30d1ff", "dedfde": "b7926b", - "0f0f0f": "0f0f0f", "9c979c": "8f6049", "8ebbb7": "8f6049", "c2e7e9": "b7926b", @@ -23,9 +22,6 @@ "8f99a3": "ceccef", "af9b0a": "b4425a", "f9d800": "ff6767", - "dedfde": "dedfde", - "0f0f0f": "0f0f0f", - "9c979c": "9c979c", "8ebbb7": "ca6d2a", "c2e7e9": "fcb925", "725e16": "2a3064", diff --git a/public/images/pokemon/variant/997.json b/public/images/pokemon/variant/997.json index eb2acdbae7d..f4a3efc5cf4 100644 --- a/public/images/pokemon/variant/997.json +++ b/public/images/pokemon/variant/997.json @@ -6,11 +6,9 @@ "5b6f8a": "2e4042", "7da6a6": "8f6049", "6695e3": "325747", - "0f0f0f": "0f0f0f", "ffd14a": "30d1ff", "da9123": "3b69d3", "4b7a9a": "293b39", - "ffffff": "ffffff", "3a637e": "1e2c2f", "643620": "705c39", "f47d2f": "c5a64d", @@ -23,11 +21,9 @@ "5b6f8a": "524f60", "7da6a6": "ca6d2a", "6695e3": "e6e6eb", - "0f0f0f": "0f0f0f", "ffd14a": "ff6767", "da9123": "b4425a", "4b7a9a": "a09ec1", - "ffffff": "ffffff", "3a637e": "756c98", "643620": "2a3064", "f47d2f": "2984e8", diff --git a/public/images/pokemon/variant/998.json b/public/images/pokemon/variant/998.json index 19257d173aa..4d1a752ab09 100644 --- a/public/images/pokemon/variant/998.json +++ b/public/images/pokemon/variant/998.json @@ -11,7 +11,6 @@ "3a4149": "413c41", "f7c600": "30d1ff", "262426": "2a272c", - "141414": "141414", "8d292c": "705c39", "ea3745": "c5a64d" }, @@ -27,7 +26,6 @@ "3a4149": "215ecd", "f7c600": "ff6767", "262426": "223992", - "141414": "141414", "8d292c": "33468c", "ea3745": "2984e8" } diff --git a/public/images/pokemon/variant/999.json b/public/images/pokemon/variant/999.json index a0cbb5f322a..b6c95c3db01 100644 --- a/public/images/pokemon/variant/999.json +++ b/public/images/pokemon/variant/999.json @@ -6,7 +6,6 @@ "545b6b": "1e2e60", "ddc126": "d52d70", "783a52": "4b0f01", - "0f0f0f": "0f0f0f", "ac4454": "ab461e", "bfa33e": "bc1457", "8a8f9f": "34497e", @@ -23,13 +22,10 @@ "545b6b": "415073", "ddc126": "728295", "783a52": "4f2e5c", - "0f0f0f": "0f0f0f", "ac4454": "794e83", "bfa33e": "485466", "8a8f9f": "8bb0ab", "b9becd": "afd2ca", - "bac4d8": "bac4d8", - "7a82a9": "7a82a9", "a59227": "9c9cbe", "745527": "302d62" }, @@ -40,13 +36,10 @@ "545b6b": "6467a8", "ddc126": "4e85bf", "783a52": "6d6594", - "0f0f0f": "0f0f0f", "ac4454": "bcb9d6", "bfa33e": "294f7e", "8a8f9f": "a5ace8", "b9becd": "dae0f3", - "bac4d8": "bac4d8", - "7a82a9": "7a82a9", "a59227": "b6d0d7", "745527": "1c394d" } diff --git a/public/images/pokemon/variant/back/1.json b/public/images/pokemon/variant/back/1.json index 895bcad4e6d..81843438dfe 100644 --- a/public/images/pokemon/variant/back/1.json +++ b/public/images/pokemon/variant/back/1.json @@ -6,10 +6,8 @@ "bdff73": "ffc5a3", "a5d642": "ff745e", "63d6b5": "de3570", - "101010": "101010", "73ad31": "b34952", - "3a9494": "9c195c", - "ffffff": "ffffff" + "3a9494": "9c195c" }, "2": { "526329": "022e59", @@ -18,9 +16,7 @@ "bdff73": "befaf1", "a5d642": "80c3d9", "63d6b5": "faac05", - "101010": "101010", "73ad31": "446b94", - "3a9494": "d46d00", - "ffffff": "ffffff" + "3a9494": "d46d00" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/100.json b/public/images/pokemon/variant/back/100.json index 6203c3cfa54..ed53410ee28 100644 --- a/public/images/pokemon/variant/back/100.json +++ b/public/images/pokemon/variant/back/100.json @@ -1,6 +1,5 @@ { "1": { - "841010": "841010", "ffad9c": "fffdd7", "ff845a": "ffd86f", "ff5221": "f0b64a", @@ -8,8 +7,7 @@ "d63142": "c76d14", "b5adbd": "d6b0a5", "ded6d6": "f7e4da", - "ffffff": "fffdfb", - "101010": "101010" + "ffffff": "fffdfb" }, "2": { "841010": "27145d", @@ -20,7 +18,6 @@ "d63142": "482683", "b5adbd": "94b1c9", "ded6d6": "cde3ef", - "ffffff": "f3fdff", - "101010": "101010" + "ffffff": "f3fdff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/1000.json b/public/images/pokemon/variant/back/1000.json index 8149392d9b6..4f27d5ea595 100644 --- a/public/images/pokemon/variant/back/1000.json +++ b/public/images/pokemon/variant/back/1000.json @@ -1,7 +1,6 @@ { "0": { "b78234": "a64700", - "121212": "121212", "e0b81a": "d05c31", "f9d95b": "ee883f", "623c20": "6d1906", @@ -11,12 +10,10 @@ "762534": "5d0d05", "9c3e43": "6d1906", "323437": "531f03", - "545b6b": "8f4a14", - "0f0f0f": "0f0f0f" + "545b6b": "8f4a14" }, "1": { "b78234": "7a4e5d", - "121212": "121212", "e0b81a": "96747e", "f9d95b": "e1ced1", "623c20": "622f43", @@ -26,22 +23,18 @@ "762534": "513a59", "9c3e43": "7f6086", "323437": "1d2c54", - "545b6b": "415073", - "0f0f0f": "0f0f0f" + "545b6b": "415073" }, "2": { "b78234": "5a9aa3", - "121212": "121212", "e0b81a": "89d1d6", "f9d95b": "e5fffc", "623c20": "3d717b", - "ffffff": "ffffff", "b4a45e": "36465f", "918344": "1f3149", "762534": "547995", "9c3e43": "7e93b0", "323437": "212857", - "545b6b": "495890", - "0f0f0f": "0f0f0f" + "545b6b": "495890" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/1001.json b/public/images/pokemon/variant/back/1001.json index 4aa4f62bf62..e98d729116e 100644 --- a/public/images/pokemon/variant/back/1001.json +++ b/public/images/pokemon/variant/back/1001.json @@ -7,7 +7,6 @@ "8c979d": "a19775", "a28b76": "383734", "7e615a": "1f1e1c", - "0f0f0f": "0f0f0f", "618044": "9e4b28", "76b458": "de7e52", "524a36": "6e4105", @@ -22,7 +21,6 @@ "8c979d": "9f88b3", "a28b76": "fce6f0", "7e615a": "e6aec8", - "0f0f0f": "0f0f0f", "618044": "e170a1", "76b458": "f5bede", "524a36": "420f0f", diff --git a/public/images/pokemon/variant/back/1003.json b/public/images/pokemon/variant/back/1003.json index a7216e678f1..10746b80ec9 100644 --- a/public/images/pokemon/variant/back/1003.json +++ b/public/images/pokemon/variant/back/1003.json @@ -4,7 +4,6 @@ "a6b4a7": "e7cb7e", "73958b": "daa666", "486863": "be8550", - "0f0f0f": "0f0f0f", "5e4622": "352831", "5c3127": "861d0f", "8c6140": "ff7d59", @@ -19,7 +18,6 @@ "a6b4a7": "cfa0f3", "73958b": "8d6acc", "486863": "6c4aac", - "0f0f0f": "0f0f0f", "5e4622": "434377", "5c3127": "313246", "8c6140": "767a7e", diff --git a/public/images/pokemon/variant/back/1004.json b/public/images/pokemon/variant/back/1004.json index 16c69b047b5..8e2df2d0163 100644 --- a/public/images/pokemon/variant/back/1004.json +++ b/public/images/pokemon/variant/back/1004.json @@ -2,7 +2,6 @@ "1": { "a23724": "b06f00", "f4342f": "f2b200", - "0f0f0f": "0f0f0f", "f35e38": "ffc81b", "f9824f": "ffe13a", "f0a755": "ffe86b", @@ -13,13 +12,11 @@ "5b985a": "5c71c1", "83b884": "7a9ae0", "3c3f3a": "27276a", - "487447": "394d9a", - "f8f8f0": "f8f8f0" + "487447": "394d9a" }, "2": { "a23724": "76074d", "f4342f": "a525d3", - "0f0f0f": "0f0f0f", "f35e38": "3449f6", "f9824f": "49c9f6", "f0a755": "79f6a1", @@ -30,7 +27,6 @@ "5b985a": "b09f97", "83b884": "d7cbb5", "3c3f3a": "4b4444", - "487447": "84736f", - "f8f8f0": "f8f8f0" + "487447": "84736f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/1006.json b/public/images/pokemon/variant/back/1006.json index c03a810dcec..04d4a5e9aae 100644 --- a/public/images/pokemon/variant/back/1006.json +++ b/public/images/pokemon/variant/back/1006.json @@ -3,8 +3,6 @@ "293549": "2a224e", "6db1b5": "585995", "4a8484": "3e2d63", - "f8f8f8": "f8f8f8", - "030303": "030303", "214c1f": "483d5c", "59b56a": "c2c8dc", "3f845a": "79728e", @@ -13,7 +11,6 @@ "b0accf": "27678e", "ff5098": "a5ffd4", "fcfcfc": "36a5aa", - "81899c": "81899c", "eeb1dd": "fbfffc", "585f6a": "2a224e" } diff --git a/public/images/pokemon/variant/back/1008-ultimate-mode.json b/public/images/pokemon/variant/back/1008-ultimate-mode.json index ce46761068e..300c4e5fae9 100644 --- a/public/images/pokemon/variant/back/1008-ultimate-mode.json +++ b/public/images/pokemon/variant/back/1008-ultimate-mode.json @@ -1,56 +1,43 @@ { "0": { "4ba5cf": "8955b5", - "fefefe": "fefefe", "d7c2c1": "d7c3f7", "c883d1": "7fd8cf", - "0e0e12": "0e0e12", "1a1c42": "393a3e", "5c4370": "3e446d", "fcdf14": "427eff", - "e6e3f2": "e6e3f2", - "878594": "878594", "4d3672": "858585", - "c1bddf": "c1bddf", "643fa3": "c8c8c8", "392855": "616161", - "2e3176": "868686", - "25173d": "25173d" + "2e3176": "868686" }, "1": { "4ba5cf": "31808e", "fefefe": "ffffc9", "d7c2c1": "b3e2d0", "c883d1": "ade263", - "0e0e12": "0e0e12", "1a1c42": "184433", "5c4370": "3b5c63", "fcdf14": "2cc151", - "e6e3f2": "e6e3f2", "878594": "89a5ff", "4d3672": "444b66", "c1bddf": "b7d8ff", "643fa3": "626877", "392855": "393e51", - "2e3176": "3aff75", - "25173d": "25173d" + "2e3176": "3aff75" }, "2": { "4ba5cf": "8e3c84", "fefefe": "ffd8ff", "d7c2c1": "ff93d4", "c883d1": "ffc26d", - "0e0e12": "0e0e12", "1a1c42": "29253f", - "5c4370": "5c4370", "fcdf14": "cc5767", - "e6e3f2": "e6e3f2", "878594": "ad9e9d", "4d3672": "2a3768", "c1bddf": "e0e0e0", "643fa3": "3b4986", "392855": "192142", - "2e3176": "cf3e57", - "25173d": "25173d" + "2e3176": "cf3e57" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/101.json b/public/images/pokemon/variant/back/101.json index 0dad4f6c88d..73e31735422 100644 --- a/public/images/pokemon/variant/back/101.json +++ b/public/images/pokemon/variant/back/101.json @@ -3,28 +3,23 @@ "5a5252": "683f3c", "efefef": "f7e4da", "cecede": "d6b0a5", - "101010": "101010", "a59c9c": "8f7a6f", - "f7a58c": "f7a58c", "d68494": "d59679", "ff5221": "f0b64a", "e63a31": "dd932b", "c52942": "c76d14", - "841010": "983d00", - "ffffff": "ffffff" + "841010": "983d00" }, "2": { "5a5252": "384c6a", "efefef": "cde3ef", "cecede": "94b1c9", - "101010": "101010", "a59c9c": "7993b1", "f7a58c": "c27bec", "d68494": "887db5", "ff5221": "7240a2", "e63a31": "5c3295", "c52942": "482683", - "841010": "27145d", - "ffffff": "ffffff" + "841010": "27145d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/1010.json b/public/images/pokemon/variant/back/1010.json index bc8248c6576..e0fed348d1e 100644 --- a/public/images/pokemon/variant/back/1010.json +++ b/public/images/pokemon/variant/back/1010.json @@ -1,6 +1,5 @@ { "1": { - "0b0b0b": "0b0b0b", "1e5238": "63193a", "39804b": "943a5a", "69b95b": "d6637b", @@ -11,11 +10,9 @@ "343631": "313436", "c0c1be": "bec1c0", "ff5f7c": "638c10", - "ffb2c0": "9cce52", - "1d1d1c": "1d1d1c" + "ffb2c0": "9cce52" }, "2": { - "0b0b0b": "0b0b0b", "1e5238": "834b04", "39804b": "a4790a", "69b95b": "bba010", @@ -26,7 +23,6 @@ "343631": "54544c", "c0c1be": "eeeeee", "ff5f7c": "e565fd", - "ffb2c0": "eeeeee", - "1d1d1c": "1d1d1c" + "ffb2c0": "eeeeee" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/1018.json b/public/images/pokemon/variant/back/1018.json index 70f9c5a2f50..a3748b6b543 100644 --- a/public/images/pokemon/variant/back/1018.json +++ b/public/images/pokemon/variant/back/1018.json @@ -2,7 +2,6 @@ "1": { "7a3d3e": "871e14", "c94747": "ed7746", - "151515": "151515", "101d3a": "081f16", "243c79": "1d542f", "295098": "3b814a", @@ -19,12 +18,8 @@ "2": { "7a3d3e": "062449", "c94747": "2077a6", - "151515": "151515", "101d3a": "062449", - "243c79": "243c79", - "295098": "295098", "544a6f": "1a0e34", - "1e2c59": "1e2c59", "ffdf9d": "6df4ff", "bb7944": "28b9dc", "e0e0ed": "8075c1", diff --git a/public/images/pokemon/variant/back/1023.json b/public/images/pokemon/variant/back/1023.json index 09ce8fa2132..9ef53b06171 100644 --- a/public/images/pokemon/variant/back/1023.json +++ b/public/images/pokemon/variant/back/1023.json @@ -2,35 +2,29 @@ "1": { "89570c": "52766a", "00a6ad": "92c72a", - "050505": "050505", "f0c720": "c5f6e6", "62f7f7": "bcfb3f", "b4961f": "88b8a8", - "f9ffff": "f9ffff", "163d43": "133453", "45cbc8": "5ca6ea", "389cad": "3673aa", "206477": "285883", "858ca7": "7b7b7b", "c9cfda": "bdbdbd", - "242322": "242322", "454a54": "4f4d4d" }, "2": { "89570c": "627675", "00a6ad": "852098", - "050505": "050505", "f0c720": "b6d4d2", "62f7f7": "d046e8", "b4961f": "9bb4b3", - "f9ffff": "f9ffff", "163d43": "5c3c06", "45cbc8": "d9cd25", "389cad": "c1991d", "206477": "94670d", "858ca7": "a9a7a2", "c9cfda": "d5d5d1", - "242322": "242322", "454a54": "72716d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/111.json b/public/images/pokemon/variant/back/111.json index 24a94b7145d..27474254759 100644 --- a/public/images/pokemon/variant/back/111.json +++ b/public/images/pokemon/variant/back/111.json @@ -4,19 +4,13 @@ "bdbdce": "6a547a", "8484ad": "402f51", "3a3a52": "261e2d", - "101010": "101010", - "e6e6ef": "9781ab", - "ffffff": "ffffff", - "ad3a29": "ad3a29" + "e6e6ef": "9781ab" }, "2": { "5a5a7b": "ab4355", "bdbdce": "e18db3", "8484ad": "d76688", "3a3a52": "6d2935", - "101010": "101010", - "e6e6ef": "f7b4d1", - "ffffff": "ffffff", - "ad3a29": "ad3a29" + "e6e6ef": "f7b4d1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/112.json b/public/images/pokemon/variant/back/112.json index c983447afce..b1ad7e99b19 100644 --- a/public/images/pokemon/variant/back/112.json +++ b/public/images/pokemon/variant/back/112.json @@ -3,24 +3,18 @@ "52525a": "3c2945", "c5c5bd": "6a547a", "8c8c94": "523c5c", - "101010": "101010", "e6e6de": "9781ab", "735a31": "6b6373", "e6d6ad": "cecede", - "b5a573": "948cad", - "ffffff": "ffffff", - "e6523a": "e6523a" + "b5a573": "948cad" }, "2": { "52525a": "642224", "c5c5bd": "cb568a", "8c8c94": "ab3f5c", - "101010": "101010", "e6e6de": "ef86b5", "735a31": "6d586d", "e6d6ad": "dacad3", - "b5a573": "be9bb6", - "ffffff": "ffffff", - "e6523a": "e6523a" + "b5a573": "be9bb6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/113.json b/public/images/pokemon/variant/back/113.json index 1d1a74731c7..2f83d9e4ab0 100644 --- a/public/images/pokemon/variant/back/113.json +++ b/public/images/pokemon/variant/back/113.json @@ -4,7 +4,6 @@ "ffd6d6": "f6caec", "ffadad": "cc96c5", "8c4242": "6b279e", - "101010": "101010", "ff845a": "c164e4", "ef5a31": "953fc7" }, @@ -13,7 +12,6 @@ "ffd6d6": "f8c8e3", "ffadad": "e5a5ce", "8c4242": "61020c", - "101010": "101010", "ff845a": "d33128", "ef5a31": "a3091a" }, @@ -22,7 +20,6 @@ "ffd6d6": "d7baec", "ffadad": "ac8fc4", "8c4242": "204b7d", - "101010": "101010", "ff845a": "567bbf", "ef5a31": "204b7d" } diff --git a/public/images/pokemon/variant/back/114.json b/public/images/pokemon/variant/back/114.json index 9b04d485b01..b24b70c2032 100644 --- a/public/images/pokemon/variant/back/114.json +++ b/public/images/pokemon/variant/back/114.json @@ -2,7 +2,6 @@ "1": { "214252": "442152", "5aa5ce": "755ace", - "101010": "101010", "94d6f7": "a479ff", "427b94": "654294", "732929": "2b7329", @@ -12,7 +11,6 @@ "2": { "214252": "705040", "5aa5ce": "ebc582", - "101010": "101010", "94d6f7": "ffedb6", "427b94": "ad875a", "732929": "332119", diff --git a/public/images/pokemon/variant/back/116.json b/public/images/pokemon/variant/back/116.json index f19c6b2b98e..e36ac1629fa 100644 --- a/public/images/pokemon/variant/back/116.json +++ b/public/images/pokemon/variant/back/116.json @@ -3,10 +3,7 @@ "3a5263": "1f4f3e", "a5c5ef": "5bab65", "6b94b5": "3d7b4f", - "101010": "101010", - "ffffff": "ffffff", "c52929": "34b9af", - "d6d6d6": "d6d6d6", "bddeff": "7ed683", "9c844a": "548133", "dec54a": "91bf49", @@ -16,10 +13,7 @@ "3a5263": "cf7d3a", "a5c5ef": "ffe675", "6b94b5": "edb766", - "101010": "101010", - "ffffff": "ffffff", "c52929": "9973c7", - "d6d6d6": "d6d6d6", "bddeff": "fffaa1", "9c844a": "314e5e", "dec54a": "4e878a", diff --git a/public/images/pokemon/variant/back/117.json b/public/images/pokemon/variant/back/117.json index ff7bebd575a..49ff752ece2 100644 --- a/public/images/pokemon/variant/back/117.json +++ b/public/images/pokemon/variant/back/117.json @@ -1,28 +1,22 @@ { "1": { "7b6321": "3f8a49", - "101010": "101010", "ffffad": "b5e37f", "dec552": "87c563", "4a6b84": "143c4f", "21425a": "122647", "a5cee6": "45b38f", "84adce": "2e8b7b", - "6b849c": "185461", - "ffffff": "ffffff", - "9c9c9c": "9c9c9c" + "6b849c": "185461" }, "2": { "7b6321": "4e878a", - "101010": "101010", "ffffad": "b3f2d8", "dec552": "7bc9bb", "4a6b84": "c74c4c", "21425a": "702525", "a5cee6": "ffd166", "84adce": "ffab66", - "6b849c": "f2705c", - "ffffff": "ffffff", - "9c9c9c": "9c9c9c" + "6b849c": "f2705c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/118.json b/public/images/pokemon/variant/back/118.json index 9f221892b82..ff3e6b6af61 100644 --- a/public/images/pokemon/variant/back/118.json +++ b/public/images/pokemon/variant/back/118.json @@ -2,7 +2,6 @@ "0": { "52525a": "734733", "ffffff": "fff7ee", - "101010": "101010", "8c8c94": "966f58", "efefef": "e7d7c9", "d6d6de": "cbb7aa", @@ -17,7 +16,6 @@ "1": { "52525a": "492d5c", "ffffff": "e7d1ea", - "101010": "101010", "8c8c94": "6c5277", "efefef": "b9a0bf", "d6d6de": "947c9c", @@ -32,7 +30,6 @@ "2": { "52525a": "2b4a54", "ffffff": "d5e6e4", - "101010": "101010", "8c8c94": "526d71", "efefef": "aecac8", "d6d6de": "84a0a1", diff --git a/public/images/pokemon/variant/back/119.json b/public/images/pokemon/variant/back/119.json index 058ebc50e1c..2af5fde5a79 100644 --- a/public/images/pokemon/variant/back/119.json +++ b/public/images/pokemon/variant/back/119.json @@ -3,8 +3,6 @@ "8c7b84": "966f58", "f7f7ff": "fff7ee", "dedee6": "e7d7c9", - "ffdebd": "ffdebd", - "101010": "101010", "943119": "794708", "c54229": "d6952e", "52525a": "522b23", @@ -18,7 +16,6 @@ "f7f7ff": "e7d1ea", "dedee6": "b9a0bf", "ffdebd": "bd9fc6", - "101010": "101010", "943119": "39195d", "c54229": "7e3eb1", "52525a": "39195d", @@ -32,7 +29,6 @@ "f7f7ff": "d5e6e4", "dedee6": "aecac8", "ffdebd": "b8cecd", - "101010": "101010", "943119": "174027", "c54229": "32723f", "52525a": "2b4a54", diff --git a/public/images/pokemon/variant/back/120.json b/public/images/pokemon/variant/back/120.json index 3b40ba1cfd8..3efc6d5cdcf 100644 --- a/public/images/pokemon/variant/back/120.json +++ b/public/images/pokemon/variant/back/120.json @@ -1,7 +1,6 @@ { "1": { "633131": "07293b", - "000000": "000000", "9c6b3a": "1b7272", "deb563": "4bd09b", "7b523a": "0f4c58", @@ -13,7 +12,6 @@ }, "2": { "633131": "1d5198", - "000000": "000000", "9c6b3a": "3eb7e5", "deb563": "9cffff", "7b523a": "2c81bc", diff --git a/public/images/pokemon/variant/back/121.json b/public/images/pokemon/variant/back/121.json index 7679498bfa0..fcd42e83f1a 100644 --- a/public/images/pokemon/variant/back/121.json +++ b/public/images/pokemon/variant/back/121.json @@ -4,15 +4,13 @@ "313a73": "631c26", "d6adef": "ffc5b4", "8c73bd": "de6262", - "b58cd6": "ee9494", - "000000": "000000" + "b58cd6": "ee9494" }, "2": { "5a529c": "9eb4ff", "313a73": "597cdb", "d6adef": "ffffff", "8c73bd": "c5d5ff", - "b58cd6": "d6e8ff", - "000000": "000000" + "b58cd6": "d6e8ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/123.json b/public/images/pokemon/variant/back/123.json index 81f615bcd45..e937d728471 100644 --- a/public/images/pokemon/variant/back/123.json +++ b/public/images/pokemon/variant/back/123.json @@ -5,43 +5,22 @@ "e6d6ad": "b5b5ce", "9c8c31": "632929", "8cce73": "f76b6b", - "101010": "101010", "fff7d6": "ffffff", "5a9c4a": "d63a3a", - "bdbdbd": "bdbdbd", - "c5a573": "b5b5ce", - "dedede": "dedede", - "ffffff": "ffffff", - "737373": "737373" + "c5a573": "b5b5ce" }, "1": { "425a21": "484e75", "bde673": "bdbdbd", - "e6d6ad": "e6d6ad", - "9c8c31": "9c8c31", "8cce73": "92b0db", - "101010": "101010", - "fff7d6": "fff7d6", "5a9c4a": "7b94d6", "bdbdbd": "ffffff", - "c5a573": "9cc5ff", - "dedede": "dedede", - "ffffff": "ffffff", - "737373": "737373" + "c5a573": "9cc5ff" }, "2": { "425a21": "8f3907", "bde673": "f8f581", - "e6d6ad": "e6d6ad", - "9c8c31": "9c8c31", "8cce73": "f0c947", - "101010": "101010", - "fff7d6": "fff7d6", - "5a9c4a": "e6a027", - "bdbdbd": "bdbdbd", - "c5a573": "c5a573", - "dedede": "dedede", - "ffffff": "ffffff", - "737373": "737373" + "5a9c4a": "e6a027" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/125.json b/public/images/pokemon/variant/back/125.json index 8933b2e4c58..9e2994e265d 100644 --- a/public/images/pokemon/variant/back/125.json +++ b/public/images/pokemon/variant/back/125.json @@ -2,25 +2,20 @@ "0": { "5a4a08": "752c0b", "ffe63a": "ff8b3a", - "101010": "101010", "e6c521": "e66a21", "c5a510": "b34d2b", "fff7b5": "ffd4b5", "3a4252": "3f3a52", "6b6b63": "57526e", - "ffffff": "ffffff", "c5c5d6": "c8c5d6" }, "1": { "5a4a08": "235c3c", "ffe63a": "59f7d0", - "101010": "101010", "e6c521": "43e6b7", "c5a510": "2dbd73", "fff7b5": "c8ffea", "3a4252": "424554", - "6b6b63": "6a6982", - "ffffff": "ffffff", - "c5c5d6": "c5c5d6" + "6b6b63": "6a6982" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/126.json b/public/images/pokemon/variant/back/126.json index c636ff760ad..e96a2a1866e 100644 --- a/public/images/pokemon/variant/back/126.json +++ b/public/images/pokemon/variant/back/126.json @@ -4,13 +4,9 @@ "ffef4a": "eaffff", "7b5231": "699296", "e6bd31": "c6edf2", - "636363": "636363", - "ffffff": "ffffff", "ff4a31": "5398cf", "ce1042": "4065b0", "6b2121": "303d58", - "c5c5c5": "c5c5c5", - "000000": "000000", "ff8c63": "81c9e6", "ee442d": "5398cf", "ffcebd": "cabac8", diff --git a/public/images/pokemon/variant/back/127-mega.json b/public/images/pokemon/variant/back/127-mega.json index 855390b8f37..fa6cade9e21 100644 --- a/public/images/pokemon/variant/back/127-mega.json +++ b/public/images/pokemon/variant/back/127-mega.json @@ -4,33 +4,21 @@ "847163": "7e5649", "d6c7b5": "d29f88", "efe7ce": "eccb90", - "000000": "000000", - "ee8329": "ee8329", - "cd5241": "cd5241", "5a4131": "172a22", "c6ae8c": "72988e", "a58e6b": "54796f", "846952": "3b554d", - "ffde62": "ffde62", - "ac9441": "ac9441", - "837362": "7e5649", - "ffffff": "ffffff" + "837362": "7e5649" }, "2": { "4a4139": "484848", "847163": "868686", "d6c7b5": "d5d5d5", "efe7ce": "ffffff", - "000000": "000000", - "ee8329": "ee8329", - "cd5241": "cd5241", "5a4131": "5c0026", "c6ae8c": "d56a70", "a58e6b": "b44954", "846952": "8c2c40", - "ffde62": "ffde62", - "ac9441": "ac9441", - "837362": "868686", - "ffffff": "ffffff" + "837362": "868686" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/127.json b/public/images/pokemon/variant/back/127.json index f49fb93e217..c094c7713de 100644 --- a/public/images/pokemon/variant/back/127.json +++ b/public/images/pokemon/variant/back/127.json @@ -5,13 +5,11 @@ "efe6ce": "eccb90", "4a423a": "441a0f", "d6c5b5": "d29f88", - "000000": "000000", "5a4231": "172a22", "e6d6b5": "92bab1", "c5ad8c": "72988e", "846b52": "3b554d", - "a58c6b": "54796f", - "ffffff": "ffffff" + "a58c6b": "54796f" }, "2": { "b5a594": "b7b7b7", @@ -19,12 +17,10 @@ "efe6ce": "ffffff", "4a423a": "484848", "d6c5b5": "d5d5d5", - "000000": "000000", "5a4231": "5c0026", "e6d6b5": "fa958c", "c5ad8c": "d56a70", "846b52": "8c2c40", - "a58c6b": "b44954", - "ffffff": "ffffff" + "a58c6b": "b44954" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/129.json b/public/images/pokemon/variant/back/129.json index d73f104ed91..7e9821bf337 100644 --- a/public/images/pokemon/variant/back/129.json +++ b/public/images/pokemon/variant/back/129.json @@ -1,7 +1,6 @@ { "1": { "7b6352": "a6452e", - "000000": "000000", "ffde29": "f0a475", "c5ad73": "d0784b", "840042": "312b45", @@ -17,7 +16,6 @@ }, "2": { "7b6352": "94836f", - "000000": "000000", "ffde29": "fffef3", "c5ad73": "e2d9c0", "840042": "6c0261", @@ -28,7 +26,6 @@ "ceced6": "d1bae7", "ffffff": "f9efff", "525263": "74619a", - "8c8ca5": "af97ce", - "ffefa5": "ffefa5" + "8c8ca5": "af97ce" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/130-mega.json b/public/images/pokemon/variant/back/130-mega.json index 1e091a7a55f..47217f75dc6 100644 --- a/public/images/pokemon/variant/back/130-mega.json +++ b/public/images/pokemon/variant/back/130-mega.json @@ -5,15 +5,10 @@ "44b4f4": "eea747", "826c4d": "90665d", "f8eaba": "fff3ec", - "0d0d0d": "0d0d0d", "cdac7b": "bd9b8e", "992137": "8691d5", "e6414a": "c9d4ff", - "202020": "202020", - "2b2d33": "682a23", - "3c3f47": "3c3f47", - "c3c3c3": "c3c3c3", - "202226": "202226" + "2b2d33": "682a23" }, "2": { "207cc1": "582c81", @@ -21,14 +16,10 @@ "44b4f4": "7b43a1", "826c4d": "855a71", "f8eaba": "ffedf4", - "0d0d0d": "0d0d0d", "cdac7b": "d7aec0", "992137": "a62869", "e6414a": "e15693", - "202020": "202020", - "2b2d33": "2b2d33", "3c3f47": "c07d4a", - "c3c3c3": "ddb07a", - "202226": "202226" + "c3c3c3": "ddb07a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/130.json b/public/images/pokemon/variant/back/130.json index 088d8ca68c4..50f4527f1d7 100644 --- a/public/images/pokemon/variant/back/130.json +++ b/public/images/pokemon/variant/back/130.json @@ -2,20 +2,17 @@ "1": { "737b7b": "93776f", "f7f7f7": "fff3ec", - "191919": "191919", "d6def7": "d2bdb4", "194273": "873503", "218cad": "cd7c1b", "196394": "a85104", "42b5ef": "f2aa45", "f7e6ad": "fff3ec", - "ceb57b": "bd9b8e", - "5a4221": "5a4221" + "ceb57b": "bd9b8e" }, "2": { "737b7b": "ad6c94", "f7f7f7": "ffe8f4", - "191919": "191919", "d6def7": "f3c3de", "194273": "1f0a47", "218cad": "5e2b97", diff --git a/public/images/pokemon/variant/back/131-gigantamax.json b/public/images/pokemon/variant/back/131-gigantamax.json index 99ccd7f45d5..4b15e8f581a 100644 --- a/public/images/pokemon/variant/back/131-gigantamax.json +++ b/public/images/pokemon/variant/back/131-gigantamax.json @@ -3,14 +3,11 @@ "184152": "133363", "41a4e6": "85cfef", "73c5f6": "ffc0e7", - "101010": "101010", "397ba4": "3989b0", - "fffad6": "fffad6", "51fffb": "ff8de5", "8ba494": "a7b2ab", "52526a": "3c1838", "dec583": "dac99e", - "fefefe": "fefefe", "d5cdc5": "cb88b0", "a49494": "844a73", "807573": "6b3768", @@ -20,14 +17,11 @@ "184152": "06383e", "41a4e6": "49b18c", "73c5f6": "8bd3b6", - "101010": "101010", "397ba4": "3a8770", - "fffad6": "fffad6", "51fffb": "0085b2", "8ba494": "8ca594", "52526a": "282548", "dec583": "baafaa", - "fefefe": "fefefe", "d5cdc5": "969dbc", "a49494": "666b8b", "807573": "454565", diff --git a/public/images/pokemon/variant/back/131.json b/public/images/pokemon/variant/back/131.json index fc364e9a423..4f39e2730c6 100644 --- a/public/images/pokemon/variant/back/131.json +++ b/public/images/pokemon/variant/back/131.json @@ -2,15 +2,12 @@ "1": { "194252": "133363", "73c5f7": "c4f6ff", - "000000": "000000", "42a5e6": "85cfef", "3a7ba5": "408aaf", - "f7efe6": "f7efe6", "6b5219": "b83e94", "d6cec5": "cb88b0", "8ca594": "a7b2ab", "dec584": "dac99e", - "5a4a42": "5a4a42", "52526b": "51264d", "a59494": "844a73", "f7dead": "f1e9d9" @@ -18,13 +15,10 @@ "2": { "194252": "06383e", "73c5f7": "8bd3b6", - "000000": "000000", "42a5e6": "49b18c", "3a7ba5": "3a8770", - "f7efe6": "f7efe6", "6b5219": "256fc4", "d6cec5": "8289a9", - "8ca594": "8ca594", "dec584": "baafaa", "5a4a42": "574e49", "52526b": "262641", diff --git a/public/images/pokemon/variant/back/132.json b/public/images/pokemon/variant/back/132.json index f4ef6e8444a..c7f568267c8 100644 --- a/public/images/pokemon/variant/back/132.json +++ b/public/images/pokemon/variant/back/132.json @@ -4,15 +4,13 @@ "5a1994": "2a6d20", "b56bce": "6ab33c", "e6a5f7": "d5ea79", - "c57be6": "9dce55", - "000000": "000000" + "c57be6": "9dce55" }, "2": { "9c5ab5": "131432", "5a1994": "0e0c1c", "b56bce": "1f2345", "e6a5f7": "486195", - "c57be6": "2b3154", - "000000": "000000" + "c57be6": "2b3154" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/133-partner.json b/public/images/pokemon/variant/back/133-partner.json index d48eaad4364..c647162304a 100644 --- a/public/images/pokemon/variant/back/133-partner.json +++ b/public/images/pokemon/variant/back/133-partner.json @@ -4,7 +4,6 @@ "523121": "0b1145", "d69c4a": "90c1f1", "a5634a": "5982b7", - "000000": "000000", "ffe6ad": "d7ebff", "bd9c7b": "5f6f94", "e6c594": "8ca8d2" @@ -14,7 +13,6 @@ "523121": "461144", "d69c4a": "bf88cb", "a5634a": "915ea3", - "000000": "000000", "ffe6ad": "f3e6e3", "bd9c7b": "a07c83", "e6c594": "cfa7a9" diff --git a/public/images/pokemon/variant/back/133.json b/public/images/pokemon/variant/back/133.json index d48eaad4364..c647162304a 100644 --- a/public/images/pokemon/variant/back/133.json +++ b/public/images/pokemon/variant/back/133.json @@ -4,7 +4,6 @@ "523121": "0b1145", "d69c4a": "90c1f1", "a5634a": "5982b7", - "000000": "000000", "ffe6ad": "d7ebff", "bd9c7b": "5f6f94", "e6c594": "8ca8d2" @@ -14,7 +13,6 @@ "523121": "461144", "d69c4a": "bf88cb", "a5634a": "915ea3", - "000000": "000000", "ffe6ad": "f3e6e3", "bd9c7b": "a07c83", "e6c594": "cfa7a9" diff --git a/public/images/pokemon/variant/back/134.json b/public/images/pokemon/variant/back/134.json index 736a9262847..debdf1e028b 100644 --- a/public/images/pokemon/variant/back/134.json +++ b/public/images/pokemon/variant/back/134.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "104a63": "26185f", "bdad5a": "a26b30", "107394": "372194", @@ -11,7 +10,6 @@ "84deff": "c497e5" }, "2": { - "101010": "101010", "104a63": "742921", "bdad5a": "7d2f67", "107394": "983930", diff --git a/public/images/pokemon/variant/back/135.json b/public/images/pokemon/variant/back/135.json index d54215466ac..16bfbf03121 100644 --- a/public/images/pokemon/variant/back/135.json +++ b/public/images/pokemon/variant/back/135.json @@ -3,11 +3,9 @@ "ad8c3a": "975720", "846b29": "b87130", "ffde52": "eecc94", - "000000": "000000", "cead4a": "e4a254", "5a4a10": "894d17", "4a087b": "126746", - "84848c": "84848c", "525252": "3b3f50", "ffffff": "effffd", "c5c5c5": "aacbc7" @@ -16,11 +14,9 @@ "ad8c3a": "7a6f96", "846b29": "404076", "ffde52": "a8a2c1", - "000000": "000000", "cead4a": "7f7ba7", "5a4a10": "202046", "4a087b": "c08336", - "84848c": "84848c", "525252": "30486d", "ffffff": "c7cedb", "c5c5c5": "8e99b5" @@ -29,13 +25,8 @@ "ad8c3a": "4351d7", "846b29": "3249a6", "ffde52": "90ecee", - "000000": "000000", "cead4a": "47b4e9", "5a4a10": "1f2478", - "4a087b": "7b2817", - "84848c": "84848c", - "525252": "525252", - "ffffff": "ffffff", - "c5c5c5": "c5c5c5" + "4a087b": "7b2817" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/136.json b/public/images/pokemon/variant/back/136.json index 41987721533..0743aed4210 100644 --- a/public/images/pokemon/variant/back/136.json +++ b/public/images/pokemon/variant/back/136.json @@ -1,7 +1,6 @@ { "0": { "732119": "64391a", - "000000": "000000", "f7734a": "e6af4a", "d64252": "b1772e", "735a42": "5e4828", @@ -11,7 +10,6 @@ }, "1": { "732119": "1b5255", - "000000": "000000", "f7734a": "5dde9d", "d64252": "3aad8b", "735a42": "766a5b", @@ -21,7 +19,6 @@ }, "2": { "732119": "4c0013", - "000000": "000000", "f7734a": "b54144", "d64252": "8c2426", "735a42": "2d252a", diff --git a/public/images/pokemon/variant/back/137.json b/public/images/pokemon/variant/back/137.json index 47b4c121ebe..64558c39b24 100644 --- a/public/images/pokemon/variant/back/137.json +++ b/public/images/pokemon/variant/back/137.json @@ -6,11 +6,8 @@ "8cd6ef": "e9635a", "08add6": "ba333b", "f7d6c5": "fccee9", - "ffffff": "ffffff", "ff6363": "f8a8cd", "7b2942": "c5415c", - "000000": "000000", - "c5c5c5": "c5c5c5", "5abde6": "e9635a", "efad9c": "e883a9" }, @@ -24,7 +21,6 @@ "ffffff": "dea27e", "ff6363": "82391d", "7b2942": "280e07", - "000000": "000000", "c5c5c5": "c67f4b", "5abde6": "ffd9ab", "efad9c": "683420" diff --git a/public/images/pokemon/variant/back/138.json b/public/images/pokemon/variant/back/138.json index 8210f144709..7c596218457 100644 --- a/public/images/pokemon/variant/back/138.json +++ b/public/images/pokemon/variant/back/138.json @@ -5,7 +5,6 @@ "e6de84": "e67443", "c5ad73": "d04e2a", "635231": "821e16", - "000000": "000000", "426bad": "602a48", "9ce6f7": "d2a3c2", "63bdf7": "b17aa1", @@ -18,7 +17,6 @@ "e6de84": "404c5f", "c5ad73": "2a344b", "635231": "080a20", - "000000": "000000", "426bad": "1a7e5c", "9ce6f7": "43c787", "63bdf7": "43c787", diff --git a/public/images/pokemon/variant/back/139.json b/public/images/pokemon/variant/back/139.json index 57da8d0b167..53306bfbce9 100644 --- a/public/images/pokemon/variant/back/139.json +++ b/public/images/pokemon/variant/back/139.json @@ -2,27 +2,22 @@ "1": { "635242": "5f1e19", "9c846b": "973b2d", - "000000": "000000", "e6de84": "fdad7d", "c5ad73": "db764a", "426bad": "602a48", "63bdf7": "a36c8a", "3a4284": "380c23", - "3a9cce": "885374", - "424242": "424242", - "fff79c": "fff79c" + "3a9cce": "885374" }, "2": { "635242": "080a1d", "9c846b": "101530", - "000000": "000000", "e6de84": "435370", "c5ad73": "293257", "426bad": "1c624a", "63bdf7": "4dbc86", "3a4284": "03261c", "3a9cce": "37a075", - "424242": "14503b", - "fff79c": "fff79c" + "424242": "14503b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/140.json b/public/images/pokemon/variant/back/140.json index d7466b4908f..b09c8dcc38a 100644 --- a/public/images/pokemon/variant/back/140.json +++ b/public/images/pokemon/variant/back/140.json @@ -2,9 +2,7 @@ "1": { "7b5229": "600006", "d6a552": "bf2512", - "ffffff": "ffffff", "4a2900": "3a000a", - "000000": "000000", "c58429": "9f1105", "a56b29": "870100", "5a4200": "221f7e", @@ -13,9 +11,7 @@ "2": { "7b5229": "140e80", "d6a552": "4b64e6", - "ffffff": "ffffff", "4a2900": "10065f", - "000000": "000000", "c58429": "334dd4", "a56b29": "1d28a5", "5a4200": "f6c09f", diff --git a/public/images/pokemon/variant/back/141.json b/public/images/pokemon/variant/back/141.json index aa6b896fafb..d1909ec4043 100644 --- a/public/images/pokemon/variant/back/141.json +++ b/public/images/pokemon/variant/back/141.json @@ -3,7 +3,6 @@ "4a4a63": "312c85", "ffffff": "c7ceff", "523119": "290105", - "000000": "000000", "e6e6d6": "9da3f7", "cea573": "c23721", "bd8c42": "a82216", @@ -15,7 +14,6 @@ "4a4a63": "8e4f0c", "ffffff": "ffd4bc", "523119": "150453", - "000000": "000000", "e6e6d6": "ffbb8a", "cea573": "4c6be7", "bd8c42": "3c45cc", diff --git a/public/images/pokemon/variant/back/142-mega.json b/public/images/pokemon/variant/back/142-mega.json index 6c0dfdb66be..d768d04c787 100644 --- a/public/images/pokemon/variant/back/142-mega.json +++ b/public/images/pokemon/variant/back/142-mega.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "484848": "922217", "9483a4": "7e494f", "1d1d1d": "3b0101", @@ -11,11 +10,9 @@ "31186a": "671707", "735294": "c54522", "9462cd": "df6d3c", - "f2f2f2": "f2f2f2", "317329": "2150d9" }, "2": { - "101010": "101010", "484848": "20606b", "9483a4": "889dab", "1d1d1d": "041c21", @@ -26,7 +23,6 @@ "31186a": "0c313c", "735294": "1e5e54", "9462cd": "348f78", - "f2f2f2": "f2f2f2", "317329": "c00c39" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/142.json b/public/images/pokemon/variant/back/142.json index 9cdfeb741dd..aae72d2e25b 100644 --- a/public/images/pokemon/variant/back/142.json +++ b/public/images/pokemon/variant/back/142.json @@ -4,12 +4,9 @@ "adadd6": "99686d", "cecee6": "b58788", "9484a5": "76454c", - "000000": "000000", "31196b": "671707", "735294": "c54522", "9463ce": "df6d3c", - "cecece": "cecece", - "ffffff": "ffffff", "317329": "2150d9" }, "2": { @@ -17,12 +14,9 @@ "adadd6": "a8bdcc", "cecee6": "cae0ec", "9484a5": "7c8e9f", - "000000": "000000", "31196b": "0b3433", "735294": "1e5e54", "9463ce": "348f78", - "cecece": "cecece", - "ffffff": "ffffff", "317329": "c00c39" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/144.json b/public/images/pokemon/variant/back/144.json index b7d8968da76..28242c5df86 100644 --- a/public/images/pokemon/variant/back/144.json +++ b/public/images/pokemon/variant/back/144.json @@ -3,51 +3,37 @@ "005273": "461660", "6badf7": "d7adff", "94c5ff": "f1dfff", - "000000": "000000", "4a84d6": "7b42ab", "003152": "461660", "007bbd": "a142c8", - "ffffff": "ffffff", - "cecece": "cecece", "5a3a19": "221531", "bd293a": "2d6cb0", "b59473": "736581", "8c6b52": "372841", - "cee6ff": "f1dfff", - "525252": "525252" + "cee6ff": "f1dfff" }, "1": { "005273": "4d0a3e", "6badf7": "ae5290", "94c5ff": "ffbee5", - "000000": "000000", "4a84d6": "6a1657", "003152": "380334", "007bbd": "ad6297", - "ffffff": "ffffff", - "cecece": "cecece", "5a3a19": "652b0f", - "bd293a": "bd293a", "b59473": "d99c5e", "8c6b52": "a9652f", - "cee6ff": "ffd4e9", - "525252": "525252" + "cee6ff": "ffd4e9" }, "2": { "005273": "904d00", "6badf7": "ffe67c", "94c5ff": "ffecbd", - "000000": "000000", "4a84d6": "e9b93f", "003152": "552b01", "007bbd": "fdc44c", - "ffffff": "ffffff", - "cecece": "cecece", "5a3a19": "492a11", - "bd293a": "bd293a", "b59473": "a08d74", "8c6b52": "7d6447", - "cee6ff": "fff8d7", - "525252": "525252" + "cee6ff": "fff8d7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/145.json b/public/images/pokemon/variant/back/145.json index cd1b65a8cb7..d530fdb2295 100644 --- a/public/images/pokemon/variant/back/145.json +++ b/public/images/pokemon/variant/back/145.json @@ -7,8 +7,6 @@ "d6ad08": "cc4e17", "c56b19": "513131", "7b6b19": "2f1517", - "6b6b6b": "6b6b6b", - "ffffff": "ffffff", "9c8c31": "643738", "f79419": "6c4645" }, @@ -20,8 +18,6 @@ "d6ad08": "e3b68e", "c56b19": "dd6b10", "7b6b19": "885024", - "6b6b6b": "6b6b6b", - "ffffff": "ffffff", "9c8c31": "a06532", "f79419": "ff9a33" }, @@ -33,8 +29,6 @@ "d6ad08": "a32a71", "c56b19": "c992cb", "7b6b19": "970083", - "6b6b6b": "6b6b6b", - "ffffff": "ffffff", "9c8c31": "ce24a8", "f79419": "ffdeff" } diff --git a/public/images/pokemon/variant/back/146.json b/public/images/pokemon/variant/back/146.json index 55f5cd03506..6bba3ef779d 100644 --- a/public/images/pokemon/variant/back/146.json +++ b/public/images/pokemon/variant/back/146.json @@ -8,13 +8,9 @@ "ffd663": "ff3bac", "de9410": "431d43", "ffef63": "755c73", - "000000": "000000", "523a29": "57004d", "8c634a": "8c0c75", - "ffffff": "ffffff", - "b58c63": "dd2559", - "cecece": "cecece", - "636363": "636363" + "b58c63": "dd2559" }, "1": { "ef633a": "0ab10c", @@ -25,13 +21,9 @@ "ffd663": "fffa4c", "de9410": "c2b562", "ffef63": "feffe1", - "000000": "000000", "523a29": "840000", "8c634a": "ad1910", - "ffffff": "ffffff", - "b58c63": "de423a", - "cecece": "cecece", - "636363": "636363" + "b58c63": "de423a" }, "2": { "ef633a": "1377b3", @@ -42,12 +34,8 @@ "ffd663": "68fffd", "de9410": "58abdb", "ffef63": "dae9ff", - "000000": "000000", "523a29": "3e0b03", "8c634a": "78230b", - "ffffff": "ffffff", - "b58c63": "b05329", - "cecece": "cecece", - "636363": "636363" + "b58c63": "b05329" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/147.json b/public/images/pokemon/variant/back/147.json index 3373e281cc0..99ae600c1b0 100644 --- a/public/images/pokemon/variant/back/147.json +++ b/public/images/pokemon/variant/back/147.json @@ -2,7 +2,6 @@ "1": { "5a5a5a": "54787d", "9c948c": "79a2a3", - "000000": "000000", "ffffff": "def1ef", "ded6de": "a2c7c7", "5a63bd": "b24729", @@ -13,7 +12,6 @@ "2": { "5a5a5a": "8c7270", "9c948c": "c2a7a3", - "000000": "000000", "ffffff": "fff5f0", "ded6de": "dfc8c2", "5a63bd": "328f97", diff --git a/public/images/pokemon/variant/back/148.json b/public/images/pokemon/variant/back/148.json index db6cfd69857..a6b498ff215 100644 --- a/public/images/pokemon/variant/back/148.json +++ b/public/images/pokemon/variant/back/148.json @@ -8,7 +8,6 @@ "193173": "90150c", "7badff": "ffad67", "5a8cef": "f48c59", - "000000": "000000", "425aff": "359bbd", "7bceff": "61cce2", "19297b": "1b6794" @@ -22,7 +21,6 @@ "193173": "1b5f6f", "7badff": "90eacc", "5a8cef": "4aab9f", - "000000": "000000", "425aff": "b930bc", "7bceff": "f86ebf", "19297b": "971f7d" diff --git a/public/images/pokemon/variant/back/149.json b/public/images/pokemon/variant/back/149.json index ff4a7a77a21..da23b9af3bf 100644 --- a/public/images/pokemon/variant/back/149.json +++ b/public/images/pokemon/variant/back/149.json @@ -3,28 +3,20 @@ "5a3a21": "102908", "ffefbd": "def1ef", "f7bd5a": "f8b58f", - "000000": "000000", "ef9c3a": "e9917b", "de733a": "d15b67", "9c5a4a": "5a394e", "efbd8c": "a2c7c7", - "cecece": "cecece", - "ffffff": "ffffff", - "ad8c42": "79a2a3", - "636363": "636363" + "ad8c42": "79a2a3" }, "2": { "5a3a21": "102908", "ffefbd": "f8dfce", "f7bd5a": "8ed9c4", - "000000": "000000", "ef9c3a": "56a29e", "de733a": "35656d", "9c5a4a": "134050", "efbd8c": "c0a59d", - "cecece": "cecece", - "ffffff": "ffffff", - "ad8c42": "895e5c", - "636363": "636363" + "ad8c42": "895e5c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/150-mega-x.json b/public/images/pokemon/variant/back/150-mega-x.json index 0d3cbf49951..148ae70ee5a 100644 --- a/public/images/pokemon/variant/back/150-mega-x.json +++ b/public/images/pokemon/variant/back/150-mega-x.json @@ -1,25 +1,20 @@ { "1": { "7a7a99": "a66b8e", - "101010": "101010", "dadaf2": "ffb5d6", "36364d": "5a2952", "acacbf": "db8aaf", "461f59": "105144", "9643bf": "379e8a", - "f8f8f8": "f8f8f8", - "55a4f2": "55a4f2", "6e318c": "1d6153" }, "2": { "7a7a99": "d68f40", - "101010": "101010", "dadaf2": "ffdd98", "36364d": "884c17", "acacbf": "edaf5b", "461f59": "6b2619", "9643bf": "ac4f4b", - "f8f8f8": "f8f8f8", "55a4f2": "da2e29", "6e318c": "6b2619" } diff --git a/public/images/pokemon/variant/back/150-mega-y.json b/public/images/pokemon/variant/back/150-mega-y.json index daae4ff6ca7..99061b18c16 100644 --- a/public/images/pokemon/variant/back/150-mega-y.json +++ b/public/images/pokemon/variant/back/150-mega-y.json @@ -4,16 +4,13 @@ "dadaf2": "ffb5d6", "36364d": "5a2952", "acacbf": "db8aaf", - "101010": "101010", "9643bf": "43bfbd", "be55f2": "55f2e1", "461f59": "1f5859", "6e318c": "318c8a", - "f8f8f8": "f8f8f8", "f25555": "4bac9a" }, "2": { - "101010": "101010", "36364d": "884c17", "461f59": "59201f", "6e318c": "8c3331", @@ -21,8 +18,7 @@ "9643bf": "bf4c43", "be55f2": "f26155", "acacbf": "edaf5b", - "f25555": "f25555", "f8f8f8": "ffdd98", "dadaf2": "ffdd98" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/150.json b/public/images/pokemon/variant/back/150.json index 51435df396e..5f50624308f 100644 --- a/public/images/pokemon/variant/back/150.json +++ b/public/images/pokemon/variant/back/150.json @@ -4,8 +4,6 @@ "847b9c": "a66b8e", "b5adc5": "db8aaf", "ded6e6": "ffd6ef", - "000000": "000000", - "ffffff": "ffffff", "9442bd": "4bac9a", "6b319c": "196b5b", "3a2152": "12493f" @@ -15,8 +13,6 @@ "847b9c": "edaf5b", "b5adc5": "ffdd98", "ded6e6": "ffeeb6", - "000000": "000000", - "ffffff": "ffffff", "9442bd": "ac4f4b", "6b319c": "6b2619", "3a2152": "884c17" diff --git a/public/images/pokemon/variant/back/151.json b/public/images/pokemon/variant/back/151.json index 822e201bc18..5aab0a15c4e 100644 --- a/public/images/pokemon/variant/back/151.json +++ b/public/images/pokemon/variant/back/151.json @@ -3,7 +3,6 @@ "5a2952": "5c2da1", "ef84b5": "ab87cf", "b56394": "895ac3", - "000000": "000000", "ffb5d6": "d3b8e8", "ffd6ef": "eed7fa", "f7b584": "e86140" @@ -12,7 +11,6 @@ "5a2952": "884c17", "ef84b5": "edaf5b", "b56394": "ba7324", - "000000": "000000", "ffb5d6": "ffdd98", "ffd6ef": "ffeeb6", "f7b584": "55716f" diff --git a/public/images/pokemon/variant/back/161.json b/public/images/pokemon/variant/back/161.json index b91fd4d8573..21ec81e5dca 100644 --- a/public/images/pokemon/variant/back/161.json +++ b/public/images/pokemon/variant/back/161.json @@ -1,7 +1,6 @@ { "1": { "3a1910": "15143c", - "101010": "101010", "634231": "46387d", "4a3121": "252054", "a5734a": "ba82dd", @@ -12,7 +11,6 @@ }, "2": { "3a1910": "243064", - "101010": "101010", "634231": "667fb8", "4a3121": "3c508b", "a5734a": "aac7e9", diff --git a/public/images/pokemon/variant/back/162.json b/public/images/pokemon/variant/back/162.json index 1e630e957cd..c779f8dde58 100644 --- a/public/images/pokemon/variant/back/162.json +++ b/public/images/pokemon/variant/back/162.json @@ -1,6 +1,5 @@ { "1": { - "212129": "212129", "7b423a": "342e6d", "ffef94": "b7abde", "e6c54a": "988fc7", @@ -9,11 +8,9 @@ "ad8429": "716aa8", "c59c42": "716aa8", "ffffc5": "d3c8ec", - "ffffff": "ffffff", "737373": "3a8591" }, "2": { - "212129": "212129", "7b423a": "56697a", "ffef94": "daeff5", "e6c54a": "b4d1dc", @@ -22,7 +19,6 @@ "ad8429": "67748a", "c59c42": "67748a", "ffffc5": "f9feff", - "ffffff": "ffffff", "737373": "cc3b46" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/163.json b/public/images/pokemon/variant/back/163.json index 5ba8ecd4c64..b01e81a5963 100644 --- a/public/images/pokemon/variant/back/163.json +++ b/public/images/pokemon/variant/back/163.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "424242": "2c203e", "734a19": "3d346b", "bd8c42": "9c83c7", @@ -10,12 +9,9 @@ "debd9c": "a3b0d2", "6b3119": "2e1f39", "bd5a29": "663e5f", - "efad94": "87627e", - "ffffff": "ffffff", - "7b7b7b": "7b7b7b" + "efad94": "87627e" }, "2": { - "101010": "101010", "424242": "192133", "734a19": "435170", "bd8c42": "a5b4be", @@ -25,8 +21,6 @@ "debd9c": "ccd4d9", "6b3119": "36282b", "bd5a29": "291920", - "efad94": "4f4143", - "ffffff": "ffffff", - "7b7b7b": "7b7b7b" + "efad94": "4f4143" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/164.json b/public/images/pokemon/variant/back/164.json index 699a992b724..b815ed5851a 100644 --- a/public/images/pokemon/variant/back/164.json +++ b/public/images/pokemon/variant/back/164.json @@ -8,11 +8,7 @@ "deb56b": "a08dbd", "bd9463": "6b5d90", "9c735a": "443c64", - "634231": "161633", - "101010": "101010", - "636363": "636363", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff" + "634231": "161633" }, "2": { "a5846b": "7a8d99", @@ -23,10 +19,6 @@ "deb56b": "c4d0d4", "bd9463": "99abb3", "9c735a": "768894", - "634231": "313f51", - "101010": "101010", - "636363": "636363", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff" + "634231": "313f51" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/169.json b/public/images/pokemon/variant/back/169.json index 34cfabeb573..a22d7e92559 100644 --- a/public/images/pokemon/variant/back/169.json +++ b/public/images/pokemon/variant/back/169.json @@ -4,7 +4,6 @@ "a55ace": "3d4381", "7b4a9c": "2f2a5f", "b57bce": "666fb4", - "101010": "101010", "08426b": "b06130", "216b94": "ffb049" }, @@ -13,7 +12,6 @@ "a55ace": "b49db2", "7b4a9c": "80607b", "b57bce": "c8b6c2", - "101010": "101010", "08426b": "901606", "216b94": "b52c0c" } diff --git a/public/images/pokemon/variant/back/173.json b/public/images/pokemon/variant/back/173.json index f181872451c..3b0a5dd3b7a 100644 --- a/public/images/pokemon/variant/back/173.json +++ b/public/images/pokemon/variant/back/173.json @@ -6,7 +6,6 @@ "de7b6b": "7c52ba", "ffa594": "9579c9", "523100": "44004a", - "101010": "101010", "6b4a31": "494299", "a56b00": "647cb3", "c58c29": "5ca3bf" @@ -18,7 +17,6 @@ "de7b6b": "95aeff", "ffa594": "b2d6ff", "523100": "912676", - "101010": "101010", "6b4a31": "b35783", "a56b00": "f28aa4", "c58c29": "ffc5e3" diff --git a/public/images/pokemon/variant/back/175.json b/public/images/pokemon/variant/back/175.json index 897a5189daf..b15179727ee 100644 --- a/public/images/pokemon/variant/back/175.json +++ b/public/images/pokemon/variant/back/175.json @@ -2,14 +2,12 @@ "0": { "94735a": "844466", "734a4a": "5b2847", - "000000": "000000", "ce9c73": "a7738f", "f7d6a5": "e4b2bb", "f7efc5": "f7c9c5", "7b8c94": "9c8c84", "d6dede": "ded6d6", "b5b5c5": "c5b5b5", - "ffffff": "ffffff", "de736b": "8ee4be", "c54242": "409e80", "4a84c5": "d05887", @@ -18,7 +16,6 @@ "1": { "94735a": "734350", "734a4a": "452030", - "000000": "000000", "ce9c73": "a26867", "f7d6a5": "be868a", "f7efc5": "f7c5ce", @@ -34,7 +31,6 @@ "2": { "94735a": "404d5b", "734a4a": "1f293b", - "000000": "000000", "ce9c73": "8093a5", "f7d6a5": "afc2d1", "f7efc5": "ddeaef", diff --git a/public/images/pokemon/variant/back/176.json b/public/images/pokemon/variant/back/176.json index 43e27a02cda..d16ca14a3ab 100644 --- a/public/images/pokemon/variant/back/176.json +++ b/public/images/pokemon/variant/back/176.json @@ -1,7 +1,6 @@ { "0": { "737b84": "6b3552", - "000000": "000000", "ffffff": "eee0db", "adc5bd": "b58f8f", "d6efef": "d2bcb7", @@ -10,7 +9,6 @@ }, "1": { "737b84": "734350", - "000000": "000000", "ffffff": "f3cbcb", "adc5bd": "ae7675", "d6efef": "c79397", @@ -19,7 +17,6 @@ }, "2": { "737b84": "404d5b", - "000000": "000000", "ffffff": "ddeaef", "adc5bd": "8093a5", "d6efef": "afc2d1", diff --git a/public/images/pokemon/variant/back/177.json b/public/images/pokemon/variant/back/177.json index 7b2c7d04a48..625103692a6 100644 --- a/public/images/pokemon/variant/back/177.json +++ b/public/images/pokemon/variant/back/177.json @@ -1,6 +1,5 @@ { "1": { - "292929": "292929", "842900": "001d3f", "d63131": "174d69", "ff424a": "4b798a", @@ -10,12 +9,9 @@ "296b29": "b36848", "846321": "356f6d", "ffde29": "8ddcaf", - "d6ad29": "4ca690", - "ffffff": "ffffff", - "cecece": "cecece" + "d6ad29": "4ca690" }, "2": { - "292929": "292929", "842900": "3b060c", "d63131": "662340", "ff424a": "9a3841", @@ -25,8 +21,6 @@ "296b29": "224181", "846321": "382c78", "ffde29": "8767bf", - "d6ad29": "554196", - "ffffff": "ffffff", - "cecece": "cecece" + "d6ad29": "554196" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/179.json b/public/images/pokemon/variant/back/179.json index 1b5b96d0ed4..80a80f85b86 100644 --- a/public/images/pokemon/variant/back/179.json +++ b/public/images/pokemon/variant/back/179.json @@ -1,13 +1,11 @@ { "1": { "847352": "8f6c51", - "101010": "101010", "ceb58c": "b69977", "e6cea5": "deccb2", "ffe6bd": "f2ebdb", "e6ad00": "d26b00", "ffde00": "fdba5b", - "ffffff": "ffffff", "a5a5a5": "452f32", "525252": "301a21", "b57b00": "a23c00", @@ -18,13 +16,11 @@ }, "2": { "847352": "131026", - "101010": "101010", "ceb58c": "2b2447", "e6cea5": "352b53", "ffe6bd": "4b3c68", "e6ad00": "c33486", "ffde00": "ee74c1", - "ffffff": "ffffff", "a5a5a5": "2d282a", "525252": "221b1f", "b57b00": "88205b", diff --git a/public/images/pokemon/variant/back/180.json b/public/images/pokemon/variant/back/180.json index 5605b9dda8c..8f83626315d 100644 --- a/public/images/pokemon/variant/back/180.json +++ b/public/images/pokemon/variant/back/180.json @@ -4,7 +4,6 @@ "84738c": "693806", "ffffff": "ffe6aa", "dee6f7": "ebbb78", - "101010": "101010", "4a4a5a": "4d2102", "de4263": "884626", "ff7373": "8e4c38", @@ -20,7 +19,6 @@ "84738c": "693806", "ffffff": "ffe6aa", "dee6f7": "ebbb78", - "101010": "101010", "4a4a5a": "4d2102", "de4263": "884626", "ff7373": "9a5328", diff --git a/public/images/pokemon/variant/back/181-mega.json b/public/images/pokemon/variant/back/181-mega.json index f26151236d5..6d064fc5d32 100644 --- a/public/images/pokemon/variant/back/181-mega.json +++ b/public/images/pokemon/variant/back/181-mega.json @@ -2,7 +2,6 @@ "1": { "737373": "58341f", "f8f8f8": "ffe8b2", - "101010": "101010", "bfbfbf": "e5c079", "bf370a": "e28f09", "734b22": "49200d", @@ -15,7 +14,6 @@ "2": { "737373": "5d412a", "f8f8f8": "fff1d0", - "101010": "101010", "bfbfbf": "ebbb78", "bf370a": "d26b00", "734b22": "49200d", diff --git a/public/images/pokemon/variant/back/181.json b/public/images/pokemon/variant/back/181.json index d26f2773b32..2fd605b86be 100644 --- a/public/images/pokemon/variant/back/181.json +++ b/public/images/pokemon/variant/back/181.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "636b6b": "521a03", "c54200": "eaa60f", "ce8c10": "492602", @@ -10,11 +9,9 @@ "ffef4a": "af724a", "adadad": "ebbb78", "e6e6e6": "ffe6aa", - "ffffff": "ffffff", "8c2100": "c06400" }, "2": { - "101010": "101010", "636b6b": "3e2752", "c54200": "d53691", "ce8c10": "1c2a6d", @@ -23,8 +20,6 @@ "845a31": "131a51", "ffef4a": "78a8ec", "adadad": "b38582", - "e6e6e6": "e6e6e6", - "ffffff": "ffffff", "8c2100": "b12173" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/182.json b/public/images/pokemon/variant/back/182.json index b544187f64e..319fa7bec95 100644 --- a/public/images/pokemon/variant/back/182.json +++ b/public/images/pokemon/variant/back/182.json @@ -3,7 +3,6 @@ "840000": "338497", "f76b00": "79f6d5", "d62100": "49c1c2", - "101010": "101010", "526329": "659251", "9cd64a": "d8ecb1", "73ad31": "a2d281", @@ -18,7 +17,6 @@ "840000": "a7801f", "f76b00": "eaed6e", "d62100": "cdbb39", - "101010": "101010", "526329": "592819", "9cd64a": "b68356", "73ad31": "804428", diff --git a/public/images/pokemon/variant/back/183.json b/public/images/pokemon/variant/back/183.json index 99046544dc4..668660a08cc 100644 --- a/public/images/pokemon/variant/back/183.json +++ b/public/images/pokemon/variant/back/183.json @@ -5,7 +5,6 @@ "5a9cef": "fb95c2", "193a73": "822156", "4284ce": "e067b0", - "101010": "101010", "636363": "7c6a7d" }, "2": { @@ -14,7 +13,6 @@ "5a9cef": "74847c", "193a73": "362d27", "4284ce": "5a6362", - "101010": "101010", "636363": "56504e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/184.json b/public/images/pokemon/variant/back/184.json index b6b63cc9890..ec9460f13ad 100644 --- a/public/images/pokemon/variant/back/184.json +++ b/public/images/pokemon/variant/back/184.json @@ -4,19 +4,15 @@ "5a9cef": "fdb1cc", "4284ce": "e077ab", "316bad": "d47090", - "101010": "101010", "7b9cc5": "dea0c1", - "c5c5d6": "ffdbdf", - "6b6b6b": "6b6b6b" + "c5c5d6": "ffdbdf" }, "2": { "193a73": "3f344d", "5a9cef": "698f7b", "4284ce": "49736f", "316bad": "496666", - "101010": "101010", "7b9cc5": "94a396", - "c5c5d6": "bcbeab", - "6b6b6b": "6b6b6b" + "c5c5d6": "bcbeab" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/185.json b/public/images/pokemon/variant/back/185.json index 2d8d461fbe7..18183ce113e 100644 --- a/public/images/pokemon/variant/back/185.json +++ b/public/images/pokemon/variant/back/185.json @@ -1,7 +1,6 @@ { "1": { "635a4a": "322a22", - "101010": "101010", "ad845a": "5d564e", "8c7342": "4c443b", "315a19": "3d1e0c", @@ -12,7 +11,6 @@ }, "2": { "635a4a": "332868", - "101010": "101010", "ad845a": "4058a8", "8c7342": "47449e", "315a19": "cf985e", diff --git a/public/images/pokemon/variant/back/19.json b/public/images/pokemon/variant/back/19.json index f87f36e8edc..57f4dd2cb01 100644 --- a/public/images/pokemon/variant/back/19.json +++ b/public/images/pokemon/variant/back/19.json @@ -4,13 +4,10 @@ "d69cd6": "88a0b1", "b573bd": "5f778e", "4a2942": "262f4f", - "101010": "101010", "a57308": "a17c7d", "efdeb5": "e8cec9", "634a08": "765358", "cead63": "c4a3a1", - "ffffff": "ffffff", - "5a5a5a": "5a5a5a", "e65a73": "739794" }, "2": { @@ -18,13 +15,10 @@ "d69cd6": "fff5eb", "b573bd": "efdcd1", "4a2942": "865c54", - "101010": "101010", "a57308": "ba476f", "efdeb5": "efb5c0", "634a08": "7e3754", "cead63": "d98a9f", - "ffffff": "ffffff", - "5a5a5a": "5a5a5a", "e65a73": "707b83" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/190.json b/public/images/pokemon/variant/back/190.json index d89680a2200..9c7c9e1b4e1 100644 --- a/public/images/pokemon/variant/back/190.json +++ b/public/images/pokemon/variant/back/190.json @@ -2,7 +2,6 @@ "1": { "52216b": "701523", "a55ac5": "c47440", - "000000": "000000", "bd7bde": "dea95a", "8442ad": "ad452f", "8c6b42": "8c7457", @@ -13,7 +12,6 @@ "2": { "52216b": "807870", "a55ac5": "bfbeb4", - "000000": "000000", "bd7bde": "e5dfdf", "8442ad": "a6a297", "8c6b42": "632339", diff --git a/public/images/pokemon/variant/back/193.json b/public/images/pokemon/variant/back/193.json index 8c6770f192a..c8679f12e39 100644 --- a/public/images/pokemon/variant/back/193.json +++ b/public/images/pokemon/variant/back/193.json @@ -11,7 +11,6 @@ "73a54a": "7262de", "6b7b84": "a36280", "c5d6ef": "ed9db5", - "101010": "101010", "4a4a52": "693e78" }, "2": { @@ -26,7 +25,6 @@ "73a54a": "46769c", "6b7b84": "607b84", "c5d6ef": "d8edbb", - "101010": "101010", "4a4a52": "3e4a52" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/196.json b/public/images/pokemon/variant/back/196.json index fd930465c7f..92eb5c3843c 100644 --- a/public/images/pokemon/variant/back/196.json +++ b/public/images/pokemon/variant/back/196.json @@ -4,7 +4,6 @@ "b57bb5": "416240", "e6a5d6": "6c9e63", "efbdef": "bddd9e", - "101010": "101010", "314273": "a86a2c", "4a73b5": "ffb554" }, @@ -13,7 +12,6 @@ "b57bb5": "d1759c", "e6a5d6": "e99eae", "efbdef": "d2a2b5", - "101010": "101010", "314273": "537fde", "4a73b5": "90b7f9" }, @@ -22,7 +20,6 @@ "b57bb5": "ce987a", "e6a5d6": "ded0af", "efbdef": "f5f3e1", - "101010": "101010", "314273": "194540", "4a73b5": "39816d" } diff --git a/public/images/pokemon/variant/back/197.json b/public/images/pokemon/variant/back/197.json index ee4a8cd3ce5..d855e228fb5 100644 --- a/public/images/pokemon/variant/back/197.json +++ b/public/images/pokemon/variant/back/197.json @@ -3,7 +3,6 @@ "29314a": "3a2534", "424252": "553849", "63637b": "896c75", - "101010": "101010", "efd652": "ff5153", "b59429": "c72343", "525200": "9b0f33" @@ -12,7 +11,6 @@ "29314a": "9f8981", "424252": "d3bcb1", "63637b": "eddbcf", - "101010": "101010", "efd652": "e7af5d", "b59429": "bf793b", "525200": "974623" diff --git a/public/images/pokemon/variant/back/199.json b/public/images/pokemon/variant/back/199.json index f17d7951ccd..9aec41df0fb 100644 --- a/public/images/pokemon/variant/back/199.json +++ b/public/images/pokemon/variant/back/199.json @@ -3,14 +3,11 @@ "63636b": "734927", "d6d6d6": "f1d191", "ada5a5": "bf9562", - "101010": "101010", - "ffffff": "ffffff", "a53129": "538a55", "ce5252": "542a28", "ff5a4a": "93de76", "e64221": "50b64e", "b52919": "2b191b", - "d1cdc9": "d1cdc9", "ef736b": "5b3332", "ff9c94": "885345", "deb531": "b97565", @@ -20,14 +17,11 @@ "63636b": "192b32", "d6d6d6": "4c7668", "ada5a5": "2b4a48", - "101010": "101010", - "ffffff": "ffffff", "a53129": "2e1910", "ce5252": "b0613c", "ff5a4a": "6f4d35", "e64221": "543322", "b52919": "893d28", - "d1cdc9": "d1cdc9", "ef736b": "de9048", "ff9c94": "edbc69", "deb531": "bf4f2a", diff --git a/public/images/pokemon/variant/back/2.json b/public/images/pokemon/variant/back/2.json index ba7f0b01ff9..90b02797ad5 100644 --- a/public/images/pokemon/variant/back/2.json +++ b/public/images/pokemon/variant/back/2.json @@ -7,11 +7,9 @@ "7bd673": "ff745e", "63ad5a": "c24627", "104a3a": "4a1117", - "101010": "101010", "10424a": "57004f", "219484": "9c1a73", - "5acebd": "de359a", - "ffffff": "ffffff" + "5acebd": "de359a" }, "2": { "7b3129": "2e3601", @@ -20,11 +18,8 @@ "317b52": "446b94", "7bd673": "bef0fa", "63ad5a": "80c3d9", - "104a3a": "104a3a", - "101010": "101010", "10424a": "733502", "219484": "c76102", - "5acebd": "faa405", - "ffffff": "ffffff" + "5acebd": "faa405" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/20.json b/public/images/pokemon/variant/back/20.json index 3b1a46c1f8b..5171363f30f 100644 --- a/public/images/pokemon/variant/back/20.json +++ b/public/images/pokemon/variant/back/20.json @@ -3,32 +3,24 @@ "6b3a00": "261518", "a57329": "352121", "c5943a": "4a3331", - "101010": "101010", "c58452": "bc9087", "ffce9c": "dfc0b3", "945210": "764f4d", "845a29": "48272e", - "b5b5b5": "b5b5b5", "a58431": "784e54", "f7f7a5": "d2b2ad", - "ffffff": "ffffff", - "efce73": "c09b9c", - "737373": "737373" + "efce73": "c09b9c" }, "2": { "6b3a00": "7f645c", "a57329": "bba08f", "c5943a": "e2cbb9", - "101010": "101010", "c58452": "ae6f7e", "ffce9c": "e4b4b4", "945210": "813636", "845a29": "34171d", - "b5b5b5": "b5b5b5", "a58431": "631737", "f7f7a5": "c46771", - "ffffff": "ffffff", - "efce73": "973a59", - "737373": "737373" + "efce73": "973a59" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/200.json b/public/images/pokemon/variant/back/200.json index 2e11c0eeb76..5d11a30847e 100644 --- a/public/images/pokemon/variant/back/200.json +++ b/public/images/pokemon/variant/back/200.json @@ -3,7 +3,6 @@ "9c3a4a": "cc762f", "631942": "71370f", "de63a5": "f6b557", - "101010": "101010", "192942": "432e69", "3a6384": "8366ab", "314a63": "603f90", diff --git a/public/images/pokemon/variant/back/2027.json b/public/images/pokemon/variant/back/2027.json index 19a32275979..bffe4327837 100644 --- a/public/images/pokemon/variant/back/2027.json +++ b/public/images/pokemon/variant/back/2027.json @@ -4,8 +4,6 @@ "354e73": "752e42", "b6dbe7": "ffdac2", "84b3ce": "d27c80", - "fefefe": "fefefe", - "101010": "101010", "897e67": "aaaa96", "fefea9": "fffffc", "d1c592": "d3d3c6" @@ -15,8 +13,6 @@ "354e73": "3d2c78", "b6dbe7": "dbb1eb", "84b3ce": "a87bcf", - "fefefe": "fefefe", - "101010": "101010", "897e67": "2e163d", "fefea9": "6f3480", "d1c592": "44225a" diff --git a/public/images/pokemon/variant/back/2028.json b/public/images/pokemon/variant/back/2028.json index e2a25c789c1..6a47ecacf45 100644 --- a/public/images/pokemon/variant/back/2028.json +++ b/public/images/pokemon/variant/back/2028.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "3a6b8c": "692a61", "f1f1f4": "fffffc", "b0e5f8": "fffed9", @@ -16,7 +15,6 @@ "9994b6": "8d6e6f" }, "2": { - "101010": "101010", "3a6b8c": "3c2d74", "f1f1f4": "e3f0ff", "b0e5f8": "f8f5b0", diff --git a/public/images/pokemon/variant/back/203.json b/public/images/pokemon/variant/back/203.json index 1429eb40c25..cb82db0fd3c 100644 --- a/public/images/pokemon/variant/back/203.json +++ b/public/images/pokemon/variant/back/203.json @@ -1,14 +1,12 @@ { "1": { "424a73": "351810", - "ffffff": "ffffff", "adb5d6": "8f6f66", "6b8cb5": "512b21", "4a3a3a": "231117", "efde52": "9c3e3e", "c5a53a": "7e262d", "9c3a5a": "ab9d75", - "101010": "101010", "9c7b42": "571522", "ce6b94": "d8d1ad", "947b6b": "1f4062", @@ -18,14 +16,12 @@ }, "2": { "424a73": "27091d", - "ffffff": "ffffff", "adb5d6": "c5b0b7", "6b8cb5": "4a1b33", "4a3a3a": "091225", "efde52": "2a9d8f", "c5a53a": "1e7884", "9c3a5a": "52ab5f", - "101010": "101010", "9c7b42": "15545d", "ce6b94": "a8e781", "947b6b": "1a2e43", diff --git a/public/images/pokemon/variant/back/2052.json b/public/images/pokemon/variant/back/2052.json index 97ce82e0380..6e709a677f7 100644 --- a/public/images/pokemon/variant/back/2052.json +++ b/public/images/pokemon/variant/back/2052.json @@ -2,10 +2,8 @@ "1": { "45505f": "8c583b", "91a3bf": "ffda5c", - "101010": "101010", "995433": "493473", "627986": "de974e", - "f3f3f3": "f3f3f3", "e3cc2b": "a66db5", "ca833c": "7a519a", "798071": "7a4888", @@ -15,10 +13,8 @@ "2": { "45505f": "271420", "91a3bf": "7c4e42", - "101010": "101010", "995433": "45328e", "627986": "5f3036", - "f3f3f3": "f3f3f3", "e3cc2b": "b5b8f9", "ca833c": "7b7fda", "798071": "5f5c7e", diff --git a/public/images/pokemon/variant/back/2053.json b/public/images/pokemon/variant/back/2053.json index 3924a1a57f8..0defe48e028 100644 --- a/public/images/pokemon/variant/back/2053.json +++ b/public/images/pokemon/variant/back/2053.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "262b3c": "41185e", "464457": "71442a", "6c7791": "de974e", @@ -8,7 +7,6 @@ "5f6281": "8c583b" }, "2": { - "101010": "101010", "262b3c": "1d1b33", "464457": "271420", "6c7791": "5f3036", diff --git a/public/images/pokemon/variant/back/206.json b/public/images/pokemon/variant/back/206.json index c9d70c975cc..1c902ff2472 100644 --- a/public/images/pokemon/variant/back/206.json +++ b/public/images/pokemon/variant/back/206.json @@ -6,7 +6,6 @@ "f7ffff": "f6ffff", "debd3a": "aeaeae", "318ca5": "4a6165", - "101010": "101010", "6bbdce": "748da4", "216b84": "2a413f", "d6e6f7": "d8edf3", @@ -21,7 +20,6 @@ "f7ffff": "fdffdc", "debd3a": "a12e55", "318ca5": "38a8a6", - "101010": "101010", "6bbdce": "73d7d5", "216b84": "1d737a", "d6e6f7": "ffd4ac", diff --git a/public/images/pokemon/variant/back/207.json b/public/images/pokemon/variant/back/207.json index 52c582cf1a8..dee74529c90 100644 --- a/public/images/pokemon/variant/back/207.json +++ b/public/images/pokemon/variant/back/207.json @@ -3,14 +3,12 @@ "63314a": "7f4812", "e6a5ce": "f8dd84", "de84b5": "daa93f", - "101010": "101010", "ad6394": "b67322" }, "2": { "63314a": "5f1723", "e6a5ce": "ef6b58", "de84b5": "c04144", - "101010": "101010", "ad6394": "97343c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/212-mega.json b/public/images/pokemon/variant/back/212-mega.json index c9755a5cb27..e118c31d3be 100644 --- a/public/images/pokemon/variant/back/212-mega.json +++ b/public/images/pokemon/variant/back/212-mega.json @@ -3,37 +3,19 @@ "662929": "215a2d", "a62929": "2f794e", "d93636": "4a9c53", - "101010": "101010", - "404040": "404040", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "737373": "737373", - "0cb9f2": "0cb9f2", - "087599": "087599", "f26161": "8cce73" }, "1": { "662929": "2f2962", "a62929": "29429c", "d93636": "4263ef", - "101010": "101010", - "404040": "404040", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf", - "737373": "737373", - "0cb9f2": "0cb9f2", - "087599": "087599", "f26161": "639cf7" }, "2": { "662929": "645117", "a62929": "b88619", "d93636": "ffca2a", - "101010": "101010", - "404040": "404040", - "f8f8f8": "f8f8f8", "bfbfbf": "cdccb4", - "737373": "737373", "0cb9f2": "f4e920", "087599": "b49800", "f26161": "c59f29" diff --git a/public/images/pokemon/variant/back/212.json b/public/images/pokemon/variant/back/212.json index 84f12bf1434..3c7d9a4799c 100644 --- a/public/images/pokemon/variant/back/212.json +++ b/public/images/pokemon/variant/back/212.json @@ -3,24 +3,14 @@ "632929": "215a2d", "f76b6b": "8cce73", "a52929": "2f794e", - "101010": "101010", - "d63a3a": "4a9c53", - "9494a5": "9494a5", - "ffffff": "ffffff", - "b5b5ce": "b5b5ce", - "3a3a4a": "3a3a4a", - "9c6b21": "9c6b21", - "dec510": "dec510" + "d63a3a": "4a9c53" }, "1": { "632929": "2f2962", "f76b6b": "639cf7", "a52929": "29429c", - "101010": "101010", "d63a3a": "4263ef", "9494a5": "6262a4", - "ffffff": "ffffff", - "b5b5ce": "b5b5ce", "3a3a4a": "3c3c50", "9c6b21": "131387", "dec510": "10bdde" @@ -29,13 +19,8 @@ "632929": "645117", "f76b6b": "c59f29", "a52929": "b88619", - "101010": "101010", "d63a3a": "ffca2a", "9494a5": "3c4543", - "ffffff": "ffffff", - "b5b5ce": "b5b5ce", - "3a3a4a": "282d2c", - "9c6b21": "9c6b21", - "dec510": "dec510" + "3a3a4a": "282d2c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/213.json b/public/images/pokemon/variant/back/213.json index 11a4ca52ff1..87d543f7868 100644 --- a/public/images/pokemon/variant/back/213.json +++ b/public/images/pokemon/variant/back/213.json @@ -4,7 +4,6 @@ "735210": "5d1931", "ffff5a": "d68b71", "efc54a": "cc5b74", - "101010": "101010", "6b633a": "8e4d31", "ffffff": "fff0d8", "d6ceb5": "fcc86f", @@ -18,7 +17,6 @@ "735210": "254d59", "ffff5a": "aaedbe", "efc54a": "5bbfaa", - "101010": "101010", "6b633a": "1f1f1f", "ffffff": "705b66", "d6ceb5": "4f3e46", diff --git a/public/images/pokemon/variant/back/215.json b/public/images/pokemon/variant/back/215.json index 1c3719c45bf..624c90d4a21 100644 --- a/public/images/pokemon/variant/back/215.json +++ b/public/images/pokemon/variant/back/215.json @@ -6,7 +6,6 @@ "316373": "6d1631", "21315a": "220a11", "3a94ad": "ac373e", - "000000": "000000", "42849c": "902738", "bdbdc5": "c5a080", "4a4a4a": "69523f", @@ -19,10 +18,8 @@ "316373": "d4874f", "21315a": "723522", "3a94ad": "fbdba1", - "000000": "000000", "42849c": "eab273", "bdbdc5": "a1a0c3", - "4a4a4a": "383d51", - "f7f7ff": "f7f7ff" + "4a4a4a": "383d51" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/216.json b/public/images/pokemon/variant/back/216.json index 014803f0c86..67087b3d9ea 100644 --- a/public/images/pokemon/variant/back/216.json +++ b/public/images/pokemon/variant/back/216.json @@ -1,38 +1,26 @@ { "0": { "6b4219": "225c35", - "101010": "101010", "ff843a": "90db6d", "b56321": "4cae50", "de7331": "6ac669", "ffe6a5": "ffffb5", - "efad52": "ffe66b", - "dedede": "dedede", - "6b6b7b": "6b6b7b", - "b5b5bd": "b5b5bd" + "efad52": "ffe66b" }, "1": { "6b4219": "5e0c28", - "101010": "101010", "ff843a": "e44642", "b56321": "9e253b", "de7331": "c42f3e", "ffe6a5": "f7eee1", - "efad52": "f2cab8", - "dedede": "dedede", - "6b6b7b": "6b6b7b", - "b5b5bd": "b5b5bd" + "efad52": "f2cab8" }, "2": { "6b4219": "1e2249", - "101010": "101010", "ff843a": "46527a", "b56321": "323760", "de7331": "3c456e", "ffe6a5": "b5fffc", - "efad52": "75aaff", - "dedede": "dedede", - "6b6b7b": "6b6b7b", - "b5b5bd": "b5b5bd" + "efad52": "75aaff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/217.json b/public/images/pokemon/variant/back/217.json index 501a7a8e666..3b8582df4dc 100644 --- a/public/images/pokemon/variant/back/217.json +++ b/public/images/pokemon/variant/back/217.json @@ -1,38 +1,23 @@ { "0": { "422919": "112114", - "7b7b8c": "7b7b8c", - "101010": "101010", "945221": "2f6324", - "ffffff": "ffffff", "634229": "1d3d26", - "b5b5bd": "b5b5bd", "f7c563": "fecd85", - "c59c4a": "cd9343", - "dedede": "dedede" + "c59c4a": "cd9343" }, "1": { "422919": "2d0e1f", - "7b7b8c": "7b7b8c", - "101010": "101010", "945221": "8c2a37", - "ffffff": "ffffff", "634229": "6b1d38", - "b5b5bd": "b5b5bd", "f7c563": "f2cab8", - "c59c4a": "c48e81", - "dedede": "dedede" + "c59c4a": "c48e81" }, "2": { "422919": "111433", - "7b7b8c": "7b7b8c", - "101010": "101010", "945221": "323760", - "ffffff": "ffffff", "634229": "1e2249", - "b5b5bd": "b5b5bd", "f7c563": "5ccaf2", - "c59c4a": "45a2f9", - "dedede": "dedede" + "c59c4a": "45a2f9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/222.json b/public/images/pokemon/variant/back/222.json index 2c50d3c55a8..f5f17ab07bf 100644 --- a/public/images/pokemon/variant/back/222.json +++ b/public/images/pokemon/variant/back/222.json @@ -2,7 +2,6 @@ "1": { "bd004a": "b76600", "7b0008": "73490d", - "000000": "000000", "ffa5c5": "f6cc70", "e66394": "f39806", "ffcee6": "f5eab0", @@ -12,7 +11,6 @@ "2": { "bd004a": "2b8c23", "7b0008": "0f660f", - "000000": "000000", "ffa5c5": "cae4a2", "e66394": "89b958", "ffcee6": "f4fad7", diff --git a/public/images/pokemon/variant/back/226.json b/public/images/pokemon/variant/back/226.json index 50a96e73d3b..a941e8be14f 100644 --- a/public/images/pokemon/variant/back/226.json +++ b/public/images/pokemon/variant/back/226.json @@ -2,7 +2,6 @@ "1": { "313a5a": "862a10", "5a6bde": "e27b36", - "101010": "101010", "4a5294": "aa4514", "525a6b": "642f21", "adb5ce": "b9783a", @@ -13,7 +12,6 @@ "2": { "313a5a": "1e3405", "5a6bde": "b1cf6b", - "101010": "101010", "4a5294": "6d9729", "525a6b": "174306", "adb5ce": "2e5f10", diff --git a/public/images/pokemon/variant/back/227.json b/public/images/pokemon/variant/back/227.json index 3615df8fc2e..c51bf16f8dd 100644 --- a/public/images/pokemon/variant/back/227.json +++ b/public/images/pokemon/variant/back/227.json @@ -5,11 +5,9 @@ "9cb5d6": "49748c", "deefff": "97bcce", "bdcee6": "6d93a4", - "101010": "101010", "ce9400": "d34b21", "ffde00": "f87642", - "637bad": "062233", - "841921": "841921" + "637bad": "062233" }, "2": { "31527b": "260e21", @@ -17,7 +15,6 @@ "9cb5d6": "773c5b", "deefff": "c8aeae", "bdcee6": "ac6f7d", - "101010": "101010", "ce9400": "36989a", "ffde00": "69d3c3", "637bad": "231429", diff --git a/public/images/pokemon/variant/back/228.json b/public/images/pokemon/variant/back/228.json index 7da9f57826e..a4e110ee3d9 100644 --- a/public/images/pokemon/variant/back/228.json +++ b/public/images/pokemon/variant/back/228.json @@ -3,30 +3,24 @@ "292931": "553454", "080808": "181223", "4a4a52": "76546b", - "101921": "101921", "767085": "a84b50", "ffffff": "f3bd87", "a59cad": "c87966", - "f8f9ff": "f8f9ff", "ada5b3": "414d67", "f7a57b": "f8f1e7", "734229": "311f3a", - "b57b5a": "ceb0a5", - "e2e0e3": "e2e0e3" + "b57b5a": "ceb0a5" }, "2": { "292931": "b1a3b1", "080808": "181223", "4a4a52": "f8faf3", - "101921": "101921", "767085": "223657", "ffffff": "5c8d95", "a59cad": "38576c", - "f8f9ff": "f8f9ff", "ada5b3": "292929", "f7a57b": "72557e", "734229": "311f3a", - "b57b5a": "533960", - "e2e0e3": "e2e0e3" + "b57b5a": "533960" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/229-mega.json b/public/images/pokemon/variant/back/229-mega.json index 4e85412dd72..6194d3d3bcb 100644 --- a/public/images/pokemon/variant/back/229-mega.json +++ b/public/images/pokemon/variant/back/229-mega.json @@ -1,27 +1,22 @@ { "1": { "83738b": "7c323c", - "000000": "000000", "ffffff": "f3bd87", "a49cac": "a84b50", "cdd5d5": "c87966", "182029": "321b32", "313139": "553454", "4a4a52": "76546b", - "f7f9fa": "f7f9fa", "af1b1b": "455d92", - "bbc3ce": "bbc3ce", "732422": "314075", "622910": "77545b", "f69c83": "f8f1e7", "a45a4a": "ceb0a5", - "f5eeee": "f5eeee", "aa1919": "aa8c82", "671f1e": "856458" }, "2": { "83738b": "121d3c", - "000000": "000000", "ffffff": "5c8d95", "a49cac": "223657", "cdd5d5": "38576c", @@ -35,7 +30,6 @@ "622910": "311f3a", "f69c83": "72557e", "a45a4a": "533960", - "f5eeee": "f5eeee", "aa1919": "534b6a", "671f1e": "423655" } diff --git a/public/images/pokemon/variant/back/229.json b/public/images/pokemon/variant/back/229.json index a4d9316078e..4e5cd46a77e 100644 --- a/public/images/pokemon/variant/back/229.json +++ b/public/images/pokemon/variant/back/229.json @@ -5,17 +5,13 @@ "ced6d6": "dc7e67", "ffffff": "f8c288", "192129": "431129", - "000000": "000000", "31313a": "631e3f", "4a4a52": "85324a", - "f8f9ff": "f8f9ff", "841021": "41578c", - "ada5b3": "ada5b3", "632910": "8c6362", "f79c84": "f8f1e7", "a55a4a": "ceb0a5", - "9c293a": "4c2a31", - "e2e0e3": "e2e0e3" + "9c293a": "4c2a31" }, "2": { "84738c": "111a33", @@ -23,16 +19,13 @@ "ced6d6": "38576c", "ffffff": "5c8d95", "192129": "444e6c", - "000000": "000000", "31313a": "a9bfd1", "4a4a52": "e8f8ff", "f8f9ff": "1d2d4e", "841021": "f37755", - "ada5b3": "ada5b3", "632910": "2d203c", "f79c84": "665a83", "a55a4a": "4a3a5e", - "9c293a": "8c5a98", - "e2e0e3": "e2e0e3" + "9c293a": "8c5a98" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/23.json b/public/images/pokemon/variant/back/23.json index b77da94b156..b424b1a7024 100644 --- a/public/images/pokemon/variant/back/23.json +++ b/public/images/pokemon/variant/back/23.json @@ -8,9 +8,7 @@ "ce63b5": "77d3a7", "7b316b": "1f8179", "e6ad5a": "d6c7a2", - "5a104a": "093640", - "101010": "101010", - "ffffff": "ffffff" + "5a104a": "093640" }, "2": { "b57b31": "293e6f", @@ -21,8 +19,6 @@ "ce63b5": "ebe1d7", "7b316b": "b3857d", "e6ad5a": "4d759b", - "5a104a": "5b303e", - "101010": "101010", - "ffffff": "ffffff" + "5a104a": "5b303e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/230.json b/public/images/pokemon/variant/back/230.json index 2603b437bbe..c7f0eb6aba6 100644 --- a/public/images/pokemon/variant/back/230.json +++ b/public/images/pokemon/variant/back/230.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "4a5a94": "2a2750", "8cbdef": "396979", "cee6f7": "5dac9b", @@ -15,7 +14,6 @@ "e6ad3a": "63a666" }, "2": { - "101010": "101010", "4a5a94": "54133f", "8cbdef": "d64b52", "cee6f7": "ffb273", diff --git a/public/images/pokemon/variant/back/231.json b/public/images/pokemon/variant/back/231.json index 7c4e6c5bc9a..68bc4fb808f 100644 --- a/public/images/pokemon/variant/back/231.json +++ b/public/images/pokemon/variant/back/231.json @@ -7,10 +7,8 @@ "525294": "4d5271", "bd3a31": "4b6aa1", "f76b52": "859abf", - "101010": "101010", "840000": "394e85", - "8c8c8c": "8c8baa", - "d6d6d6": "d6d6d6" + "8c8c8c": "8c8baa" }, "2": { "6b9cce": "673a67", @@ -20,7 +18,6 @@ "525294": "3a2043", "bd3a31": "cea141", "f76b52": "f1d35b", - "101010": "101010", "840000": "b17333", "8c8c8c": "755873", "d6d6d6": "fff8d5" diff --git a/public/images/pokemon/variant/back/232.json b/public/images/pokemon/variant/back/232.json index 2c5174d42c4..adb8af8a5cf 100644 --- a/public/images/pokemon/variant/back/232.json +++ b/public/images/pokemon/variant/back/232.json @@ -3,7 +3,6 @@ "4a5252": "5f74c7", "3a3a3a": "333a77", "849494": "b0d8ff", - "101010": "101010", "6b7373": "7fa0d7", "842129": "c8563f", "9ca5a5": "9ca3b5", @@ -21,7 +20,6 @@ "4a5252": "994e30", "3a3a3a": "6f2219", "849494": "f4b975", - "101010": "101010", "6b7373": "d17e47", "842129": "1d2a54", "9ca5a5": "3c283f", diff --git a/public/images/pokemon/variant/back/233.json b/public/images/pokemon/variant/back/233.json index e177f4e243a..99debec22a3 100644 --- a/public/images/pokemon/variant/back/233.json +++ b/public/images/pokemon/variant/back/233.json @@ -3,14 +3,12 @@ "94426b": "e27089", "ef5a63": "f8a8cd", "ff94b5": "fccee9", - "ffffff": "ffffff", "31739c": "6d224c", "d6d6d6": "e1dbff", "4a9cd6": "833462", "313a63": "4c1131", "5a3a4a": "d94664", - "6b6b7b": "887acd", - "101010": "101010" + "6b6b7b": "887acd" }, "2": { "94426b": "491c0c", @@ -22,7 +20,6 @@ "4a9cd6": "ffd9ab", "313a63": "b77751", "5a3a4a": "31150e", - "6b6b7b": "b77751", - "101010": "101010" + "6b6b7b": "b77751" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/235.json b/public/images/pokemon/variant/back/235.json index 8d3ab0ea5dd..f7255e5965a 100644 --- a/public/images/pokemon/variant/back/235.json +++ b/public/images/pokemon/variant/back/235.json @@ -5,7 +5,6 @@ "4a3a10": "431a2e", "adad8c": "b1767f", "6b5a31": "672f44", - "101010": "101010", "086300": "113041", "199c00": "1f5259", "42c519": "287170", @@ -17,7 +16,6 @@ "4a3a10": "141622", "adad8c": "8a909b", "6b5a31": "262b39", - "101010": "101010", "086300": "111321", "199c00": "1b1e2c", "42c519": "222734", diff --git a/public/images/pokemon/variant/back/239.json b/public/images/pokemon/variant/back/239.json index c48a006ef4d..db9f51c2840 100644 --- a/public/images/pokemon/variant/back/239.json +++ b/public/images/pokemon/variant/back/239.json @@ -6,7 +6,6 @@ "ce8c00": "d44b2c", "6b6b6b": "7a2414", "101010": "000000", - "ffffff": "ffffff", "cecece": "d8d8d8", "e6ad19": "f2673d", "a5a5a5": "adadad", @@ -18,11 +17,6 @@ "b56b00": "33b571", "ce8c00": "52ba8b", "6b6b6b": "206e33", - "101010": "101010", - "ffffff": "ffffff", - "cecece": "cecece", - "e6ad19": "53e680", - "a5a5a5": "a5a5a5", - "313131": "313131" + "e6ad19": "53e680" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/24.json b/public/images/pokemon/variant/back/24.json index a54eb499950..1aba309ef20 100644 --- a/public/images/pokemon/variant/back/24.json +++ b/public/images/pokemon/variant/back/24.json @@ -3,18 +3,12 @@ "523a7b": "113a53", "a584c5": "30abb3", "7b63ad": "146d7d", - "ffffff": "ffffff", - "101010": "101010", - "c5a5ef": "8feae4", - "c5c5c5": "c5c5c5" + "c5a5ef": "8feae4" }, "2": { "523a7b": "875a5f", "a584c5": "eed3b1", "7b63ad": "bf9a8e", - "ffffff": "ffffff", - "101010": "101010", - "c5a5ef": "fff9e5", - "c5c5c5": "c5c5c5" + "c5a5ef": "fff9e5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/240.json b/public/images/pokemon/variant/back/240.json index d9fdfa30751..c237b239384 100644 --- a/public/images/pokemon/variant/back/240.json +++ b/public/images/pokemon/variant/back/240.json @@ -3,24 +3,18 @@ "d6523a": "372d49", "943121": "101010", "ff7b63": "524b6f", - "101010": "101010", "ffffb5": "ffffff", "ad8400": "db4d19", "f7d63a": "fba42e", - "d6ad00": "fb832b", - "73737b": "73737b", - "ffffff": "ffffff" + "d6ad00": "fb832b" }, "2": { "d6523a": "4065b0", "943121": "303d58", "ff7b63": "5398cf", - "101010": "101010", "ffffb5": "ffffff", "ad8400": "699296", "f7d63a": "eaffff", - "d6ad00": "c6edf2", - "73737b": "73737b", - "ffffff": "ffffff" + "d6ad00": "c6edf2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/242.json b/public/images/pokemon/variant/back/242.json index 9333afa8335..89053184294 100644 --- a/public/images/pokemon/variant/back/242.json +++ b/public/images/pokemon/variant/back/242.json @@ -5,7 +5,6 @@ "ffadc5": "f6caec", "de84a5": "cc96c5", "ffc5ce": "ffdef4", - "101010": "101010", "6b6b6b": "521259", "b5b5b5": "6a1e76", "ded6d6": "a462c4", @@ -17,7 +16,6 @@ "ffadc5": "e5a5ce", "de84a5": "bd77ab", "ffc5ce": "ffd0eb", - "101010": "101010", "6b6b6b": "48050c", "b5b5b5": "60071d", "ded6d6": "8b2d4e", @@ -29,7 +27,6 @@ "ffadc5": "ddbcf5", "de84a5": "be98dd", "ffc5ce": "f4daff", - "101010": "101010", "6b6b6b": "201a4f", "b5b5b5": "3f377f", "ded6d6": "52489c", diff --git a/public/images/pokemon/variant/back/243.json b/public/images/pokemon/variant/back/243.json index ce3d36b9db3..530b240683a 100644 --- a/public/images/pokemon/variant/back/243.json +++ b/public/images/pokemon/variant/back/243.json @@ -2,7 +2,6 @@ "1": { "846ba5": "732c40", "bd8cc5": "b74f57", - "101010": "101010", "52296b": "481532", "6b6b6b": "3c3c4e", "ffffff": "f3dfdf", @@ -11,13 +10,11 @@ "a5a5a5": "9b7b81", "d69c29": "c55d3b", "8c6310": "833000", - "c50000": "c50000", "ffce42": "ff945c" }, "2": { "846ba5": "dc9779", "bd8cc5": "f5d4c0", - "101010": "101010", "52296b": "994d3d", "6b6b6b": "3c3c4e", "ffffff": "eed7cd", @@ -26,7 +23,6 @@ "a5a5a5": "ac8982", "d69c29": "5278c7", "8c6310": "2a4083", - "c50000": "c50000", "ffce42": "8aade5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/245.json b/public/images/pokemon/variant/back/245.json index 638bfa96065..6187c3c5997 100644 --- a/public/images/pokemon/variant/back/245.json +++ b/public/images/pokemon/variant/back/245.json @@ -4,7 +4,6 @@ "5a7bd6": "4c4097", "7bbdff": "6b62c0", "7b5ab5": "bd4530", - "101010": "101010", "ad6bd6": "e56444", "523a7b": "892015", "c594de": "ff8e67", @@ -13,7 +12,6 @@ "ffffff": "f7dfec", "848484": "65395c", "dedede": "e0b4ce", - "d61010": "d61010", "bdefff": "9795d1" }, "2": { @@ -21,7 +19,6 @@ "5a7bd6": "d67617", "7bbdff": "f5ae42", "7b5ab5": "863062", - "101010": "101010", "ad6bd6": "c16792", "523a7b": "40163c", "c594de": "e8a0d2", @@ -29,8 +26,6 @@ "bdbdbd": "b29cc0", "ffffff": "fbecff", "848484": "856c98", - "dedede": "dedede", - "d61010": "d61010", "bdefff": "ffdf85" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/246.json b/public/images/pokemon/variant/back/246.json index 5b507495d06..5d7c14dd125 100644 --- a/public/images/pokemon/variant/back/246.json +++ b/public/images/pokemon/variant/back/246.json @@ -4,8 +4,6 @@ "4a5a3a": "0b4367", "d6e6ce": "4fa6e0", "adce9c": "4493c7", - "101010": "101010", - "ffffff": "ffffff", "ef5229": "efca4f", "bd3a21": "cd8f30" }, @@ -14,8 +12,6 @@ "4a5a3a": "a5494d", "d6e6ce": "ecd292", "adce9c": "e5a267", - "101010": "101010", - "ffffff": "ffffff", "ef5229": "67478f", "bd3a21": "403266" } diff --git a/public/images/pokemon/variant/back/247.json b/public/images/pokemon/variant/back/247.json index 34a8a10ef3d..e05f4cc8b31 100644 --- a/public/images/pokemon/variant/back/247.json +++ b/public/images/pokemon/variant/back/247.json @@ -2,13 +2,11 @@ "1": { "295a84": "4a5a39", "8cc5ef": "accd9c", - "101010": "101010", "739cc5": "739c62" }, "2": { "295a84": "51202f", "8cc5ef": "b63c37", - "101010": "101010", "739cc5": "8b1534" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/248-mega.json b/public/images/pokemon/variant/back/248-mega.json index c63b19d7c29..70a6011b03c 100644 --- a/public/images/pokemon/variant/back/248-mega.json +++ b/public/images/pokemon/variant/back/248-mega.json @@ -1,28 +1,26 @@ { "1": { "171717": "101010", - "4a5a39": "533334", - "4b5a3b": "533334", - "727272": "727272", - "801c17": "533334", - "922d00": "004194", - "ce283d": "006fb3", - "d35200": "0098fc", - "729a62": "915957", - "739c62": "915957", - "aacb9a": "c78482" + "4a5a39": "533334", + "4b5a3b": "533334", + "801c17": "533334", + "922d00": "004194", + "ce283d": "006fb3", + "d35200": "0098fc", + "729a62": "915957", + "739c62": "915957", + "aacb9a": "c78482" }, "2": { - "171717": "101010", - "4a5a39": "06092f", - "4b5a3b": "06092f", - "727272": "727272", - "801c17": "ee7b06", - "922d00": "ee7b06", - "ce283d": "ffa904", - "d35200": "ffa904", - "729a62": "59417c", - "739c62": "59417c", - "aacb9a": "625695" + "171717": "101010", + "4a5a39": "06092f", + "4b5a3b": "06092f", + "801c17": "ee7b06", + "922d00": "ee7b06", + "ce283d": "ffa904", + "d35200": "ffa904", + "729a62": "59417c", + "739c62": "59417c", + "aacb9a": "625695" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/248.json b/public/images/pokemon/variant/back/248.json index a769de9a1ed..61908bc0aa3 100644 --- a/public/images/pokemon/variant/back/248.json +++ b/public/images/pokemon/variant/back/248.json @@ -3,11 +3,6 @@ "4a5a3a": "533334", "adce9c": "c78482", "739c63": "915957", - "101010": "101010", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", - "737373": "737373", - "942900": "942900", "004a8c": "004194", "217bbd": "006fbe" }, @@ -15,10 +10,6 @@ "4a5a3a": "06092f", "adce9c": "625695", "739c63": "2c3071", - "101010": "101010", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", - "737373": "737373", "942900": "ee7b06", "004a8c": "ee7b06", "217bbd": "ffa904" diff --git a/public/images/pokemon/variant/back/249.json b/public/images/pokemon/variant/back/249.json index 309f1d77b6b..a59c8a029d7 100644 --- a/public/images/pokemon/variant/back/249.json +++ b/public/images/pokemon/variant/back/249.json @@ -2,7 +2,6 @@ "1": { "63737b": "1d3e41", "9cade6": "326460", - "101010": "101010", "ffffff": "bad8c9", "b5c5f7": "447a6c", "004284": "214f5f", @@ -15,7 +14,6 @@ "2": { "63737b": "101010", "9cade6": "18162b", - "101010": "101010", "ffffff": "353043", "b5c5f7": "211d33", "004284": "7a7291", diff --git a/public/images/pokemon/variant/back/250.json b/public/images/pokemon/variant/back/250.json index b9e8aa51ae7..f3f2d784df3 100644 --- a/public/images/pokemon/variant/back/250.json +++ b/public/images/pokemon/variant/back/250.json @@ -4,31 +4,23 @@ "940800": "340b27", "ff5a10": "843974", "9c6300": "592964", - "101010": "101010", "42d652": "d6541f", "ffde00": "e4bcef", "dead00": "d28cda", "b5ffbd": "ed8543", "bd4210": "5b214b", - "ffef84": "f4deff", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", - "6b6b6b": "6b6b6b" + "ffef84": "f4deff" }, "2": { "109410": "365869", "940800": "0f0c3a", "ff5a10": "222e57", "9c6300": "95532c", - "101010": "101010", "42d652": "3e95c9", "ffde00": "e7aa6e", "dead00": "c68046", "b5ffbd": "77d7dd", "bd4210": "1a2053", - "ffef84": "ffd59f", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", - "6b6b6b": "6b6b6b" + "ffef84": "ffd59f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/251.json b/public/images/pokemon/variant/back/251.json index e5f01223e07..be8f2c3bf11 100644 --- a/public/images/pokemon/variant/back/251.json +++ b/public/images/pokemon/variant/back/251.json @@ -9,10 +9,7 @@ "deef94": "f4e5d9", "4a7321": "28696a", "ffffde": "fff5f5", - "101010": "101010", - "b5c55a": "cbc5af", - "6b7384": "6b7384", - "ffffff": "ffffff" + "b5c55a": "cbc5af" }, "2": { "73a531": "5f234e", @@ -24,7 +21,6 @@ "deef94": "ba9aa9", "4a7321": "3f0e2a", "ffffde": "ffedf3", - "101010": "101010", "b5c55a": "886580", "6b7384": "64475e", "ffffff": "eed9d9" diff --git a/public/images/pokemon/variant/back/255.json b/public/images/pokemon/variant/back/255.json index 94804ee8f02..78989f05aea 100644 --- a/public/images/pokemon/variant/back/255.json +++ b/public/images/pokemon/variant/back/255.json @@ -2,23 +2,19 @@ "1": { "ad8c00": "298084", "f7de6b": "58dfa5", - "000000": "000000", "efbd31": "34ad90", "7b4a19": "1d5461", "ad4210": "b93a23", "e65a21": "e86434", - "ff8c31": "ff9039", - "ffffff": "ffffff" + "ff8c31": "ff9039" }, "2": { "ad8c00": "550d28", "f7de6b": "ad3633", - "000000": "000000", "efbd31": "811c2c", "7b4a19": "400724", "ad4210": "b3817d", "e65a21": "d3afa0", - "ff8c31": "f3e5cf", - "ffffff": "ffffff" + "ff8c31": "f3e5cf" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/256.json b/public/images/pokemon/variant/back/256.json index 159cc5a51f5..0fecd72e2f5 100644 --- a/public/images/pokemon/variant/back/256.json +++ b/public/images/pokemon/variant/back/256.json @@ -1,7 +1,6 @@ { "1": { "9c3110": "11526f", - "191919": "191919", "ff7b4a": "3dd0b0", "de5a29": "1f9ba4", "9c7329": "a7471f", @@ -15,7 +14,6 @@ }, "2": { "9c3110": "8a685f", - "191919": "191919", "ff7b4a": "fff7e1", "de5a29": "cdb09b", "9c7329": "641835", diff --git a/public/images/pokemon/variant/back/257-mega.json b/public/images/pokemon/variant/back/257-mega.json index 8cde98eae09..28ecfb14064 100644 --- a/public/images/pokemon/variant/back/257-mega.json +++ b/public/images/pokemon/variant/back/257-mega.json @@ -10,7 +10,6 @@ "ff9a7f": "fff185", "e55858": "51b5cd", "ee6262": "f7ca4b", - "000000": "000000", "bd4141": "da8923", "fff188": "ecfff8", "297bd5": "930808", @@ -30,7 +29,6 @@ "ff9a7f": "fffce9", "e55858": "c6e6ff", "ee6262": "fffae1", - "000000": "000000", "bd4141": "d2bda7", "fff188": "c6fffd", "297bd5": "1f3061", diff --git a/public/images/pokemon/variant/back/257.json b/public/images/pokemon/variant/back/257.json index 42cd254566d..c294398a55c 100644 --- a/public/images/pokemon/variant/back/257.json +++ b/public/images/pokemon/variant/back/257.json @@ -6,7 +6,6 @@ "948463": "8095b3", "dedeb5": "f0fbff", "63524a": "55607d", - "000000": "000000", "ee5e5e": "598dc1", "842929": "11526f", "ef6363": "3dd0b0", @@ -20,7 +19,6 @@ "ffffff": "9386b8", "dfa550": "b2c3e3", "8c633a": "bf462a", - "c46b37": "c46b37", "dea552": "f99140", "f7d663": "ffc96b" }, @@ -31,7 +29,6 @@ "948463": "772436", "dedeb5": "cc6155", "63524a": "5b1832", - "000000": "000000", "ee5e5e": "772040", "842929": "9c7c70", "ef6363": "fffae1", @@ -41,7 +38,6 @@ "bd5f42": "983b2d", "9c8c84": "e6a653", "ffde6b": "da9b60", - "297bd6": "297bd6", "ffffff": "473c61", "dfa550": "be6646", "8c633a": "2d2e58", diff --git a/public/images/pokemon/variant/back/261.json b/public/images/pokemon/variant/back/261.json index 47e9abd21a6..5b911371ac3 100644 --- a/public/images/pokemon/variant/back/261.json +++ b/public/images/pokemon/variant/back/261.json @@ -2,27 +2,21 @@ "1": { "636363": "803c2c", "c5c5c5": "d4a172", - "000000": "000000", "a5a5a5": "b26c55", "424242": "380927", "5a5a63": "6d1757", "bd8c42": "a3738d", "f7f75a": "c59cbe", - "9c2942": "222d84", - "ffffff": "ffffff", - "6b6b84": "6b6b84" + "9c2942": "222d84" }, "2": { "636363": "24103c", "c5c5c5": "763f94", - "000000": "000000", "a5a5a5": "402067", "424242": "4e9ea3", "5a5a63": "96eedf", "bd8c42": "8aa8cd", "f7f75a": "bdd9f2", - "9c2942": "182556", - "ffffff": "ffffff", - "6b6b84": "6b6b84" + "9c2942": "182556" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/262.json b/public/images/pokemon/variant/back/262.json index 492ca26dca5..5b22bbef5c8 100644 --- a/public/images/pokemon/variant/back/262.json +++ b/public/images/pokemon/variant/back/262.json @@ -1,24 +1,17 @@ { "1": { "525252": "7a3424", - "000000": "000000", "94949c": "ad5c41", "bdbdc5": "d2975f", "313131": "510c2b", "4a4a4a": "711956", "4d4d4d": "71231f", - "bd8c42": "bd8c42", - "f7ef5a": "f7ef5a", "ad1021": "5f0d3e", - "bd4a7b": "bd4a7b", - "ffffff": "ffffff", "de2942": "8f1c4e", - "323232": "5a1c15", - "949cad": "949cad" + "323232": "5a1c15" }, "2": { "525252": "230f3b", - "000000": "000000", "94949c": "402067", "bdbdc5": "753e93", "313131": "4f9fa4", @@ -27,10 +20,7 @@ "bd8c42": "cb6654", "f7ef5a": "ffb98c", "ad1021": "45809a", - "bd4a7b": "bd4a7b", - "ffffff": "ffffff", "de2942": "5ba7ba", - "323232": "0b1044", - "949cad": "949cad" + "323232": "0b1044" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/263.json b/public/images/pokemon/variant/back/263.json index 782b8284aab..17836f92682 100644 --- a/public/images/pokemon/variant/back/263.json +++ b/public/images/pokemon/variant/back/263.json @@ -1,27 +1,22 @@ { "1": { "424242": "481f4e", - "000000": "000000", "73635a": "481f4e", "b59c8c": "8e588f", "bdad9c": "be94bb", "947b6b": "85355a", "e6dece": "e1c7dc", "5a524a": "3c1332", - "ffffff": "ffffff", - "524231": "1795be", - "a51900": "a51900" + "524231": "1795be" }, "2": { "424242": "29155a", - "000000": "000000", "73635a": "29155a", "b59c8c": "aebcff", "bdad9c": "3d2661", "947b6b": "7e86d2", "e6dece": "5f4e9c", "5a524a": "40236c", - "ffffff": "ffffff", "524231": "d0037a", "a51900": "d0037a" } diff --git a/public/images/pokemon/variant/back/264.json b/public/images/pokemon/variant/back/264.json index b6edee70ea4..9dbed087704 100644 --- a/public/images/pokemon/variant/back/264.json +++ b/public/images/pokemon/variant/back/264.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "ad9c8c": "be94bb", "6b6363": "481f4e", "5a4a3a": "59193d", @@ -9,13 +8,10 @@ "a58c7b": "8e588f", "296b94": "1795be", "6badc5": "41f3ff", - "ffffff": "ffffff", - "423a21": "423a21", "737373": "643369", "94847b": "643369" }, "2": { - "000000": "000000", "ad9c8c": "3d2661", "6b6363": "1e133e", "5a4a3a": "465aab", @@ -24,8 +20,6 @@ "a58c7b": "535db9", "296b94": "d0037a", "6badc5": "ff429b", - "ffffff": "ffffff", - "423a21": "423a21", "737373": "210f4e", "94847b": "210f4e" } diff --git a/public/images/pokemon/variant/back/2670.json b/public/images/pokemon/variant/back/2670.json index 81e91c8fb72..6a8c90767ac 100644 --- a/public/images/pokemon/variant/back/2670.json +++ b/public/images/pokemon/variant/back/2670.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "404040": "1d2040", "ff7373": "73e1ff", "802d2d": "1f298e", @@ -13,7 +12,6 @@ "243a66": "63132f" }, "2": { - "101010": "101010", "404040": "b3b3b3", "ff7373": "4cd9af", "802d2d": "20877a", diff --git a/public/images/pokemon/variant/back/278.json b/public/images/pokemon/variant/back/278.json index d5b6652f719..71ded3cae1d 100644 --- a/public/images/pokemon/variant/back/278.json +++ b/public/images/pokemon/variant/back/278.json @@ -1,6 +1,5 @@ { "0": { - "000000": "000000", "525252": "542b2b", "ffffff": "ecd8d4", "d6cee6": "ba928c", @@ -24,13 +23,10 @@ "319cd6": "4060bc", "8c5210": "201838", "949494": "3d5982", - "424242": "424242", "de8400": "473d6f", - "ffad31": "5b5481", - "313131": "313131" + "ffad31": "5b5481" }, "2": { - "000000": "000000", "525252": "732a22", "ffffff": "f5e1d1", "d6cee6": "d19e92", diff --git a/public/images/pokemon/variant/back/279.json b/public/images/pokemon/variant/back/279.json index 1e9870d772b..418bf94a12d 100644 --- a/public/images/pokemon/variant/back/279.json +++ b/public/images/pokemon/variant/back/279.json @@ -1,7 +1,6 @@ { "0": { "31638c": "324a26", - "101010": "101010", "5aa5ce": "40683c", "7bceef": "789c6e", "a5e6ff": "b6d9ac", @@ -17,15 +16,9 @@ "ce4252": "af2c4f" }, "1": { - "31638c": "31638c", - "101010": "101010", "5aa5ce": "4060bc", "7bceef": "657ddf", "a5e6ff": "b4b3ff", - "ced6ef": "ced6ef", - "737384": "737384", - "9cb5c5": "9cb5c5", - "ffffff": "ffffff", "8c4231": "17103f", "ffde4a": "534e72", "c57b31": "2a1f50", @@ -35,7 +28,6 @@ }, "2": { "31638c": "6f1314", - "101010": "101010", "5aa5ce": "892722", "7bceef": "be3d2f", "a5e6ff": "dd533a", diff --git a/public/images/pokemon/variant/back/282-mega.json b/public/images/pokemon/variant/back/282-mega.json index 5839ece498d..cc86a603997 100644 --- a/public/images/pokemon/variant/back/282-mega.json +++ b/public/images/pokemon/variant/back/282-mega.json @@ -5,7 +5,6 @@ "59b359": "c08f44", "8f8fb3": "d59c80", "f2f2ff": "f8efde", - "101010": "101010", "bcf2aa": "fff1c0", "ff8095": "ca2033", "d9576c": "da3e4f", @@ -20,13 +19,9 @@ "338046": "242746", "8be68b": "3f427f", "59b359": "282c5d", - "8f8fb3": "8f8fb3", - "f2f2ff": "f2f2ff", - "101010": "101010", "bcf2aa": "5b5790", "ff8095": "ed50f7", "d9576c": "d846c1", - "cfcfe5": "cfcfe5", "803340": "9e2a7c", "8585a6": "110a21", "e6e6f2": "371447", diff --git a/public/images/pokemon/variant/back/282.json b/public/images/pokemon/variant/back/282.json index 74d43b2b4fb..feae69b1303 100644 --- a/public/images/pokemon/variant/back/282.json +++ b/public/images/pokemon/variant/back/282.json @@ -5,7 +5,6 @@ "8ce68c": "ebc984", "b5f794": "fff1c0", "7b8cb5": "d59c80", - "000000": "000000", "efefff": "f8efde", "cecee6": "ffc4a6", "d64a73": "da3e4f", @@ -18,13 +17,8 @@ "73bd73": "282c5d", "8ce68c": "3f427f", "b5f794": "5b5790", - "7b8cb5": "7b8cb5", - "000000": "000000", - "efefff": "efefff", - "cecee6": "cecee6", "d64a73": "d846c1", "ff7b94": "ed50f7", - "84294a": "9e2a7c", - "a5b5ce": "a5b5ce" + "84294a": "9e2a7c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/285.json b/public/images/pokemon/variant/back/285.json index 584bd608434..1e7b07d1989 100644 --- a/public/images/pokemon/variant/back/285.json +++ b/public/images/pokemon/variant/back/285.json @@ -1,9 +1,5 @@ { "1": { - "73634a": "73634a", - "000000": "000000", - "efd6b5": "efd6b5", - "5a4a42": "5a4a42", "c5a584": "c59584", "849c7b": "9c7b9b", "9cce94": "cb94ce", @@ -11,7 +7,6 @@ }, "2": { "73634a": "575370", - "000000": "000000", "efd6b5": "e3ded8", "5a4a42": "3e3651", "c5a584": "b7ada2", diff --git a/public/images/pokemon/variant/back/286.json b/public/images/pokemon/variant/back/286.json index 9206f3c661d..74532287726 100644 --- a/public/images/pokemon/variant/back/286.json +++ b/public/images/pokemon/variant/back/286.json @@ -2,20 +2,16 @@ "1": { "215231": "522147", "84b573": "b573b2", - "000000": "000000", "639452": "945291", "bd314a": "842155", "f7636b": "f763ca", "84213a": "bd31b7", "634a3a": "63573a", - "b59c7b": "dea98c", - "f7dead": "f7dead", - "debd8c": "debd8c" + "b59c7b": "dea98c" }, "2": { "215231": "102141", "84b573": "3e6f96", - "000000": "000000", "639452": "244162", "bd314a": "682a88", "f7636b": "c763cf", diff --git a/public/images/pokemon/variant/back/29.json b/public/images/pokemon/variant/back/29.json index c7cdff7491d..685ec61ee48 100644 --- a/public/images/pokemon/variant/back/29.json +++ b/public/images/pokemon/variant/back/29.json @@ -4,12 +4,9 @@ "424284": "6b1524", "d6d6ff": "f28566", "adadce": "c94d40", - "101010": "101010", "efefff": "fed0aa", - "ffffff": "ffffff", "ff5242": "386ecf", "bd314a": "2141ac", - "dedede": "dedede", "3a6b94": "3750a4", "199c94": "668cdd" }, @@ -18,12 +15,9 @@ "424284": "2e1752", "d6d6ff": "8175d6", "adadce": "6044ac", - "101010": "101010", "efefff": "b0abff", - "ffffff": "ffffff", "ff5242": "da781a", "bd314a": "c54910", - "dedede": "dedede", "3a6b94": "c77d3a", "199c94": "e5b471" } diff --git a/public/images/pokemon/variant/back/290.json b/public/images/pokemon/variant/back/290.json index fcff6dbdc90..f11f281c1b1 100644 --- a/public/images/pokemon/variant/back/290.json +++ b/public/images/pokemon/variant/back/290.json @@ -1,7 +1,6 @@ { "0": { "427b52": "0e5502", - "000000": "000000", "b5de73": "77ce53", "73ad5a": "1e7709", "848484": "a75f18", @@ -10,7 +9,6 @@ "ffffef": "f8d57f", "fffff7": "fff3ba", "6b6b63": "7e400b", - "634a42": "634a42", "ad947b": "e8d6b6", "cebd9c": "f7ecd7", "9c8473": "bfa483", @@ -18,7 +16,6 @@ }, "1": { "427b52": "7a4f7c", - "000000": "000000", "b5de73": "c3b4c0", "73ad5a": "886883", "848484": "2a0b34", @@ -35,7 +32,6 @@ }, "2": { "427b52": "88134e", - "000000": "000000", "b5de73": "d9537b", "73ad5a": "ac265e", "848484": "125a60", diff --git a/public/images/pokemon/variant/back/298.json b/public/images/pokemon/variant/back/298.json index b7b889b4668..68138ad4b26 100644 --- a/public/images/pokemon/variant/back/298.json +++ b/public/images/pokemon/variant/back/298.json @@ -3,7 +3,6 @@ "314a8c": "851958", "6bb5ff": "ff8cc3", "639cf7": "e85ab4", - "101010": "101010", "4a7be6": "d2488d", "3a6bd6": "9c3e9c", "deefff": "ffe1fa", @@ -13,7 +12,6 @@ "314a8c": "4f4969", "6bb5ff": "f2dbb8", "639cf7": "c9c1b5", - "101010": "101010", "4a7be6": "a4a88c", "3a6bd6": "8f6b85", "deefff": "ffffff", diff --git a/public/images/pokemon/variant/back/3-gigantamax.json b/public/images/pokemon/variant/back/3-gigantamax.json index b618abecbcc..949bb2ef621 100644 --- a/public/images/pokemon/variant/back/3-gigantamax.json +++ b/public/images/pokemon/variant/back/3-gigantamax.json @@ -5,7 +5,6 @@ "bd6a31": "012729", "ffee52": "37d6de", "debd29": "078a8f", - "101010": "101010", "de4141": "3f1375", "ff7b73": "712f8f", "ffbdbd": "a266b0", @@ -15,8 +14,7 @@ "2e5519": "38001c", "83de7b": "ff745e", "107b6a": "b80479", - "20b49c": "de3592", - "fdfdfd": "fdfdfd" + "20b49c": "de3592" }, "2": { "833100": "0b2e01", @@ -24,7 +22,6 @@ "bd6a31": "420514", "ffee52": "f75ea8", "debd29": "a30a66", - "101010": "101010", "de4141": "3c8227", "ff7b73": "9db042", "ffbdbd": "e7e385", @@ -34,7 +31,6 @@ "2e5519": "011c38", "83de7b": "80ced9", "107b6a": "d15d04", - "20b49c": "fa8405", - "fdfdfd": "fdfdfd" + "20b49c": "fa8405" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/3.json b/public/images/pokemon/variant/back/3.json index 0c179dd5e4a..4fd41c3a1c8 100644 --- a/public/images/pokemon/variant/back/3.json +++ b/public/images/pokemon/variant/back/3.json @@ -7,7 +7,6 @@ "debd29": "078a8f", "bd6b31": "168a69", "de4242": "3f1375", - "101010": "101010", "ffef52": "5fc7c7", "105242": "190038", "107b6b": "c21f7e", @@ -15,8 +14,7 @@ "2e5519": "38001c", "5ad6c5": "f062a4", "21b59c": "de3592", - "84de7b": "ff745e", - "ffffff": "ffffff" + "84de7b": "ff745e" }, "2": { "843100": "420514", @@ -26,7 +24,6 @@ "debd29": "a30a66", "bd6b31": "852a41", "de4242": "3c8227", - "101010": "101010", "ffef52": "f75ea8", "105242": "381601", "2e5519": "011c38", @@ -34,7 +31,6 @@ "5a9c3a": "446b94", "5ad6c5": "faa405", "21b59c": "fa8405", - "84de7b": "80ced9", - "ffffff": "ffffff" + "84de7b": "80ced9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/30.json b/public/images/pokemon/variant/back/30.json index 5ddd63925f4..bfb1a5eca4f 100644 --- a/public/images/pokemon/variant/back/30.json +++ b/public/images/pokemon/variant/back/30.json @@ -5,15 +5,10 @@ "8cc5ce": "c94d40", "c5e6ef": "f28566", "193a73": "3750a4", - "101010": "101010", "1063b5": "131f65", - "4a84f7": "4a84f7", - "ffffff": "ffffff", "c52110": "2141ac", "ff9c8c": "65a4e7", - "ef4a3a": "386ecf", - "d6d6d6": "d6d6d6", - "848484": "848484" + "ef4a3a": "386ecf" }, "2": { "5a94b5": "402489", @@ -21,14 +16,10 @@ "8cc5ce": "6044ac", "c5e6ef": "8175d6", "193a73": "c77d3a", - "101010": "101010", "1063b5": "883f16", "4a84f7": "e5b471", - "ffffff": "ffffff", "c52110": "c54910", "ff9c8c": "f2ae45", - "ef4a3a": "da781a", - "d6d6d6": "d6d6d6", - "848484": "848484" + "ef4a3a": "da781a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/300.json b/public/images/pokemon/variant/back/300.json index 75a46a00d6b..8e5d73ee067 100644 --- a/public/images/pokemon/variant/back/300.json +++ b/public/images/pokemon/variant/back/300.json @@ -4,7 +4,6 @@ "9c3142": "66054d", "f7dead": "e5ced2", "efbd7b": "cca3b0", - "101010": "101010", "f79cb5": "ff5959", "d65a7b": "991657", "ef7b94": "cc3359", @@ -15,7 +14,6 @@ "9c3142": "46518c", "f7dead": "ffffff", "efbd7b": "e5ced2", - "101010": "101010", "f79cb5": "adcad8", "d65a7b": "6379a5", "ef7b94": "85a2bf", @@ -26,7 +24,6 @@ "9c3142": "661422", "f7dead": "b2dfff", "efbd7b": "7a94cc", - "101010": "101010", "f79cb5": "e58f67", "d65a7b": "99352d", "ef7b94": "cc6651", diff --git a/public/images/pokemon/variant/back/301.json b/public/images/pokemon/variant/back/301.json index 4e39e9d194c..b9e533916ce 100644 --- a/public/images/pokemon/variant/back/301.json +++ b/public/images/pokemon/variant/back/301.json @@ -1,7 +1,6 @@ { "0": { "422963": "66054d", - "000000": "000000", "a573c5": "ff5959", "634a7b": "991657", "8452a5": "cc3359", @@ -13,7 +12,6 @@ }, "1": { "422963": "65597f", - "000000": "000000", "a573c5": "ffffff", "634a7b": "948eb2", "8452a5": "cecee5", @@ -25,7 +23,6 @@ }, "2": { "422963": "a84859", - "000000": "000000", "a573c5": "f9f8a4", "634a7b": "ea9360", "8452a5": "efbd7c", diff --git a/public/images/pokemon/variant/back/302-mega.json b/public/images/pokemon/variant/back/302-mega.json index 5540f0ec64f..3d2f5c62fb1 100644 --- a/public/images/pokemon/variant/back/302-mega.json +++ b/public/images/pokemon/variant/back/302-mega.json @@ -5,7 +5,6 @@ "ff4a5a": "e945af", "cc3f7c": "b22391", "393952": "123812", - "000000": "000000", "aca4f6": "b2ca9b", "5a4a94": "416a3d", "8b73d5": "86ad74", @@ -19,7 +18,6 @@ "ff4a5a": "236dbc", "cc3f7c": "153db2", "393952": "580a16", - "000000": "000000", "aca4f6": "e0604e", "5a4a94": "7e141c", "8b73d5": "be3933", diff --git a/public/images/pokemon/variant/back/302.json b/public/images/pokemon/variant/back/302.json index 2382a267541..deabf62908c 100644 --- a/public/images/pokemon/variant/back/302.json +++ b/public/images/pokemon/variant/back/302.json @@ -4,7 +4,6 @@ "ada5f7": "b2ca9b", "5a4a94": "416a3d", "8c73d6": "86ad74", - "000000": "000000", "735aad": "5d8853", "c51021": "844bdd", "ff4a5a": "b38eec", @@ -19,7 +18,6 @@ "ada5f7": "e0604e", "5a4a94": "7e141c", "8c73d6": "be3933", - "000000": "000000", "735aad": "9f2123", "c51021": "185da6", "ff4a5a": "3aa9de", diff --git a/public/images/pokemon/variant/back/303-mega.json b/public/images/pokemon/variant/back/303-mega.json index 0c75755bea5..2275cf822b8 100644 --- a/public/images/pokemon/variant/back/303-mega.json +++ b/public/images/pokemon/variant/back/303-mega.json @@ -1,14 +1,9 @@ { "0": { - "000000": "000000", "9ca494": "e175b4", "737373": "c14c82", - "212121": "212121", "4a4a4a": "6f264f", - "7b5a29": "7b5a29", "ffc55a": "e4c997", - "cdcdcd": "cdcdcd", - "f8f8f8": "f8f8f8", "984868": "1f194c", "b86088": "31296a", "de9441": "ad8867", @@ -17,15 +12,10 @@ "732041": "201434" }, "1": { - "000000": "000000", "9ca494": "4fa285", "737373": "347c7d", - "212121": "212121", "4a4a4a": "193e49", - "7b5a29": "7b5a29", "ffc55a": "d6c491", - "cdcdcd": "cdcdcd", - "f8f8f8": "f8f8f8", "984868": "a52f22", "b86088": "ff725a", "de9441": "bc8a52", @@ -34,15 +24,11 @@ "732041": "162843" }, "2": { - "000000": "000000", "9ca494": "ba94e6", "737373": "8a62d0", - "212121": "212121", "4a4a4a": "332c76", "7b5a29": "706d80", "ffc55a": "cfc8e4", - "cdcdcd": "cdcdcd", - "f8f8f8": "f8f8f8", "984868": "a81931", "b86088": "f04948", "de9441": "b1a3ca", diff --git a/public/images/pokemon/variant/back/303.json b/public/images/pokemon/variant/back/303.json index 477efdfbaa4..117f45dd7a4 100644 --- a/public/images/pokemon/variant/back/303.json +++ b/public/images/pokemon/variant/back/303.json @@ -5,8 +5,6 @@ "000000": "101010", "737373": "c14c82", "9c4a6b": "1f194c", - "cecece": "cecece", - "ffffff": "ffffff", "de9442": "ad8867", "7b5a29": "764d32", "ffc55a": "e4c997", @@ -18,8 +16,6 @@ "000000": "101010", "737373": "347c7d", "9c4a6b": "b53a29", - "cecece": "cecece", - "ffffff": "ffffff", "de9442": "a99372", "7b5a29": "6b5424", "ffc55a": "d6c491", @@ -31,8 +27,6 @@ "000000": "101010", "737373": "9d7cd6", "9c4a6b": "b53a29", - "cecece": "cecece", - "ffffff": "ffffff", "de9442": "b1a3ca", "7b5a29": "706d80", "ffc55a": "cfc8e4", diff --git a/public/images/pokemon/variant/back/304.json b/public/images/pokemon/variant/back/304.json index 50127505ab4..15b3f4bb65f 100644 --- a/public/images/pokemon/variant/back/304.json +++ b/public/images/pokemon/variant/back/304.json @@ -4,7 +4,6 @@ "525a6b": "6c5440", "ceced6": "cbc4a2", "ffffff": "fff2e5", - "000000": "000000", "3a3a4a": "122919", "525263": "2c4531", "316b9c": "8acc0e", @@ -16,11 +15,8 @@ "525a6b": "2b265d", "ceced6": "91a1e3", "ffffff": "cdd9fa", - "000000": "000000", "3a3a4a": "371219", "525263": "611f26", - "316b9c": "316b9c", - "6bbdff": "6bbdff", "737b94": "c2584c" }, "2": { @@ -28,7 +24,6 @@ "525a6b": "722f15", "ceced6": "d2954e", "ffffff": "ffcc7d", - "000000": "000000", "3a3a4a": "192c45", "525263": "2c4368", "316b9c": "05b1ad", diff --git a/public/images/pokemon/variant/back/305.json b/public/images/pokemon/variant/back/305.json index 2cd9ba15a9c..d23f3f6609c 100644 --- a/public/images/pokemon/variant/back/305.json +++ b/public/images/pokemon/variant/back/305.json @@ -3,7 +3,6 @@ "6b6b7b": "6c5440", "ffffff": "fff2e5", "c5ced6": "cbc4a2", - "000000": "000000", "9c9cad": "bca88c", "424a52": "492d1c", "7b8494": "947d63", @@ -16,7 +15,6 @@ "6b6b7b": "2b265d", "ffffff": "cdd9fa", "c5ced6": "91a1e3", - "000000": "000000", "9c9cad": "686dc0", "424a52": "1d153f", "7b8494": "433f93", @@ -29,7 +27,6 @@ "6b6b7b": "722f15", "ffffff": "ffcc7d", "c5ced6": "d2954e", - "000000": "000000", "9c9cad": "a45f34", "424a52": "521709", "7b8494": "873e20", diff --git a/public/images/pokemon/variant/back/306-mega.json b/public/images/pokemon/variant/back/306-mega.json index 3ae17cb8c9d..cb90675d57c 100644 --- a/public/images/pokemon/variant/back/306-mega.json +++ b/public/images/pokemon/variant/back/306-mega.json @@ -1,7 +1,6 @@ { "0": { "393939": "132c1b", - "101010": "101010", "6a6a6a": "325537", "5a5a62": "735c4a", "fefefe": "fff2e5", @@ -13,7 +12,6 @@ }, "1": { "393939": "47121b", - "101010": "101010", "6a6a6a": "8b312e", "5a5a62": "374186", "fefefe": "cdd9fa", @@ -25,7 +23,6 @@ }, "2": { "393939": "1d365e", - "101010": "101010", "6a6a6a": "385594", "5a5a62": "7a3a1a", "fefefe": "f1b25e", diff --git a/public/images/pokemon/variant/back/306.json b/public/images/pokemon/variant/back/306.json index 369e367a076..d7f234ac930 100644 --- a/public/images/pokemon/variant/back/306.json +++ b/public/images/pokemon/variant/back/306.json @@ -4,7 +4,6 @@ "cecece": "e3d9c2", "a5a5ad": "cbc4a2", "ffffff": "fff2e5", - "000000": "000000", "212129": "0b1d12", "6bbdff": "d6ff42", "848494": "bca88c", @@ -18,7 +17,6 @@ "cecece": "b9c8f5", "a5a5ad": "91a1e3", "ffffff": "cdd9fa", - "000000": "000000", "212129": "290d13", "6bbdff": "ffcf47", "848494": "686dc0", @@ -32,7 +30,6 @@ "cecece": "f2b864", "a5a5ad": "d48e3c", "ffffff": "ffcc7d", - "000000": "000000", "212129": "101a37", "6bbdff": "2aebcf", "848494": "a45f34", diff --git a/public/images/pokemon/variant/back/307.json b/public/images/pokemon/variant/back/307.json index 3bdadaa8e16..8420a8631be 100644 --- a/public/images/pokemon/variant/back/307.json +++ b/public/images/pokemon/variant/back/307.json @@ -3,7 +3,6 @@ "7b6b6b": "7a5f5f", "b5adad": "9f8383", "e6dede": "deccc3", - "000000": "000000", "3a84b5": "7e4377", "3a4a5a": "5a2859", "6bcee6": "f4a8c8", @@ -13,7 +12,6 @@ "7b6b6b": "314b76", "b5adad": "677d98", "e6dede": "c2cfdb", - "000000": "000000", "3a84b5": "51876e", "3a4a5a": "113926", "6bcee6": "7edfb7", diff --git a/public/images/pokemon/variant/back/308-mega.json b/public/images/pokemon/variant/back/308-mega.json index 3517d7853a9..db572ca4391 100644 --- a/public/images/pokemon/variant/back/308-mega.json +++ b/public/images/pokemon/variant/back/308-mega.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "83414a": "59141d", "8b838b": "5a4357", "e6738b": "a53835", @@ -8,7 +7,6 @@ "bdafad": "a5829d", "52414a": "432641", "e7e3e7": "e0cdd9", - "f9f8f7": "f9f8f7", "a47329": "722966", "eebd5a": "a25793", "f6de83": "ee9bd5", @@ -16,7 +14,6 @@ "42a2bd": "efa360" }, "2": { - "101010": "101010", "83414a": "461f5d", "8b838b": "445a7e", "e6738b": "7d5187", diff --git a/public/images/pokemon/variant/back/308.json b/public/images/pokemon/variant/back/308.json index d8a8e696541..1f83f02c026 100644 --- a/public/images/pokemon/variant/back/308.json +++ b/public/images/pokemon/variant/back/308.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "84424a": "59141d", "e6738c": "a53835", "ce5a73": "8b2e2b", @@ -15,7 +14,6 @@ "f7de84": "ee9bd5" }, "2": { - "101010": "101010", "84424a": "311548", "e6738c": "7d5187", "ce5a73": "633971", @@ -24,7 +22,6 @@ "b54a5a": "461f5d", "8c848c": "576787", "ada5ad": "7e8daa", - "c5c5c5": "c5c5c5", "a57329": "205a9e", "efbd5a": "3a8dca", "f7de84": "5abbef" diff --git a/public/images/pokemon/variant/back/309.json b/public/images/pokemon/variant/back/309.json index b471b8f69f4..6506ed57935 100644 --- a/public/images/pokemon/variant/back/309.json +++ b/public/images/pokemon/variant/back/309.json @@ -5,11 +5,9 @@ "3a5a52": "091545", "84d67b": "3e6194", "b5ef9c": "6692c4", - "101010": "101010", "ffef42": "ff4039", "63bd63": "284781", - "cea53a": "d11a2d", - "ffffff": "ffffff" + "cea53a": "d11a2d" }, "2": { "639c63": "b399bd", @@ -17,10 +15,8 @@ "3a5a52": "825e94", "84d67b": "edd9ef", "b5ef9c": "ffeff5", - "101010": "101010", "ffef42": "ef60c5", "63bd63": "d5c1d9", - "cea53a": "d03ab2", - "ffffff": "ffffff" + "cea53a": "d03ab2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/31.json b/public/images/pokemon/variant/back/31.json index 7cbce870f78..e2cbab27a23 100644 --- a/public/images/pokemon/variant/back/31.json +++ b/public/images/pokemon/variant/back/31.json @@ -3,12 +3,9 @@ "314a4a": "593860", "638cad": "9d6ea7", "5ab5ce": "bd94c5", - "101010": "101010", "c5ad5a": "c5c5a4", "9cd6de": "eed3f3", "735a29": "73735a", - "d6cece": "d6cece", - "ffffff": "ffffff", "efe6a5": "ffffff", "e6ce8c": "e6e6d5" }, @@ -16,12 +13,9 @@ "314a4a": "441327", "638cad": "88241f", "5ab5ce": "be4234", - "101010": "101010", "c5ad5a": "c29f9a", "9cd6de": "e58060", "735a29": "734b48", - "d6cece": "d6cece", - "ffffff": "ffffff", "efe6a5": "ffede7", "e6ce8c": "e3ccc7" }, @@ -29,13 +23,9 @@ "314a4a": "210d3b", "638cad": "44286f", "5ab5ce": "5f4897", - "101010": "101010", "c5ad5a": "eab56b", "9cd6de": "5f4897", "735a29": "ad5923", - "d6cece": "d6cece", - "ffffff": "ffffff", - "efe6a5": "ffd999", - "e6ce8c": "e6ce8c" + "efe6a5": "ffd999" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/310-mega.json b/public/images/pokemon/variant/back/310-mega.json index 8ab3d0646dc..b0be523f618 100644 --- a/public/images/pokemon/variant/back/310-mega.json +++ b/public/images/pokemon/variant/back/310-mega.json @@ -4,30 +4,23 @@ "998c4c": "630013", "ffe566": "d4302a", "d9c357": "a6101a", - "101010": "101010", "2a474d": "0d1843", "82cad9": "4c7da6", "548e99": "284781", "69b1bf": "3e6194", - "3f6a73": "1a3269", - "ff7373": "ff7373", - "f8f8f8": "f8f8f8", - "cc2929": "cc2929", - "8c3f3f": "8c3f3f" + "3f6a73": "1a3269" }, "2": { "736a3f": "810040", "998c4c": "a40f5a", "ffe566": "e545b6", "d9c357": "c32574", - "101010": "101010", "2a474d": "3f5476", "82cad9": "c1ddeb", "548e99": "92b4cb", "69b1bf": "b3d1e5", "3f6a73": "6f8caa", "ff7373": "8f60ef", - "f8f8f8": "f8f8f8", "cc2929": "893edf", "8c3f3f": "4a0698" } diff --git a/public/images/pokemon/variant/back/310.json b/public/images/pokemon/variant/back/310.json index 68668df185a..c6370627111 100644 --- a/public/images/pokemon/variant/back/310.json +++ b/public/images/pokemon/variant/back/310.json @@ -4,25 +4,19 @@ "a57b5a": "6d000f", "ffef63": "d7231c", "c5ad5a": "9b0c24", - "101010": "101010", "73b5d6": "3e6194", "4a525a": "0d1a4d", "639cc5": "284781", - "5a84ad": "1a3269", - "bdbde6": "bdbde6", - "ffffff": "ffffff" + "5a84ad": "1a3269" }, "2": { "736352": "810040", "a57b5a": "9c0333", "ffef63": "e545b6", "c5ad5a": "c32574", - "101010": "101010", "73b5d6": "d5d6ee", "4a525a": "4c3a63", "639cc5": "c4bfd9", - "5a84ad": "a399bd", - "bdbde6": "bdbde6", - "ffffff": "ffffff" + "5a84ad": "a399bd" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/311.json b/public/images/pokemon/variant/back/311.json index c981b68c665..4904b5a2de3 100644 --- a/public/images/pokemon/variant/back/311.json +++ b/public/images/pokemon/variant/back/311.json @@ -3,7 +3,6 @@ "de4a42": "e070a9", "ef8484": "f89bc2", "b53131": "c24e9e", - "101010": "101010", "e6c573": "feda99", "b59c63": "c08242", "7b6352": "c08242", @@ -13,7 +12,6 @@ "de4a42": "d17e4d", "ef8484": "efa772", "b53131": "b7653c", - "101010": "101010", "e6c573": "becef1", "b59c63": "7e89bc", "7b6352": "7e89bc", @@ -23,7 +21,6 @@ "de4a42": "e2dba3", "ef8484": "fbf6e0", "b53131": "b7ac55", - "101010": "101010", "e6c573": "891e32", "b59c63": "620b05", "7b6352": "620b05", diff --git a/public/images/pokemon/variant/back/312.json b/public/images/pokemon/variant/back/312.json index e6006e80bbb..b9b732fde2e 100644 --- a/public/images/pokemon/variant/back/312.json +++ b/public/images/pokemon/variant/back/312.json @@ -1,7 +1,6 @@ { "1": { "4252de": "533bb0", - "101010": "101010", "739cf7": "c5ade5", "5a84ef": "8f6cd0", "e6c573": "b4dfe5", @@ -11,7 +10,6 @@ }, "2": { "4252de": "7cc5a5", - "101010": "101010", "739cf7": "e6f8ee", "5a84ef": "c4ddd2", "e6c573": "2e3a7f", diff --git a/public/images/pokemon/variant/back/315.json b/public/images/pokemon/variant/back/315.json index 124fba8a7b0..0f364cacd18 100644 --- a/public/images/pokemon/variant/back/315.json +++ b/public/images/pokemon/variant/back/315.json @@ -3,7 +3,6 @@ "3a5229": "0b2337", "5a9452": "153a51", "a5de73": "408592", - "000000": "000000", "73c55a": "215569", "295a94": "482571", "a5314a": "af681a", @@ -19,7 +18,6 @@ "3a5229": "201443", "5a9452": "402765", "a5de73": "aa78cd", - "000000": "000000", "73c55a": "66418b", "295a94": "6f104e", "a5314a": "8c2601", diff --git a/public/images/pokemon/variant/back/320.json b/public/images/pokemon/variant/back/320.json index e3be16343f5..3cb2d6ca5c0 100644 --- a/public/images/pokemon/variant/back/320.json +++ b/public/images/pokemon/variant/back/320.json @@ -5,7 +5,6 @@ "639cce": "ad252f", "4a84b5": "950f30", "315a94": "7d082e", - "000000": "000000", "ceb584": "cba6b8", "6b634a": "6c3f51", "ffefce": "eed9ef" @@ -16,7 +15,6 @@ "639cce": "503769", "4a84b5": "3d2955", "315a94": "34224b", - "000000": "000000", "ceb584": "b7a3bf", "6b634a": "5c4964", "ffefce": "eed9ef" diff --git a/public/images/pokemon/variant/back/321.json b/public/images/pokemon/variant/back/321.json index 51ee130e4ee..a893b313e54 100644 --- a/public/images/pokemon/variant/back/321.json +++ b/public/images/pokemon/variant/back/321.json @@ -1,6 +1,5 @@ { "1": { - "847384": "847384", "1052ce": "a4172f", "293a9c": "510019", "2173de": "ce323d", @@ -8,7 +7,6 @@ "94adff": "f5796d", "5a84ef": "e64f4f", "efe6ff": "e2c6d0", - "101010": "101010", "d6cede": "cba6b8" }, "2": { @@ -20,7 +18,6 @@ "94adff": "b484ce", "5a84ef": "8f69a3", "efe6ff": "fcebf6", - "101010": "101010", "d6cede": "eed9ef" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/327.json b/public/images/pokemon/variant/back/327.json index 29d66d38e43..850b92e64a6 100644 --- a/public/images/pokemon/variant/back/327.json +++ b/public/images/pokemon/variant/back/327.json @@ -1,7 +1,6 @@ { "1": { "7b4231": "21384a", - "101010": "101010", "735242": "122c3b", "e6d6a5": "b2dcd7", "cea573": "6ca9ac", @@ -11,7 +10,6 @@ }, "2": { "7b4231": "75211a", - "101010": "101010", "735242": "52180f", "e6d6a5": "be5f3c", "cea573": "93381f", diff --git a/public/images/pokemon/variant/back/328.json b/public/images/pokemon/variant/back/328.json index 354371495b7..0645acb54cf 100644 --- a/public/images/pokemon/variant/back/328.json +++ b/public/images/pokemon/variant/back/328.json @@ -4,9 +4,7 @@ "734242": "254226", "ef7342": "c9da97", "ff947b": "ffffbc", - "212121": "212121", "cecec5": "e99339", - "ffffff": "ffffff", "a5ada5": "bc6427", "848484": "89370b" }, @@ -15,9 +13,7 @@ "734242": "17465e", "ef7342": "5dd7db", "ff947b": "84f6e4", - "212121": "212121", "cecec5": "e4a056", - "ffffff": "ffffff", "a5ada5": "cd7537", "848484": "a84e20" } diff --git a/public/images/pokemon/variant/back/329.json b/public/images/pokemon/variant/back/329.json index 38397678f36..27efbde73c5 100644 --- a/public/images/pokemon/variant/back/329.json +++ b/public/images/pokemon/variant/back/329.json @@ -8,8 +8,6 @@ "737352": "1e4320", "bdad7b": "89af58", "e6d68c": "b6cd74", - "bdbdde": "bdbdde", - "ffffff": "ffffff", "ffffa5": "ffffb5" }, "2": { @@ -21,8 +19,6 @@ "737352": "2a658b", "bdad7b": "69b0c8", "e6d68c": "92ddf2", - "bdbdde": "bdbdde", - "ffffff": "ffffff", "ffffa5": "ffffb5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/330.json b/public/images/pokemon/variant/back/330.json index 96ade337889..2f48030d162 100644 --- a/public/images/pokemon/variant/back/330.json +++ b/public/images/pokemon/variant/back/330.json @@ -4,27 +4,22 @@ "84293a": "752d0c", "6ba573": "d8b430", "ce3a4a": "bc6427", - "101010": "101010", "5a7b52": "8b6009", "de6373": "e99339", "94d69c": "f6e85f", "b5de73": "e4ee9e", - "ffffff": "ffffff", "8ca552": "b3c46a", - "526321": "555e3d", - "deff8c": "deff8c" + "526321": "555e3d" }, "2": { "315a5a": "171997", "84293a": "a84e20", "6ba573": "465fd4", "ce3a4a": "cd7537", - "101010": "101010", "5a7b52": "2836af", "de6373": "f79021", "94d69c": "80a1f5", "b5de73": "94e3ff", - "ffffff": "ffffff", "8ca552": "4dabe8", "526321": "003c64", "deff8c": "d7fff7" diff --git a/public/images/pokemon/variant/back/333.json b/public/images/pokemon/variant/back/333.json index 64d67f5b282..7bc30c324e0 100644 --- a/public/images/pokemon/variant/back/333.json +++ b/public/images/pokemon/variant/back/333.json @@ -4,23 +4,19 @@ "3a6b84": "59377f", "7bceff": "e9d9fa", "63ade6": "cab1ec", - "101010": "101010", "9c9cc5": "3f328d", "ffffff": "80a1f1", "cecee6": "5251bd", - "848494": "392166", - "5a5a73": "5a5a73" + "848494": "392166" }, "2": { "5a94ce": "bc4e8b", "3a6b84": "84265b", "7bceff": "ff9ebd", "63ade6": "e677a5", - "101010": "101010", "9c9cc5": "bf6744", "ffffff": "ffddb4", "cecee6": "eb9d6a", - "848494": "892f26", - "5a5a73": "5a5a73" + "848494": "892f26" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/334-mega.json b/public/images/pokemon/variant/back/334-mega.json index 93a67bca961..38125962e9c 100644 --- a/public/images/pokemon/variant/back/334-mega.json +++ b/public/images/pokemon/variant/back/334-mega.json @@ -10,7 +10,6 @@ "deadc4": "45256a", "95d1e5": "e9d9fa", "4b6973": "462a66", - "101010": "101010", "74a3b3": "947dcf" }, "2": { @@ -24,7 +23,6 @@ "deadc4": "c63057", "95d1e5": "ff93ac", "4b6973": "771743", - "101010": "101010", "74a3b3": "cb457d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/334.json b/public/images/pokemon/variant/back/334.json index fb032bb4190..ba966e3ea90 100644 --- a/public/images/pokemon/variant/back/334.json +++ b/public/images/pokemon/variant/back/334.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "4a6394": "59377f", "109cce": "947dcf", "5ac5ff": "dbc4fa", @@ -12,7 +11,6 @@ "dee6ef": "6463d8" }, "2": { - "000000": "000000", "4a6394": "84265b", "109cce": "bc4e8b", "5ac5ff": "ff9ebd", diff --git a/public/images/pokemon/variant/back/336.json b/public/images/pokemon/variant/back/336.json index 59602a1c735..1466ff88ffa 100644 --- a/public/images/pokemon/variant/back/336.json +++ b/public/images/pokemon/variant/back/336.json @@ -7,10 +7,8 @@ "efe65a": "f78db5", "deb521": "dc7592", "631919": "20525a", - "000000": "000000", "ad423a": "2d6a77", "d6524a": "108bac", - "ffffff": "ffffff", "4a3152": "616479", "a573e6": "d5cce0", "735a94": "908ea4", @@ -24,10 +22,8 @@ "efe65a": "ee9452", "deb521": "d55218", "631919": "192121", - "000000": "000000", "ad423a": "293131", "d6524a": "5a6262", - "ffffff": "ffffff", "4a3152": "942931", "a573e6": "e6628b", "735a94": "b43952", diff --git a/public/images/pokemon/variant/back/337.json b/public/images/pokemon/variant/back/337.json index 3b6b2e7d4ef..da6fab95bb7 100644 --- a/public/images/pokemon/variant/back/337.json +++ b/public/images/pokemon/variant/back/337.json @@ -5,7 +5,6 @@ "cebd6b": "505c71", "b5a552": "38384b", "846b42": "161617", - "101010": "101010", "3a423a": "20282b", "b5213a": "b81fac", "841029": "611267", @@ -17,7 +16,6 @@ "cebd6b": "8a1211", "b5a552": "630923", "846b42": "2f0616", - "101010": "101010", "3a423a": "341413", "b5213a": "30d6d6", "841029": "08adad", diff --git a/public/images/pokemon/variant/back/338.json b/public/images/pokemon/variant/back/338.json index fac0db9ac9d..8e1981ca714 100644 --- a/public/images/pokemon/variant/back/338.json +++ b/public/images/pokemon/variant/back/338.json @@ -2,7 +2,6 @@ "1": { "634a19": "2b272d", "f7e663": "8d8b7f", - "101010": "101010", "deb519": "605a4a", "9c6b21": "332c2f", "c59442": "404042", @@ -16,7 +15,6 @@ "2": { "634a19": "80849a", "f7e663": "dbe4ee", - "101010": "101010", "deb519": "b1becb", "9c6b21": "8d93a7", "c59442": "96a2ae", diff --git a/public/images/pokemon/variant/back/339.json b/public/images/pokemon/variant/back/339.json index 969045d2a02..d63ded230b8 100644 --- a/public/images/pokemon/variant/back/339.json +++ b/public/images/pokemon/variant/back/339.json @@ -6,7 +6,6 @@ "63cef7": "fbabcc", "2194bd": "8f4daf", "293142": "413aad", - "000000": "000000", "525252": "413aad", "bdbdc5": "5bd5d5", "d6d6de": "aaffd5", diff --git a/public/images/pokemon/variant/back/340.json b/public/images/pokemon/variant/back/340.json index a52e33e995f..1f4723f642b 100644 --- a/public/images/pokemon/variant/back/340.json +++ b/public/images/pokemon/variant/back/340.json @@ -4,13 +4,9 @@ "84deff": "e27f9f", "73ade6": "bd5f55", "4263b5": "655050", - "000000": "000000", "3a4a9c": "443636", "c5a542": "fff6d0", - "f7de5a": "f7de5a", - "6b5a42": "6b5a42", "637bce": "856d6d", - "7bb5e6": "885b57", - "ffffff": "ffffff" + "7bb5e6": "885b57" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/341.json b/public/images/pokemon/variant/back/341.json index efb741ef1b0..aba08b64a3a 100644 --- a/public/images/pokemon/variant/back/341.json +++ b/public/images/pokemon/variant/back/341.json @@ -4,11 +4,8 @@ "ff9c94": "d2d78f", "6b3a42": "5e2204", "f77352": "c1b63c", - "101010": "101010", "e65208": "a37d1c", - "ffffff": "ffffff", "846b52": "ad5d2f", - "cecece": "cecece", "ad9c84": "d4925f", "ceb594": "edbda3" }, @@ -17,11 +14,8 @@ "ff9c94": "dbe5a8", "6b3a42": "5b432a", "f77352": "9ab767", - "101010": "101010", "e65208": "889455", - "ffffff": "ffffff", "846b52": "7a5030", - "cecece": "cecece", "ad9c84": "a88453", "ceb594": "d9bf7e" } diff --git a/public/images/pokemon/variant/back/35.json b/public/images/pokemon/variant/back/35.json index 9ccfd640d33..063f30863fa 100644 --- a/public/images/pokemon/variant/back/35.json +++ b/public/images/pokemon/variant/back/35.json @@ -6,10 +6,8 @@ "ffd6bd": "c7a1e4", "9c8473": "72899d", "ffadad": "9786e3", - "101010": "101010", "5a3121": "20475b", - "949494": "4d5f9d", - "ffffff": "ffffff" + "949494": "4d5f9d" }, "2": { "e67b7b": "958fe6", @@ -19,8 +17,6 @@ "9c8473": "ffd2e0", "ffadad": "badfff", "101010": "321025", - "5a3121": "5a3154", - "949494": "949494", - "ffffff": "ffffff" + "5a3121": "5a3154" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/351-rainy.json b/public/images/pokemon/variant/back/351-rainy.json index 5e7a1d827f2..3835257321a 100644 --- a/public/images/pokemon/variant/back/351-rainy.json +++ b/public/images/pokemon/variant/back/351-rainy.json @@ -1,14 +1,9 @@ { "0": { "526384": "527384", - "8ccede": "8ccede", - "3a425a": "3a425a", - "84b5c5": "84b5c5", - "ffffff": "ffffff", "6373bd": "379aa9", "738cd6": "48c2b4", "b5c5de": "85de7e", - "191919": "191919", "ceeff7": "79ff5e", "5a5a52": "4f555a", "c5c5c5": "9db4c5", @@ -17,13 +12,11 @@ "1": { "526384": "3c165d", "8ccede": "f5bbf6", - "3a425a": "3a425a", "84b5c5": "aa82c1", "ffffff": "faefff", "6373bd": "512b82", "738cd6": "704cb4", "b5c5de": "ac7ce9", - "191919": "191919", "ceeff7": "c5abff", "5a5a52": "352f55", "c5c5c5": "d7d4f1", @@ -32,13 +25,10 @@ "2": { "526384": "2d5170", "8ccede": "59a3b2", - "3a425a": "3a425a", "84b5c5": "487c91", - "ffffff": "ffffff", "6373bd": "99aac3", "738cd6": "cad9ea", "b5c5de": "454fd0", - "191919": "191919", "ceeff7": "5c74e2", "5a5a52": "282e44", "c5c5c5": "605e74", diff --git a/public/images/pokemon/variant/back/351-snowy.json b/public/images/pokemon/variant/back/351-snowy.json index ddb3a3bebb7..5b69d124f6a 100644 --- a/public/images/pokemon/variant/back/351-snowy.json +++ b/public/images/pokemon/variant/back/351-snowy.json @@ -1,11 +1,6 @@ { "0": { - "73a58c": "73a58c", "bde6e6": "bee3e6", - "8ccead": "8ccead", - "29523a": "29523a", - "52736b": "52736b", - "191919": "191919", "634a73": "4a4a73", "7b52bd": "5260bd", "8c73d6": "738cd6", @@ -18,12 +13,9 @@ "8ccead": "c4dcdc", "29523a": "335c68", "52736b": "688e94", - "191919": "191919", "634a73": "1f2567", "7b52bd": "323e85", - "8c73d6": "3f59a0", - "9c9cc5": "9c9cc5", - "c5b5ff": "c5b5ff" + "8c73d6": "3f59a0" }, "2": { "73a58c": "245b68", @@ -31,7 +23,6 @@ "8ccead": "47989e", "29523a": "15364b", "52736b": "5e98a5", - "191919": "191919", "634a73": "2f4954", "7b52bd": "7eafbf", "8c73d6": "b6e7e8", diff --git a/public/images/pokemon/variant/back/351-sunny.json b/public/images/pokemon/variant/back/351-sunny.json index d0d87551e48..2e80bb8d6bb 100644 --- a/public/images/pokemon/variant/back/351-sunny.json +++ b/public/images/pokemon/variant/back/351-sunny.json @@ -5,7 +5,6 @@ "ffffff": "f0dee7", "d6844a": "d6994a", "633129": "633829", - "191919": "191919", "ef7b4a": "ff566c", "ce5a4a": "bf4b6a", "5a5a52": "5a5155", @@ -17,7 +16,6 @@ "ffffff": "d7d4f1", "d6844a": "d34d51", "633129": "4a0427", - "191919": "191919", "ef7b4a": "cd385b", "ce5a4a": "871537", "5a5a52": "282e44", diff --git a/public/images/pokemon/variant/back/351.json b/public/images/pokemon/variant/back/351.json index 1e0c0e15946..d79aa01e05f 100644 --- a/public/images/pokemon/variant/back/351.json +++ b/public/images/pokemon/variant/back/351.json @@ -4,7 +4,6 @@ "949494": "496c9a", "e6dede": "9ec7dc", "f7f7ef": "cfe1e7", - "000000": "000000", "cebdbd": "6288a6", "a59ca5": "6a0650", "ffffff": "b12348", @@ -15,7 +14,6 @@ "949494": "344372", "e6dede": "6f86a4", "f7f7ef": "a7bcd1", - "000000": "000000", "cebdbd": "425a8a", "a59ca5": "93290d", "ffffff": "d87a26", diff --git a/public/images/pokemon/variant/back/352.json b/public/images/pokemon/variant/back/352.json index 565b4cf87d3..b68f95b14a2 100644 --- a/public/images/pokemon/variant/back/352.json +++ b/public/images/pokemon/variant/back/352.json @@ -4,44 +4,38 @@ "73315a": "0e3354", "8c7b5a": "824c0b", "d663ad": "54a3ca", - "000000": "000000", "f7ef7b": "f7dd7b", "dec55a": "e5b740", "bda552": "cd9a2b", "42635a": "296161", "5a9473": "418b87", "5abd73": "5db5a8", - "7bd684": "9cefbc", - "ffffff": "ffffff" + "7bd684": "9cefbc" }, "1": { "a54284": "3d48b2", "73315a": "202065", "8c7b5a": "7b2577", "d663ad": "8597d6", - "000000": "000000", "f7ef7b": "ed7cd8", "dec55a": "cb57b6", "bda552": "962c8d", "42635a": "762f0f", "5a9473": "bd7932", "5abd73": "e4ad46", - "7bd684": "ffd577", - "ffffff": "ffffff" + "7bd684": "ffd577" }, "2": { "a54284": "64152b", "73315a": "400e2a", "8c7b5a": "307855", "d663ad": "ab2f43", - "000000": "000000", "f7ef7b": "affec6", "dec55a": "7edb9f", "bda552": "52b57a", "42635a": "58214c", "5a9473": "b45599", "5abd73": "d775b5", - "7bd684": "f2a8d6", - "ffffff": "ffffff" + "7bd684": "f2a8d6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/353.json b/public/images/pokemon/variant/back/353.json index 40c30d2720c..a888181b501 100644 --- a/public/images/pokemon/variant/back/353.json +++ b/public/images/pokemon/variant/back/353.json @@ -4,7 +4,6 @@ "635a8c": "9c4572", "73739c": "c25e87", "8484ad": "d57b96", - "000000": "000000", "19315a": "2c1432", "428cad": "5452c7", "73b5d6": "8476d7", @@ -16,7 +15,6 @@ "635a8c": "487c5d", "73739c": "6d9772", "8484ad": "93aa7f", - "000000": "000000", "19315a": "20311c", "428cad": "47b858", "73b5d6": "71d765", diff --git a/public/images/pokemon/variant/back/354-mega.json b/public/images/pokemon/variant/back/354-mega.json index 01632fcde0f..1010d14aaf3 100644 --- a/public/images/pokemon/variant/back/354-mega.json +++ b/public/images/pokemon/variant/back/354-mega.json @@ -5,7 +5,6 @@ "eebd5a": "b78d90", "d59c39": "7d656d", "322c33": "30142a", - "010101": "010101", "685f6b": "6c2f4c", "4d464f": "592145", "7c777d": "934861", @@ -20,7 +19,6 @@ "eebd5a": "4d4f5b", "d59c39": "3b3d54", "322c33": "2b454a", - "010101": "010101", "685f6b": "71a680", "4d464f": "5b777b", "7c777d": "9cbf81", diff --git a/public/images/pokemon/variant/back/354.json b/public/images/pokemon/variant/back/354.json index 2cf56096218..a6004d0fe69 100644 --- a/public/images/pokemon/variant/back/354.json +++ b/public/images/pokemon/variant/back/354.json @@ -4,7 +4,6 @@ "9c9ca5": "934861", "3a3142": "2e0920", "7b7b84": "6c2f4c", - "000000": "000000", "a57b10": "715568", "523a00": "372a38", "efbd5a": "b78d90", @@ -16,7 +15,6 @@ "9c9ca5": "9ed18a", "3a3142": "2b454a", "7b7b84": "84bd95", - "000000": "000000", "a57b10": "33365e", "523a00": "151433", "efbd5a": "4d4f5b", diff --git a/public/images/pokemon/variant/back/357.json b/public/images/pokemon/variant/back/357.json index c2b00a581c0..b7091079ec3 100644 --- a/public/images/pokemon/variant/back/357.json +++ b/public/images/pokemon/variant/back/357.json @@ -15,7 +15,6 @@ "b5946b": "ffefd5" }, "2": { - "000000": "000000", "52ad52": "2d3c5c", "216321": "101121", "3a8c4a": "1f2547", diff --git a/public/images/pokemon/variant/back/358.json b/public/images/pokemon/variant/back/358.json index e0ad4916ffd..d23fb2c57fc 100644 --- a/public/images/pokemon/variant/back/358.json +++ b/public/images/pokemon/variant/back/358.json @@ -1,11 +1,7 @@ { "0": { - "a57352": "a57352", "000000": "101010", - "e6a54a": "e6a54a", "ffd65a": "ffce5a", - "ffe694": "ffe694", - "ffffff": "ffffff", "424a6b": "3a1837", "c5e6ff": "d8c8d9", "9cc5e6": "c3b5c6", @@ -20,7 +16,6 @@ "e6a54a": "cca375", "ffd65a": "ebd4b0", "ffe694": "faedcd", - "ffffff": "ffffff", "424a6b": "29346b", "c5e6ff": "c5c2dc", "9cc5e6": "afadcd", @@ -35,7 +30,6 @@ "e6a54a": "c86b3e", "ffd65a": "ee9b65", "ffe694": "f4c89d", - "ffffff": "ffffff", "424a6b": "593a58", "c5e6ff": "f7e6e5", "9cc5e6": "e8d6d6", diff --git a/public/images/pokemon/variant/back/36.json b/public/images/pokemon/variant/back/36.json index a68781af567..0f92d1fc987 100644 --- a/public/images/pokemon/variant/back/36.json +++ b/public/images/pokemon/variant/back/36.json @@ -3,13 +3,10 @@ "52423a": "59435c", "8c4a52": "7e4b9c", "de6363": "958fe6", - "101010": "101010", "7b6b63": "ab6f83", "ffc5b5": "e5faf2", "ef9494": "abcbff", - "52314a": "52314a", "d67ba5": "f5c4e0", - "bd5a7b": "d1829b", - "ffffff": "ffffff" + "bd5a7b": "d1829b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/361.json b/public/images/pokemon/variant/back/361.json index 19b1e1aa055..6428c992de9 100644 --- a/public/images/pokemon/variant/back/361.json +++ b/public/images/pokemon/variant/back/361.json @@ -5,7 +5,6 @@ "efc56b": "c36193", "ffefa5": "f5a4c6", "ff735a": "ddb478", - "000000": "000000", "b55a31": "cf9d61", "3a3131": "2e161b", "4a4a4a": "432525" @@ -16,7 +15,6 @@ "efc56b": "1f4419", "ffefa5": "5f884c", "ff735a": "071f12", - "000000": "000000", "b55a31": "03130b", "3a3131": "586b62", "4a4a4a": "8c9f94" diff --git a/public/images/pokemon/variant/back/362-mega.json b/public/images/pokemon/variant/back/362-mega.json index 2f3d13a6944..244a1c96aeb 100644 --- a/public/images/pokemon/variant/back/362-mega.json +++ b/public/images/pokemon/variant/back/362-mega.json @@ -1,7 +1,6 @@ { "1": { "393941": "050832", - "010101": "010101", "2b74a8": "84073c", "bbeeff": "f9383e", "7dbbee": "b7113a", @@ -13,7 +12,6 @@ }, "2": { "393941": "221315", - "010101": "010101", "2b74a8": "0c4b3a", "bbeeff": "5ce11a", "7dbbee": "009325", diff --git a/public/images/pokemon/variant/back/362.json b/public/images/pokemon/variant/back/362.json index 337a5137ab9..13cdf946670 100644 --- a/public/images/pokemon/variant/back/362.json +++ b/public/images/pokemon/variant/back/362.json @@ -1,18 +1,15 @@ { "1": { "3a3a42": "0d1146", - "000000": "000000", "a5a5ad": "f9383e", "7b7b84": "84073c", "7b7b94": "151a57", "e6e6f7": "a2b7e5", "adadce": "2f3c84", - "c5cee6": "6076c6", - "52526b": "52526b" + "c5cee6": "6076c6" }, "2": { "3a3a42": "221315", - "000000": "000000", "a5a5ad": "009325", "7b7b84": "0c4b3a", "7b7b94": "4a282a", diff --git a/public/images/pokemon/variant/back/37.json b/public/images/pokemon/variant/back/37.json index 1c7262f4d92..3e4728637c6 100644 --- a/public/images/pokemon/variant/back/37.json +++ b/public/images/pokemon/variant/back/37.json @@ -5,7 +5,6 @@ "732100": "381d5b", "bd735a": "ba6cbd", "e6946b": "dc91d5", - "101010": "101010", "ffde94": "d4c5b6", "ffe6b5": "e8e0d1", "845231": "743a67", @@ -18,7 +17,6 @@ "732100": "1e1323", "bd735a": "33325e", "e6946b": "45457c", - "101010": "101010", "ffde94": "9fb3c1", "ffe6b5": "d8e4e8", "845231": "1b1b47", diff --git a/public/images/pokemon/variant/back/371.json b/public/images/pokemon/variant/back/371.json index 5191634020b..a8ee100bde5 100644 --- a/public/images/pokemon/variant/back/371.json +++ b/public/images/pokemon/variant/back/371.json @@ -3,32 +3,20 @@ "4a5263": "4f342a", "d6cede": "ead1b5", "a59cb5": "bc997e", - "000000": "000000", "849494": "89624e", "5a84ad": "a8662e", "bda573": "28407d", - "f7f7ff": "f7f7ff", "63ade6": "d19656", - "847352": "1b2867", - "ffffff": "ffffff", - "9c4219": "9c4219", - "d67342": "d67342", - "94d6ff": "94d6ff" + "847352": "1b2867" }, "2": { "4a5263": "55111e", "d6cede": "eacb8e", "a59cb5": "c79961", - "000000": "000000", "849494": "89624e", "5a84ad": "b33c47", "bda573": "e5cdab", - "f7f7ff": "f7f7ff", "63ade6": "c7515c", - "847352": "c79961", - "ffffff": "ffffff", - "9c4219": "9c4219", - "d67342": "d67342", - "94d6ff": "94d6ff" + "847352": "c79961" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/372.json b/public/images/pokemon/variant/back/372.json index 3adf4b49788..8002e0728b7 100644 --- a/public/images/pokemon/variant/back/372.json +++ b/public/images/pokemon/variant/back/372.json @@ -3,9 +3,7 @@ "525263": "5e3528", "7b7384": "704a3b", "d6d6d6": "ead1b5", - "efefd6": "efefd6", "adadb5": "bc997e", - "191919": "191919", "525a52": "9b572b", "9494a5": "9b735d", "4a423a": "6e2a12", @@ -17,9 +15,7 @@ "525263": "7b4e2e", "7b7384": "a16f44", "d6d6d6": "f2d9a9", - "efefd6": "efefd6", "adadb5": "d0a674", - "191919": "191919", "525a52": "862533", "9494a5": "ad7853", "4a423a": "581222", diff --git a/public/images/pokemon/variant/back/373-mega.json b/public/images/pokemon/variant/back/373-mega.json index 04515e84b4b..4e5d5889e6e 100644 --- a/public/images/pokemon/variant/back/373-mega.json +++ b/public/images/pokemon/variant/back/373-mega.json @@ -3,28 +3,22 @@ "602828": "02002c", "a33939": "132760", "ea5350": "1c4076", - "101010": "101010", "002e3f": "6c2d13", "23a1d3": "efb660", "1e7696": "d28943", "f77979": "4572a2", - "255063": "a45f28", - "acaca4": "acaca4", - "fcfcfc": "fcfcfc", - "839494": "839494" + "255063": "a45f28" }, "2": { "602828": "866c51", "a33939": "baae9b", "ea5350": "e5ddcb", - "101010": "101010", "002e3f": "300926", "23a1d3": "8a3562", "1e7696": "71184e", "f77979": "fff9e5", "255063": "3f0f31", "acaca4": "591126", - "fcfcfc": "fcfcfc", "839494": "591126" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/373.json b/public/images/pokemon/variant/back/373.json index ec86f607f9d..b4588ac589c 100644 --- a/public/images/pokemon/variant/back/373.json +++ b/public/images/pokemon/variant/back/373.json @@ -1,6 +1,5 @@ { "1": { - "191919": "191919", "29637b": "66300e", "84cee6": "f3be6d", "4aa5ce": "c77939", @@ -9,13 +8,10 @@ "de8494": "4572a2", "a53a4a": "132760", "42849c": "9f5727", - "ffffff": "ffffff", "adada5": "f1dbc0", - "849494": "c49368", - "efefe6": "efefe6" + "849494": "c49368" }, "2": { - "191919": "191919", "29637b": "310823", "84cee6": "8b2539", "4aa5ce": "631734", @@ -24,7 +20,6 @@ "de8494": "fff5fb", "a53a4a": "b596ab", "42849c": "420c26", - "ffffff": "ffffff", "adada5": "beaa8a", "849494": "8c6d56", "efefe6": "fff9e5" diff --git a/public/images/pokemon/variant/back/374.json b/public/images/pokemon/variant/back/374.json index a5490ebda55..a617d6e3a1b 100644 --- a/public/images/pokemon/variant/back/374.json +++ b/public/images/pokemon/variant/back/374.json @@ -3,7 +3,6 @@ "424a84": "550611", "94b5ef": "ff795f", "528cd6": "b52524", - "101010": "101010", "4a6ba5": "851421", "73b5f7": "eb4c43", "dedede": "f0cb69", @@ -14,7 +13,6 @@ "424a84": "0d4346", "94b5ef": "7ef5d1", "528cd6": "39ac99", - "101010": "101010", "4a6ba5": "1e716e", "73b5f7": "70e1bf", "dedede": "ffb752", diff --git a/public/images/pokemon/variant/back/375.json b/public/images/pokemon/variant/back/375.json index 80de761d4bb..3cb439918de 100644 --- a/public/images/pokemon/variant/back/375.json +++ b/public/images/pokemon/variant/back/375.json @@ -1,7 +1,6 @@ { "1": { "636b8c": "8d4010", - "101010": "101010", "dedede": "f2d660", "9c9cad": "ce7c29", "c5c5ce": "f8b74c", @@ -14,7 +13,6 @@ }, "2": { "636b8c": "7e280e", - "101010": "101010", "dedede": "f19231", "9c9cad": "bd582c", "c5c5ce": "eb763d", diff --git a/public/images/pokemon/variant/back/376-mega.json b/public/images/pokemon/variant/back/376-mega.json index 041b81152c8..1f9fbff63d9 100644 --- a/public/images/pokemon/variant/back/376-mega.json +++ b/public/images/pokemon/variant/back/376-mega.json @@ -6,8 +6,7 @@ "313962": "550611", "736a73": "a76911", "cdcdcd": "ffe07c", - "acacac": "ffc753", - "101010": "101010" + "acacac": "ffc753" }, "2": { "416294": "1e716e", @@ -16,7 +15,6 @@ "313962": "0b3739", "736a73": "9f4219", "cdcdcd": "ffc16a", - "acacac": "f57e37", - "101010": "101010" + "acacac": "f57e37" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/376.json b/public/images/pokemon/variant/back/376.json index ee2939ebeb8..b0379faa0c0 100644 --- a/public/images/pokemon/variant/back/376.json +++ b/public/images/pokemon/variant/back/376.json @@ -1,7 +1,6 @@ { "1": { "313a63": "550611", - "101010": "101010", "a5c5f7": "ff7d6d", "7ba5f7": "f2534b", "4a84c5": "b42a29", @@ -13,7 +12,6 @@ }, "2": { "313a63": "0b3739", - "101010": "101010", "a5c5f7": "7ef5d1", "7ba5f7": "67ddbe", "4a84c5": "41b4a1", diff --git a/public/images/pokemon/variant/back/38.json b/public/images/pokemon/variant/back/38.json index bd8b6202381..54406c2bd7e 100644 --- a/public/images/pokemon/variant/back/38.json +++ b/public/images/pokemon/variant/back/38.json @@ -3,7 +3,6 @@ "846319": "613260", "ce9c4a": "b16da0", "f7e67b": "f0c2dc", - "101010": "101010", "e6c552": "ca91ba", "ffa53a": "8963b5", "ef8429": "593d85" @@ -12,7 +11,6 @@ "846319": "0b0b2a", "ce9c4a": "1a1a52", "f7e67b": "3f548b", - "101010": "101010", "e6c552": "293272", "ffa53a": "a9354a", "ef8429": "811d39" diff --git a/public/images/pokemon/variant/back/380-mega.json b/public/images/pokemon/variant/back/380-mega.json index fe47ff1cda3..98af25e4d7e 100644 --- a/public/images/pokemon/variant/back/380-mega.json +++ b/public/images/pokemon/variant/back/380-mega.json @@ -3,7 +3,6 @@ "7474a6": "9a6853", "f2f2ff": "f3e6df", "adadd9": "b48f79", - "101010": "101010", "cecef2": "e3cfc1", "483f73": "97440c", "8777d9": "d08528", @@ -13,7 +12,6 @@ "7474a6": "8d5a8f", "f2f2ff": "eedaea", "adadd9": "c78ac4", - "101010": "101010", "cecef2": "e4c7e1", "483f73": "167683", "8777d9": "5de2d5", diff --git a/public/images/pokemon/variant/back/380.json b/public/images/pokemon/variant/back/380.json index eeb530ff55c..d04ae32d12e 100644 --- a/public/images/pokemon/variant/back/380.json +++ b/public/images/pokemon/variant/back/380.json @@ -1,7 +1,6 @@ { "1": { "8c294a": "8c3205", - "000000": "000000", "ff6363": "f78232", "7b73a5": "ac654e", "ceceef": "dead89", @@ -10,12 +9,10 @@ "ada5d6": "b87e64", "ce4a52": "d45c1b", "cea54a": "8d4def", - "ffffff": "ffffff", "ffce5a": "a575ff" }, "2": { "8c294a": "480a81", - "000000": "000000", "ff6363": "9344b8", "7b73a5": "912a63", "ceceef": "d899bd", @@ -24,7 +21,6 @@ "ada5d6": "ad5682", "ce4a52": "70309f", "cea54a": "ab2635", - "ffffff": "ffffff", "ffce5a": "cf3d45" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/381-mega.json b/public/images/pokemon/variant/back/381-mega.json index 018df030d4a..87eb3ee0e3a 100644 --- a/public/images/pokemon/variant/back/381-mega.json +++ b/public/images/pokemon/variant/back/381-mega.json @@ -3,7 +3,6 @@ "7474a6": "7e447b", "f2f2ff": "f9cfed", "adadd9": "b673ad", - "101010": "101010", "cecef2": "dfa1d2", "483f73": "29165d", "8777d9": "453c90", @@ -13,7 +12,6 @@ "7474a6": "98485e", "f2f2ff": "f7d9ec", "adadd9": "bf7a9d", - "101010": "101010", "cecef2": "e4abcc", "483f73": "52060f", "8777d9": "97241f", diff --git a/public/images/pokemon/variant/back/381.json b/public/images/pokemon/variant/back/381.json index 85d230ee1df..56fb1494d79 100644 --- a/public/images/pokemon/variant/back/381.json +++ b/public/images/pokemon/variant/back/381.json @@ -3,26 +3,22 @@ "4a63b5": "3e1f5a", "293173": "2a0f43", "5aa5ff": "653c7e", - "101010": "101010", "6b636b": "6d3252", "ded6ce": "f9cfed", "5273d6": "4f2c6a", "b5b5ad": "e4a8d1", "dedede": "ffe5f4", - "ffffff": "ffffff", "c53a5a": "d05718" }, "2": { "4a63b5": "b54800", "293173": "7e2201", "5aa5ff": "ea8b00", - "101010": "101010", "6b636b": "733e7c", "ded6ce": "dab1d7", "5273d6": "ce6700", "b5b5ad": "bb8dbb", "dedede": "e9cae4", - "ffffff": "ffffff", "c53a5a": "00abd2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/382-primal.json b/public/images/pokemon/variant/back/382-primal.json index 368d7a809f0..2b0eb5ce5fb 100644 --- a/public/images/pokemon/variant/back/382-primal.json +++ b/public/images/pokemon/variant/back/382-primal.json @@ -4,7 +4,6 @@ "74659d": "f3bb49", "90a2c0": "eac3b9", "d3e6f4": "f6e4e0", - "101010": "101010", "e8e3e8": "fff7f4", "373384": "f08d2a", "7eaecc": "ff3200", @@ -19,9 +18,6 @@ "2": { "27245e": "780613", "74659d": "ea512b", - "90a2c0": "90a2c0", - "d3e6f4": "d3e6f4", - "101010": "101010", "e8e3e8": "ffe9e6", "373384": "a90e14", "7eaecc": "ffc546", diff --git a/public/images/pokemon/variant/back/382.json b/public/images/pokemon/variant/back/382.json index 5bd9c3a9a7d..f947132f2d6 100644 --- a/public/images/pokemon/variant/back/382.json +++ b/public/images/pokemon/variant/back/382.json @@ -1,9 +1,7 @@ { "1": { - "5a526b": "5a526b", "dedede": "fff7f4", "3a63b5": "f08d2a", - "101010": "101010", "cebdce": "f6e4e0", "5aa5ff": "ffc95c", "4a84d6": "ffa938", @@ -16,10 +14,7 @@ "73293a": "a30d25" }, "2": { - "5a526b": "5a526b", - "dedede": "dedede", "3a63b5": "a90e14", - "101010": "101010", "cebdce": "d7bbd7", "5aa5ff": "ea512b", "4a84d6": "ce3118", @@ -28,7 +23,6 @@ "9c8c94": "ba9abc", "84ceff": "ff8a5e", "f71010": "ffc546", - "a53163": "ea7c18", - "73293a": "73293a" + "a53163": "ea7c18" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/383-primal.json b/public/images/pokemon/variant/back/383-primal.json index 1cb9664651e..77f7bb7d58a 100644 --- a/public/images/pokemon/variant/back/383-primal.json +++ b/public/images/pokemon/variant/back/383-primal.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "632329": "032a10", "7e2d2d": "10371a", "d5736d": "419e49", @@ -8,16 +7,9 @@ "957346": "ff8571", "f2d259": "ffd493", "a03131": "135121", - "343434": "343434", - "695a5b": "695a5b", - "887981": "887981", - "f6e08c": "f6e08c", - "e0b2b2": "49c74f", - "bdbdd5": "bdbdd5", - "f2f2f2": "f2f2f2" + "e0b2b2": "49c74f" }, "2": { - "000000": "000000", "632329": "123953", "7e2d2d": "20516c", "d5736d": "4daab4", @@ -29,8 +21,6 @@ "695a5b": "4e5169", "887981": "777e95", "f6e08c": "ebffb0", - "e0b2b2": "68cfd0", - "bdbdd5": "bdbdd5", - "f2f2f2": "f2f2f2" + "e0b2b2": "68cfd0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/383.json b/public/images/pokemon/variant/back/383.json index f3760c0244e..447de8865d4 100644 --- a/public/images/pokemon/variant/back/383.json +++ b/public/images/pokemon/variant/back/383.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "7b2129": "032a10", "9c2929": "10371a", "ff736b": "419e49", @@ -13,11 +12,9 @@ "9c6b31": "d51b3e", "ffce31": "ff435d", "94848c": "72798b", - "ffbdbd": "49c74f", - "ad9ca5": "ad9ca5" + "ffbdbd": "49c74f" }, "2": { - "000000": "000000", "7b2129": "123953", "9c2929": "20516c", "ff736b": "73e7e8", @@ -27,10 +24,7 @@ "736363": "4e5169", "ffffff": "e5fdff", "bdbdd6": "bcdde4", - "9c6b31": "9c6b31", - "ffce31": "ffce31", "94848c": "787f9d", - "ffbdbd": "68cfd0", - "ad9ca5": "ad9ca5" + "ffbdbd": "68cfd0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/384-mega.json b/public/images/pokemon/variant/back/384-mega.json index 016c044b27f..9ee39a2621c 100644 --- a/public/images/pokemon/variant/back/384-mega.json +++ b/public/images/pokemon/variant/back/384-mega.json @@ -3,7 +3,6 @@ "fbe27e": "90f25d", "fc9436": "3dc62f", "836231": "064c1e", - "010101": "010101", "f6de00": "4ff869", "c5a400": "27c750", "3d7d6d": "66637b", @@ -11,14 +10,12 @@ "22523e": "333554", "e4b629": "27c750", "60d293": "e4e0ee", - "3f3f3f": "333554", - "fcfcfc": "fcfcfc" + "3f3f3f": "333554" }, "2": { "fbe27e": "17e2d6", "fc9436": "098faf", "836231": "121d31", - "010101": "010101", "f6de00": "17e2d6", "c5a400": "098faf", "3d7d6d": "84120f", @@ -26,7 +23,6 @@ "22523e": "650f04", "e4b629": "098faf", "60d293": "f18c5e", - "3f3f3f": "380100", - "fcfcfc": "fcfcfc" + "3f3f3f": "380100" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/384.json b/public/images/pokemon/variant/back/384.json index f4fc7855474..a6400382a8b 100644 --- a/public/images/pokemon/variant/back/384.json +++ b/public/images/pokemon/variant/back/384.json @@ -2,7 +2,6 @@ "1": { "295242": "333554", "4a8473": "66637b", - "000000": "000000", "5abd8c": "b3aec1", "73293a": "064c1e", "9c2952": "27c750", @@ -10,23 +9,17 @@ "c5a500": "4ebc28", "846331": "188c0f", "e65273": "4ff869", - "94deb5": "e4e0ee", - "ffffff": "ffffff", - "ded6ef": "ded6ef" + "94deb5": "e4e0ee" }, "2": { "295242": "540709", "4a8473": "821815", - "000000": "000000", "5abd8c": "ca4636", "73293a": "003b53", "9c2952": "098faf", "f7de00": "17e2d6", "c5a500": "098faf", "846331": "003082", - "e65273": "e65273", - "94deb5": "f18c5e", - "ffffff": "ffffff", - "ded6ef": "ded6ef" + "94deb5": "f18c5e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/385.json b/public/images/pokemon/variant/back/385.json index 1bb728fe3d2..102d7633618 100644 --- a/public/images/pokemon/variant/back/385.json +++ b/public/images/pokemon/variant/back/385.json @@ -1,7 +1,6 @@ { "0": { "ad8431": "925108", - "000000": "000000", "ffff94": "f7e980", "e6bd52": "db942d", "ffe65a": "f3bf5c", @@ -14,7 +13,6 @@ }, "1": { "ad8431": "874100", - "000000": "000000", "ffff94": "f7be5d", "e6bd52": "ba670d", "ffe65a": "de9128", @@ -27,7 +25,6 @@ }, "2": { "ad8431": "234664", - "000000": "000000", "ffff94": "b1dbe8", "e6bd52": "427aa3", "ffe65a": "6fb6da", diff --git a/public/images/pokemon/variant/back/387.json b/public/images/pokemon/variant/back/387.json index a858e24d088..a8d187d2794 100644 --- a/public/images/pokemon/variant/back/387.json +++ b/public/images/pokemon/variant/back/387.json @@ -3,7 +3,6 @@ "3aa542": "d0d6d6", "7bd66b": "ffffff", "3a5a29": "241423", - "000000": "000000", "634a3a": "2c4a78", "b58452": "d6e1e9", "5a7b42": "372835", @@ -12,7 +11,6 @@ "bdce84": "7d6d7a", "dee68c": "958790", "f7e65a": "8bcadd", - "c5bd3a": "3875a1", - "ffffff": "ffffff" + "c5bd3a": "3875a1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/388.json b/public/images/pokemon/variant/back/388.json index 9ddb71ba8c8..e81ad1f8baf 100644 --- a/public/images/pokemon/variant/back/388.json +++ b/public/images/pokemon/variant/back/388.json @@ -3,34 +3,26 @@ "3a5a29": "3b1228", "3a8c42": "e79ac2", "63b56b": "ffd3f2", - "101019": "101019", "634a3a": "112a24", "b58452": "3f5e4c", "8c6b42": "2c483c", "deb542": "738f7a", "efd642": "9cc096", - "ffffff": "ffffff", "6b8c4a": "773859", "adc563": "b07587", - "94ad5a": "954e6c", - "949494": "949494", - "d6d6d6": "d6d6d6" + "94ad5a": "954e6c" }, "2": { "3a5a29": "362f2f", "3a8c42": "d6e1e9", "63b56b": "ffffff", - "101019": "101019", "634a3a": "251c3d", "b58452": "2c4a78", "8c6b42": "20284e", "deb542": "3875a1", "efd642": "8bcadd", - "ffffff": "ffffff", "6b8c4a": "463d3e", "adc563": "949494", - "94ad5a": "756667", - "949494": "949494", - "d6d6d6": "d6d6d6" + "94ad5a": "756667" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/389.json b/public/images/pokemon/variant/back/389.json index db18c1f2d10..ce698dbdb6d 100644 --- a/public/images/pokemon/variant/back/389.json +++ b/public/images/pokemon/variant/back/389.json @@ -3,7 +3,6 @@ "196319": "ba597b", "42ad42": "fddcf6", "318c3a": "e799bb", - "101010": "101010", "634a3a": "241a21", "8c6b42": "3d2a37", "b58452": "573a4b", @@ -18,7 +17,6 @@ "196319": "738d9d", "42ad42": "d6e1e9", "318c3a": "a7bcc9", - "101010": "101010", "634a3a": "251c3d", "8c6b42": "444661", "b58452": "5c5b75", diff --git a/public/images/pokemon/variant/back/393.json b/public/images/pokemon/variant/back/393.json index e11dce3b058..29ad29cfcbe 100644 --- a/public/images/pokemon/variant/back/393.json +++ b/public/images/pokemon/variant/back/393.json @@ -7,9 +7,7 @@ "63a5c5": "ce8a56", "9cd6f7": "e8ce81", "bdcede": "e2d7a5", - "ffffff": "ffffff", "637b94": "c68a67", - "101010": "101010", "634a10": "363b56", "f7ce42": "bec8d1", "ad843a": "81899b", @@ -25,7 +23,6 @@ "bdcede": "ccb9af", "ffffff": "f4ede8", "637b94": "877e78", - "101010": "101010", "634a10": "368089", "f7ce42": "92edcf", "ad843a": "67c1b7", diff --git a/public/images/pokemon/variant/back/394.json b/public/images/pokemon/variant/back/394.json index c18a4eadc37..0a46d80ab71 100644 --- a/public/images/pokemon/variant/back/394.json +++ b/public/images/pokemon/variant/back/394.json @@ -2,7 +2,6 @@ "1": { "7b5242": "2a2c3a", "bd8c6b": "4f5572", - "101010": "101010", "efce63": "81899b", "ffe684": "bec8d1", "21426b": "2b544b", @@ -16,7 +15,6 @@ "2": { "7b5242": "3c7d84", "bd8c6b": "438084", - "101010": "101010", "efce63": "82d3d0", "ffe684": "baf3e4", "21426b": "aa3565", diff --git a/public/images/pokemon/variant/back/395.json b/public/images/pokemon/variant/back/395.json index e497e8b78e6..624c023fb72 100644 --- a/public/images/pokemon/variant/back/395.json +++ b/public/images/pokemon/variant/back/395.json @@ -3,7 +3,6 @@ "bd8c6b": "464c6b", "ffe684": "bec8d1", "7b5242": "1e202b", - "101010": "101010", "103c75": "7f1711", "9cceff": "fff18c", "528ce6": "cc8043", @@ -18,7 +17,6 @@ "bd8c6b": "2c7787", "ffe684": "6cd3cd", "7b5242": "184555", - "101010": "101010", "103c75": "26061c", "9cceff": "7e2b44", "528ce6": "4f1438", diff --git a/public/images/pokemon/variant/back/399.json b/public/images/pokemon/variant/back/399.json index 86398cd680e..3392927dfdc 100644 --- a/public/images/pokemon/variant/back/399.json +++ b/public/images/pokemon/variant/back/399.json @@ -3,7 +3,6 @@ "634a31": "101e42", "c58c42": "617dda", "9c6331": "3e5ca8", - "101010": "101010", "423110": "0e1831", "cebd84": "8497ce", "5a4229": "42295a" diff --git a/public/images/pokemon/variant/back/4.json b/public/images/pokemon/variant/back/4.json index d3271eebf43..6b337d2ef3a 100644 --- a/public/images/pokemon/variant/back/4.json +++ b/public/images/pokemon/variant/back/4.json @@ -5,14 +5,11 @@ "8c2900": "0f3234", "ff9442": "26837c", "ffd608": "e9bfff", - "101010": "101010", "f7a500": "9e59db", - "ffffff": "ffffff", "31adef": "c40f0f", "083a8c": "8e0b25", "ffd67b": "99f4f7", - "e6ad5a": "60c5c8", - "b5b5b5": "b5b5b5" + "e6ad5a": "60c5c8" }, "2": { "e63a00": "4c83d4", @@ -20,13 +17,10 @@ "8c2900": "20346f", "ff9442": "3a78b7", "ffd608": "f9fffa", - "101010": "101010", "f7a500": "96e8e8", - "ffffff": "ffffff", "31adef": "1e8eff", "083a8c": "0059ff", "ffd67b": "5e238e", - "e6ad5a": "380f6e", - "b5b5b5": "b5b5b5" + "e6ad5a": "380f6e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/400.json b/public/images/pokemon/variant/back/400.json index 734b277ae36..233a47e12ac 100644 --- a/public/images/pokemon/variant/back/400.json +++ b/public/images/pokemon/variant/back/400.json @@ -3,10 +3,8 @@ "ad947b": "bd9171", "e6d69c": "fff5d1", "5a3a31": "70323f", - "3a3129": "3a3129", "bd844a": "dba0ac", "8c5a31": "c46269", - "101010": "101010", "423a31": "3e3040", "63523a": "824561" }, @@ -17,7 +15,6 @@ "3a3129": "313d63", "bd844a": "617dda", "8c5a31": "3e5ca8", - "101010": "101010", "423a31": "38204f", "63523a": "42295a" } diff --git a/public/images/pokemon/variant/back/401.json b/public/images/pokemon/variant/back/401.json index 446e2648182..068a54ee262 100644 --- a/public/images/pokemon/variant/back/401.json +++ b/public/images/pokemon/variant/back/401.json @@ -2,7 +2,6 @@ "1": { "524a42": "cf8439", "7b7363": "f6bb47", - "101010": "101010", "8c6b08": "272344", "ffefad": "56769d", "e6c56b": "454389", @@ -13,7 +12,6 @@ "2": { "524a42": "453565", "7b7363": "71558c", - "101010": "101010", "8c6b08": "784341", "ffefad": "ffd47c", "e6c56b": "e59a75", diff --git a/public/images/pokemon/variant/back/402.json b/public/images/pokemon/variant/back/402.json index 7b6ca4a615e..8dd97d47dae 100644 --- a/public/images/pokemon/variant/back/402.json +++ b/public/images/pokemon/variant/back/402.json @@ -2,9 +2,7 @@ "1": { "633100": "272344", "de5a52": "afd3df", - "101010": "101010", "9c4231": "498ebe", - "31293a": "31293a", "524a42": "cf8439", "7b7363": "f6bb47", "424252": "0e0e23", @@ -17,7 +15,6 @@ "2": { "633100": "2a545f", "de5a52": "70af85", - "101010": "101010", "9c4231": "2f9378", "31293a": "281c41", "524a42": "453565", diff --git a/public/images/pokemon/variant/back/4052.json b/public/images/pokemon/variant/back/4052.json index 58444d01406..46fb4cb3e6d 100644 --- a/public/images/pokemon/variant/back/4052.json +++ b/public/images/pokemon/variant/back/4052.json @@ -1,7 +1,5 @@ { "1": { - "181a1d": "181a1d", - "010101": "010101", "3d4547": "4e385a", "5b4e4d": "57567e", "ada09a": "c3c5d4", @@ -9,8 +7,6 @@ "272d2e": "342b49" }, "2": { - "181a1d": "181a1d", - "010101": "010101", "3d4547": "417778", "5b4e4d": "171127", "ada09a": "603b54", diff --git a/public/images/pokemon/variant/back/406.json b/public/images/pokemon/variant/back/406.json index 744fcb0e506..3265d4e1508 100644 --- a/public/images/pokemon/variant/back/406.json +++ b/public/images/pokemon/variant/back/406.json @@ -1,7 +1,6 @@ { "1": { "73a54a": "153a51", - "000000": "000000", "3a5a29": "0b2337", "b5ef73": "5fadaf", "8cce29": "498b93", @@ -11,7 +10,6 @@ }, "2": { "73a54a": "52347a", - "000000": "000000", "3a5a29": "2d1a4e", "b5ef73": "c098dd", "8cce29": "a47cc7", diff --git a/public/images/pokemon/variant/back/407.json b/public/images/pokemon/variant/back/407.json index 08071023f31..a0005710379 100644 --- a/public/images/pokemon/variant/back/407.json +++ b/public/images/pokemon/variant/back/407.json @@ -5,7 +5,6 @@ "739c8c": "bb9b89", "ffffff": "fff1cb", "d6cede": "e1bf95", - "000000": "000000", "7b3a5a": "9c5910", "ff6384": "efc754", "bd426b": "d28f31", @@ -22,7 +21,6 @@ "739c8c": "a39ec0", "ffffff": "fcf8ff", "d6cede": "d6c7e6", - "000000": "000000", "7b3a5a": "9c2407", "ff6384": "ec883b", "bd426b": "c15a21", diff --git a/public/images/pokemon/variant/back/4077.json b/public/images/pokemon/variant/back/4077.json index 5043570356c..bfa1923812d 100644 --- a/public/images/pokemon/variant/back/4077.json +++ b/public/images/pokemon/variant/back/4077.json @@ -8,7 +8,6 @@ "c973e6": "cc4328", "646357": "192666", "ffffe3": "8cd8ff", - "101010": "101010", "ded5ae": "5b93cc", "a3a49f": "355699", "59237e": "312c49", @@ -23,7 +22,6 @@ "c973e6": "282866", "646357": "361e66", "ffffe3": "ff99dd", - "101010": "101010", "ded5ae": "cc66cc", "a3a49f": "7a3d99", "59237e": "312c49", diff --git a/public/images/pokemon/variant/back/4078.json b/public/images/pokemon/variant/back/4078.json index a47536e3a51..0905cd64299 100644 --- a/public/images/pokemon/variant/back/4078.json +++ b/public/images/pokemon/variant/back/4078.json @@ -1,7 +1,6 @@ { "1": { "44bf75": "cc9470", - "2b3055": "2b3055", "85fabf": "ffd9a5", "737ba4": "514766", "109865": "995944", @@ -9,7 +8,6 @@ "8e38c1": "990c00", "de9fff": "ff884c", "c566e3": "cc4328", - "0c0c0c": "0c0c0c", "414a83": "312c49", "ded5ae": "5b93cc", "636357": "192666", @@ -18,7 +16,6 @@ }, "2": { "44bf75": "cc1e4c", - "2b3055": "2b3055", "85fabf": "ff3255", "737ba4": "514766", "109865": "990f3d", @@ -26,7 +23,6 @@ "8e38c1": "161f4c", "de9fff": "483e7c", "c566e3": "282866", - "0c0c0c": "0c0c0c", "414a83": "312c49", "ded5ae": "cc66cc", "636357": "361e66", diff --git a/public/images/pokemon/variant/back/4079.json b/public/images/pokemon/variant/back/4079.json index e958fc537ab..6872fcd153d 100644 --- a/public/images/pokemon/variant/back/4079.json +++ b/public/images/pokemon/variant/back/4079.json @@ -7,12 +7,9 @@ "fefe3c": "ffeccb", "7c2847": "452a29", "caaa2c": "edc59e", - "101010": "101010", "8b5a18": "a84071", "ffe6b4": "ff9eba", - "dea462": "e0799c", - "fcfcfc": "fcfcfc", - "d5cdcd": "d5cdcd" + "dea462": "e0799c" }, "2": { "d76d96": "c6aead", @@ -22,11 +19,8 @@ "fefe3c": "d9736b", "7c2847": "503941", "caaa2c": "963e59", - "101010": "101010", "8b5a18": "a45c58", "ffe6b4": "efc697", - "dea462": "cb8f75", - "fcfcfc": "fcfcfc", - "d5cdcd": "d5cdcd" + "dea462": "cb8f75" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/4080.json b/public/images/pokemon/variant/back/4080.json index 0101712afb7..ab56fdf775e 100644 --- a/public/images/pokemon/variant/back/4080.json +++ b/public/images/pokemon/variant/back/4080.json @@ -2,13 +2,9 @@ "1": { "723f7c": "edc59e", "a565c0": "ffedcc", - "181818": "181818", "7b2645": "573531", "d76792": "905446", - "c9c9c9": "c9c9c9", - "b6b6ae": "b6b6ae", "7c6987": "a94172", - "fbfbfb": "fbfbfb", "ede2ef": "ff9fbb", "b5a0bd": "e17a9d", "f985aa": "bb694b", @@ -19,13 +15,9 @@ "2": { "723f7c": "963e59", "a565c0": "d9736b", - "181818": "181818", "7b2645": "846467", "d76792": "c6aead", - "c9c9c9": "c9c9c9", - "b6b6ae": "b6b6ae", "7c6987": "a45c58", - "fbfbfb": "fbfbfb", "ede2ef": "efc697", "b5a0bd": "ca8e74", "f985aa": "ecdcbe", diff --git a/public/images/pokemon/variant/back/41.json b/public/images/pokemon/variant/back/41.json index 42283672198..35bd2e46178 100644 --- a/public/images/pokemon/variant/back/41.json +++ b/public/images/pokemon/variant/back/41.json @@ -1,26 +1,18 @@ { "1": { - "101010": "101010", "8cb5ef": "205182", "4a427b": "14093b", "637bb5": "12325c", "73215a": "b6591e", "b5529c": "d58e41", - "bdceff": "868ecc", - "ffffff": "ffffff", - "636363": "636363", - "d6d6d6": "d6d6d6" + "bdceff": "868ecc" }, "2": { - "101010": "101010", "8cb5ef": "cbabca", "4a427b": "4d3259", "637bb5": "916c8b", "73215a": "670f10", "b5529c": "94241c", - "bdceff": "e8d2e6", - "ffffff": "ffffff", - "636363": "636363", - "d6d6d6": "d6d6d6" + "bdceff": "e8d2e6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/412-plant.json b/public/images/pokemon/variant/back/412-plant.json index 8203db30f28..7174877e4a0 100644 --- a/public/images/pokemon/variant/back/412-plant.json +++ b/public/images/pokemon/variant/back/412-plant.json @@ -3,7 +3,6 @@ "292931": "262b56", "5a5a5a": "5f709f", "3a3a42": "455081", - "101010": "101010", "314a3a": "1f3726", "7b9c4a": "6c956d", "527342": "446649", @@ -13,7 +12,6 @@ "292931": "392933", "5a5a5a": "9f8a8f", "3a3a42": "725c67", - "101010": "101010", "314a3a": "3d2525", "7b9c4a": "8c736c", "527342": "71514e", @@ -23,10 +21,8 @@ "292931": "673f57", "5a5a5a": "c69ab0", "3a3a42": "976480", - "101010": "101010", "314a3a": "1c2d54", "7b9c4a": "5d9ac0", - "527342": "3c6390", - "634a3a": "634a3a" + "527342": "3c6390" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/412-trash.json b/public/images/pokemon/variant/back/412-trash.json index 90cf01bc206..8a1e7b3e8f8 100644 --- a/public/images/pokemon/variant/back/412-trash.json +++ b/public/images/pokemon/variant/back/412-trash.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "292931": "191c46", "3a3a42": "455081", "5a5a5a": "5f709f", @@ -11,7 +10,6 @@ "737b7b": "774490" }, "1": { - "101010": "101010", "292931": "1d1929", "3a3a42": "342e41", "5a5a5a": "594f69", @@ -22,7 +20,6 @@ "737b7b": "4f4955" }, "2": { - "101010": "101010", "292931": "273f2c", "3a3a42": "547e55", "5a5a5a": "b5d6b2", diff --git a/public/images/pokemon/variant/back/413-plant.json b/public/images/pokemon/variant/back/413-plant.json index 397cef6f9a6..ae9f68e2f1f 100644 --- a/public/images/pokemon/variant/back/413-plant.json +++ b/public/images/pokemon/variant/back/413-plant.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "3a3a42": "30366b", "5a5a5a": "455081", "3a5242": "1b3f27", @@ -10,7 +9,6 @@ "314a3a": "304f3a" }, "1": { - "101010": "101010", "3a3a42": "4e3946", "5a5a5a": "725c67", "3a5242": "3f2b2f", @@ -20,7 +18,6 @@ "314a3a": "593d41" }, "2": { - "101010": "101010", "3a3a42": "724063", "5a5a5a": "ab7492", "3a5242": "3c689b", diff --git a/public/images/pokemon/variant/back/413-sandy.json b/public/images/pokemon/variant/back/413-sandy.json index d402bb20673..a89eac5c29c 100644 --- a/public/images/pokemon/variant/back/413-sandy.json +++ b/public/images/pokemon/variant/back/413-sandy.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "5a5a5a": "455081", "3a3a42": "30366b", "3a3131": "2e1e1b", @@ -11,7 +10,6 @@ "635252": "644034" }, "1": { - "101010": "101010", "5a5a5a": "64403f", "3a3a42": "533032", "3a3131": "2c0e17", @@ -22,7 +20,6 @@ "635252": "3e2025" }, "2": { - "101010": "101010", "5a5a5a": "aeb2cd", "3a3a42": "8385a6", "3a3131": "0e1e40", diff --git a/public/images/pokemon/variant/back/413-trash.json b/public/images/pokemon/variant/back/413-trash.json index 1a9df5e0347..796e33cb57c 100644 --- a/public/images/pokemon/variant/back/413-trash.json +++ b/public/images/pokemon/variant/back/413-trash.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "3a3a42": "30366b", "5a5a5a": "455081", "523a4a": "412358", @@ -10,9 +9,7 @@ "7b4a5a": "9b4e86" }, "1": { - "101010": "101010", "3a3a42": "403850", - "5a5a5a": "5a5a5a", "523a4a": "2e2529", "c55a9c": "8d5053", "844a73": "723542", @@ -20,9 +17,7 @@ "7b4a5a": "49496a" }, "2": { - "101010": "101010", "3a3a42": "7aa17b", - "5a5a5a": "5a5a5a", "523a4a": "0e2517", "c55a9c": "5e5864", "844a73": "39343f", diff --git a/public/images/pokemon/variant/back/414.json b/public/images/pokemon/variant/back/414.json index 9c807a346ce..0e55e89659a 100644 --- a/public/images/pokemon/variant/back/414.json +++ b/public/images/pokemon/variant/back/414.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "734221": "b18066", "a54a00": "c59f7e", "e66b29": "f2daba", @@ -15,7 +14,6 @@ "4a3a3a": "291717" }, "2": { - "101010": "101010", "734221": "ae5b3c", "a54a00": "d2895c", "e66b29": "e8b479", diff --git a/public/images/pokemon/variant/back/418.json b/public/images/pokemon/variant/back/418.json index 58fb6a055b6..05967e88af0 100644 --- a/public/images/pokemon/variant/back/418.json +++ b/public/images/pokemon/variant/back/418.json @@ -3,14 +3,10 @@ "ad5a21": "7d1e39", "7b4221": "611b35", "ef7b19": "9c354f", - "191919": "191919", "ce6b19": "851d3e", "f7f7b5": "e8d4cc", "c59452": "995e5c", - "d6d6ce": "d6d6ce", - "ffffff": "ffffff", "cebd84": "cea49d", - "6b6b6b": "6b6b6b", "99693c": "6a808c", "e6a531": "a0b3ba", "2163a5": "385e11", @@ -21,12 +17,9 @@ "ad5a21": "cd91aa", "7b4221": "9e6a86", "ef7b19": "debfc8", - "191919": "191919", "ce6b19": "dca5b5", "f7f7b5": "a8688f", "c59452": "672e5d", - "d6d6ce": "d6d6ce", - "ffffff": "ffffff", "cebd84": "965080", "6b6b6b": "432e38", "99693c": "8e410e", diff --git a/public/images/pokemon/variant/back/419.json b/public/images/pokemon/variant/back/419.json index 3202d442933..197a8b33e18 100644 --- a/public/images/pokemon/variant/back/419.json +++ b/public/images/pokemon/variant/back/419.json @@ -2,17 +2,13 @@ "1": { "7b4221": "611b35", "ef7b19": "9c354f", - "191919": "191919", "ce6b19": "851d3e", "ad5a21": "7d1e39", "cebd84": "cea49d", "f7f7b5": "e8d4cc", "99693c": "6a808c", - "6b6b6b": "6b6b6b", "e6a531": "a0b3ba", "ffde00": "d2e5e8", - "d6d6ce": "d6d6ce", - "ffffff": "ffffff", "c59452": "995e5c", "2163a5": "385e11", "63bde6": "6a9539" @@ -20,7 +16,6 @@ "2": { "7b4221": "9e6a86", "ef7b19": "debfc8", - "191919": "191919", "ce6b19": "dca5b5", "ad5a21": "cd91aa", "cebd84": "965080", @@ -29,8 +24,6 @@ "6b6b6b": "726481", "e6a531": "d4812f", "ffde00": "eda342", - "d6d6ce": "d6d6ce", - "ffffff": "ffffff", "c59452": "672e5d", "2163a5": "4b2a70", "63bde6": "744d99" diff --git a/public/images/pokemon/variant/back/4199.json b/public/images/pokemon/variant/back/4199.json index 3feab3d0964..676cb5e36d7 100644 --- a/public/images/pokemon/variant/back/4199.json +++ b/public/images/pokemon/variant/back/4199.json @@ -1,7 +1,6 @@ { "1": { "413668": "622344", - "101010": "101010", "a191b5": "de504e", "7a6a98": "ad3139", "654493": "7e3351", @@ -11,14 +10,12 @@ "a565c0": "ffeccb", "d76792": "8f5345", "7b2645": "573531", - "f8f8f8": "f8f8f8", "c89a51": "a84254", "eed583": "c75865", "f985aa": "bb694b" }, "2": { "413668": "1d4c46", - "101010": "101010", "a191b5": "b0dc72", "7a6a98": "71ae48", "654493": "38735c", @@ -28,7 +25,6 @@ "a565c0": "d9736b", "d76792": "c7afae", "7b2645": "846467", - "f8f8f8": "f8f8f8", "c89a51": "2b4a49", "eed583": "4c766a", "f985aa": "ecdcbe" diff --git a/public/images/pokemon/variant/back/42.json b/public/images/pokemon/variant/back/42.json index df3cf67d3ef..adb0c8f6360 100644 --- a/public/images/pokemon/variant/back/42.json +++ b/public/images/pokemon/variant/back/42.json @@ -5,7 +5,6 @@ "adceff": "3c74b1", "5aadef": "204882", "631052": "892d03", - "000000": "000000", "ce6bb5": "f1a139", "ad52ad": "d5711b", "943a7b": "af4e0c" @@ -16,7 +15,6 @@ "adceff": "dfcddd", "5aadef": "cbabca", "631052": "54070c", - "000000": "000000", "ce6bb5": "bc3b1d", "ad52ad": "94241c", "943a7b": "670f10" diff --git a/public/images/pokemon/variant/back/422-east.json b/public/images/pokemon/variant/back/422-east.json index 833a1828c33..28d6da15f68 100644 --- a/public/images/pokemon/variant/back/422-east.json +++ b/public/images/pokemon/variant/back/422-east.json @@ -1,8 +1,6 @@ { "0": { "636394": "61819f", - "101010": "101010", - "ffffff": "ffffff", "bdceef": "b8d4e6", "52527b": "636b7b", "6bb5f7": "82e1c0", @@ -17,8 +15,6 @@ }, "1": { "636394": "314173", - "101010": "101010", - "ffffff": "ffffff", "bdceef": "b8d4e6", "52527b": "314173", "6bb5f7": "485f9c", @@ -33,8 +29,6 @@ }, "2": { "636394": "6d427b", - "101010": "101010", - "ffffff": "ffffff", "bdceef": "c5deef", "52527b": "451e4c", "6bb5f7": "955dbe", diff --git a/public/images/pokemon/variant/back/422-west.json b/public/images/pokemon/variant/back/422-west.json index 563110e29e3..acd593a7b6e 100644 --- a/public/images/pokemon/variant/back/422-west.json +++ b/public/images/pokemon/variant/back/422-west.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "c5428c": "8b3553", "e652a5": "c66264", "73426b": "8b3553", @@ -8,7 +7,6 @@ "ff8cc5": "ff9269", "ad6394": "c66264", "ffde73": "ffd275", - "ffffff": "ffffff", "a58c3a": "ca8b46", "524a3a": "645346", "73737b": "645346", @@ -16,7 +14,6 @@ "b5b5c5": "ca8b46" }, "1": { - "101010": "101010", "c5428c": "573d64", "e652a5": "7960a1", "73426b": "573d64", @@ -24,7 +21,6 @@ "ff8cc5": "aa8be8", "ad6394": "7960a1", "ffde73": "ffb8c5", - "ffffff": "ffffff", "a58c3a": "da6f7b", "524a3a": "993d48", "73737b": "8a7b68", @@ -32,7 +28,6 @@ "b5b5c5": "d1b07c" }, "2": { - "101010": "101010", "c5428c": "281e4c", "e652a5": "48427b", "73426b": "281e4c", @@ -40,7 +35,6 @@ "ff8cc5": "5d64be", "ad6394": "48427b", "ffde73": "ffc975", - "ffffff": "ffffff", "a58c3a": "e5693d", "524a3a": "933f04", "73737b": "00706a", diff --git a/public/images/pokemon/variant/back/4222.json b/public/images/pokemon/variant/back/4222.json index 9c778939ac4..597fc4e1a28 100644 --- a/public/images/pokemon/variant/back/4222.json +++ b/public/images/pokemon/variant/back/4222.json @@ -8,7 +8,6 @@ "9c94a3": "58929f", "fbf2ff": "d4fefe", "cbc2d1": "a9e4e3", - "101010": "101010", "af9e9e": "44a0af", "756868": "097f8d" }, @@ -21,7 +20,6 @@ "9c94a3": "4b1f28", "fbf2ff": "874059", "cbc2d1": "773050", - "101010": "101010", "af9e9e": "b0919b", "756868": "8d6573" } diff --git a/public/images/pokemon/variant/back/423-east.json b/public/images/pokemon/variant/back/423-east.json index 07e5cde7799..57268c0a922 100644 --- a/public/images/pokemon/variant/back/423-east.json +++ b/public/images/pokemon/variant/back/423-east.json @@ -3,7 +3,6 @@ "3a4231": "224052", "426b31": "527084", "5a944a": "679ab2", - "101010": "101010", "a58c3a": "a58e3b", "ffde73": "fedf73", "7bbd52": "80e2bf", @@ -16,7 +15,6 @@ "3a4231": "293852", "426b31": "314173", "5a944a": "485f9c", - "101010": "101010", "a58c3a": "649bb2", "ffde73": "82e1c0", "7bbd52": "5271bd", @@ -29,7 +27,6 @@ "3a4231": "451e4c", "426b31": "6d427b", "5a944a": "955dbe", - "101010": "101010", "a58c3a": "e5693d", "ffde73": "ffc975", "7bbd52": "ad75e8", diff --git a/public/images/pokemon/variant/back/423-west.json b/public/images/pokemon/variant/back/423-west.json index 9720880f96d..096917202d3 100644 --- a/public/images/pokemon/variant/back/423-west.json +++ b/public/images/pokemon/variant/back/423-west.json @@ -1,20 +1,17 @@ { "0": { "4a3a3a": "101010", - "101010": "101010", "c5944a": "ff9269", "a56b3a": "c66264", "ffde73": "ffd275", "6b4a3a": "8b3553", "a58c3a": "ca8b46", "ad6394": "c66264", - "6b3a52": "6b3a52", "524a3a": "645346", "ff8cc5": "ff9269" }, "1": { "4a3a3a": "573d64", - "101010": "101010", "c5944a": "c1a5ff", "a56b3a": "aa8be8", "ffde73": "ffb8c5", @@ -27,7 +24,6 @@ }, "2": { "4a3a3a": "281e4c", - "101010": "101010", "c5944a": "7588e8", "a56b3a": "5d64be", "ffde73": "ffc975", diff --git a/public/images/pokemon/variant/back/424.json b/public/images/pokemon/variant/back/424.json index c0e9356a7a4..6a111ce9829 100644 --- a/public/images/pokemon/variant/back/424.json +++ b/public/images/pokemon/variant/back/424.json @@ -3,7 +3,6 @@ "734a42": "415c73", "ad5242": "428dad", "ff735a": "5ae9ff", - "101010": "101010", "8c6b42": "8c7457", "debd73": "c4b487", "ffefa5": "ffeccc", @@ -16,7 +15,6 @@ "734a42": "593802", "ad5242": "946212", "ff735a": "ffb338", - "101010": "101010", "8c6b42": "632339", "debd73": "99455d", "ffefa5": "ed8286", diff --git a/public/images/pokemon/variant/back/425.json b/public/images/pokemon/variant/back/425.json index 16f0160cd1d..4f24d386f9a 100644 --- a/public/images/pokemon/variant/back/425.json +++ b/public/images/pokemon/variant/back/425.json @@ -6,7 +6,6 @@ "946be6": "64acb1", "7b42a5": "497b91", "4a316b": "223142", - "101010": "101010", "633184": "39677a", "c5b5ff": "83d5c0", "8c6b21": "7c6839", @@ -20,7 +19,6 @@ "946be6": "c0c7ab", "7b42a5": "93a383", "4a316b": "3f4a3d", - "101010": "101010", "633184": "697c63", "c5b5ff": "cde5ca", "8c6b21": "3c171e", diff --git a/public/images/pokemon/variant/back/426.json b/public/images/pokemon/variant/back/426.json index 2614d684621..f6dbda4c0a4 100644 --- a/public/images/pokemon/variant/back/426.json +++ b/public/images/pokemon/variant/back/426.json @@ -3,7 +3,6 @@ "c5c5e6": "7ca786", "5a5a63": "536661", "ffffff": "b0d1b8", - "101010": "101010", "8452ad": "20787c", "5a427b": "1d524d", "9c73de": "64acb1", @@ -20,7 +19,6 @@ "c5c5e6": "7ca786", "5a5a63": "536661", "ffffff": "b0d1b8", - "101010": "101010", "8452ad": "9fa994", "5a427b": "686458", "9c73de": "d1d1b8", diff --git a/public/images/pokemon/variant/back/4263.json b/public/images/pokemon/variant/back/4263.json index c9d11566864..8b9cea44bbf 100644 --- a/public/images/pokemon/variant/back/4263.json +++ b/public/images/pokemon/variant/back/4263.json @@ -1,28 +1,20 @@ { "1": { "5b5958": "397e4a", - "010101": "010101", "b2b3b2": "a3ce9e", "f5f5f6": "f5ffea", "3e4042": "01473a", "60656a": "1c8155", - "1b2627": "002121", - "d94a7f": "d94a7f", - "fcfcfc": "fcfcfc", - "ee96b2": "ee96b2", - "6e3b51": "6e3b51", - "9b4f69": "9b4f69" + "1b2627": "002121" }, "2": { "5b5958": "100d2d", - "010101": "010101", "b2b3b2": "201b47", "f5f5f6": "3c335d", "3e4042": "412991", "60656a": "8e5aef", "1b2627": "201b47", "d94a7f": "0099ce", - "fcfcfc": "fcfcfc", "ee96b2": "54f1ff", "6e3b51": "004a8b", "9b4f69": "0099ce" diff --git a/public/images/pokemon/variant/back/4264.json b/public/images/pokemon/variant/back/4264.json index ed5b3343df0..c266ecb7aa4 100644 --- a/public/images/pokemon/variant/back/4264.json +++ b/public/images/pokemon/variant/back/4264.json @@ -1,10 +1,8 @@ { "1": { - "010101": "010101", "abadaf": "95c090", "797570": "579666", "414141": "1c8155", - "1c1917": "1c1917", "f5f5f6": "f5ffea", "bc3065": "d414dd", "322c29": "01473a", @@ -13,11 +11,9 @@ "949496": "3d494e" }, "2": { - "010101": "010101", "abadaf": "1e1a3b", "797570": "302373", "414141": "7c4cd6", - "1c1917": "1c1917", "f5f5f6": "342d4c", "bc3065": "0099ce", "322c29": "412991", diff --git a/public/images/pokemon/variant/back/427.json b/public/images/pokemon/variant/back/427.json index 068998d5196..5ea989326d9 100644 --- a/public/images/pokemon/variant/back/427.json +++ b/public/images/pokemon/variant/back/427.json @@ -6,7 +6,6 @@ "523a3a": "994c3d", "8c5a42": "cc8866", "b57b4a": "ffcc99", - "101010": "101010", "3a313a": "130019", "c55a7b": "cecee5" }, @@ -17,8 +16,6 @@ "523a3a": "355699", "8c5a42": "5b93cc", "b57b4a": "8cd8ff", - "101010": "101010", - "3a313a": "3a313a", "c55a7b": "cc84b4" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/428-mega.json b/public/images/pokemon/variant/back/428-mega.json index e5221fcb22b..8ff3489fc64 100644 --- a/public/images/pokemon/variant/back/428-mega.json +++ b/public/images/pokemon/variant/back/428-mega.json @@ -9,7 +9,6 @@ "624a41": "660a38", "c55a7b": "7f4c99", "7b3941": "472866", - "101010": "101010", "232323": "0d0b16", "414141": "161626" }, @@ -23,7 +22,6 @@ "624a41": "65597f", "c55a7b": "cc4328", "7b3941": "990c00", - "101010": "101010", "232323": "191933", "414141": "312c49" } diff --git a/public/images/pokemon/variant/back/428.json b/public/images/pokemon/variant/back/428.json index b8176251f02..e5efa645c0c 100644 --- a/public/images/pokemon/variant/back/428.json +++ b/public/images/pokemon/variant/back/428.json @@ -1,7 +1,6 @@ { "1": { "523a3a": "991e47", - "101010": "101010", "b57b4a": "ffcc99", "8c5a42": "cc8866", "c5a57b": "cc3d55", @@ -11,7 +10,6 @@ }, "2": { "523a3a": "355699", - "101010": "101010", "b57b4a": "8cd8ff", "8c5a42": "5b93cc", "c5a57b": "cecee5", diff --git a/public/images/pokemon/variant/back/429.json b/public/images/pokemon/variant/back/429.json index 77530e81c00..32b54694f92 100644 --- a/public/images/pokemon/variant/back/429.json +++ b/public/images/pokemon/variant/back/429.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "b563b5": "ffdd67", "5a4263": "9b490e", "845284": "d3941a", @@ -8,11 +7,9 @@ "6b4a94": "387fa7", "31213a": "112048", "ef3a10": "cc762f", - "943a5a": "71370f", - "ffffff": "ffffff" + "943a5a": "71370f" }, "1": { - "101010": "101010", "b563b5": "3df7ed", "5a4263": "0c8086", "845284": "1dbdb9", @@ -20,11 +17,9 @@ "6b4a94": "a1c8db", "31213a": "244358", "ef3a10": "e28c27", - "943a5a": "7b3c08", - "ffffff": "ffffff" + "943a5a": "7b3c08" }, "2": { - "101010": "101010", "b563b5": "fff7dd", "5a4263": "5d4a2f", "845284": "eece8c", @@ -32,7 +27,6 @@ "6b4a94": "e6aa47", "31213a": "603305", "ef3a10": "c33126", - "943a5a": "7a1511", - "ffffff": "ffffff" + "943a5a": "7a1511" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/43.json b/public/images/pokemon/variant/back/43.json index e94b27ad756..407e9490c53 100644 --- a/public/images/pokemon/variant/back/43.json +++ b/public/images/pokemon/variant/back/43.json @@ -4,7 +4,6 @@ "c5e67b": "90a1d7", "4a5a21": "2a2274", "9cd64a": "606dbb", - "101010": "101010", "293a4a": "522c90", "5a6b84": "7946a9", "7394a5": "a564c7" @@ -14,7 +13,6 @@ "c5e67b": "e8b737", "4a5a21": "6a2509", "9cd64a": "b88026", - "101010": "101010", "293a4a": "560a25", "5a6b84": "79152a", "7394a5": "b3292e" diff --git a/public/images/pokemon/variant/back/433.json b/public/images/pokemon/variant/back/433.json index 59f6d4e7b0f..81bc89ed7b7 100644 --- a/public/images/pokemon/variant/back/433.json +++ b/public/images/pokemon/variant/back/433.json @@ -1,7 +1,6 @@ { "0": { "6b3a31": "631d61", - "000000": "000000", "d6d6f7": "f7e6e5", "e66352": "f37cdf", "ad5231": "a6459c", @@ -13,7 +12,6 @@ }, "1": { "6b3a31": "14404e", - "000000": "000000", "d6d6f7": "ebd4b0", "e66352": "4a94ad", "ad5231": "2f6e8c", @@ -25,7 +23,6 @@ }, "2": { "6b3a31": "102837", - "000000": "000000", "d6d6f7": "f7e6e5", "e66352": "4d8891", "ad5231": "3a656c", diff --git a/public/images/pokemon/variant/back/436.json b/public/images/pokemon/variant/back/436.json index 372a91449aa..5f678d2e976 100644 --- a/public/images/pokemon/variant/back/436.json +++ b/public/images/pokemon/variant/back/436.json @@ -1,7 +1,6 @@ { "1": { "103a4a": "3e3b45", - "101010": "101010", "2984a5": "9192a6", "195a7b": "737185", "63c5e6": "dfe1f4", @@ -9,7 +8,6 @@ }, "2": { "103a4a": "400f06", - "101010": "101010", "2984a5": "9d4e16", "195a7b": "7e2b15", "63c5e6": "e98851", diff --git a/public/images/pokemon/variant/back/437.json b/public/images/pokemon/variant/back/437.json index cccd9954d5d..7ea8842e638 100644 --- a/public/images/pokemon/variant/back/437.json +++ b/public/images/pokemon/variant/back/437.json @@ -4,7 +4,6 @@ "3194b5": "dedede", "214a5a": "6a6994", "42adce": "eeeaff", - "101010": "101010", "bdd6de": "bd9173", "73d6ef": "ffffff", "a5c5ce": "a27661", @@ -16,7 +15,6 @@ "3194b5": "d58151", "214a5a": "783827", "42adce": "f4a97f", - "101010": "101010", "bdd6de": "e0da82", "73d6ef": "edc590", "a5c5ce": "ccbd73", diff --git a/public/images/pokemon/variant/back/438.json b/public/images/pokemon/variant/back/438.json index 78a49203dd6..5e45ca123da 100644 --- a/public/images/pokemon/variant/back/438.json +++ b/public/images/pokemon/variant/back/438.json @@ -3,7 +3,6 @@ "315a19": "3d1e0c", "9cde7b": "b6a747", "4ac542": "8a6a24", - "000000": "000000", "5a8c5a": "6c4616", "846b42": "4c443b", "524231": "322a22", @@ -13,7 +12,6 @@ "315a19": "846764", "9cde7b": "fffdee", "4ac542": "e8e6d7", - "000000": "000000", "5a8c5a": "b9ac9d", "846b42": "3c389d", "524231": "2d2164", diff --git a/public/images/pokemon/variant/back/44.json b/public/images/pokemon/variant/back/44.json index 0f4b93f23d8..e370655c694 100644 --- a/public/images/pokemon/variant/back/44.json +++ b/public/images/pokemon/variant/back/44.json @@ -3,7 +3,6 @@ "c57329": "0f7469", "8c3a19": "043d44", "5a2900": "162486", - "101010": "101010", "ce734a": "7aa8d2", "ffbd42": "55bb7e", "f7efbd": "7dcf94", @@ -18,7 +17,6 @@ "c57329": "9f631f", "8c3a19": "773811", "5a2900": "680b10", - "101010": "101010", "ce734a": "d98247", "ffbd42": "e8d65e", "f7efbd": "ede68f", diff --git a/public/images/pokemon/variant/back/440.json b/public/images/pokemon/variant/back/440.json index f89500aa28f..cb9162a831a 100644 --- a/public/images/pokemon/variant/back/440.json +++ b/public/images/pokemon/variant/back/440.json @@ -1,18 +1,15 @@ { "0": { "a55a7b": "925382", - "101010": "101010", "ffc5d6": "f6cae1", "c58ca5": "c57cad", "73425a": "6c1f9e", - "ffffff": "ffffff", "a5527b": "953fc7", "de6b9c": "c164e4", "cebdc5": "d6bdde" }, "1": { "a55a7b": "81256f", - "101010": "101010", "ffc5d6": "ebbada", "c58ca5": "bd61a4", "73425a": "61020c", @@ -23,7 +20,6 @@ }, "2": { "a55a7b": "6a3981", - "101010": "101010", "ffc5d6": "e2bfef", "c58ca5": "b377c6", "73425a": "132f5d", diff --git a/public/images/pokemon/variant/back/441.json b/public/images/pokemon/variant/back/441.json index ab17493bee6..5860511c18a 100644 --- a/public/images/pokemon/variant/back/441.json +++ b/public/images/pokemon/variant/back/441.json @@ -2,7 +2,6 @@ "1": { "292931": "331d29", "5a5a63": "8f5a70", - "000000": "000000", "42424a": "573244", "c5c5c5": "deacce", "ffffff": "ffeef7", diff --git a/public/images/pokemon/variant/back/442.json b/public/images/pokemon/variant/back/442.json index d2fbb6f372c..7ca9d701108 100644 --- a/public/images/pokemon/variant/back/442.json +++ b/public/images/pokemon/variant/back/442.json @@ -6,10 +6,6 @@ "bdd642": "d69042", "ffde10": "db8241", "524252": "42426b", - "101010": "101010", - "b59c94": "b59c94", - "9c846b": "9c846b", - "846b63": "846b63", "734a7b": "8b8b8b" }, "2": { @@ -18,11 +14,8 @@ "63b542": "71cfd7", "bdd642": "a28ded", "ffde10": "a61145", - "524252": "524252", - "101010": "101010", "b59c94": "59001f", "9c846b": "484848", - "846b63": "282828", - "734a7b": "734a7b" + "846b63": "282828" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/443.json b/public/images/pokemon/variant/back/443.json index 4a65daecb4b..c2154751658 100644 --- a/public/images/pokemon/variant/back/443.json +++ b/public/images/pokemon/variant/back/443.json @@ -5,11 +5,6 @@ "314252": "082963", "8cc5d6": "42a5f7", "5294ad": "1984c5", - "42d6de": "42d6de", - "3aadc5": "3aadc5", - "ffffff": "ffffff", - "c5ced6": "c5ced6", - "5a6363": "5a6363", "ad3a10": "a57c10", "de5a29": "e6c529", "7b1910": "731029" @@ -22,9 +17,6 @@ "5294ad": "905647", "42d6de": "54b0ff", "3aadc5": "2878e1", - "ffffff": "ffffff", - "c5ced6": "c5ced6", - "5a6363": "5a6363", "ad3a10": "92a9b2", "de5a29": "d9f0f1", "7b1910": "731029" @@ -37,9 +29,6 @@ "5294ad": "4c5e66", "42d6de": "6fe6a3", "3aadc5": "23b8a8", - "ffffff": "ffffff", - "c5ced6": "c5ced6", - "5a6363": "5a6363", "ad3a10": "92a9b2", "de5a29": "d9f0f1", "7b1910": "3e3a52" diff --git a/public/images/pokemon/variant/back/444.json b/public/images/pokemon/variant/back/444.json index 287f0c4050c..d502b2387a6 100644 --- a/public/images/pokemon/variant/back/444.json +++ b/public/images/pokemon/variant/back/444.json @@ -11,10 +11,7 @@ "5a1000": "502209", "ffff19": "fa845a", "ad314a": "ad7b08", - "c5ced6": "c5ced6", - "de5a29": "f7b834", - "ffffff": "ffffff", - "737b84": "737b84" + "de5a29": "f7b834" }, "1": { "3a4a8c": "6f3633", @@ -28,10 +25,7 @@ "5a1000": "211e33", "ffff19": "ffd177", "ad314a": "829ca6", - "c5ced6": "c5ced6", - "de5a29": "c2dedf", - "ffffff": "ffffff", - "737b84": "737b84" + "de5a29": "c2dedf" }, "2": { "3a4a8c": "223a4a", @@ -45,9 +39,6 @@ "5a1000": "521000", "ffff19": "62cbff", "ad314a": "be472f", - "c5ced6": "c5ced6", - "de5a29": "ee723e", - "ffffff": "ffffff", - "737b84": "737b84" + "de5a29": "ee723e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/445-mega.json b/public/images/pokemon/variant/back/445-mega.json index 68c374cc43f..511c3760720 100644 --- a/public/images/pokemon/variant/back/445-mega.json +++ b/public/images/pokemon/variant/back/445-mega.json @@ -4,13 +4,9 @@ "6060c0": "236696", "404080": "19446e", "8080c0": "65a2d5", - "000000": "000000", "c0a000": "3aadc5", "e0e000": "42d6de", "c04040": "9e5201", - "ffffff": "ffffff", - "808080": "808080", - "c0c0c0": "c0c0c0", "e04040": "f7ac34", "602000": "502209" }, @@ -19,13 +15,9 @@ "6060c0": "deae7a", "404080": "b67252", "8080c0": "f2d8aa", - "000000": "000000", "c0a000": "255dd7", "e0e000": "4caaff", "c04040": "9fb6bf", - "ffffff": "ffffff", - "808080": "808080", - "c0c0c0": "c0c0c0", "e04040": "dce8e8", "602000": "393648" }, @@ -34,13 +26,9 @@ "6060c0": "2f434b", "404080": "152c3b", "8080c0": "689099", - "000000": "000000", "c0a000": "23b8a8", "e0e000": "6fe6a3", "c04040": "b23219", - "ffffff": "ffffff", - "808080": "808080", - "c0c0c0": "c0c0c0", "e04040": "ec642c", "602000": "521000" } diff --git a/public/images/pokemon/variant/back/445.json b/public/images/pokemon/variant/back/445.json index 7bf76d03212..a151b1a7da5 100644 --- a/public/images/pokemon/variant/back/445.json +++ b/public/images/pokemon/variant/back/445.json @@ -4,12 +4,8 @@ "5a63ad": "226596", "42428c": "264074", "7b7bce": "65a2d5", - "101010": "101010", "c59410": "3aadc5", "ffd619": "42d6de", - "ffffff": "ffffff", - "737b84": "737b84", - "c5ced6": "c5ced6", "bd3a42": "b2630f", "5a1000": "502209", "e64a31": "f7ac34" @@ -19,12 +15,8 @@ "5a63ad": "deae7a", "42428c": "af6e55", "7b7bce": "f2d8aa", - "101010": "101010", "c59410": "255dd7", "ffd619": "4caaff", - "ffffff": "ffffff", - "737b84": "737b84", - "c5ced6": "c5ced6", "bd3a42": "9fb6bf", "5a1000": "393648", "e64a31": "c8c8c8" @@ -34,12 +26,8 @@ "5a63ad": "2f434b", "42428c": "152c3b", "7b7bce": "689099", - "101010": "101010", "c59410": "23b8a8", "ffd619": "6fe6a3", - "ffffff": "ffffff", - "737b84": "737b84", - "c5ced6": "c5ced6", "bd3a42": "be472f", "5a1000": "521000", "e64a31": "c8c8c8" diff --git a/public/images/pokemon/variant/back/447.json b/public/images/pokemon/variant/back/447.json index e5bb7f6e3ae..85f1a8f0edd 100644 --- a/public/images/pokemon/variant/back/447.json +++ b/public/images/pokemon/variant/back/447.json @@ -1,18 +1,14 @@ { "0": { - "101010": "101010", "104a7b": "6c3e20", "4a9cef": "e2ce75", "29739c": "a56d2f", "3a3a3a": "12334a", "5a5a5a": "2c486e", - "848484": "848484", "8c843a": "b6957f", - "dec573": "e6d5b9", - "b5b5b5": "b5b5b5" + "dec573": "e6d5b9" }, "1": { - "101010": "101010", "104a7b": "590e1f", "4a9cef": "b85251", "29739c": "7f1e2f", @@ -24,15 +20,12 @@ "b5b5b5": "f3aa58" }, "2": { - "101010": "101010", "104a7b": "3a2254", "4a9cef": "735c9e", "29739c": "513674", "3a3a3a": "26153f", "5a5a5a": "30224c", - "848484": "848484", "8c843a": "373566", - "dec573": "51668e", - "b5b5b5": "b5b5b5" + "dec573": "51668e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/448-mega.json b/public/images/pokemon/variant/back/448-mega.json index 686bb7c0d77..28bb8eb4363 100644 --- a/public/images/pokemon/variant/back/448-mega.json +++ b/public/images/pokemon/variant/back/448-mega.json @@ -3,23 +3,18 @@ "173968": "6c3e20", "407cdc": "e2ce75", "2e5c85": "a56d2f", - "101010": "101010", "393939": "2c2f4c", "5a5a5a": "3a5376", "d5d5d5": "dbcbcb", - "fcfcfc": "fcfcfc", "9a2626": "8a332f", "de4141": "d85e40", "e6d083": "719cbe", - "838383": "838383", - "b09a4d": "51689c", - "ac6262": "ac6262" + "b09a4d": "51689c" }, "1": { "173968": "202931", "407cdc": "b85251", "2e5c85": "7f1e2f", - "101010": "101010", "393939": "202931", "5a5a5a": "444b4b", "d5d5d5": "bb711c", @@ -27,23 +22,17 @@ "9a2626": "a79687", "de4141": "f7eadc", "e6d083": "dec2a3", - "838383": "838383", - "b09a4d": "a26f59", - "ac6262": "ac6262" + "b09a4d": "a26f59" }, "2": { "173968": "2e1547", "407cdc": "735c9e", "2e5c85": "513674", - "101010": "101010", "393939": "291838", "5a5a5a": "352a4b", - "d5d5d5": "d5d5d5", - "fcfcfc": "fcfcfc", "9a2626": "b8461f", "de4141": "de8141", "e6d083": "51668e", - "838383": "838383", "b09a4d": "373566", "ac6262": "9b2e11" } diff --git a/public/images/pokemon/variant/back/448.json b/public/images/pokemon/variant/back/448.json index 5fe86ccde17..17780e4e225 100644 --- a/public/images/pokemon/variant/back/448.json +++ b/public/images/pokemon/variant/back/448.json @@ -3,14 +3,9 @@ "104a7b": "6c3e20", "4a9cef": "e2ce75", "29739c": "a56d2f", - "101010": "101010", "3a3a3a": "0a2734", "5a5a5a": "223754", "d6d6d6": "ddcccc", - "ffffff": "ffffff", - "a53131": "a53131", - "de4242": "de4242", - "848484": "848484", "b5b563": "b6957f", "e6e69c": "e6d5b9", "ad6363": "82b0c4" @@ -19,29 +14,21 @@ "104a7b": "410814", "4a9cef": "b85251", "29739c": "7f1e2f", - "101010": "101010", "3a3a3a": "262032", "5a5a5a": "3b3d4a", "d6d6d6": "eb9645", "ffffff": "fcc161", "a53131": "d3acb2", "de4242": "ebdcdb", - "848484": "848484", "b5b563": "ab8977", - "e6e69c": "dfd0c0", - "ad6363": "ad6363" + "e6e69c": "dfd0c0" }, "2": { "104a7b": "3f2457", "4a9cef": "735c9e", "29739c": "513674", - "101010": "101010", "3a3a3a": "2c2339", "5a5a5a": "3d3052", - "d6d6d6": "d6d6d6", - "ffffff": "ffffff", - "a53131": "a53131", - "de4242": "de4242", "848484": "453a5a", "b5b563": "47439c", "e6e69c": "6c8bc7", diff --git a/public/images/pokemon/variant/back/45.json b/public/images/pokemon/variant/back/45.json index ea6e7dea875..df028577a42 100644 --- a/public/images/pokemon/variant/back/45.json +++ b/public/images/pokemon/variant/back/45.json @@ -7,7 +7,6 @@ "f77373": "5e8fde", "de4a5a": "436ac7", "944a00": "472b86", - "101010": "101010", "ff8429": "966fbb", "ce6319": "724ba4", "19294a": "201349", @@ -24,7 +23,6 @@ "f77373": "d2cbb2", "de4a5a": "cdb2a2", "944a00": "621734", - "101010": "101010", "ff8429": "a23d44", "ce6319": "8b293e", "19294a": "510c35", diff --git a/public/images/pokemon/variant/back/453.json b/public/images/pokemon/variant/back/453.json index 436da3d191f..18211242b55 100644 --- a/public/images/pokemon/variant/back/453.json +++ b/public/images/pokemon/variant/back/453.json @@ -18,7 +18,6 @@ "4a4a8c": "d88f77", "6b73d6": "f0ce8b", "849cff": "fff2c9", - "101010": "101010", "9c3a3a": "16729b", "e6525a": "40adbb", "ff9ca5": "a9ebeb", diff --git a/public/images/pokemon/variant/back/454.json b/public/images/pokemon/variant/back/454.json index 0f96173cbfd..2082cec8ff1 100644 --- a/public/images/pokemon/variant/back/454.json +++ b/public/images/pokemon/variant/back/454.json @@ -15,7 +15,6 @@ }, "2": { "3a3a52": "b15248", - "101010": "101010", "6b73d6": "f0ce8b", "4a4a8c": "d88f77", "849cff": "fff2c9", diff --git a/public/images/pokemon/variant/back/456.json b/public/images/pokemon/variant/back/456.json index e10373acbf4..3a970d1ed94 100644 --- a/public/images/pokemon/variant/back/456.json +++ b/public/images/pokemon/variant/back/456.json @@ -2,7 +2,6 @@ "1": { "31425a": "824568", "526b8c": "966764", - "101010": "101010", "426b84": "aa6985", "94d6e6": "f3e1c6", "29293a": "4f2846", @@ -11,14 +10,11 @@ "c54591": "f19e53", "833171": "d3633a", "c54a94": "8bbcd9", - "efffff": "efffff", - "73427b": "6d90c2", - "15202e": "15202e" + "73427b": "6d90c2" }, "2": { "31425a": "eeb547", "526b8c": "181e52", - "101010": "101010", "426b84": "fff8b0", "94d6e6": "34507e", "29293a": "d36a2b", @@ -27,8 +23,6 @@ "c54591": "50a8c2", "833171": "366ea4", "c54a94": "7b1615", - "efffff": "efffff", - "73427b": "5e0e0e", - "15202e": "15202e" + "73427b": "5e0e0e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/4562.json b/public/images/pokemon/variant/back/4562.json index 9e8c1bee22e..5dd509b1345 100644 --- a/public/images/pokemon/variant/back/4562.json +++ b/public/images/pokemon/variant/back/4562.json @@ -2,10 +2,8 @@ "1": { "313131": "145555", "525252": "257e6a", - "101010": "101010", "672b82": "7e173e", "ab38d1": "b0264c", - "371d3f": "371d3f", "6f5c6b": "743949", "e6ddde": "d6b8a0", "927e8d": "a46361", @@ -14,10 +12,8 @@ "2": { "313131": "69162c", "525252": "90222b", - "101010": "101010", "672b82": "57a0b9", "ab38d1": "c2ffe2", - "371d3f": "371d3f", "6f5c6b": "0a4340", "e6ddde": "4fb66a", "927e8d": "1f6455", diff --git a/public/images/pokemon/variant/back/457.json b/public/images/pokemon/variant/back/457.json index d6a2fad6569..845bfa899e7 100644 --- a/public/images/pokemon/variant/back/457.json +++ b/public/images/pokemon/variant/back/457.json @@ -1,7 +1,6 @@ { "2": { "526b8c": "0f154a", - "101010": "101010", "c5e6f7": "5781c7", "94d6e6": "34507e", "7394ad": "1c335b", @@ -10,7 +9,6 @@ "303449": "b95735", "c54591": "ffc369", "9e357b": "c7703c", - "efffff": "efffff", "c54a94": "983121", "73427b": "7b1213", "26344c": "121c2f" diff --git a/public/images/pokemon/variant/back/46.json b/public/images/pokemon/variant/back/46.json index 1062e915d76..0817d312551 100644 --- a/public/images/pokemon/variant/back/46.json +++ b/public/images/pokemon/variant/back/46.json @@ -8,7 +8,6 @@ "c5b521": "d9c9b9", "3a2910": "3a2108", "734a19": "521e0a", - "101010": "101010", "ffad63": "cf6423", "e68429": "bc4b23" }, @@ -21,7 +20,6 @@ "c5b521": "e5d59c", "3a2910": "3a2108", "734a19": "5a392d", - "101010": "101010", "ffad63": "f3d8cb", "e68429": "d1afa3" }, @@ -34,7 +32,6 @@ "c5b521": "e5d59c", "3a2910": "1e152d", "734a19": "3d2b4e", - "101010": "101010", "ffad63": "bf9edd", "e68429": "9779a6" } diff --git a/public/images/pokemon/variant/back/461.json b/public/images/pokemon/variant/back/461.json index c0cd7405527..01c7eca5892 100644 --- a/public/images/pokemon/variant/back/461.json +++ b/public/images/pokemon/variant/back/461.json @@ -3,7 +3,6 @@ "c52973": "3a3d60", "842152": "191a24", "f75273": "636896", - "101010": "101010", "293152": "530b34", "6b6bad": "8b274b", "424a84": "691043", @@ -18,12 +17,10 @@ "c52973": "3d81c5", "842152": "102f6c", "f75273": "5cb0eb", - "101010": "101010", "293152": "96543f", "6b6bad": "ffd3a7", "424a84": "ecaa84", "c58c08": "8f1a8d", - "ffffff": "ffffff", "ffd642": "e6509f", "6b637b": "718198", "c5bdce": "b3cedb", diff --git a/public/images/pokemon/variant/back/462.json b/public/images/pokemon/variant/back/462.json index 39a7d3460b2..a4af8152167 100644 --- a/public/images/pokemon/variant/back/462.json +++ b/public/images/pokemon/variant/back/462.json @@ -3,8 +3,6 @@ "ad8419": "8fb9cc", "f7ce52": "cee7f2", "635a6b": "90495b", - "ffffff": "ffffff", - "101010": "101010", "424252": "612e40", "7b7b84": "90495b", "adadb5": "c36c77", @@ -17,7 +15,6 @@ "f7ce52": "a7dcaa", "635a6b": "662e00", "ffffff": "fffb93", - "101010": "101010", "424252": "401d00", "7b7b84": "662e00", "adadb5": "8c500b", diff --git a/public/images/pokemon/variant/back/464.json b/public/images/pokemon/variant/back/464.json index b9269dc7279..8232d6da3eb 100644 --- a/public/images/pokemon/variant/back/464.json +++ b/public/images/pokemon/variant/back/464.json @@ -5,15 +5,9 @@ "ef5200": "6f4d9f", "29293a": "1f1028", "3a3a4a": "3b2d40", - "101010": "101010", "7b6b7b": "6e5d7b", - "6b6373": "6b6373", - "cecede": "cecede", - "efefff": "efefff", "5a4a63": "514259", - "948cad": "948cad", - "943a00": "4c2f6e", - "ad2900": "ad2900" + "943a00": "4c2f6e" }, "2": { "523100": "492133", @@ -21,7 +15,6 @@ "ef5200": "6d3950", "29293a": "442339", "3a3a4a": "701f38", - "101010": "101010", "7b6b7b": "c6405b", "6b6373": "b66360", "cecede": "e8a797", diff --git a/public/images/pokemon/variant/back/465.json b/public/images/pokemon/variant/back/465.json index cc868023c2b..26f1d75d388 100644 --- a/public/images/pokemon/variant/back/465.json +++ b/public/images/pokemon/variant/back/465.json @@ -3,10 +3,8 @@ "193a63": "391963", "295a84": "472984", "3a73ad": "6b3aad", - "000000": "000000", "5a193a": "195a2a", "bd216b": "21bd69", - "31313a": "31313a", "d65a94": "5ad662" }, "2": { @@ -18,4 +16,4 @@ "bd216b": "b35131", "193a63": "705040" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/466.json b/public/images/pokemon/variant/back/466.json index 35c65a58eea..362c4043b08 100644 --- a/public/images/pokemon/variant/back/466.json +++ b/public/images/pokemon/variant/back/466.json @@ -5,7 +5,6 @@ "5a4a42": "465b69", "312929": "333931", "ffef94": "baffde", - "000000": "000000", "c5ad42": "4abaae", "731900": "73376d", "b53a19": "a45ead", @@ -18,11 +17,9 @@ "5a4a42": "285ffb", "312929": "2334c1", "ffef94": "f5f5f5", - "000000": "000000", "c5ad42": "b8bfd6", "731900": "e68419", "b53a19": "f1c168", - "f7523a": "e8ff80", - "b5b5c5": "b5b5c5" + "f7523a": "e8ff80" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/467.json b/public/images/pokemon/variant/back/467.json index 8371e4c36a2..121e1266a39 100644 --- a/public/images/pokemon/variant/back/467.json +++ b/public/images/pokemon/variant/back/467.json @@ -8,18 +8,15 @@ "e64231": "db4d19", "d63131": "ba4014", "953f47": "8c3313", - "101010": "101010", "612922": "8c3313", "ff94a5": "fb832b", "c55a6b": "db4d19", - "4a4a42": "4a4a42", "ca2b2b": "372d49", "a1354b": "272034", "cea53a": "db4d19", "ffc53a": "fb832b", "bc5969": "474139", "ff9dad": "777066", - "ced6e6": "ced6e6", "662f20": "8c3313", "e2937a": "fb832b", "b14849": "db4d19", @@ -34,18 +31,15 @@ "e64231": "478bc0", "d63131": "4065b0", "953f47": "4065b0", - "101010": "101010", "612922": "699296", "ff94a5": "eaffff", "c55a6b": "c6edf2", - "4a4a42": "4a4a42", "ca2b2b": "4065b0", "a1354b": "31508c", "cea53a": "c6edf2", "ffc53a": "eaffff", "bc5969": "7f90a9", "ff9dad": "abc7de", - "ced6e6": "ced6e6", "662f20": "2a2523", "e2937a": "eaffff", "b14849": "4065b0", diff --git a/public/images/pokemon/variant/back/468.json b/public/images/pokemon/variant/back/468.json index 1c0c54973d1..72ada607d8c 100644 --- a/public/images/pokemon/variant/back/468.json +++ b/public/images/pokemon/variant/back/468.json @@ -5,7 +5,6 @@ "ce4a31": "409e80", "4a5a73": "593237", "efefff": "eee0db", - "101010": "101010", "bdc5de": "ceacac", "4284ef": "d05887", "bd8484": "8ee4be", @@ -18,7 +17,6 @@ "ce4a31": "c48330", "4a5a73": "452030", "efefff": "f3cbcb", - "101010": "101010", "bdc5de": "c2888c", "4284ef": "f19a4e", "bd8484": "f5b55e", @@ -31,7 +29,6 @@ "ce4a31": "d97741", "4a5a73": "254985", "efefff": "b3ddeb", - "101010": "101010", "bdc5de": "81aaca", "4284ef": "db79db", "bd8484": "f39a4c", diff --git a/public/images/pokemon/variant/back/47.json b/public/images/pokemon/variant/back/47.json index 141a046e34e..a21356d48cc 100644 --- a/public/images/pokemon/variant/back/47.json +++ b/public/images/pokemon/variant/back/47.json @@ -9,7 +9,6 @@ "de6b31": "bc4b23", "631000": "521e0a", "ff8452": "e0843d", - "101010": "101010", "b5423a": "85251b" }, "1": { @@ -22,7 +21,6 @@ "de6b31": "d1afa3", "631000": "5a392d", "ff8452": "f3d8cb", - "101010": "101010", "b5423a": "98655f" }, "2": { @@ -35,7 +33,6 @@ "de6b31": "9779a6", "631000": "3d2b4e", "ff8452": "bf9edd", - "101010": "101010", "b5423a": "6a507b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/470.json b/public/images/pokemon/variant/back/470.json index 22912bc961c..3b6f1154e13 100644 --- a/public/images/pokemon/variant/back/470.json +++ b/public/images/pokemon/variant/back/470.json @@ -2,7 +2,6 @@ "2": { "31635a": "9f5d29", "6bbd8c": "edd898", - "101010": "101010", "319c73": "d8a452", "efd69c": "b39671", "d6b573": "816242", diff --git a/public/images/pokemon/variant/back/471.json b/public/images/pokemon/variant/back/471.json index b5332dd5597..f8de14b6bc3 100644 --- a/public/images/pokemon/variant/back/471.json +++ b/public/images/pokemon/variant/back/471.json @@ -1,19 +1,14 @@ { "0": { - "101010": "101010", "94e6ef": "f8f7ff", "94b5ce": "e6e3f3", "7b9cb5": "dad9ea", "525a84": "636b94", - "3a3a52": "3a3a52", - "313a4a": "313a4a", "529cde": "a0e7f7", "425a6b": "3597ac", - "52639c": "54bbd2", - "efffff": "efffff" + "52639c": "54bbd2" }, "1": { - "101010": "101010", "94e6ef": "c0aebd", "94b5ce": "a1899e", "7b9cb5": "865d86", @@ -22,11 +17,9 @@ "313a4a": "53205d", "529cde": "c6b9ff", "425a6b": "835ad1", - "52639c": "997aea", - "efffff": "efffff" + "52639c": "997aea" }, "2": { - "101010": "101010", "94e6ef": "63d1e9", "94b5ce": "3b9abe", "7b9cb5": "28769f", @@ -35,7 +28,6 @@ "313a4a": "09234b", "529cde": "3aceef", "425a6b": "edfcff", - "52639c": "2984d6", - "efffff": "efffff" + "52639c": "2984d6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/474.json b/public/images/pokemon/variant/back/474.json index 2490d3fd713..1729121eb34 100644 --- a/public/images/pokemon/variant/back/474.json +++ b/public/images/pokemon/variant/back/474.json @@ -3,10 +3,8 @@ "5a3a4a": "9e264e", "ef5a63": "f8a8e6", "94426b": "d95492", - "101010": "101010", "bd4a6b": "e883c8", "ff94b5": "fccef2", - "ffffff": "ffffff", "313a63": "110a25", "31739c": "271a3e", "8cd6ff": "5e4868", @@ -19,7 +17,6 @@ "5a3a4a": "31150e", "ef5a63": "82391d", "94426b": "491c0c", - "101010": "101010", "bd4a6b": "612a17", "ff94b5": "a04c27", "ffffff": "ffe4d4", diff --git a/public/images/pokemon/variant/back/475.json b/public/images/pokemon/variant/back/475.json index 3cafe1d59ea..8d359917f97 100644 --- a/public/images/pokemon/variant/back/475.json +++ b/public/images/pokemon/variant/back/475.json @@ -6,7 +6,6 @@ "42845a": "c08f44", "7394a5": "ebc984", "5ab56b": "eabb5d", - "101010": "101010", "7b8cad": "d59c80", "efefff": "f8efde", "a5b5ce": "ffc4a6", @@ -22,11 +21,6 @@ "42845a": "242745", "7394a5": "3f427f", "5ab56b": "282c5d", - "101010": "101010", - "7b8cad": "7b8cad", - "efefff": "efefff", - "a5b5ce": "a5b5ce", - "c5cede": "c5cede", "e6523a": "d846c1", "7b5252": "9e2a7c", "ff9c84": "b035ae" diff --git a/public/images/pokemon/variant/back/478.json b/public/images/pokemon/variant/back/478.json index 36861f03a5e..bd8ee24cac1 100644 --- a/public/images/pokemon/variant/back/478.json +++ b/public/images/pokemon/variant/back/478.json @@ -7,7 +7,6 @@ "527bb5": "34853e", "73b5d6": "65d64d", "42528c": "045836", - "101010": "101010", "4a3173": "001e1d", "6b3131": "081d22", "e67b4a": "29504d", diff --git a/public/images/pokemon/variant/back/479-fan.json b/public/images/pokemon/variant/back/479-fan.json index 60cb7e4fc50..13d46fccf21 100644 --- a/public/images/pokemon/variant/back/479-fan.json +++ b/public/images/pokemon/variant/back/479-fan.json @@ -8,21 +8,16 @@ "7b3a21": "113526", "ef7329": "417131", "ffad84": "819d56", - "101010": "101010", - "4a4a52": "2e3f18", - "bdbdbd": "bdbdbd" + "4a4a52": "2e3f18" }, "2": { "d6ad00": "adbed7", "ffe65a": "d9e1ec", "ffefa5": "edf2fa", - "ffffff": "ffffff", "c54a19": "cbb240", "7b3a21": "ad7d28", "ef7329": "e4de6d", "ffad84": "fcfebf", - "101010": "101010", - "4a4a52": "374f6c", - "bdbdbd": "bdbdbd" + "4a4a52": "374f6c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/479-frost.json b/public/images/pokemon/variant/back/479-frost.json index 357bc3ceb99..e36f1eb2648 100644 --- a/public/images/pokemon/variant/back/479-frost.json +++ b/public/images/pokemon/variant/back/479-frost.json @@ -4,11 +4,8 @@ "ce73ff": "648c50", "de9cff": "9ea436", "7b3a21": "183b29", - "101010": "101010", "ef7329": "417131", "c54a19": "205027", - "292929": "292929", - "4a4a52": "4a4a52", "ffffff": "fbffbd" }, "2": { @@ -16,11 +13,7 @@ "ce73ff": "59b5d7", "de9cff": "8ed4e9", "7b3a21": "536d8c", - "101010": "101010", "ef7329": "c5cbe5", - "c54a19": "93a5ba", - "292929": "292929", - "4a4a52": "4a4a52", - "ffffff": "ffffff" + "c54a19": "93a5ba" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/479-heat.json b/public/images/pokemon/variant/back/479-heat.json index eb5aa5503f2..123080d40ac 100644 --- a/public/images/pokemon/variant/back/479-heat.json +++ b/public/images/pokemon/variant/back/479-heat.json @@ -8,19 +8,16 @@ "ffad84": "819d56", "c54a19": "205027", "ef7329": "417131", - "101010": "101010", "292929": "142a1f" }, "2": { "bd2929": "cbbf4c", "ff4231": "f5f4ab", "ff9c94": "fdffe1", - "ffffff": "ffffff", "7b3a21": "9e3867", "ffad84": "ffd5d0", "c54a19": "d06280", "ef7329": "ff8493", - "101010": "101010", "292929": "581944" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/479-mow.json b/public/images/pokemon/variant/back/479-mow.json index b05f61a329c..f7e6f73165f 100644 --- a/public/images/pokemon/variant/back/479-mow.json +++ b/public/images/pokemon/variant/back/479-mow.json @@ -7,7 +7,6 @@ "c54a19": "205027", "ef7329": "417131", "ffad84": "819d56", - "101010": "101010", "4a4a52": "183b29", "ffffff": "fbffbd" }, @@ -18,9 +17,6 @@ "7b3a21": "064f40", "c54a19": "147a5c", "ef7329": "279e69", - "ffad84": "6ada9c", - "101010": "101010", - "4a4a52": "4a4a52", - "ffffff": "ffffff" + "ffad84": "6ada9c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/479-wash.json b/public/images/pokemon/variant/back/479-wash.json index eac753f790f..9c7e5547344 100644 --- a/public/images/pokemon/variant/back/479-wash.json +++ b/public/images/pokemon/variant/back/479-wash.json @@ -4,12 +4,10 @@ "084ac5": "204336", "8cbdf7": "9ea436", "c54a19": "205027", - "101010": "101010", "ffad84": "819d56", "7b3a21": "143b2b", "ef7329": "417131", "4a4a52": "183b29", - "292929": "292929", "ffffff": "fbffbd" }, "2": { @@ -17,12 +15,8 @@ "084ac5": "1aac79", "8cbdf7": "b4feca", "c54a19": "53abd0", - "101010": "101010", "ffad84": "bbf7fe", "7b3a21": "255e90", - "ef7329": "86d7ec", - "4a4a52": "4a4a52", - "292929": "292929", - "ffffff": "ffffff" + "ef7329": "86d7ec" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/479.json b/public/images/pokemon/variant/back/479.json index e6bd74a3c5a..d0cc41fd8dc 100644 --- a/public/images/pokemon/variant/back/479.json +++ b/public/images/pokemon/variant/back/479.json @@ -6,7 +6,6 @@ "c54a19": "205027", "7b3a21": "143b2b", "ef7329": "417131", - "101010": "101010", "bdbdbd": "d8e082", "0842ad": "648c50", "317bef": "89a271", @@ -15,12 +14,9 @@ "2": { "5ac5bd": "64da6a", "bdf7ef": "d7f3c1", - "ffffff": "ffffff", "c54a19": "2e3948", "7b3a21": "242834", "ef7329": "4d5262", - "101010": "101010", - "bdbdbd": "bdbdbd", "0842ad": "c95367", "317bef": "e9919c", "29adbd": "1fb18e" diff --git a/public/images/pokemon/variant/back/480.json b/public/images/pokemon/variant/back/480.json index c8b2594016b..17c8018c61b 100644 --- a/public/images/pokemon/variant/back/480.json +++ b/public/images/pokemon/variant/back/480.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "f7c573": "e8824f", "ad8c42": "ba5327", "735a42": "86340d", @@ -11,7 +10,6 @@ "ad4242": "e141ed" }, "1": { - "101010": "101010", "f7c573": "3675ba", "ad8c42": "1e4891", "735a42": "0b1f51", @@ -22,7 +20,6 @@ "ad4242": "ffbd73" }, "2": { - "101010": "101010", "f7c573": "4d967d", "ad8c42": "24594a", "735a42": "123723", diff --git a/public/images/pokemon/variant/back/481.json b/public/images/pokemon/variant/back/481.json index cbaa6c1597b..9ed487565ac 100644 --- a/public/images/pokemon/variant/back/481.json +++ b/public/images/pokemon/variant/back/481.json @@ -3,7 +3,6 @@ "84426b": "691149", "b55284": "93397b", "ef73ad": "b35596", - "101010": "101010", "7b7394": "8d4275", "949cc5": "d295b9", "424242": "591c4b", @@ -14,7 +13,6 @@ "84426b": "371959", "b55284": "59367e", "ef73ad": "785194", - "101010": "101010", "7b7394": "6b4b75", "949cc5": "b89cbb", "424242": "51385c", @@ -25,11 +23,9 @@ "84426b": "813401", "b55284": "c76e1e", "ef73ad": "e2a21b", - "101010": "101010", "7b7394": "896149", "949cc5": "c5ac94", "424242": "633826", - "b5cef7": "f7e0b5", - "ef4242": "ef4242" + "b5cef7": "f7e0b5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/482.json b/public/images/pokemon/variant/back/482.json index ef599ca2581..59039572fec 100644 --- a/public/images/pokemon/variant/back/482.json +++ b/public/images/pokemon/variant/back/482.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "3a4a73": "03436b", "5a94c5": "27bac2", "426394": "0f7293", @@ -11,7 +10,6 @@ "ad4242": "7c1caa" }, "1": { - "101010": "101010", "3a4a73": "23472c", "5a94c5": "488356", "426394": "32613b", @@ -22,7 +20,6 @@ "ad4242": "d26725" }, "2": { - "101010": "101010", "3a4a73": "62114e", "5a94c5": "ce569c", "426394": "a4327e", diff --git a/public/images/pokemon/variant/back/485.json b/public/images/pokemon/variant/back/485.json index 3eb9d2f0d0f..fd87acf184a 100644 --- a/public/images/pokemon/variant/back/485.json +++ b/public/images/pokemon/variant/back/485.json @@ -2,7 +2,6 @@ "1": { "5a3131": "313f5a", "ad5a42": "4266ad", - "737373": "737373", "191919": "2f2f2f", "84425a": "425884", "c5c5c5": "e3e3e3", @@ -10,21 +9,17 @@ "ce8429": "29ce5a", "ffa510": "10ff6b", "525252": "767676", - "949494": "bfa9a9", - "3a3a3a": "3a3a3a" + "949494": "bfa9a9" }, "2": { "5a3131": "462151", "ad5a42": "7836a7", - "737373": "737373", - "191919": "191919", "84425a": "633372", "c5c5c5": "949494", "e6e6ef": "b0b0b0", "ce8429": "ce2988", "ffa510": "f110ff", "525252": "514949", - "949494": "636363", - "3a3a3a": "3a3a3a" + "949494": "636363" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/487-altered.json b/public/images/pokemon/variant/back/487-altered.json index 2342bc62e92..c7cdeeaabfa 100644 --- a/public/images/pokemon/variant/back/487-altered.json +++ b/public/images/pokemon/variant/back/487-altered.json @@ -2,7 +2,6 @@ "1": { "3a3a4a": "171731", "735200": "023432", - "000000": "000000", "ffefc5": "9fffd4", "ffd600": "35ad81", "ce9c00": "156151", @@ -18,7 +17,6 @@ "2": { "3a3a4a": "12251a", "735200": "4a351b", - "000000": "000000", "ffefc5": "fffdf1", "ffd600": "e2d4af", "ce9c00": "aa956f", diff --git a/public/images/pokemon/variant/back/487-origin.json b/public/images/pokemon/variant/back/487-origin.json index 7990487a65d..a62cfa3a399 100644 --- a/public/images/pokemon/variant/back/487-origin.json +++ b/public/images/pokemon/variant/back/487-origin.json @@ -12,8 +12,7 @@ "a5213a": "974eaf", "6b6b7b": "3c1f59", "5a3110": "5e0e6e", - "ff4252": "df78ff", - "000000": "000000" + "ff4252": "df78ff" }, "2": { "292929": "241010", @@ -28,7 +27,6 @@ "a5213a": "16b811", "6b6b7b": "1e203c", "5a3110": "00760b", - "ff4252": "46e92a", - "000000": "000000" + "ff4252": "46e92a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/488.json b/public/images/pokemon/variant/back/488.json index 4d302553deb..f6306b0d3f8 100644 --- a/public/images/pokemon/variant/back/488.json +++ b/public/images/pokemon/variant/back/488.json @@ -2,14 +2,12 @@ "1": { "6b5231": "5a3c2a", "ffefbd": "fdf0d6", - "101010": "101010", "ad945a": "bc977d", "ffd673": "ddbfa4", "8c427b": "721e01", "d68cce": "dd8d2e", "c55a9c": "b33c12", "523a5a": "420600", - "ffffff": "ffffff", "e6c5ef": "ffd28c", "3a427b": "181d46", "526bb5": "304190", @@ -18,14 +16,12 @@ "2": { "6b5231": "485e63", "ffefbd": "e0eceb", - "101010": "101010", "ad945a": "7a9294", "ffd673": "bacaca", "8c427b": "168557", "d68cce": "7fe14b", "c55a9c": "2cba5e", "523a5a": "084c38", - "ffffff": "ffffff", "e6c5ef": "e0ff8c", "3a427b": "111828", "526bb5": "2f3345", diff --git a/public/images/pokemon/variant/back/489.json b/public/images/pokemon/variant/back/489.json index 53c68ee6184..234998f9912 100644 --- a/public/images/pokemon/variant/back/489.json +++ b/public/images/pokemon/variant/back/489.json @@ -4,7 +4,6 @@ "3a529c": "185b4f", "6bc5f7": "9bf3b7", "9ce6ff": "c3ffcd", - "101010": "101010", "199cd6": "69c796" }, "1": { @@ -12,7 +11,6 @@ "3a529c": "682307", "6bc5f7": "f5a54e", "9ce6ff": "ffd289", - "101010": "101010", "199cd6": "c27138" }, "2": { @@ -20,7 +18,6 @@ "3a529c": "84255f", "6bc5f7": "e484a8", "9ce6ff": "efa0b2", - "101010": "101010", "199cd6": "c65086" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/490.json b/public/images/pokemon/variant/back/490.json index 4ae1ca03db1..950148a35fe 100644 --- a/public/images/pokemon/variant/back/490.json +++ b/public/images/pokemon/variant/back/490.json @@ -1,7 +1,6 @@ { "0": { "317bad": "399271", - "101010": "101010", "199cd6": "69c796", "6bc5f7": "9bf3b7", "294a84": "185b4f", @@ -9,7 +8,6 @@ }, "1": { "317bad": "c27138", - "101010": "101010", "199cd6": "c27138", "6bc5f7": "f5a54e", "294a84": "964d17", @@ -17,7 +15,6 @@ }, "2": { "317bad": "b8488c", - "101010": "101010", "199cd6": "cc659c", "6bc5f7": "de89b3", "294a84": "912b6e", diff --git a/public/images/pokemon/variant/back/491.json b/public/images/pokemon/variant/back/491.json index 4935373691d..62a7849d6a1 100644 --- a/public/images/pokemon/variant/back/491.json +++ b/public/images/pokemon/variant/back/491.json @@ -1,30 +1,23 @@ { "1": { - "848484": "848484", - "dee6ef": "dee6ef", - "adb5bd": "adb5bd", "524a4a": "53818e", - "101010": "101010", "313131": "274656", "520000": "0a436c", "942942": "1e849a", "e63a29": "4fe0cd", "29e6ff": "d7502b", - "108cad": "a32819", - "ffffff": "ffffff" + "108cad": "a32819" }, "2": { "848484": "694624", "dee6ef": "ffcdbc", "adb5bd": "ce9c7a", "524a4a": "a9303f", - "101010": "101010", "313131": "5e1b2d", "520000": "6a2c00", "942942": "ba5a19", "e63a29": "ffa645", "29e6ff": "76f7ff", - "108cad": "25a6c7", - "ffffff": "ffffff" + "108cad": "25a6c7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/492-land.json b/public/images/pokemon/variant/back/492-land.json index 3f0b8dda84f..340e9bb285c 100644 --- a/public/images/pokemon/variant/back/492-land.json +++ b/public/images/pokemon/variant/back/492-land.json @@ -2,7 +2,6 @@ "1": { "8cad63": "2a5045", "adde63": "416556", - "101010": "101010", "5a7342": "0f312b", "ffef7b": "cb9373", "844a6b": "b22519", @@ -19,7 +18,6 @@ "2": { "8cad63": "aa671e", "adde63": "f0a852", - "101010": "101010", "5a7342": "743510", "ffef7b": "f0d962", "844a6b": "326a9a", diff --git a/public/images/pokemon/variant/back/492-sky.json b/public/images/pokemon/variant/back/492-sky.json index 3830a053162..1d482166dc2 100644 --- a/public/images/pokemon/variant/back/492-sky.json +++ b/public/images/pokemon/variant/back/492-sky.json @@ -3,7 +3,6 @@ "7bad21": "24493e", "9cd621": "416556", "3a6b10": "103129", - "101010": "101010", "9494ad": "b18355", "ffffff": "fffae9", "52525a": "78492a", @@ -16,7 +15,6 @@ "7bad21": "ad5a1b", "9cd621": "f09d52", "3a6b10": "974a15", - "101010": "101010", "9494ad": "a7604e", "ffffff": "fff4ea", "52525a": "7a3126", diff --git a/public/images/pokemon/variant/back/494.json b/public/images/pokemon/variant/back/494.json index 79cbc752102..c47825a8ff2 100644 --- a/public/images/pokemon/variant/back/494.json +++ b/public/images/pokemon/variant/back/494.json @@ -5,9 +5,7 @@ "846b3a": "c43d21", "c59c5a": "d96030", "ffe6ad": "ee8e3e", - "000000": "000000", "6b4a10": "902300", - "3a3a3a": "3a3a3a", "bd4a00": "706040" }, "2": { @@ -16,9 +14,7 @@ "846b3a": "2b2a40", "c59c5a": "45465d", "ffe6ad": "72758a", - "000000": "000000", "6b4a10": "1e1b36", - "3a3a3a": "3a3a3a", "bd4a00": "b9648d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/495.json b/public/images/pokemon/variant/back/495.json index a10cba7c1e1..c38d9c8fca8 100644 --- a/public/images/pokemon/variant/back/495.json +++ b/public/images/pokemon/variant/back/495.json @@ -5,10 +5,8 @@ "088400": "363270", "ffde29": "ff884c", "c59c00": "cc4328", - "080808": "080808", "5a2100": "1e1e66", "fff7bd": "ffe5b2", - "ffffff": "ffffff", "943a00": "4c3d99", "c5bd63": "cca37a", "de7b42": "8766cc", @@ -20,10 +18,8 @@ "088400": "b23561", "ffde29": "ffffff", "c59c00": "cecee5", - "080808": "080808", "5a2100": "054566", "fff7bd": "fff2f8", - "ffffff": "ffffff", "943a00": "168399", "c5bd63": "ccadc1", "de7b42": "33cccc", diff --git a/public/images/pokemon/variant/back/496.json b/public/images/pokemon/variant/back/496.json index e0c079d2d15..fb864e30af6 100644 --- a/public/images/pokemon/variant/back/496.json +++ b/public/images/pokemon/variant/back/496.json @@ -3,30 +3,24 @@ "21943a": "433e7c", "105229": "281d49", "29c54a": "6970af", - "000000": "000000", "8c7b31": "7f533f", - "ffffff": "ffffff", "bd4a21": "8766cc", "734210": "4c3d99", "c5bd63": "cca37a", "fff7bd": "ffe5b2", "d6ad29": "cc523d", - "081010": "081010", "ffce29": "ff884c" }, "2": { "21943a": "b23561", "105229": "7f194c", "29c54a": "e55b75", - "000000": "000000", "8c7b31": "664c61", - "ffffff": "ffffff", "bd4a21": "778fd8", "734210": "4a52a5", "c5bd63": "ccadc1", "fff7bd": "fff2f8", "d6ad29": "cecee5", - "081010": "081010", "ffce29": "ffffff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/497.json b/public/images/pokemon/variant/back/497.json index 7249f0b1bb0..34600584f10 100644 --- a/public/images/pokemon/variant/back/497.json +++ b/public/images/pokemon/variant/back/497.json @@ -3,10 +3,8 @@ "105229": "06010c", "10733a": "1b0f3f", "9cd69c": "778fd8", - "081010": "081010", "73a573": "4a52a5", "8c8cad": "8b8bac", - "ffffff": "ffffff", "943a00": "4c3d99", "ff8400": "8766cc", "199c4a": "2e2872", @@ -19,7 +17,6 @@ "105229": "06010c", "10733a": "660f41", "9cd69c": "ff727e", - "081010": "081010", "73a573": "cc4768", "8c8cad": "664c61", "ffffff": "fff2f8", diff --git a/public/images/pokemon/variant/back/5.json b/public/images/pokemon/variant/back/5.json index fc9c313b8b9..dcd498dea43 100644 --- a/public/images/pokemon/variant/back/5.json +++ b/public/images/pokemon/variant/back/5.json @@ -2,16 +2,12 @@ "1": { "942110": "10292c", "ffa500": "9e59db", - "101010": "101010", "ff524a": "2a6e70", "ce3a3a": "1a4848", "ff4200": "5033ce", "ff846b": "40a78f", "ffde29": "e9bfff", - "b5b5b5": "b5b5b5", "005aff": "ce1010", - "ffffff": "ffffff", - "6b6b6b": "6b6b6b", "e6cead": "99f4f7", "b58c5a": "60c5c8", "cead7b": "6ee3e5" @@ -19,16 +15,12 @@ "2": { "942110": "101a70", "ffa500": "96e8e8", - "101010": "101010", "ff524a": "2564bc", "ce3a3a": "163793", "ff4200": "4c83d4", "ff846b": "418ae2", "ffde29": "f9fffa", - "b5b5b5": "b5b5b5", "005aff": "2b75ff", - "ffffff": "ffffff", - "6b6b6b": "6b6b6b", "e6cead": "5e238e", "b58c5a": "340d6b", "cead7b": "47177a" diff --git a/public/images/pokemon/variant/back/50.json b/public/images/pokemon/variant/back/50.json index 598825032ea..e11530fed28 100644 --- a/public/images/pokemon/variant/back/50.json +++ b/public/images/pokemon/variant/back/50.json @@ -4,7 +4,6 @@ "a55a5a": "2b8d62", "5a3119": "10644e", "de9c5a": "7ade9a", - "101010": "101010", "847b4a": "a29276", "e6e6b5": "ffffe4", "5a5221": "77674b", @@ -15,7 +14,6 @@ "a55a5a": "cc8029", "5a3119": "a66010", "de9c5a": "ffde62", - "101010": "101010", "847b4a": "8592a6", "e6e6b5": "e6ebf2", "5a5221": "62738c", diff --git a/public/images/pokemon/variant/back/51.json b/public/images/pokemon/variant/back/51.json index 8d80ecb3f5f..1dda616609b 100644 --- a/public/images/pokemon/variant/back/51.json +++ b/public/images/pokemon/variant/back/51.json @@ -4,7 +4,6 @@ "de9c5a": "7ade9a", "c57342": "4eb578", "5a3119": "10644e", - "101010": "101010", "730019": "882859", "ff6b5a": "ff78b0", "d63a4a": "ef4da0", @@ -18,7 +17,6 @@ "de9c5a": "ffde62", "c57342": "f2ad3d", "5a3119": "a66010", - "101010": "101010", "730019": "62738c", "ff6b5a": "e6ebf2", "d63a4a": "c3ccd9", diff --git a/public/images/pokemon/variant/back/517.json b/public/images/pokemon/variant/back/517.json index 66e30e5a872..c88320baf66 100644 --- a/public/images/pokemon/variant/back/517.json +++ b/public/images/pokemon/variant/back/517.json @@ -7,10 +7,8 @@ "e6adc5": "5cb391", "ad7bce": "119b87", "634a6b": "003f4f", - "101010": "101010", "de7bbd": "5fafdf", - "ad2942": "ca2793", - "ffffff": "ffffff" + "ad2942": "ca2793" }, "2": { "ce8cbd": "255696", @@ -20,9 +18,7 @@ "e6adc5": "3f79b7", "ad7bce": "d6654d", "634a6b": "52252a", - "101010": "101010", "de7bbd": "cd8042", - "ad2942": "bd3c25", - "ffffff": "ffffff" + "ad2942": "bd3c25" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/518.json b/public/images/pokemon/variant/back/518.json index 98dc4134ea0..f1c7177b0e9 100644 --- a/public/images/pokemon/variant/back/518.json +++ b/public/images/pokemon/variant/back/518.json @@ -7,7 +7,6 @@ "6b63a5": "b85635", "ffc5ce": "f7dfe1", "9c5a63": "854655", - "101010": "101010", "ce9c94": "efbcc9", "525252": "a86c76", "bd73ad": "0d4543", @@ -21,7 +20,6 @@ "6b63a5": "e7af71", "ffc5ce": "384a8f", "9c5a63": "151c59", - "101010": "101010", "ce9c94": "233175", "525252": "0b0f3c", "bd73ad": "314da0", diff --git a/public/images/pokemon/variant/back/52-gigantamax.json b/public/images/pokemon/variant/back/52-gigantamax.json index 9837323ddab..620a1792cd6 100644 --- a/public/images/pokemon/variant/back/52-gigantamax.json +++ b/public/images/pokemon/variant/back/52-gigantamax.json @@ -4,11 +4,6 @@ "c89f8c": "816f5c", "fbf7e6": "ece3c7", "f0dea2": "c7b497", - "101010": "101010", - "986100": "986100", - "cca700": "cca700", - "f6f6f6": "f6f6f6", - "f9d400": "f9d400", "944100": "751e7c", "ea9f38": "cb5fbd", "c5810b": "b146ac" @@ -18,10 +13,8 @@ "c89f8c": "915d2f", "fbf7e6": "e5bc79", "f0dea2": "c08647", - "101010": "101010", "986100": "683700", "cca700": "a96c00", - "f6f6f6": "f6f6f6", "f9d400": "ffbf3f", "944100": "2948ad", "ea9f38": "7bf7f7", @@ -32,10 +25,8 @@ "c89f8c": "322d28", "fbf7e6": "807d77", "f0dea2": "524f4a", - "101010": "101010", "986100": "986f00", "cca700": "efc300", - "f6f6f6": "f6f6f6", "f9d400": "f9e600", "944100": "256a24", "ea9f38": "aeec97", diff --git a/public/images/pokemon/variant/back/52.json b/public/images/pokemon/variant/back/52.json index 4bb9cb30ec9..11c20d19a3d 100644 --- a/public/images/pokemon/variant/back/52.json +++ b/public/images/pokemon/variant/back/52.json @@ -2,8 +2,6 @@ "0": { "8c6b00": "5b4a3b", "ffe684": "c7b497", - "101010": "101010", - "ffffff": "ffffff", "ffd600": "cea500", "debd3a": "816f5c", "cea500": "945a00", @@ -14,11 +12,7 @@ "1": { "8c6b00": "552e15", "ffe684": "c08647", - "101010": "101010", - "ffffff": "ffffff", - "ffd600": "ffd600", "debd3a": "915d2f", - "cea500": "cea500", "944200": "2948ad", "ef9c31": "7bf7f7", "c57b08": "52add6" @@ -26,8 +20,6 @@ "2": { "8c6b00": "241d18", "ffe684": "524f4a", - "101010": "101010", - "ffffff": "ffffff", "ffd600": "d2ac00", "debd3a": "322d28", "cea500": "986f00", diff --git a/public/images/pokemon/variant/back/524.json b/public/images/pokemon/variant/back/524.json index 3ce39b1bc45..0ad758ddcb6 100644 --- a/public/images/pokemon/variant/back/524.json +++ b/public/images/pokemon/variant/back/524.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "3a2119": "4d8c77", "5a4231": "63a690", "7b5a4a": "97d9c3", @@ -9,7 +8,6 @@ "42528c": "656273" }, "2": { - "000000": "000000", "3a2119": "292933", "5a4231": "515266", "7b5a4a": "979bb3", diff --git a/public/images/pokemon/variant/back/525.json b/public/images/pokemon/variant/back/525.json index da6fd7b6282..84258c85efb 100644 --- a/public/images/pokemon/variant/back/525.json +++ b/public/images/pokemon/variant/back/525.json @@ -3,7 +3,6 @@ "21293a": "292538", "293a6b": "464558", "42528c": "656273", - "101010": "101010", "733121": "0c3b37", "ff6b52": "bcf1a6", "ce4a3a": "50cd61", @@ -13,7 +12,6 @@ "21293a": "584245", "293a6b": "9b7570", "42528c": "cdac94", - "101010": "101010", "733121": "733120", "ff6b52": "eeb570", "ce4a3a": "dc6c44", diff --git a/public/images/pokemon/variant/back/526.json b/public/images/pokemon/variant/back/526.json index f6cf26e75fc..b17f2ef7785 100644 --- a/public/images/pokemon/variant/back/526.json +++ b/public/images/pokemon/variant/back/526.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "e63131": "50cd61", "6b2121": "0c3b37", "9c3131": "0d6d58", @@ -13,7 +12,6 @@ "848484": "afc1c8" }, "2": { - "000000": "000000", "e63131": "dc6c44", "6b2121": "733120", "9c3131": "a7323b", diff --git a/public/images/pokemon/variant/back/53.json b/public/images/pokemon/variant/back/53.json index 2a3d338fccf..2f890cc3492 100644 --- a/public/images/pokemon/variant/back/53.json +++ b/public/images/pokemon/variant/back/53.json @@ -1,20 +1,17 @@ { "0": { - "101010": "101010", "845200": "5b4a3b", "deb56b": "c7b497", "ffe684": "ece3c7", "b58429": "816f5c" }, "1": { - "101010": "101010", "845200": "431a0e", "deb56b": "8d6038", "ffe684": "c39564", "b58429": "552e15" }, "2": { - "101010": "101010", "845200": "241d18", "deb56b": "322d28", "ffe684": "524f4a", diff --git a/public/images/pokemon/variant/back/530.json b/public/images/pokemon/variant/back/530.json index 1f1d90459d0..2e70eff1305 100644 --- a/public/images/pokemon/variant/back/530.json +++ b/public/images/pokemon/variant/back/530.json @@ -1,15 +1,12 @@ { "1": { "636363": "564964", - "101010": "101010", "d6d6d6": "f7eaec", "a5a5a5": "cab3d8", "423129": "954a29", - "292119": "292119", "5a4a42": "d1884d", "bd4242": "d7f55c", "844242": "88ca4c", - "ffffff": "ffffff", "ce736b": "d35f9e", "ef847b": "ff8be8", "842931": "438c43" diff --git a/public/images/pokemon/variant/back/531-mega.json b/public/images/pokemon/variant/back/531-mega.json index f78a2d37074..1436a7c609d 100644 --- a/public/images/pokemon/variant/back/531-mega.json +++ b/public/images/pokemon/variant/back/531-mega.json @@ -2,7 +2,6 @@ "1": { "80734d": "7c4b3b", "ffecb2": "fff6f0", - "101010": "101010", "ccb87a": "d6bfb4", "b35968": "b64231", "ffbfca": "f5a779", @@ -13,7 +12,6 @@ "2": { "80734d": "09232a", "ffecb2": "4bb9a6", - "101010": "101010", "ccb87a": "29878f", "b35968": "a0602f", "ffbfca": "f6e3a8", diff --git a/public/images/pokemon/variant/back/531.json b/public/images/pokemon/variant/back/531.json index 8a96bebb946..6f430465129 100644 --- a/public/images/pokemon/variant/back/531.json +++ b/public/images/pokemon/variant/back/531.json @@ -1,11 +1,9 @@ { "1": { - "734a4a": "734a4a", "ce6b73": "cc6348", "de8c94": "f5a779", "6b634a": "a86d57", "ceb584": "d6bfb4", - "101010": "101010", "f7e6ad": "fff6f0", "a58c63": "7c4b3b", "63636b": "782b3e", @@ -18,7 +16,6 @@ "de8c94": "f6e3a8", "6b634a": "09232a", "ceb584": "29878f", - "101010": "101010", "f7e6ad": "4bb9a6", "a58c63": "164d54", "63636b": "1a2135", diff --git a/public/images/pokemon/variant/back/532.json b/public/images/pokemon/variant/back/532.json index c0c68638f47..3befad7c830 100644 --- a/public/images/pokemon/variant/back/532.json +++ b/public/images/pokemon/variant/back/532.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "7b5208": "663326", "5a3a08": "4c1d14", "ad7308": "954734", @@ -10,13 +9,10 @@ "843142": "3a3931", "c55a73": "545148", "ef7b8c": "6c6958", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", "6b3a31": "5c3b64", "94635a": "814981" }, "2": { - "101010": "101010", "7b5208": "825536", "5a3a08": "6f4b33", "ad7308": "b3774d", @@ -26,8 +22,6 @@ "843142": "201f36", "c55a73": "2f2b42", "ef7b8c": "504f66", - "c5c5c5": "c5c5c5", - "ffffff": "ffffff", "6b3a31": "958d71", "94635a": "b5b18f" } diff --git a/public/images/pokemon/variant/back/533.json b/public/images/pokemon/variant/back/533.json index 7b7b707019b..bf227a13f05 100644 --- a/public/images/pokemon/variant/back/533.json +++ b/public/images/pokemon/variant/back/533.json @@ -3,7 +3,6 @@ "631931": "363d48", "bd3a4a": "707885", "84293a": "666b72", - "101010": "101010", "9c8c84": "3b8177", "5a3a42": "1d4c3c", "c5bdad": "569d84", @@ -15,7 +14,6 @@ "631931": "363d48", "bd3a4a": "acc2d7", "84293a": "6e869f", - "101010": "101010", "9c8c84": "6e6685", "5a3a42": "3c3946", "c5bdad": "9a8cad", diff --git a/public/images/pokemon/variant/back/534.json b/public/images/pokemon/variant/back/534.json index 508f107c3f5..7dda8ce3a11 100644 --- a/public/images/pokemon/variant/back/534.json +++ b/public/images/pokemon/variant/back/534.json @@ -3,7 +3,6 @@ "8c6b5a": "17524f", "5a3a21": "0d382d", "c59c73": "2a726e", - "101010": "101010", "3a3a31": "6e7878", "6b6b63": "94a6a9", "8c8c84": "becfd1", @@ -15,7 +14,6 @@ "8c6b5a": "68797a", "5a3a21": "505252", "c59c73": "90aba8", - "101010": "101010", "3a3a31": "5c5830", "6b6b63": "a78f4c", "8c8c84": "e3c682", diff --git a/public/images/pokemon/variant/back/540.json b/public/images/pokemon/variant/back/540.json index 8c61ece684a..5f2e3f94dad 100644 --- a/public/images/pokemon/variant/back/540.json +++ b/public/images/pokemon/variant/back/540.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "3a6319": "7b4a5a", "5a9c31": "b56b7b", "94ce08": "ef949c", @@ -10,7 +9,6 @@ "e68408": "69473c" }, "2": { - "000000": "000000", "3a6319": "051d69", "5a9c31": "15328e", "94ce08": "1e57cc", diff --git a/public/images/pokemon/variant/back/541.json b/public/images/pokemon/variant/back/541.json index c0f2d6d2074..d4bdd357130 100644 --- a/public/images/pokemon/variant/back/541.json +++ b/public/images/pokemon/variant/back/541.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "94ce08": "ef949c", "3a6319": "7b4a5a", "5a9c31": "b56b7b", @@ -9,7 +8,6 @@ "299c52": "ac6675" }, "2": { - "000000": "000000", "94ce08": "1152d8", "3a6319": "051d69", "5a9c31": "1339b8", diff --git a/public/images/pokemon/variant/back/542.json b/public/images/pokemon/variant/back/542.json index 5fd6526edf2..e1b21a7f68d 100644 --- a/public/images/pokemon/variant/back/542.json +++ b/public/images/pokemon/variant/back/542.json @@ -1,7 +1,6 @@ { "1": { "8c7b10": "573728", - "000000": "000000", "fff721": "967768", "426331": "7b4a5a", "7bce08": "ef949c", @@ -13,7 +12,6 @@ }, "2": { "8c7b10": "7b6053", - "000000": "000000", "fff721": "ffffff", "426331": "172371", "7bce08": "1e57cc", diff --git a/public/images/pokemon/variant/back/543.json b/public/images/pokemon/variant/back/543.json index 5100aa499c9..4e6f1855627 100644 --- a/public/images/pokemon/variant/back/543.json +++ b/public/images/pokemon/variant/back/543.json @@ -15,7 +15,6 @@ "efb508": "7ab7e6" }, "2": { - "101010": "101010", "632131": "6d5332", "bd3152": "d3c9ae", "940042": "968167", diff --git a/public/images/pokemon/variant/back/544.json b/public/images/pokemon/variant/back/544.json index 5d02ae2b196..68577d8cdaf 100644 --- a/public/images/pokemon/variant/back/544.json +++ b/public/images/pokemon/variant/back/544.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "5a4a63": "0a3939", "ad94c5": "238071", "84739c": "135c56", @@ -16,7 +15,6 @@ "ffff00": "7ab7e6" }, "2": { - "000000": "000000", "5a4a63": "452e23", "ad94c5": "a67645", "84739c": "764f2d", diff --git a/public/images/pokemon/variant/back/545.json b/public/images/pokemon/variant/back/545.json index c1e2a523206..46c7dcdc6a0 100644 --- a/public/images/pokemon/variant/back/545.json +++ b/public/images/pokemon/variant/back/545.json @@ -2,7 +2,6 @@ "1": { "631010": "0b4a45", "c5195a": "238071", - "101010": "101010", "6b216b": "831774", "8c3a9c": "a63c9f", "9c1042": "135c56", @@ -16,7 +15,6 @@ "2": { "631010": "8f795c", "c5195a": "dddaaf", - "101010": "101010", "6b216b": "b37830", "8c3a9c": "d7b444", "9c1042": "bdaf8a", diff --git a/public/images/pokemon/variant/back/546.json b/public/images/pokemon/variant/back/546.json index 9c45ddf2bd1..231b1f32e88 100644 --- a/public/images/pokemon/variant/back/546.json +++ b/public/images/pokemon/variant/back/546.json @@ -5,7 +5,6 @@ "dee6c5": "e4b397", "4a5a52": "663023", "194a19": "4c2f6e", - "101010": "101010", "52a54a": "c690da", "427b42": "9d62bc", "ffffff": "f2d2cb", @@ -17,7 +16,6 @@ "dee6c5": "bf7c6a", "4a5a52": "5c1e1f", "194a19": "2e6450", - "101010": "101010", "52a54a": "70be90", "427b42": "559c7a", "ffffff": "f7dbd1", diff --git a/public/images/pokemon/variant/back/547.json b/public/images/pokemon/variant/back/547.json index 44fb5bb86da..3ccf3c6ff74 100644 --- a/public/images/pokemon/variant/back/547.json +++ b/public/images/pokemon/variant/back/547.json @@ -3,24 +3,20 @@ "ad945a": "914e3a", "6b5a42": "663023", "e6dece": "dda585", - "101010": "101010", "c5b58c": "b77153", "194a19": "422258", "427b42": "8750a3", "52a54a": "b07cc3", - "523a29": "523a29", "735242": "693535" }, "2": { "ad945a": "4b1918", "6b5a42": "360e10", "e6dece": "a86250", - "101010": "101010", "c5b58c": "70322b", "194a19": "1c523e", "427b42": "428565", "52a54a": "5bab7c", - "523a29": "523a29", "735242": "d79057" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/548.json b/public/images/pokemon/variant/back/548.json index 9dc8f3e868a..93e7e42c1e7 100644 --- a/public/images/pokemon/variant/back/548.json +++ b/public/images/pokemon/variant/back/548.json @@ -2,7 +2,6 @@ "0": { "315a31": "31425a", "3aad3a": "76bfc7", - "101010": "101010", "3a844a": "307489", "9cbd4a": "a3b02e", "637b31": "646412", @@ -12,7 +11,6 @@ "1": { "315a31": "731629", "3aad3a": "ef5755", - "101010": "101010", "3a844a": "bd2d40", "9cbd4a": "8e954d", "637b31": "4e4e25", @@ -22,7 +20,6 @@ "2": { "315a31": "351c49", "3aad3a": "8d57a4", - "101010": "101010", "3a844a": "663982", "9cbd4a": "9f802c", "637b31": "5c4510", diff --git a/public/images/pokemon/variant/back/549.json b/public/images/pokemon/variant/back/549.json index bb81411e8d7..5f2bda23099 100644 --- a/public/images/pokemon/variant/back/549.json +++ b/public/images/pokemon/variant/back/549.json @@ -1,13 +1,11 @@ { "1": { "734221": "09445f", - "101010": "101010", "bd633a": "228ac5", "ffb59c": "78e6f7", "ff6b3a": "54c5eb", "bda552": "77909a", "ffde42": "b6c7cc", - "ffffff": "ffffff", "315a31": "80152b", "4a844a": "bd2d40", "3aad3a": "ef5755", @@ -17,13 +15,11 @@ }, "2": { "734221": "540f26", - "101010": "101010", "bd633a": "a62540", "ffb59c": "fe8e95", "ff6b3a": "de6475", "bda552": "d1b18c", "ffde42": "efddc1", - "ffffff": "ffffff", "315a31": "351c49", "4a844a": "5d3576", "3aad3a": "834c9b", diff --git a/public/images/pokemon/variant/back/551.json b/public/images/pokemon/variant/back/551.json index b173b167f9c..a5eb436667b 100644 --- a/public/images/pokemon/variant/back/551.json +++ b/public/images/pokemon/variant/back/551.json @@ -2,7 +2,6 @@ "1": { "523a10": "27172f", "c59c5a": "d8693a", - "101010": "101010", "8c7331": "b83b28", "42424a": "343958", "212121": "262347", @@ -12,7 +11,6 @@ "2": { "523a10": "1c2231", "c59c5a": "8688a0", - "101010": "101010", "8c7331": "646781", "42424a": "301f40", "212121": "290c2a", diff --git a/public/images/pokemon/variant/back/552.json b/public/images/pokemon/variant/back/552.json index 3b0bed5f6b6..8a4eec1e19f 100644 --- a/public/images/pokemon/variant/back/552.json +++ b/public/images/pokemon/variant/back/552.json @@ -5,7 +5,6 @@ "c59c5a": "d8693a", "523a10": "261d35", "191921": "232044", - "101010": "101010", "292931": "343958", "ffffff": "ebce81", "c5c5c5": "b37941", @@ -19,7 +18,6 @@ "c59c5a": "646781", "523a10": "161b23", "191921": "281842", - "101010": "101010", "292931": "412853", "ffffff": "90a0a7", "c5c5c5": "5b6d75", diff --git a/public/images/pokemon/variant/back/553.json b/public/images/pokemon/variant/back/553.json index aa8ea69e2ad..9769ce870d7 100644 --- a/public/images/pokemon/variant/back/553.json +++ b/public/images/pokemon/variant/back/553.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "8c3142": "164954", "212129": "192540", "c55252": "1b7871", @@ -12,7 +11,6 @@ "ffffff": "ffefa7" }, "2": { - "101010": "101010", "8c3142": "8b93a5", "212129": "58265a", "c55252": "c5cbd0", diff --git a/public/images/pokemon/variant/back/556.json b/public/images/pokemon/variant/back/556.json index 3863d4bda29..59655d106a0 100644 --- a/public/images/pokemon/variant/back/556.json +++ b/public/images/pokemon/variant/back/556.json @@ -4,7 +4,6 @@ "e66ba5": "aad7ec", "ce4a8c": "95bcdb", "8c1957": "454792", - "101010": "101010", "b59c10": "d66430", "ffd600": "ff9b3b", "429c4a": "acd2d3", @@ -20,7 +19,6 @@ "e66ba5": "ffcadc", "ce4a8c": "eea9be", "8c1957": "b06ea0", - "101010": "101010", "b59c10": "e0be7a", "ffd600": "fff1ac", "429c4a": "971746", diff --git a/public/images/pokemon/variant/back/559.json b/public/images/pokemon/variant/back/559.json index 1fd00baef27..df54688b898 100644 --- a/public/images/pokemon/variant/back/559.json +++ b/public/images/pokemon/variant/back/559.json @@ -3,14 +3,9 @@ "732129": "64195b", "b52931": "c855a9", "e63a42": "e18abd", - "212121": "212121", "7b6308": "66470e", "ffce00": "d7c475", "bd9c00": "8a7127", - "424242": "424242", - "adada5": "adada5", - "ffffff": "ffffff", - "63635a": "63635a", "7b7352": "5f533d", "c5bd84": "c7bea5", "fff7b5": "ecead9" @@ -19,32 +14,16 @@ "732129": "251c34", "b52931": "4f4967", "e63a42": "82809f", - "212121": "212121", "7b6308": "8b8352", "ffce00": "fffcdd", - "bd9c00": "bdbc82", - "424242": "424242", - "adada5": "adada5", - "ffffff": "ffffff", - "63635a": "63635a", - "7b7352": "7b7352", - "c5bd84": "c5bd84", - "fff7b5": "fff7b5" + "bd9c00": "bdbc82" }, "2": { "732129": "17541a", "b52931": "2d852b", "e63a42": "7cce68", - "212121": "212121", "7b6308": "6f9d3d", "ffce00": "e5ff87", - "bd9c00": "98c053", - "424242": "424242", - "adada5": "adada5", - "ffffff": "ffffff", - "63635a": "63635a", - "7b7352": "7b7352", - "c5bd84": "c5bd84", - "fff7b5": "fff7b5" + "bd9c00": "98c053" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/56.json b/public/images/pokemon/variant/back/56.json index adede31e531..aa8740928c6 100644 --- a/public/images/pokemon/variant/back/56.json +++ b/public/images/pokemon/variant/back/56.json @@ -5,7 +5,6 @@ "734200": "476983", "ffc584": "98b5cb", "fff7ce": "c8bfe3", - "101010": "101010", "d6ad9c": "867ba4", "f7deb5": "ada2cd", "dea573": "7b96ab" @@ -16,7 +15,6 @@ "734200": "302927", "ffc584": "5b5757", "fff7ce": "f9e9bd", - "101010": "101010", "d6ad9c": "d2a357", "f7deb5": "ddbf6b", "dea573": "4c4442" @@ -27,7 +25,6 @@ "734200": "212a20", "ffc584": "678674", "fff7ce": "ee5d26", - "101010": "101010", "d6ad9c": "a72510", "f7deb5": "cf361c", "dea573": "5d6962" diff --git a/public/images/pokemon/variant/back/560.json b/public/images/pokemon/variant/back/560.json index bf75cf1eed2..f94cac1b56b 100644 --- a/public/images/pokemon/variant/back/560.json +++ b/public/images/pokemon/variant/back/560.json @@ -1,47 +1,29 @@ { "0": { - "212121": "212121", "7b3a29": "5f533d", "de293a": "b1578c", "f77b21": "d9d7bf", "c55a19": "aea489", - "4a4a4a": "4a4a4a", - "949494": "949494", - "ffffff": "ffffff", - "bdbdbd": "bdbdbd", - "636363": "636363", "6b5229": "66470e", "f7ce10": "d7c475", "b59419": "8f7939", "e66373": "e18abd" }, "1": { - "212121": "212121", "7b3a29": "251c34", "de293a": "4f4967", "f77b21": "c3b889", "c55a19": "988658", - "4a4a4a": "4a4a4a", - "949494": "949494", - "ffffff": "ffffff", - "bdbdbd": "bdbdbd", - "636363": "636363", "6b5229": "8b8352", "f7ce10": "fffcdd", "b59419": "bdbc82", "e66373": "82809f" }, "2": { - "212121": "212121", "7b3a29": "24360d", "de293a": "3f5d3e", "f77b21": "fff7b5", "c55a19": "c5bd84", - "4a4a4a": "4a4a4a", - "949494": "949494", - "ffffff": "ffffff", - "bdbdbd": "bdbdbd", - "636363": "636363", "6b5229": "627f2e", "f7ce10": "d8f769", "b59419": "a8c458", diff --git a/public/images/pokemon/variant/back/562.json b/public/images/pokemon/variant/back/562.json index 2b3efcc8f2c..b551e133f8e 100644 --- a/public/images/pokemon/variant/back/562.json +++ b/public/images/pokemon/variant/back/562.json @@ -2,27 +2,22 @@ "1": { "313131": "741136", "525252": "a63051", - "101010": "101010", "ad0000": "4fe0b6", "ff0000": "a0f7ff", - "5a0000": "5a0000", "ce8410": "90493f", "f7ad29": "ae6a5d", "8c5a21": "551f1d", - "ffde7b": "d29887", - "dedede": "dedede" + "ffde7b": "d29887" }, "2": { "313131": "2a895c", "525252": "49bc7a", - "101010": "101010", "ad0000": "b48bb5", "ff0000": "dbbdcf", "5a0000": "955b85", "ce8410": "a6935a", "f7ad29": "d9e878", "8c5a21": "64471e", - "ffde7b": "e4f49e", - "dedede": "dedede" + "ffde7b": "e4f49e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/563.json b/public/images/pokemon/variant/back/563.json index 022c7bb0c47..10a57779fa1 100644 --- a/public/images/pokemon/variant/back/563.json +++ b/public/images/pokemon/variant/back/563.json @@ -1,7 +1,6 @@ { "1": { "3a3a42": "a40e38", - "101010": "101010", "294a4a": "101838", "3194ad": "38478c", "216b7b": "242b71", @@ -12,7 +11,6 @@ }, "2": { "3a3a42": "3ce483", - "101010": "101010", "294a4a": "591105", "3194ad": "e03241", "216b7b": "81280f", diff --git a/public/images/pokemon/variant/back/568.json b/public/images/pokemon/variant/back/568.json index 6fb163ce912..17d826caed0 100644 --- a/public/images/pokemon/variant/back/568.json +++ b/public/images/pokemon/variant/back/568.json @@ -2,7 +2,6 @@ "1": { "296b4a": "6b3873", "4a8c6b": "a35fa3", - "000000": "000000", "103121": "170829", "194a31": "412157", "736352": "162632", @@ -15,7 +14,6 @@ "2": { "296b4a": "773835", "4a8c6b": "b37664", - "000000": "000000", "103121": "411513", "194a31": "59221f", "736352": "d3b492", diff --git a/public/images/pokemon/variant/back/569-gigantamax.json b/public/images/pokemon/variant/back/569-gigantamax.json index 2c3ec4a6446..3bd15935f15 100644 --- a/public/images/pokemon/variant/back/569-gigantamax.json +++ b/public/images/pokemon/variant/back/569-gigantamax.json @@ -3,7 +3,6 @@ "7b6a5a": "162632", "5a4a41": "101829", "a48b73": "273947", - "010101": "010101", "7d8991": "4c6177", "bdbdbd": "8c9bad", "00acd5": "adf083", @@ -21,7 +20,6 @@ "7b6a5a": "d3b492", "5a4a41": "96684c", "a48b73": "f4eccf", - "010101": "010101", "7d8991": "9d5038", "bdbdbd": "da975a", "00acd5": "d5435c", @@ -29,7 +27,6 @@ "184a31": "59221f", "296a4a": "773835", "e6da00": "55383c", - "bc9540": "bc9540", "6bdc27": "f285b9", "febca4": "9b2b4e", "7a5a62": "67152f", diff --git a/public/images/pokemon/variant/back/569.json b/public/images/pokemon/variant/back/569.json index b61cffe9075..f56a152edbd 100644 --- a/public/images/pokemon/variant/back/569.json +++ b/public/images/pokemon/variant/back/569.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "5a4a42": "101829", "7b6b5a": "162632", "a58c73": "273947", @@ -14,7 +13,6 @@ "ef52a5": "adf083" }, "2": { - "000000": "000000", "5a4a42": "9d7862", "7b6b5a": "d3b492", "a58c73": "f4eccf", diff --git a/public/images/pokemon/variant/back/57.json b/public/images/pokemon/variant/back/57.json index dcd82aa40da..5e14ec78953 100644 --- a/public/images/pokemon/variant/back/57.json +++ b/public/images/pokemon/variant/back/57.json @@ -2,20 +2,15 @@ "0": { "634a21": "41306b", "9c6b6b": "476983", - "000000": "000000", "ffe6b5": "ada2cd", "ffffd6": "c8bfe3", "e6bd9c": "867ba4", "5a3100": "233a4c", "ce8c5a": "5c798f", - "e6b58c": "98b5cb", - "424242": "424242", - "7b7b7b": "7b7b7b" + "e6b58c": "98b5cb" }, "1": { - "634a21": "634a21", "9c6b6b": "3a302e", - "000000": "000000", "ffe6b5": "ddbf6b", "ffffd6": "f9e9bd", "e6bd9c": "d2a357", @@ -28,7 +23,6 @@ "2": { "634a21": "802819", "9c6b6b": "313930", - "000000": "000000", "ffe6b5": "cf361c", "ffffd6": "ee5d26", "e6bd9c": "a72510", diff --git a/public/images/pokemon/variant/back/570.json b/public/images/pokemon/variant/back/570.json index db0ddc9ae8d..6573e762e21 100644 --- a/public/images/pokemon/variant/back/570.json +++ b/public/images/pokemon/variant/back/570.json @@ -2,7 +2,6 @@ "1": { "6b213a": "4f025a", "ad1042": "c359e6", - "101010": "101010", "424252": "2f375a", "5a5a73": "475378", "212131": "1b1b47", @@ -12,7 +11,6 @@ "2": { "6b213a": "006867", "ad1042": "01d5bb", - "101010": "101010", "424252": "746a98", "5a5a73": "a1a1c0", "212131": "163956", diff --git a/public/images/pokemon/variant/back/571.json b/public/images/pokemon/variant/back/571.json index 5f18c3b6e51..a427a010eb6 100644 --- a/public/images/pokemon/variant/back/571.json +++ b/public/images/pokemon/variant/back/571.json @@ -1,19 +1,14 @@ { "1": { - "101010": "101010", "293142": "283766", "212131": "0a133f", "4a1029": "540548", "7b2942": "8e2270", "ad1042": "cc2f94", "4a4a52": "2d2b43", - "63636b": "4e4664", - "cecece": "cecece", - "318484": "318484", - "19b5b5": "19b5b5" + "63636b": "4e4664" }, "2": { - "101010": "101010", "293142": "283766", "212131": "121b47", "4a1029": "061a3e", @@ -21,7 +16,6 @@ "ad1042": "2f8cdb", "4a4a52": "5e5277", "63636b": "938aae", - "cecece": "cecece", "318484": "7e248c", "19b5b5": "9c58ca" } diff --git a/public/images/pokemon/variant/back/577.json b/public/images/pokemon/variant/back/577.json index d31bf54a381..b87f61ec984 100644 --- a/public/images/pokemon/variant/back/577.json +++ b/public/images/pokemon/variant/back/577.json @@ -8,7 +8,6 @@ "e6de73": "afdfce", "5a845a": "5e2c58", "6b6329": "597070", - "101010": "101010", "cee6bd": "ebc7d9", "316342": "442e7a", "9cad8c": "975b88", @@ -23,7 +22,6 @@ "e6de73": "9d65b1", "5a845a": "961d3c", "6b6329": "522849", - "101010": "101010", "cee6bd": "dfab9f", "316342": "3b031b", "9cad8c": "b86d6a", @@ -33,12 +31,10 @@ "428c5a": "a968a4", "5ab57b": "ce8ec2", "94e6ad": "f7c6e5", - "ffffff": "ffffff", "a59c31": "5ab3a2", "e6de73": "74d6b3", "5a845a": "ba7066", "6b6329": "3e8c82", - "101010": "101010", "cee6bd": "f0c9ba", "316342": "713c85", "9cad8c": "ba7066", diff --git a/public/images/pokemon/variant/back/578.json b/public/images/pokemon/variant/back/578.json index b1a55c50158..d3e934cfd8d 100644 --- a/public/images/pokemon/variant/back/578.json +++ b/public/images/pokemon/variant/back/578.json @@ -6,7 +6,6 @@ "637b63": "834783", "c5deb5": "ebc7e1", "9cbd8c": "9b65ac", - "101010": "101010", "84dea5": "c3b8f1", "e6ffde": "ffffff" }, @@ -17,7 +16,6 @@ "637b63": "862f2d", "c5deb5": "d69289", "9cbd8c": "b0605c", - "101010": "101010", "84dea5": "ee8c91", "e6ffde": "fff3f3" }, @@ -28,7 +26,6 @@ "637b63": "ba7066", "c5deb5": "f0c9ba", "9cbd8c": "d69887", - "101010": "101010", "84dea5": "d080b8", "e6ffde": "ffffff" } diff --git a/public/images/pokemon/variant/back/579.json b/public/images/pokemon/variant/back/579.json index 2b7c7cadec0..73e43af4a1d 100644 --- a/public/images/pokemon/variant/back/579.json +++ b/public/images/pokemon/variant/back/579.json @@ -6,7 +6,6 @@ "4a8c63": "40516c", "d6efc5": "bfdadd", "9cbd8c": "7f9fb5", - "101010": "101010", "de6363": "7bfff7", "a55252": "4aad8c", "c5a563": "63b519", @@ -19,7 +18,6 @@ "4a8c63": "862f2d", "d6efc5": "d69289", "9cbd8c": "b0605c", - "101010": "101010", "de6363": "e39744", "a55252": "bb6620", "c5a563": "844386", @@ -32,7 +30,6 @@ "4a8c63": "9d4e4c", "d6efc5": "e8baac", "9cbd8c": "c5887f", - "101010": "101010", "de6363": "74d6b3", "a55252": "5ab3a2", "c5a563": "6d648a", diff --git a/public/images/pokemon/variant/back/585-summer.json b/public/images/pokemon/variant/back/585-summer.json index 40e37014b60..6942da9df8d 100644 --- a/public/images/pokemon/variant/back/585-summer.json +++ b/public/images/pokemon/variant/back/585-summer.json @@ -2,14 +2,12 @@ "0": { "315231": "314a29", "317b42": "416a39", - "000000": "000000", "42b542": "4a8b4a", "ce9c08": "d89ca6", "7b5210": "c16b7d", "ffde52": "ffffff", "bda58c": "d89ca6", "9c7b5a": "c16b7d", - "ffffff": "ffffff", "f7efc5": "ffd5f6", "524219": "783046", "313131": "783046", diff --git a/public/images/pokemon/variant/back/586-autumn.json b/public/images/pokemon/variant/back/586-autumn.json index deda6a5097b..fea1b869102 100644 --- a/public/images/pokemon/variant/back/586-autumn.json +++ b/public/images/pokemon/variant/back/586-autumn.json @@ -1,17 +1,10 @@ { "0": { - "000000": "000000", - "bd3a3a": "bd3a3a", - "842131": "842131", - "5a1919": "5a1919", - "4a0808": "4a0808", "7b5231": "d98997", "422110": "9d4f62", "633121": "c66479", "de8c29": "ffecfb", - "dedede": "dedede", "a57b4a": "e1b2d7", - "311010": "311010", "dec56b": "ffd5f6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/586-spring.json b/public/images/pokemon/variant/back/586-spring.json index 064a1ddecef..0b060156d33 100644 --- a/public/images/pokemon/variant/back/586-spring.json +++ b/public/images/pokemon/variant/back/586-spring.json @@ -1,11 +1,9 @@ { "0": { "311010": "2a1418", - "000000": "000000", "731931": "5e263e", "4a1008": "7f334a", "633a21": "c66479", - "ff739c": "ff739c", "ce4263": "c66479", "dec56b": "ffd5f6", "422119": "9d4f62", diff --git a/public/images/pokemon/variant/back/586-summer.json b/public/images/pokemon/variant/back/586-summer.json index 6481eb33cad..daafade5616 100644 --- a/public/images/pokemon/variant/back/586-summer.json +++ b/public/images/pokemon/variant/back/586-summer.json @@ -1,6 +1,5 @@ { "0": { - "000000": "000000", "193a29": "314a29", "195a31": "416a39", "088c42": "4a8b4a", @@ -9,9 +8,7 @@ "422119": "9d4f62", "633a21": "c66479", "de9429": "ffecfb", - "dedede": "dedede", "a57b4a": "e1b2d7", - "311010": "311010", "dec56b": "ffd5f6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/586-winter.json b/public/images/pokemon/variant/back/586-winter.json index 630c958cd11..6a9c9ed7400 100644 --- a/public/images/pokemon/variant/back/586-winter.json +++ b/public/images/pokemon/variant/back/586-winter.json @@ -1,7 +1,6 @@ { "0": { "424a42": "99648f", - "000000": "000000", "ffffff": "ffd5f6", "6b6b6b": "b184a8", "adadad": "e1b2d7", @@ -11,8 +10,6 @@ "422119": "9d4f62", "7b5a31": "d98997", "de9429": "ffecfb", - "dedede": "dedede", - "a57b4a": "e1b2d7", - "311010": "311010" + "a57b4a": "e1b2d7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/592.json b/public/images/pokemon/variant/back/592.json index 802e143bd11..06e3c8618dc 100644 --- a/public/images/pokemon/variant/back/592.json +++ b/public/images/pokemon/variant/back/592.json @@ -1,11 +1,9 @@ { "1": { "3a5a6b": "933b94", - "101010": "101010", "d6e6ff": "fee8ff", "5aa5c5": "c35ec7", "b5c5e6": "e3b8ec", - "84d6ff": "ef94eb", - "ffffff": "ffffff" + "84d6ff": "ef94eb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/593.json b/public/images/pokemon/variant/back/593.json index f37daf8990c..a346624cdd2 100644 --- a/public/images/pokemon/variant/back/593.json +++ b/public/images/pokemon/variant/back/593.json @@ -2,7 +2,6 @@ "1": { "213a6b": "6a236f", "d6e6ff": "fee8ff", - "101010": "101010", "9cadd6": "e3b8ec", "29529c": "6a236f", "3a84ce": "c35ec7", @@ -11,7 +10,6 @@ "2": { "213a6b": "6e1b12", "d6e6ff": "ec7542", - "101010": "101010", "9cadd6": "d24d25", "29529c": "8e2b16", "3a84ce": "cb7048", diff --git a/public/images/pokemon/variant/back/594.json b/public/images/pokemon/variant/back/594.json index 22beae73c5e..d4f3186772a 100644 --- a/public/images/pokemon/variant/back/594.json +++ b/public/images/pokemon/variant/back/594.json @@ -6,11 +6,9 @@ "ff8cad": "f5a454", "f77384": "e37830", "633a42": "882915", - "000000": "000000", "e68c9c": "d68147", "005263": "681f16", "002931": "310000", - "9c8c10": "a74c8e", - "ffffff": "ffffff" + "9c8c10": "a74c8e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/595.json b/public/images/pokemon/variant/back/595.json index d5d387fb681..2d44343dcf5 100644 --- a/public/images/pokemon/variant/back/595.json +++ b/public/images/pokemon/variant/back/595.json @@ -1,7 +1,6 @@ { "1": { "735208": "583e28", - "101010": "101010", "cead08": "b57353", "f7de42": "e9ae7e", "a58408": "955d41", @@ -11,7 +10,6 @@ }, "2": { "735208": "46494d", - "101010": "101010", "cead08": "7b828b", "f7de42": "aab3bf", "a58408": "575b62", diff --git a/public/images/pokemon/variant/back/596.json b/public/images/pokemon/variant/back/596.json index 13a45eefaf2..26b9b446cad 100644 --- a/public/images/pokemon/variant/back/596.json +++ b/public/images/pokemon/variant/back/596.json @@ -1,7 +1,6 @@ { "1": { "192942": "3f210d", - "101010": "101010", "3a52b5": "7c4620", "3a3a42": "684529", "293a7b": "5e341a", @@ -14,9 +13,7 @@ }, "2": { "192942": "a1400e", - "101010": "101010", "3a52b5": "ff8e1e", - "3a3a42": "3a3a42", "293a7b": "d1630f", "ffde52": "aab3bf", "9c8419": "575b62", diff --git a/public/images/pokemon/variant/back/6-gigantamax.json b/public/images/pokemon/variant/back/6-gigantamax.json index 2cb22a53810..9e871aa6eba 100644 --- a/public/images/pokemon/variant/back/6-gigantamax.json +++ b/public/images/pokemon/variant/back/6-gigantamax.json @@ -7,7 +7,6 @@ "ef8429": "b77cb2", "fcfcfc": "eafff4", "ce5242": "9052af", - "101010": "101010", "ffe877": "adffcc", "efb55a": "d8a3e2", "ff0000": "3d30cc", diff --git a/public/images/pokemon/variant/back/6-mega-x.json b/public/images/pokemon/variant/back/6-mega-x.json index 7e281e5d094..f59aa1b4e5f 100644 --- a/public/images/pokemon/variant/back/6-mega-x.json +++ b/public/images/pokemon/variant/back/6-mega-x.json @@ -1,7 +1,6 @@ { "1": { "1f1f1f": "08225e", - "080808": "080808", "5a5a5a": "317396", "383838": "163d82", "009de1": "3da542", @@ -9,7 +8,6 @@ "99d9f7": "e6ffcc", "60a6c8": "82d179", "00b1e6": "af66ff", - "2b629c": "7341a6", - "f8f8f8": "f8f8f8" + "2b629c": "7341a6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/6-mega-y.json b/public/images/pokemon/variant/back/6-mega-y.json index 1780f6949e1..d06bb6fffa2 100644 --- a/public/images/pokemon/variant/back/6-mega-y.json +++ b/public/images/pokemon/variant/back/6-mega-y.json @@ -3,16 +3,11 @@ "e64210": "5033ce", "f7a510": "9e59db", "833118": "552982", - "000000": "000000", "ee8329": "b27cbc", "ffd610": "e9bfff", "cd5241": "8053b2", "eeb45a": "d8a3e2", - "cdcdcd": "cdcdcd", "eede7b": "fae5ff", - "f2f2f2": "f2f2f2", - "217394": "41a86e", - "ffffff": "ffffff", - "636363": "636363" + "217394": "41a86e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/602.json b/public/images/pokemon/variant/back/602.json index ff5e607f300..595a98661a7 100644 --- a/public/images/pokemon/variant/back/602.json +++ b/public/images/pokemon/variant/back/602.json @@ -4,7 +4,6 @@ "b5bdce": "9d65ad", "cedee6": "b291d6", "efffff": "e8ddff", - "191921": "191921", "9ca5b5": "6b357a", "ffe67b": "55b5d6", "ffd600": "3d8cbd", @@ -15,7 +14,6 @@ "b5bdce": "62a89e", "cedee6": "8ecbaf", "efffff": "c7f0d5", - "191921": "191921", "9ca5b5": "315775", "ffe67b": "9a2957", "ffd600": "771a32", diff --git a/public/images/pokemon/variant/back/603.json b/public/images/pokemon/variant/back/603.json index e4e8fb70d58..b59b6ea69e2 100644 --- a/public/images/pokemon/variant/back/603.json +++ b/public/images/pokemon/variant/back/603.json @@ -3,7 +3,6 @@ "847342": "4f8194", "efdea5": "b9f1d3", "c5ad7b": "8dd8d0", - "191921": "191921", "103a4a": "884993", "215a63": "957bd0", "de7352": "8c1a6a", @@ -11,14 +10,12 @@ "b54a29": "610c53", "deb500": "d89d77", "ffd600": "f7e1a6", - "ffffff": "ffffff", "949c4a": "ff772d" }, "2": { "847342": "0d1a31", "efdea5": "3a5865", "c5ad7b": "283b4e", - "191921": "191921", "103a4a": "6faa3c", "215a63": "bbdf64", "de7352": "fef5b5", diff --git a/public/images/pokemon/variant/back/604.json b/public/images/pokemon/variant/back/604.json index b7fb3bb6208..01e61a45af2 100644 --- a/public/images/pokemon/variant/back/604.json +++ b/public/images/pokemon/variant/back/604.json @@ -4,7 +4,6 @@ "002131": "501d59", "216373": "957bd0", "73b5ce": "b29fe8", - "101019": "101019", "ffd600": "f7e1a6", "deb500": "d89d77", "847342": "4f8194", @@ -21,7 +20,6 @@ "002131": "225517", "216373": "bbdf64", "73b5ce": "e1ed9e", - "101019": "101019", "ffd600": "b83c5c", "deb500": "92233f", "847342": "0d1a31", diff --git a/public/images/pokemon/variant/back/605.json b/public/images/pokemon/variant/back/605.json index d5431137ef4..d0afbb0acfe 100644 --- a/public/images/pokemon/variant/back/605.json +++ b/public/images/pokemon/variant/back/605.json @@ -4,7 +4,6 @@ "3a7352": "292571", "a5cebd": "617eb8", "639484": "3c508b", - "101010": "101010", "ce0000": "954bd8", "7b2929": "2ecbc2", "6b6310": "54760c", @@ -15,7 +14,6 @@ "3a7352": "702c2c", "a5cebd": "be847a", "639484": "9f5952", - "101010": "101010", "ce0000": "615ad4", "7b2929": "f052a8", "6b6310": "a13815", @@ -26,7 +24,6 @@ "3a7352": "24243a", "a5cebd": "5b5e68", "639484": "38394c", - "101010": "101010", "ce0000": "ee5962", "7b2929": "8952dc", "6b6310": "8b3dbe", diff --git a/public/images/pokemon/variant/back/606.json b/public/images/pokemon/variant/back/606.json index b7517edbab7..ba4a85de4eb 100644 --- a/public/images/pokemon/variant/back/606.json +++ b/public/images/pokemon/variant/back/606.json @@ -4,7 +4,6 @@ "634229": "3f1925", "de9c7b": "9f534b", "8c523a": "581f28", - "101010": "101010", "c5a57b": "e9c0a2", "8c2929": "4b1263", "ce0000": "602985", @@ -18,7 +17,6 @@ "634229": "2f536f", "de9c7b": "a0e4e6", "8c523a": "4d879f", - "101010": "101010", "c5a57b": "c35d43", "8c2929": "16146f", "ce0000": "384097", @@ -32,9 +30,7 @@ "634229": "834f57", "de9c7b": "e5d1cc", "8c523a": "97696a", - "101010": "101010", "c5a57b": "bc3295", - "8c2929": "8c2929", "ce0000": "d3335a", "e6ce00": "a6488d", "e6c5a5": "dc59aa", diff --git a/public/images/pokemon/variant/back/609.json b/public/images/pokemon/variant/back/609.json index 80e1d7b3201..c716a8159ea 100644 --- a/public/images/pokemon/variant/back/609.json +++ b/public/images/pokemon/variant/back/609.json @@ -7,7 +7,6 @@ "313131": "11247b", "5a5a5a": "123684", "c5d6d6": "8e7c96", - "ffffff": "ffffff", "7b8c8c": "bb9fbc" }, "2": { @@ -18,7 +17,6 @@ "313131": "a15f42", "5a5a5a": "8d412b", "c5d6d6": "dcceae", - "ffffff": "ffffff", "7b8c8c": "eee6ca" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/610.json b/public/images/pokemon/variant/back/610.json index b011b55eb06..9fa630fe381 100644 --- a/public/images/pokemon/variant/back/610.json +++ b/public/images/pokemon/variant/back/610.json @@ -1,13 +1,10 @@ { "1": { - "000000": "000000", "313a29": "0a0b31", "4a523a": "27105b", "636b4a": "4b409d", "6b7b4a": "3f3562", "94a55a": "514776", - "b5b5d6": "b5b5d6", - "ffffff": "ffffff", "ce0000": "9d9d9d", "630000": "361a06", "84b521": "b52439", @@ -16,14 +13,11 @@ "d6e694": "d8d8d8" }, "2": { - "000000": "000000", "313a29": "0e1f3d", "4a523a": "193769", "636b4a": "35679c", "6b7b4a": "681c2a", "94a55a": "983f50", - "b5b5d6": "b5b5d6", - "ffffff": "ffffff", "ce0000": "00b5ce", "630000": "2f0010", "84b521": "5b69da", diff --git a/public/images/pokemon/variant/back/6100.json b/public/images/pokemon/variant/back/6100.json index bcf7d0cb55a..5113ce4930c 100644 --- a/public/images/pokemon/variant/back/6100.json +++ b/public/images/pokemon/variant/back/6100.json @@ -3,12 +3,8 @@ "7c2506": "2e333b", "fa923e": "a0c6ca", "ec6f00": "69a6b4", - "101010": "101010", "dc5d00": "598195", "c04a1c": "4e6170", - "ddccc8": "ddccc8", - "fefefe": "fefefe", - "ded5d5": "ded5d5", "f3d181": "c9cdd6", "d9a866": "a5aab7", "b8752e": "838797" @@ -17,12 +13,8 @@ "7c2506": "5d0a26", "fa923e": "d04744", "ec6f00": "a62833", - "101010": "101010", "dc5d00": "8f1b2c", "c04a1c": "72142b", - "ddccc8": "ddccc8", - "fefefe": "fefefe", - "ded5d5": "ded5d5", "f3d181": "502b32", "d9a866": "3a272e", "b8752e": "2d2327" diff --git a/public/images/pokemon/variant/back/6101.json b/public/images/pokemon/variant/back/6101.json index a494bf095d4..f87a8b27a30 100644 --- a/public/images/pokemon/variant/back/6101.json +++ b/public/images/pokemon/variant/back/6101.json @@ -4,13 +4,10 @@ "f3d181": "c9cdd6", "d9a866": "a5aab7", "a9763d": "838797", - "101010": "101010", "dc5d00": "5e8494", "ec6f00": "69a6b4", "c04a1c": "386583", "7c2506": "2e333b", - "cdcdde": "cdcdde", - "fefefe": "fefefe", "6f625e": "373e4c" }, "2": { @@ -18,13 +15,9 @@ "f3d181": "5e343c", "d9a866": "452d35", "a9763d": "35262c", - "101010": "101010", "dc5d00": "582b39", "ec6f00": "a62833", "c04a1c": "72142b", - "7c2506": "4a061d", - "cdcdde": "cdcdde", - "fefefe": "fefefe", - "6f625e": "6f625e" + "7c2506": "4a061d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/611.json b/public/images/pokemon/variant/back/611.json index 9a803c28aeb..5f55d0c321f 100644 --- a/public/images/pokemon/variant/back/611.json +++ b/public/images/pokemon/variant/back/611.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "4a8c4a": "b52439", "314a29": "650b18", "426b3a": "98182b", @@ -8,14 +7,12 @@ "b52121": "737373", "737373": "3f3562", "3a3a3a": "2a0e29", - "ffffff": "ffffff", "de4242": "c4c4c3", "9c9c9c": "736198", "7b7b7b": "514776", "5a5a52": "342047" }, "2": { - "101010": "101010", "4a8c4a": "35679c", "314a29": "161736", "426b3a": "193769", @@ -23,7 +20,6 @@ "b52121": "1f4fbf", "737373": "681c2a", "3a3a3a": "2c0216", - "ffffff": "ffffff", "de4242": "417dc7", "9c9c9c": "983f50", "7b7b7b": "823140", diff --git a/public/images/pokemon/variant/back/612.json b/public/images/pokemon/variant/back/612.json index a4954b21424..1640dce9b33 100644 --- a/public/images/pokemon/variant/back/612.json +++ b/public/images/pokemon/variant/back/612.json @@ -1,7 +1,6 @@ { "1": { "520000": "383838", - "000000": "000000", "8c0000": "84847e", "424200": "330909", "a5ad19": "b52439", @@ -15,7 +14,6 @@ }, "2": { "520000": "0d1e7c", - "000000": "000000", "8c0000": "1f4fbf", "424200": "0d0e2a", "a5ad19": "193769", diff --git a/public/images/pokemon/variant/back/618.json b/public/images/pokemon/variant/back/618.json index d4db4967946..9c6c04064a3 100644 --- a/public/images/pokemon/variant/back/618.json +++ b/public/images/pokemon/variant/back/618.json @@ -3,16 +3,12 @@ "cebd00": "bdac99", "ffff00": "f3e6dd", "6b6319": "987b6d", - "081019": "081019", "52423a": "312118", "6b524a": "4a342a", "bd846b": "8c3841", "846b63": "6b3838", "d69c84": "ad4c4c", "efce42": "eac2bd", - "d6cec5": "d6cec5", - "ffffff": "ffffff", - "081018": "081018", "735a52": "564038", "735a53": "564038", "9c8473": "a08773", @@ -22,7 +18,6 @@ "cebd00": "58536b", "ffff00": "707488", "6b6319": "39314a", - "081019": "081019", "52423a": "5a2e2e", "6b524a": "804e48", "bd846b": "cec9b1", diff --git a/public/images/pokemon/variant/back/619.json b/public/images/pokemon/variant/back/619.json index 15e699cb554..05e6abc805b 100644 --- a/public/images/pokemon/variant/back/619.json +++ b/public/images/pokemon/variant/back/619.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "634a29": "5b3724", "ad9c4a": "a69384", "947b52": "72533f", @@ -10,12 +9,9 @@ "cebd7b": "faf2db", "de637b": "dd7736", "7b213a": "64171c", - "52525a": "572821", - "ffffff": "ffffff", - "73293a": "73293a" + "52525a": "572821" }, "2": { - "000000": "000000", "634a29": "52271a", "ad9c4a": "aa6b4e", "947b52": "8d3e21", @@ -26,7 +22,6 @@ "de637b": "764ebb", "7b213a": "2f1148", "52525a": "44172c", - "ffffff": "ffffff", "73293a": "3f1f5d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/620.json b/public/images/pokemon/variant/back/620.json index 407d3dfd576..642c872d137 100644 --- a/public/images/pokemon/variant/back/620.json +++ b/public/images/pokemon/variant/back/620.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "524263": "80101d", "424242": "63332d", "b59c9c": "ddb2a5", @@ -8,14 +7,12 @@ "ad8cc5": "d8524a", "735263": "855348", "e6d6d6": "f3d9ce", - "4a2121": "4a2121", "a52121": "e1811a", "5a4231": "2a5a8c", "ce8c52": "4a86c5", "ffad63": "abe5ff" }, "2": { - "000000": "000000", "524263": "15244d", "424242": "3a193c", "b59c9c": "ba89a1", @@ -23,7 +20,6 @@ "ad8cc5": "3979ad", "735263": "654162", "e6d6d6": "e2b7db", - "4a2121": "4a2121", "a52121": "7b25cf", "5a4231": "8c0224", "ce8c52": "e61b42", diff --git a/public/images/pokemon/variant/back/6215.json b/public/images/pokemon/variant/back/6215.json index 741d6ddc0bb..db99eb822bf 100644 --- a/public/images/pokemon/variant/back/6215.json +++ b/public/images/pokemon/variant/back/6215.json @@ -6,12 +6,9 @@ "9c9bce": "ae8976", "514a80": "402010", "dcdbf7": "d0b3a4", - "080808": "080808", "28234b": "220d0a", "7d6ca4": "853a36", "584d80": "562627", - "f6f6ff": "f6f6ff", - "bdbdc5": "bdbdc5", "c52973": "ea903f" }, "2": { @@ -21,12 +18,9 @@ "9c9bce": "3c8775", "514a80": "14273a", "dcdbf7": "60ae7e", - "080808": "080808", "28234b": "0a191e", "7d6ca4": "395962", "584d80": "1c3942", - "f6f6ff": "f6f6ff", - "bdbdc5": "bdbdc5", "c52973": "f49633" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/622.json b/public/images/pokemon/variant/back/622.json index 97f38954bab..3144bbef1df 100644 --- a/public/images/pokemon/variant/back/622.json +++ b/public/images/pokemon/variant/back/622.json @@ -5,7 +5,6 @@ "84cece": "c78b3f", "004a52": "4c1b11", "106b63": "732d02", - "191921": "191921", "106b7b": "5f2b1b", "29848c": "76432c", "6b4200": "21111f", @@ -21,7 +20,6 @@ "84cece": "ad6352", "004a52": "350408", "106b63": "3a100d", - "191921": "191921", "106b7b": "4d090d", "29848c": "631111", "6b4200": "624b7a", diff --git a/public/images/pokemon/variant/back/633.json b/public/images/pokemon/variant/back/633.json index 8ce4cc2dc04..dd00d344bdf 100644 --- a/public/images/pokemon/variant/back/633.json +++ b/public/images/pokemon/variant/back/633.json @@ -1,7 +1,6 @@ { "1": { "292129": "140d35", - "101010": "101010", "5a5252": "4c297a", "525252": "4c297a", "423a42": "331c62", @@ -14,7 +13,6 @@ }, "2": { "292129": "1c2313", - "101010": "101010", "5a5252": "3a452d", "525252": "3a452d", "423a42": "2b351e", diff --git a/public/images/pokemon/variant/back/634.json b/public/images/pokemon/variant/back/634.json index 56d55acca5d..3cf9dc8670a 100644 --- a/public/images/pokemon/variant/back/634.json +++ b/public/images/pokemon/variant/back/634.json @@ -2,27 +2,21 @@ "1": { "292129": "140d35", "423a42": "331c62", - "101010": "101010", "525252": "4c297a", "3a63a5": "728197", "6394de": "bdd2e2", "19316b": "35475d", "632142": "1f4c90", - "9c3a6b": "3a80b8", - "adadad": "adadad", - "e6dede": "e6dede" + "9c3a6b": "3a80b8" }, "2": { "292129": "1c2313", "423a42": "2b351e", - "101010": "101010", "525252": "3a452d", "3a63a5": "a5a685", "6394de": "d9d9aa", "19316b": "6a6a51", "632142": "813530", - "9c3a6b": "ba5744", - "adadad": "adadad", - "e6dede": "e6dede" + "9c3a6b": "ba5744" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/635.json b/public/images/pokemon/variant/back/635.json index 750953e85e1..d0daca25363 100644 --- a/public/images/pokemon/variant/back/635.json +++ b/public/images/pokemon/variant/back/635.json @@ -3,13 +3,11 @@ "423a42": "331c62", "292129": "140d35", "525252": "4c297a", - "101010": "101010", "3a5a9c": "728197", "5a84ce": "bdd2e2", "9c4231": "bc3962", "19316b": "35475d", "732919": "7a1545", - "e6dede": "e6dede", "632142": "1f4c90", "bd527b": "65bfed", "8c2963": "3a80b8" @@ -18,13 +16,11 @@ "423a42": "2b351e", "292129": "1c2313", "525252": "3a452d", - "101010": "101010", "3a5a9c": "a5a685", "5a84ce": "d9d9aa", "9c4231": "950505", "19316b": "6a6a51", "732919": "640303", - "e6dede": "e6dede", "632142": "813530", "bd527b": "e78256", "8c2963": "ba5744" diff --git a/public/images/pokemon/variant/back/647-ordinary.json b/public/images/pokemon/variant/back/647-ordinary.json index a013f9fbb2f..65ca10d54d9 100644 --- a/public/images/pokemon/variant/back/647-ordinary.json +++ b/public/images/pokemon/variant/back/647-ordinary.json @@ -1,24 +1,17 @@ { "1": { "7b3129": "96711f", - "212121": "212121", "de4221": "fdbb3e", "ad3121": "c2912f", "314a8c": "c3382a", "19295a": "922517", "4a6bce": "ef4635", - "6b6b52": "6b6b52", - "fff7bd": "fff7bd", - "b5ad84": "b5ad84", "217ba5": "f15c5d", "63bdff": "f69284", - "525252": "525252", - "addeff": "fbcfcb", - "ffffff": "ffffff" + "addeff": "fbcfcb" }, "2": { "7b3129": "81304a", - "212121": "212121", "de4221": "de5d83", "ad3121": "a84564", "314a8c": "3b3160", @@ -29,8 +22,6 @@ "b5ad84": "b573a8", "217ba5": "b89edb", "63bdff": "e4d7ff", - "525252": "525252", - "addeff": "f1ecff", - "ffffff": "ffffff" + "addeff": "f1ecff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/647-resolute.json b/public/images/pokemon/variant/back/647-resolute.json index 2231d1dd79a..71b7ec5bbf7 100644 --- a/public/images/pokemon/variant/back/647-resolute.json +++ b/public/images/pokemon/variant/back/647-resolute.json @@ -1,7 +1,5 @@ { "1": { - "4a5252": "4a5252", - "101010": "101010", "843a29": "c2912f", "63bdff": "f69284", "ff9421": "d84a9a", @@ -10,15 +8,10 @@ "314a8c": "c3382a", "193163": "922517", "4a6bce": "ef4635", - "21848c": "be4848", - "635a29": "635a29", - "b5ad73": "b5ad73", - "fff7ad": "fff7ad", - "ffffff": "ffffff" + "21848c": "be4848" }, "2": { "4a5252": "6a4863", - "101010": "101010", "843a29": "81304a", "63bdff": "e4d7ff", "ff9421": "8571a4", @@ -30,7 +23,6 @@ "21848c": "b89edb", "635a29": "6a4863", "b5ad73": "b573a8", - "fff7ad": "d89cc6", - "ffffff": "ffffff" + "fff7ad": "d89cc6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/648-pirouette.json b/public/images/pokemon/variant/back/648-pirouette.json index 194c63c30d4..c62deec8e21 100644 --- a/public/images/pokemon/variant/back/648-pirouette.json +++ b/public/images/pokemon/variant/back/648-pirouette.json @@ -21,14 +21,11 @@ "4a423a": "413429", "84736b": "83685b", "101010": "1a1313", - "73423a": "73423a", "423131": "553a35", "635a52": "625246", "c5b594": "c9b190", "fffff7": "fff4e0", - "947b5a": "947b5a", "f7527b": "986752", - "c5315a": "553a35", - "5a5252": "5a5252" + "c5315a": "553a35" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/649-burn.json b/public/images/pokemon/variant/back/649-burn.json index 18dd2d964ce..1c73e9602ae 100644 --- a/public/images/pokemon/variant/back/649-burn.json +++ b/public/images/pokemon/variant/back/649-burn.json @@ -5,13 +5,9 @@ "9c5ac5": "7baec3", "73428c": "4084c0", "ceb5ff": "87feff", - "5a2110": "5a2110", - "a53121": "a53121", "a584bd": "62c4e6", - "ef2100": "ef2100", "733129": "26a624", "f75221": "ddffb0", - "ffffff": "ffffff", "b54221": "97e083" }, "2": { @@ -20,13 +16,9 @@ "9c5ac5": "484553", "73428c": "312f42", "ceb5ff": "f56e6e", - "5a2110": "5a2110", - "a53121": "a53121", "a584bd": "b72852", - "ef2100": "ef2100", "733129": "91283b", "f75221": "ff9b90", - "ffffff": "ffffff", "b54221": "c9514e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/649-chill.json b/public/images/pokemon/variant/back/649-chill.json index 7f8988d6a76..ed8bb05fdfc 100644 --- a/public/images/pokemon/variant/back/649-chill.json +++ b/public/images/pokemon/variant/back/649-chill.json @@ -5,10 +5,7 @@ "9c5ac5": "7baec3", "73428c": "4084c0", "ceb5ff": "87feff", - "42423a": "42423a", - "a5a5ad": "a5a5ad", "a584bd": "62c4e6", - "ffffff": "ffffff", "733129": "26a624", "f75221": "ddffb0", "b54221": "97e083" @@ -19,10 +16,7 @@ "9c5ac5": "484553", "73428c": "312f42", "ceb5ff": "ccf7fe", - "42423a": "42423a", - "a5a5ad": "a5a5ad", "a584bd": "8dc7e3", - "ffffff": "ffffff", "733129": "4b8fba", "f75221": "aafaff", "b54221": "7cc9e0" diff --git a/public/images/pokemon/variant/back/649-douse.json b/public/images/pokemon/variant/back/649-douse.json index f00fbdd66cc..80b4a7a5a51 100644 --- a/public/images/pokemon/variant/back/649-douse.json +++ b/public/images/pokemon/variant/back/649-douse.json @@ -5,13 +5,9 @@ "9c5ac5": "7baec3", "73428c": "4084c0", "ceb5ff": "87feff", - "00424a": "00424a", - "0084b5": "0084b5", "a584bd": "62c4e6", - "00ceff": "00ceff", "733129": "26a624", "f75221": "ddffb0", - "ffffff": "ffffff", "b54221": "97e083" }, "2": { @@ -20,13 +16,9 @@ "9c5ac5": "484553", "73428c": "312f42", "ceb5ff": "7bbde3", - "00424a": "00424a", - "0084b5": "0084b5", "a584bd": "4994da", - "00ceff": "00ceff", "733129": "2048bd", "f75221": "a4c8ff", - "ffffff": "ffffff", "b54221": "6c92e0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/649-shock.json b/public/images/pokemon/variant/back/649-shock.json index e6dfbe5d6e0..feaf84a8a08 100644 --- a/public/images/pokemon/variant/back/649-shock.json +++ b/public/images/pokemon/variant/back/649-shock.json @@ -5,13 +5,9 @@ "9c5ac5": "7baec3", "73428c": "4084c0", "ceb5ff": "87feff", - "4a4208": "4a4208", - "b5b500": "b5b500", "a584bd": "62c4e6", - "deff00": "deff00", "733129": "26a624", "f75221": "ddffb0", - "ffffff": "ffffff", "b54221": "97e083" }, "2": { @@ -20,13 +16,9 @@ "9c5ac5": "484553", "73428c": "312f42", "ceb5ff": "ffee5e", - "4a4208": "4a4208", - "b5b500": "b5b500", "a584bd": "ecb549", - "deff00": "deff00", "733129": "c69634", "f75221": "fff7aa", - "ffffff": "ffffff", "b54221": "eccc67" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/649.json b/public/images/pokemon/variant/back/649.json index fcee232a8c3..c31b7bf27f2 100644 --- a/public/images/pokemon/variant/back/649.json +++ b/public/images/pokemon/variant/back/649.json @@ -5,13 +5,9 @@ "9c5ac5": "7baec3", "73428c": "4084c0", "ceb5ff": "87feff", - "6b4a08": "6b4a08", - "c58400": "c58400", "a584bd": "62c4e6", - "efbd00": "efbd00", "733129": "26a624", "f75221": "ddffb0", - "ffffff": "ffffff", "b54221": "97e083" }, "2": { @@ -20,13 +16,9 @@ "9c5ac5": "484553", "73428c": "312f42", "ceb5ff": "f7ae6a", - "6b4a08": "6b4a08", - "c58400": "c58400", "a584bd": "e2854c", - "efbd00": "efbd00", "733129": "c6684b", "f75221": "fbba7f", - "ffffff": "ffffff", "b54221": "e0875a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/653.json b/public/images/pokemon/variant/back/653.json index f7761fa32b1..acbc4c24d67 100644 --- a/public/images/pokemon/variant/back/653.json +++ b/public/images/pokemon/variant/back/653.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736028": "9f398a", "ffd659": "e190c3", "ccab47": "c35ba3", @@ -12,7 +11,6 @@ "f8f8f8": "fbecff" }, "2": { - "101010": "101010", "736028": "172547", "ffd659": "3a6a93", "ccab47": "264166", diff --git a/public/images/pokemon/variant/back/654.json b/public/images/pokemon/variant/back/654.json index cc8722209f8..d9fc958239e 100644 --- a/public/images/pokemon/variant/back/654.json +++ b/public/images/pokemon/variant/back/654.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736028": "481332", "ccab47": "682546", "ffd659": "a85789", @@ -10,12 +9,9 @@ "737373": "5c255f", "f8f8f8": "e7caef", "804913": "c5b3ca", - "bfbfbf": "c093c3", - "262626": "262626", - "404040": "404040" + "bfbfbf": "c093c3" }, "2": { - "101010": "101010", "736028": "061530", "ccab47": "173864", "ffd659": "2b5f8a", @@ -25,8 +21,6 @@ "737373": "75553c", "f8f8f8": "fff2dd", "804913": "098794", - "bfbfbf": "d4b996", - "262626": "262626", - "404040": "404040" + "bfbfbf": "d4b996" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/6549.json b/public/images/pokemon/variant/back/6549.json index 230d54b1777..e5bf44b1c5a 100644 --- a/public/images/pokemon/variant/back/6549.json +++ b/public/images/pokemon/variant/back/6549.json @@ -2,35 +2,27 @@ "1": { "70365a": "29547d", "ff84bd": "73bad9", - "101010": "101010", "bd59a2": "5094c0", "bda452": "77909a", "ffde41": "b6c7cc", "526229": "80152b", "ffbbdb": "b5ddea", - "fdfdfd": "fdfdfd", "315a31": "5a5a2c", "39ac39": "bfd17f", "4a834a": "8e954d", "9cb462": "bd2d40", - "c5ee7b": "ef5755", - "cdc5bd": "cdc5bd" + "c5ee7b": "ef5755" }, "2": { "70365a": "8a1a3c", "ff84bd": "e8617a", - "101010": "101010", "bd59a2": "d64065", - "bda452": "bda452", - "ffde41": "ffde41", "526229": "351c49", "ffbbdb": "f38e9c", - "fdfdfd": "fdfdfd", "315a31": "643312", "39ac39": "ebc460", "4a834a": "9d7d45", "9cb462": "5d3576", - "c5ee7b": "834c9b", - "cdc5bd": "cdc5bd" + "c5ee7b": "834c9b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/655.json b/public/images/pokemon/variant/back/655.json index cacae9a43d5..2232880aaba 100644 --- a/public/images/pokemon/variant/back/655.json +++ b/public/images/pokemon/variant/back/655.json @@ -6,11 +6,8 @@ "79280f": "4d1681", "816528": "331035", "ffda5a": "e7caef", - "000000": "000000", "deb048": "c093c3", "a7673a": "a58dab", - "bfbfbf": "bfbfbf", - "6e6d6a": "6e6d6a", "893027": "872b59", "62211b": "550c28", "ae3d32": "b55390" @@ -22,11 +19,8 @@ "79280f": "005646", "816528": "75553c", "ffda5a": "fff2dd", - "000000": "000000", "deb048": "d4b996", "a7673a": "098794", - "bfbfbf": "bfbfbf", - "6e6d6a": "6e6d6a", "893027": "173864", "62211b": "101010", "ae3d32": "2b5f8a" diff --git a/public/images/pokemon/variant/back/6570.json b/public/images/pokemon/variant/back/6570.json index b42d9780a3b..13dd8b85012 100644 --- a/public/images/pokemon/variant/back/6570.json +++ b/public/images/pokemon/variant/back/6570.json @@ -7,7 +7,6 @@ "f7acae": "ffd291", "4a4d53": "3b2b4f", "fafafa": "efd9d9", - "101010": "101010", "b3b3bb": "d6b7b1", "928d96": "504b6a", "cbcfd8": "7b7897", @@ -22,7 +21,6 @@ "f7acae": "79d38d", "4a4d53": "6f4332", "fafafa": "f0decd", - "101010": "101010", "b3b3bb": "c6ab99", "928d96": "995d3e", "cbcfd8": "d79568", diff --git a/public/images/pokemon/variant/back/6571.json b/public/images/pokemon/variant/back/6571.json index fe8a33a5133..971faa8a4cb 100644 --- a/public/images/pokemon/variant/back/6571.json +++ b/public/images/pokemon/variant/back/6571.json @@ -1,7 +1,6 @@ { "1": { "942429": "4a1921", - "101010": "101010", "d53a3e": "782d41", "928d96": "4a4759", "f07376": "b44d63", @@ -17,7 +16,6 @@ }, "2": { "942429": "143130", - "101010": "101010", "d53a3e": "265a52", "928d96": "885f49", "f07376": "4e867b", @@ -28,7 +26,6 @@ "a7484f": "2a6062", "5f0002": "072222", "cbcfd8": "bc9072", - "6d4d62": "c2589c", - "4b163b": "4b163b" + "6d4d62": "c2589c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/664.json b/public/images/pokemon/variant/back/664.json index b4b1dbcc26a..f19fae75071 100644 --- a/public/images/pokemon/variant/back/664.json +++ b/public/images/pokemon/variant/back/664.json @@ -2,7 +2,6 @@ "1": { "737373": "9c615f", "f2f2f2": "ffffff", - "101010": "101010", "b3b3b3": "e9c7c4", "262626": "4c2855", "404040": "895a9f", @@ -14,7 +13,6 @@ "2": { "737373": "590015", "f2f2f2": "c83e4c", - "101010": "101010", "b3b3b3": "a70d37", "262626": "05312f", "404040": "377772", diff --git a/public/images/pokemon/variant/back/665.json b/public/images/pokemon/variant/back/665.json index c5defbab5b7..de52892d922 100644 --- a/public/images/pokemon/variant/back/665.json +++ b/public/images/pokemon/variant/back/665.json @@ -1,11 +1,9 @@ { "1": { - "363636": "363636", "d1bf6b": "a0c896", "8c8c8c": "895a9f", "bfbfbf": "a97dbb", "9d7247": "838b53", - "101010": "101010", "4d4d4d": "9c615f", "b3b3b3": "e9c7c4", "f8f8f8": "ffffff", @@ -19,7 +17,6 @@ "8c8c8c": "590015", "bfbfbf": "a70d37", "9d7247": "dda476", - "101010": "101010", "4d4d4d": "590015", "b3b3b3": "a70d37", "f8f8f8": "c83e4c", diff --git a/public/images/pokemon/variant/back/666-archipelago.json b/public/images/pokemon/variant/back/666-archipelago.json index 88f2fdca3f6..3b5397ac3e6 100644 --- a/public/images/pokemon/variant/back/666-archipelago.json +++ b/public/images/pokemon/variant/back/666-archipelago.json @@ -1,34 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "c8373c": "c8373c", - "30c171": "30c171", - "d2bf96": "d2bf96", "303030": "402746", - "c27351": "c27351", "ceab62": "d9edd4", "675220": "958c8a", "707068": "a97cbc", - "a2523b": "a2523b", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3", - "b28e67": "b28e67" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "824719", - "c8373c": "c8373c", - "30c171": "30c171", - "d2bf96": "d2bf96", "303030": "642703", - "c27351": "c27351", "ceab62": "a22414", "675220": "741300", "707068": "a22414", - "a2523b": "a2523b", "504a4a": "741300", - "c3c3c3": "e7caa5", - "b28e67": "b28e67" + "c3c3c3": "e7caa5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-continental.json b/public/images/pokemon/variant/back/666-continental.json index c28da572185..3a023b45433 100644 --- a/public/images/pokemon/variant/back/666-continental.json +++ b/public/images/pokemon/variant/back/666-continental.json @@ -1,34 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "d18257": "d18257", "303030": "402746", - "f9bd55": "f9bd55", - "f8f05e": "f8f05e", - "d24c3e": "d24c3e", "ceab62": "d9edd4", "675220": "958c8a", - "aa5844": "aa5844", "707068": "a97cbc", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3", - "e08528": "e08528" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "8f551e", - "d18257": "d18257", "303030": "6d2d0d", - "f9bd55": "f9bd55", - "f8f05e": "f8f05e", - "d24c3e": "d24c3e", "ceab62": "e99b44", "675220": "9c5c19", - "aa5844": "aa5844", "707068": "e99b44", "504a4a": "9c5c19", - "c3c3c3": "f8f27f", - "e08528": "e08528" + "c3c3c3": "f8f27f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-elegant.json b/public/images/pokemon/variant/back/666-elegant.json index bfccf82b7fc..c641b655843 100644 --- a/public/images/pokemon/variant/back/666-elegant.json +++ b/public/images/pokemon/variant/back/666-elegant.json @@ -1,33 +1,18 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "e6ddf8": "e6ddf8", - "cf7ef3": "cf7ef3", - "f8de3f": "f8de3f", "303030": "402746", - "875fb5": "875fb5", - "de4040": "de4040", "ceab62": "d9edd4", "675220": "958c8a", "707068": "a97cbc", - "56479d": "56479d", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "612776", - "e6ddf8": "e6ddf8", - "cf7ef3": "cf7ef3", - "f8de3f": "f8de3f", "303030": "351262", - "875fb5": "875fb5", - "de4040": "de4040", "ceab62": "a73fab", "675220": "7d1083", "707068": "a73fab", - "56479d": "56479d", "504a4a": "7d1083", "c3c3c3": "f0ecff" } diff --git a/public/images/pokemon/variant/back/666-fancy.json b/public/images/pokemon/variant/back/666-fancy.json index 5d368667ae3..6f20a0dc3bb 100644 --- a/public/images/pokemon/variant/back/666-fancy.json +++ b/public/images/pokemon/variant/back/666-fancy.json @@ -1,36 +1,22 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "de4040": "de4040", - "5faa3e": "5faa3e", - "ceab62": "d9edd4", - "b6d26d": "b6d26d", - "e9e052": "e9e052", - "cf7ef3": "cf7ef3", - "c3c3c3": "ffeaff", - "f2d4e3": "f2d4e3", - "ead2e3": "ffeaff" - }, - "2": { - "101010": "101010", - "303030": "00771b", - "675220": "b9c05a", - "504a4a": "b9c05a", - "595959": "6f9f42", - "707068": "6f9f42", - "de4040": "de4040", - "5faa3e": "5faa3e", - "ceab62": "e3e982", - "b6d26d": "b6d26d", - "e9e052": "e9e052", - "cf7ef3": "cf7ef3", - "c3c3c3": "fcf1ff", - "f2d4e3": "f2d4e3", - "ead2e3": "fcf1ff" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "c3c3c3": "ffeaff", + "ead2e3": "ffeaff" + }, + "2": { + "303030": "00771b", + "675220": "b9c05a", + "504a4a": "b9c05a", + "595959": "6f9f42", + "707068": "6f9f42", + "ceab62": "e3e982", + "c3c3c3": "fcf1ff", + "ead2e3": "fcf1ff" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-garden.json b/public/images/pokemon/variant/back/666-garden.json index 57dd83db8e9..26d8098a6fd 100644 --- a/public/images/pokemon/variant/back/666-garden.json +++ b/public/images/pokemon/variant/back/666-garden.json @@ -1,31 +1,18 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "398351": "398351", - "3dba96": "3dba96", "303030": "402746", - "88d254": "88d254", "ceab62": "d9edd4", "675220": "958c8a", - "de4040": "de4040", "707068": "a97cbc", - "3f919a": "3f919a", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "006b55", - "398351": "398351", - "3dba96": "3dba96", "303030": "044553", - "88d254": "88d254", "ceab62": "227687", "675220": "055160", - "de4040": "de4040", "707068": "227687", - "3f919a": "3f919a", "504a4a": "055160", "c3c3c3": "72d0a3" } diff --git a/public/images/pokemon/variant/back/666-high-plains.json b/public/images/pokemon/variant/back/666-high-plains.json index 6ee5c78e6ca..0271aa89d50 100644 --- a/public/images/pokemon/variant/back/666-high-plains.json +++ b/public/images/pokemon/variant/back/666-high-plains.json @@ -1,36 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f3a861": "f3a861", - "9a5a3b": "9a5a3b", "303030": "402746", - "e1764e": "e1764e", - "aa4343": "aa4343", "ceab62": "d9edd4", "675220": "958c8a", "707068": "a97cbc", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3", - "337543": "337543", - "e8c815": "e8c815", - "773d21": "773d21" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "a55422", - "f3a861": "f3a861", - "9a5a3b": "9a5a3b", "303030": "8f1d19", - "e1764e": "e1764e", - "aa4343": "aa4343", "ceab62": "f2975a", "675220": "c97034", "707068": "f2975a", "504a4a": "c97034", - "c3c3c3": "edc67c", - "337543": "337543", - "e8c815": "e8c815", - "773d21": "773d21" + "c3c3c3": "edc67c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-icy-snow.json b/public/images/pokemon/variant/back/666-icy-snow.json index 24fc6ef23b1..4b944b84227 100644 --- a/public/images/pokemon/variant/back/666-icy-snow.json +++ b/public/images/pokemon/variant/back/666-icy-snow.json @@ -1,32 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f0f0f8": "f0f0f8", - "cfd9cf": "cfd9cf", "303030": "402746", - "c5c5da": "c5c5da", "ceab62": "d9edd4", "675220": "958c8a", "707068": "a97cbc", - "504a4a": "7f6991", - "acacc2": "acacc2", - "95a1a1": "95a1a1", - "c3c3c3": "c3c3c3" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "60646a", - "f0f0f8": "f0f0f8", - "cfd9cf": "cfd9cf", "303030": "364051", - "c5c5da": "c5c5da", "ceab62": "8c91a4", "675220": "666b7d", "707068": "8c91a4", "504a4a": "666b7d", - "acacc2": "acacc2", - "95a1a1": "95a1a1", "c3c3c3": "fefeff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-jungle.json b/public/images/pokemon/variant/back/666-jungle.json index 08d50d8afa6..3d1932e0564 100644 --- a/public/images/pokemon/variant/back/666-jungle.json +++ b/public/images/pokemon/variant/back/666-jungle.json @@ -1,34 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "638c63": "638c63", - "7cc48b": "7cc48b", "303030": "402746", "ceab62": "d9edd4", "675220": "958c8a", - "567456": "567456", "504a4a": "7f6991", - "707068": "a97cbc", - "c3c3c3": "c3c3c3", - "724e28": "724e28", - "9a653e": "9a653e", - "c29566": "c29566" + "707068": "a97cbc" }, "2": { - "101010": "101010", "595959": "285b3b", - "638c63": "638c63", - "7cc48b": "7cc48b", "303030": "20452e", "ceab62": "385c43", "675220": "153922", - "567456": "567456", "504a4a": "153922", "707068": "385c43", - "c3c3c3": "a9d9a0", - "724e28": "724e28", - "9a653e": "9a653e", - "c29566": "c29566" + "c3c3c3": "a9d9a0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-marine.json b/public/images/pokemon/variant/back/666-marine.json index feadbcb8307..ef344010316 100644 --- a/public/images/pokemon/variant/back/666-marine.json +++ b/public/images/pokemon/variant/back/666-marine.json @@ -1,30 +1,17 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "2f8dc9": "2f8dc9", - "5acdf1": "5acdf1", "303030": "402746", "ceab62": "d9edd4", "675220": "958c8a", - "f2f2f2": "f2f2f2", - "367cb9": "367cb9", - "315382": "315382", "707068": "a97cbc", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "2a5894", - "2f8dc9": "2f8dc9", - "5acdf1": "5acdf1", "303030": "16244f", "ceab62": "3070af", "675220": "264c85", - "f2f2f2": "f2f2f2", - "367cb9": "367cb9", - "315382": "315382", "707068": "3070af", "504a4a": "264c85", "c3c3c3": "f2f2f2" diff --git a/public/images/pokemon/variant/back/666-meadow.json b/public/images/pokemon/variant/back/666-meadow.json index 54a620a47f6..135e7630d23 100644 --- a/public/images/pokemon/variant/back/666-meadow.json +++ b/public/images/pokemon/variant/back/666-meadow.json @@ -1,33 +1,18 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "da6b7e": "da6b7e", - "f3a0ca": "f3a0ca", "303030": "402746", "ceab62": "d9edd4", "675220": "958c8a", - "b4295a": "b4295a", - "2d9b9b": "2d9b9b", - "f2f2f2": "f2f2f2", "707068": "a97cbc", - "e66fad": "e66fad", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "9e3941", - "da6b7e": "da6b7e", - "f3a0ca": "f3a0ca", "303030": "770921", "ceab62": "ce5283", "675220": "a2275e", - "b4295a": "b4295a", - "2d9b9b": "2d9b9b", - "f2f2f2": "f2f2f2", "707068": "ce5283", - "e66fad": "e66fad", "504a4a": "a2275e", "c3c3c3": "f4c2ec" } diff --git a/public/images/pokemon/variant/back/666-modern.json b/public/images/pokemon/variant/back/666-modern.json index ab03985576c..88df6a6a10a 100644 --- a/public/images/pokemon/variant/back/666-modern.json +++ b/public/images/pokemon/variant/back/666-modern.json @@ -1,34 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "c3c3c3": "c3c3c3", - "3b6cbb": "3b6cbb", - "f44f4f": "f44f4f", "303030": "402746", - "f8f05c": "f8f05c", "ceab62": "d9edd4", "675220": "958c8a", - "cfc5d9": "cfc5d9", - "b83c3c": "b83c3c", "707068": "a97cbc", - "504a4a": "7f6991", - "405793": "405793" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "830012", "c3c3c3": "ffeae8", - "3b6cbb": "3b6cbb", - "f44f4f": "f44f4f", "303030": "4e0000", - "f8f05c": "f8f05c", "ceab62": "ad2640", "675220": "801521", - "cfc5d9": "cfc5d9", - "b83c3c": "b83c3c", "707068": "ad2640", - "504a4a": "801521", - "405793": "405793" + "504a4a": "801521" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-monsoon.json b/public/images/pokemon/variant/back/666-monsoon.json index 915d471b2b1..5a127a43bbe 100644 --- a/public/images/pokemon/variant/back/666-monsoon.json +++ b/public/images/pokemon/variant/back/666-monsoon.json @@ -1,33 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "807676": "807676", - "ceab62": "d9edd4", - "5676de": "5676de", - "4eccd6": "4eccd6", - "989898": "989898", - "c3c3c3": "c3c3c3", - "f0f0f8": "f0f0f8" - }, - "2": { - "101010": "101010", - "303030": "3d3231", - "675220": "2c3593", - "504a4a": "2c3593", - "595959": "4f4645", - "707068": "5857bc", - "807676": "807676", - "ceab62": "5857bc", - "5676de": "5676de", - "4eccd6": "4eccd6", - "989898": "989898", - "92f4f4": "92f4f4", - "c3c3c3": "b8f9f9", - "f0f0f8": "f0f0f8" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "3d3231", + "675220": "2c3593", + "504a4a": "2c3593", + "595959": "4f4645", + "707068": "5857bc", + "ceab62": "5857bc", + "c3c3c3": "b8f9f9" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-ocean.json b/public/images/pokemon/variant/back/666-ocean.json index 8b62b4a8072..a5ba9408104 100644 --- a/public/images/pokemon/variant/back/666-ocean.json +++ b/public/images/pokemon/variant/back/666-ocean.json @@ -1,34 +1,18 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "e1384d": "e1384d", - "f4ad61": "f4ad61", - "f8ef6a": "f8ef6a", "303030": "402746", - "ceb362": "ceb362", "675220": "958c8a", - "ebcf3f": "ebcf3f", "707068": "a97cbc", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3", - "4482c9": "4482c9", - "6bb2e9": "6bb2e9" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "e99a26", - "e1384d": "e1384d", - "f4ad61": "f4ad61", - "f8ef6a": "f8ef6a", "303030": "b54908", "ceb362": "ea8742", "675220": "bc601c", - "ebcf3f": "ebcf3f", "707068": "ea8742", "504a4a": "bc601c", - "c3c3c3": "f3c86b", - "4482c9": "4482c9", - "6bb2e9": "6bb2e9" + "c3c3c3": "f3c86b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-poke-ball.json b/public/images/pokemon/variant/back/666-poke-ball.json index 002bcdde6aa..3712ad1a20b 100644 --- a/public/images/pokemon/variant/back/666-poke-ball.json +++ b/public/images/pokemon/variant/back/666-poke-ball.json @@ -1,22 +1,13 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "b72c2c": "b72c2c", "303030": "402746", - "dc4b4b": "dc4b4b", "ceab62": "d9edd4", "675220": "958c8a", - "e97e7e": "e97e7e", - "971d1d": "971d1d", - "f8f8f8": "f8f8f8", "707068": "a97cbc", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3", - "a9a99e": "a9a99e" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "df0036", "b72c2c": "00005e", "303030": "ae001a", diff --git a/public/images/pokemon/variant/back/666-polar.json b/public/images/pokemon/variant/back/666-polar.json index 7c72f32ed24..fd76c92ae7b 100644 --- a/public/images/pokemon/variant/back/666-polar.json +++ b/public/images/pokemon/variant/back/666-polar.json @@ -1,34 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "4d6cc1": "4d6cc1", - "f0f0f8": "f0f0f8", "303030": "402746", - "3b4b8a": "3b4b8a", - "bfbfbf": "bfbfbf", "ceab62": "d9edd4", "675220": "958c8a", "707068": "a97cbc", - "504a4a": "7f6991", - "2d2d61": "2d2d61", - "c3c3c3": "c3c3c3", - "6aa2dc": "6aa2dc" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "2f3887", - "4d6cc1": "4d6cc1", - "f0f0f8": "f0f0f8", "303030": "191b54", - "3b4b8a": "3b4b8a", - "bfbfbf": "bfbfbf", "ceab62": "5f85c1", "675220": "366098", "707068": "5f85c1", "504a4a": "366098", - "2d2d61": "2d2d61", - "c3c3c3": "ffffff", - "6aa2dc": "6aa2dc" + "c3c3c3": "ffffff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-river.json b/public/images/pokemon/variant/back/666-river.json index c7e5e288d05..5ba0084df9d 100644 --- a/public/images/pokemon/variant/back/666-river.json +++ b/public/images/pokemon/variant/back/666-river.json @@ -1,40 +1,18 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "4a412c": "4a412c", - "675220": "958c8a", - "634d20": "634d20", - "1d726a": "1d726a", - "504a4a": "7f6991", - "595959": "724b7a", - "625841": "625841", - "707068": "a97cbc", - "bc813f": "bc813f", - "9c9143": "9c9143", - "ceab62": "ceab62", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "c3c3c3": "c3c3c3", - "d2a862": "d9edd4" - }, - "2": { - "101010": "101010", - "303030": "7b2800", - "4a412c": "4a412c", - "675220": "ae7f41", - "634d20": "634d20", - "1d726a": "1d726a", - "504a4a": "ae7f41", - "595959": "8a5702", - "625841": "625841", - "707068": "d9a666", - "bc813f": "bc813f", - "9c9143": "9c9143", - "ceab62": "ceab62", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "c3c3c3": "e3c384", - "d2a862": "d2a862" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "d2a862": "d9edd4" + }, + "2": { + "303030": "7b2800", + "675220": "ae7f41", + "504a4a": "ae7f41", + "595959": "8a5702", + "707068": "d9a666", + "c3c3c3": "e3c384" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-sandstorm.json b/public/images/pokemon/variant/back/666-sandstorm.json index 63b0661e2fb..66f333b87be 100644 --- a/public/images/pokemon/variant/back/666-sandstorm.json +++ b/public/images/pokemon/variant/back/666-sandstorm.json @@ -1,34 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f1d69e": "f1d69e", - "625843": "625843", "303030": "402746", - "ba8d68": "ba8d68", - "9b9148": "9b9148", "ceab62": "d9edd4", "675220": "958c8a", - "d9b674": "d9b674", "707068": "a97cbc", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3", - "72604d": "72604d" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "88583e", - "f1d69e": "f1d69e", - "625843": "625843", "303030": "443123", - "ba8d68": "ba8d68", - "9b9148": "9b9148", "ceab62": "c6975f", "675220": "9c703b", - "d9b674": "d9b674", "707068": "c6975f", "504a4a": "9c703b", - "c3c3c3": "ece1a9", - "72604d": "72604d" + "c3c3c3": "ece1a9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/666-savanna.json b/public/images/pokemon/variant/back/666-savanna.json index 2fa9a25e5ca..462946135a9 100644 --- a/public/images/pokemon/variant/back/666-savanna.json +++ b/public/images/pokemon/variant/back/666-savanna.json @@ -1,33 +1,18 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "61a0f5": "61a0f5", - "fffd77": "fffd77", "303030": "402746", - "55d3d9": "55d3d9", "ceab62": "d9edd4", "675220": "958c8a", - "dcc433": "dcc433", - "3b67ac": "3b67ac", "707068": "a97cbc", - "6cc6c6": "6cc6c6", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "4168bb", - "61a0f5": "61a0f5", - "fffd77": "fffd77", "303030": "183576", - "55d3d9": "55d3d9", "ceab62": "4faab3", "675220": "1d828b", - "dcc433": "dcc433", - "3b67ac": "3b67ac", "707068": "4faab3", - "6cc6c6": "6cc6c6", "504a4a": "1d828b", "c3c3c3": "81e7e1" } diff --git a/public/images/pokemon/variant/back/666-sun.json b/public/images/pokemon/variant/back/666-sun.json index 4142b1d2643..daaf2ca1932 100644 --- a/public/images/pokemon/variant/back/666-sun.json +++ b/public/images/pokemon/variant/back/666-sun.json @@ -1,32 +1,17 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f1a26a": "f1a26a", - "f47491": "f47491", - "f0ce44": "f0ce44", - "fcf372": "fcf372", "303030": "402746", "ceab62": "d9edd4", "675220": "958c8a", - "e18248": "e18248", - "c94971": "c94971", "707068": "a97cbc", - "504a4a": "7f6991", - "c3c3c3": "c3c3c3" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "750500", - "f1a26a": "f1a26a", - "f47491": "f47491", - "f0ce44": "f0ce44", - "fcf372": "fcf372", "303030": "640000", "ceab62": "b83b74", "675220": "8c1850", - "e18248": "e18248", - "c94971": "c94971", "707068": "b83b74", "504a4a": "8c1850", "c3c3c3": "fee3e7" diff --git a/public/images/pokemon/variant/back/666-tundra.json b/public/images/pokemon/variant/back/666-tundra.json index 3e85b8021ad..06e16ee3f2f 100644 --- a/public/images/pokemon/variant/back/666-tundra.json +++ b/public/images/pokemon/variant/back/666-tundra.json @@ -1,32 +1,19 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "a3def1": "a3def1", - "f0f0f8": "f0f0f8", "303030": "402746", - "74bbe9": "74bbe9", - "d0d0d0": "d0d0d0", "ceab62": "d9edd4", "675220": "958c8a", "707068": "a97cbc", - "504a4a": "7f6991", - "539ad9": "539ad9", - "c3c3c3": "c3c3c3" + "504a4a": "7f6991" }, "2": { - "101010": "101010", "595959": "225b72", - "a3def1": "a3def1", - "f0f0f8": "f0f0f8", "303030": "003d69", - "74bbe9": "74bbe9", - "d0d0d0": "d0d0d0", "ceab62": "659dd0", "675220": "3a76a7", "707068": "659dd0", "504a4a": "3a76a7", - "539ad9": "539ad9", "c3c3c3": "cbfbfb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/669-blue.json b/public/images/pokemon/variant/back/669-blue.json index 758b01c48f8..bd164f701d5 100644 --- a/public/images/pokemon/variant/back/669-blue.json +++ b/public/images/pokemon/variant/back/669-blue.json @@ -3,10 +3,6 @@ "665a1f": "230e63", "ffe14c": "4d37d5", "ccb43d": "3c118e", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8", - "101010": "101010", "65a943": "e493a1", "266280": "200e5c", "61c2f2": "4d72d5", @@ -21,7 +17,6 @@ "595959": "32448e", "bfbfbf": "a5c3ea", "f8f8f8": "dff2ff", - "101010": "101010", "65a943": "33a2bf", "266280": "215510", "61c2f2": "afcf4f", diff --git a/public/images/pokemon/variant/back/669-orange.json b/public/images/pokemon/variant/back/669-orange.json index a7ca575c15e..452e7af1a62 100644 --- a/public/images/pokemon/variant/back/669-orange.json +++ b/public/images/pokemon/variant/back/669-orange.json @@ -3,10 +3,6 @@ "665a1f": "5c0d0d", "ffe14c": "a3382c", "ccb43d": "871723", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8", - "101010": "101010", "65a943": "e493a1", "805326": "5c2c09", "ffb266": "cd9231", @@ -21,7 +17,6 @@ "595959": "712b2b", "bfbfbf": "f1beb3", "f8f8f8": "fff1df", - "101010": "101010", "65a943": "ea8c48", "805326": "215510", "ffb266": "afcf4f", diff --git a/public/images/pokemon/variant/back/669-red.json b/public/images/pokemon/variant/back/669-red.json index 249fedd9e3d..ff77021293a 100644 --- a/public/images/pokemon/variant/back/669-red.json +++ b/public/images/pokemon/variant/back/669-red.json @@ -3,10 +3,6 @@ "665a1f": "3e0547", "ffe14c": "9c235f", "ccb43d": "6a094f", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8", - "101010": "101010", "65a943": "e493a1", "802d2d": "55061c", "ff7373": "cd4a4a", @@ -21,7 +17,6 @@ "595959": "800d3e", "bfbfbf": "f1a2a9", "f8f8f8": "ffd7db", - "101010": "101010", "65a943": "dc3543", "802d2d": "215510", "ff7373": "afcf4f", diff --git a/public/images/pokemon/variant/back/669-white.json b/public/images/pokemon/variant/back/669-white.json index 2140e493685..54678252991 100644 --- a/public/images/pokemon/variant/back/669-white.json +++ b/public/images/pokemon/variant/back/669-white.json @@ -3,10 +3,6 @@ "665a1f": "110732", "ffe14c": "4c495c", "ccb43d": "302b40", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8", - "101010": "101010", "65a943": "e493a1", "808080": "1e1d2a", "fefefe": "89898e", @@ -20,8 +16,6 @@ "ccb43d": "c4c6bf", "595959": "616a64", "bfbfbf": "d4dcd5", - "f8f8f8": "f8f8f8", - "101010": "101010", "65a943": "636a67", "808080": "215510", "fefefe": "afcf4f", diff --git a/public/images/pokemon/variant/back/669-yellow.json b/public/images/pokemon/variant/back/669-yellow.json index 09e57788049..72a4292bc77 100644 --- a/public/images/pokemon/variant/back/669-yellow.json +++ b/public/images/pokemon/variant/back/669-yellow.json @@ -3,10 +3,6 @@ "665a1f": "034020", "ffe14c": "1a8e16", "ccb43d": "0a6323", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8", - "101010": "101010", "65a943": "e493a1", "807826": "054e19", "fff266": "abb830", @@ -21,7 +17,6 @@ "595959": "6a532c", "bfbfbf": "ead295", "f8f8f8": "fffde0", - "101010": "101010", "65a943": "f1d74b", "807826": "215510", "fff266": "afcf4f", diff --git a/public/images/pokemon/variant/back/670-blue.json b/public/images/pokemon/variant/back/670-blue.json index f06692d2c71..5a413b46ffc 100644 --- a/public/images/pokemon/variant/back/670-blue.json +++ b/public/images/pokemon/variant/back/670-blue.json @@ -5,15 +5,11 @@ "ffe14c": "402bbf", "61c2f2": "4a64cd", "3d9ccc": "3342b8", - "101010": "101010", "ccb43d": "33168e", "6bb347": "1d8057", "3d6629": "094740", "288a71": "e493a1", - "134035": "aa2960", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "134035": "aa2960" }, "2": { "665a1f": "b1b1b1", @@ -21,7 +17,6 @@ "ffe14c": "f8f8f4", "61c2f2": "afcf4f", "3d9ccc": "739f1f", - "101010": "101010", "ccb43d": "dcdad8", "6bb347": "3c403a", "3d6629": "121c0d", diff --git a/public/images/pokemon/variant/back/670-orange.json b/public/images/pokemon/variant/back/670-orange.json index a9f85ce8395..0b5c79f1ca2 100644 --- a/public/images/pokemon/variant/back/670-orange.json +++ b/public/images/pokemon/variant/back/670-orange.json @@ -5,15 +5,11 @@ "ffe14c": "a3382c", "ffb266": "cd9231", "d98d41": "aa571d", - "101010": "101010", "ccb43d": "871723", "6bb347": "1d8057", "3d6629": "094740", "288a71": "e493a1", - "134035": "aa2960", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "134035": "aa2960" }, "2": { "665a1f": "b1b1b1", @@ -21,7 +17,6 @@ "ffe14c": "f8f8f4", "ffb266": "afcf4f", "d98d41": "739f1f", - "101010": "101010", "ccb43d": "dcdad8", "6bb347": "3c403a", "3d6629": "121c0d", diff --git a/public/images/pokemon/variant/back/670-red.json b/public/images/pokemon/variant/back/670-red.json index bfceb377666..151d49c9e93 100644 --- a/public/images/pokemon/variant/back/670-red.json +++ b/public/images/pokemon/variant/back/670-red.json @@ -5,15 +5,11 @@ "ffe14c": "8e1653", "ff7373": "cd4a4a", "d94c4c": "a31f35", - "101010": "101010", "ccb43d": "6a094f", "6bb347": "1d8057", "3d6629": "094740", "288a71": "e493a1", - "134035": "aa2960", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "134035": "aa2960" }, "2": { "665a1f": "b1b1b1", @@ -21,7 +17,6 @@ "ffe14c": "f8f8f4", "ff7373": "afcf4f", "d94c4c": "739f1f", - "101010": "101010", "ccb43d": "dcdad8", "6bb347": "3c403a", "3d6629": "121c0d", diff --git a/public/images/pokemon/variant/back/670-white.json b/public/images/pokemon/variant/back/670-white.json index fa7b45d2158..a05a2c17394 100644 --- a/public/images/pokemon/variant/back/670-white.json +++ b/public/images/pokemon/variant/back/670-white.json @@ -5,15 +5,11 @@ "ffe14c": "3b374e", "fefefe": "747478", "d9d9d9": "4c4b55", - "101010": "101010", "ccb43d": "2c2347", "6bb347": "1d8057", "3d6629": "094740", "288a71": "e493a1", - "134035": "aa2960", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "134035": "aa2960" }, "2": { "665a1f": "b1b1b1", @@ -21,14 +17,11 @@ "ffe14c": "f8f8f4", "fefefe": "afcf4f", "d9d9d9": "739f1f", - "101010": "101010", "ccb43d": "dcdad8", "6bb347": "3c403a", "3d6629": "121c0d", "288a71": "6d716f", "134035": "1c2d32", - "595959": "595959", - "bfbfbf": "c6c6c6", - "f8f8f8": "f8f8f8" + "bfbfbf": "c6c6c6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/670-yellow.json b/public/images/pokemon/variant/back/670-yellow.json index d98e0f97054..683d5e6bc29 100644 --- a/public/images/pokemon/variant/back/670-yellow.json +++ b/public/images/pokemon/variant/back/670-yellow.json @@ -5,15 +5,11 @@ "ffe14c": "1a8021", "fff266": "abb830", "d9cc41": "6f950a", - "101010": "101010", "ccb43d": "0b5c19", "6bb347": "1d8057", "3d6629": "094740", "288a71": "e493a1", - "134035": "aa2960", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "134035": "aa2960" }, "2": { "665a1f": "b1b1b1", @@ -21,7 +17,6 @@ "ffe14c": "f8f8f4", "fff266": "afcf4f", "d9cc41": "739f1f", - "101010": "101010", "ccb43d": "dcdad8", "6bb347": "3c403a", "3d6629": "121c0d", diff --git a/public/images/pokemon/variant/back/6705.json b/public/images/pokemon/variant/back/6705.json index 5cc27fb033d..a6d18c9cf29 100644 --- a/public/images/pokemon/variant/back/6705.json +++ b/public/images/pokemon/variant/back/6705.json @@ -6,7 +6,6 @@ "bfacbf": "e56ca6", "367456": "0c5474", "50ab89": "197497", - "101010": "101010", "60606c": "1f1233", "c5cce0": "513981", "aeb5c6": "442967", @@ -18,13 +17,9 @@ "f2daf2": "9cead8", "4d454d": "194f51", "bfacbf": "5db6a9", - "367456": "367456", - "50ab89": "50ab89", - "101010": "101010", "60606c": "042329", "c5cce0": "176463", "aeb5c6": "0d484a", - "949aab": "073338", - "e3e8f4": "e3e8f4" + "949aab": "073338" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/671-blue.json b/public/images/pokemon/variant/back/671-blue.json index 935eeeab1b3..043958cec7c 100644 --- a/public/images/pokemon/variant/back/671-blue.json +++ b/public/images/pokemon/variant/back/671-blue.json @@ -4,22 +4,17 @@ "73bfbf": "291371", "e5ffff": "69c9e3", "aaf2f2": "3827a3", - "101010": "101010", "3d9ccc": "2938a3", "61c2f2": "3c54b8", "1b594a": "aa1a58", "3aa68b": "ff91a4", - "2d806b": "dc5073", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "2d806b": "dc5073" }, "2": { "476d80": "07230a", "73bfbf": "28392c", "e5ffff": "dfe3e1", "aaf2f2": "4d4e46", - "101010": "101010", "3d9ccc": "7f9f1f", "61c2f2": "afcf4f", "1b594a": "0d4a80", diff --git a/public/images/pokemon/variant/back/671-orange.json b/public/images/pokemon/variant/back/671-orange.json index 08a78a394bb..9c9f0faa7fe 100644 --- a/public/images/pokemon/variant/back/671-orange.json +++ b/public/images/pokemon/variant/back/671-orange.json @@ -4,22 +4,17 @@ "cca37a": "631818", "fff2e5": "ffbc77", "ffd9b2": "a34b2c", - "101010": "101010", "d98d41": "954c17", "ffb266": "cd8e31", "1b594a": "aa1a58", "3aa68b": "ff91a4", - "2d806b": "dc5073", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "2d806b": "dc5073" }, "2": { "71543f": "07230a", "cca37a": "28392c", "fff2e5": "dfe3e1", "ffd9b2": "4d4e46", - "101010": "101010", "d98d41": "7f9f1f", "ffb266": "afcf4f", "1b594a": "800707", diff --git a/public/images/pokemon/variant/back/671-red.json b/public/images/pokemon/variant/back/671-red.json index 642c0c96cae..de5714bdcbf 100644 --- a/public/images/pokemon/variant/back/671-red.json +++ b/public/images/pokemon/variant/back/671-red.json @@ -4,22 +4,17 @@ "a66390": "4e0c38", "ffb2cc": "ff90a2", "d998c3": "8e1a55", - "101010": "101010", "d94c4c": "95172c", "ff7373": "c64040", "1b594a": "aa1a58", "3aa68b": "ff91a4", - "2d806b": "dc5073", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "2d806b": "dc5073" }, "2": { "683644": "07230a", "a66390": "28392c", "ffb2cc": "dfe3e1", "d998c3": "4d4e46", - "101010": "101010", "d94c4c": "7f9f1f", "ff7373": "afcf4f", "1b594a": "710846", diff --git a/public/images/pokemon/variant/back/671-white.json b/public/images/pokemon/variant/back/671-white.json index 9f3e489ca31..9e96be30a78 100644 --- a/public/images/pokemon/variant/back/671-white.json +++ b/public/images/pokemon/variant/back/671-white.json @@ -4,29 +4,22 @@ "b3b3b3": "272232", "ffbfca": "c2c1c6", "f2f2f2": "353340", - "101010": "101010", "d9d9d9": "3c3b47", "fefefe": "60616a", "1b594a": "aa1a58", "3aa68b": "ff91a4", - "2d806b": "dc5073", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "2d806b": "dc5073" }, "2": { "808080": "07230a", "b3b3b3": "28392c", "ffbfca": "dfe3e1", "f2f2f2": "4d4e46", - "101010": "101010", "d9d9d9": "7f9f1f", "fefefe": "afcf4f", "1b594a": "1c2d32", "3aa68b": "6d716f", "2d806b": "3c4747", - "595959": "595959", - "bfbfbf": "bfbfbf", "f8f8f8": "f9f9f9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/671-yellow.json b/public/images/pokemon/variant/back/671-yellow.json index a2aea6302ad..246f3a756b5 100644 --- a/public/images/pokemon/variant/back/671-yellow.json +++ b/public/images/pokemon/variant/back/671-yellow.json @@ -4,22 +4,17 @@ "ccb485": "227850", "ffd2a6": "ffe593", "ffeabf": "22b14a", - "101010": "101010", "d9cc41": "789c16", "fff266": "b0bf2b", "1b594a": "aa1a58", "3aa68b": "ff91a4", - "2d806b": "dc5073", - "595959": "595959", - "bfbfbf": "bfbfbf", - "f8f8f8": "f8f8f8" + "2d806b": "dc5073" }, "2": { "6e6b4a": "07230a", "ccb485": "28392c", "ffd2a6": "dfe3e1", "ffeabf": "4d4e46", - "101010": "101010", "d9cc41": "7f9f1f", "fff266": "afcf4f", "1b594a": "8e4d0a", diff --git a/public/images/pokemon/variant/back/6713.json b/public/images/pokemon/variant/back/6713.json index a0ba9eb72ad..721679daf7d 100644 --- a/public/images/pokemon/variant/back/6713.json +++ b/public/images/pokemon/variant/back/6713.json @@ -3,7 +3,6 @@ "737373": "7a993d", "e8e8e8": "cfe68a", "729ac2": "d97389", - "101010": "101010", "bfbfbf": "9dcc3e", "bff4ff": "ffbfda", "6b5442": "732334", @@ -19,7 +18,6 @@ "737373": "641531", "e8e8e8": "bf576b", "729ac2": "cc7b1e", - "101010": "101010", "bfbfbf": "993554", "bff4ff": "fcc95c", "6b5442": "2c7a75", diff --git a/public/images/pokemon/variant/back/672.json b/public/images/pokemon/variant/back/672.json index ad732e63266..c477cacb3bb 100644 --- a/public/images/pokemon/variant/back/672.json +++ b/public/images/pokemon/variant/back/672.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "737373": "9e2c3d", "404040": "73132e", "403830": "642509", @@ -16,7 +15,6 @@ "ff884c": "552d30" }, "2": { - "101010": "101010", "737373": "2d2b40", "404040": "161526", "403830": "305a4f", diff --git a/public/images/pokemon/variant/back/673.json b/public/images/pokemon/variant/back/673.json index 2861d12d0dd..a9ec1635f4e 100644 --- a/public/images/pokemon/variant/back/673.json +++ b/public/images/pokemon/variant/back/673.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "666666": "9e2c3d", "404040": "73132e", "542914": "471405", @@ -16,7 +15,6 @@ "d6b778": "ce8648" }, "2": { - "101010": "101010", "666666": "2d2b40", "404040": "161526", "542914": "37224d", diff --git a/public/images/pokemon/variant/back/677.json b/public/images/pokemon/variant/back/677.json index 425ffc7ec90..c3b8df46589 100644 --- a/public/images/pokemon/variant/back/677.json +++ b/public/images/pokemon/variant/back/677.json @@ -4,15 +4,13 @@ "b8b8cc": "bd5c81", "45454d": "470d28", "8a8a99": "943b5d", - "f8f8f8": "f1f0e4", - "101010": "101010" + "f8f8f8": "f1f0e4" }, "2": { "5c5c66": "243e41", "b8b8cc": "6ba78a", "45454d": "193437", "8a8a99": "426b62", - "f8f8f8": "67415e", - "101010": "101010" + "f8f8f8": "67415e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/678-female.json b/public/images/pokemon/variant/back/678-female.json index c628e4db4ed..578b1f6f47e 100644 --- a/public/images/pokemon/variant/back/678-female.json +++ b/public/images/pokemon/variant/back/678-female.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "737373": "947859", "bfbfbf": "d5c49f", "f8f8f8": "f8f5cd", @@ -9,7 +8,6 @@ "365fb3": "a5346b" }, "2": { - "101010": "101010", "737373": "3a1633", "bfbfbf": "613d5a", "f8f8f8": "855577", diff --git a/public/images/pokemon/variant/back/678.json b/public/images/pokemon/variant/back/678.json index c628e4db4ed..578b1f6f47e 100644 --- a/public/images/pokemon/variant/back/678.json +++ b/public/images/pokemon/variant/back/678.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "737373": "947859", "bfbfbf": "d5c49f", "f8f8f8": "f8f5cd", @@ -9,7 +8,6 @@ "365fb3": "a5346b" }, "2": { - "101010": "101010", "737373": "3a1633", "bfbfbf": "613d5a", "f8f8f8": "855577", diff --git a/public/images/pokemon/variant/back/69.json b/public/images/pokemon/variant/back/69.json index b93b8b335e7..2e87f433d28 100644 --- a/public/images/pokemon/variant/back/69.json +++ b/public/images/pokemon/variant/back/69.json @@ -1,15 +1,11 @@ { "1": { "ad7b42": "841d4a", - "ffffff": "ffffff", "f7e673": "d97076", "d6bd63": "b04d64", "5a3a00": "3b0239", "000000": "1d0015", "946b42": "4f0537", - "b54231": "b54231", - "d6636b": "d6636b", - "732100": "732100", "426b10": "b3273e", "7bc552": "f3a480", "63a542": "d0735b", @@ -17,7 +13,6 @@ }, "2": { "ad7b42": "5380b6", - "ffffff": "ffffff", "f7e673": "b6e9ff", "d6bd63": "7fb1d9", "5a3a00": "324884", diff --git a/public/images/pokemon/variant/back/690.json b/public/images/pokemon/variant/back/690.json index a513e813823..7e4536149f9 100644 --- a/public/images/pokemon/variant/back/690.json +++ b/public/images/pokemon/variant/back/690.json @@ -2,7 +2,6 @@ "1": { "3f6273": "310511", "4d341b": "181243", - "101010": "101010", "a6e1ff": "792a48", "a6703a": "3e44a2", "7ec3e5": "6b1f42", @@ -16,7 +15,6 @@ "2": { "3f6273": "340628", "4d341b": "042431", - "101010": "101010", "a6e1ff": "633060", "a6703a": "2c5d64", "7ec3e5": "481a42", diff --git a/public/images/pokemon/variant/back/691.json b/public/images/pokemon/variant/back/691.json index 5ed68809c44..849dd6a4e5b 100644 --- a/public/images/pokemon/variant/back/691.json +++ b/public/images/pokemon/variant/back/691.json @@ -1,7 +1,6 @@ { "1": { "4d4d2e": "31246d", - "101010": "101010", "b3b36b": "403c94", "80804d": "382f7d", "732230": "310511", @@ -17,7 +16,6 @@ }, "2": { "4d4d2e": "07262e", - "101010": "101010", "b3b36b": "1d4952", "80804d": "0d3338", "732230": "340b33", diff --git a/public/images/pokemon/variant/back/696.json b/public/images/pokemon/variant/back/696.json index a953f1b1cb3..48a55116ffa 100644 --- a/public/images/pokemon/variant/back/696.json +++ b/public/images/pokemon/variant/back/696.json @@ -1,53 +1,27 @@ { "1": { - "734517":"5e0b0b", - "ffa64c":"a50d0d", - "4a322c":"023425", - "101010":"101010", - "404040":"4c3216", - "966858":"1b6430", - "f8f8f8":"dfdea7", - "65483a":"0b4c29", - "bfbfbf":"cbbe8c", - "8c8c8c":"ad8c63", - "121212":"121212", - "bdbdbd":"cfc28f" + "734517": "5e0b0b", + "ffa64c": "a50d0d", + "4a322c": "023425", + "404040": "4c3216", + "966858": "1b6430", + "f8f8f8": "dfdea7", + "65483a": "0b4c29", + "bfbfbf": "cbbe8c", + "8c8c8c": "ad8c63", + "bdbdbd": "cfc28f" }, "2": { - "734517":"395cb7", - "ffa64c":"d2e9ff", - "4a322c":"3e1f18", - "101010":"101010", - "404040":"250860", - "966858":"83726e", - "f8f8f8":"6e46a7", - "65483a":"644943", - "bfbfbf":"593097", - "8c8c8c":"411684", - "121212":"decaff", - "bdbdbd":"79c8d3" + "734517": "395cb7", + "ffa64c": "d2e9ff", + "4a322c": "3e1f18", + "404040": "250860", + "966858": "83726e", + "f8f8f8": "6e46a7", + "65483a": "644943", + "bfbfbf": "593097", + "8c8c8c": "411684", + "121212": "decaff", + "bdbdbd": "79c8d3" } -} - - - - - - - - - - - - - - - - - - - - - - - +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/697.json b/public/images/pokemon/variant/back/697.json index 392be597d2e..5c4c49c531b 100644 --- a/public/images/pokemon/variant/back/697.json +++ b/public/images/pokemon/variant/back/697.json @@ -1,32 +1,30 @@ { "1": { - "54434c":"4c3216", - "080808":"080808", - "fafafa":"dfdea7", - "cccccc":"cbbe8c", - "964b1c":"5e0b0b", - "f19d5a":"b52424", - "bf7545":"971c1c", - "50131e":"0b241e", - "963e4e":"285234", - "722533":"153626", - "9f9d98":"ad8c63", - "35272e":"36282f", - "584650":"4f3417" + "54434c": "4c3216", + "fafafa": "dfdea7", + "cccccc": "cbbe8c", + "964b1c": "5e0b0b", + "f19d5a": "b52424", + "bf7545": "971c1c", + "50131e": "0b241e", + "963e4e": "285234", + "722533": "153626", + "9f9d98": "ad8c63", + "35272e": "36282f", + "584650": "4f3417" }, "2": { - "54434c":"170c25", - "080808":"080808", - "fafafa":"4b2e64", - "cccccc":"33214f", - "964b1c":"9d5390", - "f19d5a":"f4dbf6", - "bf7545":"ce7ecc", - "50131e":"52352f", - "963e4e":"ab9b97", - "722533":"83726e", - "9f9d98":"26173b", - "35272e":"a15593", - "584650":"cc7cc9" + "54434c": "170c25", + "fafafa": "4b2e64", + "cccccc": "33214f", + "964b1c": "9d5390", + "f19d5a": "f4dbf6", + "bf7545": "ce7ecc", + "50131e": "52352f", + "963e4e": "ab9b97", + "722533": "83726e", + "9f9d98": "26173b", + "35272e": "a15593", + "584650": "cc7cc9" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/698.json b/public/images/pokemon/variant/back/698.json index 48a717ac503..e47f88780ac 100644 --- a/public/images/pokemon/variant/back/698.json +++ b/public/images/pokemon/variant/back/698.json @@ -5,13 +5,10 @@ "fff2b2": "9bffa9", "537180": "b04f4b", "a6e1ff": "efab87", - "101010": "101010", "85b4cc": "cf755d", "217aa6": "7f99e1", "30b2f2": "b5dcff", - "fdfdfd": "fdfdfd", - "c0c0c0": "d7cca0", - "cacaca": "cacaca" + "c0c0c0": "d7cca0" }, "2": { "b3747e": "c452a6", @@ -19,12 +16,9 @@ "fff2b2": "eb88b9", "537180": "392d65", "a6e1ff": "936daa", - "101010": "101010", "85b4cc": "654a8a", "217aa6": "efaa51", "30b2f2": "ffd169", - "fdfdfd": "fdfdfd", - "c0c0c0": "282747", - "cacaca": "cacaca" + "c0c0c0": "282747" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/699.json b/public/images/pokemon/variant/back/699.json index aa7a63c04c6..34be21e1ec5 100644 --- a/public/images/pokemon/variant/back/699.json +++ b/public/images/pokemon/variant/back/699.json @@ -10,8 +10,6 @@ "657dac": "c44f5d", "ffffff": "ffeac0", "4e568b": "a03c58", - "101010": "101010", - "f8f8f8": "f8f8f8", "3d8eb6": "12545e", "53c5ff": "1c7376", "94b7bd": "d3a47b", @@ -31,8 +29,6 @@ "657dac": "2f4978", "ffffff": "bae8ff", "4e568b": "243369", - "101010": "101010", - "f8f8f8": "f8f8f8", "3d8eb6": "852d6b", "53c5ff": "ab467e", "94b7bd": "261e44", diff --git a/public/images/pokemon/variant/back/700.json b/public/images/pokemon/variant/back/700.json index a7d41e68dd6..129e418ea69 100644 --- a/public/images/pokemon/variant/back/700.json +++ b/public/images/pokemon/variant/back/700.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "8a2843": "452f89", "235a99": "a63071", "d85a7a": "996cd2", @@ -13,7 +12,6 @@ "a88d8c": "8c8fa8" }, "2": { - "101010": "101010", "8a2843": "0e6134", "235a99": "900d1b", "d85a7a": "5dae7d", diff --git a/public/images/pokemon/variant/back/702.json b/public/images/pokemon/variant/back/702.json index 1c19fa48122..81e527f87bd 100644 --- a/public/images/pokemon/variant/back/702.json +++ b/public/images/pokemon/variant/back/702.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "4d4d4d": "6789b3", "262626": "2a3b5e", "735c2e": "a53c42", @@ -9,7 +8,6 @@ "997a3d": "c9685f" }, "2": { - "101010": "101010", "4d4d4d": "197870", "262626": "072d38", "735c2e": "1e0e27", diff --git a/public/images/pokemon/variant/back/703.json b/public/images/pokemon/variant/back/703.json index 951c8b311b9..f5dc35b243e 100644 --- a/public/images/pokemon/variant/back/703.json +++ b/public/images/pokemon/variant/back/703.json @@ -5,9 +5,7 @@ "6994bf": "e67c37", "8cc6ff": "ffa633", "8f8fb3": "4d496b", - "f8f8f8": "f8f8f8", "666680": "37344e", - "101010": "101010", "595959": "e6ac60", "bfbfbf": "ffd3a1", "f2f2f2": "ffeed6" @@ -20,7 +18,6 @@ "8f8fb3": "e4cdf9", "f8f8f8": "ffe2ee", "666680": "cca1db", - "101010": "101010", "595959": "5a3d84", "bfbfbf": "8359a7", "f2f2f2": "a473bf" diff --git a/public/images/pokemon/variant/back/704.json b/public/images/pokemon/variant/back/704.json index be52dd71a83..f293f542288 100644 --- a/public/images/pokemon/variant/back/704.json +++ b/public/images/pokemon/variant/back/704.json @@ -4,7 +4,6 @@ "4d454d": "8a2166", "f2daf2": "fbb3d2", "bfacbf": "c77da0", - "101010": "101010", "66cc52": "348fa6", "4d993d": "185d83", "8f7db3": "7d699d", @@ -16,7 +15,6 @@ "4d454d": "134557", "f2daf2": "92d8c8", "bfacbf": "5f8d86", - "101010": "101010", "66cc52": "bb7935", "4d993d": "a34205", "8f7db3": "2f5d6f", diff --git a/public/images/pokemon/variant/back/705.json b/public/images/pokemon/variant/back/705.json index 7d0e856616d..603dc58909d 100644 --- a/public/images/pokemon/variant/back/705.json +++ b/public/images/pokemon/variant/back/705.json @@ -6,7 +6,6 @@ "bfacbf": "ca719c", "647543": "0c5474", "98bd51": "197497", - "101010": "101010", "665980": "4e4094", "8f7db3": "8b69c3", "b8a1e5": "c7a1e5" @@ -18,7 +17,6 @@ "bfacbf": "4e9b8f", "647543": "842401", "98bd51": "a34205", - "101010": "101010", "665980": "274159", "8f7db3": "2f667c", "b8a1e5": "4a9699" diff --git a/public/images/pokemon/variant/back/706.json b/public/images/pokemon/variant/back/706.json index ff21462bf22..cc05bcd250d 100644 --- a/public/images/pokemon/variant/back/706.json +++ b/public/images/pokemon/variant/back/706.json @@ -4,8 +4,6 @@ "e6d4e7": "f1a4c5", "4d454d": "8a2166", "bfacbf": "cd7aa1", - "f8f8f8": "f8f8f8", - "101010": "101010", "998a99": "b24c86", "307922": "0c5474", "46b030": "197497", @@ -21,8 +19,6 @@ "e6d4e7": "9cead8", "4d454d": "0e4043", "bfacbf": "559b91", - "f8f8f8": "f8f8f8", - "101010": "101010", "998a99": "2b736f", "307922": "842401", "46b030": "a34205", diff --git a/public/images/pokemon/variant/back/708.json b/public/images/pokemon/variant/back/708.json index e3ffaa6e659..700c6e16135 100644 --- a/public/images/pokemon/variant/back/708.json +++ b/public/images/pokemon/variant/back/708.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "2b303c": "722023", "494e5b": "a14743", "56372f": "36384f", @@ -10,7 +9,6 @@ "775943": "575a6a" }, "2": { - "101010": "101010", "2b303c": "6f5f80", "494e5b": "9c92a4", "56372f": "31161d", diff --git a/public/images/pokemon/variant/back/709.json b/public/images/pokemon/variant/back/709.json index 51b5ea55f48..b2327699b93 100644 --- a/public/images/pokemon/variant/back/709.json +++ b/public/images/pokemon/variant/back/709.json @@ -2,7 +2,6 @@ "1": { "4d361f": "36384f", "174d3b": "361f1b", - "101010": "101010", "cc8f52": "7c808c", "36b389": "907f76", "268062": "4d362e", @@ -13,7 +12,6 @@ "2": { "4d361f": "47232b", "174d3b": "761d52", - "101010": "101010", "cc8f52": "7e5658", "36b389": "da7ea8", "268062": "a94079", diff --git a/public/images/pokemon/variant/back/71.json b/public/images/pokemon/variant/back/71.json index bc672f7bcf7..bc7e00d221e 100644 --- a/public/images/pokemon/variant/back/71.json +++ b/public/images/pokemon/variant/back/71.json @@ -2,7 +2,6 @@ "1": { "635229": "4f0537", "a57b31": "781649", - "000000": "000000", "4aa57b": "e28e58", "10633a": "b0552e", "8cc57b": "e28e58", @@ -12,8 +11,6 @@ "ef8c52": "b352a5", "efd66b": "b6514d", "f7ef94": "d37763", - "bdc5c5": "bdc5c5", - "ffffff": "ffffff", "b5e69c": "f9be81" }, "2": { @@ -29,8 +26,6 @@ "ef8c52": "3250c7", "efd66b": "6880c2", "f7ef94": "7998d3", - "bdc5c5": "bdc5c5", - "ffffff": "ffffff", "b5e69c": "cfe3e5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/710.json b/public/images/pokemon/variant/back/710.json index 63492302b69..443197883f6 100644 --- a/public/images/pokemon/variant/back/710.json +++ b/public/images/pokemon/variant/back/710.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "664e42": "72a966", "332721": "213a22", "4d3b32": "478243", @@ -9,7 +8,6 @@ "d98777": "404040" }, "2": { - "101010": "101010", "664e42": "425947", "332721": "0e2218", "4d3b32": "2a4031", diff --git a/public/images/pokemon/variant/back/711.json b/public/images/pokemon/variant/back/711.json index dfa0005fa7d..b75b1846b79 100644 --- a/public/images/pokemon/variant/back/711.json +++ b/public/images/pokemon/variant/back/711.json @@ -1,6 +1,5 @@ { "0": { - "070707": "070707", "605347": "593a59", "34281d": "291431", "4a4127": "311835", @@ -13,7 +12,6 @@ "c99c6b": "b98e55" }, "1": { - "070707": "070707", "605347": "353631", "34281d": "0f1014", "4a4127": "202423", @@ -26,7 +24,6 @@ "c99c6b": "baa78d" }, "2": { - "070707": "070707", "605347": "e56146", "34281d": "5e0b09", "4a4127": "ad3b33", diff --git a/public/images/pokemon/variant/back/712.json b/public/images/pokemon/variant/back/712.json index 59ad2436866..6a9f45ffebd 100644 --- a/public/images/pokemon/variant/back/712.json +++ b/public/images/pokemon/variant/back/712.json @@ -4,11 +4,7 @@ "58647b": "bf566d", "b3eaf8": "ffbfda", "a5c4d2": "f29eb3", - "e8f5fe": "ffebf2", - "101010": "101010", - "bfbfbf": "bfbfbf", - "737373": "737373", - "f8f8f8": "f8f8f8" + "e8f5fe": "ffebf2" }, "2": { "719aa9": "cc7b1e", @@ -16,7 +12,6 @@ "b3eaf8": "fcc95c", "a5c4d2": "e69e2b", "e8f5fe": "fff2ad", - "101010": "101010", "bfbfbf": "6cb3ae", "737373": "2c7a75", "f8f8f8": "b9f2ee" diff --git a/public/images/pokemon/variant/back/713.json b/public/images/pokemon/variant/back/713.json index 61977f60470..03f24a2226d 100644 --- a/public/images/pokemon/variant/back/713.json +++ b/public/images/pokemon/variant/back/713.json @@ -6,8 +6,7 @@ "bff4ff": "ffbfda", "335980": "994255", "f2ffff": "ffebf2", - "77b8d9": "d97389", - "101010": "101010" + "77b8d9": "d97389" }, "2": { "608cba": "a8632a", @@ -16,7 +15,6 @@ "bff4ff": "fcc95c", "335980": "824628", "f2ffff": "fff2ad", - "77b8d9": "cc7b1e", - "101010": "101010" + "77b8d9": "cc7b1e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/714.json b/public/images/pokemon/variant/back/714.json index c2082c3933b..6eed2094909 100644 --- a/public/images/pokemon/variant/back/714.json +++ b/public/images/pokemon/variant/back/714.json @@ -2,7 +2,6 @@ "1": { "633674": "500a25", "b459d5": "a42c54", - "101010": "101010", "85489b": "8e1d4b", "3f3f3f": "202558", "756175": "43167f", @@ -13,7 +12,6 @@ "2": { "633674": "5f151c", "b459d5": "c24430", - "101010": "101010", "85489b": "882c27", "3f3f3f": "5b1922", "756175": "945d56", diff --git a/public/images/pokemon/variant/back/715.json b/public/images/pokemon/variant/back/715.json index 7ca4d81e5dc..0d07fb84711 100644 --- a/public/images/pokemon/variant/back/715.json +++ b/public/images/pokemon/variant/back/715.json @@ -1,38 +1,32 @@ { - "1": { - "101010": "101010", - "287366": "731338", - "3aa694": "a42c54", - "404040": "542f98", - "343434": "3e107b", - "252525": "260447", - "4cd9c1": "d04b6c", - "595959": "7a5ccc", - "6a3f73": "0f103c", - "737373": "563d8f", - "801a1a": "801a1a", - "8e5499": "202558", - "bd70cc": "2f386b", - "bfbfbf": "ab83dd", - "e52e2e": "e52e2e", - "f8f8f8": "d5bdec" - }, - "2": { - "101010": "101010", - "287366": "832714", - "3aa694": "b8552c", - "404040": "b18373", - "343434": "906152", - "252525": "6c3f39", - "4cd9c1": "dd834c", - "595959": "e2c7b5", - "6a3f73": "3b0c18", - "737373": "280911", - "801a1a": "801a1a", - "8e5499": "5b1922", - "bd70cc": "7c2928", - "bfbfbf": "43191e", - "e52e2e": "e52e2e", - "f8f8f8": "5a2a2b" - } + "1": { + "287366": "731338", + "3aa694": "a42c54", + "404040": "542f98", + "343434": "3e107b", + "252525": "260447", + "4cd9c1": "d04b6c", + "595959": "7a5ccc", + "6a3f73": "0f103c", + "737373": "563d8f", + "8e5499": "202558", + "bd70cc": "2f386b", + "bfbfbf": "ab83dd", + "f8f8f8": "d5bdec" + }, + "2": { + "287366": "832714", + "3aa694": "b8552c", + "404040": "b18373", + "343434": "906152", + "252525": "6c3f39", + "4cd9c1": "dd834c", + "595959": "e2c7b5", + "6a3f73": "3b0c18", + "737373": "280911", + "8e5499": "5b1922", + "bd70cc": "7c2928", + "bfbfbf": "43191e", + "f8f8f8": "5a2a2b" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/716-active.json b/public/images/pokemon/variant/back/716-active.json index 1b3ad588fce..fc83877da6c 100644 --- a/public/images/pokemon/variant/back/716-active.json +++ b/public/images/pokemon/variant/back/716-active.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "ccbd8f": "c27f52", "345090": "75127d", "807659": "7e4428", @@ -16,8 +15,6 @@ "c37732": "36c1a4", "547fe9": "b33ccd", "dd3238": "2e73b1", - "5959b3": "5959b3", - "9191f2": "9191f2", "243659": "132b1b", "3d5c99": "1e3824", "ffecb2": "f0c197", @@ -27,7 +24,6 @@ "5c8ae5": "324c37" }, "2": { - "101010": "101010", "ccbd8f": "3b2328", "345090": "93221f", "807659": "210f14", @@ -43,8 +39,6 @@ "c37732": "7445f1", "547fe9": "d75343", "dd3238": "e445d0", - "5959b3": "5959b3", - "9191f2": "9191f2", "243659": "37134c", "3d5c99": "643071", "ffecb2": "553639", diff --git a/public/images/pokemon/variant/back/716-neutral.json b/public/images/pokemon/variant/back/716-neutral.json index 8d70b9ee2ca..f15d9fc64dc 100644 --- a/public/images/pokemon/variant/back/716-neutral.json +++ b/public/images/pokemon/variant/back/716-neutral.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "84b4ce": "ac8781", "364566": "603f3c", "c0e0ec": "bfa19a", @@ -12,7 +11,6 @@ "5c8ae5": "324c37" }, "2": { - "101010": "101010", "84b4ce": "42283b", "364566": "230d1e", "c0e0ec": "613e56", diff --git a/public/images/pokemon/variant/back/717.json b/public/images/pokemon/variant/back/717.json index 1104b74cf71..615b092ba9c 100644 --- a/public/images/pokemon/variant/back/717.json +++ b/public/images/pokemon/variant/back/717.json @@ -2,7 +2,6 @@ "1": { "4d4d4d": "816450", "b3b3b3": "dbd4cd", - "101010": "101010", "737373": "c1aa9a", "242626": "0f0b2c", "8c8c8c": "cbbfb5", diff --git a/public/images/pokemon/variant/back/720-unbound.json b/public/images/pokemon/variant/back/720-unbound.json index 61c6c599b5d..b8764c786d3 100644 --- a/public/images/pokemon/variant/back/720-unbound.json +++ b/public/images/pokemon/variant/back/720-unbound.json @@ -8,7 +8,6 @@ "7b91a3": "958672", "925b0f": "414a79", "2c2c2c": "3e162b", - "010101": "010101", "dba423": "9ca7d5", "e0ca61": "becef5", "4f4f4f": "684252" @@ -22,7 +21,6 @@ "7b91a3": "997392", "925b0f": "853015", "2c2c2c": "632373", - "010101": "010101", "dba423": "e2885a", "e0ca61": "ffc26a", "4f4f4f": "a947b4" @@ -36,7 +34,6 @@ "7b91a3": "5c827d", "925b0f": "682b16", "2c2c2c": "1c2433", - "010101": "010101", "dba423": "b05d2d", "e0ca61": "ed9b42", "4f4f4f": "304757" diff --git a/public/images/pokemon/variant/back/720.json b/public/images/pokemon/variant/back/720.json index 49f525d94b0..8d53be6f7f9 100644 --- a/public/images/pokemon/variant/back/720.json +++ b/public/images/pokemon/variant/back/720.json @@ -8,7 +8,6 @@ "807126": "414a79", "ffe14c": "c5deec", "fdfdfd": "f3feff", - "101010": "101010", "ccb43d": "9cafdd", "b8b8cc": "cc9b3c", "dadaf2": "ffdb73" @@ -22,7 +21,6 @@ "807126": "853015", "ffe14c": "ffc26a", "fdfdfd": "fff0e8", - "101010": "101010", "ccb43d": "eb7037", "b8b8cc": "ca79bd", "dadaf2": "f7bae9" @@ -36,7 +34,6 @@ "807126": "682b16", "ffe14c": "ffc26a", "fdfdfd": "ffffde", - "101010": "101010", "ccb43d": "b05d2d", "b8b8cc": "9e8fbb", "dadaf2": "d5cce5" diff --git a/public/images/pokemon/variant/back/728.json b/public/images/pokemon/variant/back/728.json index fb17e2c119e..cd73143937a 100644 --- a/public/images/pokemon/variant/back/728.json +++ b/public/images/pokemon/variant/back/728.json @@ -7,8 +7,6 @@ "436cbf": "009469", "b3627d": "e54c41", "6c90d9": "14af82", - "101010": "101010", - "808080": "808080", "bfbfbf": "c2beb4", "314f8c": "006355", "639ba6": "858d7d", @@ -24,8 +22,6 @@ "436cbf": "a6213f", "b3627d": "a7225c", "6c90d9": "be294a", - "101010": "101010", - "808080": "808080", "bfbfbf": "bfb4b9", "314f8c": "770f29", "639ba6": "b88389", diff --git a/public/images/pokemon/variant/back/729.json b/public/images/pokemon/variant/back/729.json index c4d13768085..27c3cf46560 100644 --- a/public/images/pokemon/variant/back/729.json +++ b/public/images/pokemon/variant/back/729.json @@ -1,6 +1,5 @@ { "1": { - "808080": "808080", "f8f8f8": "fff6e2", "bfbfbf": "c2beb4", "8dafaf": "ff989e", @@ -9,13 +8,11 @@ "326187": "006b65", "2d8ec4": "009a88", "1eb9ee": "0ccfa2", - "101010": "101010", "733f50": "bb402f", "e57ea1": "ff9384", "b3627d": "fb6051" }, "2": { - "808080": "808080", "f8f8f8": "f5edee", "bfbfbf": "bfb4b9", "8dafaf": "b681a6", @@ -23,10 +20,6 @@ "bad8d8": "deabce", "326187": "5a141b", "2d8ec4": "952c3f", - "1eb9ee": "c6496f", - "101010": "101010", - "733f50": "733f50", - "e57ea1": "e57ea1", - "b3627d": "b3627d" + "1eb9ee": "c6496f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/730.json b/public/images/pokemon/variant/back/730.json index eec815b0572..9ac00923a7a 100644 --- a/public/images/pokemon/variant/back/730.json +++ b/public/images/pokemon/variant/back/730.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "8d3f4a": "a62c20", "c76374": "e54c41", "0e6792": "b54f5f", @@ -18,11 +17,9 @@ "c0bdc1": "beaac0", "aac7e6": "ea7c5b", "f8f8f8": "fff2d4", - "faf8f8": "f1e8f1", - "fef8f8": "fef8f8" + "faf8f8": "f1e8f1" }, "2": { - "101010": "101010", "8d3f4a": "1d1638", "c76374": "391e62", "0e6792": "500518", @@ -40,7 +37,6 @@ "c0bdc1": "c0b4a5", "aac7e6": "e9a5c0", "f8f8f8": "f5edee", - "faf8f8": "f5f3e3", - "fef8f8": "fef8f8" + "faf8f8": "f5f3e3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/734.json b/public/images/pokemon/variant/back/734.json index 0a47457f284..f398dec7ae5 100644 --- a/public/images/pokemon/variant/back/734.json +++ b/public/images/pokemon/variant/back/734.json @@ -6,7 +6,6 @@ "ba836d": "35576b", "db9f4f": "907e82", "9c5b50": "2a3f52", - "080808": "080808", "413d38": "523716" }, "2": { @@ -16,7 +15,6 @@ "ba836d": "a69c98", "db9f4f": "362e2e", "9c5b50": "786a66", - "080808": "080808", "413d38": "464a4d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/735.json b/public/images/pokemon/variant/back/735.json index ed9354a9ee8..e87a187b31f 100644 --- a/public/images/pokemon/variant/back/735.json +++ b/public/images/pokemon/variant/back/735.json @@ -3,7 +3,6 @@ "84521a": "462f39", "ecd96c": "b99d95", "b6973a": "7a6a6d", - "101010": "101010", "af754e": "354c6b", "8d473d": "2a3252", "602c24": "03102d", @@ -14,7 +13,6 @@ "84521a": "241b1b", "ecd96c": "4d4242", "b6973a": "362e2e", - "101010": "101010", "af754e": "ada5a4", "8d473d": "90827e", "602c24": "524b4b", diff --git a/public/images/pokemon/variant/back/747.json b/public/images/pokemon/variant/back/747.json index 946fd0fa0aa..c98a0cd804f 100644 --- a/public/images/pokemon/variant/back/747.json +++ b/public/images/pokemon/variant/back/747.json @@ -4,7 +4,6 @@ "f9e07d": "e3e2ff", "753e7b": "9b6459", "ba8dbe": "edd5ca", - "101010": "101010", "9265a3": "7d2671", "335780": "490a3c", "dcafd6": "a21f90", @@ -16,7 +15,6 @@ "f9e07d": "ffebed", "753e7b": "113c3a", "ba8dbe": "2b6157", - "101010": "101010", "9265a3": "e5214a", "335780": "12484e", "dcafd6": "ff3f5a", diff --git a/public/images/pokemon/variant/back/748.json b/public/images/pokemon/variant/back/748.json index 80953670173..c486f245f2e 100644 --- a/public/images/pokemon/variant/back/748.json +++ b/public/images/pokemon/variant/back/748.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "943732": "5c075b", "f28c4f": "c639bd", "e25025": "a21f90", @@ -11,11 +10,9 @@ "455b85": "892e20", "711a6a": "81463e", "b7429a": "d29784", - "d76fa5": "edd5ca", - "171539": "171539" + "d76fa5": "edd5ca" }, "2": { - "101010": "101010", "943732": "ac063c", "f28c4f": "ff3f5a", "e25025": "e12350", @@ -26,7 +23,6 @@ "455b85": "186443", "711a6a": "082b29", "b7429a": "1c524b", - "d76fa5": "2b6157", - "171539": "171539" + "d76fa5": "2b6157" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/751.json b/public/images/pokemon/variant/back/751.json index 40dc82691e9..60f85c366f2 100644 --- a/public/images/pokemon/variant/back/751.json +++ b/public/images/pokemon/variant/back/751.json @@ -3,7 +3,6 @@ "8895ac": "ae504b", "e8e8ea": "ffc8d1", "69670e": "3a112f", - "fcfcfc": "fcfcfc", "878330": "431632", "9bad34": "4e1f42", "cedf42": "673252", @@ -11,22 +10,18 @@ "79c4d4": "f3bd8a", "aed7ee": "fcfcfc", "516a7b": "812b3e", - "5e9cbd": "cc7854", - "101010": "101010" + "5e9cbd": "cc7854" }, "2": { "8895ac": "ea9b43", "e8e8ea": "f1dcc2", "69670e": "263756", - "fcfcfc": "fcfcfc", "878330": "37619a", "9bad34": "4980ac", "cedf42": "72add9", "3c4459": "73312f", "79c4d4": "3b5373", - "aed7ee": "aed7ee", "516a7b": "ba5c2c", - "5e9cbd": "253155", - "101010": "101010" + "5e9cbd": "253155" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/752.json b/public/images/pokemon/variant/back/752.json index 19976c0f3ec..26e7cf2c614 100644 --- a/public/images/pokemon/variant/back/752.json +++ b/public/images/pokemon/variant/back/752.json @@ -3,8 +3,6 @@ "426b84": "7c3b51", "b7d7e6": "ffc8d1", "81afc9": "d187a0", - "fdfdfd": "fdfdfd", - "101010": "101010", "69670e": "3a112f", "9bad34": "4e1f42", "cedf42": "673252", @@ -19,8 +17,6 @@ "426b84": "55506a", "b7d7e6": "dce7ee", "81afc9": "a7a2bc", - "fdfdfd": "fdfdfd", - "101010": "101010", "69670e": "263756", "9bad34": "4980ac", "cedf42": "72add9", diff --git a/public/images/pokemon/variant/back/753.json b/public/images/pokemon/variant/back/753.json index d7f33035127..670cdc102c3 100644 --- a/public/images/pokemon/variant/back/753.json +++ b/public/images/pokemon/variant/back/753.json @@ -3,28 +3,22 @@ "234028": "2e1643", "5ba668": "4e2c62", "468050": "3e2253", - "101010": "101010", "549977": "1b3822", "315945": "0e2616", "69bf94": "27452c", "d98d9a": "a55c36", "ffbfca": "b47145", - "803340": "682c16", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf" + "803340": "682c16" }, "2": { "234028": "531034", "5ba668": "ce54b0", "468050": "9b2d76", - "101010": "101010", "549977": "5a215a", "315945": "441342", "69bf94": "6e3472", "d98d9a": "263b83", "ffbfca": "3454a5", - "803340": "0b1d4e", - "f8f8f8": "f8f8f8", - "bfbfbf": "bfbfbf" + "803340": "0b1d4e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/755.json b/public/images/pokemon/variant/back/755.json index 55f19f27f11..9574af8ad8d 100644 --- a/public/images/pokemon/variant/back/755.json +++ b/public/images/pokemon/variant/back/755.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "7a3f7a": "451233", "e07c8d": "d64742", "f1b6c8": "e76d5b", @@ -16,7 +15,6 @@ "b5cc91": "866eaf" }, "2": { - "101010": "101010", "7a3f7a": "1d225e", "e07c8d": "7ae7c9", "f1b6c8": "b0ffe1", diff --git a/public/images/pokemon/variant/back/756.json b/public/images/pokemon/variant/back/756.json index 7df75eb0186..40daf267d3b 100644 --- a/public/images/pokemon/variant/back/756.json +++ b/public/images/pokemon/variant/back/756.json @@ -6,7 +6,6 @@ "9867ad": "b64a46", "b591c4": "e76d5b", "cbd59f": "e5aff3", - "101010": "101010", "764b67": "451233", "d08aab": "6c344f", "f5bcd8": "904b66", @@ -22,7 +21,6 @@ "9867ad": "2a2f55", "b591c4": "3a4b75", "cbd59f": "dffffa", - "101010": "101010", "764b67": "0d7a66", "d08aab": "81e3c9", "f5bcd8": "98f5d1", diff --git a/public/images/pokemon/variant/back/761.json b/public/images/pokemon/variant/back/761.json index 4b74180dff7..330ad1a112d 100644 --- a/public/images/pokemon/variant/back/761.json +++ b/public/images/pokemon/variant/back/761.json @@ -2,19 +2,14 @@ "1": { "476629": "215e59", "8fcc52": "70d2e1", - "101010": "101010", "6b993d": "398793", "80334d": "251936", "e55c8a": "9f86e4", - "b3476b": "7e5cdb", - "bfbfbf": "bfbfbf", - "737373": "737373", - "f8f8f8": "f8f8f8" + "b3476b": "7e5cdb" }, "2": { "476629": "3e0a11", "8fcc52": "86232e", - "101010": "101010", "6b993d": "5a0a16", "80334d": "0f0f0f", "e55c8a": "2c574a", diff --git a/public/images/pokemon/variant/back/762.json b/public/images/pokemon/variant/back/762.json index ac231760921..7e194693d2a 100644 --- a/public/images/pokemon/variant/back/762.json +++ b/public/images/pokemon/variant/back/762.json @@ -2,12 +2,8 @@ "1": { "446328": "215e59", "96c853": "70d2e1", - "0f0f0f": "0f0f0f", "659344": "398793", "ebe130": "e66556", - "fdfdfd": "fdfdfd", - "c7b8c4": "c7b8c4", - "72585f": "72585f", "962354": "45366e", "f26284": "7e5cdb", "6a1533": "251936", @@ -16,7 +12,6 @@ "2": { "446328": "3e0a11", "96c853": "86232e", - "0f0f0f": "0f0f0f", "659344": "5a0a16", "ebe130": "5c0505", "fdfdfd": "e4c59e", diff --git a/public/images/pokemon/variant/back/763.json b/public/images/pokemon/variant/back/763.json index 614731b9ad7..91c993c1047 100644 --- a/public/images/pokemon/variant/back/763.json +++ b/public/images/pokemon/variant/back/763.json @@ -8,10 +8,6 @@ "cc4876": "674dad", "96c853": "70d2e1", "659344": "398793", - "0f0f0f": "0f0f0f", - "72585f": "72585f", - "fdfdfd": "fdfdfd", - "c7b8c4": "c7b8c4", "ce466b": "9f86e4" }, "2": { @@ -23,8 +19,6 @@ "cc4876": "254536", "96c853": "86232e", "659344": "5a0a16", - "0f0f0f": "0f0f0f", - "72585f": "72585f", "fdfdfd": "e4c59e", "c7b8c4": "af8260", "ce466b": "2c574a" diff --git a/public/images/pokemon/variant/back/767.json b/public/images/pokemon/variant/back/767.json index 74479ed25ec..405506f716f 100644 --- a/public/images/pokemon/variant/back/767.json +++ b/public/images/pokemon/variant/back/767.json @@ -1,7 +1,6 @@ { "1": { "46334f": "844008", - "080808": "080808", "a65e97": "e8a92a", "713e70": "c86910", "3f5252": "202733", @@ -12,7 +11,6 @@ }, "2": { "46334f": "091b52", - "080808": "080808", "a65e97": "2849ac", "713e70": "1c306d", "3f5252": "3d105f", diff --git a/public/images/pokemon/variant/back/768.json b/public/images/pokemon/variant/back/768.json index 4f2bccd4687..def73d43a89 100644 --- a/public/images/pokemon/variant/back/768.json +++ b/public/images/pokemon/variant/back/768.json @@ -4,7 +4,6 @@ "c8e1cd": "6e6d6d", "546b57": "202733", "81b68e": "494950", - "101010": "101010", "842886": "c85710", "cc5fcf": "ff7e2c", "7a4952": "844008", @@ -20,15 +19,11 @@ "c8e1cd": "2849ac", "546b57": "091b52", "81b68e": "1c306d", - "101010": "101010", "842886": "5722a6", "cc5fcf": "8b51e1", "7a4952": "3d105f", "9a6982": "452772", "bd95a8": "844caf", - "498f6c": "8cdded", - "5c635e": "5c635e", - "2f3330": "2f3330", - "404843": "404843" + "498f6c": "8cdded" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/77.json b/public/images/pokemon/variant/back/77.json index 657eb67ffeb..be654bab991 100644 --- a/public/images/pokemon/variant/back/77.json +++ b/public/images/pokemon/variant/back/77.json @@ -9,8 +9,6 @@ "733131": "2b2333", "c59c6b": "948eb2", "ffefce": "ffffff", - "ffffff": "ffffff", - "000000": "000000", "424a84": "191933", "c5c5d6": "514766", "737ba5": "312c49" @@ -25,8 +23,6 @@ "733131": "03060c", "c59c6b": "191933", "ffefce": "514766", - "ffffff": "ffffff", - "000000": "000000", "424a84": "59497a", "c5c5d6": "b5b5e2", "737ba5": "857cb2" diff --git a/public/images/pokemon/variant/back/771.json b/public/images/pokemon/variant/back/771.json index 0d2997ef79a..f2260e4c6b7 100644 --- a/public/images/pokemon/variant/back/771.json +++ b/public/images/pokemon/variant/back/771.json @@ -2,9 +2,7 @@ "1": { "73223d": "570a00", "d94174": "de884b", - "101010": "101010", "992e52": "c95340", - "1a1a1a": "1a1a1a", "404040": "731b33", "262626": "4a1a30", "595959": "bd5e49", @@ -14,9 +12,7 @@ "2": { "73223d": "b94114", "d94174": "ead059", - "101010": "101010", "992e52": "db7b43", - "1a1a1a": "1a1a1a", "404040": "dacece", "262626": "b8a197", "595959": "1c1c2d", diff --git a/public/images/pokemon/variant/back/772.json b/public/images/pokemon/variant/back/772.json index d367e8f88f7..972da787a08 100644 --- a/public/images/pokemon/variant/back/772.json +++ b/public/images/pokemon/variant/back/772.json @@ -2,7 +2,6 @@ "1": { "454f55": "232843", "92a6a9": "889db1", - "080808": "080808", "6b777e": "526085", "642515": "7e4f36", "c55e3a": "eed8a1", @@ -23,7 +22,6 @@ "2": { "454f55": "18182a", "92a6a9": "65657c", - "080808": "080808", "6b777e": "3b3b51", "642515": "444961", "c55e3a": "c1cfd8", diff --git a/public/images/pokemon/variant/back/773.json b/public/images/pokemon/variant/back/773.json index 4b76892c9db..5d79c355815 100644 --- a/public/images/pokemon/variant/back/773.json +++ b/public/images/pokemon/variant/back/773.json @@ -7,7 +7,6 @@ "d3d7df": "98a8be", "e3e6ec": "bdd1e5", "bcbbc5": "788fb5", - "080808": "080808", "3f3b50": "1e172a", "aba7bc": "493d55", "483c39": "3a2d53", @@ -30,11 +29,8 @@ "d3d7df": "b4bcc4", "e3e6ec": "444455", "bcbbc5": "242433", - "080808": "080808", - "3f3b50": "3f3b50", "aba7bc": "dbd8e8", "483c39": "778894", - "e9eaf8": "e9eaf8", "e64f5e": "98ce58", "1d1845": "41434e", "0073bf": "6a6c75", diff --git a/public/images/pokemon/variant/back/776.json b/public/images/pokemon/variant/back/776.json index e35f08c7c5b..fe8b05aad96 100644 --- a/public/images/pokemon/variant/back/776.json +++ b/public/images/pokemon/variant/back/776.json @@ -3,7 +3,6 @@ "635a4e": "5a4c65", "969678": "887c97", "ccccad": "b4b8c8", - "080808": "080808", "71171a": "210920", "b7282c": "3f2350", "e74545": "4f3d66", @@ -18,7 +17,6 @@ "635a4e": "4c4276", "969678": "7983c1", "ccccad": "adc4e9", - "080808": "080808", "71171a": "976b65", "b7282c": "e1bf9f", "e74545": "faeecd", diff --git a/public/images/pokemon/variant/back/777.json b/public/images/pokemon/variant/back/777.json index ab44e252c60..156a0b4c9bc 100644 --- a/public/images/pokemon/variant/back/777.json +++ b/public/images/pokemon/variant/back/777.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "ffea80": "dec2f0", "ccb852": "ac8fbb", "b3b3b3": "8e71cd", @@ -8,11 +7,9 @@ "808080": "645393", "73593f": "ae428a", "bfbfbf": "d0dadb", - "f8f8f8": "f8f8f8", "595959": "444147" }, "2": { - "101010": "101010", "ffea80": "d65d3c", "ccb852": "7b3c26", "b3b3b3": "4cb568", diff --git a/public/images/pokemon/variant/back/778-busted.json b/public/images/pokemon/variant/back/778-busted.json index 70c365d1ff7..ad19c88cd92 100644 --- a/public/images/pokemon/variant/back/778-busted.json +++ b/public/images/pokemon/variant/back/778-busted.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "404040": "2d1818", "b3a76b": "8d4f3d", "f2e291": "aa6f46", diff --git a/public/images/pokemon/variant/back/778-disguised.json b/public/images/pokemon/variant/back/778-disguised.json index 9b8340c7562..8e986e56ccc 100644 --- a/public/images/pokemon/variant/back/778-disguised.json +++ b/public/images/pokemon/variant/back/778-disguised.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "404040": "2d1818", "b3a76b": "8d4f3d", "f2e291": "aa6f46", @@ -19,4 +18,4 @@ "b37d47": "8eb5cd", "805933": "6d80a4" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/back/779.json b/public/images/pokemon/variant/back/779.json index f8bebbf1e1f..f3e9539edf2 100644 --- a/public/images/pokemon/variant/back/779.json +++ b/public/images/pokemon/variant/back/779.json @@ -2,7 +2,6 @@ "1": { "58295f": "a52121", "b75eb7": "f65656", - "101010": "101010", "834589": "c62c2c", "de5c8a": "602b7a", "314d8e": "667fb2", @@ -11,14 +10,11 @@ "5e9fc4": "94c5da", "93d3e1": "caefff", "cfae3f": "d65e5e", - "efe85f": "faa28c", - "fdfdfd": "fdfdfd", - "969696": "969696" + "efe85f": "faa28c" }, "2": { "58295f": "4545c4", "b75eb7": "8585ff", - "101010": "101010", "834589": "6666e2", "de5c8a": "dca032", "314d8e": "7878ca", @@ -27,8 +23,6 @@ "5e9fc4": "afafe1", "93d3e1": "eeeeff", "cfae3f": "2d2c43", - "efe85f": "454457", - "fdfdfd": "fdfdfd", - "969696": "969696" + "efe85f": "454457" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/78.json b/public/images/pokemon/variant/back/78.json index 44cfceafde4..25f9f1b388f 100644 --- a/public/images/pokemon/variant/back/78.json +++ b/public/images/pokemon/variant/back/78.json @@ -7,10 +7,8 @@ "8c5231": "65597f", "ffe6c5": "ffffff", "733131": "2b2333", - "000000": "000000", "efc58c": "cecee5", "c5946b": "948eb2", - "ffffff": "ffffff", "c5c5c5": "514766", "424a52": "191933", "737b84": "312c49" @@ -23,10 +21,8 @@ "8c5231": "090b16", "ffe6c5": "514766", "733131": "03060c", - "000000": "000000", "efc58c": "312c49", "c5946b": "191933", - "ffffff": "ffffff", "c5c5c5": "b5b5e2", "424a52": "59497a", "737b84": "857cb2" diff --git a/public/images/pokemon/variant/back/789.json b/public/images/pokemon/variant/back/789.json index e79ed8007b1..71b8ffb3355 100644 --- a/public/images/pokemon/variant/back/789.json +++ b/public/images/pokemon/variant/back/789.json @@ -3,41 +3,27 @@ "4e5cc7": "6a12dc", "169fda": "9255f2", "34eef8": "db34f8", - "fdfdfd": "fdfdfd", "422d66": "490f2c", - "101010": "101010", "503896": "64173e", - "9d5f00": "9d5f00", - "f8f229": "f8f229", - "283937": "283937", "8c49a9": "dc48a7", - "1484de": "1484de", - "34c3fa": "34c3fa", "e2629f": "f77247" }, "1": { "4e5cc7": "f6a42d", "169fda": "ffdf49", "34eef8": "fff695", - "fdfdfd": "fdfdfd", "422d66": "830000", - "101010": "101010", "503896": "eb5b2a", "9d5f00": "6a738f", "f8f229": "e5efff", "283937": "391c21", "8c49a9": "e52518", - "1484de": "1484de", - "34c3fa": "34c3fa", "e2629f": "ff4079" }, "2": { "4e5cc7": "3dc7e0", "169fda": "71ffd8", - "34eef8": "34eef8", - "fdfdfd": "fdfdfd", "422d66": "030038", - "101010": "101010", "503896": "007ecc", "9d5f00": "61061f", "f8f229": "c22741", diff --git a/public/images/pokemon/variant/back/79.json b/public/images/pokemon/variant/back/79.json index 4bec35f4691..961a48e4815 100644 --- a/public/images/pokemon/variant/back/79.json +++ b/public/images/pokemon/variant/back/79.json @@ -1,9 +1,5 @@ { "0": { - "6b6363": "6b6363", - "d6cece": "d6cece", - "101010": "101010", - "ffffff": "ffffff", "ffa5a5": "cebdff", "de637b": "846bbd", "ff8494": "ad94ff", @@ -11,14 +7,9 @@ "7b2131": "52397b", "8c5a19": "8c6b10", "ffe6b5": "fff7b5", - "dea563": "deb55a", - "efc58c": "efc58c" + "dea563": "deb55a" }, "1": { - "6b6363": "6b6363", - "d6cece": "d6cece", - "101010": "101010", - "ffffff": "ffffff", "ffa5a5": "ad7459", "de637b": "5b3332", "ff8494": "885345", @@ -30,10 +21,6 @@ "efc58c": "d49983" }, "2": { - "6b6363": "6b6363", - "d6cece": "d6cece", - "101010": "101010", - "ffffff": "ffffff", "ffa5a5": "ffeb9b", "de637b": "dd8f47", "ff8494": "eebd6a", diff --git a/public/images/pokemon/variant/back/790.json b/public/images/pokemon/variant/back/790.json index 415b2d26074..e111a9e35b9 100644 --- a/public/images/pokemon/variant/back/790.json +++ b/public/images/pokemon/variant/back/790.json @@ -4,14 +4,9 @@ "faf54e": "e5efff", "c87522": "7b89c4", "e8a61e": "aebde2", - "101010": "101010", - "fdfdfd": "fdfdfd", "169fda": "ffdf49", "1d3e89": "a20b02", - "e2629f": "e2629f", "764394": "eb5b2a", - "1e232b": "1e232b", - "17a6e3": "17a6e3", "2c5fab": "ff4079" }, "2": { @@ -19,14 +14,9 @@ "faf54e": "d4314c", "c87522": "890425", "e8a61e": "ae1a3d", - "101010": "101010", - "fdfdfd": "fdfdfd", - "169fda": "169fda", "1d3e89": "0f2388", "e2629f": "71ffd8", "764394": "7e13bf", - "1e232b": "1e232b", - "17a6e3": "17a6e3", "2c5fab": "3dc7e0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/791-radiant-sun.json b/public/images/pokemon/variant/back/791-radiant-sun.json index a3080d379bf..545a67c4114 100644 --- a/public/images/pokemon/variant/back/791-radiant-sun.json +++ b/public/images/pokemon/variant/back/791-radiant-sun.json @@ -1,7 +1,6 @@ { "1": { "aa8735": "7c0004", - "151515": "151515", "f9f190": "ff648b", "dcb75f": "ec3975", "868e8d": "8c190b", @@ -11,7 +10,6 @@ }, "2": { "aa8735": "730627", - "151515": "151515", "f9f190": "ea2a58", "dcb75f": "97082c", "868e8d": "10175e", diff --git a/public/images/pokemon/variant/back/791.json b/public/images/pokemon/variant/back/791.json index 0c3f46e61fb..8732147daad 100644 --- a/public/images/pokemon/variant/back/791.json +++ b/public/images/pokemon/variant/back/791.json @@ -1,6 +1,5 @@ { "1": { - "080808": "080808", "91510b": "7a80ab", "d29e31": "c5bbd6", "efe85a": "edf4ff", @@ -14,7 +13,6 @@ "313139": "61080b" }, "2": { - "080808": "080808", "91510b": "730627", "d29e31": "890425", "efe85a": "c1143d", diff --git a/public/images/pokemon/variant/back/792-full-moon.json b/public/images/pokemon/variant/back/792-full-moon.json index d4b01d5f77b..d252adadfb0 100644 --- a/public/images/pokemon/variant/back/792-full-moon.json +++ b/public/images/pokemon/variant/back/792-full-moon.json @@ -3,8 +3,6 @@ "aa8735": "765a3f", "f9f190": "fffef2", "dcb75f": "e6ded2", - "fffef2": "fffef2", - "151515": "151515", "59b3c6": "971283", "85d0e0": "ec5ddf", "fefefe": "ffdda2", @@ -17,7 +15,6 @@ "f9f190": "c22741", "dcb75f": "980f2a", "fffef2": "f34958", - "151515": "151515", "59b3c6": "2460ac", "85d0e0": "3797d0", "fefefe": "ffd1d1", diff --git a/public/images/pokemon/variant/back/792.json b/public/images/pokemon/variant/back/792.json index 2e4d97ae0d5..259fadf021c 100644 --- a/public/images/pokemon/variant/back/792.json +++ b/public/images/pokemon/variant/back/792.json @@ -3,8 +3,6 @@ "665d14": "624427", "e5da7f": "e6ded2", "a69e5c": "afa191", - "080808": "080808", - "fdfce8": "fdfce8", "45348e": "bc1836", "bcb5c1": "ffd386", "240f62": "60000c", @@ -17,11 +15,9 @@ "665d14": "6b0420", "e5da7f": "c22741", "a69e5c": "980f2a", - "080808": "080808", "fdfce8": "ff6d74", "45348e": "1a3186", "bcb5c1": "e19096", - "240f62": "240f62", "7b807e": "7e343d", "fefefe": "ffd1d1", "6046d8": "1550a1", diff --git a/public/images/pokemon/variant/back/793.json b/public/images/pokemon/variant/back/793.json index c0254131b0e..a99c6a324df 100644 --- a/public/images/pokemon/variant/back/793.json +++ b/public/images/pokemon/variant/back/793.json @@ -7,8 +7,7 @@ "308ebc": "1ecb76", "6b868f": "47090d", "26507d": "109d6a", - "53b0d9": "40ffcc", - "101010": "101010" + "53b0d9": "40ffcc" }, "2": { "9ba0b6": "1f1b9c", @@ -18,7 +17,6 @@ "308ebc": "24a7b0", "6b868f": "120d6b", "26507d": "2368b1", - "53b0d9": "6bebff", - "101010": "101010" + "53b0d9": "6bebff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/797.json b/public/images/pokemon/variant/back/797.json index 488b7a6b7de..91bb773e7b8 100644 --- a/public/images/pokemon/variant/back/797.json +++ b/public/images/pokemon/variant/back/797.json @@ -1,7 +1,6 @@ { "1": { "4c7e71": "2d3cb0", - "101010": "101010", "fefefe": "f9e5d1", "bccfc4": "f2b97f", "2b584b": "19155c", @@ -15,7 +14,6 @@ }, "2": { "4c7e71": "69132d", - "101010": "101010", "fefefe": "534757", "bccfc4": "242733", "2b584b": "410425", diff --git a/public/images/pokemon/variant/back/798.json b/public/images/pokemon/variant/back/798.json index 33fc6804577..13c60718373 100644 --- a/public/images/pokemon/variant/back/798.json +++ b/public/images/pokemon/variant/back/798.json @@ -21,7 +21,6 @@ "646471": "283e65", "fdfdfd": "87d2da", "cfcfcf": "4a86b8", - "101010": "101010", "aeaeae": "305895", "a86c1c": "5a2036", "686877": "110d1a", diff --git a/public/images/pokemon/variant/back/80-mega.json b/public/images/pokemon/variant/back/80-mega.json index 96b9c22aa83..b751d8ac584 100644 --- a/public/images/pokemon/variant/back/80-mega.json +++ b/public/images/pokemon/variant/back/80-mega.json @@ -1,11 +1,8 @@ { "1": { "783030": "3f2729", - "181818": "181818", "f89090": "885345", "e06878": "5b3332", - "deded5": "deded5", - "f8f8f8": "f8f8f8", "805820": "9f675f", "e8d080": "e0b69d", "505058": "7c5b40", @@ -15,11 +12,8 @@ }, "2": { "783030": "c08746", - "181818": "181818", "f89090": "eebd6a", "e06878": "de9048", - "deded5": "deded5", - "f8f8f8": "f8f8f8", "805820": "69080f", "e8d080": "d16b34", "505058": "192b32", diff --git a/public/images/pokemon/variant/back/80.json b/public/images/pokemon/variant/back/80.json index a95ecf48908..d8e5597dc52 100644 --- a/public/images/pokemon/variant/back/80.json +++ b/public/images/pokemon/variant/back/80.json @@ -1,32 +1,24 @@ { "1": { "7b3131": "3f2729", - "191919": "191919", "52525a": "8b5d37", "ff9494": "895446", "b5bdbd": "f0d090", "e66b7b": "5c3433", "8c9494": "bf9562", - "b6b6ae": "b6b6ae", "845a21": "9f675f", - "deded6": "deded6", "efd684": "e0b69d", - "ffffff": "ffffff", "cea563": "d49983" }, "2": { "7b3131": "a54729", - "191919": "191919", "52525a": "192b32", "ff9494": "edbc69", "b5bdbd": "4b7567", "e66b7b": "dd8f47", "8c9494": "2a4947", - "b6b6ae": "b6b6ae", "845a21": "69080f", - "deded6": "deded6", "efd684": "d16b34", - "ffffff": "ffffff", "cea563": "b34d2e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/800-dawn-wings.json b/public/images/pokemon/variant/back/800-dawn-wings.json index e8391c97440..08002017da4 100644 --- a/public/images/pokemon/variant/back/800-dawn-wings.json +++ b/public/images/pokemon/variant/back/800-dawn-wings.json @@ -3,7 +3,6 @@ "305fb6": "624427", "82c5f7": "e6ded2", "6197e9": "afa191", - "080808": "080808", "afd2da": "bc1836", "7b807e": "86102d", "fefefe": "ffd386", @@ -17,7 +16,6 @@ "305fb6": "3b0015", "82c5f7": "970b22", "6197e9": "5b0318", - "080808": "080808", "afd2da": "1a3186", "7b807e": "041243", "fefefe": "ffd7fc", diff --git a/public/images/pokemon/variant/back/800-dusk-mane.json b/public/images/pokemon/variant/back/800-dusk-mane.json index af3d20d7b58..e070b214b50 100644 --- a/public/images/pokemon/variant/back/800-dusk-mane.json +++ b/public/images/pokemon/variant/back/800-dusk-mane.json @@ -1,12 +1,10 @@ { "1": { - "080808": "080808", "1b2021": "3a001c", "2b3233": "5f0021", "424a50": "890425", "ae6200": "b72011", "d38a2b": "7c0004", - "f3cf55": "f3cf55", "768188": "c8245d", "89704b": "731f09", "dbcc8f": "da6e40", @@ -14,7 +12,6 @@ "fdfcf8": "e8e7ff" }, "2": { - "080808": "080808", "1b2021": "240842", "2b3233": "3e135f", "424a50": "602483", diff --git a/public/images/pokemon/variant/back/800-ultra.json b/public/images/pokemon/variant/back/800-ultra.json index 114151d61a1..b0cff259a9a 100644 --- a/public/images/pokemon/variant/back/800-ultra.json +++ b/public/images/pokemon/variant/back/800-ultra.json @@ -7,7 +7,6 @@ "bc912c": "8e0021", "fcf167": "ee2033", "8e6924": "770031", - "151515": "151515", "dcb92c": "bc0125", "fefac2": "ff7e75" }, @@ -19,7 +18,6 @@ "bc912c": "900090", "fcf167": "ff49e7", "8e6924": "510059", - "151515": "151515", "dcb92c": "d10cc7", "fefac2": "ff8ae9" } diff --git a/public/images/pokemon/variant/back/800.json b/public/images/pokemon/variant/back/800.json index 7e1dad5a59d..1b96bb66727 100644 --- a/public/images/pokemon/variant/back/800.json +++ b/public/images/pokemon/variant/back/800.json @@ -5,8 +5,7 @@ "fbfbfb": "e8e7ff", "768188": "c8245d", "b5bbbf": "a266eb", - "424a50": "890425", - "080808": "080808" + "424a50": "890425" }, "2": { "2b3233": "3e135f", @@ -14,7 +13,6 @@ "fbfbfb": "ffb8c9", "768188": "b13dc8", "b5bbbf": "f66fdc", - "424a50": "602483", - "080808": "080808" + "424a50": "602483" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/802.json b/public/images/pokemon/variant/back/802.json index a5fdbcd63b7..6b2bce333ce 100644 --- a/public/images/pokemon/variant/back/802.json +++ b/public/images/pokemon/variant/back/802.json @@ -3,7 +3,6 @@ "536155": "29352b", "2c3e30": "111c12", "6a806d": "526555", - "101010": "101010", "2d3137": "084434", "747778": "76bc8f", "4e5356": "3a7e5d" @@ -12,7 +11,6 @@ "536155": "b5b1ce", "2c3e30": "7a758d", "6a806d": "cbc9e8", - "101010": "101010", "2d3137": "17145e", "747778": "515aad", "4e5356": "2f3079" @@ -21,7 +19,6 @@ "536155": "82b7c3", "2c3e30": "508294", "6a806d": "a7eaee", - "101010": "101010", "2d3137": "5a0423", "747778": "ce3e63", "4e5356": "97123b" diff --git a/public/images/pokemon/variant/back/803.json b/public/images/pokemon/variant/back/803.json index 99736595873..acd89674274 100644 --- a/public/images/pokemon/variant/back/803.json +++ b/public/images/pokemon/variant/back/803.json @@ -1,7 +1,6 @@ { "1": { "78757f": "449e93", - "101010": "101010", "ccc0d8": "e3ffec", "98295e": "27579e", "d9338e": "3492b9", @@ -13,7 +12,6 @@ }, "2": { "78757f": "cd9b85", - "101010": "101010", "ccc0d8": "ffefe0", "98295e": "a12f63", "d9338e": "d6487a", diff --git a/public/images/pokemon/variant/back/804.json b/public/images/pokemon/variant/back/804.json index 5686b72ac9b..d418b17ae86 100644 --- a/public/images/pokemon/variant/back/804.json +++ b/public/images/pokemon/variant/back/804.json @@ -1,7 +1,6 @@ { "1": { "5f4670": "16396f", - "101010": "101010", "9372c0": "22658d", "bc88ff": "359faf", "9e2348": "81262d", @@ -17,7 +16,6 @@ }, "2": { "5f4670": "0e3346", - "101010": "101010", "9372c0": "2d794e", "bc88ff": "68b363", "9e2348": "7e4e3d", diff --git a/public/images/pokemon/variant/back/808.json b/public/images/pokemon/variant/back/808.json index e7625f51e73..8d6e17d9210 100644 --- a/public/images/pokemon/variant/back/808.json +++ b/public/images/pokemon/variant/back/808.json @@ -4,10 +4,8 @@ "ab732b": "ce5a6f", "dea220": "ff7c8e", "ffda45": "ffbeae", - "101010": "101010", "3d3534": "2c4048", "59544e": "38585b", - "f9f9f9": "f9f9f9", "67675f": "426e73", "8a8d7e": "6a8f97", "b1b5a6": "98d6f0", @@ -20,15 +18,11 @@ "ab732b": "2d2931", "dea220": "64486f", "ffda45": "9b6e98", - "101010": "101010", "3d3534": "780000", "59544e": "9e002e", - "f9f9f9": "f9f9f9", "67675f": "ba2b41", "8a8d7e": "d66352", "b1b5a6": "f49769", - "dcdcda": "ffbe6e", - "741012": "741012", - "c2292e": "c2292e" + "dcdcda": "ffbe6e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/809-gigantamax.json b/public/images/pokemon/variant/back/809-gigantamax.json index 0d1c729ec7c..f9ba49de9c5 100644 --- a/public/images/pokemon/variant/back/809-gigantamax.json +++ b/public/images/pokemon/variant/back/809-gigantamax.json @@ -4,10 +4,8 @@ "b1b5a6": "98d6f0", "dcdcda": "c2effc", "e8e8e8": "dff7f7", - "f9f9f9": "f9f9f9", "67675f": "426e73", "59544e": "38585b", - "101010": "101010", "dea220": "ff7c8e", "ab732b": "ce5a6f", "3d3534": "2c4048", @@ -20,15 +18,12 @@ "b1b5a6": "f49769", "dcdcda": "ffbe6e", "e8e8e8": "ffde6c", - "f9f9f9": "f9f9f9", "67675f": "ba2b41", "59544e": "9e002e", - "101010": "101010", "dea220": "64486f", "ab732b": "2d2931", "3d3534": "780000", "e46d8b": "741012", - "211d1d": "570000", - "c2292e": "c2292e" + "211d1d": "570000" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/809.json b/public/images/pokemon/variant/back/809.json index 78c209e4ea8..1f597aa305e 100644 --- a/public/images/pokemon/variant/back/809.json +++ b/public/images/pokemon/variant/back/809.json @@ -4,7 +4,6 @@ "211d1d": "232a2b", "59544e": "38585b", "814f23": "85374d", - "101010": "101010", "ab732b": "ce5a6f", "67675f": "426e73", "ffda45": "ffbeae", @@ -12,7 +11,6 @@ "dea220": "ff7c8e", "b1b5a6": "98d6f0", "dcdcda": "c2effc", - "f9f9f9": "f9f9f9", "c2292e": "ffce6b" }, "2": { @@ -20,15 +18,12 @@ "211d1d": "570000", "59544e": "9e002e", "814f23": "101010", - "101010": "101010", "ab732b": "2d2931", "67675f": "ba2b41", "ffda45": "9b6e98", "8a8d7e": "d66352", "dea220": "64486f", "b1b5a6": "f49769", - "dcdcda": "ffbe6e", - "f9f9f9": "f9f9f9", - "c2292e": "c2292e" + "dcdcda": "ffbe6e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/81.json b/public/images/pokemon/variant/back/81.json index a5b983598c1..08c0ab1e797 100644 --- a/public/images/pokemon/variant/back/81.json +++ b/public/images/pokemon/variant/back/81.json @@ -3,9 +3,7 @@ "8c8c8c": "c36c77", "b5b5b5": "f99596", "d6d6d6": "ffc4b8", - "ffffff": "ffffff", "524a4a": "90495b", - "101010": "101010", "3a3131": "612e40", "5a8463": "c36c77", "ef1900": "e67468", @@ -20,7 +18,6 @@ "d6d6d6": "f2c76c", "ffffff": "fffb93", "524a4a": "8c500b", - "101010": "101010", "3a3131": "662e00", "5a8463": "a65410", "ef1900": "e6a845", diff --git a/public/images/pokemon/variant/back/816.json b/public/images/pokemon/variant/back/816.json index 8153a53decd..2db6adf77dc 100644 --- a/public/images/pokemon/variant/back/816.json +++ b/public/images/pokemon/variant/back/816.json @@ -7,8 +7,7 @@ "425493": "7d292a", "5091c0": "b5464b", "6ab6d2": "e66371", - "add7e7": "e6828e", - "101010": "101010" + "add7e7": "e6828e" }, "2": { "1f2d63": "6e1a4c", @@ -18,7 +17,6 @@ "425493": "813535", "5091c0": "dea26c", "6ab6d2": "ffeeb8", - "add7e7": "fffbec", - "101010": "101010" + "add7e7": "fffbec" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/817.json b/public/images/pokemon/variant/back/817.json index 7c74f55eef9..818b677a356 100644 --- a/public/images/pokemon/variant/back/817.json +++ b/public/images/pokemon/variant/back/817.json @@ -8,12 +8,10 @@ "6c4499": "a1572f", "70cce0": "eb8577", "a278c7": "dd8a4f", - "101010": "101010", "3d6424": "83403e", "6ba01b": "a36d5d", "8cd222": "d99f8d", - "ccc7cd": "c7c1bd", - "fefefe": "fefefe" + "ccc7cd": "c7c1bd" }, "2": { "183569": "731f4e", @@ -24,11 +22,9 @@ "6c4499": "2c5aa8", "70cce0": "ffe5a3", "a278c7": "459dca", - "101010": "101010", "3d6424": "731317", "6ba01b": "ba2c22", "8cd222": "d85633", - "ccc7cd": "becee1", - "fefefe": "fefefe" + "ccc7cd": "becee1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/818-gigantamax.json b/public/images/pokemon/variant/back/818-gigantamax.json index e885e058b5a..bca7f49b3fb 100644 --- a/public/images/pokemon/variant/back/818-gigantamax.json +++ b/public/images/pokemon/variant/back/818-gigantamax.json @@ -4,17 +4,12 @@ "f2f889": "f889b6", "1c7bc1": "06cccf", "e9cd5f": "e95f92", - "101010": "101010", "01599a": "0ea6a8", "549bc3": "0060a4", "9cd2e2": "107ac0", - "ee3e5c": "ee3e5c", "31302f": "989dac", "4a4a4d": "c4ccd4", - "5cdada": "5cdada", "5e9bc3": "0a60a4", - "fdfdfd": "fdfdfd", - "b0faff": "b0faff", "646565": "f7fbfc" }, "1": { @@ -22,7 +17,6 @@ "f2f889": "82664c", "1c7bc1": "d94a4c", "e9cd5f": "614432", - "101010": "101010", "01599a": "9c2734", "549bc3": "a45e4a", "9cd2e2": "e1926f", @@ -40,7 +34,6 @@ "f2f889": "65c2e5", "1c7bc1": "fff2cc", "e9cd5f": "4484c3", - "101010": "101010", "01599a": "d8b284", "549bc3": "e38544", "9cd2e2": "ffcd57", diff --git a/public/images/pokemon/variant/back/818.json b/public/images/pokemon/variant/back/818.json index fc948072c94..bbb18e197b3 100644 --- a/public/images/pokemon/variant/back/818.json +++ b/public/images/pokemon/variant/back/818.json @@ -7,8 +7,6 @@ "e9cd5f": "614432", "549bc3": "a55846", "9cd2e2": "e1926f", - "101010": "101010", - "fdfdfd": "fdfdfd", "ff7c00": "5885a2", "31302f": "251e1c", "646565": "4c4643", @@ -23,8 +21,6 @@ "e9cd5f": "4484c3", "549bc3": "e38544", "9cd2e2": "ffcd57", - "101010": "101010", - "fdfdfd": "fdfdfd", "ff7c00": "a13047", "31302f": "510e3c", "646565": "be3a7d", diff --git a/public/images/pokemon/variant/back/82.json b/public/images/pokemon/variant/back/82.json index daed151e7d4..2db8f3ef0ca 100644 --- a/public/images/pokemon/variant/back/82.json +++ b/public/images/pokemon/variant/back/82.json @@ -2,13 +2,11 @@ "1": { "8c8c8c": "c36c77", "524a4a": "90495b", - "ffffff": "ffffff", "d6d6d6": "ffc4b8", "ff8c4a": "ffc4b8", "b5b5b5": "f99596", "3a3131": "612e40", "ef1900": "e67468", - "101010": "101010", "5a8463": "c36c77", "8cb5a5": "f99596", "d6f7de": "ffe9e5", @@ -25,7 +23,6 @@ "b5b5b5": "b27a20", "3a3131": "401d00", "ef1900": "a65410", - "101010": "101010", "5a8463": "701900", "8cb5a5": "a65410", "d6f7de": "e6a845", diff --git a/public/images/pokemon/variant/back/821.json b/public/images/pokemon/variant/back/821.json index 6101b9d4261..dcbdaf08804 100644 --- a/public/images/pokemon/variant/back/821.json +++ b/public/images/pokemon/variant/back/821.json @@ -1,6 +1,5 @@ { "1": { - "080808": "080808", "201a12": "4b2a5e", "505038": "bc7dc3", "272b47": "6a445c", @@ -13,7 +12,6 @@ "ac9534": "be919e" }, "2": { - "080808": "080808", "201a12": "a46828", "505038": "eaae36", "272b47": "612a0e", diff --git a/public/images/pokemon/variant/back/822.json b/public/images/pokemon/variant/back/822.json index cedd8cdfdff..22c63166273 100644 --- a/public/images/pokemon/variant/back/822.json +++ b/public/images/pokemon/variant/back/822.json @@ -1,11 +1,9 @@ { "1": { "403524": "ad6f83", - "201a12": "201a12", "505038": "e7a6c9", "252d49": "c8658a", "2f4577": "f4a0b9", - "080808": "080808", "426eb2": "ffdeeb", "659aba": "fff6f8", "444f59": "2e262f", @@ -13,11 +11,9 @@ }, "2": { "403524": "b95212", - "201a12": "201a12", "505038": "dc7c16", "252d49": "91591e", "2f4577": "eaae36", - "080808": "080808", "426eb2": "edd472", "659aba": "fff1b9", "444f59": "541705", diff --git a/public/images/pokemon/variant/back/823.json b/public/images/pokemon/variant/back/823.json index eb3f2d02655..3245dd6897b 100644 --- a/public/images/pokemon/variant/back/823.json +++ b/public/images/pokemon/variant/back/823.json @@ -1,21 +1,17 @@ { "1": { - "010101": "010101", "251d4e": "6a445c", "434475": "f4a0b9", "303360": "ad6f83", "646ca8": "ffdeeb", "4d5488": "e7a6c9", "f30101": "df7b10", - "ffa8a8": "ffa8a8", "4e4150": "57445a", - "2e262f": "2e262f", "18173d": "4b2a5e", "2c2b58": "845195", "3e3d6d": "bc7dc3" }, "2": { - "010101": "010101", "251d4e": "612a0e", "434475": "dc7c16", "303360": "b95212", diff --git a/public/images/pokemon/variant/back/829.json b/public/images/pokemon/variant/back/829.json index c3f2e3d3228..4fa2d435fb0 100644 --- a/public/images/pokemon/variant/back/829.json +++ b/public/images/pokemon/variant/back/829.json @@ -4,8 +4,6 @@ "e09b24": "1da3c2", "f4d626": "4aebe3", "fef54b": "84fff5", - "101010": "101010", - "fef1a7": "fef1a7", "841d1a": "3b0122", "cf301f": "601335", "fb472f": "7b2640", @@ -17,7 +15,6 @@ "e09b24": "6b2d9e", "f4d626": "bc77ff", "fef54b": "e8aaff", - "101010": "101010", "fef1a7": "f6e6ff", "841d1a": "14103b", "cf301f": "24244b", diff --git a/public/images/pokemon/variant/back/830.json b/public/images/pokemon/variant/back/830.json index 517f81ff692..fdb0b20d021 100644 --- a/public/images/pokemon/variant/back/830.json +++ b/public/images/pokemon/variant/back/830.json @@ -6,8 +6,7 @@ "e8d5c6": "a2d2e7", "5c6738": "6f3e7b", "8a9247": "9d6aa5", - "bab743": "c38ec6", - "101010": "101010" + "bab743": "c38ec6" }, "2": { "89593b": "442664", @@ -16,7 +15,6 @@ "e8d5c6": "d5aee9", "5c6738": "133049", "8a9247": "3c627e", - "bab743": "6a9cbb", - "101010": "101010" + "bab743": "6a9cbb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/835.json b/public/images/pokemon/variant/back/835.json index 0e4b99223d7..0c68b758f61 100644 --- a/public/images/pokemon/variant/back/835.json +++ b/public/images/pokemon/variant/back/835.json @@ -1,7 +1,6 @@ { "1": { "844840": "051514", - "101010": "101010", "bd8d62": "e0bb76", "a26642": "aa8e5a", "d1cccb": "e7c78d", @@ -15,11 +14,9 @@ }, "2": { "844840": "313e38", - "101010": "101010", "bd8d62": "509468", "a26642": "3d5d59", "d1cccb": "a0bcaa", - "fbfbfb": "fbfbfb", "837a76": "43554d", "9a6229": "2b2042", "f7da11": "776baf", diff --git a/public/images/pokemon/variant/back/836.json b/public/images/pokemon/variant/back/836.json index da9680ed581..fadea8ede4b 100644 --- a/public/images/pokemon/variant/back/836.json +++ b/public/images/pokemon/variant/back/836.json @@ -1,13 +1,10 @@ { "1": { - "a06d21": "a06d21", - "0d0d0d": "0d0d0d", "fad833": "e0bb76", "c8ad25": "aa8e5a", "495043": "28797b", "dec12e": "e0bb76", "cfc7c6": "cbcdb4", - "8c7b7a": "8c7b7a", "f2efef": "fdffe1", "fff665": "e7c78d", "373737": "2c4f4d", @@ -15,7 +12,6 @@ }, "2": { "a06d21": "213d3a", - "0d0d0d": "0d0d0d", "fad833": "509468", "c8ad25": "3d5d59", "495043": "3c2e5b", diff --git a/public/images/pokemon/variant/back/84.json b/public/images/pokemon/variant/back/84.json index 01886764957..9dca4a84b80 100644 --- a/public/images/pokemon/variant/back/84.json +++ b/public/images/pokemon/variant/back/84.json @@ -3,10 +3,7 @@ "523a19": "1b4e31", "946b5a": "3a8951", "bd8c52": "65bf75", - "636363": "636363", "dead73": "a5e6a0", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "bba689", "635210": "1d1636", "efdead": "ece4ce", @@ -18,8 +15,6 @@ "bd8c52": "9f4079", "636363": "3a2050", "dead73": "c35d88", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "84333c", "635210": "642330", "efdead": "efbcad", @@ -31,8 +26,6 @@ "bd8c52": "618bbc", "636363": "7a355d", "dead73": "95bedc", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "2e2448", "635210": "1d1636", "efdead": "584c6b", diff --git a/public/images/pokemon/variant/back/85.json b/public/images/pokemon/variant/back/85.json index fe780361521..145458243f3 100644 --- a/public/images/pokemon/variant/back/85.json +++ b/public/images/pokemon/variant/back/85.json @@ -1,16 +1,11 @@ { "0": { - "424242": "424242", - "848484": "848484", - "000000": "000000", "5a4221": "1b4e31", "a57b5a": "3a8951", "ce9c52": "65bf75", "635a42": "7a614c", "efdead": "ece4ce", - "ffffff": "ffffff", "b5a57b": "bba689", - "d6cece": "d6cece", "b54242": "1e2b61", "ffd6e6": "accaf0", "f784a5": "3a5797" @@ -18,15 +13,12 @@ "1": { "424242": "3a2050", "848484": "6b4685", - "000000": "000000", "5a4221": "48123f", "a57b5a": "6f265a", "ce9c52": "9f4079", "635a42": "84333c", "efdead": "efbcad", - "ffffff": "ffffff", "b5a57b": "c46e6e", - "d6cece": "d6cece", "b54242": "372d68", "ffd6e6": "cbadec", "f784a5": "8163b5" @@ -34,15 +26,12 @@ "2": { "424242": "412334", "848484": "7d4c60", - "000000": "000000", "5a4221": "1b2c59", "a57b5a": "618bbc", "ce9c52": "95bedc", "635a42": "1d1636", "efdead": "584c6b", - "ffffff": "ffffff", "b5a57b": "43385c", - "d6cece": "d6cece", "b54242": "612253", "ffd6e6": "e1a272", "f784a5": "91425d" diff --git a/public/images/pokemon/variant/back/850.json b/public/images/pokemon/variant/back/850.json index 0c37d56a9a3..974ab0a09b3 100644 --- a/public/images/pokemon/variant/back/850.json +++ b/public/images/pokemon/variant/back/850.json @@ -8,7 +8,6 @@ "681607": "065b58", "42221c": "36203c", "2f1610": "24122b", - "101010": "101010", "be5409": "25a96a", "f89e08": "a3ffb9" }, @@ -20,9 +19,6 @@ "ff5839": "f360a3", "681607": "4a1036", "42221c": "222957", - "2f1610": "121439", - "101010": "101010", - "be5409": "be5409", - "f89e08": "f89e08" + "2f1610": "121439" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/851-gigantamax.json b/public/images/pokemon/variant/back/851-gigantamax.json index fe3e1c837e7..f235f9b4e56 100644 --- a/public/images/pokemon/variant/back/851-gigantamax.json +++ b/public/images/pokemon/variant/back/851-gigantamax.json @@ -8,9 +8,7 @@ "e71d12": "59365d", "9a2d21": "36203c", "5b2f26": "5e3d35", - "2f1610": "2f1610", "804a3e": "745f47", - "010000": "010000", "f4ba01": "71ea9d", "ff5839": "ad58ab" }, @@ -19,13 +17,10 @@ "f89e08": "d73981", "ffd901": "ffcb61", "5b0f0f": "121439", - "941528": "941528", "e71d12": "36426c", "9a2d21": "222957", "5b2f26": "60144b", - "2f1610": "2f1610", "804a3e": "973554", - "010000": "010000", "f4ba01": "e98a27", "ff5839": "7866cb" } diff --git a/public/images/pokemon/variant/back/851.json b/public/images/pokemon/variant/back/851.json index 36b7e56509e..3b1881b132d 100644 --- a/public/images/pokemon/variant/back/851.json +++ b/public/images/pokemon/variant/back/851.json @@ -12,11 +12,9 @@ "42221c": "36203c", "2f1610": "24122b", "681607": "024f2d", - "101010": "101010", "941528": "005f35" }, "2": { - "be5409": "be5409", "f89e08": "f36d73", "ffd901": "ffc143", "5b2f26": "36426c", @@ -27,8 +25,6 @@ "ff5839": "ff6970", "42221c": "222957", "2f1610": "121439", - "681607": "6e0442", - "101010": "101010", - "941528": "941528" + "681607": "6e0442" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/854.json b/public/images/pokemon/variant/back/854.json index 2446d716998..09196ea7351 100644 --- a/public/images/pokemon/variant/back/854.json +++ b/public/images/pokemon/variant/back/854.json @@ -9,7 +9,6 @@ "733a87": "cc752f", "9aedea": "b74f6c", "af63c4": "ffffeb", - "101010": "101010", "c3bfe0": "f2bbaa" }, "2": { @@ -22,7 +21,6 @@ "733a87": "2a3c2c", "9aedea": "c9c0b9", "af63c4": "82b183", - "101010": "101010", "c3bfe0": "524c4e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/855.json b/public/images/pokemon/variant/back/855.json index bd1bbcedb7f..a9a234fd471 100644 --- a/public/images/pokemon/variant/back/855.json +++ b/public/images/pokemon/variant/back/855.json @@ -9,7 +9,6 @@ "4bb2af": "531d2b", "c3bfe0": "c06d66", "f5f9fa": "f2bbaa", - "101010": "101010", "733a87": "ef9e5c", "af63c4": "ffffeb", "215557": "3c0e1b" @@ -24,7 +23,6 @@ "4bb2af": "222221", "c3bfe0": "3e383a", "f5f9fa": "524c4e", - "101010": "101010", "733a87": "538c61", "af63c4": "82b183", "215557": "222221" diff --git a/public/images/pokemon/variant/back/856.json b/public/images/pokemon/variant/back/856.json index 3d245b74324..bfc575d89d7 100644 --- a/public/images/pokemon/variant/back/856.json +++ b/public/images/pokemon/variant/back/856.json @@ -2,7 +2,6 @@ "1": { "727ab1": "1d4a3b", "c8e9ff": "5ec183", - "181818": "181818", "acbfdf": "3b9665", "bb6a99": "043232", "f9d5da": "298675", @@ -13,7 +12,6 @@ "2": { "727ab1": "6b0124", "c8e9ff": "cb304d", - "181818": "181818", "acbfdf": "a11437", "bb6a99": "30163d", "f9d5da": "523f73", diff --git a/public/images/pokemon/variant/back/858-gigantamax.json b/public/images/pokemon/variant/back/858-gigantamax.json index 98f13ee6842..a1b18562909 100644 --- a/public/images/pokemon/variant/back/858-gigantamax.json +++ b/public/images/pokemon/variant/back/858-gigantamax.json @@ -1,7 +1,6 @@ { "1": { "948fc2": "1d6447", - "101010": "101010", "c15974": "043232", "c8e9ff": "5ec183", "e489a0": "125a51", @@ -15,7 +14,6 @@ }, "2": { "948fc2": "6d042b", - "101010": "101010", "c15974": "30163d", "c8e9ff": "cb304d", "e489a0": "3b2351", diff --git a/public/images/pokemon/variant/back/858.json b/public/images/pokemon/variant/back/858.json index 5d9ca997770..7efde3f313b 100644 --- a/public/images/pokemon/variant/back/858.json +++ b/public/images/pokemon/variant/back/858.json @@ -2,7 +2,6 @@ "1": { "727ab1": "1d4a3b", "acbfdf": "3b9665", - "101010": "101010", "948fc2": "287b59", "c8e9ff": "5ec183", "d9cedb": "dec1c2", @@ -16,7 +15,6 @@ "2": { "727ab1": "6b0124", "acbfdf": "a11437", - "101010": "101010", "948fc2": "8c0e32", "c8e9ff": "cb304d", "d9cedb": "e4bcde", diff --git a/public/images/pokemon/variant/back/859.json b/public/images/pokemon/variant/back/859.json index 16dcecb181e..a3d7e501811 100644 --- a/public/images/pokemon/variant/back/859.json +++ b/public/images/pokemon/variant/back/859.json @@ -4,7 +4,6 @@ "8d3856": "376b2d", "f589c2": "9aba6d", "ffbff5": "dbe797", - "101010": "101010", "45366d": "5b1d15", "735aac": "a4332d", "947cd8": "cc5836" @@ -14,7 +13,6 @@ "8d3856": "30082d", "f589c2": "6b2b3e", "ffbff5": "904f55", - "101010": "101010", "45366d": "794935", "735aac": "f0c475", "947cd8": "f9e9a4" diff --git a/public/images/pokemon/variant/back/86.json b/public/images/pokemon/variant/back/86.json index 75fd67c9b4d..5375b92e57e 100644 --- a/public/images/pokemon/variant/back/86.json +++ b/public/images/pokemon/variant/back/86.json @@ -4,8 +4,6 @@ "e6e6f7": "f3c7aa", "949cb5": "a86f5b", "d6ceef": "c78f72", - "101010": "101010", - "ffffff": "ffffff", "b59442": "a4622f", "f7e6bd": "f7e3bd", "6b5a10": "6b3410", @@ -16,8 +14,6 @@ "e6e6f7": "b2c3d1", "949cb5": "5e6d7c", "d6ceef": "91a0ac", - "101010": "101010", - "ffffff": "ffffff", "b59442": "b5ada5", "f7e6bd": "efefe6", "6b5a10": "847b73", @@ -28,8 +24,6 @@ "e6e6f7": "7ecdca", "949cb5": "325062", "d6ceef": "558a98", - "101010": "101010", - "ffffff": "ffffff", "b59442": "81604a", "f7e6bd": "d9caa5", "6b5a10": "5f3e2e", diff --git a/public/images/pokemon/variant/back/860.json b/public/images/pokemon/variant/back/860.json index f318490f04c..11974fd8618 100644 --- a/public/images/pokemon/variant/back/860.json +++ b/public/images/pokemon/variant/back/860.json @@ -4,7 +4,6 @@ "e93761": "638a48", "f75c90": "7daf56", "352954": "3b1528", - "101010": "101010", "5d4694": "8b332d", "8872b6": "c45949", "433568": "5a1d27", @@ -17,7 +16,6 @@ "e93761": "491337", "f75c90": "64233b", "352954": "a26458", - "101010": "101010", "5d4694": "dfc784", "8872b6": "f6e8b8", "433568": "c98e63", diff --git a/public/images/pokemon/variant/back/861-gigantamax.json b/public/images/pokemon/variant/back/861-gigantamax.json index e97032b5a26..29c6de702b9 100644 --- a/public/images/pokemon/variant/back/861-gigantamax.json +++ b/public/images/pokemon/variant/back/861-gigantamax.json @@ -1,14 +1,12 @@ { "1": { "2f184e": "290527", - "101010": "101010", "433568": "5a1d27", "5d4694": "8b332d", "352954": "3b1528" }, "2": { "2f184e": "6a2f3a", - "101010": "101010", "433568": "c98e63", "5d4694": "dfc784", "352954": "a26458" diff --git a/public/images/pokemon/variant/back/861.json b/public/images/pokemon/variant/back/861.json index acdc2e3c502..cec30107ea8 100644 --- a/public/images/pokemon/variant/back/861.json +++ b/public/images/pokemon/variant/back/861.json @@ -1,7 +1,6 @@ { "1": { "356a3c": "162a35", - "101010": "101010", "47be62": "366c59", "409555": "244849", "433568": "5a1d27", @@ -11,7 +10,6 @@ }, "2": { "356a3c": "090d50", - "101010": "101010", "47be62": "3f386f", "409555": "272664", "433568": "c98e63", diff --git a/public/images/pokemon/variant/back/862.json b/public/images/pokemon/variant/back/862.json index 8f323fb4822..8ca663c9103 100644 --- a/public/images/pokemon/variant/back/862.json +++ b/public/images/pokemon/variant/back/862.json @@ -1,7 +1,5 @@ { "1": { - "1b2627": "1b2627", - "010101": "010101", "474749": "156a66", "303034": "094448", "6f7071": "01473a", @@ -11,12 +9,10 @@ "f5f5f6": "f5ffea", "9b4f69": "d414dd", "df84ad": "ff69fa", - "2b2d2e": "052332", - "fcfcfc": "fcfcfc" + "2b2d2e": "052332" }, "2": { "1b2627": "180c46", - "010101": "010101", "474749": "8655e1", "303034": "5a3eb9", "6f7071": "2e1d7b", @@ -26,7 +22,6 @@ "f5f5f6": "342d4c", "9b4f69": "0099ce", "df84ad": "54f1ff", - "2b2d2e": "060429", - "fcfcfc": "fcfcfc" + "2b2d2e": "060429" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/863.json b/public/images/pokemon/variant/back/863.json index ddeaa711d6b..c100f2e1b4c 100644 --- a/public/images/pokemon/variant/back/863.json +++ b/public/images/pokemon/variant/back/863.json @@ -2,9 +2,7 @@ "1": { "66716c": "59879a", "bfc1bf": "b4e0d3", - "010101": "010101", "8f9c95": "85c1c0", - "181a1d": "181a1d", "272d2e": "342b49", "3d4547": "4e385a", "84726f": "9591a7", @@ -14,7 +12,6 @@ "2": { "66716c": "331a37", "bfc1bf": "92264b", - "010101": "010101", "8f9c95": "6d0b3c", "181a1d": "0f2127", "272d2e": "234a56", diff --git a/public/images/pokemon/variant/back/864.json b/public/images/pokemon/variant/back/864.json index a9d6199388e..eeefe5b0166 100644 --- a/public/images/pokemon/variant/back/864.json +++ b/public/images/pokemon/variant/back/864.json @@ -8,8 +8,7 @@ "cbc2d1": "d7d2f6", "7f806a": "4d8894", "fbf2ff": "d3ffff", - "c6bbcb": "a7e6e5", - "101010": "101010" + "c6bbcb": "a7e6e5" }, "2": { "bcb9be": "055946", @@ -20,7 +19,6 @@ "cbc2d1": "567f83", "7f806a": "4b1f28", "fbf2ff": "874059", - "c6bbcb": "773050", - "101010": "101010" + "c6bbcb": "773050" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/867.json b/public/images/pokemon/variant/back/867.json index 124ea0d4f66..edfad6a836d 100644 --- a/public/images/pokemon/variant/back/867.json +++ b/public/images/pokemon/variant/back/867.json @@ -1,7 +1,6 @@ { "1": { "393941": "69d9bf", - "101010": "101010", "927e8d": "a46361", "d9d0d1": "d6b8a0", "c5b9bb": "c69981", @@ -10,7 +9,6 @@ }, "2": { "393941": "a4222c", - "101010": "101010", "927e8d": "1f6455", "d9d0d1": "4fb66a", "c5b9bb": "298a61", diff --git a/public/images/pokemon/variant/back/87.json b/public/images/pokemon/variant/back/87.json index bc02e269dbe..a1deab7b93f 100644 --- a/public/images/pokemon/variant/back/87.json +++ b/public/images/pokemon/variant/back/87.json @@ -4,32 +4,20 @@ "e6e6f7": "f0b28a", "425263": "773630", "d6ceef": "bc7855", - "9ca5bd": "b76a43", - "101010": "101010", - "ffffff": "ffffff", - "847b7b": "847b7b", - "d6cece": "d6cece" + "9ca5bd": "b76a43" }, "1": { "6b7ba5": "465264", "e6e6f7": "96adbe", "425263": "2f3b50", "d6ceef": "5a7286", - "9ca5bd": "5e6d7c", - "101010": "101010", - "ffffff": "ffffff", - "847b7b": "847b7b", - "d6cece": "d6cece" + "9ca5bd": "5e6d7c" }, "2": { "6b7ba5": "20354a", "e6e6f7": "86dfe2", "425263": "171d3f", "d6ceef": "5493ac", - "9ca5bd": "305f7d", - "101010": "101010", - "ffffff": "ffffff", - "847b7b": "847b7b", - "d6cece": "d6cece" + "9ca5bd": "305f7d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/872.json b/public/images/pokemon/variant/back/872.json index c7b73b39012..cac7ab2c540 100644 --- a/public/images/pokemon/variant/back/872.json +++ b/public/images/pokemon/variant/back/872.json @@ -2,9 +2,7 @@ "0": { "7b8b9b": "345f5c", "d8e9f0": "b7f1d6", - "f5fdff": "f5fdff", "acc3cc": "669a8c", - "101010": "101010", "695e77": "275e43", "edeae0": "a6d6a6", "b3a7c2": "73a878" @@ -12,9 +10,7 @@ "1": { "7b8b9b": "22504c", "d8e9f0": "b6e7df", - "f5fdff": "f5fdff", "acc3cc": "548e8f", - "101010": "101010", "695e77": "354b63", "edeae0": "c1ebf3", "b3a7c2": "89a9be" @@ -22,9 +18,7 @@ "2": { "7b8b9b": "5a3993", "d8e9f0": "d5c3ff", - "f5fdff": "f5fdff", "acc3cc": "a66ac2", - "101010": "101010", "695e77": "5f3465", "edeae0": "e5a2da", "b3a7c2": "a060a0" diff --git a/public/images/pokemon/variant/back/873.json b/public/images/pokemon/variant/back/873.json index dd3754e7fe9..e0977b608e7 100644 --- a/public/images/pokemon/variant/back/873.json +++ b/public/images/pokemon/variant/back/873.json @@ -4,23 +4,20 @@ "b3b4bd": "73a878", "e7e0e6": "a6d6a6", "8f8f9f": "27532f", - "fdfdfd": "b7f1d7", - "101010": "101010" + "fdfdfd": "b7f1d7" }, "1": { "747489": "556b7d", "b3b4bd": "92a9b8", "e7e0e6": "b6e7df", "8f8f9f": "415366", - "fdfdfd": "eefffb", - "101010": "101010" + "fdfdfd": "eefffb" }, "2": { "747489": "512d52", "b3b4bd": "864c86", "e7e0e6": "d78dcb", "8f8f9f": "5f3465", - "fdfdfd": "d5c3ff", - "101010": "101010" + "fdfdfd": "d5c3ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/876-female.json b/public/images/pokemon/variant/back/876-female.json index 38892176d0d..9aa3f570830 100644 --- a/public/images/pokemon/variant/back/876-female.json +++ b/public/images/pokemon/variant/back/876-female.json @@ -4,7 +4,6 @@ "7d7493": "5a3736", "2f2642": "2c1419", "564c6c": "4a282a", - "101010": "101010", "6c64a6": "b72e3e", "4d447e": "8c1932", "3d3055": "64102c", @@ -17,7 +16,6 @@ "7d7493": "ecb2c5", "2f2642": "444a8e", "564c6c": "d58da4", - "101010": "101010", "6c64a6": "78aae5", "4d447e": "5c7bc5", "3d3055": "4c5db1", diff --git a/public/images/pokemon/variant/back/876.json b/public/images/pokemon/variant/back/876.json index af4f5492efe..024747b2e0b 100644 --- a/public/images/pokemon/variant/back/876.json +++ b/public/images/pokemon/variant/back/876.json @@ -3,7 +3,6 @@ "2e2641": "2c1419", "7d7493": "5a3736", "564c6c": "4a282a", - "101010": "101010", "2f2642": "2c1419", "6c64a6": "b72e3e", "4d447e": "8c1932", @@ -16,7 +15,6 @@ "2e2641": "314c7c", "7d7493": "a3c5e8", "564c6c": "78a5d4", - "101010": "101010", "2f2642": "7a316c", "6c64a6": "f589bb", "4d447e": "d268a7", diff --git a/public/images/pokemon/variant/back/877-hangry.json b/public/images/pokemon/variant/back/877-hangry.json index a4e19c34f67..4ecb7181777 100644 --- a/public/images/pokemon/variant/back/877-hangry.json +++ b/public/images/pokemon/variant/back/877-hangry.json @@ -1,7 +1,6 @@ { "0": { "383634": "3a1010", - "101010": "101010", "4f4b47": "952222", "6c6c6c": "540606", "6b3d96": "967f3d", @@ -9,8 +8,6 @@ "9958ce": "cebb58" }, "1": { - "383634": "383634", - "101010": "101010", "4f4b47": "3a3a3a", "6c6c6c": "212020", "6b3d96": "cb6333", @@ -18,10 +15,6 @@ "9958ce": "cb6333" }, "2": { - "383634": "383634", - "101010": "101010", - "4f4b47": "4f4b47", - "6c6c6c": "6c6c6c", "6b3d96": "568351", "493061": "306135", "9958ce": "7fba7f" diff --git a/public/images/pokemon/variant/back/877.json b/public/images/pokemon/variant/back/877.json index 846a3ecdaee..5e4e7501352 100644 --- a/public/images/pokemon/variant/back/877.json +++ b/public/images/pokemon/variant/back/877.json @@ -1,33 +1,21 @@ { "0": { "8a5e48": "383634", - "101010": "101010", - "383634": "383634", "af7044": "4f4b47", - "4f4b47": "4f4b47", - "6c6c6c": "6c6c6c", "cf9c66": "6c6c6c", "d3b351": "8851d3", "f4f489": "b689f4" }, "1": { "8a5e48": "2e57f6", - "101010": "101010", - "383634": "383634", "af7044": "86aaff", - "4f4b47": "4f4b47", - "6c6c6c": "6c6c6c", "cf9c66": "2c439d", "d3b351": "8b8853", "f4f489": "fff98f" }, "2": { "8a5e48": "4f8a48", - "101010": "101010", - "383634": "383634", "af7044": "71cf66", - "4f4b47": "4f4b47", - "6c6c6c": "6c6c6c", "cf9c66": "44af5b", "d3b351": "b6b6b6", "f4f489": "f8f8f8" diff --git a/public/images/pokemon/variant/back/880.json b/public/images/pokemon/variant/back/880.json index 1270725b8a2..7f2d67ad64f 100644 --- a/public/images/pokemon/variant/back/880.json +++ b/public/images/pokemon/variant/back/880.json @@ -1,7 +1,6 @@ { "1": { "8f261b": "1b1829", - "101010": "101010", "ff8d9f": "6a98c4", "ed4e76": "312f47", "975e17": "5b0610", @@ -16,8 +15,6 @@ "025f46": "26253e" }, "2": { - "8f261b": "8f261b", - "101010": "101010", "ff8d9f": "e28854", "ed4e76": "ca5939", "975e17": "211b3d", diff --git a/public/images/pokemon/variant/back/881.json b/public/images/pokemon/variant/back/881.json index 3efad4efe60..580250907bc 100644 --- a/public/images/pokemon/variant/back/881.json +++ b/public/images/pokemon/variant/back/881.json @@ -4,7 +4,6 @@ "975e17": "5b0610", "ffff84": "ee8563", "ead900": "c6362b", - "101010": "101010", "2abbfc": "ceb16f", "09354d": "271014", "9ab8ba": "cea5b9", @@ -24,9 +23,7 @@ "975e17": "211b3d", "ffff84": "dceeeb", "ead900": "636287", - "101010": "101010", "2abbfc": "26c248", - "09354d": "09354d", "9ab8ba": "a3c465", "edf3f2": "fcffe4", "5c7996": "50a751", diff --git a/public/images/pokemon/variant/back/882.json b/public/images/pokemon/variant/back/882.json index bfaf844e6ed..27028180ff4 100644 --- a/public/images/pokemon/variant/back/882.json +++ b/public/images/pokemon/variant/back/882.json @@ -3,7 +3,6 @@ "434c63": "771922", "83bbed": "eaa561", "777ebd": "cc6235", - "101010": "101010", "003319": "1a182b", "005e44": "564e6e", "8f261b": "1d2238", @@ -19,7 +18,6 @@ "434c63": "450940", "83bbed": "8c1f45", "777ebd": "6c1046", - "101010": "101010", "003319": "cc7d3b", "005e44": "f1b45f", "8f261b": "215b68", diff --git a/public/images/pokemon/variant/back/883.json b/public/images/pokemon/variant/back/883.json index 354ac125db9..c28f2eb7f2f 100644 --- a/public/images/pokemon/variant/back/883.json +++ b/public/images/pokemon/variant/back/883.json @@ -3,7 +3,6 @@ "434c63": "3a151c", "83bbed": "eaa561", "172459": "771922", - "101010": "101010", "777ebd": "cc6235", "5c7996": "8c6060", "9ab8ba": "cea5b9", @@ -17,7 +16,6 @@ "434c63": "450940", "83bbed": "8c1f45", "172459": "320432", - "101010": "101010", "777ebd": "6c1046", "5c7996": "50a751", "9ab8ba": "a3c465", diff --git a/public/images/pokemon/variant/back/884-gigantamax.json b/public/images/pokemon/variant/back/884-gigantamax.json index 52bc8a7cab3..a813ba8c860 100644 --- a/public/images/pokemon/variant/back/884-gigantamax.json +++ b/public/images/pokemon/variant/back/884-gigantamax.json @@ -1,7 +1,6 @@ { "1": { "837080": "5d392f", - "151515": "151515", "c4bac5": "c19b85", "a893a8": "9b715e", "e4e5f1": "f8e0cf", @@ -15,7 +14,6 @@ }, "2": { "837080": "1a0e34", - "151515": "151515", "c4bac5": "443a6e", "a893a8": "312857", "e4e5f1": "6e5ca6", diff --git a/public/images/pokemon/variant/back/884.json b/public/images/pokemon/variant/back/884.json index 4cb8efc516b..e71bc735fdf 100644 --- a/public/images/pokemon/variant/back/884.json +++ b/public/images/pokemon/variant/back/884.json @@ -2,7 +2,6 @@ "1": { "68353c": "871e14", "b96a6a": "cd452b", - "151515": "151515", "a893a8": "a77c69", "e4e5f1": "f8e0cf", "837080": "5d392f", @@ -16,7 +15,6 @@ "2": { "68353c": "062449", "b96a6a": "2077a6", - "151515": "151515", "a893a8": "32234e", "e4e5f1": "65549c", "837080": "1a0e34", diff --git a/public/images/pokemon/variant/back/885.json b/public/images/pokemon/variant/back/885.json index a03ef2a9a01..ba01496a553 100644 --- a/public/images/pokemon/variant/back/885.json +++ b/public/images/pokemon/variant/back/885.json @@ -2,7 +2,6 @@ "0": { "3a583c": "133056", "fa5494": "efa93f", - "101010": "101010", "cc4066": "ac7508", "5f875a": "2f6c89", "476b48": "20486e", @@ -15,7 +14,6 @@ "1": { "3a583c": "2f040d", "fa5494": "4590da", - "101010": "101010", "cc4066": "244f9f", "5f875a": "7d1f2c", "476b48": "2f040d", @@ -28,7 +26,6 @@ "2": { "3a583c": "1f0c2c", "fa5494": "68c7c4", - "101010": "101010", "cc4066": "2a8286", "5f875a": "3c2750", "476b48": "231234", diff --git a/public/images/pokemon/variant/back/886.json b/public/images/pokemon/variant/back/886.json index be5cad5860a..227276bd075 100644 --- a/public/images/pokemon/variant/back/886.json +++ b/public/images/pokemon/variant/back/886.json @@ -1,19 +1,16 @@ { "0": { "444e62": "2d365a", - "101010": "101010", "addcbc": "6accd6", "5f875a": "2f6c89", "2c323f": "192250", "566f89": "465272", "fa5494": "efa93f", "7fb3b1": "78c3cb", - "d5fffb": "d5fffb", "5b878c": "4c90a6" }, "1": { "444e62": "4a1621", - "101010": "101010", "addcbc": "da6151", "5f875a": "6b242e", "2c323f": "2e080d", @@ -25,7 +22,6 @@ }, "2": { "444e62": "231b45", - "101010": "101010", "addcbc": "927fa1", "5f875a": "3c2750", "2c323f": "251b31", diff --git a/public/images/pokemon/variant/back/887.json b/public/images/pokemon/variant/back/887.json index e49645f7228..c2d1732dd33 100644 --- a/public/images/pokemon/variant/back/887.json +++ b/public/images/pokemon/variant/back/887.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "2c323f": "192250", "566f89": "46557b", "444e62": "2c3867", @@ -15,7 +14,6 @@ "48a9b0": "479bb6" }, "1": { - "101010": "101010", "2c323f": "2e080d", "566f89": "6c273d", "444e62": "4a1621", @@ -30,9 +28,7 @@ "48a9b0": "8a212f" }, "2": { - "101010": "101010", "2c323f": "1b163f", - "566f89": "566f89", "444e62": "332a59", "fa5494": "68c7c4", "cc4066": "2a666b", diff --git a/public/images/pokemon/variant/back/888-crowned.json b/public/images/pokemon/variant/back/888-crowned.json index e0e62e49bd5..3ca6bf9673c 100644 --- a/public/images/pokemon/variant/back/888-crowned.json +++ b/public/images/pokemon/variant/back/888-crowned.json @@ -2,7 +2,6 @@ "1": { "8f4e2f": "2f4567", "f2db8a": "a1c9cd", - "080808": "080808", "d79a53": "5a829b", "3471b4": "b74323", "2d4377": "5c1a1d", @@ -18,7 +17,6 @@ "2": { "8f4e2f": "692e47", "f2db8a": "c4826b", - "080808": "080808", "d79a53": "964c5c", "3471b4": "9fa7d0", "2d4377": "615c7e", diff --git a/public/images/pokemon/variant/back/888.json b/public/images/pokemon/variant/back/888.json index 22953486afb..12040268121 100644 --- a/public/images/pokemon/variant/back/888.json +++ b/public/images/pokemon/variant/back/888.json @@ -3,7 +3,6 @@ "2d4377": "5c1a1d", "4999da": "ec813b", "3471b4": "b74323", - "080808": "080808", "93262f": "0d2729", "f45353": "448b48", "be3c45": "224d42", @@ -16,7 +15,6 @@ "2d4377": "615c7e", "4999da": "e6ecff", "3471b4": "9fa7d0", - "080808": "080808", "93262f": "431042", "f45353": "902d57", "be3c45": "6c1d59", diff --git a/public/images/pokemon/variant/back/889-crowned.json b/public/images/pokemon/variant/back/889-crowned.json index cd69c495fff..963684b7306 100644 --- a/public/images/pokemon/variant/back/889-crowned.json +++ b/public/images/pokemon/variant/back/889-crowned.json @@ -1,7 +1,6 @@ { "1": { "2d2f7b": "102c2c", - "080808": "080808", "396dce": "70a757", "2d48a8": "3c6959", "8f4e2f": "2f4567", @@ -17,7 +16,6 @@ }, "2": { "2d2f7b": "244e61", - "080808": "080808", "396dce": "6fc7c1", "2d48a8": "4797a4", "8f4e2f": "692e47", diff --git a/public/images/pokemon/variant/back/889.json b/public/images/pokemon/variant/back/889.json index 883802e962a..3c172653f72 100644 --- a/public/images/pokemon/variant/back/889.json +++ b/public/images/pokemon/variant/back/889.json @@ -4,7 +4,6 @@ "396dce": "70a757", "2d48a8": "3c6959", "f2db8a": "a1c9cd", - "080808": "080808", "731a27": "1c163d", "eb363a": "614378", "ae2836": "422b61", @@ -17,7 +16,6 @@ "396dce": "6fc7c1", "2d48a8": "4797a4", "f2db8a": "c4826b", - "080808": "080808", "731a27": "615c7e", "eb363a": "e6ecff", "ae2836": "9fa7d0", diff --git a/public/images/pokemon/variant/back/890-eternamax.json b/public/images/pokemon/variant/back/890-eternamax.json index 356e1209bac..37dcd76f832 100644 --- a/public/images/pokemon/variant/back/890-eternamax.json +++ b/public/images/pokemon/variant/back/890-eternamax.json @@ -5,7 +5,6 @@ "6461ba": "6393a9", "641e30": "0778a0", "31245f": "162a52", - "010101": "010101", "e23434": "119bc7", "ab2a4c": "2fbbdc", "ff8c8c": "68e8f7", @@ -19,7 +18,6 @@ "6461ba": "e0ecff", "641e30": "934516", "31245f": "87a3dd", - "010101": "010101", "e23434": "d98d16", "ab2a4c": "cb7210", "ff8c8c": "e2a234", diff --git a/public/images/pokemon/variant/back/890.json b/public/images/pokemon/variant/back/890.json index 0c4ddb2ee61..97bb904cc13 100644 --- a/public/images/pokemon/variant/back/890.json +++ b/public/images/pokemon/variant/back/890.json @@ -8,11 +8,8 @@ "3a15bc": "264864", "675cc5": "406d89", "b21833": "21779e", - "010101": "010101", "f46d70": "8ef2ff", "f18cd5": "ff7d54", - "fefefe": "fefefe", - "ffbcbc": "ffbcbc", "e22dbc": "ee535a" }, "2": { @@ -24,11 +21,8 @@ "3a15bc": "bfd1fa", "675cc5": "e0ecff", "b21833": "bd5f10", - "010101": "010101", "f46d70": "f1bd4b", "f18cd5": "73e5dc", - "fefefe": "fefefe", - "ffbcbc": "ffbcbc", "e22dbc": "298fb9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/8901.json b/public/images/pokemon/variant/back/8901.json index 615b6219577..628da15b2de 100644 --- a/public/images/pokemon/variant/back/8901.json +++ b/public/images/pokemon/variant/back/8901.json @@ -2,24 +2,12 @@ "0": { "764e38": "823343", "b8805f": "b24c57", - "4b271b": "491b24", - "564d4e": "564d4e", - "847c7a": "847c7a", - "34302e": "34302e", - "bdb8b5": "bdb8b5", - "050505": "050505", - "efefef": "efefef" + "4b271b": "491b24" }, "1": { "764e38": "354d4f", "b8805f": "4d7269", - "4b271b": "2a2c33", - "564d4e": "564d4e", - "847c7a": "847c7a", - "34302e": "34302e", - "bdb8b5": "bdb8b5", - "050505": "050505", - "efefef": "efefef" + "4b271b": "2a2c33" }, "2": { "764e38": "423765", @@ -28,8 +16,6 @@ "564d4e": "5c486b", "847c7a": "c199ae", "34302e": "2a1a35", - "bdb8b5": "ede6eb", - "050505": "050505", - "efefef": "efefef" + "bdb8b5": "ede6eb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/891.json b/public/images/pokemon/variant/back/891.json index 6a11dfad107..f20000f7a63 100644 --- a/public/images/pokemon/variant/back/891.json +++ b/public/images/pokemon/variant/back/891.json @@ -1,18 +1,13 @@ { "0": { "717674": "6d5755", - "101010": "101010", "d8d1cb": "d1c8ba", "b5ada6": "ad9a8a", - "9194a2": "9194a2", - "fbfbfb": "fbfbfb", - "c9cccd": "c9cccd", "393539": "34302f", "655e65": "5c5653" }, "1": { "717674": "263138", - "101010": "101010", "d8d1cb": "6e8b9b", "b5ada6": "475b68", "9194a2": "181b33", @@ -23,7 +18,6 @@ }, "2": { "717674": "56546b", - "101010": "101010", "d8d1cb": "e8e8ff", "b5ada6": "a4a4bc", "9194a2": "7f1c27", diff --git a/public/images/pokemon/variant/back/892-gigantamax-rapid.json b/public/images/pokemon/variant/back/892-gigantamax-rapid.json index 0c3cde948bb..66217fca718 100644 --- a/public/images/pokemon/variant/back/892-gigantamax-rapid.json +++ b/public/images/pokemon/variant/back/892-gigantamax-rapid.json @@ -1,18 +1,13 @@ { "0": { - "100d4f": "100d4f", "303ff1": "4550e6", "282d26": "25141f", - "2b337d": "2b337d", - "010101": "010101", "605f4d": "513b46", - "86a0fd": "86a0fd", "f5f5f5": "f4efe8", "9e6225": "8b222f", "fffa60": "ff9736", "d5a926": "b95826", "b5b5b5": "afa299", - "919191": "919191", "6b6574": "726259" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/892-gigantamax-single.json b/public/images/pokemon/variant/back/892-gigantamax-single.json index c2c5098b928..481912d7c11 100644 --- a/public/images/pokemon/variant/back/892-gigantamax-single.json +++ b/public/images/pokemon/variant/back/892-gigantamax-single.json @@ -2,15 +2,10 @@ "0": { "42473a": "382334", "282d26": "25141f", - "010101": "010101", "605f4d": "513b46", - "570f0f": "570f0f", "e7140a": "d03932", - "922718": "922718", - "fe7d70": "fe7d70", "f5f5f5": "f4efe8", "9e6225": "8b222f", - "919191": "919191", "fffa60": "ff9736", "d5a926": "b95826", "b5b5b5": "afa299", diff --git a/public/images/pokemon/variant/back/892-rapid-strike.json b/public/images/pokemon/variant/back/892-rapid-strike.json index cdccb62732d..9d1905b869b 100644 --- a/public/images/pokemon/variant/back/892-rapid-strike.json +++ b/public/images/pokemon/variant/back/892-rapid-strike.json @@ -2,12 +2,9 @@ "0": { "4f4b58": "4a2e27", "605f4d": "513b46", - "010101": "010101", "6b6574": "725444", "8d8c8e": "957961", "282d26": "25141f", - "fcfcfc": "fcfcfc", - "b9b9b9": "b9b9b9", "9e6225": "8b222f", "42473a": "382334", "fffa60": "ff9736", @@ -16,7 +13,6 @@ "1": { "4f4b58": "242a3f", "605f4d": "444f5b", - "010101": "010101", "6b6574": "4c6877", "8d8c8e": "809ba3", "282d26": "181b33", @@ -30,7 +26,6 @@ "2": { "4f4b58": "56546b", "605f4d": "213199", - "010101": "010101", "6b6574": "a4a4bc", "8d8c8e": "e8e8ff", "282d26": "07073f", diff --git a/public/images/pokemon/variant/back/892.json b/public/images/pokemon/variant/back/892.json index 5499ec660fe..7476bf85cfd 100644 --- a/public/images/pokemon/variant/back/892.json +++ b/public/images/pokemon/variant/back/892.json @@ -2,22 +2,18 @@ "0": { "282d26": "25141f", "605f4d": "513b46", - "b9b9b9": "b9b9b9", - "010101": "010101", "4f4b58": "4a2e27", "42473a": "382334", "6b6574": "725444", "8d8c8e": "957961", "9e6225": "8b222f", "fffa60": "ff9736", - "fcfcfc": "fcfcfc", "d5a926": "b95826" }, "1": { "282d26": "181b33", "605f4d": "444f5b", "b9b9b9": "768187", - "010101": "010101", "4f4b58": "263138", "42473a": "2e3549", "6b6574": "4c6877", @@ -31,7 +27,6 @@ "282d26": "3d0015", "605f4d": "870e2a", "b9b9b9": "a52139", - "010101": "010101", "4f4b58": "56546b", "42473a": "51081e", "6b6574": "a4a4bc", diff --git a/public/images/pokemon/variant/back/896.json b/public/images/pokemon/variant/back/896.json index f1c459febd1..a88dce32430 100644 --- a/public/images/pokemon/variant/back/896.json +++ b/public/images/pokemon/variant/back/896.json @@ -1,6 +1,5 @@ { "0": { - "000000": "000000", "8cacdd": "8f84c9", "bbd2ff": "b9abea", "4679b7": "5952a1", @@ -13,7 +12,6 @@ "6c6271": "68627a" }, "1": { - "000000": "000000", "8cacdd": "41d5b3", "bbd2ff": "9dffff", "4679b7": "00816c", @@ -26,7 +24,6 @@ "6c6271": "35486b" }, "2": { - "000000": "000000", "8cacdd": "bc393b", "bbd2ff": "f68c79", "4679b7": "780024", diff --git a/public/images/pokemon/variant/back/897.json b/public/images/pokemon/variant/back/897.json index 2d14655e39b..0217835accd 100644 --- a/public/images/pokemon/variant/back/897.json +++ b/public/images/pokemon/variant/back/897.json @@ -1,19 +1,13 @@ { "0": { - "101010": "101010", - "3c3c3c": "3c3c3c", "525852": "5d5458", "49478f": "894061", "7c5bcf": "d05a82", "00285c": "632741", - "d9a4e3": "d9a4e3", - "fcfcfc": "fcfcfc", - "755179": "755179", "504e8e": "80447d", "8776e4": "b862b3" }, "1": { - "101010": "101010", "3c3c3c": "622d51", "525852": "904c75", "49478f": "932f27", @@ -26,7 +20,6 @@ "8776e4": "ef8956" }, "2": { - "101010": "101010", "3c3c3c": "3a6965", "525852": "5c8a7b", "49478f": "13312b", diff --git a/public/images/pokemon/variant/back/898-ice.json b/public/images/pokemon/variant/back/898-ice.json index ec65a41c97a..c4ce4d27186 100644 --- a/public/images/pokemon/variant/back/898-ice.json +++ b/public/images/pokemon/variant/back/898-ice.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "8cacdd": "8f84c9", "004037": "00403c", "bbd2ff": "b9abea", @@ -8,8 +7,6 @@ "00584b": "005852", "4679b7": "5952a1", "525752": "6a5837", - "fbfbfb": "fbfbfb", - "c6c7cc": "c6c7cc", "9e8f87": "ae8b50", "d1c8be": "d7c881", "003071": "2f104f", @@ -19,11 +16,9 @@ "00285b": "3b2948", "cac0cb": "c9c0d4", "83818f": "6f6982", - "6c6271": "68627a", - "3c3c3c": "3c3c3c" + "6c6271": "68627a" }, "1": { - "101010": "101010", "8cacdd": "41d5b3", "004037": "00124d", "bbd2ff": "9dffff", @@ -31,8 +26,6 @@ "00584b": "183986", "4679b7": "00816c", "525752": "38255f", - "fbfbfb": "fbfbfb", - "c6c7cc": "c6c7cc", "9e8f87": "927ec4", "d1c8be": "ba9ded", "003071": "014837", @@ -42,11 +35,9 @@ "00285b": "8d075a", "cac0cb": "6f8ec1", "83818f": "506698", - "6c6271": "35486b", - "3c3c3c": "3c3c3c" + "6c6271": "35486b" }, "2": { - "101010": "101010", "8cacdd": "bc393b", "004037": "3c1522", "bbd2ff": "f68c79", diff --git a/public/images/pokemon/variant/back/898-shadow.json b/public/images/pokemon/variant/back/898-shadow.json index 336ba31bc8d..a15e24df045 100644 --- a/public/images/pokemon/variant/back/898-shadow.json +++ b/public/images/pokemon/variant/back/898-shadow.json @@ -4,21 +4,14 @@ "007766": "00776f", "00584b": "005852", "525752": "6a5837", - "101010": "101010", - "fbfbfb": "fbfbfb", - "3c3c3c": "3c3c3c", - "c7c8cd": "c7c8cd", "525852": "5d5458", "9e8f87": "ae8b50", "d1c8be": "d7c881", "49478f": "894061", "7c5bcf": "d05a82", "00285c": "632741", - "d9a4e3": "d9a4e3", "3b3b3b": "6a5837", - "fcfcfc": "fcfcfc", "00285b": "3b2948", - "755179": "755179", "504e8e": "80447d", "8776e4": "b862b3" }, @@ -27,10 +20,7 @@ "007766": "345ab5", "00584b": "183986", "525752": "38255f", - "101010": "101010", - "fbfbfb": "fbfbfb", "3c3c3c": "622d51", - "c7c8cd": "c7c8cd", "525852": "904c75", "9e8f87": "927ec4", "d1c8be": "ba9ded", @@ -50,7 +40,6 @@ "007766": "88253e", "00584b": "601b35", "525752": "181935", - "101010": "101010", "fbfbfb": "fefdeb", "3c3c3c": "3a6965", "c7c8cd": "ccc5bb", diff --git a/public/images/pokemon/variant/back/898.json b/public/images/pokemon/variant/back/898.json index b05b80efd5e..174c25d9379 100644 --- a/public/images/pokemon/variant/back/898.json +++ b/public/images/pokemon/variant/back/898.json @@ -7,8 +7,6 @@ "504e8e": "71517a", "007766": "00776f", "525852": "6a5837", - "101010": "101010", - "fcfcfc": "fcfcfc", "c7c8cd": "ccc6d1", "9e8f87": "ae8b50", "797b8f": "8e778d", @@ -23,8 +21,6 @@ "504e8e": "f55a95", "007766": "345ab5", "525852": "38255f", - "101010": "101010", - "fcfcfc": "fcfcfc", "c7c8cd": "ccc6d1", "9e8f87": "927ec4", "797b8f": "c64883", @@ -39,7 +35,6 @@ "504e8e": "cc8c49", "007766": "88253e", "525852": "181935", - "101010": "101010", "fcfcfc": "fefdeb", "c7c8cd": "c4bdb3", "9e8f87": "354d8a", diff --git a/public/images/pokemon/variant/back/9-gigantamax.json b/public/images/pokemon/variant/back/9-gigantamax.json index 689aac11b75..8ab2115c5a8 100644 --- a/public/images/pokemon/variant/back/9-gigantamax.json +++ b/public/images/pokemon/variant/back/9-gigantamax.json @@ -1,17 +1,12 @@ { "1": { "352e27": "2c2525", - "fdfdfd": "fdfdfd", "494136": "3e322f", "5f5647": "504945", - "949494": "949494", - "cdcdd5": "cdcdd5", "083962": "204c6d", - "101010": "101010", "2062ac": "33808c", "94ace6": "50b176", "5a8bcd": "5fc7a3", - "4a4a4a": "4a4a4a", "6ce8d6": "9bffa4", "c75435": "b44839", "ea7957": "e06a71" diff --git a/public/images/pokemon/variant/back/900.json b/public/images/pokemon/variant/back/900.json index 68558c7931b..835b578b32a 100644 --- a/public/images/pokemon/variant/back/900.json +++ b/public/images/pokemon/variant/back/900.json @@ -1,30 +1,14 @@ { "1": { - "080808": "080808", - "3a2e2f": "3a2e2f", - "6a5856": "6a5856", - "4d3d3e": "4d3d3e", - "96856d": "96856d", - "fcfcfc": "fcfcfc", - "2b1f22": "2b1f22", - "c8bdb7": "c8bdb7", "6b563a": "221a69", "af7845": "354da7", - "e2b561": "4b84d2", - "e3d1ae": "e3d1ae" + "e2b561": "4b84d2" }, "2": { - "080808": "080808", - "3a2e2f": "3a2e2f", "6a5856": "424242", "4d3d3e": "808080", - "96856d": "96856d", - "fcfcfc": "fcfcfc", - "2b1f22": "2b1f22", - "c8bdb7": "c8bdb7", "6b563a": "a54200", "af7845": "e68400", - "e2b561": "ffde00", - "e3d1ae": "e3d1ae" + "e2b561": "ffde00" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/901.json b/public/images/pokemon/variant/back/901.json index da538225735..c3fc4fb00ed 100644 --- a/public/images/pokemon/variant/back/901.json +++ b/public/images/pokemon/variant/back/901.json @@ -1,24 +1,16 @@ { "1": { "382423": "1c2825", - "0f0f0f": "0f0f0f", "502f29": "273b32", "231a18": "0c1515", - "77655b": "77655b", - "9c8d86": "9c8d86", - "4b4236": "4b4236", "63443d": "31563f", "ca8b35": "c48e81", "fec643": "f7eee1", - "fcfcfc": "fcfcfc", "25521f": "557f24", - "fec672": "f2cab8", - "95908a": "95908a", - "b4b4b1": "b4b4b1" + "fec672": "f2cab8" }, "2": { "382423": "1e2249", - "0f0f0f": "0f0f0f", "502f29": "323760", "231a18": "111433", "77655b": "c199ae", @@ -27,10 +19,7 @@ "63443d": "46527a", "ca8b35": "437aff", "fec643": "bfeeff", - "fcfcfc": "fcfcfc", "25521f": "f83259", - "fec672": "96b7ff", - "95908a": "95908a", - "b4b4b1": "b4b4b1" + "fec672": "96b7ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/903.json b/public/images/pokemon/variant/back/903.json index 4cfc1cf557a..1f689b19af0 100644 --- a/public/images/pokemon/variant/back/903.json +++ b/public/images/pokemon/variant/back/903.json @@ -4,13 +4,10 @@ "415b81": "3a0f0e", "533662": "136e81", "9ebade": "bd795f", - "0f110d": "0f110d", "718fbe": "9f4c3d", "8e2458": "12968b", "6a56b3": "722738", "36326d": "210609", - "f8feff": "f8feff", - "9b98a9": "9b98a9", "de2f41": "31dabb", "eb357c": "31dabb" }, @@ -19,7 +16,6 @@ "415b81": "0e2125", "533662": "982e33", "9ebade": "256258", - "0f110d": "0f110d", "718fbe": "194648", "8e2458": "cc5427", "6a56b3": "65b571", diff --git a/public/images/pokemon/variant/back/909.json b/public/images/pokemon/variant/back/909.json index 37ffae8ca39..afcdebd5e28 100644 --- a/public/images/pokemon/variant/back/909.json +++ b/public/images/pokemon/variant/back/909.json @@ -8,9 +8,7 @@ "745e45": "76976a", "aaa493": "a4ba9e", "dfa22f": "8cd9d9", - "0f0f0f": "152828", - "525867": "525867", - "373c46": "373c46" + "0f0f0f": "152828" }, "2": { "fe5c2e": "2ce455", @@ -21,8 +19,6 @@ "745e45": "55754a", "aaa493": "82977c", "dfa22f": "2ce455", - "0f0f0f": "162319", - "525867": "525867", - "373c46": "373c46" + "0f0f0f": "162319" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/911.json b/public/images/pokemon/variant/back/911.json index c46e1bdbb5d..07b60682d4c 100644 --- a/public/images/pokemon/variant/back/911.json +++ b/public/images/pokemon/variant/back/911.json @@ -7,24 +7,19 @@ "5b5c5e": "4f5052", "fcfcfc": "cccccc", "9fa0a2": "758a70", - "333c36": "333c36", "ba3227": "234141", "741010": "152828", - "ff4a3c": "366565", - "0f0f0f": "0f0f0f" + "ff4a3c": "366565" }, "2": { "d20000": "0ea631", "f45511": "2fe757", "ee8b08": "08e739", "ffd017": "4ffc75", - "5b5c5e": "5b5c5e", "fcfcfc": "e5ffec", "9fa0a2": "82977c", - "333c36": "333c36", "ba3227": "243929", "741010": "162319", - "ff4a3c": "38583f", - "0f0f0f": "0f0f0f" + "ff4a3c": "38583f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/912.json b/public/images/pokemon/variant/back/912.json index bbbe5288893..fce8f37518a 100644 --- a/public/images/pokemon/variant/back/912.json +++ b/public/images/pokemon/variant/back/912.json @@ -2,7 +2,6 @@ "1": { "1f5978": "8c3b14", "2fbee8": "e69c51", - "0f0f0f": "0f0f0f", "3686b1": "d96536", "becde4": "d79f63", "4d6373": "975432", @@ -11,7 +10,6 @@ "2": { "1f5978": "0a3025", "2fbee8": "33b37e", - "0f0f0f": "0f0f0f", "3686b1": "1c7962", "becde4": "5137a0", "4d6373": "2d185d", diff --git a/public/images/pokemon/variant/back/913.json b/public/images/pokemon/variant/back/913.json index e9d85674c0e..fbe1defcb77 100644 --- a/public/images/pokemon/variant/back/913.json +++ b/public/images/pokemon/variant/back/913.json @@ -6,7 +6,6 @@ "13325e": "3f050e", "174b6a": "862311", "30b0ba": "f77122", - "0f0f0f": "0f0f0f", "916a44": "3b2e28", "ddc271": "5b5450", "d0c4d3": "d79f63", @@ -23,7 +22,6 @@ "13325e": "072a2b", "174b6a": "541222", "30b0ba": "a22f49", - "0f0f0f": "0f0f0f", "916a44": "4b251b", "ddc271": "c76740", "d0c4d3": "3b188e", diff --git a/public/images/pokemon/variant/back/914.json b/public/images/pokemon/variant/back/914.json index 2179ed6d464..a10fad30d99 100644 --- a/public/images/pokemon/variant/back/914.json +++ b/public/images/pokemon/variant/back/914.json @@ -7,7 +7,6 @@ "333f93": "821e24", "752911": "302822", "e3460f": "f8edb9", - "0f0f0f": "0f0f0f", "a24720": "dac194", "8ea6a8": "d79f63", "62747b": "975432", @@ -26,7 +25,6 @@ "333f93": "0f4537", "752911": "664747", "e3460f": "fff2e5", - "0f0f0f": "0f0f0f", "a24720": "eac7b4", "8ea6a8": "3b188e", "62747b": "120e4a", diff --git a/public/images/pokemon/variant/back/919.json b/public/images/pokemon/variant/back/919.json index 0f7ecc24eab..581aaf57432 100644 --- a/public/images/pokemon/variant/back/919.json +++ b/public/images/pokemon/variant/back/919.json @@ -4,7 +4,6 @@ "63738c": "4b453d", "798aa2": "6c655c", "4b5870": "302d27", - "121212": "121212", "41485b": "23211d", "dde1e4": "cec890", "c0bdc0": "a29d62", @@ -12,7 +11,6 @@ "7b8ca3": "6c655c", "b0acb0": "a29d62", "ffc608": "d02c35", - "0f0f0f": "0f0f0f", "a38215": "b52736", "a49dac": "62654e" }, @@ -21,24 +19,16 @@ "63738c": "498f57", "798aa2": "70ba74", "4b5870": "295449", - "121212": "121212", "41485b": "1c3835", - "dde1e4": "dde1e4", - "c0bdc0": "c0bdc0", - "636164": "636164", "7b8ca3": "70ba74", - "b0acb0": "b0acb0", "ffc608": "c54d2d", - "0f0f0f": "0f0f0f", - "a38215": "7f223a", - "a49dac": "a49dac" + "a38215": "7f223a" }, "2": { "2f323c": "340f21", "63738c": "983444", "798aa2": "c74d51", "4b5870": "601c3a", - "121212": "121212", "41485b": "4b132c", "dde1e4": "444444", "c0bdc0": "444444", @@ -46,7 +36,6 @@ "7b8ca3": "c74d51", "b0acb0": "333333", "ffc608": "2977b6", - "0f0f0f": "0f0f0f", "a38215": "293c7d", "a49dac": "222222" } diff --git a/public/images/pokemon/variant/back/920.json b/public/images/pokemon/variant/back/920.json index 79b215090f3..2b41be162fe 100644 --- a/public/images/pokemon/variant/back/920.json +++ b/public/images/pokemon/variant/back/920.json @@ -1,12 +1,8 @@ { "0": { "292829": "475316", - "0f0f0f": "0f0f0f", "505050": "dbcf15", "3c393c": "8e931a", - "e6ebef": "e6ebef", - "a59aa5": "a59aa5", - "ffffff": "ffffff", "6b6d6b": "f6ea5f", "607381": "444444", "8e4815": "4d0517", @@ -17,12 +13,8 @@ }, "1": { "292829": "1e391b", - "0f0f0f": "0f0f0f", "505050": "529042", "3c393c": "34642c", - "e6ebef": "e6ebef", - "a59aa5": "a59aa5", - "ffffff": "ffffff", "6b6d6b": "6ea25e", "607381": "919191", "8e4815": "550927", @@ -33,12 +25,8 @@ }, "2": { "292829": "47132c", - "0f0f0f": "0f0f0f", "505050": "b52828", "3c393c": "791b2d", - "e6ebef": "e6ebef", - "a59aa5": "a59aa5", - "ffffff": "ffffff", "6b6d6b": "df4747", "607381": "858585", "8e4815": "1c1936", diff --git a/public/images/pokemon/variant/back/924.json b/public/images/pokemon/variant/back/924.json index 9b2e1c7db20..af06a7001ea 100644 --- a/public/images/pokemon/variant/back/924.json +++ b/public/images/pokemon/variant/back/924.json @@ -3,7 +3,6 @@ "393a44": "344854", "f9f9f9": "cddef1", "b8b9c0": "9c89d2", - "0f0f0f": "0f0f0f", "888b97": "5a6e8f", "565765": "444561", "567d9a": "755382", @@ -14,7 +13,6 @@ "393a44": "3f0f0f", "f9f9f9": "b39090", "b8b9c0": "785e5e", - "0f0f0f": "0f0f0f", "888b97": "6e4343", "565765": "543131", "567d9a": "a15d55", @@ -25,7 +23,6 @@ "393a44": "27272e", "f9f9f9": "757373", "b8b9c0": "4b4b4d", - "0f0f0f": "0f0f0f", "888b97": "3c3c3d", "565765": "252526", "567d9a": "471910", diff --git a/public/images/pokemon/variant/back/925-four.json b/public/images/pokemon/variant/back/925-four.json index 9b2e1c7db20..af06a7001ea 100644 --- a/public/images/pokemon/variant/back/925-four.json +++ b/public/images/pokemon/variant/back/925-four.json @@ -3,7 +3,6 @@ "393a44": "344854", "f9f9f9": "cddef1", "b8b9c0": "9c89d2", - "0f0f0f": "0f0f0f", "888b97": "5a6e8f", "565765": "444561", "567d9a": "755382", @@ -14,7 +13,6 @@ "393a44": "3f0f0f", "f9f9f9": "b39090", "b8b9c0": "785e5e", - "0f0f0f": "0f0f0f", "888b97": "6e4343", "565765": "543131", "567d9a": "a15d55", @@ -25,7 +23,6 @@ "393a44": "27272e", "f9f9f9": "757373", "b8b9c0": "4b4b4d", - "0f0f0f": "0f0f0f", "888b97": "3c3c3d", "565765": "252526", "567d9a": "471910", diff --git a/public/images/pokemon/variant/back/925-three.json b/public/images/pokemon/variant/back/925-three.json index 9b2e1c7db20..af06a7001ea 100644 --- a/public/images/pokemon/variant/back/925-three.json +++ b/public/images/pokemon/variant/back/925-three.json @@ -3,7 +3,6 @@ "393a44": "344854", "f9f9f9": "cddef1", "b8b9c0": "9c89d2", - "0f0f0f": "0f0f0f", "888b97": "5a6e8f", "565765": "444561", "567d9a": "755382", @@ -14,7 +13,6 @@ "393a44": "3f0f0f", "f9f9f9": "b39090", "b8b9c0": "785e5e", - "0f0f0f": "0f0f0f", "888b97": "6e4343", "565765": "543131", "567d9a": "a15d55", @@ -25,7 +23,6 @@ "393a44": "27272e", "f9f9f9": "757373", "b8b9c0": "4b4b4d", - "0f0f0f": "0f0f0f", "888b97": "3c3c3d", "565765": "252526", "567d9a": "471910", diff --git a/public/images/pokemon/variant/back/93.json b/public/images/pokemon/variant/back/93.json index d25c8085a4c..1b0b795524d 100644 --- a/public/images/pokemon/variant/back/93.json +++ b/public/images/pokemon/variant/back/93.json @@ -5,10 +5,7 @@ "524263": "52426b", "c58cce": "dfcaee", "ad6bce": "caaddf", - "b51919": "2963d6", - "101010": "101010", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6" + "b51919": "2963d6" }, "1": { "de4a31": "7ee75c", @@ -16,10 +13,7 @@ "524263": "380508", "c58cce": "c06380", "ad6bce": "8e395f", - "b51919": "2eb063", - "101010": "101010", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6" + "b51919": "2eb063" }, "2": { "de4a31": "e47750", @@ -27,9 +21,6 @@ "524263": "1a1320", "c58cce": "897e91", "ad6bce": "544e59", - "b51919": "b72b47", - "101010": "101010", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6" + "b51919": "b72b47" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/932.json b/public/images/pokemon/variant/back/932.json index 307d0fbe1bb..4a7b43945b8 100644 --- a/public/images/pokemon/variant/back/932.json +++ b/public/images/pokemon/variant/back/932.json @@ -2,7 +2,6 @@ "1": { "717171": "82556e", "ffffff": "f9c2cd", - "121212": "121212", "b4b4b4": "bc8296", "c6876e": "deeaf3", "875651": "9ba7b0", @@ -13,7 +12,6 @@ "2": { "717171": "383744", "ffffff": "9ba0a0", - "121212": "121212", "b4b4b4": "63636d", "c6876e": "7cbf7f", "875651": "618c56", diff --git a/public/images/pokemon/variant/back/933.json b/public/images/pokemon/variant/back/933.json index d2aed23d065..22bdad71eaa 100644 --- a/public/images/pokemon/variant/back/933.json +++ b/public/images/pokemon/variant/back/933.json @@ -1,7 +1,6 @@ { "1": { "636363": "90a4b5", - "121212": "121212", "c6876e": "bc8296", "8c6464": "d8e9f5", "b4b4b4": "adbac3", @@ -15,7 +14,6 @@ }, "2": { "636363": "444251", - "121212": "121212", "c6876e": "5d9157", "8c6464": "3d5e47", "b4b4b4": "63636d", diff --git a/public/images/pokemon/variant/back/934.json b/public/images/pokemon/variant/back/934.json index 84d33b5f448..2aec5e8fe82 100644 --- a/public/images/pokemon/variant/back/934.json +++ b/public/images/pokemon/variant/back/934.json @@ -6,7 +6,6 @@ "c1b5bd": "bc808c", "64514d": "6d7982", "96675a": "adbac3", - "0f0f0f": "0f0f0f", "44332e": "3a464f", "58493e": "563d41", "c3927b": "d8e9f5", @@ -20,7 +19,6 @@ "c1b5bd": "6a6a72", "64514d": "3d5e47", "96675a": "5d9157", - "0f0f0f": "0f0f0f", "44332e": "2b3f3f", "58493e": "444f47", "c3927b": "7fc17c", diff --git a/public/images/pokemon/variant/back/936.json b/public/images/pokemon/variant/back/936.json index 98c7398e1a0..e2131c8988e 100644 --- a/public/images/pokemon/variant/back/936.json +++ b/public/images/pokemon/variant/back/936.json @@ -3,15 +3,11 @@ "e42212": "93d6b7", "fdcd0d": "b885d6", "e589b5": "a59fdf", - "1b2123": "1b2123", "8a2f2f": "5ba0cc", - "4a4848": "4a4848", "5b3e1c": "1d1d36", - "383636": "383636", "a27715": "343467", "cfac07": "645aa3", "f0e631": "6d74b8", - "0f0f0f": "0f0f0f", "542829": "465da8", "fffba6": "aab1ef" }, @@ -21,13 +17,10 @@ "e589b5": "a3bfcc", "1b2123": "342351", "8a2f2f": "418dcc", - "4a4848": "4a4848", "5b3e1c": "193939", - "383636": "383636", "a27715": "2e5f55", "cfac07": "4c8954", "f0e631": "78b770", - "0f0f0f": "0f0f0f", "542829": "1f4a7f", "fffba6": "8be68b" }, @@ -35,15 +28,11 @@ "e42212": "e72ecb", "fdcd0d": "fd890d", "e589b5": "ff5668", - "1b2123": "1b2123", "8a2f2f": "9d4193", - "4a4848": "4a4848", "5b3e1c": "515b7f", - "383636": "383636", "a27715": "7a7fa8", "cfac07": "91a1c1", "f0e631": "cbd4f4", - "0f0f0f": "0f0f0f", "542829": "5e385a", "fffba6": "ffffff" } diff --git a/public/images/pokemon/variant/back/937.json b/public/images/pokemon/variant/back/937.json index d2b407afb4a..46b00ac4a90 100644 --- a/public/images/pokemon/variant/back/937.json +++ b/public/images/pokemon/variant/back/937.json @@ -6,7 +6,6 @@ "97c7dd": "ff8cc7", "343467": "ad5e15", "645aa3": "efcc32", - "0f0f0f": "0f0f0f", "292528": "ad5e15", "2541ad": "c44648", "1d1d36": "5b3e1c", @@ -20,7 +19,6 @@ "97c7dd": "f4b766", "343467": "b52d6c", "645aa3": "e57bc4", - "0f0f0f": "0f0f0f", "292528": "b52d6c", "2541ad": "992923", "1d1d36": "7a1e47", @@ -34,10 +32,8 @@ "97c7dd": "9668e3", "343467": "515b7f", "645aa3": "cbd4f4", - "0f0f0f": "0f0f0f", "292528": "515b7f", "2541ad": "4615bd", - "1d1d36": "1d1d36", "454589": "91a1c1", "453d43": "8897aa" } diff --git a/public/images/pokemon/variant/back/94-gigantamax.json b/public/images/pokemon/variant/back/94-gigantamax.json index 550f763a83f..348c78479ab 100644 --- a/public/images/pokemon/variant/back/94-gigantamax.json +++ b/public/images/pokemon/variant/back/94-gigantamax.json @@ -1,7 +1,6 @@ { "0": { "5a4a9c": "a89dc4", - "101010": "101010", "b48bbd": "fefefe", "9473b4": "fcf4fc", "4a294a": "634b63", @@ -10,7 +9,6 @@ }, "1": { "5a4a9c": "4a1f36", - "101010": "101010", "b48bbd": "c56f8a", "9473b4": "8d3e61", "4a294a": "201323", @@ -19,7 +17,6 @@ }, "2": { "5a4a9c": "302433", - "101010": "101010", "b48bbd": "7b6888", "9473b4": "3f324a", "4a294a": "201323", diff --git a/public/images/pokemon/variant/back/94-mega.json b/public/images/pokemon/variant/back/94-mega.json index a903b3aefb0..ee1076223f4 100644 --- a/public/images/pokemon/variant/back/94-mega.json +++ b/public/images/pokemon/variant/back/94-mega.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "4d2a4d": "634b63", "503f73": "d1bcd6", "775499": "fcf4fc", @@ -11,7 +10,6 @@ "ff5991": "72e9f2" }, "1": { - "101010": "101010", "4d2a4d": "1a1320", "503f73": "511e3b", "775499": "a44c73", @@ -22,7 +20,6 @@ "ff5991": "c1ea61" }, "2": { - "101010": "101010", "4d2a4d": "1a1320", "503f73": "302433", "775499": "3f324a", diff --git a/public/images/pokemon/variant/back/94.json b/public/images/pokemon/variant/back/94.json index 23175bfe203..028450f1498 100644 --- a/public/images/pokemon/variant/back/94.json +++ b/public/images/pokemon/variant/back/94.json @@ -2,7 +2,6 @@ "0": { "5a4a9c": "9e85a6", "b58cbd": "ebdbf7", - "101010": "101010", "9473b5": "cbb7da", "4a294a": "634b63", "7b63a5": "b8a2c3" @@ -10,7 +9,6 @@ "1": { "5a4a9c": "4a1f36", "b58cbd": "c56f8a", - "101010": "101010", "9473b5": "8d3e61", "4a294a": "1b0917", "7b63a5": "6f284a" @@ -18,7 +16,6 @@ "2": { "5a4a9c": "302433", "b58cbd": "7b6888", - "101010": "101010", "9473b5": "3f324a", "4a294a": "201323", "7b63a5": "3f324a" diff --git a/public/images/pokemon/variant/back/940.json b/public/images/pokemon/variant/back/940.json index 313dbd273ec..c68f4dc3c10 100644 --- a/public/images/pokemon/variant/back/940.json +++ b/public/images/pokemon/variant/back/940.json @@ -2,11 +2,9 @@ "1": { "2f3135": "372b61", "3f424d": "4c4982", - "181a1b": "181a1b", "ffcd37": "7dffc0", "be8f29": "5dd9c8", "91a5c3": "e39fc5", - "f9f9f9": "f9f9f9", "73bbbf": "f7859b", "643c28": "433382", "c27741": "9a5fd9", @@ -17,11 +15,9 @@ "2": { "2f3135": "e099a5", "3f424d": "edc5c8", - "181a1b": "181a1b", "ffcd37": "d9647b", "be8f29": "b3466a", "91a5c3": "ba73b2", - "f9f9f9": "f9f9f9", "73bbbf": "ffcf4a", "643c28": "2b2745", "c27741": "57436e", diff --git a/public/images/pokemon/variant/back/941.json b/public/images/pokemon/variant/back/941.json index 8ac4f1c0d7f..9bbee8a2e92 100644 --- a/public/images/pokemon/variant/back/941.json +++ b/public/images/pokemon/variant/back/941.json @@ -1,12 +1,9 @@ { "1": { - "15161e": "15161e", "34393f": "2b3863", "26282c": "1f1d54", "aa7e24": "3dd1cc", "ffcd37": "6ef5c8", - "fdfdfd": "fdfdfd", - "0f0f0f": "0f0f0f", "73bbbf": "de82ff", "2b1717": "773185", "692a2f": "ff9ec6", @@ -15,13 +12,10 @@ "37415a": "55348a" }, "2": { - "15161e": "15161e", "34393f": "f7bebe", "26282c": "e394a7", "aa7e24": "c44f6c", "ffcd37": "e3667d", - "fdfdfd": "fdfdfd", - "0f0f0f": "0f0f0f", "73bbbf": "ffcf4a", "2b1717": "3a3466", "692a2f": "776294", diff --git a/public/images/pokemon/variant/back/948.json b/public/images/pokemon/variant/back/948.json index 35aff4a6038..d567f9de04a 100644 --- a/public/images/pokemon/variant/back/948.json +++ b/public/images/pokemon/variant/back/948.json @@ -6,7 +6,6 @@ "f8d3c2": "8b91c8", "ffec37": "ff6237", "976924": "a50927", - "000000": "000000", "eaba2b": "ce271a", "d2bbac": "e2bea6", "fef8f5": "fff4f1", @@ -19,7 +18,6 @@ "f8d3c2": "eb9a93", "ffec37": "4b86bd", "976924": "254087", - "000000": "000000", "eaba2b": "2e609b", "d2bbac": "d8bdab", "fef8f5": "ffede5", diff --git a/public/images/pokemon/variant/back/949.json b/public/images/pokemon/variant/back/949.json index 1773e282574..2684d9055cc 100644 --- a/public/images/pokemon/variant/back/949.json +++ b/public/images/pokemon/variant/back/949.json @@ -3,15 +3,12 @@ "404040": "4b3073", "282828": "33134d", "5f5f5f": "7462ad", - "000000": "000000", "86433c": "a50927", "ca7268": "d41929", "ede652": "1672a1", - "ffffff": "ffffff", "d6938b": "ff4737", "e7bcb8": "ff9d6d", "cdae52": "0c4a83", - "101010": "101010", "c2ae83": "b29785", "94724b": "60473c", "936839": "042259" @@ -20,15 +17,12 @@ "404040": "70150e", "282828": "460001", "5f5f5f": "c64d30", - "000000": "000000", "86433c": "401e54", "ca7268": "613a8a", "ede652": "dd7731", - "ffffff": "ffffff", "d6938b": "8e65c1", "e7bcb8": "dd9dff", "cdae52": "af3610", - "101010": "101010", "c2ae83": "d9b591", "94724b": "6f492c", "936839": "7e1200" diff --git a/public/images/pokemon/variant/back/951.json b/public/images/pokemon/variant/back/951.json index 600d22ebc33..4e9cc76122b 100644 --- a/public/images/pokemon/variant/back/951.json +++ b/public/images/pokemon/variant/back/951.json @@ -6,10 +6,8 @@ "a6b496": "facf81", "f0fbe3": "ffeacc", "2f683c": "9d6b5b", - "0f0f0f": "0f0f0f", "5c7c5c": "4c292f", "ff9115": "ffb676", - "2e302f": "2e302f", "79b97b": "704f4f" }, "2": { @@ -19,10 +17,8 @@ "a6b496": "fa95d1", "f0fbe3": "fecff5", "2f683c": "7456a8", - "0f0f0f": "0f0f0f", "5c7c5c": "8e7eb1", "ff9115": "b6dfff", - "2e302f": "2e302f", "79b97b": "cfbfe6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/952.json b/public/images/pokemon/variant/back/952.json index 4f6d47d615d..5502fb57a0a 100644 --- a/public/images/pokemon/variant/back/952.json +++ b/public/images/pokemon/variant/back/952.json @@ -8,7 +8,6 @@ "3f8147": "d38c43", "69ab7b": "be8a84", "42804b": "9d6b5b", - "0f0f0f": "0f0f0f", "262826": "3b1720", "476b51": "704f4f", "3c5042": "4c292f", @@ -23,7 +22,6 @@ "3f8147": "627bcd", "69ab7b": "c4a4eb", "42804b": "9884d3", - "0f0f0f": "0f0f0f", "262826": "7a6597", "476b51": "f8f3fe", "3c5042": "cfbfe6", diff --git a/public/images/pokemon/variant/back/953.json b/public/images/pokemon/variant/back/953.json index 9a56df52cb9..17e3c06732b 100644 --- a/public/images/pokemon/variant/back/953.json +++ b/public/images/pokemon/variant/back/953.json @@ -8,7 +8,6 @@ "c5b4aa": "d3e6e6", "37332b": "104139", "777463": "199e46", - "000000": "000000", "a28e86": "c1d8db", "b96c26": "2f7410" }, @@ -21,7 +20,6 @@ "c5b4aa": "39cfbc", "37332b": "261031", "777463": "8358a1", - "000000": "000000", "a28e86": "52b0b0", "b96c26": "4792bd" } diff --git a/public/images/pokemon/variant/back/954.json b/public/images/pokemon/variant/back/954.json index b760ea947d4..b591f9593db 100644 --- a/public/images/pokemon/variant/back/954.json +++ b/public/images/pokemon/variant/back/954.json @@ -7,7 +7,6 @@ "f73983": "ffbc00", "9a1b48": "fffd91", "f8f8f8": "fbf3ab", - "181818": "181818", "5ea2c6": "7d4538", "6bc0dd": "b05858", "3f4f5c": "523223", @@ -23,7 +22,6 @@ "f73983": "141031", "9a1b48": "ded051", "f8f8f8": "432f77", - "181818": "181818", "5ea2c6": "616481", "6bc0dd": "9e9fb6", "3f4f5c": "21214c", diff --git a/public/images/pokemon/variant/back/957.json b/public/images/pokemon/variant/back/957.json index 2c5e45997ff..81ea5b4b1e5 100644 --- a/public/images/pokemon/variant/back/957.json +++ b/public/images/pokemon/variant/back/957.json @@ -3,7 +3,6 @@ "522e45": "56224b", "ecd0d0": "f2d5cb", "aa848f": "ad858d", - "0f0f0f": "0f0f0f", "a74167": "993868", "ec558c": "c65f7e", "e991b5": "ff9ba0", @@ -15,7 +14,6 @@ "522e45": "7f3435", "ecd0d0": "fef8e6", "aa848f": "aecdcf", - "0f0f0f": "0f0f0f", "a74167": "ee8363", "ec558c": "f3ad79", "e991b5": "ffd8ad", @@ -27,7 +25,6 @@ "522e45": "3e325e", "ecd0d0": "ecd9f7", "aa848f": "c0b3e2", - "0f0f0f": "0f0f0f", "a74167": "7b3f91", "ec558c": "a557a3", "e991b5": "db9fea", diff --git a/public/images/pokemon/variant/back/958.json b/public/images/pokemon/variant/back/958.json index ad50c394745..dc8a9fff24d 100644 --- a/public/images/pokemon/variant/back/958.json +++ b/public/images/pokemon/variant/back/958.json @@ -6,7 +6,6 @@ "312b33": "3f2319", "897194": "8b5745", "ada1c5": "cb836c", - "0f0f0f": "0f0f0f", "e991b5": "ff9ba0", "ae597d": "d35673", "ec558c": "c65f7e", @@ -21,7 +20,6 @@ "312b33": "3f2319", "897194": "834436", "ada1c5": "bf7754", - "0f0f0f": "0f0f0f", "e991b5": "f6c58d", "ae597d": "ad7058", "ec558c": "f3ad79", @@ -36,7 +34,6 @@ "312b33": "1e1d30", "897194": "6a6e77", "ada1c5": "aebab6", - "0f0f0f": "0f0f0f", "e991b5": "db9fea", "ae597d": "a171c4", "ec558c": "a557a3", diff --git a/public/images/pokemon/variant/back/959.json b/public/images/pokemon/variant/back/959.json index 544c4431a68..671346287fc 100644 --- a/public/images/pokemon/variant/back/959.json +++ b/public/images/pokemon/variant/back/959.json @@ -3,12 +3,7 @@ "2b153a": "3d171f", "5f4c9b": "77394b", "452f66": "592740", - "111111": "111111", - "aa855d": "aa855d", - "664636": "664636", "897193": "aa624c", - "eeebc8": "eeebc8", - "e2c793": "e2c793", "524059": "512d1e", "aaa0c3": "e48d72", "cc518e": "873659", @@ -26,7 +21,6 @@ "2b153a": "281738", "5f4c9b": "377377", "452f66": "19374a", - "111111": "111111", "aa855d": "80959f", "664636": "535d6c", "897193": "834436", @@ -49,7 +43,6 @@ "2b153a": "1e1d30", "5f4c9b": "aebab6", "452f66": "6a6e77", - "111111": "111111", "aa855d": "ad9c8a", "664636": "685952", "897193": "353549", diff --git a/public/images/pokemon/variant/back/962.json b/public/images/pokemon/variant/back/962.json index 615d983e2c5..efb88b17751 100644 --- a/public/images/pokemon/variant/back/962.json +++ b/public/images/pokemon/variant/back/962.json @@ -1,7 +1,6 @@ { "0": { "342930": "3e1d26", - "0f0f0f": "0f0f0f", "4a3942": "60354a", "937d85": "b1686b", "b9aaaf": "dd9f9d", @@ -17,7 +16,6 @@ }, "1": { "342930": "1e382a", - "0f0f0f": "0f0f0f", "4a3942": "395740", "937d85": "6b7e50", "b9aaaf": "c6ca8e", @@ -33,7 +31,6 @@ }, "2": { "342930": "754156", - "0f0f0f": "0f0f0f", "4a3942": "a5777f", "937d85": "2f2655", "b9aaaf": "453863", diff --git a/public/images/pokemon/variant/back/967.json b/public/images/pokemon/variant/back/967.json index 7eab2cd96f5..bdd96d92422 100644 --- a/public/images/pokemon/variant/back/967.json +++ b/public/images/pokemon/variant/back/967.json @@ -1,31 +1,22 @@ { "1": { "384a35": "464354", - "b9b7b3": "b9b7b3", "54654e": "67637a", "1c2916": "272431", - "0f0f0f": "0f0f0f", "f16b32": "bead9d", "34453d": "444a71", "607d6d": "6e76a9", - "75b07d": "9299c7", - "fcfcfc": "fcfcfc", - "323943": "323943", - "222328": "222328", - "4b565c": "4b565c", - "e2e9d7": "e2e9d7" + "75b07d": "9299c7" }, "2": { "384a35": "5d0c0c", "b9b7b3": "c0ab8b", "54654e": "942d22", "1c2916": "43060b", - "0f0f0f": "0f0f0f", "f16b32": "8c63d2", "34453d": "45141d", "607d6d": "6b2c31", "75b07d": "a95d50", - "fcfcfc": "fcfcfc", "323943": "502b2a", "222328": "371516", "4b565c": "815652", diff --git a/public/images/pokemon/variant/back/968.json b/public/images/pokemon/variant/back/968.json index 83a04a2bd2c..cf193ddfff8 100644 --- a/public/images/pokemon/variant/back/968.json +++ b/public/images/pokemon/variant/back/968.json @@ -1,30 +1,19 @@ { "1": { - "52585c": "52585c", - "0f0f0f": "0f0f0f", "492927": "29421f", - "d1d1da": "d1d1da", - "92989c": "92989c", "bd494a": "4d7d3a", "f7645a": "5c9446", "813737": "3b5f2d", - "bd928c": "bd928c", - "fcceba": "fcceba", - "52b6ef": "a14363", - "5c4f41": "5c4f41" + "52b6ef": "a14363" }, "2": { "52585c": "676e74", - "0f0f0f": "0f0f0f", "492927": "6f390d", "d1d1da": "dadae3", "92989c": "a1a9ae", "bd494a": "ba7429", "f7645a": "eee870", "813737": "ae7100", - "bd928c": "bd928c", - "fcceba": "fcceba", - "52b6ef": "46de9b", - "5c4f41": "5c4f41" + "52b6ef": "46de9b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/969.json b/public/images/pokemon/variant/back/969.json index 99e9549bbf9..61effc7cf6d 100644 --- a/public/images/pokemon/variant/back/969.json +++ b/public/images/pokemon/variant/back/969.json @@ -2,7 +2,6 @@ "1": { "21255c": "323b51", "3253d6": "577b81", - "0f0f0f": "0f0f0f", "5de0aa": "fbce5d", "2c369a": "435469", "41968b": "c57833", @@ -18,7 +17,6 @@ "2": { "21255c": "bb7154", "3253d6": "ffedd1", - "0f0f0f": "0f0f0f", "5de0aa": "df543b", "2c369a": "e1a47a", "41968b": "a51414", diff --git a/public/images/pokemon/variant/back/970.json b/public/images/pokemon/variant/back/970.json index 1b4ec91b2f8..cc64345f212 100644 --- a/public/images/pokemon/variant/back/970.json +++ b/public/images/pokemon/variant/back/970.json @@ -1,6 +1,5 @@ { "1": { - "242737": "242737", "366956": "692915", "41968b": "c57833", "5de0aa": "fbce5d", diff --git a/public/images/pokemon/variant/back/973.json b/public/images/pokemon/variant/back/973.json index 6bb3f90575d..49889e00caf 100644 --- a/public/images/pokemon/variant/back/973.json +++ b/public/images/pokemon/variant/back/973.json @@ -6,13 +6,10 @@ "f596b0": "f0ddde", "645555": "404355", "e9e5ea": "e7e2e6", - "e7e2e6": "e7e2e6", "bdaeba": "bdaeb5", "504343": "272636", "f9be51": "e7a11f", "bf964a": "d28011", - "000000": "000000", - "ffffff": "ffffff", "852941": "60484a" }, "1": { @@ -22,13 +19,10 @@ "f596b0": "e768cc", "645555": "404355", "e9e5ea": "e7e2e6", - "e7e2e6": "e7e2e6", "bdaeba": "bdaeb5", "504343": "272636", "f9be51": "5fdd5b", "bf964a": "289c43", - "000000": "000000", - "ffffff": "ffffff", "852941": "430855" }, "2": { @@ -36,15 +30,10 @@ "af3f5b": "b7501e", "eb6d96": "f29f5b", "f596b0": "fabe7d", - "645555": "645555", "e9e5ea": "e7e2e6", - "e7e2e6": "e7e2e6", "bdaeba": "bdaeb5", - "504343": "504343", "f9be51": "3175cb", "bf964a": "2c3ca6", - "000000": "000000", - "ffffff": "ffffff", "852941": "943615" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/974.json b/public/images/pokemon/variant/back/974.json index 31a1cf892b1..057e9e9047d 100644 --- a/public/images/pokemon/variant/back/974.json +++ b/public/images/pokemon/variant/back/974.json @@ -4,7 +4,6 @@ "524951": "661427", "bebaba": "ee9065", "efefef": "ffcc9e", - "0f0f0f": "0f0f0f", "c7639c": "48aeba", "f493c9": "71e2d3", "fcfcfc": "efefef", @@ -17,7 +16,6 @@ "524951": "172651", "bebaba": "2a607f", "efefef": "438aa0", - "0f0f0f": "0f0f0f", "c7639c": "daa470", "f493c9": "ffdfa1", "fcfcfc": "efefef", diff --git a/public/images/pokemon/variant/back/975.json b/public/images/pokemon/variant/back/975.json index 428947aa317..3d082dd5749 100644 --- a/public/images/pokemon/variant/back/975.json +++ b/public/images/pokemon/variant/back/975.json @@ -2,7 +2,6 @@ "1": { "6a6069": "8c2727", "c8c4c4": "ee9065", - "0f0f0f": "0f0f0f", "a29793": "c85442", "fefefe": "ffcc9e", "c7639c": "48aeba", @@ -11,13 +10,11 @@ "b6b6c0": "d85661", "8c8899": "b53653", "f493c9": "71e2d3", - "69697e": "931d50", - "fcfcfc": "fcfcfc" + "69697e": "931d50" }, "2": { "6a6069": "121f43", "c8c4c4": "265777", - "0f0f0f": "0f0f0f", "a29793": "193e66", "fefefe": "357489", "c7639c": "daa470", @@ -25,8 +22,6 @@ "555566": "a05c56", "b6b6c0": "ffe9d6", "8c8899": "ddbcaa", - "f493c9": "ffdfa1", - "69697e": "69697e", - "fcfcfc": "fcfcfc" + "f493c9": "ffdfa1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/978-stretchy.json b/public/images/pokemon/variant/back/978-stretchy.json index 670d8a67e35..b5781ffc372 100644 --- a/public/images/pokemon/variant/back/978-stretchy.json +++ b/public/images/pokemon/variant/back/978-stretchy.json @@ -4,7 +4,6 @@ "ffcb2d": "7277a4", "8f6b18": "252c60", "ce9b24": "485084", - "0f0f0f": "0f0f0f", "ffcf2d": "c1c1c1", "cd9a23": "a3a3a3", "adafb8": "dace8e", @@ -16,7 +15,6 @@ "ffcb2d": "355c1e", "8f6b18": "184a03", "ce9b24": "273f08", - "0f0f0f": "0f0f0f", "ffcf2d": "d8d0ad", "cd9a23": "afa680", "adafb8": "91734f", diff --git a/public/images/pokemon/variant/back/979.json b/public/images/pokemon/variant/back/979.json index f5051737038..8e636e471ce 100644 --- a/public/images/pokemon/variant/back/979.json +++ b/public/images/pokemon/variant/back/979.json @@ -3,21 +3,17 @@ "7b7786": "706394", "c0c1c8": "bbb3d6", "fafafc": "ddd2ff", - "111111": "111111", "a5a6b2": "ada2cd", "8f8d9c": "867ba4", "55525c": "625583", "474958": "38496a", "555c69": "3f5275", - "323132": "323132", - "5d6976": "4d6289", - "464546": "464546" + "5d6976": "4d6289" }, "1": { "7b7786": "c88945", "c0c1c8": "ebd494", "fafafc": "f9e9bd", - "111111": "111111", "a5a6b2": "ddbf6b", "8f8d9c": "d2a357", "55525c": "895b29", @@ -31,7 +27,6 @@ "7b7786": "b12009", "c0c1c8": "f26a3c", "fafafc": "ffa050", - "111111": "111111", "a5a6b2": "e9492f", "8f8d9c": "d22c10", "55525c": "951500", diff --git a/public/images/pokemon/variant/back/98.json b/public/images/pokemon/variant/back/98.json index 3fc272d9ff2..677c4ac9014 100644 --- a/public/images/pokemon/variant/back/98.json +++ b/public/images/pokemon/variant/back/98.json @@ -4,13 +4,10 @@ "843110": "433868", "ffa563": "c466f3", "ff7331": "9359ca", - "101010": "101010", "5a4221": "231947", "ffdebd": "c3d6ff", "e6bd8c": "9ba3d9", "735210": "4c5067", - "ffffff": "ffffff", - "dedede": "dedede", "b58442": "847ebe" }, "2": { @@ -18,13 +15,10 @@ "843110": "234b85", "ffa563": "5ce6f3", "ff7331": "4abbd4", - "101010": "101010", "5a4221": "0d193e", "ffdebd": "4a5197", "e6bd8c": "342b78", "735210": "232756", - "ffffff": "ffffff", - "dedede": "dedede", "b58442": "1e1e64" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/981.json b/public/images/pokemon/variant/back/981.json index 985b3611ab8..e7e2c41d476 100644 --- a/public/images/pokemon/variant/back/981.json +++ b/public/images/pokemon/variant/back/981.json @@ -1,7 +1,6 @@ { "1": { "43341e": "112b46", - "0f0f0f": "0f0f0f", "6f5431": "1f4062", "8b704c": "3d6186", "36383d": "503a2d", @@ -9,9 +8,7 @@ "9ca0ab": "665144", "fff42f": "c29925", "deb43d": "dec93d", - "fcfcfc": "fcfcfc", "775c10": "774f10", - "a8abb3": "a8abb3", "b1a75c": "882d2d", "513c21": "500f0f", "fdec8a": "9c3e3e", @@ -25,7 +22,6 @@ }, "2": { "43341e": "52ab5f", - "0f0f0f": "0f0f0f", "6f5431": "a8e781", "8b704c": "e4efcf", "36383d": "792e51", @@ -33,9 +29,7 @@ "9ca0ab": "9c5978", "fff42f": "ed9233", "deb43d": "ebbb72", - "fcfcfc": "fcfcfc", "775c10": "b35127", - "a8abb3": "a8abb3", "b1a75c": "1e7884", "513c21": "1a456c", "fdec8a": "2a9d8f", diff --git a/public/images/pokemon/variant/back/982-three-segment.json b/public/images/pokemon/variant/back/982-three-segment.json index 4fe1f475743..b740a63bde3 100644 --- a/public/images/pokemon/variant/back/982-three-segment.json +++ b/public/images/pokemon/variant/back/982-three-segment.json @@ -1,10 +1,8 @@ { "1": { "5a6273": "5d6970", - "f6ffff": "f6ffff", "735a41": "53575a", "f6e67b": "ececec", - "101010": "101010", "debd39": "aeaeae", "c1d1e9": "c1d7e2", "318ba4": "4a6165", diff --git a/public/images/pokemon/variant/back/982.json b/public/images/pokemon/variant/back/982.json index 4fe1f475743..b740a63bde3 100644 --- a/public/images/pokemon/variant/back/982.json +++ b/public/images/pokemon/variant/back/982.json @@ -1,10 +1,8 @@ { "1": { "5a6273": "5d6970", - "f6ffff": "f6ffff", "735a41": "53575a", "f6e67b": "ececec", - "101010": "101010", "debd39": "aeaeae", "c1d1e9": "c1d7e2", "318ba4": "4a6165", diff --git a/public/images/pokemon/variant/back/987.json b/public/images/pokemon/variant/back/987.json index e28a34d5435..b0d6b616201 100644 --- a/public/images/pokemon/variant/back/987.json +++ b/public/images/pokemon/variant/back/987.json @@ -5,7 +5,6 @@ "621841": "71370f", "b36cc1": "d3941a", "182941": "132443", - "0f0f0f": "0f0f0f", "de62a4": "ffc668", "4a83a4": "387fa7", "314a62": "244260", @@ -18,7 +17,6 @@ "621841": "7b3c08", "b36cc1": "1dbdb9", "182941": "244358", - "0f0f0f": "0f0f0f", "de62a4": "ffdf90", "4a83a4": "a1c8db", "314a62": "7396b4", @@ -31,7 +29,6 @@ "621841": "5a0a05", "b36cc1": "eece8c", "182941": "603305", - "0f0f0f": "0f0f0f", "de62a4": "e25038", "4a83a4": "e6aa47", "314a62": "b56f2a", diff --git a/public/images/pokemon/variant/back/988.json b/public/images/pokemon/variant/back/988.json index 7ef8e8d8902..799a483d3e8 100644 --- a/public/images/pokemon/variant/back/988.json +++ b/public/images/pokemon/variant/back/988.json @@ -4,14 +4,10 @@ "ed7e3d": "28d7bd", "7b2000": "0b334c", "d8a33f": "56e4ba", - "181820": "181820", "efd165": "66e9c2", "d1fd77": "e2fd77", "7dc536": "d7d346", "f04137": "17b79f", - "35384f": "35384f", - "f1f7f7": "f1f7f7", - "465175": "465175", "a9a9ab": "92c9b9", "359f8f": "23838b" }, @@ -20,13 +16,11 @@ "ed7e3d": "b258c9", "7b2000": "3d1759", "d8a33f": "9d46a1", - "181820": "181820", "efd165": "c273e0", "d1fd77": "71d1fb", "7dc536": "38b9e0", "f04137": "9439c5", "35384f": "123755", - "f1f7f7": "f1f7f7", "465175": "1b233f", "a9a9ab": "8fb8c9", "359f8f": "154e67" diff --git a/public/images/pokemon/variant/back/99-gigantamax.json b/public/images/pokemon/variant/back/99-gigantamax.json index 31fa87f0e8d..7318afcc1dc 100644 --- a/public/images/pokemon/variant/back/99-gigantamax.json +++ b/public/images/pokemon/variant/back/99-gigantamax.json @@ -4,7 +4,6 @@ "f6c58b": "9f60d5", "832908": "3b1c69", "ee8b4a": "8853bf", - "101010": "101010", "735210": "534681", "fdfdfd": "ffdbdb", "e1d0db": "d5869b", @@ -19,7 +18,6 @@ "f6c58b": "75e0e8", "832908": "22447d", "ee8b4a": "43adc4", - "101010": "101010", "735210": "1e1743", "fdfdfd": "b1f1cf", "e1d0db": "73c1c2", diff --git a/public/images/pokemon/variant/back/99.json b/public/images/pokemon/variant/back/99.json index 3dcbff624f5..de493968876 100644 --- a/public/images/pokemon/variant/back/99.json +++ b/public/images/pokemon/variant/back/99.json @@ -4,8 +4,6 @@ "c56b5a": "6232a9", "ef8c4a": "8853bf", "f7c58c": "9f60d5", - "101010": "101010", - "4a3121": "4a3121", "efbd8c": "9ba3d9", "ffe6b5": "c3d6ff", "b57b5a": "7c72b6", @@ -16,7 +14,6 @@ "c56b5a": "2d6f9e", "ef8c4a": "43adc4", "f7c58c": "75e0e8", - "101010": "101010", "4a3121": "1c1f46", "efbd8c": "31296f", "ffe6b5": "464d89", diff --git a/public/images/pokemon/variant/back/993.json b/public/images/pokemon/variant/back/993.json index 5668106b6b9..a3397ce9af9 100644 --- a/public/images/pokemon/variant/back/993.json +++ b/public/images/pokemon/variant/back/993.json @@ -2,7 +2,6 @@ "1": { "282828": "292109", "7a787a": "f8f5e2", - "0f0f0f": "0f0f0f", "463741": "754711", "4f4d51": "c59b4b", "4a424a": "533310", @@ -11,14 +10,12 @@ "3a75e6": "543280", "952b7d": "585a5c", "ff4dcb": "b7c6d6", - "fcfcfc": "fcfcfc", "172e57": "160832", "749eed": "b98bd6" }, "2": { "282828": "172220", "7a787a": "a4bfbe", - "0f0f0f": "0f0f0f", "463741": "264953", "4f4d51": "467678", "4a424a": "24323e", @@ -27,7 +24,6 @@ "3a75e6": "983b5c", "952b7d": "873954", "ff4dcb": "e3bbd3", - "fcfcfc": "fcfcfc", "172e57": "470e2c", "749eed": "f17ea6" } diff --git a/public/images/pokemon/variant/back/994.json b/public/images/pokemon/variant/back/994.json index bb4507045bd..98b54e86dd2 100644 --- a/public/images/pokemon/variant/back/994.json +++ b/public/images/pokemon/variant/back/994.json @@ -5,13 +5,11 @@ "f29e42": "00f02c", "fac375": "8bffa0", "626262": "696983", - "090913": "090913", "6a0305": "ae7a24", "dd393e": "fdc263", "a91215": "d79a38", "979797": "9b9bb6", "dddcde": "d9d9ea", - "292933": "292933", "30445a": "3f357c", "96cfd7": "b0a4f8", "6a8997": "867bc8" @@ -21,14 +19,10 @@ "7b451b": "0a5763", "f29e42": "00bfe1", "fac375": "7bf2ff", - "626262": "626262", - "090913": "090913", "6a0305": "6e2140", "dd393e": "ff5e5e", "a91215": "e72158", - "979797": "979797", "dddcde": "e9dac7", - "292933": "292933", "30445a": "664338", "96cfd7": "ffc28c", "6a8997": "ff926c" diff --git a/public/images/pokemon/variant/back/995.json b/public/images/pokemon/variant/back/995.json index 7838862d09b..eaa6f55f6e1 100644 --- a/public/images/pokemon/variant/back/995.json +++ b/public/images/pokemon/variant/back/995.json @@ -1,21 +1,15 @@ { "1": { - "101010": "101010", "50692e": "7b6a31", "79a045": "ac9b63", "bbd782": "f6eebd", "9ac450": "ddcb86", "069f7a": "9d3eb9", "02fd9e": "ca72e4", - "edffee": "edffee", - "43343c": "43343c", - "504a4a": "504a4a", "54992b": "8d7f54", - "2c2327": "2c2327", "456723": "4f4528" }, "2": { - "101010": "101010", "50692e": "383c40", "79a045": "4c5156", "bbd782": "949ca5", @@ -23,10 +17,8 @@ "069f7a": "9a1f2c", "02fd9e": "d53143", "edffee": "d8dfe8", - "43343c": "43343c", "504a4a": "48424f", "54992b": "464b51", - "2c2327": "2c2327", "456723": "26292b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/996.json b/public/images/pokemon/variant/back/996.json index 2891143402e..972620eab18 100644 --- a/public/images/pokemon/variant/back/996.json +++ b/public/images/pokemon/variant/back/996.json @@ -1,6 +1,5 @@ { "1": { - "020202": "020202", "5f5f64": "181f1f", "9ea7af": "293b39", "bec3c7": "325747", @@ -17,7 +16,6 @@ "ffe000": "c5a64d" }, "2": { - "020202": "020202", "5f5f64": "2f2c38", "9ea7af": "ceccef", "bec3c7": "e6e6eb", @@ -25,9 +23,6 @@ "314a5d": "524f60", "c4e9eb": "fcb925", "968201": "2a3064", - "e3e3e3": "e3e3e3", - "bcb7bc": "bcb7bc", - "a39ca1": "a39ca1", "96abac": "ca6d2a", "aecacb": "e38f21", "cab300": "1f46c4", diff --git a/public/images/pokemon/variant/back/997.json b/public/images/pokemon/variant/back/997.json index edf986cf27a..6567c4d0ee5 100644 --- a/public/images/pokemon/variant/back/997.json +++ b/public/images/pokemon/variant/back/997.json @@ -1,6 +1,5 @@ { "1": { - "020202": "020202", "516373": "5a3b36", "caefef": "b7926b", "3f6176": "1e2c2f", @@ -15,7 +14,6 @@ "cf9100": "9f7b3e" }, "2": { - "020202": "020202", "516373": "79452f", "caefef": "fcb925", "3f6176": "8a82aa", diff --git a/public/images/pokemon/variant/back/998.json b/public/images/pokemon/variant/back/998.json index 5c83a4cd734..063d9582962 100644 --- a/public/images/pokemon/variant/back/998.json +++ b/public/images/pokemon/variant/back/998.json @@ -1,7 +1,6 @@ { "1": { "1f3241": "1b2525", - "020202": "020202", "5b879b": "5a3b36", "416075": "305444", "eaf9f9": "e1d4be", @@ -10,14 +9,12 @@ "afc0c7": "8f6049", "ffe100": "30d1ff", "837d34": "3b69d3", - "272427": "272427", "bf373e": "c5a64d", "9b2930": "705c39", "8fa7b1": "835344" }, "2": { "1f3241": "524f60", - "020202": "020202", "5b879b": "79452f", "416075": "e6e6eb", "eaf9f9": "fff8d3", diff --git a/public/images/pokemon/variant/back/999.json b/public/images/pokemon/variant/back/999.json index bacd640b9be..e7ba3b67167 100644 --- a/public/images/pokemon/variant/back/999.json +++ b/public/images/pokemon/variant/back/999.json @@ -9,7 +9,6 @@ "545b6b": "1e2e60", "783a52": "492118", "ac4454": "ab461e", - "0f0f0f": "0f0f0f", "7a82a9": "5e647a", "bac4d8": "757a8b", "a59227": "a44418" @@ -24,9 +23,6 @@ "545b6b": "415073", "783a52": "4f2e5c", "ac4454": "794e83", - "0f0f0f": "0f0f0f", - "7a82a9": "7a82a9", - "bac4d8": "bac4d8", "a59227": "9c9cbe" }, "2": { @@ -39,9 +35,6 @@ "545b6b": "6467a8", "783a52": "6d6594", "ac4454": "bcb9d6", - "0f0f0f": "0f0f0f", - "7a82a9": "7a82a9", - "bac4d8": "bac4d8", "a59227": "b6d0d7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/111.json b/public/images/pokemon/variant/back/female/111.json index 5ef11d8ed41..bf115bed097 100644 --- a/public/images/pokemon/variant/back/female/111.json +++ b/public/images/pokemon/variant/back/female/111.json @@ -4,19 +4,13 @@ "bdbdce": "6a547a", "8484ad": "402f51", "3a3a52": "261e2d", - "101010": "101010", - "e6e6ef": "9781ab", - "ffffff": "ffffff", - "ad3a29": "ad3a29" + "e6e6ef": "9781ab" }, "2": { "5a5a7b": "ab4355", "bdbdce": "e18db3", "8484ad": "d76688", "3a3a52": "6d2935", - "101010": "101010", - "e6e6ef": "f7b4d1", - "ffffff": "ffffff", - "ad3a29": "ad3a29" + "e6e6ef": "f7b4d1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/112.json b/public/images/pokemon/variant/back/female/112.json index 774e2d1cf64..189c155b683 100644 --- a/public/images/pokemon/variant/back/female/112.json +++ b/public/images/pokemon/variant/back/female/112.json @@ -3,24 +3,18 @@ "52525a": "3c2945", "c5c5bd": "6a547a", "8c8c94": "523c5c", - "101010": "101010", "e6e6de": "9781ab", "735a31": "6b6373", "e6d6ad": "cecede", - "b5a573": "948cad", - "ffffff": "ffffff", - "e6523a": "e6523a" + "b5a573": "948cad" }, "2": { "52525a": "642224", "c5c5bd": "cb568a", "8c8c94": "ab3f5c", - "101010": "101010", "e6e6de": "ef86b5", "735a31": "6d586d", "e6d6ad": "dacad3", - "b5a573": "be9bb6", - "ffffff": "ffffff", - "e6523a": "e6523a" + "b5a573": "be9bb6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/118.json b/public/images/pokemon/variant/back/female/118.json index 6097ad43468..2bba2f4b638 100644 --- a/public/images/pokemon/variant/back/female/118.json +++ b/public/images/pokemon/variant/back/female/118.json @@ -2,9 +2,7 @@ "1": { "52525a": "5b3856", "ffffff": "fff9fc", - "101010": "101010", "8c8c94": "9c6891", - "efefef": "efefef", "ceb57b": "975c8c", "d6d6de": "bf8cb0", "ad1000": "40163f", @@ -17,7 +15,6 @@ "2": { "52525a": "2e5453", "ffffff": "f0fff8", - "101010": "101010", "8c8c94": "629a8e", "efefef": "c3f0dd", "ceb57b": "65aaae", diff --git a/public/images/pokemon/variant/back/female/119.json b/public/images/pokemon/variant/back/female/119.json index 9471908cb42..f48ae5bdf48 100644 --- a/public/images/pokemon/variant/back/female/119.json +++ b/public/images/pokemon/variant/back/female/119.json @@ -3,7 +3,6 @@ "8c7b84": "8d6083", "f7f7ff": "ffecfa", "dedee6": "eac5df", - "101010": "101010", "943119": "49215e", "c54229": "843f97", "ffdebd": "eac5df", @@ -17,7 +16,6 @@ "8c7b84": "5182a3", "f7f7ff": "eafcff", "dedee6": "bae6f4", - "101010": "101010", "943119": "132441", "c54229": "1a447b", "ffdebd": "cedaef", diff --git a/public/images/pokemon/variant/back/female/123.json b/public/images/pokemon/variant/back/female/123.json index 049e6e23435..e3734a34d2e 100644 --- a/public/images/pokemon/variant/back/female/123.json +++ b/public/images/pokemon/variant/back/female/123.json @@ -5,43 +5,22 @@ "e6d6ad": "b5b5ce", "9c8c31": "632929", "8cce73": "f76b6b", - "101010": "101010", "fff7d6": "ffffff", "5a9c4a": "d63a3a", - "bdbdbd": "bdbdbd", - "c5a573": "b5b5ce", - "dedede": "dedede", - "ffffff": "ffffff", - "737373": "737373" + "c5a573": "b5b5ce" }, "1": { "425a21": "484e75", "bde673": "bdbdbd", - "e6d6ad": "e6d6ad", - "9c8c31": "9c8c31", "8cce73": "92b0db", - "101010": "101010", - "fff7d6": "fff7d6", "5a9c4a": "7b94d6", "bdbdbd": "ffffff", - "c5a573": "9cc5ff", - "dedede": "dedede", - "ffffff": "ffffff", - "737373": "737373" + "c5a573": "9cc5ff" }, "2": { "425a21": "8f3907", "bde673": "f8f581", - "e6d6ad": "e6d6ad", - "9c8c31": "9c8c31", "8cce73": "f0c947", - "101010": "101010", - "fff7d6": "fff7d6", - "5a9c4a": "e6a027", - "bdbdbd": "bdbdbd", - "c5a573": "c5a573", - "dedede": "dedede", - "ffffff": "ffffff", - "737373": "737373" + "5a9c4a": "e6a027" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/129.json b/public/images/pokemon/variant/back/female/129.json index 1d949149c89..63297954964 100644 --- a/public/images/pokemon/variant/back/female/129.json +++ b/public/images/pokemon/variant/back/female/129.json @@ -1,7 +1,6 @@ { "1": { "7b6352": "8a4723", - "000000": "000000", "ffde29": "f0bf75", "c5ad73": "c07b3f", "840042": "22294c", @@ -16,7 +15,6 @@ }, "2": { "7b6352": "94836f", - "000000": "000000", "ffde29": "e2d9c0", "c5ad73": "bcaf98", "840042": "230f55", diff --git a/public/images/pokemon/variant/back/female/130.json b/public/images/pokemon/variant/back/female/130.json index d18385f7385..1bdb5ddf702 100644 --- a/public/images/pokemon/variant/back/female/130.json +++ b/public/images/pokemon/variant/back/female/130.json @@ -2,7 +2,6 @@ "1": { "737b7b": "9b7866", "f7f7f7": "ffedce", - "191919": "191919", "d6def7": "e3c7ab", "194273": "6c1301", "218cad": "cd6b1b", @@ -15,7 +14,6 @@ "2": { "737b7b": "a37785", "f7f7f7": "f7e2e2", - "191919": "191919", "d6def7": "d9b6b9", "194273": "1c0b46", "218cad": "53227e", diff --git a/public/images/pokemon/variant/back/female/185.json b/public/images/pokemon/variant/back/female/185.json index f65d9951e05..e30e4407750 100644 --- a/public/images/pokemon/variant/back/female/185.json +++ b/public/images/pokemon/variant/back/female/185.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "635a4a": "303429", "ad845a": "6f7367", "8c7342": "515549", @@ -11,7 +10,6 @@ "e6b54a": "8f991b" }, "2": { - "101010": "101010", "635a4a": "243075", "ad845a": "4663b1", "8c7342": "3d47a2", diff --git a/public/images/pokemon/variant/back/female/19.json b/public/images/pokemon/variant/back/female/19.json index c72993def35..54bd7d2edf7 100644 --- a/public/images/pokemon/variant/back/female/19.json +++ b/public/images/pokemon/variant/back/female/19.json @@ -4,13 +4,10 @@ "d69cd6": "88a0b1", "b573bd": "5f778e", "4a2942": "262f4f", - "101010": "101010", "a57308": "cb9287", "efdeb5": "fae4d8", "634a08": "ae6b69", "cead63": "e8beae", - "ffffff": "ffffff", - "5a5a5a": "5a5a5a", "e65a73": "6e8d9a" }, "2": { @@ -18,13 +15,10 @@ "d69cd6": "fff5eb", "b573bd": "efdcd1", "4a2942": "865c54", - "101010": "101010", "a57308": "ba476f", "efdeb5": "efb5c0", "634a08": "7e3754", "cead63": "d98a9f", - "ffffff": "ffffff", - "5a5a5a": "5a5a5a", "e65a73": "cb3f46" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/190.json b/public/images/pokemon/variant/back/female/190.json index 7945e4a1186..9c7c9e1b4e1 100644 --- a/public/images/pokemon/variant/back/female/190.json +++ b/public/images/pokemon/variant/back/female/190.json @@ -3,7 +3,6 @@ "52216b": "701523", "a55ac5": "c47440", "bd7bde": "dea95a", - "000000": "000000", "8442ad": "ad452f", "8c6b42": "8c7457", "c5ad6b": "c4b487", @@ -14,7 +13,6 @@ "52216b": "807870", "a55ac5": "bfbeb4", "bd7bde": "e5dfdf", - "000000": "000000", "8442ad": "a6a297", "8c6b42": "632339", "c5ad6b": "99455d", diff --git a/public/images/pokemon/variant/back/female/20.json b/public/images/pokemon/variant/back/female/20.json index f16f484b797..d3d2738ba7a 100644 --- a/public/images/pokemon/variant/back/female/20.json +++ b/public/images/pokemon/variant/back/female/20.json @@ -3,23 +3,18 @@ "6b3a00": "331a1b", "a57329": "543330", "c5943a": "644c47", - "101010": "101010", "c58452": "bc9087", "ffce9c": "dfc0b3", "945210": "764f4d", "845a29": "956240", - "b5b5b5": "b5b5b5", "a58431": "cd9c6e", "f7f7a5": "fff1d4", - "ffffff": "ffffff", - "efce73": "eccda3", - "737373": "737373" + "efce73": "eccda3" }, "2": { "6b3a00": "7f645c", "a57329": "bba08f", "c5943a": "e2cbb9", - "101010": "101010", "c58452": "ae6f7e", "ffce9c": "e4b4b4", "945210": "813636", diff --git a/public/images/pokemon/variant/back/female/203.json b/public/images/pokemon/variant/back/female/203.json index 1429eb40c25..cb82db0fd3c 100644 --- a/public/images/pokemon/variant/back/female/203.json +++ b/public/images/pokemon/variant/back/female/203.json @@ -1,14 +1,12 @@ { "1": { "424a73": "351810", - "ffffff": "ffffff", "adb5d6": "8f6f66", "6b8cb5": "512b21", "4a3a3a": "231117", "efde52": "9c3e3e", "c5a53a": "7e262d", "9c3a5a": "ab9d75", - "101010": "101010", "9c7b42": "571522", "ce6b94": "d8d1ad", "947b6b": "1f4062", @@ -18,14 +16,12 @@ }, "2": { "424a73": "27091d", - "ffffff": "ffffff", "adb5d6": "c5b0b7", "6b8cb5": "4a1b33", "4a3a3a": "091225", "efde52": "2a9d8f", "c5a53a": "1e7884", "9c3a5a": "52ab5f", - "101010": "101010", "9c7b42": "15545d", "ce6b94": "a8e781", "947b6b": "1a2e43", diff --git a/public/images/pokemon/variant/back/female/212.json b/public/images/pokemon/variant/back/female/212.json index 84f12bf1434..3c7d9a4799c 100644 --- a/public/images/pokemon/variant/back/female/212.json +++ b/public/images/pokemon/variant/back/female/212.json @@ -3,24 +3,14 @@ "632929": "215a2d", "f76b6b": "8cce73", "a52929": "2f794e", - "101010": "101010", - "d63a3a": "4a9c53", - "9494a5": "9494a5", - "ffffff": "ffffff", - "b5b5ce": "b5b5ce", - "3a3a4a": "3a3a4a", - "9c6b21": "9c6b21", - "dec510": "dec510" + "d63a3a": "4a9c53" }, "1": { "632929": "2f2962", "f76b6b": "639cf7", "a52929": "29429c", - "101010": "101010", "d63a3a": "4263ef", "9494a5": "6262a4", - "ffffff": "ffffff", - "b5b5ce": "b5b5ce", "3a3a4a": "3c3c50", "9c6b21": "131387", "dec510": "10bdde" @@ -29,13 +19,8 @@ "632929": "645117", "f76b6b": "c59f29", "a52929": "b88619", - "101010": "101010", "d63a3a": "ffca2a", "9494a5": "3c4543", - "ffffff": "ffffff", - "b5b5ce": "b5b5ce", - "3a3a4a": "282d2c", - "9c6b21": "9c6b21", - "dec510": "dec510" + "3a3a4a": "282d2c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/215.json b/public/images/pokemon/variant/back/female/215.json index 3ce956a327e..95c97bce2c3 100644 --- a/public/images/pokemon/variant/back/female/215.json +++ b/public/images/pokemon/variant/back/female/215.json @@ -6,7 +6,6 @@ "f75273": "637696", "21315a": "220a11", "3a94ad": "ac373e", - "000000": "000000", "42849c": "902738", "4a4a4a": "69523f", "bdbdc5": "c5a080", @@ -19,10 +18,8 @@ "f75273": "7ac3f0", "21315a": "723522", "3a94ad": "fbdba1", - "000000": "000000", "42849c": "eab273", "4a4a4a": "383d51", - "bdbdc5": "a1a0c3", - "f7f7ff": "f7f7ff" + "bdbdc5": "a1a0c3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/217.json b/public/images/pokemon/variant/back/female/217.json index 7ce80e163b6..bbc26a6e1db 100644 --- a/public/images/pokemon/variant/back/female/217.json +++ b/public/images/pokemon/variant/back/female/217.json @@ -1,38 +1,23 @@ { "0": { "422919": "112114", - "7b7b8c": "7b7b8c", - "101010": "101010", "945221": "2f6324", - "ffffff": "ffffff", "634229": "1d3d26", - "b5b5bd": "b5b5bd", "f7c563": "fecd85", - "c59c4a": "cd9343", - "dedede": "dedede" + "c59c4a": "cd9343" }, "1": { "422919": "2d0e1f", - "7b7b8c": "7b7b8c", - "101010": "101010", "945221": "8c2a37", - "ffffff": "ffffff", "634229": "6b1d38", - "b5b5bd": "b5b5bd", "f7c563": "f2cab8", - "c59c4a": "c48e81", - "dedede": "dedede" + "c59c4a": "c48e81" }, "2": { "422919": "111433", - "7b7b8c": "7b7b8c", - "101010": "101010", "945221": "323760", - "ffffff": "ffffff", "634229": "1e2249", - "b5b5bd": "b5b5bd", "f7c563": "5ccaf2", - "c59c4a": "45a2f9", - "dedede": "dedede" + "c59c4a": "45a2f9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/229.json b/public/images/pokemon/variant/back/female/229.json index eeff43a6184..ad2612813d4 100644 --- a/public/images/pokemon/variant/back/female/229.json +++ b/public/images/pokemon/variant/back/female/229.json @@ -5,17 +5,12 @@ "ced6d6": "dc7e67", "ffffff": "ffcf9a", "192129": "402b41", - "000000": "000000", "31313a": "5c435d", "4a4a52": "85738c", - "f8f9ff": "f8f9ff", "841021": "3b59a1", - "ada5b3": "ada5b3", "632910": "8c6362", "f79c84": "f8f1e7", - "a55a4a": "ceb0a5", - "9c293a": "9c293a", - "e2e0e3": "e2e0e3" + "a55a4a": "ceb0a5" }, "2": { "84738c": "101028", @@ -23,16 +18,13 @@ "ced6d6": "38576c", "ffffff": "5c8d95", "192129": "3a2d35", - "000000": "000000", "31313a": "b3a5a2", "4a4a52": "f8faf3", "f8f9ff": "3d5f75", "841021": "fe8d53", - "ada5b3": "ada5b3", "632910": "3f2440", "f79c84": "844d76", "a55a4a": "613762", - "9c293a": "8c5273", - "e2e0e3": "e2e0e3" + "9c293a": "8c5273" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/232.json b/public/images/pokemon/variant/back/female/232.json index 7d6c59a0aa3..8f5fb1a7be6 100644 --- a/public/images/pokemon/variant/back/female/232.json +++ b/public/images/pokemon/variant/back/female/232.json @@ -3,7 +3,6 @@ "4a5252": "5f74c7", "3a3a3a": "333a77", "849494": "b0d8ff", - "101010": "101010", "6b7373": "7fa0d7", "842129": "c8563f", "9ca5a5": "9ca3b5", @@ -21,7 +20,6 @@ "4a5252": "994e30", "3a3a3a": "6f2219", "849494": "f4b975", - "101010": "101010", "6b7373": "d17e47", "842129": "1d2a54", "9ca5a5": "3c283f", diff --git a/public/images/pokemon/variant/back/female/255.json b/public/images/pokemon/variant/back/female/255.json index d3666839aac..8ffd9a797b9 100644 --- a/public/images/pokemon/variant/back/female/255.json +++ b/public/images/pokemon/variant/back/female/255.json @@ -2,23 +2,19 @@ "1": { "ad8c00": "782a14", "f7de6b": "f1a545", - "000000": "000000", "efbd31": "d36f2b", "7b4a19": "580c0b", "ad4210": "318793", "e65a21": "4cada9", - "ff8c31": "6bcdb2", - "ffffff": "ffffff" + "ff8c31": "6bcdb2" }, "2": { "ad8c00": "550d38", "f7de6b": "ad3342", - "000000": "000000", "efbd31": "811c3e", "7b4a19": "43082f", "ad4210": "b3817d", "e65a21": "d3afa0", - "ff8c31": "f3e5cf", - "ffffff": "ffffff" + "ff8c31": "f3e5cf" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/256.json b/public/images/pokemon/variant/back/female/256.json index a688ca2f6d0..0fe9ff85cad 100644 --- a/public/images/pokemon/variant/back/female/256.json +++ b/public/images/pokemon/variant/back/female/256.json @@ -1,7 +1,6 @@ { "1": { "9c3110": "8e3820", - "191919": "191919", "ff7b4a": "f7ca4b", "de5a29": "da8923", "9c7329": "3a888d", @@ -16,7 +15,6 @@ }, "2": { "9c3110": "8a685f", - "191919": "191919", "ff7b4a": "fff7e1", "de5a29": "cdb09b", "9c7329": "64163c", diff --git a/public/images/pokemon/variant/back/female/257.json b/public/images/pokemon/variant/back/female/257.json index dadb97bbad6..8f5dcf05c4a 100644 --- a/public/images/pokemon/variant/back/female/257.json +++ b/public/images/pokemon/variant/back/female/257.json @@ -6,7 +6,6 @@ "ee5e5e": "598dc1", "dedeb5": "f0fbff", "ff8463": "70b0d5", - "000000": "000000", "63524a": "55607d", "842929": "8e3820", "ef6363": "f7ca4b", @@ -31,7 +30,6 @@ "ee5e5e": "772040", "dedeb5": "cc6155", "ff8463": "912d42", - "000000": "000000", "63524a": "5b1832", "842929": "9c7c70", "ef6363": "fffae1", diff --git a/public/images/pokemon/variant/back/female/3.json b/public/images/pokemon/variant/back/female/3.json index 49fe726b084..2b3274ae4cb 100644 --- a/public/images/pokemon/variant/back/female/3.json +++ b/public/images/pokemon/variant/back/female/3.json @@ -8,15 +8,13 @@ "ff7b73": "712f8f", "bd6b31": "168a69", "de4242": "3f1375", - "101010": "101010", "105242": "190038", "107b6b": "9e1976", "2e5519": "38001c", "5a9c3a": "b34952", "5ad6c5": "f062a4", "21b59c": "de3592", - "84de7b": "ff745e", - "ffffff": "ffffff" + "84de7b": "ff745e" }, "2": { "843100": "420514", @@ -27,14 +25,12 @@ "ff7b73": "9db042", "bd6b31": "852a41", "de4242": "3c8227", - "101010": "101010", "105242": "381601", "107b6b": "d15d04", "2e5519": "011c38", "5a9c3a": "446b94", "5ad6c5": "faa405", "21b59c": "fa8405", - "84de7b": "80ced9", - "ffffff": "ffffff" + "84de7b": "80ced9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/307.json b/public/images/pokemon/variant/back/female/307.json index 3bdadaa8e16..8420a8631be 100644 --- a/public/images/pokemon/variant/back/female/307.json +++ b/public/images/pokemon/variant/back/female/307.json @@ -3,7 +3,6 @@ "7b6b6b": "7a5f5f", "b5adad": "9f8383", "e6dede": "deccc3", - "000000": "000000", "3a84b5": "7e4377", "3a4a5a": "5a2859", "6bcee6": "f4a8c8", @@ -13,7 +12,6 @@ "7b6b6b": "314b76", "b5adad": "677d98", "e6dede": "c2cfdb", - "000000": "000000", "3a84b5": "51876e", "3a4a5a": "113926", "6bcee6": "7edfb7", diff --git a/public/images/pokemon/variant/back/female/308.json b/public/images/pokemon/variant/back/female/308.json index fd439be8d40..d5c9803f46b 100644 --- a/public/images/pokemon/variant/back/female/308.json +++ b/public/images/pokemon/variant/back/female/308.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "84424a": "59141d", "e6738c": "a53835", "ce5a73": "8b2e2b", @@ -15,7 +14,6 @@ "f7de84": "ee9bd5" }, "2": { - "101010": "101010", "84424a": "461f5d", "e6738c": "a37aac", "ce5a73": "7d5187", @@ -24,7 +22,6 @@ "b54a5a": "633971", "8c848c": "6c7d9e", "ada5ad": "9faab9", - "c5c5c5": "c5c5c5", "a57329": "205a9e", "efbd5a": "205a9e", "f7de84": "5abbef" diff --git a/public/images/pokemon/variant/back/female/315.json b/public/images/pokemon/variant/back/female/315.json index dc0d3cbf1ba..f909e10f4a1 100644 --- a/public/images/pokemon/variant/back/female/315.json +++ b/public/images/pokemon/variant/back/female/315.json @@ -3,7 +3,6 @@ "3a5229": "0b2337", "5a9452": "153a51", "a5de73": "408592", - "000000": "000000", "73c55a": "215569", "295a94": "482571", "a5314a": "9c5910", @@ -19,7 +18,6 @@ "3a5229": "201443", "5a9452": "402765", "a5de73": "aa78cd", - "000000": "000000", "73c55a": "66418b", "295a94": "1a6644", "a5314a": "1d6970", diff --git a/public/images/pokemon/variant/back/female/369.json b/public/images/pokemon/variant/back/female/369.json index b3cff229c6c..4f43e66892b 100644 --- a/public/images/pokemon/variant/back/female/369.json +++ b/public/images/pokemon/variant/back/female/369.json @@ -7,7 +7,6 @@ "efcea5": "757e99", "ffefce": "aab1c6", "b5946b": "31384a", - "000000": "000000", "3a2929": "644c2b", "9c847b": "e0cc66", "524242": "91743c", @@ -18,17 +17,14 @@ "2": { "6b5242": "3a421e", "8c734a": "3d4521", - "52423a": "52423a", "ceb594": "758745", "efcea5": "96a558", "ffefce": "b6c174", "b5946b": "656d39", - "000000": "000000", "3a2929": "231934", "9c847b": "543d7d", "524242": "32214a", "7b6b63": "412e63", - "ef4a73": "ef4a73", "ce4231": "584a95" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/399.json b/public/images/pokemon/variant/back/female/399.json index 7e2fe21cf2a..f4401d7b1c6 100644 --- a/public/images/pokemon/variant/back/female/399.json +++ b/public/images/pokemon/variant/back/female/399.json @@ -3,8 +3,6 @@ "634a31": "70323f", "c58c42": "e5a5bb", "9c6331": "d46378", - "101010": "101010", - "423110": "423110", "cebd84": "eba978", "5a4229": "824561" }, @@ -12,7 +10,6 @@ "634a31": "101e42", "c58c42": "617dda", "9c6331": "3e5ca8", - "101010": "101010", "423110": "0e1831", "cebd84": "8497ce", "5a4229": "42295a" diff --git a/public/images/pokemon/variant/back/female/400.json b/public/images/pokemon/variant/back/female/400.json index 195d6e1a8b0..6f731de97f4 100644 --- a/public/images/pokemon/variant/back/female/400.json +++ b/public/images/pokemon/variant/back/female/400.json @@ -3,10 +3,8 @@ "ad947b": "bd9171", "e6d69c": "fff5d1", "5a3a31": "70323f", - "3a3129": "3a3129", "bd844a": "dba0ac", "8c5a31": "c46269", - "101010": "101010", "423a31": "3e3040", "63523a": "824561" }, @@ -17,7 +15,6 @@ "3a3129": "313d63", "bd844a": "617dda", "8c5a31": "3e5ca8", - "101010": "101010", "423a31": "38204f", "63523a": "42295a" } diff --git a/public/images/pokemon/variant/back/female/401.json b/public/images/pokemon/variant/back/female/401.json index 446e2648182..068a54ee262 100644 --- a/public/images/pokemon/variant/back/female/401.json +++ b/public/images/pokemon/variant/back/female/401.json @@ -2,7 +2,6 @@ "1": { "524a42": "cf8439", "7b7363": "f6bb47", - "101010": "101010", "8c6b08": "272344", "ffefad": "56769d", "e6c56b": "454389", @@ -13,7 +12,6 @@ "2": { "524a42": "453565", "7b7363": "71558c", - "101010": "101010", "8c6b08": "784341", "ffefad": "ffd47c", "e6c56b": "e59a75", diff --git a/public/images/pokemon/variant/back/female/402.json b/public/images/pokemon/variant/back/female/402.json index 7171c8b3629..a6ed33a6a13 100644 --- a/public/images/pokemon/variant/back/female/402.json +++ b/public/images/pokemon/variant/back/female/402.json @@ -2,7 +2,6 @@ "1": { "633100": "272344", "de5a52": "afd3df", - "101010": "101010", "9c4231": "498ebe", "31293a": "592a22", "524a42": "cf8439", @@ -17,7 +16,6 @@ "2": { "633100": "2a545f", "de5a52": "70af85", - "101010": "101010", "9c4231": "2f9378", "31293a": "281c41", "524a42": "453565", diff --git a/public/images/pokemon/variant/back/female/407.json b/public/images/pokemon/variant/back/female/407.json index 55de95a3105..8edb2911c7e 100644 --- a/public/images/pokemon/variant/back/female/407.json +++ b/public/images/pokemon/variant/back/female/407.json @@ -5,7 +5,6 @@ "739c8c": "bb9b89", "ffffff": "fff1cb", "d6cede": "e1bf95", - "000000": "000000", "7b3a5a": "9c5910", "ff6384": "efc754", "bd426b": "d28f31", @@ -22,15 +21,11 @@ "739c8c": "a199cd", "ffffff": "fcf8ff", "d6cede": "d6c7e6", - "000000": "000000", "7b3a5a": "18585e", "ff6384": "83e4d0", "bd426b": "55b9af", "3a9c63": "764f9c", "f7d64a": "e17641", - "424a84": "424a84", - "4a5abd": "4a5abd", - "5273ef": "5273ef", "a5e6ad": "ebe6fd" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/41.json b/public/images/pokemon/variant/back/female/41.json index 87c18df01ac..8d7350c81ce 100644 --- a/public/images/pokemon/variant/back/female/41.json +++ b/public/images/pokemon/variant/back/female/41.json @@ -1,24 +1,18 @@ { "1": { - "101010": "101010", "8cb5ef": "4e538f", "4a427b": "14093b", "637bb5": "37326f", "73215a": "aa4c18", "b5529c": "cc7b32", - "bdceff": "868ecc", - "ffffff": "ffffff", - "636363": "636363" + "bdceff": "868ecc" }, "2": { - "101010": "101010", "8cb5ef": "cbabca", "4a427b": "4d3259", "637bb5": "916c8b", "73215a": "670f10", "b5529c": "94241c", - "bdceff": "e8d2e6", - "ffffff": "ffffff", - "636363": "636363" + "bdceff": "e8d2e6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/419.json b/public/images/pokemon/variant/back/female/419.json index 3202d442933..197a8b33e18 100644 --- a/public/images/pokemon/variant/back/female/419.json +++ b/public/images/pokemon/variant/back/female/419.json @@ -2,17 +2,13 @@ "1": { "7b4221": "611b35", "ef7b19": "9c354f", - "191919": "191919", "ce6b19": "851d3e", "ad5a21": "7d1e39", "cebd84": "cea49d", "f7f7b5": "e8d4cc", "99693c": "6a808c", - "6b6b6b": "6b6b6b", "e6a531": "a0b3ba", "ffde00": "d2e5e8", - "d6d6ce": "d6d6ce", - "ffffff": "ffffff", "c59452": "995e5c", "2163a5": "385e11", "63bde6": "6a9539" @@ -20,7 +16,6 @@ "2": { "7b4221": "9e6a86", "ef7b19": "debfc8", - "191919": "191919", "ce6b19": "dca5b5", "ad5a21": "cd91aa", "cebd84": "965080", @@ -29,8 +24,6 @@ "6b6b6b": "726481", "e6a531": "d4812f", "ffde00": "eda342", - "d6d6ce": "d6d6ce", - "ffffff": "ffffff", "c59452": "672e5d", "2163a5": "4b2a70", "63bde6": "744d99" diff --git a/public/images/pokemon/variant/back/female/42.json b/public/images/pokemon/variant/back/female/42.json index d2be9f7ced5..9fede6848a8 100644 --- a/public/images/pokemon/variant/back/female/42.json +++ b/public/images/pokemon/variant/back/female/42.json @@ -5,7 +5,6 @@ "adceff": "666fb4", "5aadef": "3d4381", "631052": "892d03", - "000000": "000000", "ce6bb5": "f1a139", "ad52ad": "d5711b", "943a7b": "af4e0c" @@ -16,7 +15,6 @@ "adceff": "e8d2e6", "5aadef": "cbabca", "631052": "54070c", - "000000": "000000", "ce6bb5": "bc3b1d", "ad52ad": "94241c", "943a7b": "6c1314" diff --git a/public/images/pokemon/variant/back/female/424.json b/public/images/pokemon/variant/back/female/424.json index c0e9356a7a4..6a111ce9829 100644 --- a/public/images/pokemon/variant/back/female/424.json +++ b/public/images/pokemon/variant/back/female/424.json @@ -3,7 +3,6 @@ "734a42": "415c73", "ad5242": "428dad", "ff735a": "5ae9ff", - "101010": "101010", "8c6b42": "8c7457", "debd73": "c4b487", "ffefa5": "ffeccc", @@ -16,7 +15,6 @@ "734a42": "593802", "ad5242": "946212", "ff735a": "ffb338", - "101010": "101010", "8c6b42": "632339", "debd73": "99455d", "ffefa5": "ed8286", diff --git a/public/images/pokemon/variant/back/female/44.json b/public/images/pokemon/variant/back/female/44.json index c3e5290e2a9..1ffdc2c917a 100644 --- a/public/images/pokemon/variant/back/female/44.json +++ b/public/images/pokemon/variant/back/female/44.json @@ -3,7 +3,6 @@ "c57329": "0f7469", "8c3a19": "043d44", "5a2900": "162486", - "101010": "101010", "ce734a": "7aa8d2", "ffbd42": "55bb7e", "ad523a": "4d75b6", @@ -17,8 +16,6 @@ "2": { "c57329": "9f631f", "8c3a19": "773811", - "5a2900": "5a2900", - "101010": "101010", "ce734a": "d98247", "ffbd42": "e8d65e", "ad523a": "bd4e2d", diff --git a/public/images/pokemon/variant/back/female/443.json b/public/images/pokemon/variant/back/female/443.json index 4a65daecb4b..c2154751658 100644 --- a/public/images/pokemon/variant/back/female/443.json +++ b/public/images/pokemon/variant/back/female/443.json @@ -5,11 +5,6 @@ "314252": "082963", "8cc5d6": "42a5f7", "5294ad": "1984c5", - "42d6de": "42d6de", - "3aadc5": "3aadc5", - "ffffff": "ffffff", - "c5ced6": "c5ced6", - "5a6363": "5a6363", "ad3a10": "a57c10", "de5a29": "e6c529", "7b1910": "731029" @@ -22,9 +17,6 @@ "5294ad": "905647", "42d6de": "54b0ff", "3aadc5": "2878e1", - "ffffff": "ffffff", - "c5ced6": "c5ced6", - "5a6363": "5a6363", "ad3a10": "92a9b2", "de5a29": "d9f0f1", "7b1910": "731029" @@ -37,9 +29,6 @@ "5294ad": "4c5e66", "42d6de": "6fe6a3", "3aadc5": "23b8a8", - "ffffff": "ffffff", - "c5ced6": "c5ced6", - "5a6363": "5a6363", "ad3a10": "92a9b2", "de5a29": "d9f0f1", "7b1910": "3e3a52" diff --git a/public/images/pokemon/variant/back/female/444.json b/public/images/pokemon/variant/back/female/444.json index 287f0c4050c..d502b2387a6 100644 --- a/public/images/pokemon/variant/back/female/444.json +++ b/public/images/pokemon/variant/back/female/444.json @@ -11,10 +11,7 @@ "5a1000": "502209", "ffff19": "fa845a", "ad314a": "ad7b08", - "c5ced6": "c5ced6", - "de5a29": "f7b834", - "ffffff": "ffffff", - "737b84": "737b84" + "de5a29": "f7b834" }, "1": { "3a4a8c": "6f3633", @@ -28,10 +25,7 @@ "5a1000": "211e33", "ffff19": "ffd177", "ad314a": "829ca6", - "c5ced6": "c5ced6", - "de5a29": "c2dedf", - "ffffff": "ffffff", - "737b84": "737b84" + "de5a29": "c2dedf" }, "2": { "3a4a8c": "223a4a", @@ -45,9 +39,6 @@ "5a1000": "521000", "ffff19": "62cbff", "ad314a": "be472f", - "c5ced6": "c5ced6", - "de5a29": "ee723e", - "ffffff": "ffffff", - "737b84": "737b84" + "de5a29": "ee723e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/445.json b/public/images/pokemon/variant/back/female/445.json index 41d1e100a96..dc453b93018 100644 --- a/public/images/pokemon/variant/back/female/445.json +++ b/public/images/pokemon/variant/back/female/445.json @@ -4,12 +4,8 @@ "5a63ad": "33719e", "42428c": "1e4b77", "7b7bce": "65a2d5", - "101010": "101010", "c59410": "3aadc5", "ffd619": "42d6de", - "ffffff": "ffffff", - "737b84": "737b84", - "c5ced6": "c5ced6", "bd3a42": "b2630f", "5a1000": "502209", "e64a31": "f7ac34" @@ -19,12 +15,8 @@ "5a63ad": "deae7a", "42428c": "af6e55", "7b7bce": "f2d8aa", - "101010": "101010", "c59410": "255dd7", "ffd619": "4caaff", - "ffffff": "ffffff", - "737b84": "737b84", - "c5ced6": "c5ced6", "bd3a42": "9fb6bf", "5a1000": "393648", "e64a31": "dce8e8" @@ -34,12 +26,8 @@ "5a63ad": "2f434b", "42428c": "152c3b", "7b7bce": "689099", - "101010": "101010", "c59410": "23b8a8", "ffd619": "6fe6a3", - "ffffff": "ffffff", - "737b84": "737b84", - "c5ced6": "c5ced6", "bd3a42": "be472f", "5a1000": "521000", "e64a31": "de5a29" diff --git a/public/images/pokemon/variant/back/female/45.json b/public/images/pokemon/variant/back/female/45.json index b278635e4cc..0af6336f5bf 100644 --- a/public/images/pokemon/variant/back/female/45.json +++ b/public/images/pokemon/variant/back/female/45.json @@ -7,7 +7,6 @@ "f77373": "5e8fde", "de4a5a": "436ac7", "944a00": "472b86", - "101010": "101010", "ff8429": "966fbb", "ce6319": "724ba4", "19294a": "201349", @@ -24,7 +23,6 @@ "f77373": "d2cbb2", "de4a5a": "cdb2a2", "944a00": "621734", - "101010": "101010", "ff8429": "a23d44", "ce6319": "8b293e", "19294a": "510c35", diff --git a/public/images/pokemon/variant/back/female/453.json b/public/images/pokemon/variant/back/female/453.json index 8fab3b26995..f8f06b5808f 100644 --- a/public/images/pokemon/variant/back/female/453.json +++ b/public/images/pokemon/variant/back/female/453.json @@ -4,7 +4,6 @@ "4a4a8c": "701221", "6b73d6": "9e1e23", "849cff": "c45447", - "101010": "101010", "9c3a3a": "d07320", "e6525a": "f2b64c", "ff9ca5": "f7db86", diff --git a/public/images/pokemon/variant/back/female/454.json b/public/images/pokemon/variant/back/female/454.json index c9a44500cec..ef803e87155 100644 --- a/public/images/pokemon/variant/back/female/454.json +++ b/public/images/pokemon/variant/back/female/454.json @@ -1,7 +1,6 @@ { "1": { "3a3a52": "4c0914", - "101010": "101010", "6b73d6": "9e1e23", "4a4a8c": "701221", "849cff": "c45447", diff --git a/public/images/pokemon/variant/back/female/456.json b/public/images/pokemon/variant/back/female/456.json index 5a7072a85e3..88e91daf10d 100644 --- a/public/images/pokemon/variant/back/female/456.json +++ b/public/images/pokemon/variant/back/female/456.json @@ -2,7 +2,6 @@ "1": { "31425a": "b94539", "526b8c": "986259", - "101010": "101010", "426b84": "e2895d", "94d6e6": "f3e1c6", "29293a": "7e2023", @@ -11,14 +10,11 @@ "c54591": "f19e53", "833171": "d3633a", "c54a94": "8bbcd9", - "efffff": "efffff", - "73427b": "688db9", - "15202e": "15202e" + "73427b": "688db9" }, "2": { "31425a": "e89e3d", "526b8c": "162743", - "101010": "101010", "426b84": "fff8b0", "94d6e6": "27616f", "29293a": "b66736", @@ -27,8 +23,6 @@ "c54591": "5fd0a4", "833171": "349b8b", "c54a94": "7b1615", - "efffff": "efffff", - "73427b": "550a16", - "15202e": "15202e" + "73427b": "550a16" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/457.json b/public/images/pokemon/variant/back/female/457.json index d12664b8695..6bb2c6e0efe 100644 --- a/public/images/pokemon/variant/back/female/457.json +++ b/public/images/pokemon/variant/back/female/457.json @@ -1,7 +1,6 @@ { "1": { "526b8c": "966764", - "101010": "101010", "c5e6f7": "fffbf2", "94d6e6": "f3e1c6", "7394ad": "cda38c", @@ -10,14 +9,12 @@ "303449": "812628", "c54591": "ffc369", "9e357b": "c7703c", - "efffff": "efffff", "c54a94": "aadff3", "73427b": "6f75a0", "26344c": "815358" }, "2": { "526b8c": "162743", - "101010": "101010", "c5e6f7": "429b91", "94d6e6": "27616f", "7394ad": "1c405b", @@ -26,7 +23,6 @@ "303449": "d67947", "c54591": "50c2a1", "9e357b": "2e9b8f", - "efffff": "efffff", "c54a94": "983121", "73427b": "7b1213", "26344c": "12223d" diff --git a/public/images/pokemon/variant/back/female/461.json b/public/images/pokemon/variant/back/female/461.json index 71308ceadc5..6414601a8af 100644 --- a/public/images/pokemon/variant/back/female/461.json +++ b/public/images/pokemon/variant/back/female/461.json @@ -3,7 +3,6 @@ "c52973": "3a3d60", "842152": "191a24", "f75273": "636896", - "101010": "101010", "293152": "530b34", "6b6bad": "8b274b", "424a84": "691043", @@ -11,19 +10,16 @@ "ffffff": "ffefb1", "ffd642": "ffb05b", "6b637b": "985d45", - "c5bdce": "cca075", - "8c2931": "8c2931" + "c5bdce": "cca075" }, "2": { "c52973": "3d81c5", "842152": "102f6c", "f75273": "5cb0eb", - "101010": "101010", "293152": "96543f", "6b6bad": "ffd3a7", "424a84": "ecaa84", "c58c08": "8f1a8d", - "ffffff": "ffffff", "ffd642": "e6509f", "6b637b": "718198", "c5bdce": "b3cedb", diff --git a/public/images/pokemon/variant/back/female/464.json b/public/images/pokemon/variant/back/female/464.json index 9479b6f2ebf..10c18fa20e9 100644 --- a/public/images/pokemon/variant/back/female/464.json +++ b/public/images/pokemon/variant/back/female/464.json @@ -5,15 +5,9 @@ "ef5200": "6f4d9f", "29293a": "1f1028", "3a3a4a": "3b2d40", - "101010": "101010", "7b6b7b": "6e5d7b", - "6b6373": "6b6373", - "cecede": "cecede", - "efefff": "efefff", "5a4a63": "514259", - "948cad": "948cad", - "943a00": "4c2f6e", - "ad2900": "ad2900" + "943a00": "4c2f6e" }, "2": { "523100": "492133", @@ -21,7 +15,6 @@ "ef5200": "6d3950", "29293a": "442339", "3a3a4a": "701f38", - "101010": "101010", "7b6b7b": "c6405b", "6b6373": "b66360", "cecede": "e8a797", diff --git a/public/images/pokemon/variant/back/female/465.json b/public/images/pokemon/variant/back/female/465.json index ed257655add..fec2a63f634 100644 --- a/public/images/pokemon/variant/back/female/465.json +++ b/public/images/pokemon/variant/back/female/465.json @@ -3,10 +3,8 @@ "193a63": "391963", "295a84": "472984", "3a73ad": "6b3aad", - "000000": "000000", "5a193a": "195a2a", "bd216b": "21bd69", - "31313a": "31313a", "d65a94": "5ad662" }, "2": { diff --git a/public/images/pokemon/variant/back/female/592.json b/public/images/pokemon/variant/back/female/592.json index eaaa9cf38ea..a7f086924bd 100644 --- a/public/images/pokemon/variant/back/female/592.json +++ b/public/images/pokemon/variant/back/female/592.json @@ -1,29 +1,23 @@ { "0": { "7b3a52": "622a1e", - "101010": "101010", "ffdee6": "ffe7df", "d6b5bd": "f2bba3", "bd84a5": "eb8b4d", - "ffb5d6": "ffb868", - "ffffff": "ffffff" + "ffb5d6": "ffb868" }, "1": { "7b3a52": "302a85", - "101010": "101010", "ffdee6": "e3deff", "d6b5bd": "9d92ce", "bd84a5": "5052c1", - "ffb5d6": "6270e3", - "ffffff": "ffffff" + "ffb5d6": "6270e3" }, "2": { "7b3a52": "4e1b55", - "101010": "101010", "ffdee6": "a65ea3", "d6b5bd": "703573", "bd84a5": "efacd1", - "ffb5d6": "ffdbec", - "ffffff": "ffffff" + "ffb5d6": "ffdbec" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/593.json b/public/images/pokemon/variant/back/female/593.json index 6f954902f10..af86de4b02e 100644 --- a/public/images/pokemon/variant/back/female/593.json +++ b/public/images/pokemon/variant/back/female/593.json @@ -1,7 +1,6 @@ { "0": { "7b3a52": "622a1e", - "101010": "101010", "ffdef7": "ffe7df", "c5a5bd": "f2bba3", "d684b5": "eb8b4d", @@ -9,7 +8,6 @@ }, "1": { "7b3a52": "302a85", - "101010": "101010", "ffdef7": "e3deff", "c5a5bd": "aba5c5", "d684b5": "4c4eb7", @@ -17,7 +15,6 @@ }, "2": { "7b3a52": "4e1b55", - "101010": "101010", "ffdef7": "a65ea3", "c5a5bd": "703573", "d684b5": "efacd1", diff --git a/public/images/pokemon/variant/back/female/6215.json b/public/images/pokemon/variant/back/female/6215.json index 741d6ddc0bb..db99eb822bf 100644 --- a/public/images/pokemon/variant/back/female/6215.json +++ b/public/images/pokemon/variant/back/female/6215.json @@ -6,12 +6,9 @@ "9c9bce": "ae8976", "514a80": "402010", "dcdbf7": "d0b3a4", - "080808": "080808", "28234b": "220d0a", "7d6ca4": "853a36", "584d80": "562627", - "f6f6ff": "f6f6ff", - "bdbdc5": "bdbdc5", "c52973": "ea903f" }, "2": { @@ -21,12 +18,9 @@ "9c9bce": "3c8775", "514a80": "14273a", "dcdbf7": "60ae7e", - "080808": "080808", "28234b": "0a191e", "7d6ca4": "395962", "584d80": "1c3942", - "f6f6ff": "f6f6ff", - "bdbdc5": "bdbdc5", "c52973": "f49633" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/84.json b/public/images/pokemon/variant/back/female/84.json index 2cb87a3cd28..2b665f3b48c 100644 --- a/public/images/pokemon/variant/back/female/84.json +++ b/public/images/pokemon/variant/back/female/84.json @@ -3,10 +3,7 @@ "523a19": "1b4e31", "946b5a": "3a8951", "bd8c52": "65bf75", - "636363": "636363", "dead73": "a5e6a0", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "bba689", "635210": "7a614c", "efdead": "ece4ce", @@ -16,10 +13,7 @@ "523a19": "4e0d2f", "946b5a": "762141", "bd8c52": "9b374e", - "636363": "636363", "dead73": "c35d6a", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "af85a2", "635210": "4a2240", "efdead": "e7cedb", @@ -29,10 +23,7 @@ "523a19": "2e4c6c", "946b5a": "5f92aa", "bd8c52": "7abcc7", - "636363": "636363", "dead73": "b0ebed", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "4a1e41", "635210": "391435", "efdead": "884b71", diff --git a/public/images/pokemon/variant/back/female/85.json b/public/images/pokemon/variant/back/female/85.json index 4499daf9608..ebf7e226b8b 100644 --- a/public/images/pokemon/variant/back/female/85.json +++ b/public/images/pokemon/variant/back/female/85.json @@ -1,16 +1,11 @@ { "0": { - "424242": "424242", - "848484": "848484", - "000000": "000000", "5a4221": "1b4e31", "a57b5a": "3a8951", "ce9c52": "65bf75", "635a42": "7a614c", "efdead": "ece4ce", - "ffffff": "ffffff", "b5a57b": "bba689", - "d6cece": "d6cece", "b54242": "1a265f", "ffd6e6": "7fbdd1", "f784a5": "3a6c97" @@ -18,15 +13,12 @@ "1": { "424242": "1c1d49", "848484": "2e3260", - "000000": "000000", "5a4221": "4e0d2f", "a57b5a": "762141", "ce9c52": "9b374e", "635a42": "4a2240", "efdead": "e7cedb", - "ffffff": "ffffff", "b5a57b": "af85a2", - "d6cece": "d6cece", "b54242": "4e276f", "ffd6e6": "a668ba", "f784a5": "784496" @@ -34,15 +26,12 @@ "2": { "424242": "621e2a", "848484": "973d41", - "000000": "000000", "5a4221": "2e4c6c", "a57b5a": "6a9dbf", "ce9c52": "94d1db", "635a42": "391436", "efdead": "784766", - "ffffff": "ffffff", "b5a57b": "54284b", - "d6cece": "d6cece", "b54242": "6d1b55", "ffd6e6": "e882a5", "f784a5": "a5397a" diff --git a/public/images/pokemon/variant/exp/1001.json b/public/images/pokemon/variant/exp/1001.json index e85b345ed2b..5de76f31c04 100644 --- a/public/images/pokemon/variant/exp/1001.json +++ b/public/images/pokemon/variant/exp/1001.json @@ -3,7 +3,6 @@ "505551": "754e3b", "b8bebd": "ebe6c0", "313430": "4f2711", - "0f0f0f": "0f0f0f", "7e615a": "1f1e1c", "48492e": "0a0907", "a28b76": "383734", @@ -13,17 +12,12 @@ "524a36": "6e4105", "b99c60": "e2a845", "7b7253": "b87416", - "f97c20": "a5af8b", - "fdfdfd": "fdfdfd", - "010101": "010101", - "212421": "212421", - "212021": "212021" + "f97c20": "a5af8b" }, "2": { "505551": "322733", "b8bebd": "dbcce8", "313430": "1b101c", - "0f0f0f": "0f0f0f", "7e615a": "e6aec8", "48492e": "9c4b6f", "a28b76": "fce6f0", @@ -33,10 +27,6 @@ "524a36": "420f0f", "b99c60": "bd405d", "7b7253": "5e1b1b", - "f97c20": "f536f5", - "fdfdfd": "fdfdfd", - "010101": "010101", - "212421": "212421", - "212021": "212021" + "f97c20": "f536f5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/1003.json b/public/images/pokemon/variant/exp/1003.json index b9e73bfb9aa..2dbd7479745 100644 --- a/public/images/pokemon/variant/exp/1003.json +++ b/public/images/pokemon/variant/exp/1003.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "477068": "daa666", "905a20": "655062", "2e4f49": "96562e", @@ -21,7 +20,6 @@ "856e62": "514758" }, "2": { - "000000": "000000", "477068": "8d6acc", "905a20": "57599c", "2e4f49": "6241a1", diff --git a/public/images/pokemon/variant/exp/1004.json b/public/images/pokemon/variant/exp/1004.json index 4a489005a7e..cbbd66b9a4f 100644 --- a/public/images/pokemon/variant/exp/1004.json +++ b/public/images/pokemon/variant/exp/1004.json @@ -2,7 +2,6 @@ "1": { "a23724": "b06f00", "f4342f": "f2b200", - "0f0f0f": "0f0f0f", "f35e38": "ffc81b", "f9824f": "ffe13a", "b15236": "dca300", @@ -14,39 +13,15 @@ "5b985a": "5c71c1", "83b884": "7a9ae0", "3c3f3a": "27276a", - "f8f8f0": "f8f8f0", "548c53": "5acbe0", - "0e0e0e": "0e0e0e", - "6e5e00": "6e5e00", - "1a3b1e": "1a3b1e", "426b41": "3f89b4", - "ffd871": "ffd871", - "ffba02": "ffba02", - "ffce4c": "ffce4c", - "443a00": "443a00", - "ec8d22": "ec8d22", "73af74": "539de0", "ffc938": "ffe49d", - "ffe191": "fffaed", - "857100": "857100", - "ffedbe": "ffedbe", - "524600": "524600", - "4e6e00": "4e6e00", - "e8ff71": "e8ff71", - "d5ff02": "d5ff02", - "e2ff4c": "e2ff4c", - "304400": "304400", - "7a6800": "7a6800", - "ffe39a": "ffe39a", - "ffc21f": "ffc21f", - "4b4000": "4b4000", - "ece622": "ece622", - "ee9b3d": "ee9b3d" + "ffe191": "fffaed" }, "2": { "a23724": "76074d", "f4342f": "a525d3", - "0f0f0f": "0f0f0f", "f35e38": "3449f6", "f9824f": "49c9f6", "b15236": "7642bd", @@ -58,33 +33,16 @@ "5b985a": "b09f97", "83b884": "d7cbb5", "3c3f3a": "4b4444", - "f8f8f0": "f8f8f0", "548c53": "e5c468", - "0e0e0e": "0e0e0e", - "6e5e00": "6e5e00", "1a3b1e": "420202", "426b41": "bda10a", - "ffd871": "ffd871", - "ffba02": "ffba02", - "ffce4c": "ffce4c", - "443a00": "443a00", - "ec8d22": "ec8d22", "73af74": "b48910", "ffc938": "ff8e70", "ffe191": "ffb3aa", - "857100": "857100", - "ffedbe": "ffedbe", - "524600": "524600", "4e6e00": "a34b0b", "e8ff71": "ffd0ae", "d5ff02": "ffb47d", "e2ff4c": "ff8374", - "304400": "440000", - "7a6800": "7a6800", - "ffe39a": "ffe39a", - "ffc21f": "ffc21f", - "4b4000": "4b4000", - "ece622": "ece622", - "ee9b3d": "ee9b3d" + "304400": "440000" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/1006.json b/public/images/pokemon/variant/exp/1006.json index 3fd7c511936..4e329152f01 100644 --- a/public/images/pokemon/variant/exp/1006.json +++ b/public/images/pokemon/variant/exp/1006.json @@ -1,7 +1,6 @@ { "2": { "37522e": "2a224e", - "000000": "000000", "456539": "2a224e", "4b9080": "3e2d63", "456639": "2a224e", diff --git a/public/images/pokemon/variant/exp/1008-ultimate-mode.json b/public/images/pokemon/variant/exp/1008-ultimate-mode.json index 2301e19c8e6..90b682218e9 100644 --- a/public/images/pokemon/variant/exp/1008-ultimate-mode.json +++ b/public/images/pokemon/variant/exp/1008-ultimate-mode.json @@ -1,18 +1,10 @@ { "0": { "0697ee": "8955b5", - "ffffff": "ffffff", "aaa8db": "7fd8cf", - "39ace3": "39ace3", - "9c97bd": "9c97bd", - "aca7c7": "aca7c7", "f7ec83": "427eff", - "000000": "000000", "635e7b": "5c4370", - "494e5f": "494e5f", - "7e738c": "7e738c", "1c174e": "393a3e", - "e1e0e9": "e1e0e9", "2f329f": "858585", "765cc2": "c8c8c8" }, @@ -20,13 +12,10 @@ "0697ee": "31808e", "ffffff": "ffffc9", "aaa8db": "ade263", - "39ace3": "39ace3", "9c97bd": "7d8ace", "aca7c7": "89a5ff", "f7ec83": "2cc151", - "000000": "000000", "635e7b": "3b5c63", - "494e5f": "494e5f", "7e738c": "626b94", "1c174e": "252e42", "e1e0e9": "b7d8ff", @@ -41,10 +30,6 @@ "9c97bd": "aa88a1", "aca7c7": "ad9e9d", "f7ec83": "cc5767", - "000000": "000000", - "635e7b": "635e7b", - "494e5f": "494e5f", - "7e738c": "7e738c", "1c174e": "192142", "e1e0e9": "e0e0e0", "2f329f": "2a3768", diff --git a/public/images/pokemon/variant/exp/127-mega.json b/public/images/pokemon/variant/exp/127-mega.json index d23b5071423..4ba25f9f216 100644 --- a/public/images/pokemon/variant/exp/127-mega.json +++ b/public/images/pokemon/variant/exp/127-mega.json @@ -3,34 +3,24 @@ "837362": "7e5649", "eee6cd": "eccb90", "d5c5b4": "d29f88", - "000000": "000000", "b4a494": "b1846f", "4a4139": "441a0f", - "ae5a05": "ae5a05", - "eb8823": "eb8823", "5a4131": "172a22", "c5ac8b": "72988e", "836a52": "3b554d", "a48b6a": "54796f", - "e6d5b4": "92bab1", - "fffd79": "fffd79", - "ffffff": "ffffff" + "e6d5b4": "92bab1" }, "2": { "837362": "868686", "eee6cd": "ffffff", "d5c5b4": "d5d5d5", - "000000": "000000", "b4a494": "b7b7b7", "4a4139": "484848", - "ae5a05": "ae5a05", - "eb8823": "eb8823", "5a4131": "5c0026", "c5ac8b": "d56a70", "836a52": "8c2c40", "a48b6a": "b44954", - "e6d5b4": "fa958c", - "fffd79": "fffd79", - "ffffff": "ffffff" + "e6d5b4": "fa958c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/181-mega.json b/public/images/pokemon/variant/exp/181-mega.json index 43ab28dd603..52125fd3653 100644 --- a/public/images/pokemon/variant/exp/181-mega.json +++ b/public/images/pokemon/variant/exp/181-mega.json @@ -2,7 +2,6 @@ "1": { "626a6a": "58341f", "ffffff": "ffe8b2", - "101010": "101010", "c54100": "e28f09", "b4b4bd": "e5c079", "e6e6e6": "ffe8b2", @@ -17,7 +16,6 @@ "2": { "626a6a": "5d412a", "ffffff": "fff1d0", - "101010": "101010", "c54100": "d26b00", "b4b4bd": "ebbb78", "e6e6e6": "fff1d0", diff --git a/public/images/pokemon/variant/exp/2027.json b/public/images/pokemon/variant/exp/2027.json index 1bf950569fb..2aec1f8d221 100644 --- a/public/images/pokemon/variant/exp/2027.json +++ b/public/images/pokemon/variant/exp/2027.json @@ -1,10 +1,8 @@ { "1": { "354e73": "752e42", - "fefefe": "fefefe", "b6dbe7": "ffdac2", "84b3ce": "d27c80", - "101010": "101010", "518d9f": "a24c68", "10397b": "212d55", "cdbe85": "d3d3c6", @@ -13,10 +11,8 @@ }, "2": { "354e73": "3d2c78", - "fefefe": "fefefe", "b6dbe7": "dbb1eb", "84b3ce": "a87bcf", - "101010": "101010", "518d9f": "6a439e", "10397b": "1d6268", "cdbe85": "44225a", diff --git a/public/images/pokemon/variant/exp/2028.json b/public/images/pokemon/variant/exp/2028.json index 36887e3f321..3ef67aec065 100644 --- a/public/images/pokemon/variant/exp/2028.json +++ b/public/images/pokemon/variant/exp/2028.json @@ -1,7 +1,6 @@ { "1": { "3c88b4": "966281", - "101010": "101010", "ffffff": "fffffc", "52b0cf": "e2877b", "b0e5f8": "fffed9", @@ -13,12 +12,10 @@ "8c8c8c": "8d6e6f", "525252": "6f525d", "bdbdcd": "d0c0b6", - "606060": "4f364c", - "f1f1f4": "f1f1f4" + "606060": "4f364c" }, "2": { "3c88b4": "515fa9", - "101010": "101010", "ffffff": "e3f0ff", "52b0cf": "57a5c5", "b0e5f8": "f8f5b0", diff --git a/public/images/pokemon/variant/exp/2052.json b/public/images/pokemon/variant/exp/2052.json index 31ff32696b8..d33bed4ace9 100644 --- a/public/images/pokemon/variant/exp/2052.json +++ b/public/images/pokemon/variant/exp/2052.json @@ -1,11 +1,9 @@ { "1": { "45505f": "8c583b", - "0a0a0a": "0a0a0a", "91a3bf": "ffda5c", "262b3c": "41185e", "995433": "493473", - "f3f3f3": "f3f3f3", "e3cc2b": "a66db5", "ca833c": "7a519a", "798071": "7a4888", @@ -15,11 +13,9 @@ }, "2": { "45505f": "271420", - "0a0a0a": "0a0a0a", "91a3bf": "7c4e42", "262b3c": "1d1b33", "995433": "45328e", - "f3f3f3": "f3f3f3", "e3cc2b": "b5b8f9", "ca833c": "7b7fda", "798071": "5f5c7e", diff --git a/public/images/pokemon/variant/exp/2053.json b/public/images/pokemon/variant/exp/2053.json index 6968f2f227c..7639601cd00 100644 --- a/public/images/pokemon/variant/exp/2053.json +++ b/public/images/pokemon/variant/exp/2053.json @@ -1,13 +1,11 @@ { "1": { - "000000": "000000", "545968": "65352c", "ced6ee": "ffda5c", "a5adc7": "e89b4b", "847f8a": "592d7a", "c2bdc7": "8a519a", "02b0e3": "6945aa", - "ffffff": "ffffff", "5dc7e5": "9d67d8", "0a6079": "2e2575", "7b7ba8": "7c488a", diff --git a/public/images/pokemon/variant/exp/212-mega.json b/public/images/pokemon/variant/exp/212-mega.json index e53c2924659..146a43bc59a 100644 --- a/public/images/pokemon/variant/exp/212-mega.json +++ b/public/images/pokemon/variant/exp/212-mega.json @@ -1,43 +1,23 @@ { "0": { "622929": "215a2d", - "000000": "000000", "f66a6a": "8cce73", "d53939": "4a9c53", - "a42929": "2f794e", - "404052": "404052", - "ffffff": "ffffff", - "717186": "717186", - "2b2b38": "2b2b38", - "b4b4cd": "b4b4cd", - "1083a2": "1083a2", - "2cabcc": "2cabcc" + "a42929": "2f794e" }, "1": { "622929": "2f2962", - "000000": "000000", "f66a6a": "639cf7", "d53939": "4263ef", - "a42929": "29429c", - "404052": "404052", - "ffffff": "ffffff", - "717186": "717186", - "2b2b38": "2b2b38", - "b4b4cd": "b4b4cd", - "1083a2": "1083a2", - "2cabcc": "2cabcc" + "a42929": "29429c" }, "2": { "622929": "645117", - "000000": "000000", "f66a6a": "c59f29", "d53939": "ffca2a", "a42929": "b88619", "404052": "282d2c", - "ffffff": "ffffff", "717186": "3c4543", - "2b2b38": "2b2b38", - "b4b4cd": "b4b4cd", "1083a2": "645117", "2cabcc": "f4e920" } diff --git a/public/images/pokemon/variant/exp/229-mega.json b/public/images/pokemon/variant/exp/229-mega.json index 1cc9a9fe878..a2c95914e2a 100644 --- a/public/images/pokemon/variant/exp/229-mega.json +++ b/public/images/pokemon/variant/exp/229-mega.json @@ -2,7 +2,6 @@ "1": { "83738b": "7c323c", "ffffff": "f3bd87", - "000000": "000000", "cdd5d5": "c87966", "a49cac": "a84b50", "182029": "321b32", @@ -11,19 +10,14 @@ "a45a4a": "ceb0a5", "313139": "553454", "6a211f": "314075", - "c5cdd1": "c5cdd1", "ce0a10": "455d92", - "f8f9ff": "f8f9ff", "622910": "77545b", - "e2e0e3": "e2e0e3", - "b6aabc": "b6aabc", "732422": "856458", "af1b1b": "aa8c82" }, "2": { "83738b": "100f27", "ffffff": "5c8d95", - "000000": "000000", "cdd5d5": "38576c", "a49cac": "223657", "182029": "321b32", @@ -36,8 +30,6 @@ "ce0a10": "e58142", "f8f9ff": "223657", "622910": "311f3a", - "e2e0e3": "e2e0e3", - "b6aabc": "b6aabc", "732422": "423655", "af1b1b": "534b6a" } diff --git a/public/images/pokemon/variant/exp/248-mega.json b/public/images/pokemon/variant/exp/248-mega.json index 0a46ac40a4a..4f62567bc40 100644 --- a/public/images/pokemon/variant/exp/248-mega.json +++ b/public/images/pokemon/variant/exp/248-mega.json @@ -1,34 +1,34 @@ { "1": { -"4a5a39": "533334", -"821610": "004194", -"942900": "004194", -"d0243b": "006fb3", -"d55200": "0098fc", -"ff3e40": "0098fc", -"f24159": "088a72", -"f55e72": "18b8a0", -"ff6668": "1cd9ff", -"739c62": "915957", -"ff8385": "00e0fc", -"ffa3a4": "00ffc8", -"accd9c": "c78482", -"dee6cd": "dbb1b5" + "4a5a39": "533334", + "821610": "004194", + "942900": "004194", + "d0243b": "006fb3", + "d55200": "0098fc", + "ff3e40": "0098fc", + "f24159": "088a72", + "f55e72": "18b8a0", + "ff6668": "1cd9ff", + "739c62": "915957", + "ff8385": "00e0fc", + "ffa3a4": "00ffc8", + "accd9c": "c78482", + "dee6cd": "dbb1b5" }, "2": { -"4a5a39": "06092f", -"821610": "ee7b06", -"942900": "ee7b06", -"d0243b": "ffa904", -"d55200": "ffa904", -"ff3e40": "ffef76", -"f24159": "ffbf44", -"f55e72": "ffd380", -"ff6668": "fef3a1", -"739c62": "2c3071", -"ff8385": "fff8c1", -"ffa3a4": "fffbdd", -"accd9c": "625695", -"dee6cd": "7068b2" + "4a5a39": "06092f", + "821610": "ee7b06", + "942900": "ee7b06", + "d0243b": "ffa904", + "d55200": "ffa904", + "ff3e40": "ffef76", + "f24159": "ffbf44", + "f55e72": "ffd380", + "ff6668": "fef3a1", + "739c62": "2c3071", + "ff8385": "fff8c1", + "ffa3a4": "fffbdd", + "accd9c": "625695", + "dee6cd": "7068b2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/257-mega.json b/public/images/pokemon/variant/exp/257-mega.json index 0da37a3799f..ac22ad976ce 100644 --- a/public/images/pokemon/variant/exp/257-mega.json +++ b/public/images/pokemon/variant/exp/257-mega.json @@ -1,7 +1,6 @@ { "1": { "62524a": "3b3f61", - "000000": "000000", "832929": "9b422a", "bdb494": "a8c7da", "dedeb4": "f0fbff", @@ -20,7 +19,6 @@ }, "2": { "62524a": "5b143d", - "000000": "000000", "832929": "9c7c70", "bdb494": "a1304d", "dedeb4": "bc474d", diff --git a/public/images/pokemon/variant/exp/302-mega.json b/public/images/pokemon/variant/exp/302-mega.json index 733407fd959..862f7fb8997 100644 --- a/public/images/pokemon/variant/exp/302-mega.json +++ b/public/images/pokemon/variant/exp/302-mega.json @@ -4,7 +4,6 @@ "7b0000": "590752", "9e0d1a": "590752", "ff94ac": "ff8fcf", - "000000": "000000", "5a4a94": "416a3d", "ee4554": "c72c9c", "393952": "123812", @@ -18,7 +17,6 @@ "7b0000": "192077", "9e0d1a": "192077", "ff94ac": "61d6f2", - "000000": "000000", "5a4a94": "7e141c", "ee4554": "185da6", "393952": "580a16", diff --git a/public/images/pokemon/variant/exp/303-mega.json b/public/images/pokemon/variant/exp/303-mega.json index 7a025fedf32..30b63d73c46 100644 --- a/public/images/pokemon/variant/exp/303-mega.json +++ b/public/images/pokemon/variant/exp/303-mega.json @@ -1,34 +1,26 @@ { "1": { - "000000": "000000", "737373": "347c7d", "4a4a4a": "193e49", "7b5a29": "6b5424", "984868": "b43929", "ffc55a": "d6c491", - "ffffff": "ffffff", - "cdcdcd": "cdcdcd", "9ca494": "4fa285", "b86088": "ff625a", "de9441": "a99372", - "484848": "484848", "9c4a6a": "23445e", "732041": "162843", "bd628b": "397189" }, "2": { - "000000": "000000", "737373": "9d7cd6", "4a4a4a": "2f2781", "7b5a29": "706d80", "984868": "b43929", "ffc55a": "cfc8e4", - "ffffff": "ffffff", - "cdcdcd": "cdcdcd", "9ca494": "c7a8eb", "b86088": "ff625a", "de9441": "b1a3ca", - "484848": "484848", "9c4a6a": "4c3767", "732041": "2b1c3f", "bd628b": "694c84" diff --git a/public/images/pokemon/variant/exp/306-mega.json b/public/images/pokemon/variant/exp/306-mega.json index 40575898b93..5a9936478d2 100644 --- a/public/images/pokemon/variant/exp/306-mega.json +++ b/public/images/pokemon/variant/exp/306-mega.json @@ -10,9 +10,7 @@ "838394": "a48d76", "a4a4ac": "bca88c", "6abdff": "ff78fa", - "acacac": "69ad6c", - "9c3141": "9c3141", - "de5252": "de5252" + "acacac": "69ad6c" }, "1": { "000000": "101010", @@ -40,8 +38,6 @@ "838394": "833d19", "a4a4ac": "a45f34", "6abdff": "2aebcf", - "acacac": "7d95bf", - "9c3141": "9c3141", - "de5252": "de5252" + "acacac": "7d95bf" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/334-mega.json b/public/images/pokemon/variant/exp/334-mega.json index 0fafc15e556..16a61dd68d9 100644 --- a/public/images/pokemon/variant/exp/334-mega.json +++ b/public/images/pokemon/variant/exp/334-mega.json @@ -10,7 +10,6 @@ "283858": "771743", "1098c8": "cb457d", "98d8f8": "f3719a", - "101010": "101010", "000000": "101010", "4a6294": "771743", "109ccd": "cb457d" diff --git a/public/images/pokemon/variant/exp/354-mega.json b/public/images/pokemon/variant/exp/354-mega.json index 9e9c1b14f13..b7968016e9c 100644 --- a/public/images/pokemon/variant/exp/354-mega.json +++ b/public/images/pokemon/variant/exp/354-mega.json @@ -3,7 +3,6 @@ "523900": "361a2d", "d59c39": "7d656d", "393141": "431b40", - "000000": "000000", "5a5262": "6c2f4c", "7b5a29": "624858", "eebd5a": "b78d90", @@ -11,16 +10,13 @@ "8d859b": "b0697b", "913e5f": "37838b", "c44a8d": "73bdbd", - "e7e1ea": "e7e1ea", "ce92c8": "b6f0f7", - "512843": "1c4d5d", - "ffffff": "ffffff" + "512843": "1c4d5d" }, "2": { "523900": "151433", "d59c39": "3b3d54", "393141": "3b5d62", - "000000": "000000", "5a5262": "71a680", "7b5a29": "292941", "eebd5a": "4d4f5b", @@ -28,9 +24,7 @@ "8d859b": "b6d192", "913e5f": "751a1c", "c44a8d": "983226", - "e7e1ea": "e7e1ea", "ce92c8": "d1dcaa", - "512843": "4f0209", - "ffffff": "ffffff" + "512843": "4f0209" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/362-mega.json b/public/images/pokemon/variant/exp/362-mega.json index 3b6e39436e6..b3f4144f46f 100644 --- a/public/images/pokemon/variant/exp/362-mega.json +++ b/public/images/pokemon/variant/exp/362-mega.json @@ -1,4 +1,5 @@ -{"1": { +{ + "1": { "010101": "000000", "2b74a8": "84073c", "bbeeff": "f9383e", @@ -16,7 +17,6 @@ "20315e": "460025" }, "2": { - "010101": "010101", "2b74a8": "0c4b3a", "bbeeff": "5ce11a", "393941": "221315", diff --git a/public/images/pokemon/variant/exp/373-mega.json b/public/images/pokemon/variant/exp/373-mega.json index 6500192a0f6..d898320c8b9 100644 --- a/public/images/pokemon/variant/exp/373-mega.json +++ b/public/images/pokemon/variant/exp/373-mega.json @@ -4,18 +4,12 @@ "ce465e": "4572a2", "b83147": "1c4076", "a12a2f": "132760", - "000000": "000000", "2a547a": "6c2d13", "2b87c5": "d28943", "58b3da": "efb660", "2a729a": "a45f28", "ccbc26": "61caf7", "e6e85b": "96e9ff", - "cb3f51": "cb3f51", - "eeeeee": "eeeeee", - "832041": "832041", - "d95b6b": "d95b6b", - "768787": "768787", "a5a594": "f1dbc0", "dfdfd2": "fff8ec" }, @@ -24,17 +18,12 @@ "ce465e": "fff9e5", "b83147": "e5ddcb", "a12a2f": "baae9b", - "000000": "000000", "2a547a": "300926", "2b87c5": "71184e", "58b3da": "8a3562", "2a729a": "3f0f31", "ccbc26": "d56e1d", "e6e85b": "ffaf4a", - "cb3f51": "cb3f51", - "eeeeee": "eeeeee", - "832041": "832041", - "d95b6b": "d95b6b", "768787": "3d0a1d", "a5a594": "591126", "dfdfd2": "781c30" diff --git a/public/images/pokemon/variant/exp/376-mega.json b/public/images/pokemon/variant/exp/376-mega.json index cdcc4794df3..f8043aade9a 100644 --- a/public/images/pokemon/variant/exp/376-mega.json +++ b/public/images/pokemon/variant/exp/376-mega.json @@ -3,7 +3,6 @@ "736a73": "703b08", "313962": "550611", "4a83c5": "bf2e2d", - "101010": "101010", "948b94": "a76911", "416294": "851421", "acacac": "a76911", @@ -20,7 +19,6 @@ "736a73": "6f2c17", "313962": "0b3739", "4a83c5": "41b4a1", - "101010": "101010", "948b94": "9f4219", "416294": "1e716e", "acacac": "9f4219", diff --git a/public/images/pokemon/variant/exp/380-mega.json b/public/images/pokemon/variant/exp/380-mega.json index aedcc39909c..667d83b2203 100644 --- a/public/images/pokemon/variant/exp/380-mega.json +++ b/public/images/pokemon/variant/exp/380-mega.json @@ -27,4 +27,4 @@ "cda44a": "dd6800", "cd4a52": "dd6800" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/381-mega.json b/public/images/pokemon/variant/exp/381-mega.json index bb5b7cffd0b..872cc0e5cc3 100644 --- a/public/images/pokemon/variant/exp/381-mega.json +++ b/public/images/pokemon/variant/exp/381-mega.json @@ -27,4 +27,4 @@ "62004a": "9344b8", "cd4a52": "70309f" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/382-primal.json b/public/images/pokemon/variant/exp/382-primal.json index 4fce9922021..9fa6f794653 100644 --- a/public/images/pokemon/variant/exp/382-primal.json +++ b/public/images/pokemon/variant/exp/382-primal.json @@ -1,44 +1,26 @@ { "1": { "27245e": "d96714", - "000000": "000000", "74659d": "ffb44c", "d3e6f4": "f6e4e0", "373384": "f49230", "b8c9df": "c5253a", "7eaecc": "ff3200", - "fbec99": "fbec99", "417999": "c5253a", - "101010": "101010", "dedede": "fff7f4", "9c8b94": "791309", - "f61010": "f61010", - "a43162": "a43162", - "e19d76": "e19d76", - "fadbb3": "fadbb3", - "90a2c0": "eac3b9", - "cdbdcd": "cdbdcd", - "ffffff": "ffffff" + "90a2c0": "eac3b9" }, "2": { "27245e": "780613", - "000000": "000000", "74659d": "ea512b", - "d3e6f4": "d3e6f4", "373384": "a90e14", "b8c9df": "db6d14", "7eaecc": "ffc546", "fbec99": "90ffde", "417999": "ea7c18", - "101010": "101010", - "dedede": "dedede", "9c8b94": "3c0818", "f61010": "3346d0", - "a43162": "a43162", - "e19d76": "67a6f4", - "fadbb3": "fadbb3", - "90a2c0": "90a2c0", - "cdbdcd": "cdbdcd", - "ffffff": "ffffff" + "e19d76": "67a6f4" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/383-primal.json b/public/images/pokemon/variant/exp/383-primal.json index da20585cc60..04ff6c48796 100644 --- a/public/images/pokemon/variant/exp/383-primal.json +++ b/public/images/pokemon/variant/exp/383-primal.json @@ -2,29 +2,23 @@ "1": { "9d2929": "11421e", "fe736b": "279930", - "010101": "010101", "fe2129": "2b5b32", "fab672": "ff8571", "fff493": "ffd493", "7c2129": "011e0b", "fe6336": "ff203f", - "272324": "272324", "3f3b3c": "383540", "595355": "625769", - "64626c": "64626c", "fbfbfb": "fff6de", "cdccd0": "e5d4b6" }, "2": { "9d2929": "20516c", "fe736b": "68cfd0", - "010101": "010101", "fe2129": "3e8b9f", "fab672": "61ee93", "fff493": "d2ff93", "7c2129": "0a2c43", - "fe6336": "fe6336", - "272324": "272324", "3f3b3c": "2b3c4e", "595355": "4e5169", "64626c": "7373a6", diff --git a/public/images/pokemon/variant/exp/384-mega.json b/public/images/pokemon/variant/exp/384-mega.json index e4de3a1c873..ccfb6f6dbe8 100644 --- a/public/images/pokemon/variant/exp/384-mega.json +++ b/public/images/pokemon/variant/exp/384-mega.json @@ -3,7 +3,6 @@ "fbe27e": "17e2d6", "fc9436": "098faf", "836231": "003082", - "010101": "010101", "f6de00": "17e2d6", "c5a400": "0db1b1", "3d7d6d": "84120f", @@ -13,7 +12,6 @@ "60d293": "f1785e", "e4b629": "036486", "9c2952": "063f67", - "e65273": "2083e7", - "fcfcfc": "fcfcfc" + "e65273": "2083e7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/4052.json b/public/images/pokemon/variant/exp/4052.json index 1aa7d2251c6..d28c4ee091b 100644 --- a/public/images/pokemon/variant/exp/4052.json +++ b/public/images/pokemon/variant/exp/4052.json @@ -1,28 +1,21 @@ { "1": { - "181a1d": "181a1d", "3d4547": "4e385a", "84726f": "7b7aa5", "ada09a": "c3c5d4", "9aa094": "9ea9b5", "5b4e4d": "57567e", "272d2e": "342b49", - "010101": "010101", - "f3f3f3": "f3f3f3", - "f3d91d": "ffff89", - "000000": "000000" + "f3d91d": "ffff89" }, "2": { - "181a1d": "181a1d", "3d4547": "417778", "84726f": "3c2841", "ada09a": "603b54", "9aa094": "cc9a5f", "5b4e4d": "171127", "272d2e": "234a56", - "010101": "010101", "f3f3f3": "f4d294", - "f3d91d": "c4e857", - "000000": "000000" + "f3d91d": "c4e857" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/4077.json b/public/images/pokemon/variant/exp/4077.json index c51662408f4..4731cec1908 100644 --- a/public/images/pokemon/variant/exp/4077.json +++ b/public/images/pokemon/variant/exp/4077.json @@ -12,7 +12,6 @@ "fcf7ff": "edd5c9", "d2daff": "ffb44c", "59237e": "312c49", - "101010": "101010", "d8cde0": "aeadb3", "adadad": "9f9f9f", "78499b": "514766", @@ -23,7 +22,6 @@ "8e39c1": "990c00", "bdbabf": "c7aba8", "ded5ae": "5b93cc", - "fdfdfd": "fdfdfd", "8bbdc6": "ddb57c", "5292c7": "cb8b6b", "ccfffd": "efe091", @@ -47,7 +45,6 @@ "fcf7ff": "bab8c4", "d2daff": "b247a0", "59237e": "312c49", - "101010": "101010", "d8cde0": "aeadb3", "adadad": "9f9f9f", "78499b": "514766", @@ -58,7 +55,6 @@ "8e39c1": "161f4c", "bdbabf": "a7a9b2", "ded5ae": "cc66cc", - "fdfdfd": "fdfdfd", "8bbdc6": "bd80a3", "5292c7": "9e6b91", "ccfffd": "dd9ab7", diff --git a/public/images/pokemon/variant/exp/4078.json b/public/images/pokemon/variant/exp/4078.json index 854a977387d..5f7f7102ef7 100644 --- a/public/images/pokemon/variant/exp/4078.json +++ b/public/images/pokemon/variant/exp/4078.json @@ -1,11 +1,9 @@ { "1": { - "0c0c0c": "0c0c0c", "44bf75": "cc9470", "737ba4": "514766", "85fabf": "ffd9a5", "109865": "995944", - "2b3055": "2b3055", "ffffe3": "8cd8ff", "636357": "192666", "c566e3": "cc4328", @@ -19,12 +17,10 @@ "4ed68b": "cc9470" }, "2": { - "0c0c0c": "0c0c0c", "44bf75": "cc1e4c", "737ba4": "514766", "85fabf": "ff3255", "109865": "990f3d", - "2b3055": "2b3055", "ffffe3": "ff99dd", "636357": "361e66", "c566e3": "282866", diff --git a/public/images/pokemon/variant/exp/4079.json b/public/images/pokemon/variant/exp/4079.json index cb94f21fed1..8db9a419a27 100644 --- a/public/images/pokemon/variant/exp/4079.json +++ b/public/images/pokemon/variant/exp/4079.json @@ -7,9 +7,6 @@ "f88daf": "bb694b", "7c2847": "452a29", "d76d96": "8f5345", - "101010": "101010", - "d5cdcd": "d5cdcd", - "fcfcfc": "fcfcfc", "dea462": "e0799c", "8b5a18": "a84071", "ffe6b4": "ff9eba" @@ -22,9 +19,6 @@ "f88daf": "ecdcbe", "7c2847": "503941", "d76d96": "c6aead", - "101010": "101010", - "d5cdcd": "d5cdcd", - "fcfcfc": "fcfcfc", "dea462": "ca8e74", "8b5a18": "a45c58", "ffe6b4": "eec596" diff --git a/public/images/pokemon/variant/exp/4080.json b/public/images/pokemon/variant/exp/4080.json index 0d1bb55a1f9..b6fac81034e 100644 --- a/public/images/pokemon/variant/exp/4080.json +++ b/public/images/pokemon/variant/exp/4080.json @@ -2,10 +2,7 @@ "1": { "723f7c": "edc59e", "a565c0": "ffedcc", - "181818": "181818", "d76792": "905446", - "c9c9c9": "c9c9c9", - "fbfbfb": "fbfbfb", "c2c9c9": "de504e", "f985aa": "bb694b", "52525a": "821d2a", @@ -22,10 +19,7 @@ "2": { "723f7c": "963e59", "a565c0": "d9736b", - "181818": "181818", "d76792": "c6aead", - "c9c9c9": "c9c9c9", - "fbfbfb": "fbfbfb", "c2c9c9": "b0dc72", "f985aa": "ecdcbe", "52525a": "2a6122", diff --git a/public/images/pokemon/variant/exp/4199.json b/public/images/pokemon/variant/exp/4199.json index 703b641ef72..89bbdd186b2 100644 --- a/public/images/pokemon/variant/exp/4199.json +++ b/public/images/pokemon/variant/exp/4199.json @@ -3,12 +3,10 @@ "493e66": "831e2b", "a191b5": "de504e", "7a6a98": "ad3139", - "101010": "101010", "654493": "7e3351", "413668": "622344", "403468": "4f0926", "269a36": "f28783", - "f8f8f8": "f8f8f8", "a090b5": "ff9eba", "63577d": "a84071", "403568": "66222b", @@ -27,12 +25,10 @@ "493e66": "2a6122", "a191b5": "b0dc72", "7a6a98": "71ae48", - "101010": "101010", "654493": "37725b", "413668": "1d4c46", "403468": "9e3536", "269a36": "e58b5c", - "f8f8f8": "f8f8f8", "a090b5": "efc697", "63577d": "a55d59", "403568": "e6a572", diff --git a/public/images/pokemon/variant/exp/4222.json b/public/images/pokemon/variant/exp/4222.json index 217262ad84a..f3a79881488 100644 --- a/public/images/pokemon/variant/exp/4222.json +++ b/public/images/pokemon/variant/exp/4222.json @@ -9,7 +9,6 @@ "e3c4f2": "d7d2f6", "9c94a3": "58929f", "cbc2d1": "a9e4e3", - "101010": "101010", "ffa4c5": "76c6ff", "af9e9e": "44a0af", "e66294": "0099ff", @@ -26,7 +25,6 @@ "e3c4f2": "567f83", "9c94a3": "4b1f28", "cbc2d1": "773050", - "101010": "101010", "ffa4c5": "8ff3a3", "af9e9e": "b0919b", "e66294": "15c05f", diff --git a/public/images/pokemon/variant/exp/4263.json b/public/images/pokemon/variant/exp/4263.json index 938fe539ce9..52623dd15d4 100644 --- a/public/images/pokemon/variant/exp/4263.json +++ b/public/images/pokemon/variant/exp/4263.json @@ -5,10 +5,8 @@ "1b2627": "00312d", "5b5958": "397e4a", "f5f5f6": "f5ffea", - "010101": "010101", "b2b3b2": "a3ce9e", "d94a7f": "d414dd", - "fcfcfc": "fcfcfc", "e2729a": "ff69fa", "6e3b51": "9b00b4", "9b4f69": "d414dd", @@ -20,10 +18,8 @@ "1b2627": "080929", "5b5958": "100d2d", "f5f5f6": "3c335d", - "010101": "010101", "b2b3b2": "201b47", "d94a7f": "0099ce", - "fcfcfc": "fcfcfc", "e2729a": "54f1ff", "6e3b51": "004a8b", "9b4f69": "0099ce", diff --git a/public/images/pokemon/variant/exp/4264.json b/public/images/pokemon/variant/exp/4264.json index f40cc4b47cb..1841ad38561 100644 --- a/public/images/pokemon/variant/exp/4264.json +++ b/public/images/pokemon/variant/exp/4264.json @@ -1,13 +1,11 @@ { "1": { - "010101": "010101", "1d1c1b": "01473a", "343332": "1c8155", "727374": "579666", "f5f5f6": "f5ffea", "abadaf": "95c090", "ff4e89": "ff69fa", - "fcfcfc": "fcfcfc", "bc3065": "d414dd", "b4636f": "d414dd", "6f7071": "27323a", @@ -15,14 +13,12 @@ "ffa0bf": "ff69fa" }, "2": { - "010101": "010101", "1d1c1b": "412991", "343332": "7c4cd6", "727374": "18133d", "f5f5f6": "342d4c", "abadaf": "18133d", "ff4e89": "54f1ff", - "fcfcfc": "fcfcfc", "bc3065": "0099ce", "b4636f": "0099ce", "6f7071": "2a1b4e", diff --git a/public/images/pokemon/variant/exp/428-mega.json b/public/images/pokemon/variant/exp/428-mega.json index 63d366c60ae..fce41eef1c9 100644 --- a/public/images/pokemon/variant/exp/428-mega.json +++ b/public/images/pokemon/variant/exp/428-mega.json @@ -7,8 +7,6 @@ "b47b4a": "ffcc99", "8b5a41": "cc8866", "624a41": "660a38", - "000000": "000000", - "ffffff": "ffffff", "ee5a4a": "bd7acc", "7b3941": "472866", "393736": "232533", @@ -22,8 +20,6 @@ "b47b4a": "8cd8ff", "8b5a41": "5b93cc", "624a41": "65597f", - "000000": "000000", - "ffffff": "ffffff", "ee5a4a": "ff884c", "7b3941": "990c00", "393736": "514766", diff --git a/public/images/pokemon/variant/exp/445-mega.json b/public/images/pokemon/variant/exp/445-mega.json index 8cd597252af..bd15564de20 100644 --- a/public/images/pokemon/variant/exp/445-mega.json +++ b/public/images/pokemon/variant/exp/445-mega.json @@ -1,6 +1,5 @@ { "0": { - "000000": "000000", "292952": "061638", "c59410": "3aadc5", "5a62ac": "236696", @@ -9,13 +8,9 @@ "ffd518": "42d6de", "5a1000": "502209", "e64a31": "f7ac34", - "bd3941": "9e5201", - "ffffff": "ffffff", - "737b83": "737b83", - "c5cdd5": "c5cdd5" + "bd3941": "9e5201" }, "1": { - "000000": "000000", "292952": "632f1b", "c59410": "255dd7", "5a62ac": "deae7a", @@ -24,13 +19,9 @@ "ffd518": "4caaff", "5a1000": "393648", "e64a31": "dce8e8", - "bd3941": "9fb6bf", - "ffffff": "ffffff", - "737b83": "737b83", - "c5cdd5": "c5cdd5" + "bd3941": "9fb6bf" }, "2": { - "000000": "000000", "292952": "051a2e", "c59410": "23b8a8", "5a62ac": "2f434b", @@ -39,9 +30,6 @@ "ffd518": "6fe6a3", "5a1000": "521000", "e64a31": "ec642c", - "bd3941": "b23219", - "ffffff": "ffffff", - "737b83": "737b83", - "c5cdd5": "c5cdd5" + "bd3941": "b23219" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/4562.json b/public/images/pokemon/variant/exp/4562.json index 66dc22274b9..a2c3bd41ea6 100644 --- a/public/images/pokemon/variant/exp/4562.json +++ b/public/images/pokemon/variant/exp/4562.json @@ -2,10 +2,8 @@ "1": { "313131": "145555", "525252": "257e6a", - "101010": "101010", "672b82": "7e173e", "ab38d1": "b0264c", - "371d3f": "371d3f", "6f5c6b": "743949", "c5b9bb": "c69981", "cb414b": "18265b", @@ -16,10 +14,8 @@ "2": { "313131": "69162c", "525252": "90222b", - "101010": "101010", "672b82": "57a0b9", "ab38d1": "c2ffe2", - "371d3f": "371d3f", "6f5c6b": "0a4340", "c5b9bb": "298a61", "cb414b": "ffad58", diff --git a/public/images/pokemon/variant/exp/531-mega.json b/public/images/pokemon/variant/exp/531-mega.json index 112b24311c4..068c2e81ea6 100644 --- a/public/images/pokemon/variant/exp/531-mega.json +++ b/public/images/pokemon/variant/exp/531-mega.json @@ -3,7 +3,6 @@ "80734d": "7c4b3b", "ffecb2": "fff6f0", "ccb87a": "d6bfb4", - "101010": "101010", "b35968": "6b0a46", "ffbfca": "f5a779", "737373": "6b0a46", @@ -17,7 +16,6 @@ "80734d": "09232a", "ffecb2": "4bb9a6", "ccb87a": "29878f", - "101010": "101010", "b35968": "111322", "ffbfca": "f6e3a8", "737373": "111322", diff --git a/public/images/pokemon/variant/exp/6100.json b/public/images/pokemon/variant/exp/6100.json index 3ad86ad3547..9d3afba665c 100644 --- a/public/images/pokemon/variant/exp/6100.json +++ b/public/images/pokemon/variant/exp/6100.json @@ -1,7 +1,6 @@ { "1": { "beaba7": "bfebee", - "101010": "101010", "ddccc8": "bfebee", "7c2506": "2e333b", "c04a1c": "4e6170", @@ -18,7 +17,6 @@ }, "2": { "beaba7": "ecd3c1", - "101010": "101010", "ddccc8": "ecd3c1", "7c2506": "5d0a26", "c04a1c": "72142b", diff --git a/public/images/pokemon/variant/exp/6101.json b/public/images/pokemon/variant/exp/6101.json index f1de6652e5e..716e2503c61 100644 --- a/public/images/pokemon/variant/exp/6101.json +++ b/public/images/pokemon/variant/exp/6101.json @@ -1,7 +1,6 @@ { "1": { "845c35": "373e4c", - "101010": "101010", "d9a866": "a5aab7", "f3d181": "c9cdd6", "a9763d": "838797", @@ -9,14 +8,10 @@ "c04a1c": "386583", "ec6f00": "69a6b4", "dc5d00": "4f879f", - "7c2506": "2e333b", - "ddccc8": "ddccc8", - "fefefe": "fefefe", - "6f625e": "6f625e" + "7c2506": "2e333b" }, "2": { "845c35": "231b20", - "101010": "101010", "d9a866": "452d35", "f3d181": "5e343c", "a9763d": "35262c", @@ -24,9 +19,6 @@ "c04a1c": "72142b", "ec6f00": "a62833", "dc5d00": "8f1b2c", - "7c2506": "4a061d", - "ddccc8": "ddccc8", - "fefefe": "fefefe", - "6f625e": "6f625e" + "7c2506": "4a061d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/6215.json b/public/images/pokemon/variant/exp/6215.json index 3198424563b..56ee351cd66 100644 --- a/public/images/pokemon/variant/exp/6215.json +++ b/public/images/pokemon/variant/exp/6215.json @@ -1,7 +1,6 @@ { "1": { "503678": "0f5d6d", - "080808": "080808", "514a80": "402010", "956cbe": "31dabb", "9c9bce": "ae8976", @@ -12,14 +11,10 @@ "ffde7b": "a7a7a7", "584d80": "562627", "28234b": "220d0a", - "c52973": "ea903f", - "bdbdc5": "bdbdc5", - "f6f6ff": "f6f6ff", - "000000": "000000" + "c52973": "ea903f" }, "2": { "503678": "601522", - "080808": "080808", "514a80": "14273a", "956cbe": "cc5427", "9c9bce": "3c8775", @@ -30,9 +25,6 @@ "ffde7b": "ffe07e", "584d80": "1c3942", "28234b": "0a191e", - "c52973": "f49633", - "bdbdc5": "bdbdc5", - "f6f6ff": "f6f6ff", - "000000": "000000" + "c52973": "f49633" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/653.json b/public/images/pokemon/variant/exp/653.json index be967d6c9c2..d603337fb8c 100644 --- a/public/images/pokemon/variant/exp/653.json +++ b/public/images/pokemon/variant/exp/653.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736028": "9f398a", "ffd659": "e190c3", "ccab47": "c35ba3", @@ -9,11 +8,9 @@ "b34724": "502c81", "737373": "68326b", "f8f8f8": "fbecff", - "bfbfbf": "c093c3", - "404040": "404040" + "bfbfbf": "c093c3" }, "2": { - "101010": "101010", "736028": "172547", "ffd659": "3a6a93", "ccab47": "264166", @@ -22,7 +19,6 @@ "b34724": "0aaa77", "737373": "75553c", "f8f8f8": "fff8ec", - "bfbfbf": "d4b996", - "404040": "404040" + "bfbfbf": "d4b996" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/654.json b/public/images/pokemon/variant/exp/654.json index 0f3b2bf3d4e..98273b9be27 100644 --- a/public/images/pokemon/variant/exp/654.json +++ b/public/images/pokemon/variant/exp/654.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736028": "061530", "ffd659": "b55390", "ccab47": "872b59", @@ -11,14 +10,11 @@ "737373": "5c255f", "bfbfbf": "c093c3", "804913": "c5b3ca", - "262626": "262626", - "404040": "404040", "f8cf52": "80f37b", "ffc000": "4fcb61", "ff8700": "207d4e" }, "2": { - "101010": "101010", "736028": "061530", "ffd659": "2b5f8a", "ccab47": "173864", @@ -29,8 +25,6 @@ "737373": "75553c", "bfbfbf": "d4b996", "804913": "098794", - "262626": "262626", - "404040": "404040", "f8cf52": "c858a4", "ffc000": "75308e", "ff8700": "521364" diff --git a/public/images/pokemon/variant/exp/6549.json b/public/images/pokemon/variant/exp/6549.json index 8ced2d845dc..821228094f7 100644 --- a/public/images/pokemon/variant/exp/6549.json +++ b/public/images/pokemon/variant/exp/6549.json @@ -3,24 +3,20 @@ "70365a": "29547d", "bd59a2": "5094c0", "315a31": "5a5a2c", - "101010": "101010", "39ac39": "bfd17f", "ff84bd": "73bad9", "bda452": "77909a", "4a834a": "8e954d", "ffbbdb": "b5ddea", - "fdfdfd": "fdfdfd", "ffde41": "b6c7cc", "526229": "80152b", "c5ee7b": "ef5755", - "9cb462": "bd2d40", - "cdc5bd": "cdc5bd" + "9cb462": "bd2d40" }, "2": { "70365a": "8a1a3c", "bd59a2": "d64065", "315a31": "643312", - "101010": "101010", "39ac39": "ebc460", "ff84bd": "e8617a", "bda452": "78412b", diff --git a/public/images/pokemon/variant/exp/655.json b/public/images/pokemon/variant/exp/655.json index 58830e08360..6ac4e8de6dc 100644 --- a/public/images/pokemon/variant/exp/655.json +++ b/public/images/pokemon/variant/exp/655.json @@ -1,7 +1,6 @@ { "1": { "7f5f1f": "331035", - "101010": "101010", "702010": "491679", "f8df5f": "e7caef", "ea541f": "ab6ce0", @@ -31,7 +30,6 @@ }, "2": { "7f5f1f": "75553c", - "101010": "101010", "702010": "005646", "f8df5f": "fff2dd", "ea541f": "21d170", diff --git a/public/images/pokemon/variant/exp/6570.json b/public/images/pokemon/variant/exp/6570.json index d54434d87b5..d7e2a1d6345 100644 --- a/public/images/pokemon/variant/exp/6570.json +++ b/public/images/pokemon/variant/exp/6570.json @@ -4,24 +4,19 @@ "d53a3e": "e8512a", "5f0002": "5d0019", "f07376": "ff6d26", - "101010": "101010", - "4a4d53": "4a4d53", "f7acae": "fdc9a2", "fafafa": "f3dac4", "b3b3bb": "d6b7b1", "cbcfd8": "7b7897", "6d4d62": "e1d2d3", "928d96": "303443", - "a7484f": "9e111f", - "df7806": "df7806", - "ffae1a": "ffae1a" + "a7484f": "9e111f" }, "2": { "942429": "09523d", "d53a3e": "1c7b4f", "5f0002": "033431", "f07376": "3cbc5f", - "101010": "101010", "4a4d53": "6f4332", "f7acae": "79d38d", "fafafa": "f0decd", diff --git a/public/images/pokemon/variant/exp/6571.json b/public/images/pokemon/variant/exp/6571.json index 8ea944f8a12..7d713d3174b 100644 --- a/public/images/pokemon/variant/exp/6571.json +++ b/public/images/pokemon/variant/exp/6571.json @@ -5,14 +5,10 @@ "fcfcfc": "e1d2d2", "dd5857": "782d41", "e79594": "b44d63", - "101010": "101010", - "ffffff": "ffffff", - "918b96": "918b96", "c03a52": "4a1921", "b77076": "883955", "3f3f3f": "262231", "c0b6bd": "c3a5a8", - "d0d1d0": "d0d1d0", "928c91": "4a4759", "5f475c": "d7b4b6", "bfc1bf": "737185", @@ -24,14 +20,11 @@ "fcfcfc": "f0decd", "dd5857": "2e625a", "e79594": "4e867b", - "101010": "101010", - "ffffff": "ffffff", "918b96": "885f49", "c03a52": "143130", "b77076": "2e625a", "3f3f3f": "4b163b", "c0b6bd": "c6ab99", - "d0d1d0": "d0d1d0", "928c91": "885f49", "5f475c": "c2589c", "bfc1bf": "bc9072", diff --git a/public/images/pokemon/variant/exp/664.json b/public/images/pokemon/variant/exp/664.json index bd4164ca7db..932e2399bb9 100644 --- a/public/images/pokemon/variant/exp/664.json +++ b/public/images/pokemon/variant/exp/664.json @@ -2,29 +2,23 @@ "1": { "4d4d4d": "9d6260", "f8f8f8": "ffffff", - "101010": "101010", "b3b3b3": "e9c7c4", "363636": "4c2855", "747474": "a97dbb", "4e4e4e": "895a9f", "9d7247": "838b53", "d1bf6b": "a0c896", - "b2b2b2": "b2b2b2", - "f7f7f7": "f7f7f7", "855d31": "626649" }, "2": { "4d4d4d": "590015", "f8f8f8": "c83e4c", - "101010": "101010", "b3b3b3": "a70d37", "363636": "05312f", "747474": "73bdae", "4e4e4e": "377772", "9d7247": "dda476", "d1bf6b": "ffe0ba", - "b2b2b2": "b2b2b2", - "f7f7f7": "f7f7f7", "855d31": "bf8961" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/665.json b/public/images/pokemon/variant/exp/665.json index 6d828dadb5d..ac2d2e6c336 100644 --- a/public/images/pokemon/variant/exp/665.json +++ b/public/images/pokemon/variant/exp/665.json @@ -6,8 +6,6 @@ "4e4e4e": "895a9f", "747474": "a97dbb", "bfbfbf": "b294be", - "101010": "101010", - "fdfdfd": "fdfdfd", "8c8c8c": "895a9f", "4d4d4d": "9c615f", "f8f8f8": "ffffff", @@ -23,8 +21,6 @@ "4e4e4e": "377772", "747474": "73bdae", "bfbfbf": "a70d37", - "101010": "101010", - "fdfdfd": "fdfdfd", "8c8c8c": "590015", "4d4d4d": "590015", "f8f8f8": "c83e4c", diff --git a/public/images/pokemon/variant/exp/666-archipelago.json b/public/images/pokemon/variant/exp/666-archipelago.json index a305fd9dd81..0a1b2b1d198 100644 --- a/public/images/pokemon/variant/exp/666-archipelago.json +++ b/public/images/pokemon/variant/exp/666-archipelago.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "c8373c": "c8373c", - "d2bf96": "d2bf96", - "30c171": "30c171", "303030": "402746", - "c27351": "c27351", "ceab62": "d9edd4", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "a2523b": "a2523b", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "b28e67": "b28e67" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "824719", - "c8373c": "c8373c", - "d2bf96": "d2bf96", - "30c171": "30c171", "303030": "642703", - "c27351": "c27351", "ceab62": "a22414", "675220": "741300", "504a4a": "741300", "707068": "a22414", - "a2523b": "a2523b", - "c3c3c3": "e7caa5", - "811c1c": "811c1c", - "b28e67": "b28e67" + "c3c3c3": "e7caa5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-continental.json b/public/images/pokemon/variant/exp/666-continental.json index 93ff5a5c5eb..44354f1180a 100644 --- a/public/images/pokemon/variant/exp/666-continental.json +++ b/public/images/pokemon/variant/exp/666-continental.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "d18257": "d18257", "303030": "402746", - "f9bd55": "f9bd55", - "f8f05e": "f8f05e", "ceab62": "d9edd4", - "d24c3e": "d24c3e", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "aa5844": "aa5844", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "e08528": "e08528" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "8f551e", - "d18257": "d18257", "303030": "6d2d0d", - "f9bd55": "f9bd55", - "f8f05e": "f8f05e", "ceab62": "e99b44", - "d24c3e": "d24c3e", "675220": "9c5c19", "504a4a": "9c5c19", "707068": "e99b44", - "aa5844": "aa5844", - "c3c3c3": "f8f27f", - "811c1c": "811c1c", - "e08528": "e08528" + "c3c3c3": "f8f27f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-elegant.json b/public/images/pokemon/variant/exp/666-elegant.json index 06de5005e5f..cbb3635ded6 100644 --- a/public/images/pokemon/variant/exp/666-elegant.json +++ b/public/images/pokemon/variant/exp/666-elegant.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "e6ddf8": "e6ddf8", - "f8de3f": "f8de3f", - "cf7ef3": "cf7ef3", "303030": "402746", - "875fb5": "875fb5", "ceab62": "d9edd4", - "de4040": "de4040", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "56479d": "56479d", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "612776", - "e6ddf8": "e6ddf8", - "f8de3f": "f8de3f", - "cf7ef3": "cf7ef3", "303030": "351262", - "875fb5": "875fb5", "ceab62": "a73fab", - "de4040": "de4040", "675220": "7d1083", "504a4a": "7d1083", "707068": "a73fab", - "56479d": "56479d", - "c3c3c3": "f0ecff", - "811c1c": "811c1c" + "c3c3c3": "f0ecff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-fancy.json b/public/images/pokemon/variant/exp/666-fancy.json index 1f31ac6983d..964324d96e5 100644 --- a/public/images/pokemon/variant/exp/666-fancy.json +++ b/public/images/pokemon/variant/exp/666-fancy.json @@ -1,38 +1,22 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "811c1c": "811c1c", - "de4040": "de4040", - "5faa3e": "5faa3e", - "ceab62": "d9edd4", - "b6d26d": "b6d26d", - "e9e052": "e9e052", - "cf7ef3": "cf7ef3", - "c3c3c3": "ffeaff", - "f2d4e3": "f2d4e3", - "ead2e3": "ffeaff" - }, - "2": { - "101010": "101010", - "303030": "00771b", - "675220": "b9c05a", - "504a4a": "b9c05a", - "595959": "6f9f42", - "707068": "e3e982", - "811c1c": "811c1c", - "de4040": "de4040", - "5faa3e": "5faa3e", - "ceab62": "e3e982", - "b6d26d": "b6d26d", - "e9e052": "e9e052", - "cf7ef3": "cf7ef3", - "c3c3c3": "fcf1ff", - "f2d4e3": "f2d4e3", - "ead2e3": "fcf1ff" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "c3c3c3": "ffeaff", + "ead2e3": "ffeaff" + }, + "2": { + "303030": "00771b", + "675220": "b9c05a", + "504a4a": "b9c05a", + "595959": "6f9f42", + "707068": "e3e982", + "ceab62": "e3e982", + "c3c3c3": "fcf1ff", + "ead2e3": "fcf1ff" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-garden.json b/public/images/pokemon/variant/exp/666-garden.json index 6493a613fd8..285d4a5beaf 100644 --- a/public/images/pokemon/variant/exp/666-garden.json +++ b/public/images/pokemon/variant/exp/666-garden.json @@ -1,34 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "398351": "398351", - "3dba96": "3dba96", "303030": "402746", "ceab62": "d9edd4", - "88d254": "88d254", "675220": "958c8a", - "de4040": "de4040", "504a4a": "7f6991", "707068": "a97cbc", - "3f919a": "3f919a", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "006b55", - "398351": "398351", - "3dba96": "3dba96", "303030": "044553", "ceab62": "227687", - "88d254": "88d254", "675220": "055160", - "de4040": "de4040", "504a4a": "055160", "707068": "227687", - "3f919a": "3f919a", - "c3c3c3": "72d0a3", - "811c1c": "811c1c" + "c3c3c3": "72d0a3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-high-plains.json b/public/images/pokemon/variant/exp/666-high-plains.json index f63bb4f81f3..a6600d1e6ac 100644 --- a/public/images/pokemon/variant/exp/666-high-plains.json +++ b/public/images/pokemon/variant/exp/666-high-plains.json @@ -1,38 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f3a861": "f3a861", "303030": "402746", - "9a5a3b": "9a5a3b", - "e1764e": "e1764e", - "aa4343": "aa4343", "ceab62": "d9edd4", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "337543": "337543", - "e8c815": "e8c815", - "773d21": "773d21" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "a55422", - "f3a861": "f3a861", "303030": "8f1d19", - "9a5a3b": "9a5a3b", - "e1764e": "e1764e", - "aa4343": "aa4343", "ceab62": "f2975a", "675220": "c97034", "504a4a": "c97034", "707068": "f2975a", - "c3c3c3": "edc67c", - "811c1c": "811c1c", - "337543": "337543", - "e8c815": "e8c815", - "773d21": "773d21" + "c3c3c3": "edc67c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-icy-snow.json b/public/images/pokemon/variant/exp/666-icy-snow.json index d69d48d89e9..244c47d1863 100644 --- a/public/images/pokemon/variant/exp/666-icy-snow.json +++ b/public/images/pokemon/variant/exp/666-icy-snow.json @@ -1,34 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f0f0f8": "f0f0f8", "303030": "402746", - "cfd9cf": "cfd9cf", - "c5c5da": "c5c5da", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "c3c3c3": "ffeaff", - "acacc2": "acacc2", - "95a1a1": "95a1a1", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "60646a", - "f0f0f8": "f0f0f8", "303030": "364051", - "cfd9cf": "cfd9cf", - "c5c5da": "c5c5da", "675220": "666b7d", "ceab62": "8c91a4", "707068": "8c91a4", "504a4a": "666b7d", - "c3c3c3": "fefeff", - "acacc2": "acacc2", - "95a1a1": "95a1a1", - "811c1c": "811c1c" + "c3c3c3": "fefeff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-jungle.json b/public/images/pokemon/variant/exp/666-jungle.json index 2961f2fa042..19c5f288eb3 100644 --- a/public/images/pokemon/variant/exp/666-jungle.json +++ b/public/images/pokemon/variant/exp/666-jungle.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "638c63": "638c63", - "7cc48b": "7cc48b", "303030": "402746", "ceab62": "d9edd4", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "567456": "567456", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "9a653e": "9a653e", - "c29566": "c29566", - "724e28": "724e28" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "285b3b", - "638c63": "638c63", - "7cc48b": "7cc48b", "303030": "20452e", "ceab62": "385c43", "675220": "153922", "504a4a": "153922", "707068": "385c43", - "567456": "567456", - "c3c3c3": "a9d9a0", - "811c1c": "811c1c", - "9a653e": "9a653e", - "c29566": "c29566", - "724e28": "724e28" + "c3c3c3": "a9d9a0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-marine.json b/public/images/pokemon/variant/exp/666-marine.json index 27efc6226d0..3e4f4254cd8 100644 --- a/public/images/pokemon/variant/exp/666-marine.json +++ b/public/images/pokemon/variant/exp/666-marine.json @@ -1,34 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "2f8dc9": "2f8dc9", - "5acdf1": "5acdf1", "303030": "402746", "ceab62": "d9edd4", "675220": "958c8a", - "f2f2f2": "f2f2f2", - "367cb9": "367cb9", "504a4a": "7f6991", "707068": "a97cbc", - "315382": "315382", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "2a5894", - "2f8dc9": "2f8dc9", - "5acdf1": "5acdf1", "303030": "16244f", "ceab62": "3070af", "675220": "264c85", - "f2f2f2": "f2f2f2", - "367cb9": "367cb9", "504a4a": "264c85", "707068": "3070af", - "315382": "315382", - "c3c3c3": "f2f2f2", - "811c1c": "811c1c" + "c3c3c3": "f2f2f2" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-meadow.json b/public/images/pokemon/variant/exp/666-meadow.json index c766325427b..c65040d31d9 100644 --- a/public/images/pokemon/variant/exp/666-meadow.json +++ b/public/images/pokemon/variant/exp/666-meadow.json @@ -1,36 +1,20 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "811c1c": "811c1c", - "b4295a": "b4295a", - "da6b7e": "da6b7e", - "ceab62": "d9edd4", - "e66fad": "e66fad", - "2d9b9b": "2d9b9b", - "f3a0ca": "f3a0ca", - "c3c3c3": "ffeaff", - "f2f2f2": "f2f2f2" - }, - "2": { - "101010": "101010", - "303030": "770921", - "675220": "a2275e", - "504a4a": "a2275e", - "595959": "9e3941", - "707068": "ce5283", - "811c1c": "811c1c", - "b4295a": "b4295a", - "da6b7e": "da6b7e", - "ceab62": "ce5283", - "e66fad": "e66fad", - "2d9b9b": "2d9b9b", - "f3a0ca": "f3a0ca", - "c3c3c3": "f4c2ec", - "f2f2f2": "f2f2f2" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "c3c3c3": "ffeaff" + }, + "2": { + "303030": "770921", + "675220": "a2275e", + "504a4a": "a2275e", + "595959": "9e3941", + "707068": "ce5283", + "ceab62": "ce5283", + "c3c3c3": "f4c2ec" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-modern.json b/public/images/pokemon/variant/exp/666-modern.json index 2cbd9aad858..cc873702571 100644 --- a/public/images/pokemon/variant/exp/666-modern.json +++ b/public/images/pokemon/variant/exp/666-modern.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", "c3c3c3": "ffeaff", - "3b6cbb": "3b6cbb", - "f44f4f": "f44f4f", "303030": "402746", "ceab62": "d9edd4", "675220": "958c8a", - "f8f05e": "f8f05e", "504a4a": "7f6991", - "707068": "a97cbc", - "b83c3c": "b83c3c", - "cfc5d9": "cfc5d9", - "811c1c": "811c1c", - "405793": "405793" + "707068": "a97cbc" }, "2": { - "101010": "101010", "595959": "830012", "c3c3c3": "ffeae8", - "3b6cbb": "3b6cbb", - "f44f4f": "f44f4f", "303030": "4e0000", "ceab62": "ad2640", "675220": "801521", - "f8f05e": "f8f05e", "504a4a": "801521", - "707068": "ad2640", - "b83c3c": "b83c3c", - "cfc5d9": "cfc5d9", - "811c1c": "811c1c", - "405793": "405793" + "707068": "ad2640" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-monsoon.json b/public/images/pokemon/variant/exp/666-monsoon.json index 915d471b2b1..5a127a43bbe 100644 --- a/public/images/pokemon/variant/exp/666-monsoon.json +++ b/public/images/pokemon/variant/exp/666-monsoon.json @@ -1,33 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "807676": "807676", - "ceab62": "d9edd4", - "5676de": "5676de", - "4eccd6": "4eccd6", - "989898": "989898", - "c3c3c3": "c3c3c3", - "f0f0f8": "f0f0f8" - }, - "2": { - "101010": "101010", - "303030": "3d3231", - "675220": "2c3593", - "504a4a": "2c3593", - "595959": "4f4645", - "707068": "5857bc", - "807676": "807676", - "ceab62": "5857bc", - "5676de": "5676de", - "4eccd6": "4eccd6", - "989898": "989898", - "92f4f4": "92f4f4", - "c3c3c3": "b8f9f9", - "f0f0f8": "f0f0f8" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "3d3231", + "675220": "2c3593", + "504a4a": "2c3593", + "595959": "4f4645", + "707068": "5857bc", + "ceab62": "5857bc", + "c3c3c3": "b8f9f9" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-ocean.json b/public/images/pokemon/variant/exp/666-ocean.json index c468bbcbf1e..4f7cd822f97 100644 --- a/public/images/pokemon/variant/exp/666-ocean.json +++ b/public/images/pokemon/variant/exp/666-ocean.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "e1384d": "e1384d", - "f3a861": "f3a861", - "fcf372": "fcf372", "303030": "402746", "ceab62": "d9edd4", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "f0ce44": "f0ce44", - "c3c3c3": "ffeaff", - "367cb9": "367cb9", - "74bbe9": "74bbe9", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "e99a26", - "e1384d": "e1384d", - "f3a861": "f3a861", - "fcf372": "fcf372", "303030": "b54908", "ceab62": "ea8742", "675220": "bc601c", "504a4a": "bc601c", "707068": "ea8742", - "f0ce44": "f0ce44", - "c3c3c3": "f3c86b", - "367cb9": "367cb9", - "74bbe9": "74bbe9", - "811c1c": "811c1c" + "c3c3c3": "f3c86b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-poke-ball.json b/public/images/pokemon/variant/exp/666-poke-ball.json index fe6b42f6ef3..048cb75ecfd 100644 --- a/public/images/pokemon/variant/exp/666-poke-ball.json +++ b/public/images/pokemon/variant/exp/666-poke-ball.json @@ -1,33 +1,23 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "b72c2c": "b72c2c", - "dc4b4b": "dc4b4b", "303030": "402746", "675220": "958c8a", "ceab62": "d9edd4", - "e97e7e": "e97e7e", - "971d1d": "971d1d", - "f8f8f8": "f8f8f8", "707068": "a97cbc", "504a4a": "7f6991", "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "a9a99e": "a9a99e", "2c2b2b": "402746" }, "2": { - "101010": "101010", "f8f8f8": "00006d", "303030": "ae001a", "2c2b2b": "660000", - "504a4a": "a70038", + "504a4a": "a70038", "595959": "df0036", "c3c3c3": "f0a6bf", "707068": "d5375a", "a9a99e": "000050", - "811c1c": "811c1c", "971d1d": "040046", "b72c2c": "00005e", "dc4b4b": "19007d", diff --git a/public/images/pokemon/variant/exp/666-polar.json b/public/images/pokemon/variant/exp/666-polar.json index 625bfe0f292..0667b5de09c 100644 --- a/public/images/pokemon/variant/exp/666-polar.json +++ b/public/images/pokemon/variant/exp/666-polar.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "4d6cc1": "4d6cc1", "303030": "402746", - "f0f0f8": "f0f0f8", - "3b4b8a": "3b4b8a", "ceab62": "d9edd4", - "bfbfbf": "bfbfbf", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "c3c3c3": "ffeaff", - "2d2d61": "2d2d61", - "811c1c": "811c1c", - "6aa2dc": "6aa2dc" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "2f3887", - "4d6cc1": "4d6cc1", "303030": "191b54", - "f0f0f8": "f0f0f8", - "3b4b8a": "3b4b8a", "ceab62": "5f85c1", - "bfbfbf": "bfbfbf", "675220": "366098", "504a4a": "366098", "707068": "5f85c1", - "c3c3c3": "ffffff", - "2d2d61": "2d2d61", - "811c1c": "811c1c", - "6aa2dc": "6aa2dc" + "c3c3c3": "ffffff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-river.json b/public/images/pokemon/variant/exp/666-river.json index c7e5e288d05..5ba0084df9d 100644 --- a/public/images/pokemon/variant/exp/666-river.json +++ b/public/images/pokemon/variant/exp/666-river.json @@ -1,40 +1,18 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "4a412c": "4a412c", - "675220": "958c8a", - "634d20": "634d20", - "1d726a": "1d726a", - "504a4a": "7f6991", - "595959": "724b7a", - "625841": "625841", - "707068": "a97cbc", - "bc813f": "bc813f", - "9c9143": "9c9143", - "ceab62": "ceab62", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "c3c3c3": "c3c3c3", - "d2a862": "d9edd4" - }, - "2": { - "101010": "101010", - "303030": "7b2800", - "4a412c": "4a412c", - "675220": "ae7f41", - "634d20": "634d20", - "1d726a": "1d726a", - "504a4a": "ae7f41", - "595959": "8a5702", - "625841": "625841", - "707068": "d9a666", - "bc813f": "bc813f", - "9c9143": "9c9143", - "ceab62": "ceab62", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "c3c3c3": "e3c384", - "d2a862": "d2a862" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "d2a862": "d9edd4" + }, + "2": { + "303030": "7b2800", + "675220": "ae7f41", + "504a4a": "ae7f41", + "595959": "8a5702", + "707068": "d9a666", + "c3c3c3": "e3c384" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-sandstorm.json b/public/images/pokemon/variant/exp/666-sandstorm.json index 3a50d436a19..5f16f97ed58 100644 --- a/public/images/pokemon/variant/exp/666-sandstorm.json +++ b/public/images/pokemon/variant/exp/666-sandstorm.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f1d69e": "f1d69e", "303030": "402746", - "625843": "625843", - "ba8d68": "ba8d68", - "9b9148": "9b9148", "ceab62": "d9edd4", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "d9b674": "d9b674", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "72604d": "72604d" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "88583e", - "f1d69e": "f1d69e", "303030": "443123", - "625843": "625843", - "ba8d68": "ba8d68", - "9b9148": "9b9148", "ceab62": "c6975f", "675220": "9c703b", "504a4a": "9c703b", "707068": "c6975f", - "d9b674": "d9b674", - "c3c3c3": "ece1a9", - "811c1c": "811c1c", - "72604d": "72604d" + "c3c3c3": "ece1a9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-savanna.json b/public/images/pokemon/variant/exp/666-savanna.json index c42595ae8c2..12dddd4ec8d 100644 --- a/public/images/pokemon/variant/exp/666-savanna.json +++ b/public/images/pokemon/variant/exp/666-savanna.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "61a0f5": "61a0f5", - "fffd77": "fffd77", "303030": "402746", - "55d3d9": "55d3d9", "ceab62": "d9edd4", "675220": "958c8a", - "dcc433": "dcc433", "504a4a": "7f6991", "707068": "a97cbc", - "3b67ac": "3b67ac", - "6cc6c6": "6cc6c6", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "4168bb", - "61a0f5": "61a0f5", - "fffd77": "fffd77", "303030": "183576", - "55d3d9": "55d3d9", "ceab62": "4faab3", "675220": "1d828b", - "dcc433": "dcc433", "504a4a": "1d828b", "707068": "4faab3", - "3b67ac": "3b67ac", - "6cc6c6": "6cc6c6", - "c3c3c3": "81e7e1", - "811c1c": "811c1c" + "c3c3c3": "81e7e1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-sun.json b/public/images/pokemon/variant/exp/666-sun.json index 584b6231a7f..d4297619bb3 100644 --- a/public/images/pokemon/variant/exp/666-sun.json +++ b/public/images/pokemon/variant/exp/666-sun.json @@ -1,36 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "f1a26a": "f1a26a", "303030": "402746", - "f47491": "f47491", - "fcf372": "fcf372", - "f0ce44": "f0ce44", "ceab62": "d9edd4", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "c94971": "c94971", - "e18248": "e18248", - "c3c3c3": "ffeaff", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "750500", - "f1a26a": "f1a26a", "303030": "640000", - "f47491": "f47491", - "fcf372": "fcf372", - "f0ce44": "f0ce44", "ceab62": "b83b74", "675220": "8c1850", "504a4a": "8c1850", "707068": "b83b74", - "c94971": "c94971", - "e18248": "e18248", - "c3c3c3": "fee3e7", - "811c1c": "811c1c" + "c3c3c3": "fee3e7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/666-tundra.json b/public/images/pokemon/variant/exp/666-tundra.json index a2cd2299c3a..f64ca7b164b 100644 --- a/public/images/pokemon/variant/exp/666-tundra.json +++ b/public/images/pokemon/variant/exp/666-tundra.json @@ -1,34 +1,20 @@ { "1": { - "101010": "101010", "595959": "724b7a", - "a3def1": "a3def1", "303030": "402746", - "f0f0f8": "f0f0f8", - "74bbe9": "74bbe9", "ceab62": "d9edd4", - "d0d0d0": "d0d0d0", "675220": "958c8a", "504a4a": "7f6991", "707068": "a97cbc", - "c3c3c3": "ffeaff", - "539ad9": "539ad9", - "811c1c": "811c1c" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "225b72", - "a3def1": "a3def1", "303030": "003d69", - "f0f0f8": "f0f0f8", - "74bbe9": "74bbe9", "ceab62": "659dd0", - "d0d0d0": "d0d0d0", "675220": "3a76a7", "504a4a": "3a76a7", "707068": "659dd0", - "c3c3c3": "cbfbfb", - "539ad9": "539ad9", - "811c1c": "811c1c" + "c3c3c3": "cbfbfb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/669-blue.json b/public/images/pokemon/variant/exp/669-blue.json index 7b79007d9e8..59f7d036e0c 100644 --- a/public/images/pokemon/variant/exp/669-blue.json +++ b/public/images/pokemon/variant/exp/669-blue.json @@ -1,12 +1,10 @@ { "1": { "706050": "635c55", - "f8f7f9": "f8f7f9", "7f6f1f": "1b0755", "cfbfaf": "d5cabf", "cfae4f": "350d80", "faef69": "422cc6", - "101010": "101010", "df4f4f": "dc6295", "ef6f6f": "ef6fbe", "1d563a": "95315a", @@ -26,7 +24,6 @@ "cfbfaf": "a5c3ea", "cfae4f": "c4c6bf", "faef69": "fdfffb", - "101010": "101010", "df4f4f": "048080", "ef6f6f": "5fa9dd", "1d563a": "193b94", diff --git a/public/images/pokemon/variant/exp/669-white.json b/public/images/pokemon/variant/exp/669-white.json index 43bea313995..a5e4ba2c84d 100644 --- a/public/images/pokemon/variant/exp/669-white.json +++ b/public/images/pokemon/variant/exp/669-white.json @@ -1,12 +1,10 @@ { "1": { "706050": "635c55", - "f8f7f9": "f8f7f9", "7f6f1f": "110732", "cfbfaf": "d5cabf", "cfae4f": "302b40", "faef69": "4c495c", - "101010": "101010", "df4f4f": "dc6295", "ef6f6f": "ef6fbe", "1d563a": "95315a", @@ -25,7 +23,6 @@ "cfbfaf": "d4dcd5", "cfae4f": "c4c6bf", "faef69": "fdfffb", - "101010": "101010", "df4f4f": "273232", "ef6f6f": "7e878d", "1d563a": "272f2d", diff --git a/public/images/pokemon/variant/exp/669-yellow.json b/public/images/pokemon/variant/exp/669-yellow.json index 232013c6f88..31f1a7761a6 100644 --- a/public/images/pokemon/variant/exp/669-yellow.json +++ b/public/images/pokemon/variant/exp/669-yellow.json @@ -1,12 +1,10 @@ { "1": { "706050": "635c55", - "f8f7f9": "f8f7f9", "7f6f1f": "034020", "cfbfaf": "d5cabf", "cfae4f": "0a6323", "faef69": "1a8e16", - "101010": "101010", "df4f4f": "dc6295", "ef6f6f": "ef6fbe", "1d563a": "95315a", @@ -26,7 +24,6 @@ "cfbfaf": "ead295", "cfae4f": "c4c6bf", "faef69": "fdfffb", - "101010": "101010", "df4f4f": "bf8f10", "ef6f6f": "d7a34e", "1d563a": "945919", diff --git a/public/images/pokemon/variant/exp/670-blue.json b/public/images/pokemon/variant/exp/670-blue.json index 58db57808f3..52532dedd99 100644 --- a/public/images/pokemon/variant/exp/670-blue.json +++ b/public/images/pokemon/variant/exp/670-blue.json @@ -5,7 +5,6 @@ "857402": "240e63", "3c9bcb": "3342b8", "f0eb57": "402bbf", - "231e1e": "231e1e", "dcd405": "33168e", "10765d": "094740", "86b24d": "1d8057", @@ -13,17 +12,10 @@ "107359": "d9567f", "52ab5d": "e493a1", "0f5436": "ae2d63", - "879496": "879496", - "f5f7fa": "f5f7fa", - "cecee6": "cecee6", "74660f": "110732", "c0ba4b": "33168e", "b3ae28": "33168e", - "475148": "475148", - "201d1d": "73141e", - "9b93c4": "9b93c4", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "201d1d": "73141e" }, "2": { "286786": "215510", @@ -31,7 +23,6 @@ "857402": "b1b1b1", "3c9bcb": "739f1f", "f0eb57": "f8f8f4", - "231e1e": "231e1e", "dcd405": "dcdad8", "10765d": "121c0d", "86b24d": "3c403a", @@ -45,10 +36,7 @@ "74660f": "b1b1b1", "c0ba4b": "dcdad8", "b3ae28": "dcdad8", - "475148": "475148", "201d1d": "0f5741", - "9b93c4": "6195d9", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "9b93c4": "6195d9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/670-orange.json b/public/images/pokemon/variant/exp/670-orange.json index d48c0b4e5d6..88befdd6af3 100644 --- a/public/images/pokemon/variant/exp/670-orange.json +++ b/public/images/pokemon/variant/exp/670-orange.json @@ -5,7 +5,6 @@ "857402": "5c0d0d", "c6763c": "aa571d", "f0eb57": "a3382c", - "231e1e": "231e1e", "dcd405": "871723", "10765d": "094740", "86b24d": "1d8057", @@ -13,17 +12,10 @@ "107359": "d9567f", "52ab5d": "e493a1", "0f5436": "ae2d63", - "879496": "879496", - "f5f7fa": "f5f7fa", - "cecee6": "cecee6", "74660f": "5c0d0d", "c0ba4b": "871723", "b3ae28": "871723", - "475148": "475148", - "211d1d": "73141e", - "9b93c4": "9b93c4", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "211d1d": "73141e" }, "2": { "a24b1e": "215510", @@ -31,7 +23,6 @@ "857402": "b1b1b1", "c6763c": "739f1f", "f0eb57": "f8f8f4", - "231e1e": "231e1e", "dcd405": "dcdad8", "10765d": "121c0d", "86b24d": "3c403a", @@ -45,10 +36,7 @@ "74660f": "b1b1b1", "c0ba4b": "dcdad8", "b3ae28": "dcdad8", - "475148": "475148", "211d1d": "0f5741", - "9b93c4": "d78876", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "9b93c4": "d78876" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/670-red.json b/public/images/pokemon/variant/exp/670-red.json index 6ce51d9440a..d80b5620fbd 100644 --- a/public/images/pokemon/variant/exp/670-red.json +++ b/public/images/pokemon/variant/exp/670-red.json @@ -5,7 +5,6 @@ "857402": "3e0547", "972935": "a31f35", "f0eb57": "8e1653", - "231e1e": "231e1e", "dcd405": "6a094f", "10765d": "094740", "86b24d": "1d8057", @@ -13,17 +12,10 @@ "107359": "d9567f", "52ab5d": "e493a1", "0f5436": "ae2d63", - "879496": "879496", - "f5f7fa": "f5f7fa", - "cecee6": "cecee6", "74660f": "3e0547", "c0ba4b": "6a094f", "b3ae28": "6a094f", - "475148": "475148", - "211d1d": "73141e", - "9b93c4": "9b93c4", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "211d1d": "73141e" }, "2": { "6d1b24": "215510", @@ -31,7 +23,6 @@ "857402": "b1b1b1", "972935": "739f1f", "f0eb57": "f8f8f4", - "231e1e": "231e1e", "dcd405": "dcdad8", "10765d": "121c0d", "86b24d": "3c403a", @@ -45,10 +36,7 @@ "74660f": "b1b1b1", "c0ba4b": "dcdad8", "b3ae28": "dcdad8", - "475148": "475148", "211d1d": "0f5741", - "9b93c4": "cc6283", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "9b93c4": "cc6283" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/670-white.json b/public/images/pokemon/variant/exp/670-white.json index 8b2f572a523..f963a586166 100644 --- a/public/images/pokemon/variant/exp/670-white.json +++ b/public/images/pokemon/variant/exp/670-white.json @@ -5,7 +5,6 @@ "857402": "110732", "d8d8d8": "4c4b55", "f0eb57": "3b374e", - "231e1e": "231e1e", "dcd405": "2c2347", "10765d": "094740", "86b24d": "1d8057", @@ -13,17 +12,10 @@ "107359": "d9567f", "52ab5d": "e493a1", "0f5436": "ae2d63", - "879496": "879496", - "f5f7fa": "f5f7fa", - "cecee6": "cecee6", "74660f": "110732", "c0ba4b": "2c2347", "b3ae28": "2c2347", - "475148": "475148", - "211d1d": "73141e", - "9b93c4": "9b93c4", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "211d1d": "73141e" }, "2": { "868686": "215510", @@ -31,7 +23,6 @@ "857402": "b1b1b1", "d8d8d8": "739f1f", "f0eb57": "f8f8f4", - "231e1e": "231e1e", "dcd405": "dcdad8", "10765d": "121c0d", "86b24d": "3c403a", @@ -39,16 +30,11 @@ "107359": "505756", "52ab5d": "6d716f", "0f5436": "1c2d32", - "879496": "879496", - "f5f7fa": "f5f7fa", "cecee6": "e3e3eb", "74660f": "b1b1b1", "c0ba4b": "dcdad8", "b3ae28": "dcdad8", - "475148": "475148", "211d1d": "0f5741", - "9b93c4": "bfbfc9", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "9b93c4": "bfbfc9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/670-yellow.json b/public/images/pokemon/variant/exp/670-yellow.json index ac7dc7ebe6c..24b67d62070 100644 --- a/public/images/pokemon/variant/exp/670-yellow.json +++ b/public/images/pokemon/variant/exp/670-yellow.json @@ -5,7 +5,6 @@ "857402": "06471f", "d8cb40": "6f950a", "f0eb57": "1a8021", - "231e1e": "231e1e", "dcd405": "0b5c19", "10765d": "094740", "86b24d": "1d8057", @@ -13,17 +12,10 @@ "107359": "d9567f", "52ab5d": "e493a1", "0f5436": "ae2d63", - "879496": "879496", - "f5f7fa": "f5f7fa", - "cecee6": "cecee6", "74660f": "06471f", "c0ba4b": "0b5c19", "b3ae28": "0b5c19", - "475148": "475148", - "211d1d": "73141e", - "9b93c4": "9b93c4", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "211d1d": "73141e" }, "2": { "857c28": "215510", @@ -31,7 +23,6 @@ "857402": "b1b1b1", "d8cb40": "739f1f", "f0eb57": "f8f8f4", - "231e1e": "231e1e", "dcd405": "dcdad8", "10765d": "121c0d", "86b24d": "3c403a", @@ -45,10 +36,7 @@ "74660f": "b1b1b1", "c0ba4b": "dcdad8", "b3ae28": "dcdad8", - "475148": "475148", "211d1d": "0f5741", - "9b93c4": "c6a46d", - "9e2d39": "9e2d39", - "dc494d": "dc494d" + "9b93c4": "c6a46d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/6705.json b/public/images/pokemon/variant/exp/6705.json index 3d204b151ce..a248a3df404 100644 --- a/public/images/pokemon/variant/exp/6705.json +++ b/public/images/pokemon/variant/exp/6705.json @@ -6,15 +6,13 @@ "4d454d": "8a2166", "367456": "197497", "50ab89": "3aa8c4", - "101010": "101010", "60606c": "1f1233", "c5cce0": "513981", "949aab": "301848", "aeb5c6": "442967", "b8a1e5": "c7a1e5", "e3e8f4": "cfd6f7", - "665980": "8b69c3", - "8f7db3": "8f7db3" + "665980": "8b69c3" }, "2": { "807380": "2b736f", @@ -23,7 +21,6 @@ "4d454d": "194f51", "367456": "a34205", "50ab89": "d27e26", - "101010": "101010", "60606c": "042329", "c5cce0": "176463", "949aab": "073338", diff --git a/public/images/pokemon/variant/exp/671-blue.json b/public/images/pokemon/variant/exp/671-blue.json index 1da5b13b301..c335dd2b5ed 100644 --- a/public/images/pokemon/variant/exp/671-blue.json +++ b/public/images/pokemon/variant/exp/671-blue.json @@ -1,7 +1,6 @@ { "1": { "4c7385": "200e5c", - "141214": "141214", "7fc9c9": "291371", "abf2f2": "3827a3", "dcfafa": "69c9e3", @@ -12,16 +11,11 @@ "dba86b": "ff3e3e", "3ca68c": "ff91a4", "2c826c": "dc5073", - "5c5a5c": "5c5a5c", "fcfafc": "f8f8f8", - "bcbebc": "bcbebc", - "141614": "141614", "144234": "951f43", "2c7664": "c6306e", - "242624": "242624", "34866c": "dc4c5b", "2c866c": "d53b6a", - "34967c": "ea5574", - "1c1e1c": "1c1e1c" + "34967c": "ea5574" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/671-orange.json b/public/images/pokemon/variant/exp/671-orange.json index b164a67d444..7cc7d14fe6b 100644 --- a/public/images/pokemon/variant/exp/671-orange.json +++ b/public/images/pokemon/variant/exp/671-orange.json @@ -1,7 +1,6 @@ { "1": { "785a44": "631818", - "141214": "141214", "d2ab84": "631818", "fbd5ad": "a34b2c", "f9eadb": "ffbc77", @@ -12,16 +11,11 @@ "c077a0": "fff35a", "3ca68c": "ff91a4", "2c826c": "dc5073", - "5c5a5c": "5c5a5c", "fcfafc": "f8f8f8", - "bcbebc": "bcbebc", - "141614": "141614", "144234": "951f43", "2c7664": "c6306e", - "242624": "242624", "34866c": "dc4c5b", "2c866c": "d53b6a", - "34967c": "ea5574", - "1c1e1c": "1c1e1c" + "34967c": "ea5574" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/671-red.json b/public/images/pokemon/variant/exp/671-red.json index b45ae4f5a2a..9a7d9c36100 100644 --- a/public/images/pokemon/variant/exp/671-red.json +++ b/public/images/pokemon/variant/exp/671-red.json @@ -1,7 +1,6 @@ { "1": { "643e5c": "390614", - "141214": "141214", "a4628c": "4e0c38", "dc96c4": "8e1a55", "dc9ac4": "8e1a55", @@ -14,16 +13,11 @@ "fce24c": "ff7c39", "3ca68c": "ff91a4", "2c826c": "dc5073", - "5c5a5c": "5c5a5c", "fcfafc": "f8f8f8", - "bcbebc": "bcbebc", - "141614": "141614", "144234": "951f43", "2c7664": "c6306e", - "242624": "242624", "34866c": "dc4c5b", "2c866c": "d53b6a", - "34967c": "ea5574", - "1c1e1c": "1c1e1c" + "34967c": "ea5574" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/671-white.json b/public/images/pokemon/variant/exp/671-white.json index 5e46ac97606..fe867762b79 100644 --- a/public/images/pokemon/variant/exp/671-white.json +++ b/public/images/pokemon/variant/exp/671-white.json @@ -1,7 +1,6 @@ { "1": { "858585": "232323", - "141214": "141214", "b6b3b4": "0f0d15", "f3f3f3": "353340", "f9bdc8": "c2c1c6", @@ -11,16 +10,11 @@ "66dede": "ffffff", "3ca68c": "ff91a4", "2c826c": "dc5073", - "5c5a5c": "5c5a5c", "fcfafc": "f8f8f8", - "bcbebc": "bcbebc", - "141614": "141614", "144234": "951f43", "2c7664": "c6306e", - "242624": "242624", "34866c": "dc4c5b", "2c866c": "d53b6a", - "34967c": "ea5574", - "1c1e1c": "1c1e1c" + "34967c": "ea5574" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/671-yellow.json b/public/images/pokemon/variant/exp/671-yellow.json index fae27d650ae..2523db33de1 100644 --- a/public/images/pokemon/variant/exp/671-yellow.json +++ b/public/images/pokemon/variant/exp/671-yellow.json @@ -1,7 +1,6 @@ { "1": { "75714f": "084e40", - "141214": "141214", "d2b98b": "137849", "ffeac0": "22b14a", "fbcfa3": "ffe593", @@ -12,21 +11,15 @@ "a6bd3d": "5f30ff", "3ca68c": "ff91a4", "2c826c": "dc5073", - "5c5a5c": "5c5a5c", "fcfafc": "f8f8f8", - "bcbebc": "bcbebc", - "141614": "141614", "144234": "951f43", "2c7664": "c6306e", - "242624": "242624", "34866c": "dc4c5b", "2c866c": "d53b6a", - "34967c": "ea5574", - "1c1e1c": "1c1e1c" + "34967c": "ea5574" }, "2": { "75714f": "0a320e", - "141214": "141214", "d2b98b": "28392c", "ffeac0": "4d4e46", "fbcfa3": "dfe3e1", @@ -40,13 +33,10 @@ "5c5a5c": "4e3e23", "fcfafc": "fffde0", "bcbebc": "d4c18f", - "141614": "141614", "144234": "951f43", "2c7664": "b18018", - "242624": "242624", "34866c": "dc4c5b", "2c866c": "d53b6a", - "34967c": "ea5574", - "1c1e1c": "1c1e1c" + "34967c": "ea5574" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/6713.json b/public/images/pokemon/variant/exp/6713.json index 662fbf6b5b1..044b2e45f3a 100644 --- a/public/images/pokemon/variant/exp/6713.json +++ b/public/images/pokemon/variant/exp/6713.json @@ -6,7 +6,6 @@ "6b5442": "732334", "335980": "994255", "fbffff": "ffebf2", - "101010": "101010", "492d25": "101010", "553e33": "4c131f", "927863": "994255", @@ -23,7 +22,6 @@ "6b5442": "2c7a75", "335980": "824628", "fbffff": "fff2ad", - "101010": "101010", "492d25": "00403d", "553e33": "006761", "927863": "5ba6a1", diff --git a/public/images/pokemon/variant/exp/672.json b/public/images/pokemon/variant/exp/672.json index b13a8cd34c0..c4e6dd98661 100644 --- a/public/images/pokemon/variant/exp/672.json +++ b/public/images/pokemon/variant/exp/672.json @@ -1,7 +1,6 @@ { "1": { "3d3128": "642509", - "000000": "000000", "67615b": "9e2c3d", "615140": "89431b", "7e6d5a": "b3743e", @@ -11,14 +10,12 @@ "0e5d58": "8c6859", "0d8374": "d2af94", "09a77c": "f8f0e2", - "cabfbb": "cabfbb", "c16a3f": "321512", "a8905c": "4b2525", "c6b379": "552d30" }, "2": { "3d3128": "161526", - "000000": "000000", "67615b": "2d2b40", "615140": "4c7a68", "7e6d5a": "72b692", @@ -28,7 +25,6 @@ "0e5d58": "363e6c", "0d8374": "6885b6", "09a77c": "96d5e3", - "cabfbb": "cabfbb", "c16a3f": "612c6b", "a8905c": "854d87", "c6b379": "9f5f9b" diff --git a/public/images/pokemon/variant/exp/673.json b/public/images/pokemon/variant/exp/673.json index d70da2c45e2..f9c2207744d 100644 --- a/public/images/pokemon/variant/exp/673.json +++ b/public/images/pokemon/variant/exp/673.json @@ -3,7 +3,6 @@ "3d3128": "641028", "67615b": "9e2c3d", "554538": "781329", - "000000": "000000", "0e5d58": "8c6859", "0d835a": "d2af94", "74593a": "61240a", @@ -12,7 +11,6 @@ "cabfbb": "e3a378", "a8905c": "9e4e21", "c16a3f": "552d30", - "0d8374": "0d8374", "c6b379": "ce8648", "ae492a": "321512" }, @@ -20,7 +18,6 @@ "3d3128": "121123", "67615b": "201e33", "554538": "201e33", - "000000": "000000", "0e5d58": "36466c", "0d835a": "6893b6", "74593a": "513a6b", @@ -29,7 +26,6 @@ "cabfbb": "d4b3d7", "a8905c": "74a0a5", "c16a3f": "9f5f9b", - "0d8374": "0d8374", "c6b379": "c3e1cf", "ae492a": "612c6b" } diff --git a/public/images/pokemon/variant/exp/677.json b/public/images/pokemon/variant/exp/677.json index b532dd61c77..ee852b93210 100644 --- a/public/images/pokemon/variant/exp/677.json +++ b/public/images/pokemon/variant/exp/677.json @@ -6,10 +6,8 @@ "8a8a99": "943b5d", "f8f8f8": "f1f0e4", "cda4cd": "43adaf", - "ffffff": "ffffff", "3c6172": "30237a", - "995a99": "29767f", - "070707": "070707" + "995a99": "29767f" }, "2": { "5a5a65": "243e41", @@ -18,9 +16,7 @@ "8a8a99": "426b62", "f8f8f8": "67415e", "cda4cd": "ff657d", - "ffffff": "ffffff", "3c6172": "69004e", - "995a99": "d13955", - "070707": "070707" + "995a99": "d13955" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/678-female.json b/public/images/pokemon/variant/exp/678-female.json index cf5423c1547..df4f7b5c038 100644 --- a/public/images/pokemon/variant/exp/678-female.json +++ b/public/images/pokemon/variant/exp/678-female.json @@ -6,9 +6,7 @@ "17294d": "47182e", "365fb3": "a5346b", "264480": "76264d", - "101010": "101010", "ffe54f": "3fbae2", - "ffffff": "ffffff", "d92121": "415493", "c9ad20": "4b86bd" }, @@ -19,9 +17,7 @@ "17294d": "1d3f33", "365fb3": "7bd38d", "264480": "47946c", - "101010": "101010", "ffe54f": "ff85ad", - "ffffff": "ffffff", "d92121": "9d0067", "c9ad20": "f2557b" } diff --git a/public/images/pokemon/variant/exp/678.json b/public/images/pokemon/variant/exp/678.json index 972a970a59c..d113058455a 100644 --- a/public/images/pokemon/variant/exp/678.json +++ b/public/images/pokemon/variant/exp/678.json @@ -4,23 +4,18 @@ "f8f8f8": "f8f5cd", "bfbfbf": "d5c49f", "17294d": "47182e", - "101010": "101010", "365fb3": "a5346b", "264480": "76264d", - "aaf2f2": "aaf2f2", - "179958": "415493", - "ffffff": "ffffff" + "179958": "415493" }, "2": { "737373": "3a1633", "f8f8f8": "855577", "bfbfbf": "613d5a", "17294d": "1d3f33", - "101010": "101010", "365fb3": "7bd38d", "264480": "47946c", "aaf2f2": "ff867c", - "179958": "9a0066", - "ffffff": "ffffff" + "179958": "9a0066" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/691.json b/public/images/pokemon/variant/exp/691.json index 71b08e6aea7..8c9aa3d7b71 100644 --- a/public/images/pokemon/variant/exp/691.json +++ b/public/images/pokemon/variant/exp/691.json @@ -2,7 +2,6 @@ "1": { "4d4d2e": "31246d", "b3b36b": "403c94", - "101010": "101010", "732230": "310511", "f24965": "5a152f", "b3364a": "470b1e", diff --git a/public/images/pokemon/variant/exp/696.json b/public/images/pokemon/variant/exp/696.json index 677f5d98578..364de98fb15 100644 --- a/public/images/pokemon/variant/exp/696.json +++ b/public/images/pokemon/variant/exp/696.json @@ -1,51 +1,33 @@ { "1": { -"734517": "5e0b0b", -"ffa64c": "a50d0d", -"4a322c": "023425", -"404040": "4c3216", -"101010": "101010", -"65483a": "0b4c29", -"966858": "1b6430", -"f8f8f8": "dfdea7", -"8c8c8c": "ad8c63", -"bfbfbf": "cbbe8c", -"000000": "000000", -"b73b6b": "4c3216", -"ff949e": "c98c68", -"b3b9b9": "cbbe8c", -"3f3d3d": "4c3216" -}, -"2": { -"734517": "395cb7", -"ffa64c": "d2e9ff", -"4a322c": "3e1f18", -"404040": "250860", -"101010": "101010", -"65483a": "644943", -"966858": "83726e", -"f8f8f8": "6e46a7", -"8c8c8c": "411684", -"bfbfbf": "593097", -"000000": "decaff", -"b73b6b": "395cb7", -"ff949e": "79c8d3", -"b3b9b9": "79c8d3", -"3f3d3d": "395cb7" -} -} - - - - - - - - - - - - - - - + "734517": "5e0b0b", + "ffa64c": "a50d0d", + "4a322c": "023425", + "404040": "4c3216", + "65483a": "0b4c29", + "966858": "1b6430", + "f8f8f8": "dfdea7", + "8c8c8c": "ad8c63", + "bfbfbf": "cbbe8c", + "b73b6b": "4c3216", + "ff949e": "c98c68", + "b3b9b9": "cbbe8c", + "3f3d3d": "4c3216" + }, + "2": { + "734517": "395cb7", + "ffa64c": "d2e9ff", + "4a322c": "3e1f18", + "404040": "250860", + "65483a": "644943", + "966858": "83726e", + "f8f8f8": "6e46a7", + "8c8c8c": "411684", + "bfbfbf": "593097", + "000000": "decaff", + "b73b6b": "395cb7", + "ff949e": "79c8d3", + "b3b9b9": "79c8d3", + "3f3d3d": "395cb7" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/697.json b/public/images/pokemon/variant/exp/697.json index b8d305022f5..dcb3a348dd9 100644 --- a/public/images/pokemon/variant/exp/697.json +++ b/public/images/pokemon/variant/exp/697.json @@ -1,45 +1,38 @@ { -"1": { -"080808": "080808", -"32252c": "3e1e17", -"50131e": "0b241e", -"722533": "153626", -"54434c": "4c3216", -"964b1c": "5e0b0b", -"963e4e": "285234", -"bf7545": "971c1c", -"f19d5a": "b52424", -"9f9d98": "ad8c63", -"cccccc": "cbbe8c", -"fafafa": "dfdea7", -"cac2c2": "cbbe8c", -"f7eeee": "dfdea7", -"53414b": "4c3216", -"30222a": "3e1e17", -"53454d": "4c3216" -}, -"2": { -"080808": "080808", -"32252c": "0d0124", -"50131e": "573b36", -"722533": "83726e", -"54434c": "170c25", -"964b1c": "9d5390", -"963e4e": "ab9b97", -"bf7545": "ce7ecc", -"f19d5a": "f4dbf6", -"9f9d98": "26173b", -"cccccc": "33214f", -"fafafa": "4b2e64", -"cac2c2": "ce7ecc", -"f7eeee": "f4dbf6", -"53414b": "dea5dd", -"30222a": "ce7ecc", -"53454d": "f4dbf6" -} -} - - - - - + "1": { + "32252c": "3e1e17", + "50131e": "0b241e", + "722533": "153626", + "54434c": "4c3216", + "964b1c": "5e0b0b", + "963e4e": "285234", + "bf7545": "971c1c", + "f19d5a": "b52424", + "9f9d98": "ad8c63", + "cccccc": "cbbe8c", + "fafafa": "dfdea7", + "cac2c2": "cbbe8c", + "f7eeee": "dfdea7", + "53414b": "4c3216", + "30222a": "3e1e17", + "53454d": "4c3216" + }, + "2": { + "32252c": "0d0124", + "50131e": "573b36", + "722533": "83726e", + "54434c": "170c25", + "964b1c": "9d5390", + "963e4e": "ab9b97", + "bf7545": "ce7ecc", + "f19d5a": "f4dbf6", + "9f9d98": "26173b", + "cccccc": "33214f", + "fafafa": "4b2e64", + "cac2c2": "ce7ecc", + "f7eeee": "f4dbf6", + "53414b": "dea5dd", + "30222a": "ce7ecc", + "53454d": "f4dbf6" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/699.json b/public/images/pokemon/variant/exp/699.json index 107352097cd..fe543a48ddf 100644 --- a/public/images/pokemon/variant/exp/699.json +++ b/public/images/pokemon/variant/exp/699.json @@ -9,10 +9,8 @@ "657dac": "c44f5d", "81a0dc": "e5756b", "4e568b": "a03c58", - "101010": "101010", "ffffff": "ffeac0", "4cc3ff": "c2d5ff", - "f8f8f8": "f8f8f8", "3689b3": "8487e1", "3d8eb6": "12545e", "53c5ff": "1c7376", @@ -30,10 +28,8 @@ "657dac": "2f4978", "81a0dc": "3f648b", "4e568b": "243369", - "101010": "101010", "ffffff": "bae8ff", "4cc3ff": "ffea82", - "f8f8f8": "f8f8f8", "3689b3": "efbe63", "3d8eb6": "852d6b", "53c5ff": "ab467e", diff --git a/public/images/pokemon/variant/exp/700.json b/public/images/pokemon/variant/exp/700.json index 1189d463f2b..2a8ecba3b8f 100644 --- a/public/images/pokemon/variant/exp/700.json +++ b/public/images/pokemon/variant/exp/700.json @@ -1,32 +1,28 @@ { -"1": { -"101010": "101010", -"8a2843": "452f89", -"235a99": "a63071", -"895c72": "5c6889", -"d85a7a": "996cd2", -"528fcc": "d648b7", -"a88d8c": "8c8fa8", -"f18a78": "b52d27", -"fa8caa": "c7a6ee", -"64c8f3": "e974db", -"d9c3c3": "c3c5d9", -"fff5f5": "f7f5ff", -"65798c": "65798c" -}, -"2": { -"101010": "101010", -"8a2843": "0e6134", -"235a99": "900d1b", -"895c72": "7f5c89", -"d85a7a": "5dae7d", -"528fcc": "dd3d4f", -"a88d8c": "7f5c89", -"f18a78": "d14ea4", -"fa8caa": "7dec9d", -"64c8f3": "ff9a68", -"d9c3c3": "d9c3d6", -"fff5f5": "fff5fc", -"65798c": "65798c" -} + "1": { + "8a2843": "452f89", + "235a99": "a63071", + "895c72": "5c6889", + "d85a7a": "996cd2", + "528fcc": "d648b7", + "a88d8c": "8c8fa8", + "f18a78": "b52d27", + "fa8caa": "c7a6ee", + "64c8f3": "e974db", + "d9c3c3": "c3c5d9", + "fff5f5": "f7f5ff" + }, + "2": { + "8a2843": "0e6134", + "235a99": "900d1b", + "895c72": "7f5c89", + "d85a7a": "5dae7d", + "528fcc": "dd3d4f", + "a88d8c": "7f5c89", + "f18a78": "d14ea4", + "fa8caa": "7dec9d", + "64c8f3": "ff9a68", + "d9c3c3": "d9c3d6", + "fff5f5": "fff5fc" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/702.json b/public/images/pokemon/variant/exp/702.json index 12feb29a0fd..adea0fb21eb 100644 --- a/public/images/pokemon/variant/exp/702.json +++ b/public/images/pokemon/variant/exp/702.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "262626": "2a3b5e", "4d4d4d": "6789b3", "bfbf86": "a3d1cc", @@ -10,12 +9,10 @@ "f2c261": "ffd3b6", "bf994c": "e49f84", "1d1d1d": "1a1c45", - "f8f8f8": "f8f8f8", "464646": "424b8f", "d97d21": "7cd6a1" }, "2": { - "101010": "101010", "262626": "072d38", "4d4d4d": "197870", "bfbf86": "aaa8d6", @@ -25,7 +22,6 @@ "f2c261": "5f3662", "bf994c": "432249", "1d1d1d": "02172d", - "f8f8f8": "f8f8f8", "464646": "17646c", "d97d21": "d2fff1" } diff --git a/public/images/pokemon/variant/exp/704.json b/public/images/pokemon/variant/exp/704.json index e292d6fb41f..48a96fa7ff9 100644 --- a/public/images/pokemon/variant/exp/704.json +++ b/public/images/pokemon/variant/exp/704.json @@ -4,7 +4,6 @@ "f2daf2": "fbb3d2", "bfacbf": "e56ca6", "4d454d": "8a2166", - "101010": "101010", "4d993d": "197497", "66cc52": "3aa8c4", "b8a1e5": "c7a1e5", @@ -18,7 +17,6 @@ "f2daf2": "92d8c8", "bfacbf": "63a99e", "4d454d": "134557", - "101010": "101010", "4d993d": "a34205", "66cc52": "d27e26", "b8a1e5": "4a9699", diff --git a/public/images/pokemon/variant/exp/705.json b/public/images/pokemon/variant/exp/705.json index bf9aa91eb4b..037ff41c585 100644 --- a/public/images/pokemon/variant/exp/705.json +++ b/public/images/pokemon/variant/exp/705.json @@ -6,7 +6,6 @@ "4d454d": "8a2166", "307922": "aa6a00", "46b030": "ffd047", - "101010": "101010", "98bd51": "197497", "d2e79e": "3aa8c4", "647543": "0c5474", @@ -22,7 +21,6 @@ "4d454d": "194f51", "307922": "007d61", "46b030": "49ffbf", - "101010": "101010", "98bd51": "a34205", "d2e79e": "d27e26", "647543": "842401", diff --git a/public/images/pokemon/variant/exp/706.json b/public/images/pokemon/variant/exp/706.json index 41077f9d96b..1dd4602c927 100644 --- a/public/images/pokemon/variant/exp/706.json +++ b/public/images/pokemon/variant/exp/706.json @@ -5,8 +5,6 @@ "bfacbf": "da75a5", "f2daf2": "f1a4c5", "998a99": "b24c86", - "f8f8f8": "f8f8f8", - "101010": "101010", "4d993d": "197497", "336629": "0c5474", "66cc52": "3aa8c4", @@ -21,8 +19,6 @@ "bfacbf": "5db6a9", "f2daf2": "9cead8", "998a99": "2b736f", - "f8f8f8": "f8f8f8", - "101010": "101010", "4d993d": "a34205", "336629": "842401", "66cc52": "d27e26", diff --git a/public/images/pokemon/variant/exp/709.json b/public/images/pokemon/variant/exp/709.json index f249558388a..58b319ead4f 100644 --- a/public/images/pokemon/variant/exp/709.json +++ b/public/images/pokemon/variant/exp/709.json @@ -5,7 +5,6 @@ "12602e": "361f1b", "23b856": "907f76", "128b3b": "4d362e", - "101010": "101010", "915e45": "36384f", "292a40": "a14743", "f92d45": "5996d2", @@ -17,7 +16,6 @@ "12602e": "761d52", "23b856": "da7ea8", "128b3b": "a94079", - "101010": "101010", "915e45": "56323a", "292a40": "9c92a4", "f92d45": "e18933", diff --git a/public/images/pokemon/variant/exp/710.json b/public/images/pokemon/variant/exp/710.json index d63ab9ca323..ef2ef3c5bcd 100644 --- a/public/images/pokemon/variant/exp/710.json +++ b/public/images/pokemon/variant/exp/710.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "61532d": "72a966", "3d301a": "366432", "261d0e": "213a22", @@ -14,7 +13,6 @@ "fff0a5": "fafafa" }, "2": { - "101010": "101010", "61532d": "425947", "3d301a": "2a4031", "261d0e": "262626", diff --git a/public/images/pokemon/variant/exp/711.json b/public/images/pokemon/variant/exp/711.json index df3799ce802..0a34aa48c70 100644 --- a/public/images/pokemon/variant/exp/711.json +++ b/public/images/pokemon/variant/exp/711.json @@ -4,7 +4,6 @@ "61532d": "593a59", "3d301a": "311835", "bf634c": "262626", - "101010": "101010", "f49670": "404040", "894331": "171717", "e09935": "e9f25b", @@ -15,11 +14,9 @@ "fff0a5": "f1ffa7" }, "1": { - "261d0e": "261d0e", "61532d": "434348", "3d301a": "262626", "bf634c": "325b34", - "101010": "101010", "f49670": "4d7d4b", "894331": "153f18", "e09935": "ffa858", @@ -34,7 +31,6 @@ "61532d": "e56146", "3d301a": "9a2d25", "bf634c": "213c28", - "101010": "101010", "f49670": "36593d", "894331": "102316", "e09935": "f1c353", diff --git a/public/images/pokemon/variant/exp/712.json b/public/images/pokemon/variant/exp/712.json index 369ba54cd23..9e83305dab5 100644 --- a/public/images/pokemon/variant/exp/712.json +++ b/public/images/pokemon/variant/exp/712.json @@ -5,14 +5,10 @@ "58647b": "bf566d", "719aa9": "d97389", "b3eaf8": "ffbfda", - "101010": "101010", "705c99": "732334", "f2ba49": "9dcc3e", "967acc": "994255", - "ffd98c": "cbe696", - "bfbfbf": "bfbfbf", - "737373": "737373", - "f8f8f8": "f8f8f8" + "ffd98c": "cbe696" }, "2": { "a5c4d2": "e69e2b", @@ -20,7 +16,6 @@ "58647b": "a8632a", "719aa9": "cc7b1e", "b3eaf8": "fcc95c", - "101010": "101010", "705c99": "006761", "f2ba49": "6cb3ae", "967acc": "2c7a75", diff --git a/public/images/pokemon/variant/exp/713.json b/public/images/pokemon/variant/exp/713.json index ca45360ecea..af98bddcc6d 100644 --- a/public/images/pokemon/variant/exp/713.json +++ b/public/images/pokemon/variant/exp/713.json @@ -7,12 +7,8 @@ "77b8d9": "d97389", "335980": "994255", "f2ffff": "ffebf2", - "101010": "101010", - "737373": "737373", - "bfbfbf": "bfbfbf", "efab34": "9dcc3e", - "ffe46a": "cbe696", - "f8f8f8": "f8f8f8" + "ffe46a": "cbe696" }, "2": { "608cba": "a8632a", @@ -22,8 +18,6 @@ "77b8d9": "cc7b1e", "335980": "824628", "f2ffff": "fff2ad", - "101010": "101010", - "737373": "737373", "bfbfbf": "6cb3ae", "efab34": "6cb3ae", "ffe46a": "b9f2ee", diff --git a/public/images/pokemon/variant/exp/715.json b/public/images/pokemon/variant/exp/715.json index 0e97862f10b..b56ffa5ece4 100644 --- a/public/images/pokemon/variant/exp/715.json +++ b/public/images/pokemon/variant/exp/715.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "404040": "5f32b1", "6a3f73": "0f103c", "287366": "731338", @@ -14,25 +13,22 @@ "737373": "563d8f", "f8f8f8": "d6c8f1", "e52e2e": "903b78", - "000000": "000000", - "ffe14c": "ff8a58" + "ffe14c": "ff8a58" }, "2": { - "101010": "101010", - "404040": "c29484", - "6a3f73": "3b0c18", - "287366": "832714", - "3aa694": "b8552c", - "8e5499": "7c2928", - "bfbfbf": "43191e", - "595959": "ecd3c3", - "801a1a": "7c0907", - "4cd9c1": "dd834c", - "bd70cc": "5b1922", - "737373": "1d060c", - "f8f8f8": "5a2a2b", - "e52e2e": "ad3419", - "000000": "000000", - "ffe14c": "49ffcd" + "404040": "c29484", + "6a3f73": "3b0c18", + "287366": "832714", + "3aa694": "b8552c", + "8e5499": "7c2928", + "bfbfbf": "43191e", + "595959": "ecd3c3", + "801a1a": "7c0907", + "4cd9c1": "dd834c", + "bd70cc": "5b1922", + "737373": "1d060c", + "f8f8f8": "5a2a2b", + "e52e2e": "ad3419", + "ffe14c": "49ffcd" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/716-active.json b/public/images/pokemon/variant/exp/716-active.json index 494bdcbd642..62c4c8887d2 100644 --- a/public/images/pokemon/variant/exp/716-active.json +++ b/public/images/pokemon/variant/exp/716-active.json @@ -9,10 +9,8 @@ "3d5c99": "1e3824", "243659": "132b1b", "5c8ae5": "324c37", - "000000": "000000", "2b2b2e": "518554", - "404040": "7ca376", - "3c3233": "3c3233" + "404040": "7ca376" }, "2": { "807659": "210f14", @@ -24,9 +22,7 @@ "3d5c99": "643071", "243659": "37134c", "5c8ae5": "884e9f", - "000000": "000000", "2b2b2e": "d284b6", - "404040": "faaed8", - "3c3233": "3c3233" + "404040": "faaed8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/716-neutral.json b/public/images/pokemon/variant/exp/716-neutral.json index 7226d4f0a81..a1716e947c9 100644 --- a/public/images/pokemon/variant/exp/716-neutral.json +++ b/public/images/pokemon/variant/exp/716-neutral.json @@ -3,7 +3,6 @@ "364566": "603f3c", "6eaed1": "ac8781", "a7d6e8": "bfa19a", - "000000": "000000", "3d5c99": "1e3824", "243659": "132b1b", "5c8ae5": "324c37", @@ -14,7 +13,6 @@ "364566": "230d1e", "6eaed1": "42283b", "a7d6e8": "613e56", - "000000": "000000", "3d5c99": "643071", "243659": "37134c", "5c8ae5": "884e9f", diff --git a/public/images/pokemon/variant/exp/728.json b/public/images/pokemon/variant/exp/728.json index a9c7155ec91..899ae80c996 100644 --- a/public/images/pokemon/variant/exp/728.json +++ b/public/images/pokemon/variant/exp/728.json @@ -1,10 +1,8 @@ { "1": { - "101010": "101010", "1e3a66": "363d2f", "243a66": "00473d", "733f50": "a62c20", - "404040": "404040", "b3627d": "e54c41", "2c4f8c": "5a6154", "314f8c": "006355", @@ -13,7 +11,6 @@ "5f9ba6": "b56e76", "639ba6": "858d7d", "6c90d9": "14af82", - "808080": "808080", "bfbfbf": "c2beb4", "9edae5": "f7c1c5", "a1dae5": "92b599", @@ -21,11 +18,9 @@ "fefefe": "fff6e2" }, "2": { - "101010": "101010", "1e3a66": "773f46", "243a66": "54041b", "733f50": "620a33", - "404040": "404040", "b3627d": "a7225c", "2c4f8c": "a45f67", "314f8c": "770f29", @@ -34,7 +29,6 @@ "5f9ba6": "408c62", "639ba6": "b88389", "6c90d9": "be294a", - "808080": "808080", "bfbfbf": "bfb4b9", "9edae5": "91e6a2", "a1dae5": "f7c1c5", diff --git a/public/images/pokemon/variant/exp/729.json b/public/images/pokemon/variant/exp/729.json index 7b196fda526..abfaaf0fc7e 100644 --- a/public/images/pokemon/variant/exp/729.json +++ b/public/images/pokemon/variant/exp/729.json @@ -1,7 +1,5 @@ { "1": { - "101010": "101010", - "2d2e31": "2d2e31", "733f50": "bb402f", "476d72": "be665d", "b3627d": "fb6051", @@ -10,7 +8,6 @@ "639ba6": "b56e76", "2d8ec4": "009a88", "1eb9ee": "0ccfa2", - "808080": "808080", "8dafaf": "ff989e", "bfbfbf": "c2beb4", "bad8d8": "ffbd98", @@ -22,8 +19,6 @@ "6f3f50": "bb402f" }, "2": { - "101010": "101010", - "2d2e31": "2d2e31", "733f50": "620a33", "476d72": "793f5e", "b3627d": "a7225c", @@ -32,7 +27,6 @@ "639ba6": "408c62", "2d8ec4": "952c3f", "1eb9ee": "c6496f", - "808080": "808080", "8dafaf": "b681a6", "bfbfbf": "bfb4b9", "bad8d8": "deabce", diff --git a/public/images/pokemon/variant/exp/730.json b/public/images/pokemon/variant/exp/730.json index 5c8deeb52b2..812f0d1db30 100644 --- a/public/images/pokemon/variant/exp/730.json +++ b/public/images/pokemon/variant/exp/730.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "843843": "a62c20", "8d3f4a": "a62c20", "c46074": "e54c41", @@ -21,11 +20,9 @@ "c0bdc1": "beaac0", "aac7e6": "ea7c5b", "f8f8f8": "fff2d4", - "faf8f8": "f1e8f1", - "fef8f8": "fef8f8" + "faf8f8": "f1e8f1" }, "2": { - "101010": "101010", "843843": "5c2141", "8d3f4a": "1d1638", "c46074": "c17b97", @@ -46,7 +43,6 @@ "c0bdc1": "c0b4a5", "aac7e6": "e9a5c0", "f8f8f8": "f5edee", - "faf8f8": "f5f3e3", - "fef8f8": "fef8f8" + "faf8f8": "f5f3e3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/734.json b/public/images/pokemon/variant/exp/734.json index f9e52b2d090..128fd4ce9c6 100644 --- a/public/images/pokemon/variant/exp/734.json +++ b/public/images/pokemon/variant/exp/734.json @@ -3,32 +3,20 @@ "9c5b50": "2a3f52", "753933": "03192d", "6b4f27": "523a44", - "070707": "070707", "ba836d": "35576b", "f0cd84": "c1aaaa", "c19462": "907e82", "9b7357": "523a44", - "ea8c96": "c1715c", - "322f2c": "322f2c", - "f5f5f5": "f5f5f5", - "686d77": "686d77", - "bbbdc1": "bbbdc1", - "a7aac2": "a7aac2" + "ea8c96": "c1715c" }, "2": { "9c5b50": "786a66", "753933": "26201f", "6b4f27": "241b1b", - "070707": "070707", "ba836d": "a69c98", "f0cd84": "4d4242", "c19462": "362e2e", "9b7357": "241b1b", - "ea8c96": "a38b89", - "322f2c": "322f2c", - "f5f5f5": "f5f5f5", - "686d77": "686d77", - "bbbdc1": "bbbdc1", - "a7aac2": "a7aac2" + "ea8c96": "a38b89" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/735.json b/public/images/pokemon/variant/exp/735.json index 3949cbe4157..18ebd802f82 100644 --- a/public/images/pokemon/variant/exp/735.json +++ b/public/images/pokemon/variant/exp/735.json @@ -5,13 +5,9 @@ "8d473d": "2a3252", "602c24": "03102d", "af754e": "354c6b", - "101010": "101010", "b6973a": "7a6a6d", "393633": "5f3d1c", - "f8f8f8": "f8f8f8", - "787885": "787885", "ea6f91": "c1715c", - "a3a3ab": "a3a3ab", "2d2b28": "5a3215" }, "2": { @@ -20,10 +16,7 @@ "8d473d": "90827e", "602c24": "524b4b", "af754e": "ada6a4", - "101010": "101010", "b6973a": "362e2e", - "393633": "393633", - "f8f8f8": "f8f8f8", "787885": "6e6e7b", "ea6f91": "846a68", "a3a3ab": "989898", diff --git a/public/images/pokemon/variant/exp/748.json b/public/images/pokemon/variant/exp/748.json index 280c676293a..5ffc26903ab 100644 --- a/public/images/pokemon/variant/exp/748.json +++ b/public/images/pokemon/variant/exp/748.json @@ -1,7 +1,6 @@ { "1": { "943732": "490a3c", - "101010": "101010", "f28c4f": "a21f90", "e25025": "91138c", "6f97c4": "be583d", @@ -9,7 +8,6 @@ "93d1d7": "df7b52", "711a6a": "81463e", "d76fa5": "edd5ca", - "171539": "171539", "3a3f6d": "462952", "525898": "6c3776", "b7429a": "d29784", @@ -18,7 +16,6 @@ }, "2": { "943732": "c30e49", - "101010": "101010", "f28c4f": "ff3f5a", "e25025": "e12350", "6f97c4": "359d5d", diff --git a/public/images/pokemon/variant/exp/752.json b/public/images/pokemon/variant/exp/752.json index c6c3009cd1e..8f7ea16ae4d 100644 --- a/public/images/pokemon/variant/exp/752.json +++ b/public/images/pokemon/variant/exp/752.json @@ -2,11 +2,9 @@ "1": { "859ba7": "7c3b51", "d3edfb": "ffc8d1", - "ffffff": "ffffff", "c2d3dc": "d187a0", "c3d600": "673252", "707b0a": "3a112f", - "000000": "000000", "a8ba00": "4e1f42", "423e35": "395677", "817b6e": "5ea3b8", @@ -20,15 +18,12 @@ "2": { "859ba7": "55506a", "d3edfb": "dce7ee", - "ffffff": "ffffff", "c2d3dc": "a7a2bc", "c3d600": "72add9", "707b0a": "263756", - "000000": "000000", "a8ba00": "4980ac", "423e35": "75291a", "817b6e": "bc521d", - "1e414f": "1e414f", "424a56": "f5cf52", "62c4e5": "3b5373", "1a1c1e": "834723", diff --git a/public/images/pokemon/variant/exp/753.json b/public/images/pokemon/variant/exp/753.json index 78eaa04fb78..d6ffc97c2da 100644 --- a/public/images/pokemon/variant/exp/753.json +++ b/public/images/pokemon/variant/exp/753.json @@ -3,7 +3,6 @@ "234028": "2e1643", "468050": "3e2253", "5ba668": "4e2c62", - "101010": "101010", "315945": "0e2616", "69bf94": "27452c", "549977": "1b3822", @@ -19,7 +18,6 @@ "234028": "812255", "468050": "ad3a87", "5ba668": "ce54b0", - "101010": "101010", "315945": "441342", "69bf94": "6e3472", "549977": "5a215a", diff --git a/public/images/pokemon/variant/exp/754.json b/public/images/pokemon/variant/exp/754.json index c8fcf792f01..07ba33a140a 100644 --- a/public/images/pokemon/variant/exp/754.json +++ b/public/images/pokemon/variant/exp/754.json @@ -6,7 +6,6 @@ "315945": "122a1a", "d98d9a": "c95623", "69bf94": "314e36", - "101010": "101010", "cc5266": "ac351f", "404040": "3c1717", "bfbfbf": "c9d6b7", @@ -20,7 +19,6 @@ "315945": "c940c4", "d98d9a": "2944a2", "69bf94": "f881ff", - "101010": "101010", "cc5266": "343381", "404040": "0c0a3f", "bfbfbf": "feccff", diff --git a/public/images/pokemon/variant/exp/755.json b/public/images/pokemon/variant/exp/755.json index 2d3ff38fb4b..8d6a093c4bb 100644 --- a/public/images/pokemon/variant/exp/755.json +++ b/public/images/pokemon/variant/exp/755.json @@ -5,7 +5,6 @@ "fffbcf": "e4c3d0", "f1b6c8": "e76d5b", "e07c8d": "d64742", - "101010": "101010", "fdff97": "e4c3d0", "b591c4": "803a5c", "9d70b1": "5c2445", @@ -24,7 +23,6 @@ "fffbcf": "d5f9f2", "f1b6c8": "b0ffe1", "e07c8d": "7ae7c9", - "101010": "101010", "fdff97": "d5f9f2", "b591c4": "3a4b75", "9d70b1": "2c336b", diff --git a/public/images/pokemon/variant/exp/756.json b/public/images/pokemon/variant/exp/756.json index d5e8d1f15f1..210aac2a716 100644 --- a/public/images/pokemon/variant/exp/756.json +++ b/public/images/pokemon/variant/exp/756.json @@ -7,7 +7,6 @@ "b9ff5a": "e5aff3", "dcff44": "e5aff3", "c9e161": "e5aff3", - "101010": "101010", "a0d15e": "866eaf", "9867ad": "d64742", "764b67": "451233", @@ -26,7 +25,6 @@ "b9ff5a": "dffffa", "dcff44": "dffffa", "c9e161": "dffffa", - "101010": "101010", "a0d15e": "b0ffe1", "9867ad": "2c336b", "764b67": "0d7a66", diff --git a/public/images/pokemon/variant/exp/761.json b/public/images/pokemon/variant/exp/761.json index 7256c2078c0..0e954ce225b 100644 --- a/public/images/pokemon/variant/exp/761.json +++ b/public/images/pokemon/variant/exp/761.json @@ -3,27 +3,21 @@ "476629": "215e59", "6b993d": "398793", "8fcc52": "70d2e1", - "101010": "101010", "80334d": "251936", "b3476b": "7e5cdb", "e55c8a": "9f86e4", - "f8f8f8": "f8f8f8", "ffe14c": "7e5cdb", - "e38c9c": "e38c8c", - "737373": "737373", - "bfbfbf": "bfbfbf" + "e38c9c": "e38c8c" }, "2": { "476629": "3e0a11", "6b993d": "5a0a16", "8fcc52": "86232e", - "101010": "101010", "80334d": "101010", "b3476b": "254536", "e55c8a": "2c574a", "f8f8f8": "e4c59e", "ffe14c": "16664a", - "e38c9c": "e38c9c", "737373": "72585f", "bfbfbf": "af8260" } diff --git a/public/images/pokemon/variant/exp/762.json b/public/images/pokemon/variant/exp/762.json index 4a0854f4126..1cfd5d9a113 100644 --- a/public/images/pokemon/variant/exp/762.json +++ b/public/images/pokemon/variant/exp/762.json @@ -2,13 +2,9 @@ "1": { "446328": "215e59", "96c853": "70d2e1", - "0f0f0f": "0f0f0f", "659344": "398793", "ebe130": "e66556", - "c7b8c4": "c7b8c4", - "fcfcfc": "fcfcfc", "ce466b": "a787ff", - "72585f": "72585f", "962354": "45366e", "f26284": "7e5cdb", "6a1533": "251936", @@ -17,7 +13,6 @@ "2": { "446328": "3e0a11", "96c853": "86232e", - "0f0f0f": "0f0f0f", "659344": "5a0a16", "ebe130": "5c0505", "c7b8c4": "af8260", diff --git a/public/images/pokemon/variant/exp/763.json b/public/images/pokemon/variant/exp/763.json index 4f1aa828fb2..6eb153b362b 100644 --- a/public/images/pokemon/variant/exp/763.json +++ b/public/images/pokemon/variant/exp/763.json @@ -6,11 +6,7 @@ "fbf21d": "e66556", "455433": "215e59", "95b76d": "398793", - "000000": "000000", "d0fa9f": "70d2e1", - "b7979f": "b7979f", - "ffffff": "ffffff", - "615053": "615053", "d2677e": "7e5cdb", "ffa3b6": "9f86e4", "baa90e": "af3e31", @@ -23,7 +19,6 @@ "fbf21d": "420b0b", "455433": "5c0a1a", "95b76d": "5a0a16", - "000000": "000000", "d0fa9f": "86232e", "b7979f": "af8260", "ffffff": "e4c59e", diff --git a/public/images/pokemon/variant/exp/767.json b/public/images/pokemon/variant/exp/767.json index 46f860b073e..84114ed68e0 100644 --- a/public/images/pokemon/variant/exp/767.json +++ b/public/images/pokemon/variant/exp/767.json @@ -2,27 +2,23 @@ "1": { "46334f": "844008", "a65e97": "e8a92a", - "080808": "080808", "713e70": "c86910", "3f5252": "202733", "bed3cf": "6e6d6d", "5c7877": "293141", "867b73": "ecd42a", "8a9f9e": "494950", - "ede650": "7798b8", - "f7f7f7": "f7f7f7" + "ede650": "7798b8" }, "2": { "46334f": "091b52", "a65e97": "2849ac", - "080808": "080808", "713e70": "1c306d", "3f5252": "3d105f", "bed3cf": "844caf", "5c7877": "5722a6", "867b73": "8cdded", "8a9f9e": "452772", - "ede650": "d3f4fb", - "f7f7f7": "f7f7f7" + "ede650": "d3f4fb" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/768.json b/public/images/pokemon/variant/exp/768.json index ad275949bd2..f7fffd7e822 100644 --- a/public/images/pokemon/variant/exp/768.json +++ b/public/images/pokemon/variant/exp/768.json @@ -2,7 +2,6 @@ "1": { "546b57": "202733", "c8e1cd": "6e6d6d", - "101010": "101010", "81b68e": "494950", "498f6c": "ecd42a", "842886": "c85710", @@ -17,16 +16,12 @@ "2": { "546b57": "091b52", "c8e1cd": "2849ac", - "101010": "101010", "81b68e": "1c306d", "498f6c": "8cdded", "842886": "5722a6", "cc5fcf": "8b51e1", "9a6982": "452772", - "5c635e": "5c635e", "7a4952": "3d105f", - "bd95a8": "844caf", - "2f3330": "2f3330", - "404843": "404843" + "bd95a8": "844caf" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/771.json b/public/images/pokemon/variant/exp/771.json index 31a9623cb09..83f5517a66d 100644 --- a/public/images/pokemon/variant/exp/771.json +++ b/public/images/pokemon/variant/exp/771.json @@ -2,7 +2,6 @@ "1": { "73223d": "570a00", "d94174": "de884b", - "101010": "101010", "992e52": "c95340", "211e1e": "1a1a1a", "737373": "b5284a", @@ -10,7 +9,6 @@ "262626": "4a1a30", "f8f8f8": "dec890", "bfbfbf": "e07f47", - "595959": "bd5e49", - "1a1a1a": "1a1a1a" + "595959": "bd5e49" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/772.json b/public/images/pokemon/variant/exp/772.json index 45c81692bb6..92ba6ef6a63 100644 --- a/public/images/pokemon/variant/exp/772.json +++ b/public/images/pokemon/variant/exp/772.json @@ -3,7 +3,6 @@ "454f55": "232843", "92a6a9": "889db1", "6b777e": "526085", - "080808": "080808", "642515": "7e4f36", "c55e3a": "eed8a1", "934031": "c8976c", @@ -25,7 +24,6 @@ "454f55": "18182a", "92a6a9": "65657c", "6b777e": "3b3b51", - "080808": "080808", "642515": "444961", "c55e3a": "c1cfd8", "934031": "7f94b1", diff --git a/public/images/pokemon/variant/exp/773.json b/public/images/pokemon/variant/exp/773.json index b64796b9bf9..15805bf76ec 100644 --- a/public/images/pokemon/variant/exp/773.json +++ b/public/images/pokemon/variant/exp/773.json @@ -9,7 +9,6 @@ "e3e6ec": "bdd1e5", "3f3b50": "1e172a", "aba7bc": "493d55", - "080808": "080808", "e64f5e": "f1944a", "483c39": "3a2d53", "79615e": "504a75", @@ -17,7 +16,6 @@ "e9eaf8": "e7ebed", "0073bf": "7a4949", "5399df": "b59489", - "fffef5": "fffef5", "251845": "753c32", "9618e0": "dc9c4d", "125d4b": "ce7f3f", @@ -31,9 +29,7 @@ "565969": "0f0f1b", "bcbbc5": "242433", "e3e6ec": "444455", - "3f3b50": "3f3b50", "aba7bc": "dbd8e8", - "080808": "080808", "e64f5e": "98ce58", "483c39": "778894", "79615e": "d6d4d4", @@ -41,7 +37,6 @@ "e9eaf8": "eef4f8", "0073bf": "6a6c75", "5399df": "92949e", - "fffef5": "fffef5", "251845": "425735", "9618e0": "ade265", "125d4b": "686981", diff --git a/public/images/pokemon/variant/exp/776.json b/public/images/pokemon/variant/exp/776.json index 22bf97cd7a0..a17fdc05434 100644 --- a/public/images/pokemon/variant/exp/776.json +++ b/public/images/pokemon/variant/exp/776.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "666657": "5a4c65", "ccccad": "b4b8c8", "71171a": "2c0f2d", @@ -9,14 +8,12 @@ "e74545": "4f3d66", "fadd3d": "32d9e5", "331c1c": "39221d", - "f8f8f8": "f8f8f8", "6b473c": "f4eba2", "cc8720": "2f98cd", "4d2a2a": "d5966f", "9b6500": "276da5" }, "2": { - "101010": "101010", "666657": "4c4276", "ccccad": "adc4e9", "71171a": "be8a7a", @@ -25,7 +22,6 @@ "e74545": "faeecd", "fadd3d": "6e45a0", "331c1c": "0a412c", - "f8f8f8": "f8f8f8", "6b473c": "caee67", "cc8720": "4d2e5e", "4d2a2a": "61b551", diff --git a/public/images/pokemon/variant/exp/777.json b/public/images/pokemon/variant/exp/777.json index 597aad206f4..e04eee7dcd8 100644 --- a/public/images/pokemon/variant/exp/777.json +++ b/public/images/pokemon/variant/exp/777.json @@ -1,22 +1,18 @@ { "1": { - "101010": "101010", "ffea80": "dec2f0", "ccb852": "ac8fbb", "4d4d4d": "362952", "b3b3b3": "8e71cd", "808080": "645393", "595959": "444147", - "f8f8f8": "f8f8f8", "8c8c8c": "99979b", - "fbfbfb": "fbfbfb", "bfbfbf": "d0dadb", "73593f": "ae428a", "e5dba8": "dba6b6", "fff4bf": "ffd8ee" }, "2": { - "101010": "101010", "ffea80": "d65d3c", "ccb852": "7b3c26", "4d4d4d": "294127", @@ -25,7 +21,6 @@ "595959": "342a20", "f8f8f8": "e5b38c", "8c8c8c": "634c41", - "fbfbfb": "fbfbfb", "bfbfbf": "b27f64", "73593f": "47240f", "e5dba8": "c65757", diff --git a/public/images/pokemon/variant/exp/778-busted.json b/public/images/pokemon/variant/exp/778-busted.json index 679ebbb5f31..97168b7209c 100644 --- a/public/images/pokemon/variant/exp/778-busted.json +++ b/public/images/pokemon/variant/exp/778-busted.json @@ -1,7 +1,5 @@ { "1": { - "000000": "000000", - "101010": "101010", "404040": "180c05", "b3a76b": "8d4f3d", "f2e291": "aa6f46", @@ -14,7 +12,6 @@ "404039": "180c05" }, "2": { - "000000": "000000", "101010": "000000", "404040": "0b1231", "b3a76b": "3d2e4f", diff --git a/public/images/pokemon/variant/exp/778-disguised.json b/public/images/pokemon/variant/exp/778-disguised.json index 7dfb153ed7e..c419e6d0577 100644 --- a/public/images/pokemon/variant/exp/778-disguised.json +++ b/public/images/pokemon/variant/exp/778-disguised.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "404040": "180c05", "b3a76b": "8d4f3d", "f2e291": "aa6f46", @@ -13,7 +12,6 @@ "404039": "180c05" }, "2": { - "000000": "000000", "404040": "0b1231", "b3a76b": "3d2e4f", "f2e291": "5b496b", @@ -25,4 +23,4 @@ "805933": "6d80a4", "404039": "ff766e" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/779.json b/public/images/pokemon/variant/exp/779.json index d7976e85262..9877fff7652 100644 --- a/public/images/pokemon/variant/exp/779.json +++ b/public/images/pokemon/variant/exp/779.json @@ -3,7 +3,6 @@ "58295f": "a52121", "834589": "c62c2c", "b75eb7": "f65656", - "101010": "101010", "de5c8a": "602b7a", "97354e": "2e0c3f", "ef87b5": "84539d", @@ -11,15 +10,12 @@ "93d3e1": "caefff", "5e9fc4": "94c5da", "cfae3f": "d65e5e", - "efe85f": "faa28c", - "fdfdfd": "fdfdfd", - "969696": "969696" + "efe85f": "faa28c" }, "2": { "58295f": "4545c4", "834589": "6666e2", "b75eb7": "8585ff", - "101010": "101010", "de5c8a": "dca032", "97354e": "935b3b", "ef87b5": "ffd166", @@ -27,8 +23,6 @@ "93d3e1": "eeeeff", "5e9fc4": "afafe1", "cfae3f": "2d2c43", - "efe85f": "454457", - "fdfdfd": "fdfdfd", - "969696": "969696" + "efe85f": "454457" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/789.json b/public/images/pokemon/variant/exp/789.json index b4dd5c70403..f3f945b52f1 100644 --- a/public/images/pokemon/variant/exp/789.json +++ b/public/images/pokemon/variant/exp/789.json @@ -1,17 +1,11 @@ { "0": { "3a4ca6": "64173e", - "1b234d": "1b234d", "55bef2": "7d42fd", - "f8f8f8": "f8f8f8", - "101010": "101010", "4774cc": "6a2aaf", "61f2f2": "8d8cff", "ffe359": "ffc259", "736628": "a06921", - "133140": "133140", - "3d7a99": "3d7a99", - "61c2f2": "61c2f2", "9d62d9": "dc48a7", "f285bc": "f77247" }, @@ -20,7 +14,6 @@ "1b234d": "391c21", "55bef2": "ffdf49", "f8f8f8": "fdfdfd", - "101010": "101010", "4774cc": "f6a42d", "61f2f2": "fff695", "ffe359": "e5efff", @@ -36,7 +29,6 @@ "1b234d": "1f1155", "55bef2": "71ffd8", "f8f8f8": "fdfdfd", - "101010": "101010", "4774cc": "3dc7e0", "61f2f2": "c9ffe2", "ffe359": "c22741", diff --git a/public/images/pokemon/variant/exp/790.json b/public/images/pokemon/variant/exp/790.json index cbc8fda0072..6b3d3f079da 100644 --- a/public/images/pokemon/variant/exp/790.json +++ b/public/images/pokemon/variant/exp/790.json @@ -1,22 +1,16 @@ { "1": { - "101010": "101010", "8a5911": "545d9e", "c87522": "7b89c4", "faf54e": "e5efff", "e8a61e": "aebde2", - "fdfdfd": "fdfdfd", "1d3e89": "a20b02", "169fda": "ffdf49", "764394": "ff4079", "2c5fab": "eb5b2a", - "1e232b": "1e232b", - "17a6e3": "17a6e3", - "1f4294": "1f4294", "e2629f": "f6a42d" }, "2": { - "101010": "101010", "8a5911": "730627", "c87522": "890425", "faf54e": "d4314c", @@ -26,9 +20,6 @@ "169fda": "71ffd8", "764394": "7e13bf", "2c5fab": "3dc7e0", - "1e232b": "1e232b", - "17a6e3": "17a6e3", - "1f4294": "1f4294", "e2629f": "3dc7e0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/792.json b/public/images/pokemon/variant/exp/792.json index 441861522a8..9e182f9ec66 100644 --- a/public/images/pokemon/variant/exp/792.json +++ b/public/images/pokemon/variant/exp/792.json @@ -2,39 +2,25 @@ "1": { "69551f": "675340", "e3da81": "e6ded2", - "080808": "080808", "a19263": "afa191", "72629a": "864110", "edf0ff": "ffd386", "671ace": "eb422a", "240f62": "60000c", "40168c": "bc1836", - "fdfce8": "fdfce8", "494dcc": "53101c", "7bcece": "ff31e0", - "aaa4d8": "d39143", - "ffa0dd": "ffa0dd", - "ff268f": "ff268f", - "fcfcfc": "fcfcfc", - "000000": "000000" + "aaa4d8": "d39143" }, "2": { "69551f": "6b0420", "e3da81": "c22741", - "080808": "080808", "a19263": "980f2a", "72629a": "7e343d", "edf0ff": "ffd1d1", "671ace": "1550a1", - "240f62": "240f62", "40168c": "1a3186", - "fdfce8": "fdfce8", - "494dcc": "494dcc", "7bcece": "58cbe9", - "aaa4d8": "e19096", - "ffa0dd": "ffa0dd", - "ff268f": "ff268f", - "fcfcfc": "fcfcfc", - "000000": "000000" + "aaa4d8": "e19096" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/797.json b/public/images/pokemon/variant/exp/797.json index 05e51ab62bd..3e41ffa9ef2 100644 --- a/public/images/pokemon/variant/exp/797.json +++ b/public/images/pokemon/variant/exp/797.json @@ -8,7 +8,6 @@ "82ada4": "506ee3", "bccfc4": "f2b97f", "b3e088": "ffc785", - "101010": "101010", "a3e2bb": "9db7f4", "53ca89": "f0f5f9", "193124": "09112e" @@ -22,7 +21,6 @@ "82ada4": "8b1933", "bccfc4": "242733", "b3e088": "232323", - "101010": "101010", "a3e2bb": "bd2f62", "53ca89": "bbf3ef", "193124": "330007" diff --git a/public/images/pokemon/variant/exp/798.json b/public/images/pokemon/variant/exp/798.json index 75092d71cdc..18a2ce389ec 100644 --- a/public/images/pokemon/variant/exp/798.json +++ b/public/images/pokemon/variant/exp/798.json @@ -3,7 +3,6 @@ "827d7d": "18470e", "d7d0d0": "87ab39", "a86c1c": "07421f", - "000000": "000000", "af3e00": "2c180e", "fdcf00": "2c9435", "e95503": "614537", @@ -18,7 +17,6 @@ "827d7d": "283e65", "d7d0d0": "4a86b8", "a86c1c": "5a2036", - "000000": "000000", "af3e00": "8a482d", "fdcf00": "cc7d4f", "e95503": "ffeb93", diff --git a/public/images/pokemon/variant/exp/80-mega.json b/public/images/pokemon/variant/exp/80-mega.json index 5d3d810f095..eeebc5a4b50 100644 --- a/public/images/pokemon/variant/exp/80-mega.json +++ b/public/images/pokemon/variant/exp/80-mega.json @@ -1,12 +1,9 @@ { "1": { "7b3131": "3f2729", - "000000": "000000", "e66a7b": "5b3332", "ff9494": "885345", "ffbdac": "ad7459", - "deded5": "deded5", - "ffffff": "ffffff", "835a20": "9f675f", "eed583": "d49983", "ffeeb4": "e0b69d", @@ -18,12 +15,9 @@ }, "2": { "7b3131": "bf8645", - "000000": "000000", "e66a7b": "d9a95d", "ff9494": "e8cd82", "ffbdac": "f7e6a8", - "deded5": "deded5", - "ffffff": "ffffff", "835a20": "69080f", "eed583": "b34d2e", "ffeeb4": "d16b34", diff --git a/public/images/pokemon/variant/exp/800-dawn-wings.json b/public/images/pokemon/variant/exp/800-dawn-wings.json index df0592955af..63563b11d4e 100644 --- a/public/images/pokemon/variant/exp/800-dawn-wings.json +++ b/public/images/pokemon/variant/exp/800-dawn-wings.json @@ -4,10 +4,8 @@ "293233": "5f0021", "3695ce": "afa191", "5a646c": "890425", - "101010": "101010", "72baf3": "e6ded2", "a6bad9": "f1a54f", - "1f1d35": "1f1d35", "838f95": "c8245d", "c7e5ff": "efe9dd", "74b2d8": "bc1836", @@ -20,23 +18,15 @@ "a42828": "dc1246", "e95d5d": "ff5178", "53f2f2": "d58aff", - "f7e9ba": "f7e9ba", - "d7af28": "d7af28", - "424a50": "424a50", - "ff3a9c": "ff3a9c", - "000000": "000000", - "ffa0dd": "ffd386", - "080808": "080808" + "ffa0dd": "ffd386" }, "2": { "20496a": "3b0015", "293233": "3e135f", "3695ce": "5b0318", "5a646c": "602483", - "101010": "101010", "72baf3": "970b22", "a6bad9": "e79093", - "1f1d35": "1f1d35", "838f95": "f66fdc", "c7e5ff": "e44c51", "74b2d8": "1a3186", @@ -48,13 +38,6 @@ "0b82b7": "2e5dda", "a42828": "901323", "e95d5d": "da2e2e", - "53f2f2": "579eff", - "f7e9ba": "f7e9ba", - "d7af28": "d7af28", - "424a50": "424a50", - "ff3a9c": "ff3a9c", - "000000": "000000", - "ffa0dd": "ffa0dd", - "080808": "080808" + "53f2f2": "579eff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/800-ultra.json b/public/images/pokemon/variant/exp/800-ultra.json index cab917ec271..b71e56c485e 100644 --- a/public/images/pokemon/variant/exp/800-ultra.json +++ b/public/images/pokemon/variant/exp/800-ultra.json @@ -4,30 +4,22 @@ "f8f8e8": "ffe1b8", "9b8259": "b43c06", "e5e4c2": "ffbf79", - "000000": "000000", "bc9b4e": "8e0021", "f8f8d0": "ff7e75", "e8e088": "ee2033", "d0b868": "bc0125", - "7d673b": "770031", - "282828": "282828", - "f84040": "f84040", - "f88888": "f88888", - "c81010": "c81010" + "7d673b": "770031" }, "2": { "b0a080": "e552ec", "f8f8e8": "ffe2ed", "9b8259": "b021c5", "e5e4c2": "ffb9f9", - "000000": "000000", "bc9b4e": "900090", "f8f8d0": "ff8ae9", "e8e088": "ff49e7", "d0b868": "d10cc7", "7d673b": "510059", - "282828": "282828", - "f84040": "f84040", "f88888": "1ae2e6", "c81010": "00c2d2" } diff --git a/public/images/pokemon/variant/exp/800.json b/public/images/pokemon/variant/exp/800.json index 42ec6fb5d21..e0e76df5a7b 100644 --- a/public/images/pokemon/variant/exp/800.json +++ b/public/images/pokemon/variant/exp/800.json @@ -4,12 +4,10 @@ "424a50": "890425", "2b3233": "5f0021", "768188": "c8245d", - "080808": "080808", "fd2b2b": "35d5e8", "5fcfbe": "453ef2", "ec925b": "9d63ff", "9965c9": "6219a8", - "0a5ec5": "0a5ec5", "18f013": "69fff0", "b5bbbf": "a266eb", "fbfbfb": "e8e7ff" @@ -19,7 +17,6 @@ "424a50": "602483", "2b3233": "3e135f", "768188": "b13dc8", - "080808": "080808", "fd2b2b": "fd2bc1", "5fcfbe": "b71334", "ec925b": "e73c37", diff --git a/public/images/pokemon/variant/exp/802.json b/public/images/pokemon/variant/exp/802.json index 14caa71b18b..e92974ed087 100644 --- a/public/images/pokemon/variant/exp/802.json +++ b/public/images/pokemon/variant/exp/802.json @@ -2,9 +2,7 @@ "0": { "232627": "084434", "62646a": "76bc8f", - "000000": "000000", "444546": "3a7e5d", - "dc983d": "dc983d", "f2d982": "f8f592", "802d17": "ff623c", "cc411e": "e31101", @@ -13,9 +11,7 @@ "1": { "232627": "0d0b3f", "62646a": "515aad", - "000000": "000000", "444546": "2f3079", - "dc983d": "dc983d", "f2d982": "f8e592", "802d17": "ffbb17", "cc411e": "ff2006", @@ -24,7 +20,6 @@ "2": { "232627": "5a0423", "62646a": "ce3e63", - "000000": "000000", "444546": "97123b", "dc983d": "16a1e1", "f2d982": "4bf6ff", diff --git a/public/images/pokemon/variant/exp/803.json b/public/images/pokemon/variant/exp/803.json index 1f612916938..2fa484408e6 100644 --- a/public/images/pokemon/variant/exp/803.json +++ b/public/images/pokemon/variant/exp/803.json @@ -2,7 +2,6 @@ "1": { "78757f": "449e93", "ccc0d8": "e3ffec", - "101010": "101010", "98295e": "27579e", "ff6ccc": "54cbdc", "d9338e": "3492b9", @@ -17,7 +16,6 @@ "2": { "78757f": "cd9b85", "ccc0d8": "ffefe0", - "101010": "101010", "98295e": "a12f63", "ff6ccc": "ff778d", "d9338e": "d6487a", diff --git a/public/images/pokemon/variant/exp/804.json b/public/images/pokemon/variant/exp/804.json index bee1c93ca0f..e6f0309cb03 100644 --- a/public/images/pokemon/variant/exp/804.json +++ b/public/images/pokemon/variant/exp/804.json @@ -2,7 +2,6 @@ "1": { "523e68": "16396f", "b699f2": "359faf", - "101010": "101010", "8570b1": "22658d", "9e2348": "81262d", "ff6cd3": "e88354", @@ -14,13 +13,11 @@ "e0d9e8": "e3ffec", "9996a9": "8edfd5", "008fdd": "f3c58a", - "b6e4f3": "fff5c9", - "000000": "000000" + "b6e4f3": "fff5c9" }, "2": { "523e68": "0e3346", "b699f2": "68b363", - "101010": "101010", "8570b1": "2d794e", "9e2348": "7e4e3d", "ff6cd3": "fff8cc", @@ -32,7 +29,6 @@ "e0d9e8": "e54558", "9996a9": "96234e", "008fdd": "4c495b", - "b6e4f3": "68637e", - "000000": "000000" + "b6e4f3": "68637e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/808.json b/public/images/pokemon/variant/exp/808.json index a1ed465359f..23e974c8269 100644 --- a/public/images/pokemon/variant/exp/808.json +++ b/public/images/pokemon/variant/exp/808.json @@ -4,9 +4,7 @@ "ab732b": "ce5a6f", "ffda45": "ffbeae", "fbf28d": "fff1d1", - "f9f9f9": "f9f9f9", "814f23": "85374d", - "101010": "101010", "59544e": "38585b", "3d3534": "2c4048", "67675f": "426e73", @@ -21,16 +19,12 @@ "ab732b": "2d2931", "ffda45": "9b6e98", "fbf28d": "bf99bc", - "f9f9f9": "f9f9f9", "814f23": "101010", - "101010": "101010", "59544e": "9e002e", "3d3534": "780000", "67675f": "ba2b41", "8a8d7e": "d66352", "dcdcda": "ffbe6e", - "b1b5a6": "f49769", - "741012": "741012", - "c2292e": "c2292e" + "b1b5a6": "f49769" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/809.json b/public/images/pokemon/variant/exp/809.json index 29b15e46f70..9ffe4ac2c46 100644 --- a/public/images/pokemon/variant/exp/809.json +++ b/public/images/pokemon/variant/exp/809.json @@ -6,14 +6,12 @@ "3d3534": "2c4048", "dea220": "ff7c8e", "ab732b": "ce5a6f", - "101010": "101010", "fbf28d": "fff1d1", "67675f": "426e73", "814f23": "85374d", "ffda45": "ffbeae", "dcdcda": "c2effc", - "b1b5a6": "98d6f0", - "f9f9f9": "f9f9f9" + "b1b5a6": "98d6f0" }, "2": { "59544e": "9e002e", @@ -22,13 +20,11 @@ "3d3534": "780000", "dea220": "64486f", "ab732b": "2d2931", - "101010": "101010", "fbf28d": "bf99bc", "67675f": "ba2b41", "814f23": "101010", "ffda45": "9b6e98", "dcdcda": "ffbe6e", - "b1b5a6": "f49769", - "f9f9f9": "f9f9f9" + "b1b5a6": "f49769" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/816.json b/public/images/pokemon/variant/exp/816.json index 62c875c5941..55573466e55 100644 --- a/public/images/pokemon/variant/exp/816.json +++ b/public/images/pokemon/variant/exp/816.json @@ -8,12 +8,10 @@ "6ab6d2": "e66371", "add7e7": "e6828e", "718b93": "a7664c", - "fbfbfb": "fbfbfb", "5091c0": "b5464b", "bdc6ca": "d9c5bc", "d2e7ec": "eecaa2", - "9fbac1": "e19b78", - "101010": "101010" + "9fbac1": "e19b78" }, "2": { "1f2d63": "6e1a4c", @@ -24,11 +22,9 @@ "6ab6d2": "ffeeb8", "add7e7": "fffbec", "718b93": "933644", - "fbfbfb": "fbfbfb", "5091c0": "dea26c", "bdc6ca": "c5e4ea", "d2e7ec": "ec8b48", - "9fbac1": "d5543c", - "101010": "101010" + "9fbac1": "d5543c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/817.json b/public/images/pokemon/variant/exp/817.json index 5a54b6bdab3..d148636069b 100644 --- a/public/images/pokemon/variant/exp/817.json +++ b/public/images/pokemon/variant/exp/817.json @@ -8,10 +8,8 @@ "005980": "631425", "70cce0": "eb8577", "31b5d0": "cf5b5d", - "101010": "101010", "6ba01b": "a36d5d", "ccc7cd": "c7c1bd", - "fefefe": "fefefe", "3d6424": "83403e", "8cd222": "d99f8d" }, @@ -24,10 +22,8 @@ "005980": "7c2f23", "70cce0": "ffe5a3", "31b5d0": "fcbe6d", - "101010": "101010", "6ba01b": "ba2c22", "ccc7cd": "becee1", - "fefefe": "fefefe", "3d6424": "731317", "8cd222": "d85633" } diff --git a/public/images/pokemon/variant/exp/818.json b/public/images/pokemon/variant/exp/818.json index f624c2fd14a..023c086ae92 100644 --- a/public/images/pokemon/variant/exp/818.json +++ b/public/images/pokemon/variant/exp/818.json @@ -8,9 +8,6 @@ "01599a": "0ea6a8", "549bc3": "0060a4", "9cd2e2": "107ac0", - "fdfdfd": "fdfdfd", - "e3a32b": "e3a32b", - "101010": "101010", "31302f": "989dac", "646565": "f7fbfc", "4a4a4d": "c4ccd4", @@ -25,9 +22,7 @@ "01599a": "9c2734", "549bc3": "a55846", "9cd2e2": "e1926f", - "fdfdfd": "fdfdfd", "e3a32b": "5885a2", - "101010": "101010", "31302f": "251e1c", "646565": "4c4643", "4a4a4d": "342b2a", @@ -42,9 +37,7 @@ "01599a": "d8b284", "549bc3": "e38544", "9cd2e2": "ffcd57", - "fdfdfd": "fdfdfd", "e3a32b": "a13047", - "101010": "101010", "31302f": "571342", "646565": "be3a7d", "4a4a4d": "771b54", diff --git a/public/images/pokemon/variant/exp/822.json b/public/images/pokemon/variant/exp/822.json index 8e4a7614911..722c9d7f45c 100644 --- a/public/images/pokemon/variant/exp/822.json +++ b/public/images/pokemon/variant/exp/822.json @@ -6,10 +6,8 @@ "426eb2": "ffdeeb", "2f4577": "f4a0b9", "403524": "ad6f83", - "101010": "101010", "6d1b29": "5722a6", "e21d22": "8b51e1", - "f4f4f4": "f4f4f4", "95a1b6": "57445a", "444f59": "2e262f", "f85947": "8b51e1", @@ -22,10 +20,8 @@ "426eb2": "edd472", "2f4577": "eaae36", "403524": "b95212", - "101010": "101010", "6d1b29": "5a0015", "e21d22": "8f0021", - "f4f4f4": "f4f4f4", "95a1b6": "743419", "444f59": "541705", "f85947": "8f0021", diff --git a/public/images/pokemon/variant/exp/823.json b/public/images/pokemon/variant/exp/823.json index 8f2c6fe3a1d..75fa0626a8c 100644 --- a/public/images/pokemon/variant/exp/823.json +++ b/public/images/pokemon/variant/exp/823.json @@ -5,14 +5,12 @@ "303360": "ad6f83", "646ca8": "ffdeeb", "4d5488": "f4a0b9", - "010101": "010101", "ffa8a8": "ffc586", "f30101": "df7b10", "4e4150": "57445a", "2c2b58": "845195", "3e3d6d": "bc7dc3", - "18173d": "4b2a5e", - "2e262f": "2e262f" + "18173d": "4b2a5e" }, "2": { "251d4e": "612a0e", @@ -20,7 +18,6 @@ "303360": "b95212", "646ca8": "edd472", "4d5488": "eaae36", - "010101": "010101", "ffa8a8": "ff4a4a", "f30101": "e80000", "4e4150": "743419", diff --git a/public/images/pokemon/variant/exp/830.json b/public/images/pokemon/variant/exp/830.json index 58b1550cf2f..0b736376c07 100644 --- a/public/images/pokemon/variant/exp/830.json +++ b/public/images/pokemon/variant/exp/830.json @@ -6,7 +6,6 @@ "e8d5c6": "a2d2e7", "828a3f": "358699", "b6b23d": "8be8e4", - "101010": "101010", "fef0a0": "ece7c8", "bab743": "c38ec6", "5c6738": "6f3e7b", @@ -22,7 +21,6 @@ "e8d5c6": "d5aee9", "828a3f": "8243b6", "b6b23d": "b87def", - "101010": "101010", "fef0a0": "f4f1de", "bab743": "6a9cbb", "5c6738": "133049", diff --git a/public/images/pokemon/variant/exp/835.json b/public/images/pokemon/variant/exp/835.json index 708c7028bcd..fbb7122a337 100644 --- a/public/images/pokemon/variant/exp/835.json +++ b/public/images/pokemon/variant/exp/835.json @@ -1,7 +1,6 @@ { "1": { "844840": "051514", - "101010": "101010", "bd8d62": "e0bb76", "a26642": "aa8e5a", "6d943a": "28797b", @@ -11,26 +10,19 @@ "fbfbfb": "fdffe1", "cba685": "fbffc7", "9a6229": "13423f", - "f9f9f9": "f9f9f9", - "d1cccb": "e7c78d", - "837a76": "837a76", - "db6659": "db6659" + "d1cccb": "e7c78d" }, "2": { "844840": "313e38", - "101010": "101010", "bd8d62": "509468", "a26642": "3d5d59", "6d943a": "1e1a42", "76c745": "202758", "cf9529": "56447e", "f7da11": "776baf", - "fbfbfb": "fbfbfb", "cba685": "8cd3a5", "9a6229": "2b2042", - "f9f9f9": "f9f9f9", "d1cccb": "a0bcaa", - "837a76": "43554d", - "db6659": "db6659" + "837a76": "43554d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/850.json b/public/images/pokemon/variant/exp/850.json index c799fd3ac06..f65a10d09ff 100644 --- a/public/images/pokemon/variant/exp/850.json +++ b/public/images/pokemon/variant/exp/850.json @@ -1,9 +1,7 @@ { "1": { - "2f1610": "2f1610", "804a3e": "59365d", "bf3922": "117956", - "101010": "101010", "ff5839": "35c36c", "5b2f26": "36203c", "681607": "024f2d", @@ -11,22 +9,14 @@ "f89e08": "67ef9c", "ff836c": "5ff58e", "ffd901": "c8ffcc", - "be5409": "117956", - "fbfbfb": "fbfbfb" + "be5409": "117956" }, "2": { - "2f1610": "2f1610", "804a3e": "475294", "bf3922": "ae1165", - "101010": "101010", "ff5839": "d73981", "5b2f26": "36426c", "681607": "68063c", - "f77c42": "f77c42", - "f89e08": "f89e08", - "ff836c": "ff836c", - "ffd901": "ffc143", - "be5409": "be5409", - "fbfbfb": "fbfbfb" + "ffd901": "ffc143" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/851.json b/public/images/pokemon/variant/exp/851.json index 827ace8fc29..36675d6da87 100644 --- a/public/images/pokemon/variant/exp/851.json +++ b/public/images/pokemon/variant/exp/851.json @@ -4,7 +4,6 @@ "f89e08": "67ef9c", "ffd901": "c8ffcc", "bf3922": "1a8987", - "101010": "101010", "2f1610": "24122b", "5b2f26": "503154", "804a3e": "714272", @@ -12,7 +11,6 @@ "ff5839": "35c3a8", "b96f5d": "ad58ab", "941528": "005f35", - "fbfbfb": "fbfbfb", "42221c": "36203c", "000000": "101010" }, @@ -21,15 +19,12 @@ "f89e08": "f36d73", "ffd901": "ffc143", "bf3922": "ae1165", - "101010": "101010", "2f1610": "121439", "5b2f26": "36426c", "804a3e": "475294", "681607": "6e0442", "ff5839": "d73981", "b96f5d": "7866cb", - "941528": "941528", - "fbfbfb": "fbfbfb", "42221c": "222957", "000000": "101010" } diff --git a/public/images/pokemon/variant/exp/854.json b/public/images/pokemon/variant/exp/854.json index 8c4d24d68b2..fa1c80f0d51 100644 --- a/public/images/pokemon/variant/exp/854.json +++ b/public/images/pokemon/variant/exp/854.json @@ -1,12 +1,10 @@ { "1": { - "5e401f": "5e401f", "733a87": "cc752f", "cf9a4c": "592626", "ffd45c": "b7763c", "af63c4": "ffffeb", "c3bfe0": "f2bbaa", - "101010": "101010", "215557": "531d2b", "d38095": "ef9e5c", "f79e67": "eb8328", @@ -22,7 +20,6 @@ "ffd45c": "998c68", "af63c4": "82b183", "c3bfe0": "524c4e", - "101010": "101010", "215557": "222221", "d38095": "c6c95e", "f79e67": "f4f394", diff --git a/public/images/pokemon/variant/exp/855.json b/public/images/pokemon/variant/exp/855.json index c22bae10676..1d840d9f6cf 100644 --- a/public/images/pokemon/variant/exp/855.json +++ b/public/images/pokemon/variant/exp/855.json @@ -13,9 +13,7 @@ "f5f9fa": "f2bbaa", "f79e67": "eb8328", "d38095": "ef9e5c", - "733a87": "cc752f", - "101010": "101010", - "000000": "000000" + "733a87": "cc752f" }, "2": { "5e401f": "463f2b", @@ -31,8 +29,6 @@ "f5f9fa": "524c4e", "f79e67": "f4f394", "d38095": "c6c95e", - "733a87": "49755c", - "101010": "101010", - "000000": "000000" + "733a87": "49755c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/856.json b/public/images/pokemon/variant/exp/856.json index 3d245b74324..bfc575d89d7 100644 --- a/public/images/pokemon/variant/exp/856.json +++ b/public/images/pokemon/variant/exp/856.json @@ -2,7 +2,6 @@ "1": { "727ab1": "1d4a3b", "c8e9ff": "5ec183", - "181818": "181818", "acbfdf": "3b9665", "bb6a99": "043232", "f9d5da": "298675", @@ -13,7 +12,6 @@ "2": { "727ab1": "6b0124", "c8e9ff": "cb304d", - "181818": "181818", "acbfdf": "a11437", "bb6a99": "30163d", "f9d5da": "523f73", diff --git a/public/images/pokemon/variant/exp/858.json b/public/images/pokemon/variant/exp/858.json index 1f0c1cefab4..41e50e22464 100644 --- a/public/images/pokemon/variant/exp/858.json +++ b/public/images/pokemon/variant/exp/858.json @@ -3,7 +3,6 @@ "727ab1": "1d4a3b", "c8e9ff": "5ec183", "acbfdf": "3b9665", - "101010": "101010", "948fc2": "287b59", "d9cedb": "dec1c2", "e5e4ef": "f7e4e4", @@ -18,7 +17,6 @@ "727ab1": "6b0124", "c8e9ff": "cb304d", "acbfdf": "a11437", - "101010": "101010", "948fc2": "8c0e32", "d9cedb": "e4bcde", "e5e4ef": "ffecf9", diff --git a/public/images/pokemon/variant/exp/859.json b/public/images/pokemon/variant/exp/859.json index 703d5d67218..bb4e943fa79 100644 --- a/public/images/pokemon/variant/exp/859.json +++ b/public/images/pokemon/variant/exp/859.json @@ -8,9 +8,6 @@ "735aac": "a4332d", "947cd8": "cd643d", "f42252": "f55c14", - "101010": "101010", - "fdfdfd": "fdfdfd", - "c9c9c9": "c9c9c9", "8b73d5": "cc5836" }, "2": { @@ -22,8 +19,6 @@ "735aac": "f0c475", "947cd8": "d9975b", "f42252": "fc645a", - "101010": "101010", - "fdfdfd": "fdfdfd", "c9c9c9": "dad6bf", "8b73d5": "f9e9a4" } diff --git a/public/images/pokemon/variant/exp/860.json b/public/images/pokemon/variant/exp/860.json index 64c279dc81d..e9604691813 100644 --- a/public/images/pokemon/variant/exp/860.json +++ b/public/images/pokemon/variant/exp/860.json @@ -6,13 +6,9 @@ "352954": "3b1528", "fd0b42": "d24309", "5d4694": "8b332d", - "101010": "101010", "433568": "5a1d27", "8872b6": "c45949", - "c9c9c9": "c9c9c9", - "fdfdfd": "fdfdfd", "409555": "244849", - "000000": "000000", "47be62": "366c59", "356a3c": "162a35" }, @@ -23,13 +19,10 @@ "352954": "a26458", "fd0b42": "f0443e", "5d4694": "dfc784", - "101010": "101010", "433568": "c98e63", "8872b6": "f6e8b8", "c9c9c9": "dad6bf", - "fdfdfd": "fdfdfd", "409555": "272664", - "000000": "000000", "47be62": "3f386f", "356a3c": "090d50" } diff --git a/public/images/pokemon/variant/exp/861.json b/public/images/pokemon/variant/exp/861.json index f60f7b31a56..539009124d0 100644 --- a/public/images/pokemon/variant/exp/861.json +++ b/public/images/pokemon/variant/exp/861.json @@ -3,15 +3,11 @@ "356a3c": "162a35", "47be62": "366c59", "2f184e": "290527", - "101010": "101010", "5d4694": "8b332d", "409555": "244849", "fd0b42": "d24309", "433568": "5a1d27", - "c9c9c9": "c9c9c9", - "fdfdfd": "fdfdfd", "352954": "3b1528", - "7c8089": "7c8089", "e93761": "638a48", "f75c90": "7daf56" }, @@ -19,15 +15,12 @@ "356a3c": "090d50", "47be62": "3f386f", "2f184e": "6a2f3a", - "101010": "101010", "5d4694": "dfc784", "409555": "272664", "fd0b42": "f0443e", "433568": "c98e63", "c9c9c9": "dad6bf", - "fdfdfd": "fdfdfd", "352954": "a26458", - "7c8089": "7c8089", "e93761": "491337", "f75c90": "64233b" } diff --git a/public/images/pokemon/variant/exp/862.json b/public/images/pokemon/variant/exp/862.json index afcf3da4864..e2c25f4ec17 100644 --- a/public/images/pokemon/variant/exp/862.json +++ b/public/images/pokemon/variant/exp/862.json @@ -1,8 +1,6 @@ { "1": { - "1b2627": "1b2627", "474749": "156a66", - "010101": "010101", "f5f5f6": "f5ffea", "b2b3b2": "90c093", "303034": "094448", @@ -11,13 +9,11 @@ "6f7071": "01473a", "df84ad": "ff69fa", "9b4f69": "d414dd", - "fcfcfc": "fcfcfc", "494d56": "156a66" }, "2": { "1b2627": "060724", "474749": "8655e1", - "010101": "010101", "f5f5f6": "342d4c", "b2b3b2": "18133d", "303034": "5a3eb9", @@ -26,7 +22,6 @@ "6f7071": "2e1d7b", "df84ad": "54f1ff", "9b4f69": "0099ce", - "fcfcfc": "fcfcfc", "494d56": "8655e1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/863.json b/public/images/pokemon/variant/exp/863.json index 66d2b4fce96..bececb30c88 100644 --- a/public/images/pokemon/variant/exp/863.json +++ b/public/images/pokemon/variant/exp/863.json @@ -2,26 +2,20 @@ "1": { "66716c": "59879a", "bfc1bf": "b4e0d3", - "040303": "040303", "8f9c95": "85c1c0", "181a1d": "1c1922", "3d4547": "4e385a", "24282b": "342b49", "ef9b50": "fbe663", "dd5e33": "df9834", - "f3f3f3": "f3f3f3", "9aa094": "9fb8bc", "84726f": "928eb0", "5b4e4d": "4e455c", - "ada09a": "d5d0dd", - "111414": "111414", - "333a3b": "333a3b", - "736663": "736663" + "ada09a": "d5d0dd" }, "2": { "66716c": "331a37", "bfc1bf": "92264b", - "040303": "040303", "8f9c95": "6d0b3c", "181a1d": "0f2127", "3d4547": "417778", @@ -32,9 +26,6 @@ "9aa094": "a96840", "84726f": "27293c", "5b4e4d": "141626", - "ada09a": "4c4d62", - "111414": "111414", - "333a3b": "333a3b", - "736663": "736663" + "ada09a": "4c4d62" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/864.json b/public/images/pokemon/variant/exp/864.json index ccfc0f2d88d..84eab2bbe99 100644 --- a/public/images/pokemon/variant/exp/864.json +++ b/public/images/pokemon/variant/exp/864.json @@ -35,4 +35,4 @@ "bbb4bc": "0a7a57", "af9e9e": "48c492" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/867.json b/public/images/pokemon/variant/exp/867.json index fcf7e29867a..8b2b7fc38d9 100644 --- a/public/images/pokemon/variant/exp/867.json +++ b/public/images/pokemon/variant/exp/867.json @@ -1,7 +1,6 @@ { "1": { "393941": "69d9bf", - "101010": "101010", "d9d0d1": "d6b8a0", "c5b9bb": "c69981", "d66770": "334599", @@ -13,7 +12,6 @@ }, "2": { "393941": "a4222c", - "101010": "101010", "d9d0d1": "4fb66a", "c5b9bb": "298a61", "d66770": "ffe78d", diff --git a/public/images/pokemon/variant/exp/872.json b/public/images/pokemon/variant/exp/872.json index 21ea6cd4192..060816eced9 100644 --- a/public/images/pokemon/variant/exp/872.json +++ b/public/images/pokemon/variant/exp/872.json @@ -3,33 +3,24 @@ "7b8b9b": "345f5c", "acc3cc": "669a8c", "d8e9f0": "b7f1d6", - "f5fdff": "f5fdff", "edeae0": "a6d6a6", "b3a7c2": "73a878", - "101010": "101010", - "695e77": "275e43", - "fdfdfb": "fdfdfb" + "695e77": "275e43" }, "1": { "7b8b9b": "22504c", "acc3cc": "548e8f", "d8e9f0": "b6e7df", - "f5fdff": "f5fdff", "edeae0": "c1ebf3", "b3a7c2": "89a9be", - "101010": "101010", - "695e77": "354b63", - "fdfdfb": "fdfdfb" + "695e77": "354b63" }, "2": { "7b8b9b": "5a3993", "acc3cc": "a66ac2", "d8e9f0": "d5c3ff", - "f5fdff": "f5fdff", "edeae0": "e5a2da", "b3a7c2": "a060a0", - "101010": "101010", - "695e77": "5f3465", - "fdfdfb": "fdfdfb" + "695e77": "5f3465" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/873.json b/public/images/pokemon/variant/exp/873.json index 5ea93b1c3bb..2bf9938b290 100644 --- a/public/images/pokemon/variant/exp/873.json +++ b/public/images/pokemon/variant/exp/873.json @@ -5,7 +5,6 @@ "e7e0e6": "a6d6a6", "b3b4bd": "73a878", "8f8f9f": "547b58", - "101010": "101010", "758174": "497e7a", "c0e4c2": "eefffc", "a0baa8": "aae3d9", @@ -20,13 +19,11 @@ "e7e0e6": "c1ebf3", "b3b4bd": "8ebbca", "8f8f9f": "648397", - "101010": "101010", "758174": "428586", "c0e4c2": "d7fff8", "a0baa8": "7bcbc0", "4662ce": "0fa5bd", "8e9fe1": "2dd3e0", - "3f4474": "3f4474", "c0df86": "eefffb" }, "2": { @@ -35,7 +32,6 @@ "e7e0e6": "d78dcb", "b3b4bd": "864c86", "8f8f9f": "5f3465", - "101010": "101010", "758174": "795a9e", "c0e4c2": "e1e3ff", "a0baa8": "9f87ca", diff --git a/public/images/pokemon/variant/exp/876-female.json b/public/images/pokemon/variant/exp/876-female.json index 6803493d5e3..eb070b03fc2 100644 --- a/public/images/pokemon/variant/exp/876-female.json +++ b/public/images/pokemon/variant/exp/876-female.json @@ -5,7 +5,6 @@ "564c6c": "4a282a", "2f2642": "2c1419", "6c64a6": "b72e3e", - "101010": "101010", "d872e7": "79e28d", "ccb7c2": "c4a691", "fefefe": "e8d4bf", @@ -21,7 +20,6 @@ "564c6c": "d58da4", "2f2642": "444a8e", "6c64a6": "78aae5", - "101010": "101010", "d872e7": "ff9cca", "ccb7c2": "cbdbe6", "fefefe": "f0f2f3", diff --git a/public/images/pokemon/variant/exp/876.json b/public/images/pokemon/variant/exp/876.json index 4760b75fd31..8fbf83473af 100644 --- a/public/images/pokemon/variant/exp/876.json +++ b/public/images/pokemon/variant/exp/876.json @@ -3,9 +3,7 @@ "2e2641": "2c1419", "7d7493": "5a3736", "564c6c": "4a282a", - "101010": "101010", "2f2642": "2c1419", - "000000": "000000", "6c64a6": "b72e3e", "ccb7c2": "c4a691", "fefefe": "e8d4bf", @@ -20,16 +18,13 @@ "2e2641": "314c7c", "7d7493": "a3c5e8", "564c6c": "78a5d4", - "101010": "101010", "2f2642": "7a316c", - "000000": "000000", "6c64a6": "f589bb", "ccb7c2": "e6d2e7", "fefefe": "faeefa", "4d447e": "d268a7", "92605f": "0077dc", "733737": "2d4697", - "28b0e3": "28b0e3", "826882": "9b7e9e", "3d3055": "aa518a" } diff --git a/public/images/pokemon/variant/exp/877-hangry.json b/public/images/pokemon/variant/exp/877-hangry.json index 100665220df..44e48631166 100644 --- a/public/images/pokemon/variant/exp/877-hangry.json +++ b/public/images/pokemon/variant/exp/877-hangry.json @@ -1,19 +1,13 @@ { "0": { - "101010": "101010", "383634": "540606", "6c6c6c": "952222", "4f4b47": "3a1010", "9958ce": "cebb58", "6b3d96": "967f3d", - "ff151c": "ff151c", - "f38bb7": "f38bb7", - "9f9f9f": "9f9f9f", - "fbfbfb": "fbfbfb", "493061": "615e30" }, "1": { - "101010": "101010", "383634": "212020", "6c6c6c": "3a3a3a", "4f4b47": "161514", @@ -21,21 +15,13 @@ "6b3d96": "a2512c", "ff151c": "ff6b00", "f38bb7": "f3a18b", - "9f9f9f": "9f9f9f", - "fbfbfb": "fbfbfb", "493061": "753e25" }, "2": { - "101010": "101010", - "383634": "383634", - "6c6c6c": "6c6c6c", - "4f4b47": "4f4b47", "9958ce": "7fba7f", "6b3d96": "568351", "ff151c": "065b06", "f38bb7": "468e46", - "9f9f9f": "9f9f9f", - "fbfbfb": "fbfbfb", "493061": "306135" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/877.json b/public/images/pokemon/variant/exp/877.json index 4be9b0e5c12..73ab51ab3f0 100644 --- a/public/images/pokemon/variant/exp/877.json +++ b/public/images/pokemon/variant/exp/877.json @@ -1,48 +1,28 @@ { "0": { - "383634": "383634", - "101010": "101010", "8a5e48": "383634", - "6c6c6c": "6c6c6c", "cf9c66": "6c6c6c", "af7044": "4f4b47", - "4f4b47": "4f4b47", "d3b351": "8851d3", - "f4f489": "b689f4", - "fbfbfb": "fbfbfb", - "5c5c5c": "5c5c5c", - "f38bb7": "f38bb7", - "b24244": "b24244", - "e76961": "e76961" + "f4f489": "b689f4" }, "1": { - "383634": "383634", - "101010": "101010", "8a5e48": "2541ad", "6c6c6c": "58666d", "cf9c66": "86aaff", "af7044": "2c439d", - "4f4b47": "4f4b47", "d3b351": "8b8853", "f4f489": "fff98f", - "fbfbfb": "fbfbfb", - "5c5c5c": "5c5c5c", "f38bb7": "1010b3", "b24244": "424eb2", "e76961": "61b6e7" }, "2": { - "383634": "383634", - "101010": "101010", "8a5e48": "4f8a48", - "6c6c6c": "6c6c6c", "cf9c66": "71cf66", "af7044": "44af5b", - "4f4b47": "4f4b47", "d3b351": "b6b6b6", "f4f489": "f8f8f8", - "fbfbfb": "fbfbfb", - "5c5c5c": "5c5c5c", "f38bb7": "a1f38b", "b24244": "388040", "e76961": "95e69d" diff --git a/public/images/pokemon/variant/exp/880.json b/public/images/pokemon/variant/exp/880.json index 96812db4d1b..2ce8fb7dfff 100644 --- a/public/images/pokemon/variant/exp/880.json +++ b/public/images/pokemon/variant/exp/880.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "975e17": "5b0610", "ffff84": "ee8563", "e39e1e": "9c1430", @@ -12,71 +11,28 @@ "871f16": "427d47", "47202a": "20132d", "732c3e": "271d3c", - "0f1514": "0f1514", "b3761a": "271447", - "301613": "301613", - "491a15": "491a15", "ff9946": "bb3333", "008567": "757798", "005e44": "564e6e", "39ad5a": "a2b5c8", "003319": "26233c", - "4c3313": "4c3313", - "4c321e": "4c321e", - "b68b0f": "b68b0f", - "3a1c23": "3a1c23", - "471f29": "471f29", - "5f8047": "5f8047", - "747335": "40030a", - "101514": "101514", - "171412": "171412", - "5a2532": "5a2532", - "8a3248": "8a3248", - "322412": "322412", - "7b4d28": "7b4d28", - "17160f": "17160f", - "654114": "654114", - "171410": "171410", - "2f191e": "2f191e" + "747335": "40030a" }, "2": { - "101010": "101010", "975e17": "211b3d", "ffff84": "dceeeb", "e39e1e": "35365e", - "8f261b": "8f261b", "ead900": "636287", "ed4e76": "ca5939", "ff8d9f": "e28854", "ff3868": "48d385", "871f16": "239d73", - "47202a": "47202a", - "732c3e": "732c3e", - "0f1514": "0f1514", - "b3761a": "b3761a", - "301613": "301613", - "491a15": "491a15", "ff9946": "8993b9", "008567": "fff491", "005e44": "f1b45f", "39ad5a": "ce734d", "003319": "671d18", - "4c3313": "4c3313", - "4c321e": "4c321e", - "b68b0f": "b68b0f", - "3a1c23": "3a1c23", - "471f29": "471f29", - "5f8047": "5f8047", - "747335": "1a122d", - "101514": "101514", - "171412": "171412", - "5a2532": "5a2532", - "8a3248": "8a3248", - "322412": "322412", - "7b4d28": "7b4d28", - "17160f": "17160f", - "654114": "654114", - "171410": "171410", - "2f191e": "2f191e" + "747335": "1a122d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/881.json b/public/images/pokemon/variant/exp/881.json index 0d408a71172..d32717017a5 100644 --- a/public/images/pokemon/variant/exp/881.json +++ b/public/images/pokemon/variant/exp/881.json @@ -1,7 +1,6 @@ { "1": { "975e17": "5b0610", - "101010": "101010", "ffff84": "ee8563", "e39e1e": "9c1430", "ead900": "c6362b", @@ -20,7 +19,6 @@ }, "2": { "975e17": "211b3d", - "101010": "101010", "ffff84": "dceeeb", "e39e1e": "35365e", "ead900": "636287", diff --git a/public/images/pokemon/variant/exp/883.json b/public/images/pokemon/variant/exp/883.json index 723a0a9bd40..f90d3ed38a4 100644 --- a/public/images/pokemon/variant/exp/883.json +++ b/public/images/pokemon/variant/exp/883.json @@ -5,7 +5,6 @@ "777ebd": "cc6235", "172459": "771922", "edf3f2": "faebc8", - "101010": "101010", "09354d": "2f1f1a", "085d94": "714363", "9ab8ba": "cea5b9", @@ -20,7 +19,6 @@ "777ebd": "6c1046", "172459": "320432", "edf3f2": "fcffe4", - "101010": "101010", "09354d": "2f1a20", "085d94": "ad3b6c", "9ab8ba": "a3c465", diff --git a/public/images/pokemon/variant/exp/884.json b/public/images/pokemon/variant/exp/884.json index 962edf2d6da..f4e311bd455 100644 --- a/public/images/pokemon/variant/exp/884.json +++ b/public/images/pokemon/variant/exp/884.json @@ -2,7 +2,6 @@ "1": { "68353c": "871e14", "b96a6a": "cd452b", - "151515": "151515", "c4bac5": "c19b85", "e4e5f1": "f8e0cf", "837080": "5d392f", @@ -18,7 +17,6 @@ "2": { "68353c": "062449", "b96a6a": "2077a6", - "151515": "151515", "c4bac5": "3d3268", "e4e5f1": "6e5ca6", "837080": "1a0e34", diff --git a/public/images/pokemon/variant/exp/885.json b/public/images/pokemon/variant/exp/885.json index 8dc901e6476..2fc1383bea0 100644 --- a/public/images/pokemon/variant/exp/885.json +++ b/public/images/pokemon/variant/exp/885.json @@ -2,7 +2,6 @@ "0": { "3a583c": "133056", "fa5494": "efa93f", - "101010": "101010", "cc4066": "cc8225", "5f875a": "2f6c89", "476b48": "20486e", @@ -17,7 +16,6 @@ "1": { "3a583c": "2f040d", "fa5494": "4590da", - "101010": "101010", "cc4066": "3261b7", "5f875a": "6b242e", "476b48": "4e0e17", @@ -32,7 +30,6 @@ "2": { "3a583c": "1f0c2c", "fa5494": "68c7c4", - "101010": "101010", "cc4066": "2a8286", "5f875a": "3c2750", "476b48": "231234", diff --git a/public/images/pokemon/variant/exp/886.json b/public/images/pokemon/variant/exp/886.json index 5a32a09d5cc..4bed517c28e 100644 --- a/public/images/pokemon/variant/exp/886.json +++ b/public/images/pokemon/variant/exp/886.json @@ -2,7 +2,6 @@ "0": { "444e62": "2d365a", "addcbc": "6accd6", - "101010": "101010", "5f875a": "2f6c89", "2c323f": "192250", "566f89": "465272", @@ -19,7 +18,6 @@ "1": { "444e62": "4a1621", "addcbc": "da6151", - "101010": "101010", "5f875a": "6b242e", "2c323f": "2e080d", "566f89": "602034", @@ -36,7 +34,6 @@ "2": { "444e62": "231b45", "addcbc": "927fa1", - "101010": "101010", "5f875a": "3c2750", "2c323f": "251b31", "566f89": "3b2e5d", @@ -46,8 +43,6 @@ "ffe322": "87ff46", "7fb3b1": "8b659f", "5b878c": "6c4d85", - "b5a36a": "b5a36a", - "dbd39d": "dbd39d", "000000": "101010" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/887.json b/public/images/pokemon/variant/exp/887.json index a15fdf3c9ec..6e3ccfb6e8b 100644 --- a/public/images/pokemon/variant/exp/887.json +++ b/public/images/pokemon/variant/exp/887.json @@ -1,7 +1,6 @@ { "0": { "2c323f": "192250", - "101010": "101010", "566f89": "46557b", "444e62": "2c3867", "fa5494": "efa93f", @@ -22,7 +21,6 @@ }, "1": { "2c323f": "2e080d", - "101010": "101010", "566f89": "6c273d", "444e62": "4a1621", "fa5494": "4590da", @@ -43,7 +41,6 @@ }, "2": { "2c323f": "1b163f", - "101010": "101010", "566f89": "4c3f6f", "444e62": "332a59", "fa5494": "68c7c4", diff --git a/public/images/pokemon/variant/exp/888-crowned.json b/public/images/pokemon/variant/exp/888-crowned.json index a78ba1d9299..2bb8608a4d8 100644 --- a/public/images/pokemon/variant/exp/888-crowned.json +++ b/public/images/pokemon/variant/exp/888-crowned.json @@ -3,8 +3,6 @@ "f2db8a": "a1c9cd", "8f4e2f": "2f4567", "d79a53": "5a829b", - "080808": "080808", - "000000": "000000", "3471b4": "b74323", "2d4377": "5c1a1d", "4999da": "ec813b", @@ -14,15 +12,12 @@ "fae2c0": "fff8cd", "d3a79a": "da9772", "34313e": "32171f", - "fdfdfd": "fdfdfd", "9d6862": "a85f49" }, "2": { "f2db8a": "c4826b", "8f4e2f": "692e47", "d79a53": "964c5c", - "080808": "080808", - "000000": "000000", "3471b4": "9fa7d0", "2d4377": "615c7e", "4999da": "e6ecff", @@ -32,7 +27,6 @@ "fae2c0": "3d5b72", "d3a79a": "243149", "34313e": "1a1829", - "fdfdfd": "fdfdfd", "9d6862": "1c2238" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/888.json b/public/images/pokemon/variant/exp/888.json index f949289b05b..4941ed244e1 100644 --- a/public/images/pokemon/variant/exp/888.json +++ b/public/images/pokemon/variant/exp/888.json @@ -1,7 +1,6 @@ { "1": { "2d4377": "5c1a1d", - "080808": "080808", "4999da": "ec813b", "3471b4": "b74323", "f45353": "448b48", @@ -10,13 +9,10 @@ "34313e": "32171f", "be3c45": "224d42", "93262f": "0d2729", - "fdfdfd": "fdfdfd", - "9d6862": "a85f49", - "000000": "000000" + "9d6862": "a85f49" }, "2": { "2d4377": "615c7e", - "080808": "080808", "4999da": "e6ecff", "3471b4": "9fa7d0", "f45353": "902d57", @@ -25,8 +21,6 @@ "34313e": "1a1829", "be3c45": "6c1d59", "93262f": "431042", - "fdfdfd": "fdfdfd", - "9d6862": "1c2238", - "000000": "000000" + "9d6862": "1c2238" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/889-crowned.json b/public/images/pokemon/variant/exp/889-crowned.json index 65bffb601fc..61ac4b3949b 100644 --- a/public/images/pokemon/variant/exp/889-crowned.json +++ b/public/images/pokemon/variant/exp/889-crowned.json @@ -1,7 +1,6 @@ { "1": { "2d2f7b": "102c2c", - "080808": "080808", "396dce": "70a757", "2d48a8": "3c6959", "8f4e2f": "2f4567", @@ -9,17 +8,14 @@ "d79a53": "5a829b", "eb363a": "614378", "fffccc": "d3eeea", - "000000": "000000", "731a27": "1c163d", "ae2836": "422b61", "34313e": "19142f", - "fdfdfd": "fdfdfd", "8887a8": "d69f97", "c2c3cf": "ffe0cc" }, "2": { "2d2f7b": "244e61", - "080808": "080808", "396dce": "6fc7c1", "2d48a8": "4797a4", "8f4e2f": "692e47", @@ -27,11 +23,9 @@ "d79a53": "964c5c", "eb363a": "e6ecff", "fffccc": "e5b885", - "000000": "000000", "731a27": "615c7e", "ae2836": "9fa7d0", "34313e": "19142f", - "fdfdfd": "fdfdfd", "8887a8": "442e49", "c2c3cf": "694f69" } diff --git a/public/images/pokemon/variant/exp/889.json b/public/images/pokemon/variant/exp/889.json index 0d3dbf024cb..3c172653f72 100644 --- a/public/images/pokemon/variant/exp/889.json +++ b/public/images/pokemon/variant/exp/889.json @@ -3,30 +3,24 @@ "2d2f7b": "102c2c", "396dce": "70a757", "2d48a8": "3c6959", - "080808": "080808", "f2db8a": "a1c9cd", "731a27": "1c163d", "eb363a": "614378", "ae2836": "422b61", "c2c3cf": "ffe0cc", - "000000": "000000", "8887a8": "d69f97", - "34313e": "19142f", - "fdfdfd": "fdfdfd" + "34313e": "19142f" }, "2": { "2d2f7b": "244e61", "396dce": "6fc7c1", "2d48a8": "4797a4", - "080808": "080808", "f2db8a": "c4826b", "731a27": "615c7e", "eb363a": "e6ecff", "ae2836": "9fa7d0", "c2c3cf": "694f69", - "000000": "000000", "8887a8": "442e49", - "34313e": "22192c", - "fdfdfd": "fdfdfd" + "34313e": "22192c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/890-eternamax.json b/public/images/pokemon/variant/exp/890-eternamax.json index 18f3ca3f097..6445f792042 100644 --- a/public/images/pokemon/variant/exp/890-eternamax.json +++ b/public/images/pokemon/variant/exp/890-eternamax.json @@ -1,7 +1,6 @@ { "1": { "25134c": "162a52", - "010101": "010101", "3622a7": "406d89", "6461ba": "4989a6", "31245f": "264864", @@ -14,7 +13,6 @@ }, "2": { "25134c": "354e95", - "010101": "010101", "3622a7": "bfd1fa", "6461ba": "e1ecff", "31245f": "87a3dd", diff --git a/public/images/pokemon/variant/exp/890.json b/public/images/pokemon/variant/exp/890.json index 781768fde0d..749b4491943 100644 --- a/public/images/pokemon/variant/exp/890.json +++ b/public/images/pokemon/variant/exp/890.json @@ -2,18 +2,14 @@ "2": { "26124d": "4963af", "3a15bc": "bfd1fa", - "010101": "010101", "b21833": "7b2f0e", "eb1533": "cb7622", "9a2433": "732208", "3d2871": "87a3dd", "f46d70": "f1bd4b", "fb2553": "934516", - "675cc5": "675cc5", "ffbcbc": "de9335", - "12042d": "12042d", "e22dbc": "298fb9", - "f18cd5": "73e5dc", - "fefefe": "fefefe" + "f18cd5": "73e5dc" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/891.json b/public/images/pokemon/variant/exp/891.json index e5eb250ad71..a8d182967a2 100644 --- a/public/images/pokemon/variant/exp/891.json +++ b/public/images/pokemon/variant/exp/891.json @@ -5,10 +5,7 @@ "b5ada6": "ad9a8a", "9194a2": "9e988d", "c9cccd": "c8c4c3", - "101010": "101010", "fbfbfb": "f4f4f4", - "262628": "262628", - "fefefe": "fefefe", "655e65": "5c5653", "cdab78": "c75d57", "f8f3a0": "f99350", @@ -21,14 +18,10 @@ "b5ada6": "475b68", "9194a2": "181b33", "c9cccd": "2e3549", - "101010": "101010", "fbfbfb": "444f5b", - "262628": "262628", - "fefefe": "fefefe", "655e65": "433e3f", "cdab78": "cd9e79", "f8f3a0": "f8cf9f", - "b37a55": "b37a55", "393539": "292124" }, "2": { @@ -37,10 +30,7 @@ "b5ada6": "a4a4bc", "9194a2": "7f1c27", "c9cccd": "a52139", - "101010": "101010", "fbfbfb": "d33b3d", - "262628": "262628", - "fefefe": "fefefe", "655e65": "8b8d99", "cdab78": "d6b58f", "f8f3a0": "ffe3ba", diff --git a/public/images/pokemon/variant/exp/892-rapid-strike.json b/public/images/pokemon/variant/exp/892-rapid-strike.json index f9609dbeb89..a0e80f70437 100644 --- a/public/images/pokemon/variant/exp/892-rapid-strike.json +++ b/public/images/pokemon/variant/exp/892-rapid-strike.json @@ -3,23 +3,17 @@ "4f4b58": "4a2e27", "8d8c8e": "957961", "6b6574": "725444", - "010101": "010101", "605f4d": "513b46", "282d26": "25141f", - "fcfcfc": "fcfcfc", - "b9b9b9": "b9b9b9", "9e6225": "8b222f", "fffa60": "ff9736", "d5a926": "b95826", - "42473a": "382334", - "b4b4b4": "b4b4b4", - "fefefe": "fefefe" + "42473a": "382334" }, "1": { "4f4b58": "263138", "8d8c8e": "809ba3", "6b6574": "4c6877", - "010101": "010101", "605f4d": "444f5b", "282d26": "181b33", "fcfcfc": "b3c0c6", @@ -27,15 +21,12 @@ "9e6225": "272735", "fffa60": "616368", "d5a926": "494b54", - "42473a": "2e3549", - "b4b4b4": "b4b4b4", - "fefefe": "fefefe" + "42473a": "2e3549" }, "2": { "4f4b58": "56546b", "8d8c8e": "e8e8ff", "6b6574": "a4a4bc", - "010101": "010101", "605f4d": "213199", "282d26": "07073f", "fcfcfc": "4169d3", @@ -43,8 +34,6 @@ "9e6225": "875537", "fffa60": "f7caa0", "d5a926": "cc9278", - "42473a": "111a6b", - "b4b4b4": "b4b4b4", - "fefefe": "fefefe" + "42473a": "111a6b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/892.json b/public/images/pokemon/variant/exp/892.json index cb7d7978b0a..7b2dd61bfdb 100644 --- a/public/images/pokemon/variant/exp/892.json +++ b/public/images/pokemon/variant/exp/892.json @@ -1,23 +1,17 @@ { "0": { "605f4d": "513b46", - "010101": "010101", - "fcfcfc": "fcfcfc", "4f4b58": "4a2e27", - "b9b9b9": "b9b9b9", "8d8c8e": "957961", "6b6574": "725444", "282d26": "25141f", "42473a": "382334", "9e6225": "8b222f", "fffa60": "ff9736", - "b4b4b4": "b4b4b4", - "d5a926": "b95826", - "fefefe": "fefefe" + "d5a926": "b95826" }, "1": { "605f4d": "444f5b", - "010101": "010101", "fcfcfc": "b3c0c6", "4f4b58": "263138", "b9b9b9": "768187", @@ -27,13 +21,10 @@ "42473a": "2e3549", "9e6225": "272735", "fffa60": "616368", - "b4b4b4": "b4b4b4", - "d5a926": "494b54", - "fefefe": "fefefe" + "d5a926": "494b54" }, "2": { "605f4d": "870e2a", - "010101": "010101", "fcfcfc": "d33b3d", "4f4b58": "56546b", "b9b9b9": "a52139", @@ -43,8 +34,6 @@ "42473a": "51081e", "9e6225": "875537", "fffa60": "f7caa0", - "b4b4b4": "b4b4b4", - "d5a926": "cc9278", - "fefefe": "fefefe" + "d5a926": "cc9278" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/896.json b/public/images/pokemon/variant/exp/896.json index 46c929da9e3..6684803c8a3 100644 --- a/public/images/pokemon/variant/exp/896.json +++ b/public/images/pokemon/variant/exp/896.json @@ -1,7 +1,6 @@ { "0": { "8cacdd": "8f84c9", - "101010": "101010", "bbd2ff": "b9abea", "eeeef3": "f6ebf6", "cbc1cc": "c9c0d4", @@ -13,7 +12,6 @@ }, "1": { "8cacdd": "41d5b3", - "101010": "101010", "bbd2ff": "9dffff", "eeeef3": "d7ffff", "cbc1cc": "90f6da", @@ -25,7 +23,6 @@ }, "2": { "8cacdd": "bc393b", - "101010": "101010", "bbd2ff": "f68c79", "eeeef3": "fde3d6", "cbc1cc": "f3bca6", diff --git a/public/images/pokemon/variant/exp/897.json b/public/images/pokemon/variant/exp/897.json index 4d99bd33678..491f1aeb1f0 100644 --- a/public/images/pokemon/variant/exp/897.json +++ b/public/images/pokemon/variant/exp/897.json @@ -1,20 +1,14 @@ { "0": { - "3c3c3c": "3c3c3c", - "101010": "101010", "525852": "5d5458", "00285c": "632741", "49478f": "894061", "7c5bcf": "d05a82", - "d9a4e3": "d9a4e3", - "fcfcfc": "fcfcfc", - "755179": "755179", "504e8e": "80447d", "8776e4": "b862b3" }, "1": { "3c3c3c": "622d51", - "101010": "101010", "525852": "904c75", "00285c": "6e1817", "49478f": "932f27", @@ -27,7 +21,6 @@ }, "2": { "3c3c3c": "3a6965", - "101010": "101010", "525852": "5c8a7b", "00285c": "0d2222", "49478f": "13312b", diff --git a/public/images/pokemon/variant/exp/898-ice.json b/public/images/pokemon/variant/exp/898-ice.json index fc6f15bc841..370e2e323f8 100644 --- a/public/images/pokemon/variant/exp/898-ice.json +++ b/public/images/pokemon/variant/exp/898-ice.json @@ -1,7 +1,6 @@ { "0": { "8cacdd": "8f84c9", - "101010": "101010", "bbd2ff": "b9abea", "004037": "00403c", "007766": "00776f", @@ -9,9 +8,7 @@ "eeeef3": "f6ebf6", "cbc1cc": "c9c0d4", "525852": "6a5837", - "fcfcfc": "fcfcfc", "d1c8be": "d7c881", - "c7c8cd": "c7c8cd", "9e8f87": "ae8b50", "003071": "2f104f", "6c6271": "68627a", @@ -22,7 +19,6 @@ }, "1": { "8cacdd": "41d5b3", - "101010": "101010", "bbd2ff": "9dffff", "004037": "00124d", "007766": "345ab5", @@ -30,9 +26,7 @@ "eeeef3": "d7ffff", "cbc1cc": "90f6da", "525852": "38255f", - "fcfcfc": "fcfcfc", "d1c8be": "ba9ded", - "c7c8cd": "c7c8cd", "9e8f87": "927ec4", "003071": "014837", "6c6271": "35486b", @@ -43,7 +37,6 @@ }, "2": { "8cacdd": "bc393b", - "101010": "101010", "bbd2ff": "f68c79", "004037": "3c1522", "007766": "88253e", diff --git a/public/images/pokemon/variant/exp/898-shadow.json b/public/images/pokemon/variant/exp/898-shadow.json index b4aad1b5ce9..981918477d5 100644 --- a/public/images/pokemon/variant/exp/898-shadow.json +++ b/public/images/pokemon/variant/exp/898-shadow.json @@ -2,21 +2,14 @@ "0": { "004037": "00403c", "007766": "00776f", - "3c3c3c": "3c3c3c", "00584b": "005852", - "101010": "101010", "525852": "5d5458", "00285c": "632741", - "fbfbfb": "fbfbfb", "4d524d": "6a5837", "d1c8be": "d7c881", "49478f": "894061", "7c5bcf": "d05a82", - "d9a4e3": "d9a4e3", "9e8f87": "ae8b50", - "c7c8cd": "c7c8cd", - "fcfcfc": "fcfcfc", - "755179": "755179", "4679b7": "3b2948", "00285b": "3b2948", "504e8e": "80447d", @@ -27,17 +20,14 @@ "007766": "345ab5", "3c3c3c": "622d51", "00584b": "183986", - "101010": "101010", "525852": "904c75", "00285c": "6e1817", - "fbfbfb": "fbfbfb", "4d524d": "38255f", "d1c8be": "ba9ded", "49478f": "932f27", "7c5bcf": "cc5837", "d9a4e3": "ff8478", "9e8f87": "927ec4", - "c7c8cd": "c7c8cd", "fcfcfc": "fff3c6", "755179": "a63938", "4679b7": "8d075a", @@ -50,7 +40,6 @@ "007766": "88253e", "3c3c3c": "3a6965", "00584b": "601b35", - "101010": "101010", "525852": "5c8a7b", "00285c": "0d2222", "fbfbfb": "fefdeb", diff --git a/public/images/pokemon/variant/exp/898.json b/public/images/pokemon/variant/exp/898.json index f22e19ed94d..b91fcf52a3d 100644 --- a/public/images/pokemon/variant/exp/898.json +++ b/public/images/pokemon/variant/exp/898.json @@ -6,9 +6,7 @@ "00584b": "005852", "007766": "00776f", "003a87": "71517a", - "101010": "101010", "615350": "6a5837", - "fcfcfc": "fcfcfc", "c7c8cd": "ccc6d1", "9e8f87": "ae8b50", "d1c8be": "d7c881", @@ -22,9 +20,7 @@ "00584b": "183986", "007766": "345ab5", "003a87": "c64883", - "101010": "101010", "615350": "38255f", - "fcfcfc": "fcfcfc", "c7c8cd": "ccc6d1", "9e8f87": "927ec4", "d1c8be": "ba9ded", @@ -38,7 +34,6 @@ "00584b": "601b35", "007766": "88253e", "003a87": "cc8c49", - "101010": "101010", "615350": "181935", "fcfcfc": "fefdeb", "c7c8cd": "c4bdb3", diff --git a/public/images/pokemon/variant/exp/900.json b/public/images/pokemon/variant/exp/900.json index 768fbad4452..c04f7f8c108 100644 --- a/public/images/pokemon/variant/exp/900.json +++ b/public/images/pokemon/variant/exp/900.json @@ -1,30 +1,17 @@ { "1": { - "412d2b": "412d2b", - "715f5d": "715f5d", - "574644": "574644", - "000000": "000000", "69441a": "221a69", "a77235": "354da7", "d29f4b": "4b84d2", - "ffffff": "ffffff", - "3f6378": "3f6378", - "ddf5ff": "ddf5ff", - "dab16e": "6e79da", - "f3e4c0": "f3e4c0" + "dab16e": "6e79da" }, "2": { "412d2b": "424242", "715f5d": "71705d", "574644": "808080", - "000000": "000000", "69441a": "a54200", "a77235": "e68400", "d29f4b": "ffde00", - "ffffff": "ffffff", - "3f6378": "3f6378", - "ddf5ff": "ddf5ff", - "dab16e": "dad46e", - "f3e4c0": "f3e4c0" + "dab16e": "dad46e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/901.json b/public/images/pokemon/variant/exp/901.json index 8c830cd27e3..14961e69576 100644 --- a/public/images/pokemon/variant/exp/901.json +++ b/public/images/pokemon/variant/exp/901.json @@ -4,18 +4,10 @@ "231a18": "0c1515", "63443d": "31563f", "502f29": "273b32", - "77655b": "77655b", - "0f0f0f": "0f0f0f", - "9c8d86": "9c8d86", - "4b4236": "4b4236", "ca8b35": "c48e81", "fec643": "f7eee1", - "fcfcfc": "fcfcfc", "25521f": "557f24", - "fec672": "f2cab8", - "7a1349": "7a1349", - "95908a": "95908a", - "b4b4b1": "b4b4b1" + "fec672": "f2cab8" }, "2": { "382423": "1e2249", @@ -23,16 +15,11 @@ "63443d": "46527a", "502f29": "323760", "77655b": "c199ae", - "0f0f0f": "0f0f0f", "9c8d86": "ede6eb", "4b4236": "593d4a", "ca8b35": "437aff", "fec643": "bfeeff", - "fcfcfc": "fcfcfc", "25521f": "f83259", - "fec672": "96b7ff", - "7a1349": "7a1349", - "95908a": "95908a", - "b4b4b1": "b4b4b1" + "fec672": "96b7ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/903.json b/public/images/pokemon/variant/exp/903.json index 703b11b471a..baa290c16a3 100644 --- a/public/images/pokemon/variant/exp/903.json +++ b/public/images/pokemon/variant/exp/903.json @@ -2,7 +2,6 @@ "1": { "352d37": "113b69", "4e3f50": "136e81", - "101010": "101010", "4d4b65": "3a0f0e", "7a8eb1": "9f4c3d", "a2bddb": "bd795f", @@ -10,14 +9,12 @@ "a47b39": "6e6f6f", "fe2f29": "31dabb", "7e62b9": "722738", - "fcfcfc": "fcfcfc", "ecc733": "a7a7a7", "5e4181": "4b1320" }, "2": { "352d37": "601522", "4e3f50": "982e33", - "101010": "101010", "4d4b65": "0e2125", "7a8eb1": "194648", "a2bddb": "256258", diff --git a/public/images/pokemon/variant/exp/909.json b/public/images/pokemon/variant/exp/909.json index 0ea1af439d6..55e965387b4 100644 --- a/public/images/pokemon/variant/exp/909.json +++ b/public/images/pokemon/variant/exp/909.json @@ -9,16 +9,8 @@ "e85234": "366565", "baaeaa": "a4ba9e", "f4f4e4": "ffffff", - "000000": "000000", - "ffffff": "ffffff", - "4b4b4b": "4b4b4b", - "593b4b": "593b4b", - "876167": "876167", - "d39794": "d39794", "885c29": "63cbcb", - "cb9c3d": "8cd9d9", - "303239": "303239", - "777777": "777777" + "cb9c3d": "8cd9d9" }, "2": { "e2762d": "2ce455", @@ -26,19 +18,8 @@ "fcf676": "78ff99", "60182b": "162319", "ab3c28": "243929", - "77645e": "77645e", "e85234": "38583f", - "baaeaa": "baaeaa", - "f4f4e4": "f4f4e4", - "000000": "000000", - "ffffff": "ffffff", - "4b4b4b": "4b4b4b", - "593b4b": "593b4b", - "876167": "876167", - "d39794": "d39794", "885c29": "26c148", - "cb9c3d": "2ce455", - "303239": "303239", - "777777": "777777" + "cb9c3d": "2ce455" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/912.json b/public/images/pokemon/variant/exp/912.json index a374c871331..6dc013c4500 100644 --- a/public/images/pokemon/variant/exp/912.json +++ b/public/images/pokemon/variant/exp/912.json @@ -3,14 +3,12 @@ "1f5978": "8c3b14", "3686b1": "d96536", "2fbee8": "e69c51", - "0f0f0f": "0f0f0f", "84d7ff": "f7ca7b", "f2fdff": "fff0d4", "4d6373": "a05926", "f6fbfc": "ffe3b0", "becde4": "d79f63", "001b77": "7f0e0b", - "ffffff": "ffffff", "7999bd": "b17d4f", "005ba2": "a2301b", "6a6a41": "3b2e28", diff --git a/public/images/pokemon/variant/exp/913.json b/public/images/pokemon/variant/exp/913.json index ef10ed6c0e4..1626944ed42 100644 --- a/public/images/pokemon/variant/exp/913.json +++ b/public/images/pokemon/variant/exp/913.json @@ -6,12 +6,10 @@ "1e7cd3": "bd3c24", "304f5a": "62290c", "64d9ea": "ffb75c", - "0f0f0f": "0f0f0f", "4296a2": "f77122", "ab9a3a": "5b5450", "735c28": "3b2e28", "ffdf2b": "868382", - "ffffff": "ffffff", "535153": "975432", "fcfcfc": "ffe3b0", "af9aa5": "d79f63" diff --git a/public/images/pokemon/variant/exp/914.json b/public/images/pokemon/variant/exp/914.json index 88384878b7a..f17ee8abcc1 100644 --- a/public/images/pokemon/variant/exp/914.json +++ b/public/images/pokemon/variant/exp/914.json @@ -2,7 +2,6 @@ "2": { "3d7a71": "541222", "55dbe6": "f15e76", - "0f0f0f": "0f0f0f", "394bee": "1d6c42", "282a4d": "072a2b", "419bc2": "a22f49", @@ -13,11 +12,9 @@ "a24720": "eac7b4", "eda936": "ffa564", "803213": "4b251b", - "ffffff": "ffffff", "efffff": "4b40be", "cb7e29": "c76740", "8ea6a8": "3b188e", - "63797f": "120e4a", - "004040": "004040" + "63797f": "120e4a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/919.json b/public/images/pokemon/variant/exp/919.json index 2a5000c4454..aadaafcc570 100644 --- a/public/images/pokemon/variant/exp/919.json +++ b/public/images/pokemon/variant/exp/919.json @@ -2,7 +2,6 @@ "0": { "2f3342": "1a1815", "63738c": "4b453d", - "000000": "000000", "8291a6": "6c655c", "454b61": "302d27", "ada7b2": "a29d62", @@ -14,19 +13,14 @@ "1": { "2f3342": "162d2a", "63738c": "498f57", - "000000": "000000", "8291a6": "70ba74", "454b61": "295449", - "ada7b2": "ada7b2", - "dbdde1": "dbdde1", - "6c6473": "6c6473", "ffc608": "c54d2d", "ad8e13": "7f223a" }, "2": { "2f3342": "340f21", "63738c": "983444", - "000000": "000000", "8291a6": "c74d51", "454b61": "601c3a", "ada7b2": "333333", diff --git a/public/images/pokemon/variant/exp/920.json b/public/images/pokemon/variant/exp/920.json index 01685e97fbb..386572ef2b3 100644 --- a/public/images/pokemon/variant/exp/920.json +++ b/public/images/pokemon/variant/exp/920.json @@ -1,45 +1,33 @@ { "0": { "2c2c2c": "475316", - "d6dbdf": "d6dbdf", "5c5d5c": "dbcf15", - "000000": "000000", "484848": "8e931a", - "9d9fa4": "9d9fa4", "ae772a": "8c0325", "fca831": "c42929", "5b6671": "292929", - "ffffff": "ffffff", "3e454d": "1d1d1d", "778a99": "444444", "7d551e": "4d0517" }, "1": { "2c2c2c": "1e391b", - "d6dbdf": "d6dbdf", "5c5d5c": "529042", - "000000": "000000", "484848": "34642c", - "9d9fa4": "9d9fa4", "ae772a": "9b1515", "fca831": "c33c26", "5b6671": "676974", - "ffffff": "ffffff", "3e454d": "4b4d5c", "778a99": "919191", "7d551e": "550927" }, "2": { "2c2c2c": "47132c", - "d6dbdf": "d6dbdf", "5c5d5c": "b52828", - "000000": "000000", "484848": "791b2d", - "9d9fa4": "9d9fa4", "ae772a": "3a3476", "fca831": "2986c4", "5b6671": "525252", - "ffffff": "ffffff", "3e454d": "3b3b3b", "778a99": "858585", "7d551e": "1c1936" diff --git a/public/images/pokemon/variant/exp/934.json b/public/images/pokemon/variant/exp/934.json index 223fbcf5d0e..94d4cc8b4b0 100644 --- a/public/images/pokemon/variant/exp/934.json +++ b/public/images/pokemon/variant/exp/934.json @@ -4,7 +4,6 @@ "999797": "77595f", "ededed": "f9c2cd", "c1b9b9": "bc808c", - "000000": "000000", "6a4c37": "718491", "c8a085": "d8e9f5", "997862": "adbac3", @@ -22,7 +21,6 @@ "999797": "444251", "ededed": "9ba0a0", "c1b9b9": "6a6a72", - "000000": "000000", "6a4c37": "3d5e47", "c8a085": "7fc17c", "997862": "5d9157", diff --git a/public/images/pokemon/variant/exp/940.json b/public/images/pokemon/variant/exp/940.json index f5f5ae5663b..a21e494685c 100644 --- a/public/images/pokemon/variant/exp/940.json +++ b/public/images/pokemon/variant/exp/940.json @@ -1,7 +1,6 @@ { "1": { "1c1e22": "271945", - "000000": "000000", "3d4049": "4c4982", "7d5e1b": "1b9ea1", "c2a227": "5dd9c8", @@ -9,19 +8,15 @@ "292c32": "372b61", "666971": "595e99", "3f424b": "4a4780", - "ffffff": "ffffff", "8596b0": "e39fc5", "b06b38": "9a5fd9", - "000618": "000618", "704424": "433382", "ff9b37": "ce87fa", - "4fc6b4": "4fc6b4", "40434d": "754494", "af6a37": "413280" }, "2": { "1c1e22": "532d61", - "000000": "000000", "3d4049": "edc5c8", "7d5e1b": "8c2a55", "c2a227": "b3466a", @@ -29,10 +24,8 @@ "292c32": "e099a5", "666971": "f7dfdc", "3f424b": "ebc3c5", - "ffffff": "ffffff", "8596b0": "e39fc5", "b06b38": "57436e", - "000618": "000618", "704424": "2b2745", "ff9b37": "745b85", "4fc6b4": "ffcf4a", diff --git a/public/images/pokemon/variant/exp/941.json b/public/images/pokemon/variant/exp/941.json index 1c9bc304c35..0fc158976b0 100644 --- a/public/images/pokemon/variant/exp/941.json +++ b/public/images/pokemon/variant/exp/941.json @@ -1,19 +1,14 @@ { "1": { "825d21": "217991", - "000000": "000000", "ffcd37": "6ef5c8", "aa7e24": "3dd1cc", "34393f": "2b3863", "6c7177": "354c70", "26282c": "1f1d54", "8c898c": "9c5bd9", - "fdfdfd": "fdfdfd", - "1a1c1f": "1a1c1f", "73bbbf": "de82ff", "441e21": "d16492", - "0f0f0f": "0f0f0f", - "ebffff": "ebffff", "692a2f": "ff9ec6", "2b1717": "773185", "37415a": "55348a", @@ -21,19 +16,14 @@ }, "2": { "825d21": "8a2f62", - "000000": "000000", "ffcd37": "e3667d", "aa7e24": "c44f6c", "34393f": "f7bebe", "6c7177": "f7dfdc", "26282c": "e394a7", "8c898c": "cf7827", - "fdfdfd": "fdfdfd", - "1a1c1f": "1a1c1f", "73bbbf": "ffcf4a", "441e21": "51467a", - "0f0f0f": "0f0f0f", - "ebffff": "ebffff", "692a2f": "776294", "2b1717": "3a3466", "37415a": "723b80", diff --git a/public/images/pokemon/variant/exp/948.json b/public/images/pokemon/variant/exp/948.json index a99438ad7f8..bf353053172 100644 --- a/public/images/pokemon/variant/exp/948.json +++ b/public/images/pokemon/variant/exp/948.json @@ -7,7 +7,6 @@ "976924": "a50927", "ffec37": "ff6237", "fef8f5": "fff4f1", - "000000": "000000", "eaba2b": "b9352b", "d2bbac": "e2bea6", "886b59": "8d5740", @@ -22,7 +21,6 @@ "976924": "254087", "ffec37": "4b86bd", "fef8f5": "ffede5", - "000000": "000000", "eaba2b": "2e609b", "d2bbac": "d8bdab", "886b59": "ad927b", diff --git a/public/images/pokemon/variant/exp/949.json b/public/images/pokemon/variant/exp/949.json index 3a3c4564e11..7901f6a1c57 100644 --- a/public/images/pokemon/variant/exp/949.json +++ b/public/images/pokemon/variant/exp/949.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "282828": "33134d", "211f1f": "33134d", "404040": "4b3073", @@ -18,7 +17,6 @@ "cdae52": "0c4a83" }, "2": { - "000000": "000000", "282828": "460001", "211f1f": "460001", "404040": "70150e", diff --git a/public/images/pokemon/variant/exp/951.json b/public/images/pokemon/variant/exp/951.json index 7361474a6f3..979029a3c74 100644 --- a/public/images/pokemon/variant/exp/951.json +++ b/public/images/pokemon/variant/exp/951.json @@ -6,7 +6,6 @@ "2e302f": "1f0c17", "3f9a5f": "be8a84", "2f683c": "9d6b5b", - "0f0f0f": "0f0f0f", "5c7c5c": "4c292f", "79b97b": "704f4f", "a6b496": "facf81", @@ -22,13 +21,11 @@ "2e302f": "3b2e3a", "3f9a5f": "a78bdc", "2f683c": "7456a8", - "0f0f0f": "0f0f0f", "5c7c5c": "8e7eb1", "79b97b": "cfbfe6", "a6b496": "fa95d1", "acd2ae": "f8f3fe", "ff9115": "b6dfff", - "d06382": "d06382", "1c3520": "452a75" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/952.json b/public/images/pokemon/variant/exp/952.json index 5413205c023..a58d68c72a7 100644 --- a/public/images/pokemon/variant/exp/952.json +++ b/public/images/pokemon/variant/exp/952.json @@ -3,8 +3,6 @@ "294e25": "55321d", "51c444": "facf81", "3f8147": "d38c43", - "0f0f0f": "0f0f0f", - "1f1f1f": "1f1f1f", "641e1c": "8c2f0a", "a23424": "bb5a2b", "ef5131": "f8975d", @@ -12,11 +10,7 @@ "cdcdcd": "ffd2cc", "dd5800": "ffb676", "42804b": "9d6b5b", - "192021": "192021", - "fffff7": "fffff7", - "000000": "000000", "ee3131": "9d560e", - "eff3e6": "eff3e6", "e65a29": "c8833c", "ff9c18": "e4ce6d", "ffde52": "fffaa5", @@ -29,8 +23,6 @@ "294e25": "3f3399", "51c444": "90c3ea", "3f8147": "627bcd", - "0f0f0f": "0f0f0f", - "1f1f1f": "1f1f1f", "641e1c": "8c1f39", "a23424": "cb486d", "ef5131": "f77baf", @@ -38,11 +30,7 @@ "cdcdcd": "f8f3fe", "dd5800": "f597cf", "42804b": "9884d3", - "192021": "192021", - "fffff7": "fffff7", - "000000": "000000", "ee3131": "e03d64", - "eff3e6": "eff3e6", "e65a29": "f577a1", "ff9c18": "fa95d1", "ffde52": "fecff5", diff --git a/public/images/pokemon/variant/exp/953.json b/public/images/pokemon/variant/exp/953.json index 6f2885be607..2168de29c70 100644 --- a/public/images/pokemon/variant/exp/953.json +++ b/public/images/pokemon/variant/exp/953.json @@ -5,7 +5,6 @@ "c5b4aa": "d3e6e6", "37332b": "104139", "9e8360": "4059bd", - "0f0f0f": "0f0f0f", "575243": "18734a", "777462": "199e46", "afa668": "f9fba2", @@ -22,7 +21,6 @@ "c5b4aa": "39cfbc", "37332b": "261031", "9e8360": "dbedec", - "0f0f0f": "0f0f0f", "575243": "5e2d72", "777462": "8358a1", "afa668": "c9dbac", @@ -33,4 +31,4 @@ "4e4530": "534b8c", "ba6e29": "4792bd" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/954.json b/public/images/pokemon/variant/exp/954.json index 825973cc6b0..98eca52471d 100644 --- a/public/images/pokemon/variant/exp/954.json +++ b/public/images/pokemon/variant/exp/954.json @@ -4,7 +4,6 @@ "e11bff": "e1efff", "aa13b7": "a0a9da", "91263f": "87ceeb", - "000000": "000000", "ce2d6b": "fffd91", "ff4c90": "ffbc00", "ffd5e5": "fbf3ab", @@ -28,7 +27,6 @@ "e11bff": "9b2f17", "aa13b7": "6b1911", "91263f": "c65813", - "000000": "000000", "ce2d6b": "ded051", "ff4c90": "141031", "ffd5e5": "432f77", diff --git a/public/images/pokemon/variant/exp/962.json b/public/images/pokemon/variant/exp/962.json index 7f41b7aa01a..e64860b1a63 100644 --- a/public/images/pokemon/variant/exp/962.json +++ b/public/images/pokemon/variant/exp/962.json @@ -1,86 +1,40 @@ { "0": { - "030303": "030303", "44393e": "3e1d26", "997d85": "924f57", "efe3e3": "f6cbc4", "b6a2a7": "dd9f9d", - "000000": "000000", "65545b": "60354a", - "191717": "191717", "723139": "1f3078", "ffffff": "fceff1", "d65263": "4592c0", "a03e4b": "2e6fa8", "bcb1b9": "998482", - "050405": "050405", - "8c7987": "60354a", - "987d85": "987d85", - "987c84": "987c84", - "b5a1a6": "b5a1a6", - "66555c": "66555c", - "110e0f": "110e0f", - "efe2e3": "efe2e3", - "080607": "080607", - "eee2e2": "eee2e2", - "1b1919": "1b1919", - "b7a3a8": "b7a3a8", - "0d0a0c": "0d0a0c" + "8c7987": "60354a" }, "1": { - "030303": "030303", "44393e": "1e382a", "997d85": "404b22", "efe3e3": "e8e8c0", "b6a2a7": "c6ca8e", - "000000": "000000", "65545b": "395740", - "191717": "191717", "723139": "3e1e1d", "ffffff": "edf8e6", "d65263": "b37e6f", "a03e4b": "79433f", "bcb1b9": "6a856a", - "050405": "050405", - "8c7987": "26452d", - "987d85": "987d85", - "987c84": "987c84", - "b5a1a6": "b5a1a6", - "66555c": "66555c", - "110e0f": "110e0f", - "efe2e3": "efe2e3", - "080607": "080607", - "eee2e2": "eee2e2", - "1b1919": "1b1919", - "b7a3a8": "b7a3a8", - "0d0a0c": "0d0a0c" + "8c7987": "26452d" }, "2": { - "030303": "030303", "44393e": "754156", "997d85": "211f45", "efe3e3": "67548a", "b6a2a7": "453863", - "000000": "000000", "65545b": "a5777f", - "191717": "191717", "723139": "545151", "ffffff": "f7e5d0", "d65263": "aba7a8", "a03e4b": "888685", - "bcb1b9": "a96c4b", - "050405": "050405", - "8c7987": "8c7987", - "987d85": "987d85", - "987c84": "987c84", - "b5a1a6": "b5a1a6", - "66555c": "66555c", - "110e0f": "110e0f", - "efe2e3": "efe2e3", - "080607": "080607", - "eee2e2": "eee2e2", - "1b1919": "1b1919", - "b7a3a8": "b7a3a8", - "0d0a0c": "0d0a0c" + "bcb1b9": "a96c4b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/967.json b/public/images/pokemon/variant/exp/967.json index 212b46ad6f7..f0981eb020e 100644 --- a/public/images/pokemon/variant/exp/967.json +++ b/public/images/pokemon/variant/exp/967.json @@ -3,17 +3,10 @@ "1c2916": "272431", "384a35": "464354", "54654e": "67637a", - "b9b7b3": "b9b7b3", - "0f0f0f": "0f0f0f", "f16b32": "bead9d", "607d6d": "6e76a9", - "fcfcfc": "fcfcfc", "75b07d": "9299c7", "34453d": "444a71", - "4b565c": "4b565c", - "222328": "222328", - "323943": "323943", - "e2e9d7": "e2e9d7", "993832": "625549" }, "2": { @@ -21,10 +14,8 @@ "384a35": "5d0c0c", "54654e": "942d22", "b9b7b3": "c0ab8b", - "0f0f0f": "0f0f0f", "f16b32": "8c63d2", "607d6d": "6b2c31", - "fcfcfc": "fcfcfc", "75b07d": "a95d50", "34453d": "531d27", "4b565c": "815652", diff --git a/public/images/pokemon/variant/exp/968.json b/public/images/pokemon/variant/exp/968.json index 3abf6870ae9..1209b51c4a6 100644 --- a/public/images/pokemon/variant/exp/968.json +++ b/public/images/pokemon/variant/exp/968.json @@ -4,18 +4,9 @@ "c2544c": "4d7d3a", "f7645a": "5c9446", "fa968d": "72b657", - "73666a": "73666a", - "a09498": "a09498", - "cfcbc4": "cfcbc4", - "000000": "000000", - "fefefe": "fefefe", "22b5dd": "c1597d", "4b86a4": "a14363", - "bd5b4b": "4d7d3a", - "9b5746": "9b5746", - "fccdba": "fccdba", - "8b2c3d": "8b2c3d", - "d8816d": "d8816d" + "bd5b4b": "4d7d3a" }, "2": { "8f433f": "6f390d", @@ -25,14 +16,8 @@ "73666a": "676e74", "a09498": "a1a9ae", "cfcbc4": "dadae3", - "000000": "000000", - "fefefe": "fefefe", "22b5dd": "46de9b", "4b86a4": "3caf7c", - "bd5b4b": "ba7429", - "9b5746": "9b5746", - "fccdba": "fccdba", - "8b2c3d": "8b2c3d", - "d8816d": "d8816d" + "bd5b4b": "ba7429" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/969.json b/public/images/pokemon/variant/exp/969.json index 1d703142713..57ca9155f5f 100644 --- a/public/images/pokemon/variant/exp/969.json +++ b/public/images/pokemon/variant/exp/969.json @@ -12,7 +12,6 @@ "3d464b": "44111b", "4d6076": "6b1933", "ffff31": "dde4e6", - "0f0f0f": "0f0f0f", "5a869c": "bd2646", "635181": "527492", "453b4d": "2c445a", @@ -33,7 +32,6 @@ "3d464b": "2d293a", "4d6076": "433e53", "ffff31": "dde4e6", - "0f0f0f": "0f0f0f", "5a869c": "656b8b", "635181": "193a1c", "453b4d": "0d240f", diff --git a/public/images/pokemon/variant/exp/973.json b/public/images/pokemon/variant/exp/973.json index 47244e0779f..fe7d1be4ce5 100644 --- a/public/images/pokemon/variant/exp/973.json +++ b/public/images/pokemon/variant/exp/973.json @@ -1,56 +1,36 @@ { "0": { - "2c2936": "2c2936", - "211f28": "211f28", "3c3946": "404355", - "ffffff": "ffffff", "c4c1dc": "978f97", "ff79b1": "cfbbbc", "811f47": "7c6364", "ffe393": "e7a11f", "ffd55f": "d28011", - "3b3b3b": "3b3b3b", - "000000": "000000", "760c38": "540b1d", "c92f6e": "a7323f", "d43e7c": "988282", - "9c174e": "7d172b", - "3d3b4e": "3d3b4e" + "9c174e": "7d172b" }, "1": { - "2c2936": "2c2936", - "211f28": "211f28", - "3c3946": "3c3946", - "ffffff": "ffffff", - "c4c1dc": "c4c1dc", "ff79b1": "cb36b9", "811f47": "430855", "ffe393": "5fdd5b", "ffd55f": "289c43", - "3b3b3b": "3b3b3b", - "000000": "000000", "760c38": "660f71", "c92f6e": "b11468", "d43e7c": "911b92", - "9c174e": "700f49", - "3d3b4e": "3d3b4e" + "9c174e": "700f49" }, "2": { - "2c2936": "2c2936", - "211f28": "211f28", - "3c3946": "3c3946", "ffffff": "fbf2f4", "c4c1dc": "978f97", "ff79b1": "f29f5b", "811f47": "943615", "ffe393": "3175cb", "ffd55f": "2c3ca6", - "3b3b3b": "3b3b3b", - "000000": "000000", "760c38": "17167d", "c92f6e": "3175cb", "d43e7c": "d77433", - "9c174e": "2c3ca6", - "3d3b4e": "3d3b4e" + "9c174e": "2c3ca6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/974.json b/public/images/pokemon/variant/exp/974.json index fab4a8d61d1..bba74da0831 100644 --- a/public/images/pokemon/variant/exp/974.json +++ b/public/images/pokemon/variant/exp/974.json @@ -3,15 +3,11 @@ "736875": "8c2727", "bebaba": "ee9065", "524951": "661427", - "0f0f0f": "0f0f0f", "efefef": "ffcc9e", "a29793": "c85442", "a44667": "2c7193", "c7639c": "48aeba", "f493c9": "71e2d3", - "fcfcfc": "fcfcfc", - "c9c9c9": "c9c9c9", - "5e5e5e": "5e5e5e", "832041": "6a193e", "cd394a": "ac5070", "dc7569": "e37c8e" @@ -20,15 +16,11 @@ "736875": "1f355e", "bebaba": "2a607f", "524951": "172651", - "0f0f0f": "0f0f0f", "efefef": "438aa0", "a29793": "1c426b", "a44667": "ae664a", "c7639c": "daa470", "f493c9": "ffdfa1", - "fcfcfc": "fcfcfc", - "c9c9c9": "c9c9c9", - "5e5e5e": "5e5e5e", "832041": "433363", "cd394a": "775b8c", "dc7569": "a87fae" diff --git a/public/images/pokemon/variant/exp/975.json b/public/images/pokemon/variant/exp/975.json index 7ac0645ce57..e8d40f7aa90 100644 --- a/public/images/pokemon/variant/exp/975.json +++ b/public/images/pokemon/variant/exp/975.json @@ -1,6 +1,5 @@ { "1": { - "0f0f0f": "0f0f0f", "b6b6c0": "d85661", "555566": "660e45", "6a6069": "8c2727", @@ -13,11 +12,9 @@ "a44667": "2c7193", "f493c9": "71e2d3", "ded6c0": "db9b76", - "f7f6f2": "ffcfa8", - "fcfcfc": "fcfcfc" + "f7f6f2": "ffcfa8" }, "2": { - "0f0f0f": "0f0f0f", "b6b6c0": "ffe9d6", "555566": "a05c56", "6a6069": "121f43", @@ -30,7 +27,6 @@ "a44667": "ae664a", "f493c9": "ffdfa1", "ded6c0": "2b5a70", - "f7f6f2": "3a7687", - "fcfcfc": "fcfcfc" + "f7f6f2": "3a7687" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/981.json b/public/images/pokemon/variant/exp/981.json index 79ff9efd3ac..43071ff6ad6 100644 --- a/public/images/pokemon/variant/exp/981.json +++ b/public/images/pokemon/variant/exp/981.json @@ -7,13 +7,10 @@ "9ca0ab": "665144", "8b704c": "3d6186", "322513": "091e34", - "0f0f0f": "0f0f0f", "fff42f": "c29925", "b4ff68": "ff8f00", - "fcfcfc": "fcfcfc", "deb43d": "dec93d", "6aad21": "ffbd42", - "a8abb3": "a8abb3", "775c10": "774f10", "b1a75c": "7e262d", "3d680f": "be5302", @@ -35,13 +32,10 @@ "9ca0ab": "9c5978", "8b704c": "e4efcf", "322513": "337142", - "0f0f0f": "0f0f0f", "fff42f": "ed9233", "b4ff68": "dc7346", - "fcfcfc": "fcfcfc", "deb43d": "ebbb72", "6aad21": "d8975d", - "a8abb3": "a8abb3", "775c10": "b35127", "b1a75c": "1e7884", "3d680f": "953c2f", diff --git a/public/images/pokemon/variant/exp/982-three-segment.json b/public/images/pokemon/variant/exp/982-three-segment.json index beafe9763bc..eedc4163bc6 100644 --- a/public/images/pokemon/variant/exp/982-three-segment.json +++ b/public/images/pokemon/variant/exp/982-three-segment.json @@ -3,22 +3,18 @@ "206a83": "2a413f", "6abdcd": "748da4", "318ba4": "4a6165", - "101010": "101010", "735a41": "53575a", "f6e67b": "fdfdfd", "debd39": "aeaeae", "bd8b20": "757575", "5a6273": "5d6970", "d5e6f6": "c1d7e2", - "f6ffff": "f6ffff", - "fff6c5": "fdfdfd", - "000000": "000000" + "fff6c5": "fdfdfd" }, "2": { "206a83": "1d737a", "6abdcd": "b5f2ec", "318ba4": "38a8a6", - "101010": "101010", "735a41": "462a3e", "f6e67b": "db4069", "debd39": "a12e55", @@ -26,7 +22,6 @@ "5a6273": "5c4a4d", "d5e6f6": "ffd4ac", "f6ffff": "fdffdc", - "fff6c5": "e97798", - "000000": "000000" + "fff6c5": "e97798" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/982.json b/public/images/pokemon/variant/exp/982.json index 1237494d460..ac0864b8e6e 100644 --- a/public/images/pokemon/variant/exp/982.json +++ b/public/images/pokemon/variant/exp/982.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "6bbdce": "748da4", "318ca5": "4a6165", "735a42": "53575a", @@ -11,11 +10,9 @@ "5a6373": "5d6970", "fff7c5": "fdfdfd", "f7ffff": "f6ffff", - "bdcee6": "bdcee6", "216b84": "2a413f" }, "2": { - "101010": "101010", "6bbdce": "b5f2ec", "318ca5": "38a8a6", "735a42": "692342", diff --git a/public/images/pokemon/variant/exp/987.json b/public/images/pokemon/variant/exp/987.json index 6456e7153a4..c3514e5b78c 100644 --- a/public/images/pokemon/variant/exp/987.json +++ b/public/images/pokemon/variant/exp/987.json @@ -2,7 +2,6 @@ "0": { "8a378a": "9b490e", "ee93e8": "ffdd67", - "0f0f0f": "0f0f0f", "70bbb4": "5bb6ef", "4a83a4": "387fa7", "314a62": "244260", @@ -12,13 +11,11 @@ "a4295a": "cc762f", "b36cc1": "d3941a", "eee662": "ffc7ff", - "f9f9f9": "f9f9f9", "bd9431": "cb79dd" }, "1": { "8a378a": "0c8086", "ee93e8": "3df7ed", - "0f0f0f": "0f0f0f", "70bbb4": "eefff8", "4a83a4": "a1c8db", "314a62": "7396b4", @@ -28,13 +25,11 @@ "a4295a": "e28c27", "b36cc1": "1dbdb9", "eee662": "a6f0f8", - "f9f9f9": "f9f9f9", "bd9431": "66d0e5" }, "2": { "8a378a": "5d4a2f", "ee93e8": "fff7dd", - "0f0f0f": "0f0f0f", "70bbb4": "f8d371", "4a83a4": "e6aa47", "314a62": "b56f2a", @@ -44,7 +39,6 @@ "a4295a": "a62a21", "b36cc1": "eece8c", "eee662": "a6f0f8", - "f9f9f9": "f9f9f9", "bd9431": "66d0e5" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/988.json b/public/images/pokemon/variant/exp/988.json index 9e6c50e9d06..d3e7851e1fe 100644 --- a/public/images/pokemon/variant/exp/988.json +++ b/public/images/pokemon/variant/exp/988.json @@ -7,10 +7,6 @@ "d8a33f": "56e4ba", "d1fd77": "e2fd77", "f04137": "17b79f", - "35384f": "35384f", - "465175": "465175", - "f1f7f7": "f1f7f7", - "181820": "181820", "a9a9ab": "92c9b9", "ff3121": "2c9484", "e63529": "23ae9a", diff --git a/public/images/pokemon/variant/exp/993.json b/public/images/pokemon/variant/exp/993.json index 3a9ed405d1f..6a18ab70264 100644 --- a/public/images/pokemon/variant/exp/993.json +++ b/public/images/pokemon/variant/exp/993.json @@ -2,99 +2,53 @@ "1": { "272629": "754711", "47454a": "c59b4b", - "000000": "000000", "787578": "f8f5e2", "ff4dcb": "b7c6d6", "ff82db": "d9d9ea", "984983": "58585c", "ffe3ea": "f8f5f5", - "0d1e3d": "0d1e3d", "1f468f": "3c236a", "83a2e5": "c9b0f8", "3f7be5": "a58fcd", "3266d6": "8c6bac", "222421": "91988f", "2a66d6": "662ad6", - "2f2d2f": "2f2d2f", - "3c393c": "3c393c", - "2e2c2e": "2e2c2e", "316bda": "8931da", - "4a454a": "4a454a", "fa4dd6": "e3dde2", "ff5ade": "d6d3d5", "fc55db": "c1bbc0", "f84dd7": "c1b9bf", - "ff80db": "ff80db", - "494449": "494449", - "1d1f1b": "1d1f1b", - "242423": "242423", - "281d21": "281d21", - "ff51de": "ff51de", - "212421": "212421", - "342631": "342631", - "262829": "262829", "ffa8e6": "e5e4ea", "a95994": "aca5aa", "b42a8c": "7c7a7a", "9b2478": "454445", "454348": "c59b4b", "2b0b21": "070707", - "0f040c": "0f040c", - "6d1a55": "1c1b1b", - "2c1526": "2c1526", - "5d5255": "5d5255", - "373237": "373237", - "3d383c": "3d383c", - "161414": "161414", - "150a11": "150a11" + "6d1a55": "1c1b1b" }, "2": { "272629": "203c45", "47454a": "467678", - "000000": "000000", "787578": "a4bfbe", "ff4dcb": "e3bbd3", "ff82db": "f1d9e7", "984983": "873954", - "ffe3ea": "ffe3ea", "0d1e3d": "470e2c", "1f468f": "600f40", "83a2e5": "e583a5", "3f7be5": "8a143d", "3266d6": "ba1e51", - "222421": "222421", "2a66d6": "f1c4d4", - "2f2d2f": "2f2d2f", - "3c393c": "3c393c", - "2e2c2e": "2e2c2e", "316bda": "f1bdd8", - "4a454a": "4a454a", "fa4dd6": "f8d1de", "ff5ade": "f8e6ee", "fc55db": "f8eaf1", "f84dd7": "f8dfec", "ff80db": "ffe5f8", - "494449": "494449", - "1d1f1b": "1d1f1b", - "242423": "242423", - "281d21": "281d21", "ff51de": "f8e3f4", - "212421": "212421", - "342631": "342631", - "262829": "262829", "ffa8e6": "f8edf4", - "a95994": "a95994", "b42a8c": "c181a7", "9b2478": "83486b", - "454348": "454348", - "2b0b21": "2b0b21", - "0f040c": "0f040c", - "6d1a55": "4c1f39", - "2c1526": "2c1526", - "5d5255": "5d5255", - "373237": "373237", - "3d383c": "3d383c", - "161414": "161414", - "150a11": "150a11" + "6d1a55": "4c1f39" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/994.json b/public/images/pokemon/variant/exp/994.json index 273b6e6f0c7..ccc8125d86c 100644 --- a/public/images/pokemon/variant/exp/994.json +++ b/public/images/pokemon/variant/exp/994.json @@ -8,9 +8,7 @@ "626262": "696983", "5e2d4e": "ae7a24", "be5a83": "fdc263", - "181820": "181820", "874070": "d79a38", - "313139": "313139", "959595": "9b9bb6", "dbdadc": "d9d9ea", "36485a": "3f357c", diff --git a/public/images/pokemon/variant/exp/995.json b/public/images/pokemon/variant/exp/995.json index fa33051f318..cad805ca7ad 100644 --- a/public/images/pokemon/variant/exp/995.json +++ b/public/images/pokemon/variant/exp/995.json @@ -3,34 +3,21 @@ "3c571e": "4f4528", "c4de98": "f6eebd", "99c350": "ddcb86", - "000000": "000000", "78913e": "8d7f54", "15b372": "9d3eb9", - "211e1e": "211e1e", - "363735": "363735", - "453f3f": "453f3f", - "3e2a2a": "3e2a2a", "3af0a6": "ca72e4", "a2f4d2": "e9d7ee", - "4b792d": "7b6a31", - "332c2c": "332c2c", - "216645": "216645" + "4b792d": "7b6a31" }, "2": { "3c571e": "26292b", "c4de98": "949ca5", "99c350": "6b737b", - "000000": "000000", "78913e": "464b51", "15b372": "9a1f2c", - "211e1e": "211e1e", - "363735": "363735", - "453f3f": "453f3f", - "3e2a2a": "3e2a2a", "3af0a6": "d53143", "a2f4d2": "f3aebe", "4b792d": "383c40", - "332c2c": "332c2c", "216645": "ff4a73" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/996.json b/public/images/pokemon/variant/exp/996.json index 1281153af1e..79a6c40f295 100644 --- a/public/images/pokemon/variant/exp/996.json +++ b/public/images/pokemon/variant/exp/996.json @@ -4,7 +4,6 @@ "414949": "181f1f", "aab1b7": "325747", "8f99a3": "293b39", - "0f0f0f": "0f0f0f", "af9b0a": "3b69d3", "f9d800": "30d1ff", "dedfde": "b7926b", @@ -21,11 +20,9 @@ "414949": "2f2c38", "aab1b7": "e6e6eb", "8f99a3": "ceccef", - "0f0f0f": "0f0f0f", "af9b0a": "b4425a", "f9d800": "ff6767", "dedfde": "e6e6eb", - "9c979c": "9c979c", "8ebbb7": "ca6d2a", "c2e7e9": "fcb925", "769894": "79452f", diff --git a/public/images/pokemon/variant/exp/999.json b/public/images/pokemon/variant/exp/999.json index 584bf030851..821dabeeb70 100644 --- a/public/images/pokemon/variant/exp/999.json +++ b/public/images/pokemon/variant/exp/999.json @@ -11,7 +11,6 @@ "b53345": "794e83", "545b6b": "415073", "f0f3f8": "bac4d8", - "bac4d8": "bac4d8", "ab843f": "9c9cbe", "f7e077": "728295", "edce3d": "728295", @@ -34,7 +33,6 @@ "b53345": "bcb9d6", "545b6b": "6467a8", "f0f3f8": "bac4d8", - "bac4d8": "bac4d8", "ab843f": "b6d0d7", "f7e077": "4e85bf", "edce3d": "4e85bf", diff --git a/public/images/pokemon/variant/exp/back/1000.json b/public/images/pokemon/variant/exp/back/1000.json index 8149392d9b6..4f27d5ea595 100644 --- a/public/images/pokemon/variant/exp/back/1000.json +++ b/public/images/pokemon/variant/exp/back/1000.json @@ -1,7 +1,6 @@ { "0": { "b78234": "a64700", - "121212": "121212", "e0b81a": "d05c31", "f9d95b": "ee883f", "623c20": "6d1906", @@ -11,12 +10,10 @@ "762534": "5d0d05", "9c3e43": "6d1906", "323437": "531f03", - "545b6b": "8f4a14", - "0f0f0f": "0f0f0f" + "545b6b": "8f4a14" }, "1": { "b78234": "7a4e5d", - "121212": "121212", "e0b81a": "96747e", "f9d95b": "e1ced1", "623c20": "622f43", @@ -26,22 +23,18 @@ "762534": "513a59", "9c3e43": "7f6086", "323437": "1d2c54", - "545b6b": "415073", - "0f0f0f": "0f0f0f" + "545b6b": "415073" }, "2": { "b78234": "5a9aa3", - "121212": "121212", "e0b81a": "89d1d6", "f9d95b": "e5fffc", "623c20": "3d717b", - "ffffff": "ffffff", "b4a45e": "36465f", "918344": "1f3149", "762534": "547995", "9c3e43": "7e93b0", "323437": "212857", - "545b6b": "495890", - "0f0f0f": "0f0f0f" + "545b6b": "495890" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/1001.json b/public/images/pokemon/variant/exp/back/1001.json index 4aa4f62bf62..e98d729116e 100644 --- a/public/images/pokemon/variant/exp/back/1001.json +++ b/public/images/pokemon/variant/exp/back/1001.json @@ -7,7 +7,6 @@ "8c979d": "a19775", "a28b76": "383734", "7e615a": "1f1e1c", - "0f0f0f": "0f0f0f", "618044": "9e4b28", "76b458": "de7e52", "524a36": "6e4105", @@ -22,7 +21,6 @@ "8c979d": "9f88b3", "a28b76": "fce6f0", "7e615a": "e6aec8", - "0f0f0f": "0f0f0f", "618044": "e170a1", "76b458": "f5bede", "524a36": "420f0f", diff --git a/public/images/pokemon/variant/exp/back/1003.json b/public/images/pokemon/variant/exp/back/1003.json index 4498fa9e84b..85fb2a81be1 100644 --- a/public/images/pokemon/variant/exp/back/1003.json +++ b/public/images/pokemon/variant/exp/back/1003.json @@ -1,6 +1,5 @@ { "1": { - "0f0f0f": "0f0f0f", "73958b": "daa666", "486863": "be8550", "a6b4a7": "e7cb7e", @@ -16,7 +15,6 @@ "957560": "9c8e99" }, "2": { - "0f0f0f": "0f0f0f", "73958b": "8d6acc", "486863": "6c4aac", "a6b4a7": "cfa0f3", diff --git a/public/images/pokemon/variant/exp/back/1004.json b/public/images/pokemon/variant/exp/back/1004.json index 83b2909fe3c..8224e7f7f01 100644 --- a/public/images/pokemon/variant/exp/back/1004.json +++ b/public/images/pokemon/variant/exp/back/1004.json @@ -2,7 +2,6 @@ "1": { "a23724": "b06f00", "f4342f": "f2b200", - "0f0f0f": "0f0f0f", "f35e38": "ffc81b", "f9824f": "ffe13a", "f0a755": "ffe86b", @@ -13,13 +12,11 @@ "487447": "394d9a", "5b985a": "5c71c1", "83b884": "7a9ae0", - "3c3f3a": "27276a", - "f8f8f0": "f8f8f0" + "3c3f3a": "27276a" }, "2": { "a23724": "76074d", "f4342f": "a525d3", - "0f0f0f": "0f0f0f", "f35e38": "3449f6", "f9824f": "49c9f6", "f0a755": "79f6a1", @@ -30,7 +27,6 @@ "487447": "84736f", "5b985a": "b09f97", "83b884": "d7cbb5", - "3c3f3a": "4b4444", - "f8f8f0": "f8f8f0" + "3c3f3a": "4b4444" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/1008-ultimate-mode.json b/public/images/pokemon/variant/exp/back/1008-ultimate-mode.json index 9df2f7b0070..ca5aae27c1e 100644 --- a/public/images/pokemon/variant/exp/back/1008-ultimate-mode.json +++ b/public/images/pokemon/variant/exp/back/1008-ultimate-mode.json @@ -1,56 +1,43 @@ { "0": { "4ba5cf": "8955b5", - "fefefe": "fefefe", "d7c2c1": "d7c3f7", "c883d1": "7fd8cf", - "0e0e12": "0e0e12", "1a1c42": "393a3e", "fcdf14": "427eff", "5c4370": "393a3e", "4d3672": "858585", - "e6e3f2": "e6e3f2", - "878594": "878594", - "c1bddf": "c1bddf", "643fa3": "c8c8c8", "392855": "616161", - "2e3176": "616161", - "25173d": "25173d" + "2e3176": "616161" }, "1": { "4ba5cf": "31808e", "fefefe": "ffffc9", "d7c2c1": "b3e2d0", "c883d1": "ade263", - "0e0e12": "0e0e12", "1a1c42": "184433", "fcdf14": "2cc151", "5c4370": "3b5c63", "4d3672": "444b66", - "e6e3f2": "e6e3f2", "878594": "89a5ff", "c1bddf": "b7d8ff", "643fa3": "626877", "392855": "393e51", - "2e3176": "3aff75", - "25173d": "25173d" + "2e3176": "3aff75" }, "2": { "4ba5cf": "8e3c84", "fefefe": "ffd8ff", "d7c2c1": "ff93d4", "c883d1": "ffc26d", - "0e0e12": "0e0e12", "1a1c42": "192142", "fcdf14": "cc5767", - "5c4370": "5c4370", "4d3672": "2a3768", - "e6e3f2": "e6e3f2", "878594": "ad9e9d", "c1bddf": "e0e0e0", "643fa3": "3b4986", "392855": "29253f", - "2e3176": "cf3e57", - "25173d": "25173d" + "2e3176": "cf3e57" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/127-mega.json b/public/images/pokemon/variant/exp/back/127-mega.json index 855390b8f37..fa6cade9e21 100644 --- a/public/images/pokemon/variant/exp/back/127-mega.json +++ b/public/images/pokemon/variant/exp/back/127-mega.json @@ -4,33 +4,21 @@ "847163": "7e5649", "d6c7b5": "d29f88", "efe7ce": "eccb90", - "000000": "000000", - "ee8329": "ee8329", - "cd5241": "cd5241", "5a4131": "172a22", "c6ae8c": "72988e", "a58e6b": "54796f", "846952": "3b554d", - "ffde62": "ffde62", - "ac9441": "ac9441", - "837362": "7e5649", - "ffffff": "ffffff" + "837362": "7e5649" }, "2": { "4a4139": "484848", "847163": "868686", "d6c7b5": "d5d5d5", "efe7ce": "ffffff", - "000000": "000000", - "ee8329": "ee8329", - "cd5241": "cd5241", "5a4131": "5c0026", "c6ae8c": "d56a70", "a58e6b": "b44954", "846952": "8c2c40", - "ffde62": "ffde62", - "ac9441": "ac9441", - "837362": "868686", - "ffffff": "ffffff" + "837362": "868686" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/130-mega.json b/public/images/pokemon/variant/exp/back/130-mega.json index 1e091a7a55f..47217f75dc6 100644 --- a/public/images/pokemon/variant/exp/back/130-mega.json +++ b/public/images/pokemon/variant/exp/back/130-mega.json @@ -5,15 +5,10 @@ "44b4f4": "eea747", "826c4d": "90665d", "f8eaba": "fff3ec", - "0d0d0d": "0d0d0d", "cdac7b": "bd9b8e", "992137": "8691d5", "e6414a": "c9d4ff", - "202020": "202020", - "2b2d33": "682a23", - "3c3f47": "3c3f47", - "c3c3c3": "c3c3c3", - "202226": "202226" + "2b2d33": "682a23" }, "2": { "207cc1": "582c81", @@ -21,14 +16,10 @@ "44b4f4": "7b43a1", "826c4d": "855a71", "f8eaba": "ffedf4", - "0d0d0d": "0d0d0d", "cdac7b": "d7aec0", "992137": "a62869", "e6414a": "e15693", - "202020": "202020", - "2b2d33": "2b2d33", "3c3f47": "c07d4a", - "c3c3c3": "ddb07a", - "202226": "202226" + "c3c3c3": "ddb07a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/142-mega.json b/public/images/pokemon/variant/exp/back/142-mega.json index fd83d2d0958..2057e2a9ffb 100644 --- a/public/images/pokemon/variant/exp/back/142-mega.json +++ b/public/images/pokemon/variant/exp/back/142-mega.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "524273": "431e24", "484848": "922217", "adadd6": "b58788", @@ -19,7 +18,6 @@ "9483a4": "7e494f" }, "2": { - "101010": "101010", "524273": "374451", "484848": "20606b", "adadd6": "cae0ec", diff --git a/public/images/pokemon/variant/exp/back/150-mega-x.json b/public/images/pokemon/variant/exp/back/150-mega-x.json index 6c5bdf7a533..c569c53cebc 100644 --- a/public/images/pokemon/variant/exp/back/150-mega-x.json +++ b/public/images/pokemon/variant/exp/back/150-mega-x.json @@ -1,25 +1,20 @@ { "1": { "7a7a99": "a66b8e", - "101010": "101010", "dadaf2": "ffb5d6", "34344d": "5a2952", "acacbf": "db8aaf", "461f59": "105144", "9643bf": "379e8a", - "f8f8f8": "f8f8f8", - "55a4f2": "55a4f2", "6e318c": "1d6153" }, "2": { "7a7a99": "d68f40", - "101010": "101010", "dadaf2": "ffdd98", "34344d": "884c17", "acacbf": "edaf5b", "461f59": "6b2619", "9643bf": "ac4f4b", - "f8f8f8": "f8f8f8", "55a4f2": "da2e29", "6e318c": "6b2619" } diff --git a/public/images/pokemon/variant/exp/back/181-mega.json b/public/images/pokemon/variant/exp/back/181-mega.json index 372b0fe3b3c..6a7c6384ef8 100644 --- a/public/images/pokemon/variant/exp/back/181-mega.json +++ b/public/images/pokemon/variant/exp/back/181-mega.json @@ -2,7 +2,6 @@ "1": { "626a6a": "58341f", "ffffff": "fff1d0", - "101010": "101010", "b4b4bd": "ebbb78", "c54100": "e28f09", "835a31": "49200d", @@ -10,15 +9,12 @@ "e6e6e6": "f1cd8d", "ffc510": "8d472a", "ffee4a": "b36d49", - "000000": "000000", "8b2000": "9b5000", - "ff6200": "ffe85a", - "5a0000": "5a0000" + "ff6200": "ffe85a" }, "2": { "626a6a": "5d412a", "ffffff": "fff1d0", - "101010": "101010", "b4b4bd": "ebbb78", "c54100": "d26b00", "835a31": "49200d", diff --git a/public/images/pokemon/variant/exp/back/2027.json b/public/images/pokemon/variant/exp/back/2027.json index 04686fda98b..bffe4327837 100644 --- a/public/images/pokemon/variant/exp/back/2027.json +++ b/public/images/pokemon/variant/exp/back/2027.json @@ -4,23 +4,17 @@ "354e73": "752e42", "b6dbe7": "ffdac2", "84b3ce": "d27c80", - "fefefe": "fefefe", - "101010": "101010", "897e67": "aaaa96", "fefea9": "fffffc", - "d1c592": "d3d3c6", - "000000": "000000" + "d1c592": "d3d3c6" }, "2": { "518d9f": "6a439e", "354e73": "3d2c78", "b6dbe7": "dbb1eb", "84b3ce": "a87bcf", - "fefefe": "fefefe", - "101010": "101010", "897e67": "2e163d", "fefea9": "6f3480", - "d1c592": "44225a", - "000000": "000000" + "d1c592": "44225a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/2028.json b/public/images/pokemon/variant/exp/back/2028.json index 19710fd1b41..6a47ecacf45 100644 --- a/public/images/pokemon/variant/exp/back/2028.json +++ b/public/images/pokemon/variant/exp/back/2028.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "3a6b8c": "692a61", "f1f1f4": "fffffc", "b0e5f8": "fffed9", @@ -13,11 +12,9 @@ "b7e3e7": "ffb59e", "606060": "6f525d", "bdbdcd": "d0c0b6", - "9994b6": "8d6e6f", - "000000": "000000" + "9994b6": "8d6e6f" }, "2": { - "101010": "101010", "3a6b8c": "3c2d74", "f1f1f4": "e3f0ff", "b0e5f8": "f8f5b0", @@ -30,7 +27,6 @@ "b7e3e7": "5f2e71", "606060": "3a3a54", "bdbdcd": "acb7d0", - "9994b6": "7d83a4", - "000000": "000000" + "9994b6": "7d83a4" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/2052.json b/public/images/pokemon/variant/exp/back/2052.json index 31bcb35f0dc..e999d332c83 100644 --- a/public/images/pokemon/variant/exp/back/2052.json +++ b/public/images/pokemon/variant/exp/back/2052.json @@ -1,12 +1,10 @@ { "1": { "45505f": "8c583b", - "0a0a0a": "0a0a0a", "91a3bf": "ffda5c", "627986": "de974e", "995433": "493473", "262b3c": "41185e", - "f3f3f3": "f3f3f3", "e3cc2b": "a66db5", "ca833c": "7a519a", "798071": "7a4888", @@ -15,12 +13,10 @@ }, "2": { "45505f": "271420", - "0a0a0a": "0a0a0a", "91a3bf": "7c4e42", "627986": "5f3036", "995433": "45328e", "262b3c": "1d1b33", - "f3f3f3": "f3f3f3", "e3cc2b": "b5b8f9", "ca833c": "7b7fda", "798071": "5f5c7e", diff --git a/public/images/pokemon/variant/exp/back/2053.json b/public/images/pokemon/variant/exp/back/2053.json index f833d9b1dd2..fe218ea1564 100644 --- a/public/images/pokemon/variant/exp/back/2053.json +++ b/public/images/pokemon/variant/exp/back/2053.json @@ -1,18 +1,14 @@ { "1": { - "0a0a0a": "0a0a0a", "45505f": "8c583b", "627986": "de974e", "262b3c": "41185e", - "99abc9": "ffda5c", - "080808": "080808" + "99abc9": "ffda5c" }, "2": { - "0a0a0a": "0a0a0a", "45505f": "271420", "627986": "5f3036", "262b3c": "150e1c", - "99abc9": "7c4e42", - "080808": "080808" + "99abc9": "7c4e42" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/212-mega.json b/public/images/pokemon/variant/exp/back/212-mega.json index 4ec3ab904a9..ae127ee48c5 100644 --- a/public/images/pokemon/variant/exp/back/212-mega.json +++ b/public/images/pokemon/variant/exp/back/212-mega.json @@ -3,48 +3,21 @@ "622929": "215a2d", "a42929": "2f794e", "d53939": "4a9c53", - "101010": "101010", - "9494a4": "9494a4", - "ffffff": "ffffff", - "b4b4cd": "b4b4cd", - "39394a": "39394a", - "b0b0c8": "b0b0c8", - "000000": "000000", - "3b3b4c": "3b3b4c", - "006f8a": "006f8a", - "00cad2": "00cad2", - "878791": "878791", "f66a6a": "8cce73" }, "1": { "622929": "2f2962", "a42929": "29429c", "d53939": "4263ef", - "101010": "101010", - "9494a4": "9494a4", - "ffffff": "ffffff", - "b4b4cd": "b4b4cd", - "39394a": "39394a", - "b0b0c8": "b0b0c8", - "000000": "000000", - "3b3b4c": "3b3b4c", - "006f8a": "006f8a", - "00cad2": "00cad2", - "878791": "878791", "f66a6a": "639cf7" }, "2": { "622929": "645117", "a42929": "b88619", "d53939": "ffca2a", - "101010": "101010", "9494a4": "3c4543", - "ffffff": "ffffff", "b4b4cd": "cdccb4", "39394a": "2b2b38", - "b0b0c8": "b0b0c8", - "000000": "000000", - "3b3b4c": "3b3b4c", "006f8a": "645117", "00cad2": "f4e920", "878791": "3c4543", diff --git a/public/images/pokemon/variant/exp/back/229-mega.json b/public/images/pokemon/variant/exp/back/229-mega.json index 817dd33272c..21f5f27a708 100644 --- a/public/images/pokemon/variant/exp/back/229-mega.json +++ b/public/images/pokemon/variant/exp/back/229-mega.json @@ -1,41 +1,32 @@ { "1": { "83738b": "7c323c", - "000000": "000000", "ffffff": "f3bd87", "a49cac": "a84b50", "cdd5d5": "c87966", "182029": "321b32", "313139": "553454", "4a4a52": "76546b", - "010101": "010101", - "f8f9ff": "f8f9ff", "e14825": "9f94cc", "ce0a10": "455d92", "6a211f": "314075", "e89368": "c1c2e8", "f69c83": "f8f1e7", "622910": "77545b", - "0f0f0f": "0f0f0f", "c5cdd1": "bbc3ce", "a45a4a": "ceb0a5", "ffe0b3": "eef5ff", - "e2e0e3": "e2e0e3", - "830c28": "830c28", - "f7f7f7": "f7f7f7", "af1b1b": "aa8c82", "732422": "856458" }, "2": { "83738b": "121d3c", - "000000": "000000", "ffffff": "5c8d95", "a49cac": "223657", "cdd5d5": "38576c", "182029": "321b32", "313139": "b1a3b1", "4a4a52": "f8faf3", - "010101": "010101", "f8f9ff": "223657", "e14825": "2582ce", "ce0a10": "e58142", @@ -43,13 +34,10 @@ "e89368": "4ad1de", "f69c83": "72557e", "622910": "321b32", - "0f0f0f": "0f0f0f", "c5cdd1": "100f27", "a45a4a": "533960", "ffe0b3": "a9f8ef", - "e2e0e3": "e2e0e3", "830c28": "a5657c", - "f7f7f7": "f7f7f7", "af1b1b": "534b6a", "732422": "423655" } diff --git a/public/images/pokemon/variant/exp/back/248-mega.json b/public/images/pokemon/variant/exp/back/248-mega.json index f5b58bf5f10..ef0f1ce5485 100644 --- a/public/images/pokemon/variant/exp/back/248-mega.json +++ b/public/images/pokemon/variant/exp/back/248-mega.json @@ -1,28 +1,26 @@ { "1": { "171717": "101010", - "4a5a39": "533334", - "4b5a3b": "533334", - "727272": "727272", - "801c17": "004194", - "922d00": "004194", - "ce283d": "006fb3", - "d35200": "0098fc", - "729a62": "915957", - "739c62": "915957", - "aacb9a": "c78482" + "4a5a39": "533334", + "4b5a3b": "533334", + "801c17": "004194", + "922d00": "004194", + "ce283d": "006fb3", + "d35200": "0098fc", + "729a62": "915957", + "739c62": "915957", + "aacb9a": "c78482" }, "2": { - "171717": "101010", - "4a5a39": "06092f", - "4b5a3b": "06092f", - "727272": "727272", - "801c17": "ee7b06", - "922d00": "ee7b06", - "ce283d": "ffa904", - "d35200": "ffa904", - "729a62": "2c3071", - "739c62": "2c3071", - "aacb9a": "625695" + "171717": "101010", + "4a5a39": "06092f", + "4b5a3b": "06092f", + "801c17": "ee7b06", + "922d00": "ee7b06", + "ce283d": "ffa904", + "d35200": "ffa904", + "729a62": "2c3071", + "739c62": "2c3071", + "aacb9a": "625695" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/257-mega.json b/public/images/pokemon/variant/exp/back/257-mega.json index 7f2925da1d9..7dea77ff45a 100644 --- a/public/images/pokemon/variant/exp/back/257-mega.json +++ b/public/images/pokemon/variant/exp/back/257-mega.json @@ -9,7 +9,6 @@ "ff9a7f": "fff185", "f0a010": "94f1d8", "ee6262": "f7ca4b", - "000000": "000000", "e55858": "51b5cd", "bd4141": "da8923", "fff188": "ecfff8", @@ -29,7 +28,6 @@ "ff9a7f": "fffce9", "f0a010": "7747bf", "ee6262": "fffae1", - "000000": "000000", "e55858": "c6e6ff", "bd4141": "d2bda7", "fff188": "c6fffd", diff --git a/public/images/pokemon/variant/exp/back/282-mega.json b/public/images/pokemon/variant/exp/back/282-mega.json index 37bf55e1bc2..dcf8bc62a1e 100644 --- a/public/images/pokemon/variant/exp/back/282-mega.json +++ b/public/images/pokemon/variant/exp/back/282-mega.json @@ -6,7 +6,6 @@ "7888b0": "d59c80", "e8e8f8": "f8efde", "b0f090": "fff1c0", - "000000": "000000", "c8c8e0": "ffc4a6", "f87890": "ca2033", "d04870": "da3e4f", @@ -20,11 +19,7 @@ "307840": "242746", "88e088": "3f427f", "70b870": "282c5d", - "7888b0": "7888b0", - "e8e8f8": "e8e8f8", "b0f090": "5b5790", - "000000": "000000", - "c8c8e0": "c8c8e0", "f87890": "b62fa8", "d04870": "d846c1", "802848": "9e2a7c", diff --git a/public/images/pokemon/variant/exp/back/302-mega.json b/public/images/pokemon/variant/exp/back/302-mega.json index 5540f0ec64f..3d2f5c62fb1 100644 --- a/public/images/pokemon/variant/exp/back/302-mega.json +++ b/public/images/pokemon/variant/exp/back/302-mega.json @@ -5,7 +5,6 @@ "ff4a5a": "e945af", "cc3f7c": "b22391", "393952": "123812", - "000000": "000000", "aca4f6": "b2ca9b", "5a4a94": "416a3d", "8b73d5": "86ad74", @@ -19,7 +18,6 @@ "ff4a5a": "236dbc", "cc3f7c": "153db2", "393952": "580a16", - "000000": "000000", "aca4f6": "e0604e", "5a4a94": "7e141c", "8b73d5": "be3933", diff --git a/public/images/pokemon/variant/exp/back/303-mega.json b/public/images/pokemon/variant/exp/back/303-mega.json index 476ffab4228..509921b315c 100644 --- a/public/images/pokemon/variant/exp/back/303-mega.json +++ b/public/images/pokemon/variant/exp/back/303-mega.json @@ -1,34 +1,25 @@ { "1": { - "000000": "000000", "737373": "347c7d", "9ca494": "4fa285", "4a4a4a": "193e49", "7b5a29": "6b5424", "ffc55a": "d6c491", - "ffffff": "ffffff", - "cdcdcd": "cdcdcd", "984868": "b43929", "b86088": "ff625a", - "de9441": "de9441", - "484848": "484848", "9c4a6a": "23445e", "bd628b": "397189", "732041": "162843" }, "2": { - "000000": "000000", "737373": "347c7d", "9ca494": "4fa285", "4a4a4a": "193e49", "7b5a29": "6b5424", "ffc55a": "d6c491", - "ffffff": "ffffff", - "cdcdcd": "cdcdcd", "984868": "b43929", "b86088": "ff625a", "de9441": "bc8a52", - "484848": "484848", "9c4a6a": "23445e", "bd628b": "397189", "732041": "162843" diff --git a/public/images/pokemon/variant/exp/back/308-mega.json b/public/images/pokemon/variant/exp/back/308-mega.json index b13332e5183..cb5df2710f6 100644 --- a/public/images/pokemon/variant/exp/back/308-mega.json +++ b/public/images/pokemon/variant/exp/back/308-mega.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "83414a": "59141d", "e6738b": "a53835", "b44a5a": "83272c", @@ -8,7 +7,6 @@ "bdafad": "a5829d", "52414a": "432641", "e7e3e7": "e0cdd9", - "f9f8f7": "f9f8f7", "a47329": "722966", "eebd5a": "a25793", "f6de83": "ee9bd5", @@ -16,7 +14,6 @@ "42a2bd": "efa360" }, "2": { - "101010": "101010", "83414a": "461f5d", "e6738b": "7d5187", "b44a5a": "633971", diff --git a/public/images/pokemon/variant/exp/back/310-mega.json b/public/images/pokemon/variant/exp/back/310-mega.json index 8ab3d0646dc..b0be523f618 100644 --- a/public/images/pokemon/variant/exp/back/310-mega.json +++ b/public/images/pokemon/variant/exp/back/310-mega.json @@ -4,30 +4,23 @@ "998c4c": "630013", "ffe566": "d4302a", "d9c357": "a6101a", - "101010": "101010", "2a474d": "0d1843", "82cad9": "4c7da6", "548e99": "284781", "69b1bf": "3e6194", - "3f6a73": "1a3269", - "ff7373": "ff7373", - "f8f8f8": "f8f8f8", - "cc2929": "cc2929", - "8c3f3f": "8c3f3f" + "3f6a73": "1a3269" }, "2": { "736a3f": "810040", "998c4c": "a40f5a", "ffe566": "e545b6", "d9c357": "c32574", - "101010": "101010", "2a474d": "3f5476", "82cad9": "c1ddeb", "548e99": "92b4cb", "69b1bf": "b3d1e5", "3f6a73": "6f8caa", "ff7373": "8f60ef", - "f8f8f8": "f8f8f8", "cc2929": "893edf", "8c3f3f": "4a0698" } diff --git a/public/images/pokemon/variant/exp/back/354-mega.json b/public/images/pokemon/variant/exp/back/354-mega.json index d335b807b07..3eb77e2f06a 100644 --- a/public/images/pokemon/variant/exp/back/354-mega.json +++ b/public/images/pokemon/variant/exp/back/354-mega.json @@ -6,7 +6,6 @@ "eebd5a": "b78d90", "4d464f": "592145", "d59c39": "7d656d", - "010101": "010101", "685f6b": "6c2f4c", "7c777d": "934861", "a47b10": "533c4e", @@ -21,7 +20,6 @@ "eebd5a": "4d4f5b", "4d464f": "5b777b", "d59c39": "3b3d54", - "010101": "010101", "685f6b": "71a680", "7c777d": "9cbf81", "a47b10": "373c56", diff --git a/public/images/pokemon/variant/exp/back/362-mega.json b/public/images/pokemon/variant/exp/back/362-mega.json index 2f3d13a6944..244a1c96aeb 100644 --- a/public/images/pokemon/variant/exp/back/362-mega.json +++ b/public/images/pokemon/variant/exp/back/362-mega.json @@ -1,7 +1,6 @@ { "1": { "393941": "050832", - "010101": "010101", "2b74a8": "84073c", "bbeeff": "f9383e", "7dbbee": "b7113a", @@ -13,7 +12,6 @@ }, "2": { "393941": "221315", - "010101": "010101", "2b74a8": "0c4b3a", "bbeeff": "5ce11a", "7dbbee": "009325", diff --git a/public/images/pokemon/variant/exp/back/373-mega.json b/public/images/pokemon/variant/exp/back/373-mega.json index abf1ab30827..0f9d275e792 100644 --- a/public/images/pokemon/variant/exp/back/373-mega.json +++ b/public/images/pokemon/variant/exp/back/373-mega.json @@ -13,7 +13,6 @@ "545a5a": "a45f28", "e6e6df": "fcfcfc", "758888": "839494", - "acaca4": "acaca4", "e0e0d8": "fcfcfc" }, "2": { diff --git a/public/images/pokemon/variant/exp/back/376-mega.json b/public/images/pokemon/variant/exp/back/376-mega.json index 02307c25471..1f9fbff63d9 100644 --- a/public/images/pokemon/variant/exp/back/376-mega.json +++ b/public/images/pokemon/variant/exp/back/376-mega.json @@ -6,9 +6,7 @@ "313962": "550611", "736a73": "a76911", "cdcdcd": "ffe07c", - "acacac": "ffc753", - "101010": "101010", - "ffffff": "ffffff" + "acacac": "ffc753" }, "2": { "416294": "1e716e", @@ -17,8 +15,6 @@ "313962": "0b3739", "736a73": "9f4219", "cdcdcd": "ffc16a", - "acacac": "f57e37", - "101010": "101010", - "ffffff": "ffffff" + "acacac": "f57e37" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/380-mega.json b/public/images/pokemon/variant/exp/back/380-mega.json index 8d973cabd59..63483e791ba 100644 --- a/public/images/pokemon/variant/exp/back/380-mega.json +++ b/public/images/pokemon/variant/exp/back/380-mega.json @@ -3,7 +3,6 @@ "7474a6": "9a6853", "f2f2ff": "f3e6df", "adadd9": "b48f79", - "101010": "101010", "cecef2": "e3cfc1", "483f73": "713004", "8777d9": "d08528", @@ -13,7 +12,6 @@ "7474a6": "8d5a8f", "f2f2ff": "eedaea", "adadd9": "c78ac4", - "101010": "101010", "cecef2": "e4c7e1", "483f73": "15707d", "8777d9": "5de2d5", diff --git a/public/images/pokemon/variant/exp/back/381-mega.json b/public/images/pokemon/variant/exp/back/381-mega.json index 5b676558d13..30fe8a74fa5 100644 --- a/public/images/pokemon/variant/exp/back/381-mega.json +++ b/public/images/pokemon/variant/exp/back/381-mega.json @@ -3,7 +3,6 @@ "7474a6": "7e447b", "f2f2ff": "f9cfed", "adadd9": "b673ad", - "101010": "101010", "cecef2": "dfa1d2", "483f73": "29165d", "8777d9": "453c90", @@ -13,7 +12,6 @@ "7474a6": "98485e", "f2f2ff": "f7d9ec", "adadd9": "d086ac", - "101010": "101010", "cecef2": "e4abcc", "483f73": "52060f", "8777d9": "97241f", diff --git a/public/images/pokemon/variant/exp/back/382-primal.json b/public/images/pokemon/variant/exp/back/382-primal.json index 68a374ee080..2a278ceb80c 100644 --- a/public/images/pokemon/variant/exp/back/382-primal.json +++ b/public/images/pokemon/variant/exp/back/382-primal.json @@ -1,15 +1,8 @@ { "1": { - "5a526b": "5a526b", - "101010": "101010", "322e78": "f08d2a", - "cebdce": "cebdce", - "dedede": "dedede", "7eaecc": "ff3200", - "9c8c94": "9c8c94", "8b7fad": "f3bb49", - "90a2c0": "90a2c0", - "d3e6f4": "d3e6f4", "a43162": "c62e22", "fbec99": "e1ff9f", "6d5e94": "f3bb49", @@ -23,22 +16,12 @@ "fadbb3": "a2ee62", "294c60": "a30d25", "27245e": "d96714", - "74659d": "f3bb49", - "373384": "373384", - "e8e3e8": "e8e3e8", - "34607a": "34607a" + "74659d": "f3bb49" }, "2": { - "5a526b": "5a526b", - "101010": "101010", "322e78": "a90e14", - "cebdce": "cebdce", - "dedede": "dedede", "7eaecc": "ffc546", - "9c8c94": "9c8c94", "8b7fad": "ea512b", - "90a2c0": "90a2c0", - "d3e6f4": "d3e6f4", "a43162": "4139d2", "fbec99": "90ffde", "6d5e94": "ea512b", @@ -52,9 +35,6 @@ "fadbb3": "67a6f4", "294c60": "be5809", "27245e": "780613", - "74659d": "ea512b", - "373384": "373384", - "e8e3e8": "e8e3e8", - "34607a": "34607a" + "74659d": "ea512b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/383-primal.json b/public/images/pokemon/variant/exp/back/383-primal.json index ccecac7c2ac..4ccfac83fdb 100644 --- a/public/images/pokemon/variant/exp/back/383-primal.json +++ b/public/images/pokemon/variant/exp/back/383-primal.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "7b2129": "10371a", "9c2929": "135121", "ff736b": "419e49", @@ -8,12 +7,8 @@ "957346": "ff8571", "f2d259": "ffd493", "bd3131": "2b5b32", - "343434": "343434", - "695a5b": "695a5b", - "887981": "887981", "3a3a3a": "343434", "632329": "032a10", - "f6e08c": "f6e08c", "7e2d2d": "10371a", "736363": "695a5b", "94848c": "887981", @@ -21,14 +16,11 @@ "c92c33": "2b5b32", "a03131": "135121", "d5736d": "419e49", - "bdbdd5": "bdbdd5", - "f2f2f2": "f2f2f2", "ad9ca5": "49c74f", "ffffff": "f2f2f2", "bdbdd6": "bdbdd5" }, "2": { - "000000": "000000", "7b2129": "20516c", "9c2929": "2f6e85", "ff736b": "4daab4", @@ -49,8 +41,6 @@ "c92c33": "3e8b9f", "a03131": "2f6e85", "d5736d": "4daab4", - "bdbdd5": "bdbdd5", - "f2f2f2": "f2f2f2", "ad9ca5": "68cfd0", "ffffff": "f2f2f2", "bdbdd6": "bdbdd5" diff --git a/public/images/pokemon/variant/exp/back/384-mega.json b/public/images/pokemon/variant/exp/back/384-mega.json index 016c044b27f..9ee39a2621c 100644 --- a/public/images/pokemon/variant/exp/back/384-mega.json +++ b/public/images/pokemon/variant/exp/back/384-mega.json @@ -3,7 +3,6 @@ "fbe27e": "90f25d", "fc9436": "3dc62f", "836231": "064c1e", - "010101": "010101", "f6de00": "4ff869", "c5a400": "27c750", "3d7d6d": "66637b", @@ -11,14 +10,12 @@ "22523e": "333554", "e4b629": "27c750", "60d293": "e4e0ee", - "3f3f3f": "333554", - "fcfcfc": "fcfcfc" + "3f3f3f": "333554" }, "2": { "fbe27e": "17e2d6", "fc9436": "098faf", "836231": "121d31", - "010101": "010101", "f6de00": "17e2d6", "c5a400": "098faf", "3d7d6d": "84120f", @@ -26,7 +23,6 @@ "22523e": "650f04", "e4b629": "098faf", "60d293": "f18c5e", - "3f3f3f": "380100", - "fcfcfc": "fcfcfc" + "3f3f3f": "380100" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/4052.json b/public/images/pokemon/variant/exp/back/4052.json index ac18fada19c..eeaa3c4840f 100644 --- a/public/images/pokemon/variant/exp/back/4052.json +++ b/public/images/pokemon/variant/exp/back/4052.json @@ -1,24 +1,16 @@ { "1": { - "181a1d": "181a1d", "272d2e": "342b49", - "0a0a0a": "0a0a0a", "3d4547": "4e385a", - "000000": "000000", "5b4e43": "57567e", "ada09a": "c3c5d4", - "262b3c": "262b3c", "84726f": "7b7aa5" }, "2": { - "181a1d": "181a1d", "272d2e": "234a56", - "0a0a0a": "0a0a0a", "3d4547": "417778", - "000000": "000000", "5b4e43": "171127", "ada09a": "603b54", - "262b3c": "262b3c", "84726f": "3c2841" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/4077.json b/public/images/pokemon/variant/exp/back/4077.json index cbd88a9fa88..02424269ac2 100644 --- a/public/images/pokemon/variant/exp/back/4077.json +++ b/public/images/pokemon/variant/exp/back/4077.json @@ -10,7 +10,6 @@ "ded5ae": "5b93cc", "ffffe3": "8cd8ff", "a3a49f": "355699", - "101010": "101010", "59237e": "312c49", "78499b": "514766" }, @@ -25,7 +24,6 @@ "ded5ae": "cc66cc", "ffffe3": "ff99dd", "a3a49f": "7a3d99", - "101010": "101010", "59237e": "312c49", "78499b": "514766" } diff --git a/public/images/pokemon/variant/exp/back/4078.json b/public/images/pokemon/variant/exp/back/4078.json index 9c680e6fad1..644385dd72a 100644 --- a/public/images/pokemon/variant/exp/back/4078.json +++ b/public/images/pokemon/variant/exp/back/4078.json @@ -2,15 +2,12 @@ "1": { "44bf75": "cc9470", "85fabf": "ffd9a5", - "2b3055": "2b3055", "109865": "995944", "737ba4": "514766", "ffffe3": "8cd8ff", "8e38c1": "990c00", "de9fff": "ff884c", "c566e3": "cc4328", - "0c0c0c": "0c0c0c", - "ffffff": "ffffff", "414a83": "312c49", "ded5ae": "5b93cc", "636357": "192666", @@ -20,15 +17,12 @@ "2": { "44bf75": "cc1e4c", "85fabf": "ff3255", - "2b3055": "2b3055", "109865": "990f3d", "737ba4": "514766", "ffffe3": "ff99dd", "8e38c1": "161f4c", "de9fff": "483e7c", "c566e3": "282866", - "0c0c0c": "0c0c0c", - "ffffff": "ffffff", "414a83": "312c49", "ded5ae": "cc66cc", "636357": "361e66", diff --git a/public/images/pokemon/variant/exp/back/4079.json b/public/images/pokemon/variant/exp/back/4079.json index 5dd35eec151..b66ac41a38c 100644 --- a/public/images/pokemon/variant/exp/back/4079.json +++ b/public/images/pokemon/variant/exp/back/4079.json @@ -6,13 +6,10 @@ "fefe3c": "ffeccb", "caaa2c": "edc59e", "ac4152": "613934", - "101010": "101010", "7b2031": "452a29", "8b5a18": "a84071", "ffe6b4": "ff9eba", - "dea462": "e0799c", - "fcfcfc": "fcfcfc", - "d5cdcd": "d5cdcd" + "dea462": "e0799c" }, "2": { "de627b": "c6aead", @@ -21,12 +18,9 @@ "fefe3c": "d9736b", "caaa2c": "963e59", "ac4152": "846467", - "101010": "101010", "7b2031": "503941", "8b5a18": "a45c58", "ffe6b4": "efc697", - "dea462": "cb8f75", - "fcfcfc": "fcfcfc", - "d5cdcd": "d5cdcd" + "dea462": "cb8f75" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/4199.json b/public/images/pokemon/variant/exp/back/4199.json index 9b0e2810a2e..07911b965be 100644 --- a/public/images/pokemon/variant/exp/back/4199.json +++ b/public/images/pokemon/variant/exp/back/4199.json @@ -1,7 +1,6 @@ { "1": { "493e66": "821d2a", - "101010": "101010", "a191b5": "de504e", "7a6a98": "ad3139", "413668": "622344", @@ -13,13 +12,11 @@ "7b2645": "573531", "d76792": "8f5345", "f985aa": "bb694b", - "f8f8f8": "f8f8f8", "c89a51": "a84254", "eed583": "c75865" }, "2": { "493e66": "2a6122", - "101010": "101010", "a191b5": "b0dc72", "7a6a98": "71ae48", "413668": "1d4c46", @@ -31,7 +28,6 @@ "7b2645": "856568", "d76792": "c6aead", "f985aa": "ecdcbe", - "f8f8f8": "f8f8f8", "c89a51": "2a4948", "eed583": "4b7569" } diff --git a/public/images/pokemon/variant/exp/back/4222.json b/public/images/pokemon/variant/exp/back/4222.json index 4bfc486bcf6..0ae78cfbd22 100644 --- a/public/images/pokemon/variant/exp/back/4222.json +++ b/public/images/pokemon/variant/exp/back/4222.json @@ -7,7 +7,6 @@ "756868": "097f8d", "af9e9e": "44a0af", "9c94a3": "58929f", - "101010": "101010", "cbc2d1": "a9e4e3", "fbf2ff": "d4fefe", "e3c4f2": "d7d2f6" @@ -20,7 +19,6 @@ "756868": "8d6573", "af9e9e": "b0919b", "9c94a3": "4b1f28", - "101010": "101010", "cbc2d1": "773050", "fbf2ff": "874059", "e3c4f2": "567f83" diff --git a/public/images/pokemon/variant/exp/back/4263.json b/public/images/pokemon/variant/exp/back/4263.json index e6b49ad751f..29c046cf394 100644 --- a/public/images/pokemon/variant/exp/back/4263.json +++ b/public/images/pokemon/variant/exp/back/4263.json @@ -1,21 +1,14 @@ { "1": { - "010101": "010101", "5b5958": "397e4a", "60656a": "1c8155", "b2b3b2": "a3ce9e", "3e4042": "01473a", "f5f5f6": "f5ffea", "1b2627": "002121", - "d94a7f": "d94a7f", - "fcfcfc": "fcfcfc", - "ee96b2": "ee96b2", - "6e3b51": "6e3b51", - "9b4f69": "9b4f69", "000000": "010101" }, "2": { - "010101": "010101", "5b5958": "100d2d", "60656a": "8e5aef", "b2b3b2": "201b47", @@ -23,7 +16,6 @@ "f5f5f6": "3c335d", "1b2627": "201b47", "d94a7f": "0099ce", - "fcfcfc": "fcfcfc", "ee96b2": "54f1ff", "6e3b51": "004a8b", "9b4f69": "0099ce", diff --git a/public/images/pokemon/variant/exp/back/4264.json b/public/images/pokemon/variant/exp/back/4264.json index 8aec39c06cf..c266ecb7aa4 100644 --- a/public/images/pokemon/variant/exp/back/4264.json +++ b/public/images/pokemon/variant/exp/back/4264.json @@ -1,30 +1,24 @@ { "1": { - "010101": "010101", "abadaf": "95c090", "797570": "579666", "414141": "1c8155", - "1c1917": "1c1917", "f5f5f6": "f5ffea", "bc3065": "d414dd", "322c29": "01473a", "ff4e89": "ff69fa", "68696a": "27323a", - "949496": "3d494e", - "000000": "000000" + "949496": "3d494e" }, "2": { - "010101": "010101", "abadaf": "1e1a3b", "797570": "302373", "414141": "7c4cd6", - "1c1917": "1c1917", "f5f5f6": "342d4c", "bc3065": "0099ce", "322c29": "412991", "ff4e89": "54f1ff", "68696a": "2a1b4e", - "949496": "554576", - "000000": "000000" + "949496": "554576" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/428-mega.json b/public/images/pokemon/variant/exp/back/428-mega.json index 3a5b2345189..c95bd9b7366 100644 --- a/public/images/pokemon/variant/exp/back/428-mega.json +++ b/public/images/pokemon/variant/exp/back/428-mega.json @@ -9,7 +9,6 @@ "624a41": "660a38", "c55a7b": "7f4c99", "7b3941": "472866", - "101010": "101010", "232323": "0d0b16", "414141": "161626" }, @@ -23,7 +22,6 @@ "624a41": "65597f", "c55a7b": "cc4328", "7b3941": "990c00", - "101010": "101010", "232323": "191933", "414141": "312c49" } diff --git a/public/images/pokemon/variant/exp/back/445-mega.json b/public/images/pokemon/variant/exp/back/445-mega.json index 8020a5f4255..24c8dc9a9a3 100644 --- a/public/images/pokemon/variant/exp/back/445-mega.json +++ b/public/images/pokemon/variant/exp/back/445-mega.json @@ -7,18 +7,12 @@ "404088": "19446e", "5860a8": "33719e", "7878c8": "65a2d5", - "101010": "101010", "c09010": "3aadc5", "f8d018": "42d6de", "b83840": "b23219", - "ffffff": "ffffff", - "707880": "707880", - "c0c8d0": "c0c8d0", "e04830": "ec642c", "581000": "502209", "7b7bcd": "65a2d5", - "c5cdd5": "c5cdd5", - "737b83": "737b83", "000000": "101010" }, "1": { @@ -29,18 +23,12 @@ "404088": "b67252", "5860a8": "deae7a", "7878c8": "f2d8aa", - "101010": "101010", "c09010": "255dd7", "f8d018": "4caaff", "b83840": "9fb6bf", - "ffffff": "ffffff", - "707880": "707880", - "c0c8d0": "c0c8d0", "e04830": "dce8e8", "581000": "393648", "7b7bcd": "f2d8aa", - "c5cdd5": "c5cdd5", - "737b83": "737b83", "000000": "101010" }, "2": { @@ -51,18 +39,12 @@ "404088": "152c3b", "5860a8": "2f434b", "7878c8": "689099", - "101010": "101010", "c09010": "23b8a8", "f8d018": "6fe6a3", "b83840": "b23219", - "ffffff": "ffffff", - "707880": "707880", - "c0c8d0": "c0c8d0", "e04830": "ec642c", "581000": "521000", "7b7bcd": "689099", - "c5cdd5": "c5cdd5", - "737b83": "737b83", "000000": "101010" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/448-mega.json b/public/images/pokemon/variant/exp/back/448-mega.json index fcfe9ece33c..fb44fc447ec 100644 --- a/public/images/pokemon/variant/exp/back/448-mega.json +++ b/public/images/pokemon/variant/exp/back/448-mega.json @@ -3,42 +3,32 @@ "104878": "6c3e20", "4898e8": "e2ce75", "287098": "a56d2f", - "111111": "111111", "383838": "2c2f4c", "585858": "3a5376", "393939": "2c2f4c", - "d0d0d0": "d0d0d0", "5a5a5a": "454764", - "ffffff": "ffffff", "a03030": "8a332f", "d84040": "d85e40", "732222": "8a332f", "a43131": "d85e40", "b4b462": "51689c", "b0b060": "51689c", - "dddddd": "dddddd", "868640": "384876", "e6e69c": "719cbe", - "888888": "888888", "e0e098": "719cbe", "29739c": "a56d2f", - "104a7b": "104a7b", - "4a9cee": "e2ce75", - "a86060": "a86060" + "4a9cee": "e2ce75" }, "1": { "104878": "3f0916", "4898e8": "b85251", "287098": "7f1e2f", - "111111": "111111", "383838": "202931", "585858": "444b4b", "393939": "2d3740", "d0d0d0": "bb711c", "5a5a5a": "354149", "ffffff": "e8a02b", - "a03030": "a03030", - "d84040": "d84040", "732222": "bba597", "a43131": "ecdfd0", "b4b462": "ad826b", @@ -46,38 +36,30 @@ "dddddd": "bb711c", "868640": "825646", "e6e69c": "e2cab0", - "888888": "888888", "e0e098": "e2cab0", "29739c": "7f1e2f", "104a7b": "8e2929", - "4a9cee": "b85251", - "a86060": "a86060" + "4a9cee": "b85251" }, "2": { "104878": "442864", "4898e8": "735c9e", "287098": "513674", - "111111": "111111", "383838": "2c2339", "585858": "453a5a", "393939": "2c2339", - "d0d0d0": "d0d0d0", "5a5a5a": "3b2e47", - "ffffff": "ffffff", "a03030": "a53c18", "d84040": "de8141", "732222": "a53c18", "a43131": "de8141", "b4b462": "373566", "b0b060": "373566", - "dddddd": "dddddd", "868640": "1a1c3b", "e6e69c": "51668e", - "888888": "888888", "e0e098": "51668e", "29739c": "513674", "104a7b": "442864", - "4a9cee": "735c9e", - "a86060": "a86060" + "4a9cee": "735c9e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/4562.json b/public/images/pokemon/variant/exp/back/4562.json index 9e8c1bee22e..5dd509b1345 100644 --- a/public/images/pokemon/variant/exp/back/4562.json +++ b/public/images/pokemon/variant/exp/back/4562.json @@ -2,10 +2,8 @@ "1": { "313131": "145555", "525252": "257e6a", - "101010": "101010", "672b82": "7e173e", "ab38d1": "b0264c", - "371d3f": "371d3f", "6f5c6b": "743949", "e6ddde": "d6b8a0", "927e8d": "a46361", @@ -14,10 +12,8 @@ "2": { "313131": "69162c", "525252": "90222b", - "101010": "101010", "672b82": "57a0b9", "ab38d1": "c2ffe2", - "371d3f": "371d3f", "6f5c6b": "0a4340", "e6ddde": "4fb66a", "927e8d": "1f6455", diff --git a/public/images/pokemon/variant/exp/back/531-mega.json b/public/images/pokemon/variant/exp/back/531-mega.json index 7bc420db09e..1436a7c609d 100644 --- a/public/images/pokemon/variant/exp/back/531-mega.json +++ b/public/images/pokemon/variant/exp/back/531-mega.json @@ -2,25 +2,21 @@ "1": { "80734d": "7c4b3b", "ffecb2": "fff6f0", - "101010": "101010", "ccb87a": "d6bfb4", "b35968": "b64231", "ffbfca": "f5a779", "737373": "6b0a46", "bfbfbf": "cc3a74", - "f8f8f8": "f0728d", - "000000": "000000" + "f8f8f8": "f0728d" }, "2": { "80734d": "09232a", "ffecb2": "4bb9a6", - "101010": "101010", "ccb87a": "29878f", "b35968": "a0602f", "ffbfca": "f6e3a8", "737373": "111322", "bfbfbf": "202537", - "f8f8f8": "323c52", - "000000": "000000" + "f8f8f8": "323c52" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/6-mega-y.json b/public/images/pokemon/variant/exp/back/6-mega-y.json index fa5dede4662..6d67dd05e03 100644 --- a/public/images/pokemon/variant/exp/back/6-mega-y.json +++ b/public/images/pokemon/variant/exp/back/6-mega-y.json @@ -2,7 +2,6 @@ "1": { "e64210": "5033ce", "843119": "552982", - "000000": "000000", "ffd610": "e9bfff", "ef8429": "b27cbc", "f7a510": "9e59db", @@ -11,10 +10,7 @@ "cd5241": "8053b2", "ee8329": "b27cbc", "efb55a": "d8a3e2", - "cecece": "cecece", "217394": "41a86e", - "ffffff": "ffffff", - "efde7b": "fae5ff", - "636363": "636363" + "efde7b": "fae5ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/6100.json b/public/images/pokemon/variant/exp/back/6100.json index a5ba1a41917..5113ce4930c 100644 --- a/public/images/pokemon/variant/exp/back/6100.json +++ b/public/images/pokemon/variant/exp/back/6100.json @@ -5,11 +5,7 @@ "ec6f00": "69a6b4", "dc5d00": "598195", "c04a1c": "4e6170", - "101010": "101010", - "fefefe": "fefefe", - "ddccc8": "ddccc8", "f3d181": "c9cdd6", - "ded5d5": "ded5d5", "d9a866": "a5aab7", "b8752e": "838797" }, @@ -19,11 +15,7 @@ "ec6f00": "a62833", "dc5d00": "8f1b2c", "c04a1c": "72142b", - "101010": "101010", - "fefefe": "fefefe", - "ddccc8": "ddccc8", "f3d181": "502b32", - "ded5d5": "ded5d5", "d9a866": "3a272e", "b8752e": "2d2327" } diff --git a/public/images/pokemon/variant/exp/back/6101.json b/public/images/pokemon/variant/exp/back/6101.json index be75bac4e8e..f645b0ba303 100644 --- a/public/images/pokemon/variant/exp/back/6101.json +++ b/public/images/pokemon/variant/exp/back/6101.json @@ -2,29 +2,22 @@ "1": { "845c35": "373e4c", "f3d181": "c9cdd6", - "101010": "101010", "d9a866": "a5aab7", "a9763d": "838797", "c04a1c": "386583", "dc5d00": "5e8494", "ec6f00": "69a6b4", "7c2506": "2e333b", - "cdcdde": "cdcdde", - "fefefe": "fefefe", "6f625e": "373e4c" }, "2": { "845c35": "231b20", "f3d181": "5e343c", - "101010": "101010", "d9a866": "452d35", "a9763d": "35262c", "c04a1c": "72142b", "dc5d00": "582b39", "ec6f00": "a62833", - "7c2506": "4a061d", - "cdcdde": "cdcdde", - "fefefe": "fefefe", - "6f625e": "6f625e" + "7c2506": "4a061d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/6215.json b/public/images/pokemon/variant/exp/back/6215.json index a66e3780d12..a0485ed67c5 100644 --- a/public/images/pokemon/variant/exp/back/6215.json +++ b/public/images/pokemon/variant/exp/back/6215.json @@ -6,12 +6,9 @@ "956cbe": "31dabb", "514a80": "402010", "dcdbf7": "d0b3a4", - "080808": "080808", "28234b": "220d0a", "7d6ca4": "672e26", "584d80": "401914", - "f6f6ff": "f6f6ff", - "bdbdc5": "bdbdc5", "c52973": "ea903f" }, "2": { @@ -21,12 +18,9 @@ "956cbe": "cc5427", "514a80": "14273a", "dcdbf7": "60ae7e", - "080808": "080808", "28234b": "0a191e", "7d6ca4": "395962", "584d80": "1c3942", - "f6f6ff": "f6f6ff", - "bdbdc5": "bdbdc5", "c52973": "f49633" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/653.json b/public/images/pokemon/variant/exp/back/653.json index f7761fa32b1..acbc4c24d67 100644 --- a/public/images/pokemon/variant/exp/back/653.json +++ b/public/images/pokemon/variant/exp/back/653.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736028": "9f398a", "ffd659": "e190c3", "ccab47": "c35ba3", @@ -12,7 +11,6 @@ "f8f8f8": "fbecff" }, "2": { - "101010": "101010", "736028": "172547", "ffd659": "3a6a93", "ccab47": "264166", diff --git a/public/images/pokemon/variant/exp/back/654.json b/public/images/pokemon/variant/exp/back/654.json index 0f3b2bf3d4e..98273b9be27 100644 --- a/public/images/pokemon/variant/exp/back/654.json +++ b/public/images/pokemon/variant/exp/back/654.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "736028": "061530", "ffd659": "b55390", "ccab47": "872b59", @@ -11,14 +10,11 @@ "737373": "5c255f", "bfbfbf": "c093c3", "804913": "c5b3ca", - "262626": "262626", - "404040": "404040", "f8cf52": "80f37b", "ffc000": "4fcb61", "ff8700": "207d4e" }, "2": { - "101010": "101010", "736028": "061530", "ffd659": "2b5f8a", "ccab47": "173864", @@ -29,8 +25,6 @@ "737373": "75553c", "bfbfbf": "d4b996", "804913": "098794", - "262626": "262626", - "404040": "404040", "f8cf52": "c858a4", "ffc000": "75308e", "ff8700": "521364" diff --git a/public/images/pokemon/variant/exp/back/6549.json b/public/images/pokemon/variant/exp/back/6549.json index 4c50a4187b3..970b5a100a4 100644 --- a/public/images/pokemon/variant/exp/back/6549.json +++ b/public/images/pokemon/variant/exp/back/6549.json @@ -2,7 +2,6 @@ "1": { "70365a": "29547d", "ff84bd": "73bad9", - "101010": "101010", "bd59a2": "5094c0", "315a31": "5a5a2c", "bda452": "77909a", @@ -10,27 +9,20 @@ "39ac39": "bfd17f", "526229": "80152b", "ffbbdb": "b5ddea", - "fdfdfd": "fdfdfd", "4a834a": "8e954d", "9cb462": "bd2d40", - "c5ee7b": "ef5755", - "cdc5bd": "cdc5bd" + "c5ee7b": "ef5755" }, "2": { "70365a": "8a1a3c", "ff84bd": "e8617a", - "101010": "101010", "bd59a2": "d64065", "315a31": "643312", - "bda452": "bda452", - "ffde41": "ffde41", "39ac39": "ebc460", "526229": "351c49", "ffbbdb": "f38e9c", - "fdfdfd": "fdfdfd", "4a834a": "9d7d45", "9cb462": "5d3576", - "c5ee7b": "834c9b", - "cdc5bd": "cdc5bd" + "c5ee7b": "834c9b" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/6570.json b/public/images/pokemon/variant/exp/back/6570.json index 6f6498fa05a..b5d23c31c49 100644 --- a/public/images/pokemon/variant/exp/back/6570.json +++ b/public/images/pokemon/variant/exp/back/6570.json @@ -7,7 +7,6 @@ "4a4d53": "3b2b4f", "f7acae": "ffd291", "fafafa": "efd9d9", - "101010": "101010", "b3b3bb": "d6b7b1", "928d96": "504b6a", "cbcfd8": "7b7897", @@ -22,7 +21,6 @@ "4a4d53": "6f4332", "f7acae": "79d38d", "fafafa": "f0decd", - "101010": "101010", "b3b3bb": "c6ab99", "928d96": "995d3e", "cbcfd8": "d79568", diff --git a/public/images/pokemon/variant/exp/back/6571.json b/public/images/pokemon/variant/exp/back/6571.json index d678782e9fc..1a674c96676 100644 --- a/public/images/pokemon/variant/exp/back/6571.json +++ b/public/images/pokemon/variant/exp/back/6571.json @@ -1,7 +1,6 @@ { "1": { "942429": "4a1921", - "101010": "101010", "d53a3e": "782d41", "928d96": "4a4759", "f07376": "b44d63", @@ -11,13 +10,10 @@ "4a4d53": "262231", "a7484f": "883955", "5f0002": "330814", - "cbcfd8": "737185", - "4b163b": "4b163b", - "6d4d62": "6d4d62" + "cbcfd8": "737185" }, "2": { "942429": "143130", - "101010": "101010", "d53a3e": "2e625a", "928d96": "885f49", "f07376": "4e867b", @@ -28,7 +24,6 @@ "a7484f": "2a6062", "5f0002": "082226", "cbcfd8": "bc9072", - "4b163b": "4b163b", "6d4d62": "c2589c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/664.json b/public/images/pokemon/variant/exp/back/664.json index ae0ec9fc792..438ec1bf6e0 100644 --- a/public/images/pokemon/variant/exp/back/664.json +++ b/public/images/pokemon/variant/exp/back/664.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "363636": "4c2855", "4d4d4d": "9d6260", "4e4e4e": "895a9f", @@ -12,7 +11,6 @@ "f8f8f8": "ffffff" }, "2": { - "101010": "101010", "363636": "05312f", "4d4d4d": "590015", "4e4e4e": "377772", @@ -21,6 +19,6 @@ "9d7247": "dda476", "d1bf6b": "ffe0ba", "b3b3b3": "a70d37", - "f8f8f8": "c83e4c" + "f8f8f8": "c83e4c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/665.json b/public/images/pokemon/variant/exp/back/665.json index c5defbab5b7..de52892d922 100644 --- a/public/images/pokemon/variant/exp/back/665.json +++ b/public/images/pokemon/variant/exp/back/665.json @@ -1,11 +1,9 @@ { "1": { - "363636": "363636", "d1bf6b": "a0c896", "8c8c8c": "895a9f", "bfbfbf": "a97dbb", "9d7247": "838b53", - "101010": "101010", "4d4d4d": "9c615f", "b3b3b3": "e9c7c4", "f8f8f8": "ffffff", @@ -19,7 +17,6 @@ "8c8c8c": "590015", "bfbfbf": "a70d37", "9d7247": "dda476", - "101010": "101010", "4d4d4d": "590015", "b3b3b3": "a70d37", "f8f8f8": "c83e4c", diff --git a/public/images/pokemon/variant/exp/back/666-archipelago.json b/public/images/pokemon/variant/exp/back/666-archipelago.json index 6386464b74e..512859ce9ef 100644 --- a/public/images/pokemon/variant/exp/back/666-archipelago.json +++ b/public/images/pokemon/variant/exp/back/666-archipelago.json @@ -1,35 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "c8373c": "c8373c", - "a2523b": "a2523b", - "c27351": "c27351", - "30c171": "30c171", - "b28e67": "b28e67", - "ceab62": "d9edd4", - "d2bf96": "d2bf96", - "c3c3c3": "c3c3c3" - }, - "2": { - "101010": "101010", - "303030": "642703", - "675220": "741300", - "504a4a": "741300", - "595959": "824719", - "707068": "a22414", - "c8373c": "c8373c", - "a2523b": "a2523b", - "c27351": "c27351", - "30c171": "30c171", - "b28e67": "b28e67", - "ceab62": "a22414", - "d2bf96": "d2bf96", - "c3c3c3": "e7caa5" - - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "642703", + "675220": "741300", + "504a4a": "741300", + "595959": "824719", + "707068": "a22414", + "ceab62": "a22414", + "c3c3c3": "e7caa5" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-continental.json b/public/images/pokemon/variant/exp/back/666-continental.json index 92614fb346c..2c40d87b19e 100644 --- a/public/images/pokemon/variant/exp/back/666-continental.json +++ b/public/images/pokemon/variant/exp/back/666-continental.json @@ -1,38 +1,22 @@ { "1": { - "101010": "101010", "595959": "724b7a", "555353": "724b7a", - "d18257": "d18257", - "f9bd55": "f9bd55", "303030": "402746", - "f8f05e": "f8f05e", - "d24c3e": "d24c3e", "675220": "958c8a", "ceab62": "d9edd4", "707068": "a97cbc", "504a4a": "7f6991", - "aa5844": "aa5844", - "c3c3c3": "ffeaff", - "811c1c": "811c1c", - "e08528": "e08528" + "c3c3c3": "ffeaff" }, "2": { - "101010": "101010", "595959": "8f551e", "555353": "e99b44", - "d18257": "d18257", - "f9bd55": "f9bd55", "303030": "6d2d0d", - "f8f05e": "f8f05e", - "d24c3e": "d24c3e", "675220": "9c5c19", "ceab62": "e99b44", "707068": "e99b44", "504a4a": "9c5c19", - "aa5844": "aa5844", - "c3c3c3": "f8f27f", - "811c1c": "811c1c", - "308528": "308528" + "c3c3c3": "f8f27f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-elegant.json b/public/images/pokemon/variant/exp/back/666-elegant.json index 1b7b9838005..5caa4720b7b 100644 --- a/public/images/pokemon/variant/exp/back/666-elegant.json +++ b/public/images/pokemon/variant/exp/back/666-elegant.json @@ -1,34 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "de4040": "de4040", - "f8de3f": "f8de3f", - "ceab62": "d9edd4", - "56479d": "56479d", - "875fb5": "875fb5", - "cf7ef3": "cf7ef3", - "c3c3c3": "c3c3c3", - "e6ddf8": "e6ddf8" - }, - "2": { - "101010": "101010", - "303030": "351262", - "675220": "7d1083", - "504a4a": "7d1083", - "595959": "612776", - "707068": "a73fab", - "de4040": "de4040", - "f8de3f": "f8de3f", - "ceab62": "a73fab", - "56479d": "56479d", - "875fb5": "875fb5", - "cf7ef3": "cf7ef3", - "c3c3c3": "f0ecff", - "e6ddf8": "e6ddf8" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "351262", + "675220": "7d1083", + "504a4a": "7d1083", + "595959": "612776", + "707068": "a73fab", + "ceab62": "a73fab", + "c3c3c3": "f0ecff" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-fancy.json b/public/images/pokemon/variant/exp/back/666-fancy.json index 5d368667ae3..6f20a0dc3bb 100644 --- a/public/images/pokemon/variant/exp/back/666-fancy.json +++ b/public/images/pokemon/variant/exp/back/666-fancy.json @@ -1,36 +1,22 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "de4040": "de4040", - "5faa3e": "5faa3e", - "ceab62": "d9edd4", - "b6d26d": "b6d26d", - "e9e052": "e9e052", - "cf7ef3": "cf7ef3", - "c3c3c3": "ffeaff", - "f2d4e3": "f2d4e3", - "ead2e3": "ffeaff" - }, - "2": { - "101010": "101010", - "303030": "00771b", - "675220": "b9c05a", - "504a4a": "b9c05a", - "595959": "6f9f42", - "707068": "6f9f42", - "de4040": "de4040", - "5faa3e": "5faa3e", - "ceab62": "e3e982", - "b6d26d": "b6d26d", - "e9e052": "e9e052", - "cf7ef3": "cf7ef3", - "c3c3c3": "fcf1ff", - "f2d4e3": "f2d4e3", - "ead2e3": "fcf1ff" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4", + "c3c3c3": "ffeaff", + "ead2e3": "ffeaff" + }, + "2": { + "303030": "00771b", + "675220": "b9c05a", + "504a4a": "b9c05a", + "595959": "6f9f42", + "707068": "6f9f42", + "ceab62": "e3e982", + "c3c3c3": "fcf1ff", + "ead2e3": "fcf1ff" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-garden.json b/public/images/pokemon/variant/exp/back/666-garden.json index 16fec8bc537..2f79f5d017b 100644 --- a/public/images/pokemon/variant/exp/back/666-garden.json +++ b/public/images/pokemon/variant/exp/back/666-garden.json @@ -1,32 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "de4040": "de4040", - "398351": "398351", - "ceab62": "d9edd4", - "88d254": "88d254", - "3f919a": "3f919a", - "3dba96": "3dba96", - "c3c3c3": "c3c3c3" - }, - "2": { - "101010": "101010", - "303030": "044553", - "675220": "055160", - "504a4a": "055160", - "595959": "006b55", - "707068": "227687", - "de4040": "de4040", - "398351": "398351", - "ceab62": "227687", - "88d254": "88d254", - "3f919a": "3f919a", - "3dba96": "3dba96", - "c3c3c3": "72d0a3" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "044553", + "675220": "055160", + "504a4a": "055160", + "595959": "006b55", + "707068": "227687", + "ceab62": "227687", + "c3c3c3": "72d0a3" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-high-plains.json b/public/images/pokemon/variant/exp/back/666-high-plains.json index 984055b6a24..55ddeb3fd46 100644 --- a/public/images/pokemon/variant/exp/back/666-high-plains.json +++ b/public/images/pokemon/variant/exp/back/666-high-plains.json @@ -1,38 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "337543": "337543", - "504a4a": "7f6991", - "595959": "724b7a", - "7d4428": "7d4428", - "707068": "a97cbc", - "9a5a3b": "9a5a3b", - "aa4343": "aa4343", - "e1764e": "e1764e", - "e8c815": "e8c815", - "ceab62": "d9edd4", - "f3a861": "f3a861", - "c3c3c3": "c3c3c3", - "773d21": "773d21" - }, - "2": { - "101010": "101010", - "303030": "8f1d19", - "675220": "c97034", - "337543": "337543", - "504a4a": "c97034", - "595959": "a55422", - "7d4428": "7d4428", - "707068": "f2975a", - "9a5a3b": "9a5a3b", - "aa4343": "aa4343", - "e1764e": "e1764e", - "e8c815": "e8c815", - "ceab62": "f2975a", - "f3a861": "f3a861", - "c3c3c3": "edc67c", - "773d21": "773d21" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "8f1d19", + "675220": "c97034", + "504a4a": "c97034", + "595959": "a55422", + "707068": "f2975a", + "ceab62": "f2975a", + "c3c3c3": "edc67c" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-icy-snow.json b/public/images/pokemon/variant/exp/back/666-icy-snow.json index ec52af1302a..ab0c92a28fb 100644 --- a/public/images/pokemon/variant/exp/back/666-icy-snow.json +++ b/public/images/pokemon/variant/exp/back/666-icy-snow.json @@ -1,32 +1,18 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "ceab62": "d9edd4", - "95a1a1": "95a1a1", - "acacc2": "acacc2", - "c3c3c3": "c3c3c3", - "cfd9cf": "cfd9cf", - "c5c5da": "c5c5da", - "ffffff": "ffffff" - }, - "2": { - "101010": "101010", - "303030": "364051", - "675220": "666b7d", - "504a4a": "666b7d", - "595959": "60646a", - "707068": "8c91a4", - "ceab62": "8c91a4", - "95a1a1": "95a1a1", - "acacc2": "acacc2", - "c3c3c3": "c3c3c3", - "cfd9cf": "cfd9cf", - "c5c5da": "c5c5da", - "ffffff": "ffffff" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "364051", + "675220": "666b7d", + "504a4a": "666b7d", + "595959": "60646a", + "707068": "8c91a4", + "ceab62": "8c91a4" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-jungle.json b/public/images/pokemon/variant/exp/back/666-jungle.json index 63b998e284e..d4b0171bd78 100644 --- a/public/images/pokemon/variant/exp/back/666-jungle.json +++ b/public/images/pokemon/variant/exp/back/666-jungle.json @@ -1,34 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "724e28": "724e28", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "567456": "567456", - "707068": "a97cbc", - "9a653e": "9a653e", - "638c63": "638c63", - "c29566": "c29566", - "ceab62": "d9edd4", - "7cc48b": "7cc48b", - "c3c3c3": "c3c3c3" - }, - "2": { - "101010": "101010", - "303030": "20452e", - "724e28": "724e28", - "675220": "153922", - "504a4a": "153922", - "595959": "285b3b", - "567456": "567456", - "707068": "385c43", - "9a653e": "9a653e", - "638c63": "638c63", - "c29566": "c29566", - "ceab62": "385c43", - "7cc48b": "7cc48b", - "c3c3c3": "a9d9a0" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "20452e", + "675220": "153922", + "504a4a": "153922", + "595959": "285b3b", + "707068": "385c43", + "ceab62": "385c43", + "c3c3c3": "a9d9a0" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-marine.json b/public/images/pokemon/variant/exp/back/666-marine.json index 0bae2c2067e..fa84d9f946b 100644 --- a/public/images/pokemon/variant/exp/back/666-marine.json +++ b/public/images/pokemon/variant/exp/back/666-marine.json @@ -1,32 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "ceab62": "d9edd4", - "315382": "315382", - "367cb9": "367cb9", - "2f8dc9": "2f8dc9", - "5acdf1": "5acdf1", - "c3c3c3": "c3c3c3", - "f2f2f2": "f2f2f2" - }, - "2": { - "101010": "101010", - "303030": "16244f", - "675220": "264c85", - "504a4a": "264c85", - "595959": "2a5894", - "707068": "3070af", - "ceab62": "3070af", - "315382": "315382", - "367cb9": "367cb9", - "2f8dc9": "2f8dc9", - "5acdf1": "5acdf1", - "c3c3c3": "3070af", - "f2f2f2": "f2f2f2" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "16244f", + "675220": "264c85", + "504a4a": "264c85", + "595959": "2a5894", + "707068": "3070af", + "ceab62": "3070af", + "c3c3c3": "3070af" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-meadow.json b/public/images/pokemon/variant/exp/back/666-meadow.json index 4f567cb29ee..d722641f0da 100644 --- a/public/images/pokemon/variant/exp/back/666-meadow.json +++ b/public/images/pokemon/variant/exp/back/666-meadow.json @@ -1,34 +1,19 @@ { - "1": { - "101010": "101010", - "f2f2f2": "f2f2f2", - "303030": "402746", - "504a4a": "7f6991", - "595959": "724b7a", - "c3c3c3": "c3c3c3", - "707068": "a97cbc", - "675220": "958c8a", - "ceab62": "d9edd4", - "2d9b9b": "2d9b9b", - "e66fad": "e66fad", - "b4295a": "b4295a", - "f3a0ca": "f3a0ca", - "da6b7e": "da6b7e" - }, - "2": { - "101010": "101010", - "f2f2f2": "f2f2f2", - "303030": "770921", - "504a4a": "a2275e", - "595959": "9e3941", - "c3c3c3": "f4c2ec", - "707068": "ce5283", - "675220": "a2275e", - "ceab62": "ce5283", - "2d9b9b": "2d9b9b", - "e66fad": "e66fad", - "b4295a": "b4295a", - "f3a0ca": "f3a0ca", - "da6b7e": "da6b7e" - } + "1": { + "303030": "402746", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "675220": "958c8a", + "ceab62": "d9edd4" + }, + "2": { + "303030": "770921", + "504a4a": "a2275e", + "595959": "9e3941", + "c3c3c3": "f4c2ec", + "707068": "ce5283", + "675220": "a2275e", + "ceab62": "ce5283" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-modern.json b/public/images/pokemon/variant/exp/back/666-modern.json index 5572a58bfa9..ab01cb62e1d 100644 --- a/public/images/pokemon/variant/exp/back/666-modern.json +++ b/public/images/pokemon/variant/exp/back/666-modern.json @@ -1,32 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "b83c3c": "b83c3c", - "f44f4f": "f44f4f", - "ceab62": "d9edd4", - "3b6cbb": "3b6cbb", - "405793": "405793", - "c3c3c3": "c3c3c3", - "cfc5d9": "cfc5d9" - }, - "2":{ - "101010": "101010", - "303030": "4e0000", - "675220": "801521", - "504a4a": "801521", - "595959": "830012", - "707068": "ad2640", - "b83c3c": "b83c3c", - "f44f4f": "f44f4f", - "ceab62": "ad2640", - "3b6cbb": "3b6cbb", - "405793": "405793", - "c3c3c3": "ffeae8", - "cfc5d9": "cfc5d9" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "4e0000", + "675220": "801521", + "504a4a": "801521", + "595959": "830012", + "707068": "ad2640", + "ceab62": "ad2640", + "c3c3c3": "ffeae8" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-monsoon.json b/public/images/pokemon/variant/exp/back/666-monsoon.json index 915d471b2b1..5a127a43bbe 100644 --- a/public/images/pokemon/variant/exp/back/666-monsoon.json +++ b/public/images/pokemon/variant/exp/back/666-monsoon.json @@ -1,33 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "807676": "807676", - "ceab62": "d9edd4", - "5676de": "5676de", - "4eccd6": "4eccd6", - "989898": "989898", - "c3c3c3": "c3c3c3", - "f0f0f8": "f0f0f8" - }, - "2": { - "101010": "101010", - "303030": "3d3231", - "675220": "2c3593", - "504a4a": "2c3593", - "595959": "4f4645", - "707068": "5857bc", - "807676": "807676", - "ceab62": "5857bc", - "5676de": "5676de", - "4eccd6": "4eccd6", - "989898": "989898", - "92f4f4": "92f4f4", - "c3c3c3": "b8f9f9", - "f0f0f8": "f0f0f8" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "3d3231", + "675220": "2c3593", + "504a4a": "2c3593", + "595959": "4f4645", + "707068": "5857bc", + "ceab62": "5857bc", + "c3c3c3": "b8f9f9" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-ocean.json b/public/images/pokemon/variant/exp/back/666-ocean.json index 70e7a51c21f..9704a52e083 100644 --- a/public/images/pokemon/variant/exp/back/666-ocean.json +++ b/public/images/pokemon/variant/exp/back/666-ocean.json @@ -1,34 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "e1384d": "e1384d", - "ebcf3f": "ebcf3f", - "ceab62": "d9edd4", - "f4ad61": "f4ad61", - "f8ef6a": "f8ef6a", - "4482c9": "4482c9", - "6bb2e9": "6bb2e9", - "c3c3c3": "c3c3c3" - }, - "2": { - "101010": "101010", - "303030": "b54908", - "675220": "bc601c", - "504a4a": "bc601c", - "595959": "e99a26", - "707068": "ea8742", - "e1384d": "e1384d", - "ebcf3f": "ebcf3f", - "ceab62": "ea8742", - "f4ad61": "f4ad61", - "f8ef6a": "f8ef6a", - "4482c9": "4482c9", - "6bb2e9": "6bb2e9", - "c3c3c3": "f3c86b" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "b54908", + "675220": "bc601c", + "504a4a": "bc601c", + "595959": "e99a26", + "707068": "ea8742", + "ceab62": "ea8742", + "c3c3c3": "f3c86b" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-poke-ball.json b/public/images/pokemon/variant/exp/back/666-poke-ball.json index e21ba03fc1e..3625b1857ed 100644 --- a/public/images/pokemon/variant/exp/back/666-poke-ball.json +++ b/public/images/pokemon/variant/exp/back/666-poke-ball.json @@ -1,34 +1,25 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "971d1d": "971d1d", - "b72c2c": "b72c2c", - "dc4b4b": "dc4b4b", - "e97e7e": "e97e7e", - "ceab62": "d9edd4", - "a9a99e": "a9a99e", - "c3c3c3": "c3c3c3", - "f8f8f8": "f8f8f8" - }, - "2": { - "101010": "101010", - "303030": "ae001a", - "675220": "a70038", - "504a4a": "a70038", - "595959": "df0036", - "707068": "d5375a", - "971d1d": "040046", - "b72c2c": "00005e", - "dc4b4b": "19007d", - "e97e7e": "2e2095", - "ceab62": "d5375a", - "a9a99e": "000050", - "c3c3c3": "f0a6bf", - "f8f8f8": "00006d" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "ae001a", + "675220": "a70038", + "504a4a": "a70038", + "595959": "df0036", + "707068": "d5375a", + "971d1d": "040046", + "b72c2c": "00005e", + "dc4b4b": "19007d", + "e97e7e": "2e2095", + "ceab62": "d5375a", + "a9a99e": "000050", + "c3c3c3": "f0a6bf", + "f8f8f8": "00006d" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-polar.json b/public/images/pokemon/variant/exp/back/666-polar.json index f86b4df3dcc..818b7c7850e 100644 --- a/public/images/pokemon/variant/exp/back/666-polar.json +++ b/public/images/pokemon/variant/exp/back/666-polar.json @@ -1,34 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "2d2d61": "2d2d61", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "ceab62": "d9edd4", - "3b4b8a": "3b4b8a", - "4d6cc1": "4d6cc1", - "6aa2dc": "6aa2dc", - "bfbfbf": "bfbfbf", - "c3c3c3": "c3c3c3", - "f0f0f8": "f0f0f8" - }, - "2": { - "101010": "101010", - "303030": "191b54", - "675220": "366098", - "2d2d61": "2d2d61", - "504a4a": "366098", - "595959": "2f3887", - "707068": "5f85c1", - "ceab62": "5f85c1", - "3b4b8a": "3b4b8a", - "4d6cc1": "4d6cc1", - "6aa2dc": "6aa2dc", - "bfbfbf": "bfbfbf", - "c3c3c3": "ffffff", - "f0f0f8": "f0f0f8" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "191b54", + "675220": "366098", + "504a4a": "366098", + "595959": "2f3887", + "707068": "5f85c1", + "ceab62": "5f85c1", + "c3c3c3": "ffffff" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-river.json b/public/images/pokemon/variant/exp/back/666-river.json index c7e5e288d05..5ba0084df9d 100644 --- a/public/images/pokemon/variant/exp/back/666-river.json +++ b/public/images/pokemon/variant/exp/back/666-river.json @@ -1,40 +1,18 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "4a412c": "4a412c", - "675220": "958c8a", - "634d20": "634d20", - "1d726a": "1d726a", - "504a4a": "7f6991", - "595959": "724b7a", - "625841": "625841", - "707068": "a97cbc", - "bc813f": "bc813f", - "9c9143": "9c9143", - "ceab62": "ceab62", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "c3c3c3": "c3c3c3", - "d2a862": "d9edd4" - }, - "2": { - "101010": "101010", - "303030": "7b2800", - "4a412c": "4a412c", - "675220": "ae7f41", - "634d20": "634d20", - "1d726a": "1d726a", - "504a4a": "ae7f41", - "595959": "8a5702", - "625841": "625841", - "707068": "d9a666", - "bc813f": "bc813f", - "9c9143": "9c9143", - "ceab62": "ceab62", - "279ec2": "279ec2", - "59c9d3": "59c9d3", - "c3c3c3": "e3c384", - "d2a862": "d2a862" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "d2a862": "d9edd4" + }, + "2": { + "303030": "7b2800", + "675220": "ae7f41", + "504a4a": "ae7f41", + "595959": "8a5702", + "707068": "d9a666", + "c3c3c3": "e3c384" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-sandstorm.json b/public/images/pokemon/variant/exp/back/666-sandstorm.json index 6bc91afb34d..64f3f8ce3fa 100644 --- a/public/images/pokemon/variant/exp/back/666-sandstorm.json +++ b/public/images/pokemon/variant/exp/back/666-sandstorm.json @@ -1,34 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "625843": "625843", - "72604d": "72604d", - "707068": "a97cbc", - "9b9148": "9b9148", - "ba8d68": "ba8d68", - "ceab62": "d9edd4", - "d9b674": "d9b674", - "f1d69e": "f1d69e", - "c3c3c3": "c3c3c3" - }, - "2": { - "101010": "101010", - "303030": "443123", - "675220": "9c703b", - "504a4a": "9c703b", - "595959": "88583e", - "625843": "625843", - "72604d": "72604d", - "707068": "c6975f", - "9b9148": "9b9148", - "ba8d68": "ba8d68", - "ceab62": "c6975f", - "d9b674": "d9b674", - "f1d69e": "f1d69e", - "c3c3c3": "ece1a9" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "443123", + "675220": "9c703b", + "504a4a": "9c703b", + "595959": "88583e", + "707068": "c6975f", + "ceab62": "c6975f", + "c3c3c3": "ece1a9" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-savanna.json b/public/images/pokemon/variant/exp/back/666-savanna.json index c261f52dced..1b4b22b67d9 100644 --- a/public/images/pokemon/variant/exp/back/666-savanna.json +++ b/public/images/pokemon/variant/exp/back/666-savanna.json @@ -1,34 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "dcc433": "dcc433", - "ceab62": "d9edd4", - "3b67ac": "3b67ac", - "61a0f5": "61a0f5", - "55d3d9": "55d3d9", - "6cc6c6": "6cc6c6", - "fffd77": "fffd77", - "c3c3c3": "c3c3c3" - }, - "2": { - "101010": "101010", - "303030": "183576", - "675220": "1d828b", - "504a4a": "1d828b", - "595959": "4168bb", - "707068": "4faab3", - "dcc433": "dcc433", - "ceab62": "4faab3", - "fffd77": "fffd77", - "3b67ac": "3b67ac", - "61a0f5": "61a0f5", - "55d3d9": "55d3d9", - "6cc6c6": "6cc6c6", - "c3c3c3": "81e7e1" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "183576", + "675220": "1d828b", + "504a4a": "1d828b", + "595959": "4168bb", + "707068": "4faab3", + "ceab62": "4faab3", + "c3c3c3": "81e7e1" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-sun.json b/public/images/pokemon/variant/exp/back/666-sun.json index 21cf5787ba4..c18f2cd34e3 100644 --- a/public/images/pokemon/variant/exp/back/666-sun.json +++ b/public/images/pokemon/variant/exp/back/666-sun.json @@ -1,34 +1,19 @@ -{ - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "c94971": "c94971", - "e18248": "e18248", - "ceab62": "d9edd4", - "f1a26a": "f1a26a", - "f0ce44": "f0ce44", - "fcf372": "fcf372", - "f47491": "f47491", - "c3c3c3": "c3c3c3" - }, - "2": { - "101010": "101010", - "303030": "640000", - "675220": "8c1850", - "504a4a": "8c1850", - "595959": "750500", - "707068": "b83b74", - "c94971": "c94971", - "e18248": "e18248", - "ceab62": "b83b74", - "f1a26a": "f1a26a", - "f0ce44": "f0ce44", - "fcf372": "fcf372", - "f47491": "f47491", - "c3c3c3": "fee3e7" - } +{ + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "640000", + "675220": "8c1850", + "504a4a": "8c1850", + "595959": "750500", + "707068": "b83b74", + "ceab62": "b83b74", + "c3c3c3": "fee3e7" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/666-tundra.json b/public/images/pokemon/variant/exp/back/666-tundra.json index b098f776c00..fb42b3a6db2 100644 --- a/public/images/pokemon/variant/exp/back/666-tundra.json +++ b/public/images/pokemon/variant/exp/back/666-tundra.json @@ -1,32 +1,19 @@ { - "1": { - "101010": "101010", - "303030": "402746", - "675220": "958c8a", - "504a4a": "7f6991", - "595959": "724b7a", - "707068": "a97cbc", - "ceab62": "d9edd4", - "539ad9": "539ad9", - "74bbe9": "74bbe9", - "a3def1": "a3def1", - "c3c3c3": "c3c3c3", - "d0d0d0": "d0d0d0", - "f0f0f8": "f0f0f8" - }, - "2": { - "101010": "101010", - "303030": "003d69", - "675220": "3a76a7", - "504a4a": "3a76a7", - "595959": "225b72", - "707068": "659dd0", - "ceab62": "659dd0", - "539ad9": "539ad9", - "74bbe9": "74bbe9", - "a3def1": "a3def1", - "c3c3c3": "cbfbfb", - "d0d0d0": "d0d0d0", - "f0f0f8": "f0f0f8" - } + "1": { + "303030": "402746", + "675220": "958c8a", + "504a4a": "7f6991", + "595959": "724b7a", + "707068": "a97cbc", + "ceab62": "d9edd4" + }, + "2": { + "303030": "003d69", + "675220": "3a76a7", + "504a4a": "3a76a7", + "595959": "225b72", + "707068": "659dd0", + "ceab62": "659dd0", + "c3c3c3": "cbfbfb" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/670-orange.json b/public/images/pokemon/variant/exp/back/670-orange.json index 4cf657f0a43..09df5a862ed 100644 --- a/public/images/pokemon/variant/exp/back/670-orange.json +++ b/public/images/pokemon/variant/exp/back/670-orange.json @@ -2,7 +2,6 @@ "1": { "7f6f1f": "5c0d0d", "cfae4f": "a3382c", - "101010": "101010", "875829": "5c2c09", "d98d41": "aa571d", "ffb568": "cd9231", @@ -12,14 +11,12 @@ "208050": "e493a1", "cfbfaf": "bfbfbf", "706050": "595959", - "f8f7f9": "f8f7f9", "50996f": "f2b4b4", "205030": "aa2960" }, "2": { "7f6f1f": "b1b1b1", "cfae4f": "f8f8f4", - "101010": "101010", "875829": "215510", "d98d41": "739f1f", "ffb568": "afcf4f", diff --git a/public/images/pokemon/variant/exp/back/670-red.json b/public/images/pokemon/variant/exp/back/670-red.json index d6f3f1bc99c..ae753ab76b5 100644 --- a/public/images/pokemon/variant/exp/back/670-red.json +++ b/public/images/pokemon/variant/exp/back/670-red.json @@ -2,7 +2,6 @@ "1": { "7f6f1f": "3e0547", "cfae4f": "8e1653", - "101010": "101010", "703040": "630a23", "df4f4f": "a31f35", "ef6f6f": "cd4a4a", @@ -12,14 +11,12 @@ "208050": "e493a1", "cfbfaf": "bfbfbf", "706050": "595959", - "f8f7f9": "f8f7f9", "50996f": "f2b4b4", "205030": "aa2960" }, "2": { "7f6f1f": "b1b1b1", "cfae4f": "f8f8f4", - "101010": "101010", "703040": "215510", "df4f4f": "739f1f", "ef6f6f": "afcf4f", diff --git a/public/images/pokemon/variant/exp/back/670-white.json b/public/images/pokemon/variant/exp/back/670-white.json index 6c781f728dc..dda06922053 100644 --- a/public/images/pokemon/variant/exp/back/670-white.json +++ b/public/images/pokemon/variant/exp/back/670-white.json @@ -2,7 +2,6 @@ "1": { "7f6f1f": "110732", "cfae4f": "3b374e", - "101010": "101010", "878787": "1e1d2a", "d9d9d9": "4c4b55", "fdfdfd": "747478", @@ -12,14 +11,12 @@ "208050": "e493a1", "cfbfaf": "bfbfbf", "706050": "595959", - "f8f7f9": "f8f7f9", "50996f": "f2b4b4", "205030": "aa2960" }, "2": { "7f6f1f": "b1b1b1", "cfae4f": "f8f8f4", - "101010": "101010", "878787": "215510", "d9d9d9": "739f1f", "fdfdfd": "afcf4f", @@ -29,7 +26,6 @@ "208050": "6d716f", "cfbfaf": "c6c6c6", "706050": "595959", - "f8f7f9": "f8f7f9", "50996f": "a3a6a4", "205030": "1c2d32" } diff --git a/public/images/pokemon/variant/exp/back/670-yellow.json b/public/images/pokemon/variant/exp/back/670-yellow.json index 44f974da441..76b47b04e21 100644 --- a/public/images/pokemon/variant/exp/back/670-yellow.json +++ b/public/images/pokemon/variant/exp/back/670-yellow.json @@ -2,7 +2,6 @@ "1": { "7f6f1f": "06471f", "cfae4f": "1a8021", - "101010": "101010", "857c28": "064718", "d8cb40": "6f950a", "f9ec63": "abb830", @@ -12,14 +11,12 @@ "208050": "e493a1", "cfbfaf": "bfbfbf", "706050": "595959", - "f8f7f9": "f8f7f9", "50996f": "f2b4b4", "205030": "aa2960" }, "2": { "7f6f1f": "b1b1b1", "cfae4f": "f8f8f4", - "101010": "101010", "857c28": "215510", "d8cb40": "739f1f", "f9ec63": "afcf4f", diff --git a/public/images/pokemon/variant/exp/back/6705.json b/public/images/pokemon/variant/exp/back/6705.json index a4e3b52f015..f8d367abf7a 100644 --- a/public/images/pokemon/variant/exp/back/6705.json +++ b/public/images/pokemon/variant/exp/back/6705.json @@ -6,7 +6,6 @@ "bfacbf": "e56ca6", "367456": "0c5474", "50ab89": "197497", - "101010": "101010", "60606c": "1f1233", "c5cce0": "513981", "aeb5c6": "442967", @@ -20,11 +19,9 @@ "bfacbf": "5db6a9", "367456": "842401", "50ab89": "a34205", - "101010": "101010", "60606c": "042329", "c5cce0": "176463", "aeb5c6": "0d484a", - "949aab": "073338", - "e3e8f4": "e3e8f4" + "949aab": "073338" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/671-blue.json b/public/images/pokemon/variant/exp/back/671-blue.json index d439421802b..025c6e2ad0e 100644 --- a/public/images/pokemon/variant/exp/back/671-blue.json +++ b/public/images/pokemon/variant/exp/back/671-blue.json @@ -3,7 +3,6 @@ "4a778a": "130540", "7cc6c6": "291371", "daf8f8": "69c9e3", - "141214": "141214", "aaf2f2": "3827a3", "466e82": "130540", "3d9ccc": "2938a3", @@ -12,17 +11,12 @@ "247264": "dc5073", "2c826c": "dc5073", "3ca68c": "ff91a4", - "5c5a5c": "5c5a5c", - "bcbebc": "bcbebc", - "fcfafc": "fcfafc", - "245a4c": "aa1a58", - "1c362c": "1c362c" + "245a4c": "aa1a58" }, "2": { "4a778a": "07230a", "7cc6c6": "213225", "daf8f8": "dfe3e1", - "141214": "141214", "aaf2f2": "4d4e46", "466e82": "0a320e", "3d9ccc": "7f9f1f", @@ -34,7 +28,6 @@ "5c5a5c": "32448e", "bcbebc": "9fb6d4", "fcfafc": "dff2ff", - "245a4c": "0d4a80", - "1c362c": "1c362c" + "245a4c": "0d4a80" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/671-orange.json b/public/images/pokemon/variant/exp/back/671-orange.json index 9a543e497f5..4bf20675cd8 100644 --- a/public/images/pokemon/variant/exp/back/671-orange.json +++ b/public/images/pokemon/variant/exp/back/671-orange.json @@ -3,7 +3,6 @@ "795941": "401d04", "d2ab84": "631818", "faeadb": "ffbc77", - "141214": "141214", "ffd9b2": "a34b2c", "785941": "401d04", "d98d41": "954c17", @@ -12,17 +11,12 @@ "247264": "dc5073", "2c826c": "dc5073", "3ca68c": "ff91a4", - "5c5a5c": "5c5a5c", - "bcbebc": "bcbebc", - "fcfafc": "fcfafc", - "245a4c": "aa1a58", - "1c362c": "1c362c" + "245a4c": "aa1a58" }, "2": { "795941": "07230a", "d2ab84": "213225", "faeadb": "dfe3e1", - "141214": "141214", "ffd9b2": "4d4e46", "785941": "0a320e", "d98d41": "7f9f1f", @@ -34,7 +28,6 @@ "5c5a5c": "5c0c2e", "bcbebc": "f1a695", "fcfafc": "fff1df", - "245a4c": "800707", - "1c362c": "1c362c" + "245a4c": "800707" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/671-red.json b/public/images/pokemon/variant/exp/back/671-red.json index 46fe34c7d0c..9788c78b8fe 100644 --- a/public/images/pokemon/variant/exp/back/671-red.json +++ b/public/images/pokemon/variant/exp/back/671-red.json @@ -3,7 +3,6 @@ "643e5c": "390614", "a46294": "4e0c38", "fcb2cc": "ff90a2", - "141214": "141214", "dc9ac4": "8e1a55", "842e2c": "390614", "dc4e4c": "95172c", @@ -12,17 +11,12 @@ "247264": "dc5073", "2c826c": "dc5073", "3ca68c": "ff91a4", - "5c5a5c": "5c5a5c", - "bcbebc": "bcbebc", - "fcfafc": "fcfafc", - "245a4c": "aa1a58", - "1c362c": "1c362c" + "245a4c": "aa1a58" }, "2": { "643e5c": "07230a", "a46294": "213225", "fcb2cc": "dfe3e1", - "141214": "141214", "dc9ac4": "4d4e46", "842e2c": "0a320e", "dc4e4c": "7f9f1f", @@ -34,7 +28,6 @@ "5c5a5c": "5c0c2e", "bcbebc": "dca4b2", "fcfafc": "ffd7db", - "245a4c": "710846", - "1c362c": "1c362c" + "245a4c": "710846" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/671-white.json b/public/images/pokemon/variant/exp/back/671-white.json index a4953029afe..b8155ae32bb 100644 --- a/public/images/pokemon/variant/exp/back/671-white.json +++ b/public/images/pokemon/variant/exp/back/671-white.json @@ -3,7 +3,6 @@ "868686": "171a1c", "b4b4b4": "231e32", "f7bcc6": "c2c1c6", - "141214": "141214", "f2f2f2": "353340", "878787": "171a1c", "d9d9d9": "3c3b47", @@ -12,17 +11,12 @@ "247264": "dc5073", "2c826c": "dc5073", "3ca68c": "ff91a4", - "5c5a5c": "5c5a5c", - "bcbebc": "bcbebc", - "fcfafc": "fcfafc", - "245a4c": "aa1a58", - "1c362c": "1c362c" + "245a4c": "aa1a58" }, "2": { "868686": "07230a", "b4b4b4": "213225", "f7bcc6": "dfe3e1", - "141214": "141214", "f2f2f2": "4d4e46", "878787": "0a320e", "d9d9d9": "7f9f1f", @@ -34,7 +28,6 @@ "5c5a5c": "595959", "bcbebc": "bfbfbf", "fcfafc": "f9f9f9", - "245a4c": "1c2d32", - "1c362c": "1c362c" + "245a4c": "1c2d32" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/671-yellow.json b/public/images/pokemon/variant/exp/back/671-yellow.json index 81a74ac231e..63309425d81 100644 --- a/public/images/pokemon/variant/exp/back/671-yellow.json +++ b/public/images/pokemon/variant/exp/back/671-yellow.json @@ -3,7 +3,6 @@ "7c7755": "074034", "d2b98b": "227850", "facea2": "ffe593", - "141214": "141214", "feeabf": "22b14a", "76724b": "074034", "d9cc41": "789c16", @@ -12,17 +11,12 @@ "247264": "dc5073", "2c826c": "dc5073", "3ca68c": "ff91a4", - "5c5a5c": "5c5a5c", - "bcbebc": "bcbebc", - "fcfafc": "fcfafc", - "245a4c": "aa1a58", - "1c362c": "1c362c" + "245a4c": "aa1a58" }, "2": { "7c7755": "07230a", "d2b98b": "213225", "facea2": "dfe3e1", - "141214": "141214", "feeabf": "4d4e46", "76724b": "0a320e", "d9cc41": "7f9f1f", @@ -34,7 +28,6 @@ "5c5a5c": "8e4d0a", "bcbebc": "d4c18f", "fcfafc": "fffde0", - "245a4c": "8e4d0a", - "1c362c": "1c362c" + "245a4c": "8e4d0a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/6713.json b/public/images/pokemon/variant/exp/back/6713.json index a0ba9eb72ad..721679daf7d 100644 --- a/public/images/pokemon/variant/exp/back/6713.json +++ b/public/images/pokemon/variant/exp/back/6713.json @@ -3,7 +3,6 @@ "737373": "7a993d", "e8e8e8": "cfe68a", "729ac2": "d97389", - "101010": "101010", "bfbfbf": "9dcc3e", "bff4ff": "ffbfda", "6b5442": "732334", @@ -19,7 +18,6 @@ "737373": "641531", "e8e8e8": "bf576b", "729ac2": "cc7b1e", - "101010": "101010", "bfbfbf": "993554", "bff4ff": "fcc95c", "6b5442": "2c7a75", diff --git a/public/images/pokemon/variant/exp/back/672.json b/public/images/pokemon/variant/exp/back/672.json index 7282ef5e693..c118d603d57 100644 --- a/public/images/pokemon/variant/exp/back/672.json +++ b/public/images/pokemon/variant/exp/back/672.json @@ -1,7 +1,6 @@ { "1": { "3d3128": "69112a", - "000000": "000000", "67615b": "9e2c3d", "615140": "89431b", "7e6d5a": "b3743e", @@ -17,7 +16,6 @@ }, "2": { "3d3128": "161526", - "000000": "000000", "67615b": "2d2b40", "615140": "4c7a68", "7e6d5a": "72b692", @@ -31,4 +29,4 @@ "c6b379": "9f5f9b", "a8905c": "854d87" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/673.json b/public/images/pokemon/variant/exp/back/673.json index 7e5bc69976d..8d5d7d2b76e 100644 --- a/public/images/pokemon/variant/exp/back/673.json +++ b/public/images/pokemon/variant/exp/back/673.json @@ -1,7 +1,6 @@ { "1": { "3d3128": "5a0e24", - "000000": "000000", "554538": "471405", "67615b": "8f2837", "0d835a": "d2af94", @@ -17,7 +16,6 @@ }, "2": { "3d3128": "121123", - "000000": "000000", "554538": "37224d", "67615b": "2d2b40", "0d835a": "6893b6", @@ -31,4 +29,4 @@ "ae492a": "612c6b", "c16a3f": "9f5f9b" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/677.json b/public/images/pokemon/variant/exp/back/677.json index 9403c5c6e8e..473003c1fd4 100644 --- a/public/images/pokemon/variant/exp/back/677.json +++ b/public/images/pokemon/variant/exp/back/677.json @@ -3,7 +3,6 @@ "565581": "470d28", "8988b6": "943b5d", "999fdc": "bd5c81", - "000000": "000000", "c0c3e5": "e2dfcb", "e8e8ef": "f1f0e4", "8871a2": "601339", @@ -13,7 +12,6 @@ "565581": "193437", "8988b6": "426b62", "999fdc": "6ba78a", - "000000": "000000", "c0c3e5": "5f3656", "e8e8ef": "67415e", "8871a2": "243e41", diff --git a/public/images/pokemon/variant/exp/back/678-female.json b/public/images/pokemon/variant/exp/back/678-female.json index 6639b1e6674..1d4109ac04b 100644 --- a/public/images/pokemon/variant/exp/back/678-female.json +++ b/public/images/pokemon/variant/exp/back/678-female.json @@ -5,8 +5,7 @@ "737373": "947859", "334575": "76264d", "1e2945": "47182e", - "375794": "a5346b", - "000000": "000000" + "375794": "a5346b" }, "2": { "b2afb6": "613d5a", @@ -14,7 +13,6 @@ "737373": "3a1633", "334575": "47946c", "1e2945": "1d3f33", - "375794": "7bd38d", - "000000": "000000" + "375794": "7bd38d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/678.json b/public/images/pokemon/variant/exp/back/678.json index e194c472468..56684f0503e 100644 --- a/public/images/pokemon/variant/exp/back/678.json +++ b/public/images/pokemon/variant/exp/back/678.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "bfbfbf": "d5c49f", "f8f8f8": "f8f5cd", "737373": "947859", @@ -9,7 +8,6 @@ "17294d": "47182e" }, "2": { - "101010": "101010", "bfbfbf": "613d5a", "f8f8f8": "855577", "737373": "3a1633", diff --git a/public/images/pokemon/variant/exp/back/690.json b/public/images/pokemon/variant/exp/back/690.json index a513e813823..7e4536149f9 100644 --- a/public/images/pokemon/variant/exp/back/690.json +++ b/public/images/pokemon/variant/exp/back/690.json @@ -2,7 +2,6 @@ "1": { "3f6273": "310511", "4d341b": "181243", - "101010": "101010", "a6e1ff": "792a48", "a6703a": "3e44a2", "7ec3e5": "6b1f42", @@ -16,7 +15,6 @@ "2": { "3f6273": "340628", "4d341b": "042431", - "101010": "101010", "a6e1ff": "633060", "a6703a": "2c5d64", "7ec3e5": "481a42", diff --git a/public/images/pokemon/variant/exp/back/691.json b/public/images/pokemon/variant/exp/back/691.json index 5ed68809c44..849dd6a4e5b 100644 --- a/public/images/pokemon/variant/exp/back/691.json +++ b/public/images/pokemon/variant/exp/back/691.json @@ -1,7 +1,6 @@ { "1": { "4d4d2e": "31246d", - "101010": "101010", "b3b36b": "403c94", "80804d": "382f7d", "732230": "310511", @@ -17,7 +16,6 @@ }, "2": { "4d4d2e": "07262e", - "101010": "101010", "b3b36b": "1d4952", "80804d": "0d3338", "732230": "340b33", diff --git a/public/images/pokemon/variant/exp/back/696.json b/public/images/pokemon/variant/exp/back/696.json index b58bfea922f..bc63acb4f9c 100644 --- a/public/images/pokemon/variant/exp/back/696.json +++ b/public/images/pokemon/variant/exp/back/696.json @@ -1,35 +1,30 @@ { "1": { - "734517":"5e0b0b", - "ffa64c":"a50d0d", - "3e1f18":"023425", - "966858":"1b6430", - "404040":"4c3216", - "65483a":"0b4c29", - "101010":"101010", - "f8f8f8":"dfdea7", - "bfbfbf":"cbbe8c", - "8c8c8c":"ad8c63", - "121212":"121212", - "bdbdbd":"c9bd8b", - "f5f5f5":"dbdaa4", - "b73b6b":"77452d" + "734517": "5e0b0b", + "ffa64c": "a50d0d", + "3e1f18": "023425", + "966858": "1b6430", + "404040": "4c3216", + "65483a": "0b4c29", + "f8f8f8": "dfdea7", + "bfbfbf": "cbbe8c", + "8c8c8c": "ad8c63", + "bdbdbd": "c9bd8b", + "f5f5f5": "dbdaa4", + "b73b6b": "77452d" }, "2": { - "734517":"395cb7", - "ffa64c":"d2e9ff", - "3e1f18":"3e1f18", - "966858":"83726e", - "404040":"250860", - "65483a":"644943", - "101010":"101010", - "f8f8f8":"6e46a7", - "bfbfbf":"593097", - "8c8c8c":"411684", - "121212":"decaff", - "bdbdbd":"79c8d3", - "f5f5f5":"cce6ff", - "b73b6b":"385cb5" + "734517": "395cb7", + "ffa64c": "d2e9ff", + "966858": "83726e", + "404040": "250860", + "65483a": "644943", + "f8f8f8": "6e46a7", + "bfbfbf": "593097", + "8c8c8c": "411684", + "121212": "decaff", + "bdbdbd": "79c8d3", + "f5f5f5": "cce6ff", + "b73b6b": "385cb5" } -} - +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/697.json b/public/images/pokemon/variant/exp/back/697.json index 5303995a117..4fffa77a383 100644 --- a/public/images/pokemon/variant/exp/back/697.json +++ b/public/images/pokemon/variant/exp/back/697.json @@ -1,34 +1,30 @@ { - -"1": { -"080808": "080808", -"32252c": "3e1e17", -"50131e": "0b241e", -"722533": "153626", -"54434c": "4c3216", -"964b1c": "5e0b0b", -"963e4e": "285234", -"bf7545": "971c1c", -"f19d5a": "b52424", -"9f9d98": "ad8c63", -"cccccc": "cbbe8c", -"fafafa": "dfdea7", -"53454d":"4c3216" -}, -"2": { -"080808": "080808", -"32252c": "0d0124", -"50131e": "573b36", -"722533": "83726e", -"54434c": "170c25", -"964b1c": "9d5390", -"963e4e": "ab9b97", -"bf7545": "ce7ecc", -"f19d5a": "f4dbf6", -"9f9d98": "26173b", -"cccccc": "33214f", -"fafafa": "4b2e64", -"53454d": "f4dbf6" -} -} - + "1": { + "32252c": "3e1e17", + "50131e": "0b241e", + "722533": "153626", + "54434c": "4c3216", + "964b1c": "5e0b0b", + "963e4e": "285234", + "bf7545": "971c1c", + "f19d5a": "b52424", + "9f9d98": "ad8c63", + "cccccc": "cbbe8c", + "fafafa": "dfdea7", + "53454d": "4c3216" + }, + "2": { + "32252c": "0d0124", + "50131e": "573b36", + "722533": "83726e", + "54434c": "170c25", + "964b1c": "9d5390", + "963e4e": "ab9b97", + "bf7545": "ce7ecc", + "f19d5a": "f4dbf6", + "9f9d98": "26173b", + "cccccc": "33214f", + "fafafa": "4b2e64", + "53454d": "f4dbf6" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/700.json b/public/images/pokemon/variant/exp/back/700.json index 1189d463f2b..2a8ecba3b8f 100644 --- a/public/images/pokemon/variant/exp/back/700.json +++ b/public/images/pokemon/variant/exp/back/700.json @@ -1,32 +1,28 @@ { -"1": { -"101010": "101010", -"8a2843": "452f89", -"235a99": "a63071", -"895c72": "5c6889", -"d85a7a": "996cd2", -"528fcc": "d648b7", -"a88d8c": "8c8fa8", -"f18a78": "b52d27", -"fa8caa": "c7a6ee", -"64c8f3": "e974db", -"d9c3c3": "c3c5d9", -"fff5f5": "f7f5ff", -"65798c": "65798c" -}, -"2": { -"101010": "101010", -"8a2843": "0e6134", -"235a99": "900d1b", -"895c72": "7f5c89", -"d85a7a": "5dae7d", -"528fcc": "dd3d4f", -"a88d8c": "7f5c89", -"f18a78": "d14ea4", -"fa8caa": "7dec9d", -"64c8f3": "ff9a68", -"d9c3c3": "d9c3d6", -"fff5f5": "fff5fc", -"65798c": "65798c" -} + "1": { + "8a2843": "452f89", + "235a99": "a63071", + "895c72": "5c6889", + "d85a7a": "996cd2", + "528fcc": "d648b7", + "a88d8c": "8c8fa8", + "f18a78": "b52d27", + "fa8caa": "c7a6ee", + "64c8f3": "e974db", + "d9c3c3": "c3c5d9", + "fff5f5": "f7f5ff" + }, + "2": { + "8a2843": "0e6134", + "235a99": "900d1b", + "895c72": "7f5c89", + "d85a7a": "5dae7d", + "528fcc": "dd3d4f", + "a88d8c": "7f5c89", + "f18a78": "d14ea4", + "fa8caa": "7dec9d", + "64c8f3": "ff9a68", + "d9c3c3": "d9c3d6", + "fff5f5": "fff5fc" + } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/702.json b/public/images/pokemon/variant/exp/back/702.json index 12feb29a0fd..adea0fb21eb 100644 --- a/public/images/pokemon/variant/exp/back/702.json +++ b/public/images/pokemon/variant/exp/back/702.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "262626": "2a3b5e", "4d4d4d": "6789b3", "bfbf86": "a3d1cc", @@ -10,12 +9,10 @@ "f2c261": "ffd3b6", "bf994c": "e49f84", "1d1d1d": "1a1c45", - "f8f8f8": "f8f8f8", "464646": "424b8f", "d97d21": "7cd6a1" }, "2": { - "101010": "101010", "262626": "072d38", "4d4d4d": "197870", "bfbf86": "aaa8d6", @@ -25,7 +22,6 @@ "f2c261": "5f3662", "bf994c": "432249", "1d1d1d": "02172d", - "f8f8f8": "f8f8f8", "464646": "17646c", "d97d21": "d2fff1" } diff --git a/public/images/pokemon/variant/exp/back/704.json b/public/images/pokemon/variant/exp/back/704.json index 1955f425b26..12f004ad956 100644 --- a/public/images/pokemon/variant/exp/back/704.json +++ b/public/images/pokemon/variant/exp/back/704.json @@ -4,7 +4,6 @@ "f2daf2": "fbb3d2", "bfacbf": "e56ca6", "4d454d": "8a2166", - "101010": "101010", "4d993d": "197497", "66cc52": "3aa8c4", "b8a1e5": "c7a1e5", @@ -18,7 +17,6 @@ "f2daf2": "92d8c8", "bfacbf": "63a99e", "4d454d": "134557", - "101010": "101010", "4d993d": "a34205", "66cc52": "d27e26", "b8a1e5": "4a9699", diff --git a/public/images/pokemon/variant/exp/back/705.json b/public/images/pokemon/variant/exp/back/705.json index 72dd07123ea..3424b46ee03 100644 --- a/public/images/pokemon/variant/exp/back/705.json +++ b/public/images/pokemon/variant/exp/back/705.json @@ -1,26 +1,24 @@ { "1": { - "101010": "101010", - "4d454d": "8a2166", - "647543": "197497", - "98bd51": "3aa8c4", - "665980": "4e4094", - "807380": "b93f84", - "8f7db3": "8b69c3", - "bfacbf": "e56ca6", - "b8a1e5": "c7a1e5", - "f2daf2": "fbb3d2" + "4d454d": "8a2166", + "647543": "197497", + "98bd51": "3aa8c4", + "665980": "4e4094", + "807380": "b93f84", + "8f7db3": "8b69c3", + "bfacbf": "e56ca6", + "b8a1e5": "c7a1e5", + "f2daf2": "fbb3d2" }, "2": { - "101010": "101010", - "4d454d": "194f51", - "647543": "a34205", - "98bd51": "d27e26", - "665980": "274159", - "807380": "2b736f", - "8f7db3": "2f667c", - "bfacbf": "5db6a9", - "b8a1e5": "4a9699", - "f2daf2": "9cead8" + "4d454d": "194f51", + "647543": "a34205", + "98bd51": "d27e26", + "665980": "274159", + "807380": "2b736f", + "8f7db3": "2f667c", + "bfacbf": "5db6a9", + "b8a1e5": "4a9699", + "f2daf2": "9cead8" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/706.json b/public/images/pokemon/variant/exp/back/706.json index c14e7e8a123..eef2e311597 100644 --- a/public/images/pokemon/variant/exp/back/706.json +++ b/public/images/pokemon/variant/exp/back/706.json @@ -4,7 +4,6 @@ "807380": "b24c86", "bfacbf": "cd7aa1", "f2daf2": "f1a4c5", - "101010": "101010", "998a99": "b24c86", "fefefe": "f8f8f8", "4d993d": "197497", @@ -20,7 +19,6 @@ "807380": "194f51", "bfacbf": "559b91", "f2daf2": "9cead8", - "101010": "101010", "998a99": "2b736f", "fefefe": "f8f8f8", "4d993d": "a34205", diff --git a/public/images/pokemon/variant/exp/back/709.json b/public/images/pokemon/variant/exp/back/709.json index 39fdc746e2a..5aa204b7074 100644 --- a/public/images/pokemon/variant/exp/back/709.json +++ b/public/images/pokemon/variant/exp/back/709.json @@ -2,7 +2,6 @@ "1": { "3f2f1f": "262741", "1f3f2f": "361f1b", - "101010": "101010", "cf9f6f": "7c808c", "1f9f5f": "907f76", "2f6f4f": "4d362e", @@ -11,9 +10,7 @@ "33333f": "722023" }, "2": { - "3f2f1f": "3f2f1f", "1f3f2f": "761d52", - "101010": "101010", "cf9f6f": "7e5658", "1f9f5f": "da7ea8", "2f6f4f": "a94079", diff --git a/public/images/pokemon/variant/exp/back/710.json b/public/images/pokemon/variant/exp/back/710.json index 974195f1850..97f07f39af8 100644 --- a/public/images/pokemon/variant/exp/back/710.json +++ b/public/images/pokemon/variant/exp/back/710.json @@ -3,10 +3,7 @@ "392e28": "213a22", "6c5c53": "599752", "594b40": "478243", - "000000": "000000", "4e4137": "478243", - "201a17": "201a17", - "2c241f": "2c241f", "6d5a52": "599752", "41342c": "478243", "cc7571": "404040", @@ -19,10 +16,7 @@ "392e28": "0e2218", "6c5c53": "425947", "594b40": "2a4031", - "000000": "000000", "4e4137": "2a4031", - "201a17": "201a17", - "2c241f": "2c241f", "6d5a52": "425947", "41342c": "2a4031", "cc7571": "ad3b33", diff --git a/public/images/pokemon/variant/exp/back/711.json b/public/images/pokemon/variant/exp/back/711.json index 76b5beb3ad8..5bc30d8e756 100644 --- a/public/images/pokemon/variant/exp/back/711.json +++ b/public/images/pokemon/variant/exp/back/711.json @@ -1,32 +1,26 @@ { "0": { - "101010": "101010", "28211c": "202423", "504338": "593a59", "c6786e": "262626", - "25201b": "25201b", "834037": "171717", "e69586": "404040", "f1ca99": "cea971", "c09a69": "aa7e43" }, "1": { - "101010": "101010", "28211c": "202423", "504338": "353631", "c6786e": "325b34", - "25201b": "25201b", "834037": "153f18", "e69586": "4d7d4b", "f1ca99": "ddcfb1", "c09a69": "baa78d" }, "2": { - "101010": "101010", "28211c": "5e0b09", "504338": "ad3b33", "c6786e": "213c28", - "25201b": "25201b", "834037": "102316", "e69586": "36593d", "f1ca99": "b57d52", diff --git a/public/images/pokemon/variant/exp/back/712.json b/public/images/pokemon/variant/exp/back/712.json index 59ad2436866..6a9f45ffebd 100644 --- a/public/images/pokemon/variant/exp/back/712.json +++ b/public/images/pokemon/variant/exp/back/712.json @@ -4,11 +4,7 @@ "58647b": "bf566d", "b3eaf8": "ffbfda", "a5c4d2": "f29eb3", - "e8f5fe": "ffebf2", - "101010": "101010", - "bfbfbf": "bfbfbf", - "737373": "737373", - "f8f8f8": "f8f8f8" + "e8f5fe": "ffebf2" }, "2": { "719aa9": "cc7b1e", @@ -16,7 +12,6 @@ "b3eaf8": "fcc95c", "a5c4d2": "e69e2b", "e8f5fe": "fff2ad", - "101010": "101010", "bfbfbf": "6cb3ae", "737373": "2c7a75", "f8f8f8": "b9f2ee" diff --git a/public/images/pokemon/variant/exp/back/713.json b/public/images/pokemon/variant/exp/back/713.json index 61977f60470..03f24a2226d 100644 --- a/public/images/pokemon/variant/exp/back/713.json +++ b/public/images/pokemon/variant/exp/back/713.json @@ -6,8 +6,7 @@ "bff4ff": "ffbfda", "335980": "994255", "f2ffff": "ffebf2", - "77b8d9": "d97389", - "101010": "101010" + "77b8d9": "d97389" }, "2": { "608cba": "a8632a", @@ -16,7 +15,6 @@ "bff4ff": "fcc95c", "335980": "824628", "f2ffff": "fff2ad", - "77b8d9": "cc7b1e", - "101010": "101010" + "77b8d9": "cc7b1e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/715.json b/public/images/pokemon/variant/exp/back/715.json index d9b76a01588..25389a3ca71 100644 --- a/public/images/pokemon/variant/exp/back/715.json +++ b/public/images/pokemon/variant/exp/back/715.json @@ -1,7 +1,6 @@ { "1": { "404040": "542f98", - "101010": "101010", "595959": "7a5ccc", "801a1a": "5d173d", "e52e2e": "903b78", @@ -17,10 +16,7 @@ }, "2": { "404040": "b18373", - "101010": "101010", "595959": "e2c7b5", - "801a1a": "801a1a", - "e52e2e": "e52e2e", "8e5499": "5b1922", "737373": "280911", "f8f8f8": "5a2a2b", diff --git a/public/images/pokemon/variant/exp/back/716-active.json b/public/images/pokemon/variant/exp/back/716-active.json index 927ab7f9f0d..c488dc9a8fa 100644 --- a/public/images/pokemon/variant/exp/back/716-active.json +++ b/public/images/pokemon/variant/exp/back/716-active.json @@ -1,9 +1,5 @@ { "1": { - "101010": "101010", - "ccbd8f": "ccbd8f", - "807659": "807659", - "ffecb2": "ffecb2", "345090": "75127d", "7f4a16": "0f735f", "64bfe8": "dd57e8", @@ -16,8 +12,6 @@ "c37732": "3fc199", "547fe9": "b33ccd", "dd3238": "2f75b9", - "5959b3": "5959b3", - "9191f2": "9191f2", "243659": "132b1b", "3d5c99": "1e3824", "262626": "447e48", @@ -26,7 +20,6 @@ "5c8ae5": "324c37" }, "2": { - "101010": "101010", "ccbd8f": "3b2328", "807659": "210f14", "ffecb2": "553639", @@ -42,8 +35,6 @@ "c37732": "824adc", "547fe9": "d75343", "dd3238": "c53fc3", - "5959b3": "5959b3", - "9191f2": "9191f2", "243659": "37134c", "3d5c99": "643071", "262626": "d284b6", diff --git a/public/images/pokemon/variant/exp/back/716-neutral.json b/public/images/pokemon/variant/exp/back/716-neutral.json index 768172915e7..5db424fc423 100644 --- a/public/images/pokemon/variant/exp/back/716-neutral.json +++ b/public/images/pokemon/variant/exp/back/716-neutral.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "84b4ce": "ac8781", "364566": "603f3c", "c0e0ec": "bfa19a", @@ -9,11 +8,9 @@ "2b2a2e": "518554", "1a1a1a": "2c5232", "404040": "7ca376", - "5c8ae5": "324c37", - "1f7a99": "1f7a99" + "5c8ae5": "324c37" }, "2": { - "101010": "101010", "84b4ce": "42283b", "364566": "230d1e", "c0e0ec": "613e56", @@ -22,7 +19,6 @@ "2b2a2e": "d285a7", "1a1a1a": "b2638b", "404040": "f6badb", - "5c8ae5": "884e9f", - "1f7a99": "1f7a99" + "5c8ae5": "884e9f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/717.json b/public/images/pokemon/variant/exp/back/717.json index 1104b74cf71..615b092ba9c 100644 --- a/public/images/pokemon/variant/exp/back/717.json +++ b/public/images/pokemon/variant/exp/back/717.json @@ -2,7 +2,6 @@ "1": { "4d4d4d": "816450", "b3b3b3": "dbd4cd", - "101010": "101010", "737373": "c1aa9a", "242626": "0f0b2c", "8c8c8c": "cbbfb5", diff --git a/public/images/pokemon/variant/exp/back/720.json b/public/images/pokemon/variant/exp/back/720.json index c4d2c0c70c9..c0bf0e6de76 100644 --- a/public/images/pokemon/variant/exp/back/720.json +++ b/public/images/pokemon/variant/exp/back/720.json @@ -2,7 +2,6 @@ "0": { "8c3f59": "620d00", "ff73a2": "cb5e23", - "101010": "101010", "8a8a99": "684252", "cc5c81": "902c0d", "676773": "3e162b", @@ -16,7 +15,6 @@ "1": { "8c3f59": "280d46", "ff73a2": "753f9b", - "101010": "101010", "8a8a99": "a947b4", "cc5c81": "471c6b", "676773": "632373", @@ -30,7 +28,6 @@ "2": { "8c3f59": "150933", "ff73a2": "35387c", - "101010": "101010", "8a8a99": "304757", "cc5c81": "1d1a4b", "676773": "1c2433", diff --git a/public/images/pokemon/variant/exp/back/728.json b/public/images/pokemon/variant/exp/back/728.json index a9c7155ec91..899ae80c996 100644 --- a/public/images/pokemon/variant/exp/back/728.json +++ b/public/images/pokemon/variant/exp/back/728.json @@ -1,10 +1,8 @@ { "1": { - "101010": "101010", "1e3a66": "363d2f", "243a66": "00473d", "733f50": "a62c20", - "404040": "404040", "b3627d": "e54c41", "2c4f8c": "5a6154", "314f8c": "006355", @@ -13,7 +11,6 @@ "5f9ba6": "b56e76", "639ba6": "858d7d", "6c90d9": "14af82", - "808080": "808080", "bfbfbf": "c2beb4", "9edae5": "f7c1c5", "a1dae5": "92b599", @@ -21,11 +18,9 @@ "fefefe": "fff6e2" }, "2": { - "101010": "101010", "1e3a66": "773f46", "243a66": "54041b", "733f50": "620a33", - "404040": "404040", "b3627d": "a7225c", "2c4f8c": "a45f67", "314f8c": "770f29", @@ -34,7 +29,6 @@ "5f9ba6": "408c62", "639ba6": "b88389", "6c90d9": "be294a", - "808080": "808080", "bfbfbf": "bfb4b9", "9edae5": "91e6a2", "a1dae5": "f7c1c5", diff --git a/public/images/pokemon/variant/exp/back/729.json b/public/images/pokemon/variant/exp/back/729.json index a0e40c36aec..6636e6cfca9 100644 --- a/public/images/pokemon/variant/exp/back/729.json +++ b/public/images/pokemon/variant/exp/back/729.json @@ -1,7 +1,5 @@ { "1": { - "101010": "101010", - "2d2e31": "2d2e31", "733f50": "bb402f", "476d72": "be665d", "b3627d": "fb6051", @@ -10,7 +8,6 @@ "639ba6": "b56e76", "2d8ec4": "009a88", "1eb9ee": "0ccfa2", - "808080": "808080", "8dafaf": "ff989e", "bfbfbf": "c2beb4", "bad8d8": "ffbd98", @@ -19,8 +16,6 @@ "fdfdfd": "fff6e2" }, "2": { - "101010": "101010", - "2d2e31": "2d2e31", "733f50": "620a33", "476d72": "793f5e", "b3627d": "a7225c", @@ -29,7 +24,6 @@ "639ba6": "408c62", "2d8ec4": "952c3f", "1eb9ee": "c6496f", - "808080": "808080", "8dafaf": "b681a6", "bfbfbf": "bfb4b9", "bad8d8": "deabce", diff --git a/public/images/pokemon/variant/exp/back/730.json b/public/images/pokemon/variant/exp/back/730.json index ae6d464dd3f..f8ee7fb709d 100644 --- a/public/images/pokemon/variant/exp/back/730.json +++ b/public/images/pokemon/variant/exp/back/730.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "843843": "a62c20", "8d3f4a": "a62c20", "c46074": "e54c41", @@ -21,11 +20,9 @@ "c0bdc1": "beaac0", "aac7e6": "ea7c5b", "f8f8f8": "fff2d4", - "faf8f8": "f1e8f1", - "fef8f8": "fef8f8" + "faf8f8": "f1e8f1" }, "2": { - "101010": "101010", "843843": "5c2141", "8d3f4a": "1d1638", "c46074": "c17b97", @@ -46,7 +43,6 @@ "c0bdc1": "c0b4a5", "aac7e6": "e9a5c0", "f8f8f8": "f5edee", - "faf8f8": "f5f3e3", - "fef8f8": "fef8f8" + "faf8f8": "f5f3e3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/734.json b/public/images/pokemon/variant/exp/back/734.json index 03d724ed370..d46c448a6b1 100644 --- a/public/images/pokemon/variant/exp/back/734.json +++ b/public/images/pokemon/variant/exp/back/734.json @@ -2,23 +2,19 @@ "1": { "753933": "03192d", "6b4f27": "523a44", - "070707": "070707", "ba836d": "35576b", "f0cd84": "c1aaaa", "c19462": "907e82", "9c5b50": "2a3f52", - "322f2c": "523716", - "000000": "000000" + "322f2c": "523716" }, "2": { "753933": "26201f", "6b4f27": "241b1b", - "070707": "070707", "ba836d": "a69c98", "f0cd84": "4d4242", "c19462": "362e2e", "9c5b50": "786a66", - "322f2c": "464a4d", - "000000": "000000" + "322f2c": "464a4d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/735.json b/public/images/pokemon/variant/exp/back/735.json index e647e22d65c..93a57454d38 100644 --- a/public/images/pokemon/variant/exp/back/735.json +++ b/public/images/pokemon/variant/exp/back/735.json @@ -5,7 +5,6 @@ "e8eaa2": "c9b1ab", "c29b49": "7a6a6d", "9c7c5c": "354c6b", - "0f0f0f": "0f0f0f", "805744": "2a3252", "5a3732": "03102d", "282726": "462000", @@ -17,10 +16,8 @@ "e8eaa2": "5c5353", "c29b49": "362e2e", "9c7c5c": "ada5a4", - "0f0f0f": "0f0f0f", "805744": "90827e", "5a3732": "524b4b", - "282726": "282726", "484440": "423d3d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/748.json b/public/images/pokemon/variant/exp/back/748.json index 7929514bcda..d5e90eed771 100644 --- a/public/images/pokemon/variant/exp/back/748.json +++ b/public/images/pokemon/variant/exp/back/748.json @@ -1,7 +1,6 @@ { "1": { "943732": "5c075b", - "101010": "101010", "f28c4f": "c639bd", "e25025": "a21f90", "93d1d7": "df7b52", @@ -11,12 +10,10 @@ "455b85": "892e20", "525898": "6c3776", "b7429a": "d29784", - "d76fa5": "edd5ca", - "171539": "171539" + "d76fa5": "edd5ca" }, "2": { "943732": "ac063c", - "101010": "101010", "f28c4f": "ff3f5a", "e25025": "e12350", "93d1d7": "5bd97f", @@ -26,7 +23,6 @@ "455b85": "186443", "525898": "d75b3c", "b7429a": "1c524b", - "d76fa5": "2b6157", - "171539": "171539" + "d76fa5": "2b6157" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/751.json b/public/images/pokemon/variant/exp/back/751.json index c28b7065b6a..6af2a3b1c4f 100644 --- a/public/images/pokemon/variant/exp/back/751.json +++ b/public/images/pokemon/variant/exp/back/751.json @@ -4,12 +4,10 @@ "5faecb": "ae504b", "a2d5e6": "d37075", "cfebf7": "ffc8d1", - "f7f7f7": "f7f7f7", "4b5528": "3a112f", "899128": "4e1f42", "47849e": "f1977b", "cfe436": "673252", - "101010": "101010", "49757f": "9e4155", "6a95a3": "d37075", "3c434d": "812b3e", @@ -20,12 +18,10 @@ "5faecb": "b56543", "a2d5e6": "ecaa61", "cfebf7": "f1dcc2", - "f7f7f7": "f7f7f7", "4b5528": "263756", "899128": "4980ac", "47849e": "585b6c", "cfe436": "72add9", - "101010": "101010", "49757f": "c77a4f", "6a95a3": "ecaa61", "3c434d": "ba5c2c", diff --git a/public/images/pokemon/variant/exp/back/752.json b/public/images/pokemon/variant/exp/back/752.json index 4cedfc9ad56..3da662e1086 100644 --- a/public/images/pokemon/variant/exp/back/752.json +++ b/public/images/pokemon/variant/exp/back/752.json @@ -2,13 +2,10 @@ "1": { "648ca2": "7c3b51", "cae1ec": "ffc8d1", - "f7f7f7": "f7f7f7", "a1bcca": "d187a0", "8c9b26": "4e1f42", - "101010": "101010", "434a1c": "3a112f", "cde425": "673252", - "000000": "000000", "262e35": "812b3e", "253f45": "4c152c", "957759": "5ea3b8", @@ -22,13 +19,10 @@ "2": { "648ca2": "55506a", "cae1ec": "dce7ee", - "f7f7f7": "f7f7f7", "a1bcca": "a7a2bc", "8c9b26": "4980ac", - "101010": "101010", "434a1c": "263756", "cde425": "72add9", - "000000": "000000", "262e35": "d49435", "253f45": "834723", "957759": "bc521d", diff --git a/public/images/pokemon/variant/exp/back/753.json b/public/images/pokemon/variant/exp/back/753.json index e4fdc6bb6cc..26e48f43509 100644 --- a/public/images/pokemon/variant/exp/back/753.json +++ b/public/images/pokemon/variant/exp/back/753.json @@ -3,30 +3,24 @@ "234028": "2e1643", "5ba668": "4e2c62", "468050": "3e2253", - "101010": "101010", "315945": "0e2616", "549977": "1b3822", "69bf94": "27452c", "d98d9a": "a55c36", "ffbfca": "b47145", "803340": "682c16", - "f8f8f8": "f8f8f8", - "cc5266": "a55c36", - "bfbfbf": "bfbfbf" + "cc5266": "a55c36" }, "2": { "234028": "531034", "5ba668": "ce54b0", "468050": "9b2d76", - "101010": "101010", "315945": "441342", "549977": "5a215a", "69bf94": "6e3472", "d98d9a": "263b83", "ffbfca": "3454a5", "803340": "0b1d4e", - "f8f8f8": "f8f8f8", - "cc5266": "263b83", - "bfbfbf": "bfbfbf" + "cc5266": "263b83" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/754.json b/public/images/pokemon/variant/exp/back/754.json index f7c71f90a95..5fb99ea57c9 100644 --- a/public/images/pokemon/variant/exp/back/754.json +++ b/public/images/pokemon/variant/exp/back/754.json @@ -1,7 +1,6 @@ { "1": { "803340": "82180e", - "101010": "101010", "ff667f": "c95623", "cc5266": "ac351f", "ffbfca": "f48b49", diff --git a/public/images/pokemon/variant/exp/back/755.json b/public/images/pokemon/variant/exp/back/755.json index 85e1f5b2498..f24a4e444bd 100644 --- a/public/images/pokemon/variant/exp/back/755.json +++ b/public/images/pokemon/variant/exp/back/755.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "7a3f7a": "451233", "edb792": "b08598", "fdff97": "e4c3d0", @@ -21,7 +20,6 @@ "b5cc91": "866eaf" }, "2": { - "101010": "101010", "7a3f7a": "1d225e", "edb792": "99c1bd", "fdff97": "d5f9f2", diff --git a/public/images/pokemon/variant/exp/back/756.json b/public/images/pokemon/variant/exp/back/756.json index 726f32c8955..674a13ce35f 100644 --- a/public/images/pokemon/variant/exp/back/756.json +++ b/public/images/pokemon/variant/exp/back/756.json @@ -10,7 +10,6 @@ "cbd59f": "e5aff3", "dcff44": "e5aff3", "c9e161": "e5aff3", - "101010": "101010", "764b67": "451233", "d08aab": "6c344f", "f5bcd8": "904b66", @@ -30,7 +29,6 @@ "cbd59f": "dffffa", "dcff44": "dffffa", "c9e161": "dffffa", - "101010": "101010", "764b67": "0d7a66", "d08aab": "81e3c9", "f5bcd8": "98f5d1", diff --git a/public/images/pokemon/variant/exp/back/761.json b/public/images/pokemon/variant/exp/back/761.json index be3c472eba7..d320917a94e 100644 --- a/public/images/pokemon/variant/exp/back/761.json +++ b/public/images/pokemon/variant/exp/back/761.json @@ -2,19 +2,14 @@ "1": { "476629": "215e59", "8fcc52": "70d2e1", - "101010": "101010", "6b993d": "398793", "80334d": "251936", "b3476b": "7e5cdb", - "e55c8a": "9f86e4", - "bfbfbf": "bfbfbf", - "737373": "737373", - "f8f8f8": "f8f8f8" + "e55c8a": "9f86e4" }, "2": { "476629": "3e0a11", "8fcc52": "86232e", - "101010": "101010", "6b993d": "5a0a16", "80334d": "0f0f0f", "b3476b": "254536", diff --git a/public/images/pokemon/variant/exp/back/762.json b/public/images/pokemon/variant/exp/back/762.json index 824aed7099b..bd2037e95c5 100644 --- a/public/images/pokemon/variant/exp/back/762.json +++ b/public/images/pokemon/variant/exp/back/762.json @@ -2,12 +2,8 @@ "1": { "446328": "215e59", "96c853": "70d2e1", - "0f0f0f": "0f0f0f", "659344": "398793", "ebe130": "e66556", - "72585f": "72585f", - "fdfdfd": "fdfdfd", - "c7b8c4": "c7b8c4", "962354": "45366e", "f26284": "7e5cdb", "6a1533": "251936", @@ -16,7 +12,6 @@ "2": { "446328": "3e0a11", "96c853": "86232e", - "0f0f0f": "0f0f0f", "659344": "5a0a16", "ebe130": "5c0505", "72585f": "574348", diff --git a/public/images/pokemon/variant/exp/back/763.json b/public/images/pokemon/variant/exp/back/763.json index fffb9c6e439..709b53ce6cd 100644 --- a/public/images/pokemon/variant/exp/back/763.json +++ b/public/images/pokemon/variant/exp/back/763.json @@ -1,6 +1,5 @@ { "1": { - "00131c": "00131c", "c8a848": "af3e31", "c13d76": "674dad", "eaee46": "e66556", @@ -9,15 +8,11 @@ "6d9b62": "398793", "9ce783": "b3f5ff", "84c36f": "70d2e1", - "dac2d5": "dac2d5", - "fefefe": "fefefe", - "6a6274": "6a6274", "ef91aa": "c0abf7", "d75f7f": "9f86e4", "441e2c": "251936" }, "2": { - "00131c": "00131c", "c8a848": "391717", "c13d76": "254536", "eaee46": "5c0505", diff --git a/public/images/pokemon/variant/exp/back/767.json b/public/images/pokemon/variant/exp/back/767.json index 74479ed25ec..405506f716f 100644 --- a/public/images/pokemon/variant/exp/back/767.json +++ b/public/images/pokemon/variant/exp/back/767.json @@ -1,7 +1,6 @@ { "1": { "46334f": "844008", - "080808": "080808", "a65e97": "e8a92a", "713e70": "c86910", "3f5252": "202733", @@ -12,7 +11,6 @@ }, "2": { "46334f": "091b52", - "080808": "080808", "a65e97": "2849ac", "713e70": "1c306d", "3f5252": "3d105f", diff --git a/public/images/pokemon/variant/exp/back/768.json b/public/images/pokemon/variant/exp/back/768.json index 43d48fea203..ab1bd155946 100644 --- a/public/images/pokemon/variant/exp/back/768.json +++ b/public/images/pokemon/variant/exp/back/768.json @@ -4,9 +4,7 @@ "c8e1cd": "6e6d6d", "546b57": "202733", "81b68e": "494950", - "101010": "101010", "842886": "c85710", - "000000": "000000", "cc5fcf": "ff7e2c", "9a6982": "c86910", "7a4952": "844008", @@ -21,16 +19,11 @@ "c8e1cd": "2849ac", "546b57": "091b52", "81b68e": "1c306d", - "101010": "101010", "842886": "5722a6", - "000000": "000000", "cc5fcf": "8b51e1", "9a6982": "452772", "7a4952": "3d105f", - "2f3330": "2f3330", - "404843": "404843", "498f6c": "8cdded", - "bd95a8": "844caf", - "5c635e": "5c635e" + "bd95a8": "844caf" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/771.json b/public/images/pokemon/variant/exp/back/771.json index 9876b7a067f..02b1131f68e 100644 --- a/public/images/pokemon/variant/exp/back/771.json +++ b/public/images/pokemon/variant/exp/back/771.json @@ -2,9 +2,7 @@ "1": { "73223d": "570a00", "d94174": "de884b", - "101010": "101010", "992e52": "c95340", - "1a1a1a": "1a1a1a", "404040": "731b33", "595959": "bd5e49", "f8f8f8": "dec890", @@ -14,9 +12,7 @@ "2": { "73223d": "b94114", "d94174": "ead059", - "101010": "101010", "992e52": "db7b43", - "1a1a1a": "1a1a1a", "404040": "dacece", "595959": "1c1c2d", "f8f8f8": "4d4d65", diff --git a/public/images/pokemon/variant/exp/back/772.json b/public/images/pokemon/variant/exp/back/772.json index d367e8f88f7..972da787a08 100644 --- a/public/images/pokemon/variant/exp/back/772.json +++ b/public/images/pokemon/variant/exp/back/772.json @@ -2,7 +2,6 @@ "1": { "454f55": "232843", "92a6a9": "889db1", - "080808": "080808", "6b777e": "526085", "642515": "7e4f36", "c55e3a": "eed8a1", @@ -23,7 +22,6 @@ "2": { "454f55": "18182a", "92a6a9": "65657c", - "080808": "080808", "6b777e": "3b3b51", "642515": "444961", "c55e3a": "c1cfd8", diff --git a/public/images/pokemon/variant/exp/back/773.json b/public/images/pokemon/variant/exp/back/773.json index b9a89e12871..c331b8800a9 100644 --- a/public/images/pokemon/variant/exp/back/773.json +++ b/public/images/pokemon/variant/exp/back/773.json @@ -7,10 +7,8 @@ "e3e6ec": "bdd1e5", "d3d7df": "98a8be", "bcbbc5": "788fb5", - "080808": "080808", "3f3b50": "1e172a", "aba7bc": "493d55", - "c86741": "c86741", "483c39": "3a2d53", "e9eaf8": "e7ebed", "e64f5e": "f1944a", @@ -31,12 +29,8 @@ "e3e6ec": "444455", "d3d7df": "b4bcc4", "bcbbc5": "242433", - "080808": "080808", - "3f3b50": "3f3b50", "aba7bc": "dbd8e8", - "c86741": "c86741", "483c39": "778894", - "e9eaf8": "e9eaf8", "e64f5e": "98ce58", "1d1845": "41434e", "0073bf": "6a6c75", diff --git a/public/images/pokemon/variant/exp/back/777.json b/public/images/pokemon/variant/exp/back/777.json index eb3a3edb5cc..b3754df1a64 100644 --- a/public/images/pokemon/variant/exp/back/777.json +++ b/public/images/pokemon/variant/exp/back/777.json @@ -1,18 +1,14 @@ { "1": { - "101010": "101010", "ffea80": "dec2f0", "4d4d4d": "362952", "ccb852": "ac8fbb", "b3b3b3": "8e71cd", "808080": "645393", "73593f": "ae428a", - "bfbfbf": "d0dadb", - "f8f8f8": "f8f8f8", - "595959": "595959" + "bfbfbf": "d0dadb" }, "2": { - "101010": "101010", "ffea80": "d65d3c", "4d4d4d": "294127", "ccb852": "7b3c26", diff --git a/public/images/pokemon/variant/exp/back/778-busted.json b/public/images/pokemon/variant/exp/back/778-busted.json index 21f796f0657..d75d3ad86b3 100644 --- a/public/images/pokemon/variant/exp/back/778-busted.json +++ b/public/images/pokemon/variant/exp/back/778-busted.json @@ -1,24 +1,20 @@ { "1": { - "000000": "000000", - "101010": "101010", + "000000": "101010", "404040": "2d1818", "b3a76b": "8d4f3d", "f2e291": "aa6f46", "665f3d": "542c21", - "000000": "101010", "4d361f": "844b20", "b37d47": "fabc5f", "805933": "b97d2c" }, "2": { - "000000": "000000", "101010": "000000", "404040": "0c123a", "b3a76b": "3d2e4f", "f2e291": "5b496b", "665f3d": "1b1031", - "000000": "000000", "4d361f": "3e5075", "b37d47": "8eb5cd", "805933": "6d80a4" diff --git a/public/images/pokemon/variant/exp/back/778-disguised.json b/public/images/pokemon/variant/exp/back/778-disguised.json index 3ebf48117fb..f981ba3fe96 100644 --- a/public/images/pokemon/variant/exp/back/778-disguised.json +++ b/public/images/pokemon/variant/exp/back/778-disguised.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "404040": "2d1818", "b3a76b": "8d4f3d", "f2e291": "aa6f46", @@ -16,9 +15,8 @@ "b3a76b": "3d2e4f", "f2e291": "5b496b", "665f3d": "1b1031", - "000000": "000000", "4d361f": "3e5075", "b37d47": "8eb5cd", "805933": "6d80a4" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/779.json b/public/images/pokemon/variant/exp/back/779.json index 82cf0169d73..6b59b94e154 100644 --- a/public/images/pokemon/variant/exp/back/779.json +++ b/public/images/pokemon/variant/exp/back/779.json @@ -2,7 +2,6 @@ "1": { "553d72": "a52121", "9967ba": "c62c2c", - "262735": "262735", "729dcd": "667fb2", "a4f2f7": "caefff", "e66aa5": "602b7a", @@ -10,21 +9,17 @@ "f889bb": "84539d", "fae676": "faa28c", "db9957": "d65e5e", - "bbc8fb": "94c5da", - "fcfcfc": "fcfcfc" + "bbc8fb": "94c5da" }, "2": { "553d72": "4545c4", "9967ba": "6666e2", - "262735": "262735", "729dcd": "afafe1", "a4f2f7": "eeeeff", "e66aa5": "dca032", "922755": "935b3b", "f889bb": "ffd166", "fae676": "454457", - "db9957": "2d2c43", - "bbc8fb": "bbc8fb", - "fcfcfc": "fcfcfc" + "db9957": "2d2c43" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/789.json b/public/images/pokemon/variant/exp/back/789.json index 6654144c36e..f1e5ac88c50 100644 --- a/public/images/pokemon/variant/exp/back/789.json +++ b/public/images/pokemon/variant/exp/back/789.json @@ -4,17 +4,10 @@ "404c8e": "7d365a", "129fdc": "6a12dc", "34bdef": "9255f2", - "f8f8f8": "f8f8f8", - "1c242a": "1c242a", - "000000": "000000", "2e377a": "64173e", - "727449": "727449", - "f9f7ba": "f9f7ba", - "efed81": "efed81", "643f8e": "dc48a7", "8e4994": "944976", - "e2639d": "f77247", - "a74f6e": "a74f6e" + "e2639d": "f77247" }, "1": { "2872b0": "f6a42d", diff --git a/public/images/pokemon/variant/exp/back/790.json b/public/images/pokemon/variant/exp/back/790.json index 415b2d26074..e111a9e35b9 100644 --- a/public/images/pokemon/variant/exp/back/790.json +++ b/public/images/pokemon/variant/exp/back/790.json @@ -4,14 +4,9 @@ "faf54e": "e5efff", "c87522": "7b89c4", "e8a61e": "aebde2", - "101010": "101010", - "fdfdfd": "fdfdfd", "169fda": "ffdf49", "1d3e89": "a20b02", - "e2629f": "e2629f", "764394": "eb5b2a", - "1e232b": "1e232b", - "17a6e3": "17a6e3", "2c5fab": "ff4079" }, "2": { @@ -19,14 +14,9 @@ "faf54e": "d4314c", "c87522": "890425", "e8a61e": "ae1a3d", - "101010": "101010", - "fdfdfd": "fdfdfd", - "169fda": "169fda", "1d3e89": "0f2388", "e2629f": "71ffd8", "764394": "7e13bf", - "1e232b": "1e232b", - "17a6e3": "17a6e3", "2c5fab": "3dc7e0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/792.json b/public/images/pokemon/variant/exp/back/792.json index faa9a7229bf..85cad197450 100644 --- a/public/images/pokemon/variant/exp/back/792.json +++ b/public/images/pokemon/variant/exp/back/792.json @@ -1,7 +1,6 @@ { "1": { "69551f": "675340", - "000000": "000000", "a19263": "afa191", "e3da81": "e6ded2", "fff6ef": "fdfce8", @@ -11,15 +10,10 @@ "edf0ff": "ffd386", "671ace": "eb422a", "494dcc": "dd0e7d", - "7bcece": "ff31e0", - "124027": "124027", - "7a9e67": "7a9e67", - "525841": "525841", - "b6e4cb": "b6e4cb" + "7bcece": "ff31e0" }, "2": { "69551f": "6b0420", - "000000": "000000", "a19263": "980f2a", "e3da81": "c22741", "fff6ef": "ff6d74", @@ -29,10 +23,6 @@ "edf0ff": "ffd1d1", "671ace": "1550a1", "494dcc": "3692d0", - "7bcece": "58cbe9", - "124027": "124027", - "7a9e67": "7a9e67", - "525841": "525841", - "b6e4cb": "b6e4cb" + "7bcece": "58cbe9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/793.json b/public/images/pokemon/variant/exp/back/793.json index 76e104003d1..bb3d3d8793e 100644 --- a/public/images/pokemon/variant/exp/back/793.json +++ b/public/images/pokemon/variant/exp/back/793.json @@ -2,12 +2,10 @@ "1": { "a9c0c2": "941d20", "f3f8f8": "ffac61", - "fefefe": "fefefe", "66808c": "47090d", "32468d": "098c5d", "57badf": "40ffcc", "ccd9db": "db5930", - "121212": "121212", "3c7ccc": "1ecb76", "becfd1": "c03a25", "43545c": "39030e" @@ -15,13 +13,9 @@ "2": { "a9c0c2": "1f1b9c", "f3f8f8": "bd6ffd", - "fefefe": "fefefe", "66808c": "372983", - "32468d": "32468d", "57badf": "6bebff", "ccd9db": "8542ea", - "121212": "121212", - "3c7ccc": "3c7ccc", "becfd1": "5128c3", "43545c": "35226f" } diff --git a/public/images/pokemon/variant/exp/back/797.json b/public/images/pokemon/variant/exp/back/797.json index 1393cc2bf7d..7daa9fd6b7e 100644 --- a/public/images/pokemon/variant/exp/back/797.json +++ b/public/images/pokemon/variant/exp/back/797.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "135f58": "a65017", "219383": "bb6e1d", "bcc8c0": "f2b97f", @@ -21,7 +20,6 @@ "b3e088": "ffe4b2" }, "2": { - "101010": "101010", "135f58": "77d4a9", "219383": "93d9a7", "bcc8c0": "242733", diff --git a/public/images/pokemon/variant/exp/back/798.json b/public/images/pokemon/variant/exp/back/798.json index 2026ff45058..fc082c5b047 100644 --- a/public/images/pokemon/variant/exp/back/798.json +++ b/public/images/pokemon/variant/exp/back/798.json @@ -1,10 +1,8 @@ { "1": { "707070": "18470e", - "3f3f33": "3f3f33", "c8c8c8": "588720", "686877": "7b4b2b", - "2d2b26": "2d2b26", "959595": "18470e", "f9f9f9": "ddbe79", "bc5b35": "07421f", @@ -13,7 +11,6 @@ "e1921d": "136733", "e5e5e5": "87ab39", "ffffff": "d8e169", - "000000": "000000", "582914": "2c180e", "ad410b": "41281c", "e75303": "614537" @@ -32,7 +29,6 @@ "e1921d": "933940", "e5e5e5": "4a86b8", "ffffff": "87d2da", - "000000": "000000", "582914": "8a482d", "ad410b": "e1a44f", "e75303": "ffeb93" diff --git a/public/images/pokemon/variant/exp/back/80-mega.json b/public/images/pokemon/variant/exp/back/80-mega.json index 1506d6c7c6b..e6b135322da 100644 --- a/public/images/pokemon/variant/exp/back/80-mega.json +++ b/public/images/pokemon/variant/exp/back/80-mega.json @@ -1,11 +1,8 @@ { "1": { "783030": "3f2729", - "181818": "181818", "f89090": "885345", "e06878": "5b3332", - "deded5": "deded5", - "f8f8f8": "f8f8f8", "805820": "9f675f", "e8d080": "e0b69d", "505058": "7c5b40", @@ -15,11 +12,8 @@ }, "2": { "783030": "c08746", - "181818": "181818", "f89090": "eebd6a", "e06878": "de9048", - "deded5": "deded5", - "f8f8f8": "f8f8f8", "805820": "69080f", "e8d080": "d16b34", "505058": "192b32", diff --git a/public/images/pokemon/variant/exp/back/800-dawn-wings.json b/public/images/pokemon/variant/exp/back/800-dawn-wings.json index 8f3b2dd7c17..ff35f12beeb 100644 --- a/public/images/pokemon/variant/exp/back/800-dawn-wings.json +++ b/public/images/pokemon/variant/exp/back/800-dawn-wings.json @@ -4,7 +4,6 @@ "72baf3": "e6ded2", "3695ce": "afa191", "c7e5ff": "fbf5ec", - "1f1d35": "1f1d35", "1b2021": "460019", "5a646c": "890425", "293233": "700023", @@ -13,9 +12,7 @@ "617998": "86102d", "74b2d8": "bc1836", "a6bad9": "e5a355", - "000000": "000000", "b2d7f0": "eb422a", - "101010": "101010", "edf0ff": "ffd386" }, "2": { @@ -23,8 +20,6 @@ "72baf3": "970b22", "3695ce": "5b0318", "c7e5ff": "cf2f40", - "1f1d35": "1f1d35", - "1b2021": "1b2021", "5a646c": "602483", "293233": "3e135f", "434b51": "59109c", @@ -32,9 +27,7 @@ "617998": "b95261", "74b2d8": "1a3186", "a6bad9": "e79093", - "000000": "000000", "b2d7f0": "1550a1", - "101010": "101010", "edf0ff": "ffd1d1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/800-ultra.json b/public/images/pokemon/variant/exp/back/800-ultra.json index 0906a2418fe..0db88bd2a07 100644 --- a/public/images/pokemon/variant/exp/back/800-ultra.json +++ b/public/images/pokemon/variant/exp/back/800-ultra.json @@ -8,8 +8,7 @@ "f8f8d0": "ff7e75", "d0b868": "bc0125", "7d673b": "770031", - "e8e088": "ee2033", - "282828": "282828" + "e8e088": "ee2033" }, "2": { "b0a080": "e552ec", @@ -20,7 +19,6 @@ "f8f8d0": "ff8ae9", "d0b868": "900090", "7d673b": "33003d", - "e8e088": "d10cc7", - "282828": "282828" + "e8e088": "d10cc7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/800.json b/public/images/pokemon/variant/exp/back/800.json index b63455df5b9..e789115bb1f 100644 --- a/public/images/pokemon/variant/exp/back/800.json +++ b/public/images/pokemon/variant/exp/back/800.json @@ -5,8 +5,7 @@ "fbfbfb": "e8e7ff", "768188": "c8245d", "424a50": "890425", - "b5bbbf": "a266eb", - "080808": "080808" + "b5bbbf": "a266eb" }, "2": { "2b3233": "3e135f", @@ -14,7 +13,6 @@ "fbfbfb": "ffb8c9", "768188": "b13dc8", "424a50": "602483", - "b5bbbf": "f66fdc", - "080808": "080808" + "b5bbbf": "f66fdc" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/802.json b/public/images/pokemon/variant/exp/back/802.json index a432fd6bca3..0b1cdb6399d 100644 --- a/public/images/pokemon/variant/exp/back/802.json +++ b/public/images/pokemon/variant/exp/back/802.json @@ -2,19 +2,16 @@ "0": { "494949": "3a7e5d", "686868": "76bc8f", - "2f2f2f": "084434", - "101010": "101010" + "2f2f2f": "084434" }, "1": { "494949": "2f3079", "686868": "515aad", - "2f2f2f": "17145e", - "101010": "101010" + "2f2f2f": "17145e" }, "2": { "494949": "97123b", "686868": "ce3e63", - "2f2f2f": "5a0423", - "101010": "101010" + "2f2f2f": "5a0423" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/803.json b/public/images/pokemon/variant/exp/back/803.json index 215130ac568..09cd43296d2 100644 --- a/public/images/pokemon/variant/exp/back/803.json +++ b/public/images/pokemon/variant/exp/back/803.json @@ -1,7 +1,6 @@ { "1": { "78757f": "449e93", - "101010": "101010", "ccc0d8": "e3ffec", "98295e": "27579e", "d13d8f": "3492b9", @@ -13,7 +12,6 @@ }, "2": { "78757f": "cd9b85", - "101010": "101010", "ccc0d8": "ffefe0", "98295e": "a12f63", "d13d8f": "d6487a", diff --git a/public/images/pokemon/variant/exp/back/804.json b/public/images/pokemon/variant/exp/back/804.json index b41cb813bda..624c19a9879 100644 --- a/public/images/pokemon/variant/exp/back/804.json +++ b/public/images/pokemon/variant/exp/back/804.json @@ -5,7 +5,6 @@ "b69aef": "359faf", "9d3478": "c74736", "6b3357": "81262d", - "101010": "101010", "ec74d8": "e88354", "583f87": "212149", "987bcc": "22658d", @@ -22,7 +21,6 @@ "b69aef": "68b363", "9d3478": "dcbb94", "6b3357": "7e4e3d", - "101010": "101010", "ec74d8": "fff8cc", "583f87": "103a47", "987bcc": "2d794e", diff --git a/public/images/pokemon/variant/exp/back/808.json b/public/images/pokemon/variant/exp/back/808.json index 8229e2a6550..8a79e72e90b 100644 --- a/public/images/pokemon/variant/exp/back/808.json +++ b/public/images/pokemon/variant/exp/back/808.json @@ -4,10 +4,8 @@ "ab732b": "ce5a6f", "dea220": "ff7c8e", "ffda45": "ffbeae", - "101010": "101010", "3d3534": "2c4048", "59544e": "38585b", - "f9f9f9": "f9f9f9", "67675f": "426e73", "dcdcda": "c2effc", "8a8d7e": "6a8f97", @@ -20,15 +18,11 @@ "ab732b": "2d2931", "dea220": "64486f", "ffda45": "9b6e98", - "101010": "101010", "3d3534": "780000", "59544e": "9e002e", - "f9f9f9": "f9f9f9", "67675f": "ba2b41", "dcdcda": "ffbe6e", "8a8d7e": "d66352", - "b1b5a6": "f49769", - "741012": "741012", - "c2292e": "c2292e" + "b1b5a6": "f49769" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/809.json b/public/images/pokemon/variant/exp/back/809.json index 96cdbc3d9c3..1f597aa305e 100644 --- a/public/images/pokemon/variant/exp/back/809.json +++ b/public/images/pokemon/variant/exp/back/809.json @@ -4,7 +4,6 @@ "211d1d": "232a2b", "59544e": "38585b", "814f23": "85374d", - "101010": "101010", "ab732b": "ce5a6f", "67675f": "426e73", "ffda45": "ffbeae", @@ -12,23 +11,19 @@ "dea220": "ff7c8e", "b1b5a6": "98d6f0", "dcdcda": "c2effc", - "c2292e": "ffce6b", - "f9f9f9": "f9f9f9" + "c2292e": "ffce6b" }, "2": { "3d3534": "780000", "211d1d": "570000", "59544e": "9e002e", "814f23": "101010", - "101010": "101010", "ab732b": "2d2931", "67675f": "ba2b41", "ffda45": "9b6e98", "8a8d7e": "d66352", "dea220": "64486f", "b1b5a6": "f49769", - "dcdcda": "ffbe6e", - "c2292e": "c2292e", - "f9f9f9": "f9f9f9" + "dcdcda": "ffbe6e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/816.json b/public/images/pokemon/variant/exp/back/816.json index 8153a53decd..2db6adf77dc 100644 --- a/public/images/pokemon/variant/exp/back/816.json +++ b/public/images/pokemon/variant/exp/back/816.json @@ -7,8 +7,7 @@ "425493": "7d292a", "5091c0": "b5464b", "6ab6d2": "e66371", - "add7e7": "e6828e", - "101010": "101010" + "add7e7": "e6828e" }, "2": { "1f2d63": "6e1a4c", @@ -18,7 +17,6 @@ "425493": "813535", "5091c0": "dea26c", "6ab6d2": "ffeeb8", - "add7e7": "fffbec", - "101010": "101010" + "add7e7": "fffbec" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/817.json b/public/images/pokemon/variant/exp/back/817.json index 7c74f55eef9..818b677a356 100644 --- a/public/images/pokemon/variant/exp/back/817.json +++ b/public/images/pokemon/variant/exp/back/817.json @@ -8,12 +8,10 @@ "6c4499": "a1572f", "70cce0": "eb8577", "a278c7": "dd8a4f", - "101010": "101010", "3d6424": "83403e", "6ba01b": "a36d5d", "8cd222": "d99f8d", - "ccc7cd": "c7c1bd", - "fefefe": "fefefe" + "ccc7cd": "c7c1bd" }, "2": { "183569": "731f4e", @@ -24,11 +22,9 @@ "6c4499": "2c5aa8", "70cce0": "ffe5a3", "a278c7": "459dca", - "101010": "101010", "3d6424": "731317", "6ba01b": "ba2c22", "8cd222": "d85633", - "ccc7cd": "becee1", - "fefefe": "fefefe" + "ccc7cd": "becee1" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/818.json b/public/images/pokemon/variant/exp/back/818.json index 5b28c8a556c..8d0c77966e9 100644 --- a/public/images/pokemon/variant/exp/back/818.json +++ b/public/images/pokemon/variant/exp/back/818.json @@ -7,8 +7,6 @@ "e9cd5f": "614432", "549bc3": "a55846", "9cd2e2": "e1926f", - "101010": "101010", - "fdfdfd": "fdfdfd", "ff7c00": "5885a2", "31302f": "251e1c", "646565": "4c4643", @@ -23,8 +21,6 @@ "e9cd5f": "4484c3", "549bc3": "e38544", "9cd2e2": "ffcd57", - "101010": "101010", - "fdfdfd": "fdfdfd", "ff7c00": "a13047", "31302f": "571342", "646565": "be3a7d", diff --git a/public/images/pokemon/variant/exp/back/821.json b/public/images/pokemon/variant/exp/back/821.json index 6101b9d4261..dcbdaf08804 100644 --- a/public/images/pokemon/variant/exp/back/821.json +++ b/public/images/pokemon/variant/exp/back/821.json @@ -1,6 +1,5 @@ { "1": { - "080808": "080808", "201a12": "4b2a5e", "505038": "bc7dc3", "272b47": "6a445c", @@ -13,7 +12,6 @@ "ac9534": "be919e" }, "2": { - "080808": "080808", "201a12": "a46828", "505038": "eaae36", "272b47": "612a0e", diff --git a/public/images/pokemon/variant/exp/back/822.json b/public/images/pokemon/variant/exp/back/822.json index b9307b38f8a..d65996b424d 100644 --- a/public/images/pokemon/variant/exp/back/822.json +++ b/public/images/pokemon/variant/exp/back/822.json @@ -1,29 +1,21 @@ { "1": { "403524": "ad6f83", - "201a12": "201a12", "505038": "e7a6c9", "252d49": "c8658a", - "080808": "080808", "2f4577": "f4a0b9", "426eb2": "ffdeeb", "95a1b6": "57445a", - "e21d22": "e21d22", - "f4f4f4": "f4f4f4", "659aba": "fff6f8", "444f59": "2e262f" }, "2": { "403524": "b95212", - "201a12": "201a12", "505038": "dc7c16", "252d49": "91591e", - "080808": "080808", "2f4577": "eaae36", "426eb2": "edd472", "95a1b6": "743419", - "e21d22": "e21d22", - "f4f4f4": "f4f4f4", "659aba": "fff1b9", "444f59": "541705" } diff --git a/public/images/pokemon/variant/exp/back/823.json b/public/images/pokemon/variant/exp/back/823.json index 50b332400a2..605c1cd8c1b 100644 --- a/public/images/pokemon/variant/exp/back/823.json +++ b/public/images/pokemon/variant/exp/back/823.json @@ -1,27 +1,22 @@ { "1": { - "010101": "010101", "251d4e": "6a445c", "434475": "f4a0b9", "303360": "ad6f83", "646ca8": "ffdeeb", "4d5488": "e7a6c9", "e80000": "df7b10", - "ffa8a8": "ffa8a8", "4e4150": "57445a", - "2e262f": "2e262f", "18173d": "4b2a5e", "2c2b58": "845195", "3e3d6d": "bc7dc3" }, "2": { - "010101": "010101", "251d4e": "612a0e", "434475": "dc7c16", "303360": "b95212", "646ca8": "edd472", "4d5488": "eaae36", - "e80000": "e80000", "ffa8a8": "ff4a4a", "4e4150": "743419", "2e262f": "541705", diff --git a/public/images/pokemon/variant/exp/back/829.json b/public/images/pokemon/variant/exp/back/829.json index 25f91b83ab6..4fa2d435fb0 100644 --- a/public/images/pokemon/variant/exp/back/829.json +++ b/public/images/pokemon/variant/exp/back/829.json @@ -4,8 +4,6 @@ "e09b24": "1da3c2", "f4d626": "4aebe3", "fef54b": "84fff5", - "fef1a7": "fef1a7", - "101010": "101010", "841d1a": "3b0122", "cf301f": "601335", "fb472f": "7b2640", @@ -18,7 +16,6 @@ "f4d626": "bc77ff", "fef54b": "e8aaff", "fef1a7": "f6e6ff", - "101010": "101010", "841d1a": "14103b", "cf301f": "24244b", "fb472f": "2f335d", diff --git a/public/images/pokemon/variant/exp/back/830.json b/public/images/pokemon/variant/exp/back/830.json index 90af6e47db5..5bf8a112cbe 100644 --- a/public/images/pokemon/variant/exp/back/830.json +++ b/public/images/pokemon/variant/exp/back/830.json @@ -6,8 +6,7 @@ "e8d5c6": "a2d2e7", "bab743": "c38ec6", "5c6738": "6f3e7b", - "8a9247": "9d6aa5", - "101010": "101010" + "8a9247": "9d6aa5" }, "2": { "c2aba0": "9471ae", @@ -16,7 +15,6 @@ "e8d5c6": "d5aee9", "bab743": "6a9cbb", "5c6738": "133049", - "8a9247": "3c627e", - "101010": "101010" + "8a9247": "3c627e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/835.json b/public/images/pokemon/variant/exp/back/835.json index 0e4b99223d7..0c68b758f61 100644 --- a/public/images/pokemon/variant/exp/back/835.json +++ b/public/images/pokemon/variant/exp/back/835.json @@ -1,7 +1,6 @@ { "1": { "844840": "051514", - "101010": "101010", "bd8d62": "e0bb76", "a26642": "aa8e5a", "d1cccb": "e7c78d", @@ -15,11 +14,9 @@ }, "2": { "844840": "313e38", - "101010": "101010", "bd8d62": "509468", "a26642": "3d5d59", "d1cccb": "a0bcaa", - "fbfbfb": "fbfbfb", "837a76": "43554d", "9a6229": "2b2042", "f7da11": "776baf", diff --git a/public/images/pokemon/variant/exp/back/836.json b/public/images/pokemon/variant/exp/back/836.json index c12f29903b3..9d71f85d604 100644 --- a/public/images/pokemon/variant/exp/back/836.json +++ b/public/images/pokemon/variant/exp/back/836.json @@ -1,12 +1,9 @@ { "1": { - "a06d21": "a06d21", - "0d0d0d": "0d0d0d", "fad833": "e0bb76", "c8ad25": "aa8e5a", "495043": "28797b", "cfc7c6": "cbcdb4", - "8c7b7a": "8c7b7a", "dec12e": "e0bb76", "f2efef": "fdffe1", "fff665": "e7c78d", @@ -15,7 +12,6 @@ }, "2": { "a06d21": "213d3a", - "0d0d0d": "0d0d0d", "fad833": "509468", "c8ad25": "3d5d59", "495043": "3c2e5b", diff --git a/public/images/pokemon/variant/exp/back/850.json b/public/images/pokemon/variant/exp/back/850.json index b5df39e115c..2f836819132 100644 --- a/public/images/pokemon/variant/exp/back/850.json +++ b/public/images/pokemon/variant/exp/back/850.json @@ -8,7 +8,6 @@ "681607": "065b58", "42221c": "36203c", "2f1610": "24122b", - "101010": "101010", "be5409": "25a96a", "f89e08": "a3ffb9" }, @@ -20,9 +19,6 @@ "804a3e": "7866cb", "681607": "4a1036", "42221c": "222957", - "2f1610": "121439", - "101010": "101010", - "be5409": "be5409", - "f89e08": "f89e08" + "2f1610": "121439" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/851.json b/public/images/pokemon/variant/exp/back/851.json index 9fca14e5e14..7a8cb9718c7 100644 --- a/public/images/pokemon/variant/exp/back/851.json +++ b/public/images/pokemon/variant/exp/back/851.json @@ -12,11 +12,9 @@ "42221c": "36203c", "2f1610": "24122b", "681607": "024f2d", - "101010": "101010", "941528": "005f35" }, "2": { - "be5409": "be5409", "f89e08": "f36d73", "ffd901": "ffc143", "5b2f26": "36426c", @@ -27,8 +25,6 @@ "ff5839": "ff6970", "42221c": "222957", "2f1610": "121439", - "681607": "6e0442", - "101010": "101010", - "941528": "941528" + "681607": "6e0442" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/854.json b/public/images/pokemon/variant/exp/back/854.json index e438e91cb2d..e5edbe9a044 100644 --- a/public/images/pokemon/variant/exp/back/854.json +++ b/public/images/pokemon/variant/exp/back/854.json @@ -9,7 +9,6 @@ "72cfcc": "7c2039", "af63c4": "ffffeb", "9aedea": "b74f6c", - "101010": "101010", "c3bfe0": "f2bbaa" }, "2": { @@ -22,7 +21,6 @@ "72cfcc": "7c7270", "af63c4": "82b183", "9aedea": "c9c0b9", - "101010": "101010", "c3bfe0": "524c4e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/855.json b/public/images/pokemon/variant/exp/back/855.json index 0b9ad0a2b86..9839eb600c6 100644 --- a/public/images/pokemon/variant/exp/back/855.json +++ b/public/images/pokemon/variant/exp/back/855.json @@ -8,7 +8,6 @@ "4bb2af": "531d2b", "9aedea": "b74f6c", "c3bfe0": "c06d66", - "101010": "101010", "f5f9fa": "f2bbaa", "733a87": "ef9e5c", "af63c4": "ffffeb", @@ -23,7 +22,6 @@ "4bb2af": "333231", "9aedea": "fdfdfd", "c3bfe0": "3e383a", - "101010": "101010", "f5f9fa": "524c4e", "733a87": "538c61", "af63c4": "82b183", diff --git a/public/images/pokemon/variant/exp/back/856.json b/public/images/pokemon/variant/exp/back/856.json index 3d245b74324..bfc575d89d7 100644 --- a/public/images/pokemon/variant/exp/back/856.json +++ b/public/images/pokemon/variant/exp/back/856.json @@ -2,7 +2,6 @@ "1": { "727ab1": "1d4a3b", "c8e9ff": "5ec183", - "181818": "181818", "acbfdf": "3b9665", "bb6a99": "043232", "f9d5da": "298675", @@ -13,7 +12,6 @@ "2": { "727ab1": "6b0124", "c8e9ff": "cb304d", - "181818": "181818", "acbfdf": "a11437", "bb6a99": "30163d", "f9d5da": "523f73", diff --git a/public/images/pokemon/variant/exp/back/858.json b/public/images/pokemon/variant/exp/back/858.json index 8bdfcf82426..8b37e152f56 100644 --- a/public/images/pokemon/variant/exp/back/858.json +++ b/public/images/pokemon/variant/exp/back/858.json @@ -2,7 +2,6 @@ "1": { "acbfdf": "3b9665", "948fc2": "287b59", - "101010": "101010", "c8e9ff": "5ec183", "727ab1": "1d4a3b", "d9cedb": "dec1c2", @@ -16,7 +15,6 @@ "2": { "acbfdf": "a11437", "948fc2": "8c0e32", - "101010": "101010", "c8e9ff": "cb304d", "727ab1": "6b0124", "d9cedb": "e4bcde", diff --git a/public/images/pokemon/variant/exp/back/859.json b/public/images/pokemon/variant/exp/back/859.json index 16dcecb181e..a3d7e501811 100644 --- a/public/images/pokemon/variant/exp/back/859.json +++ b/public/images/pokemon/variant/exp/back/859.json @@ -4,7 +4,6 @@ "8d3856": "376b2d", "f589c2": "9aba6d", "ffbff5": "dbe797", - "101010": "101010", "45366d": "5b1d15", "735aac": "a4332d", "947cd8": "cc5836" @@ -14,7 +13,6 @@ "8d3856": "30082d", "f589c2": "6b2b3e", "ffbff5": "904f55", - "101010": "101010", "45366d": "794935", "735aac": "f0c475", "947cd8": "f9e9a4" diff --git a/public/images/pokemon/variant/exp/back/860.json b/public/images/pokemon/variant/exp/back/860.json index fa3ee7f8bc4..939f40b9868 100644 --- a/public/images/pokemon/variant/exp/back/860.json +++ b/public/images/pokemon/variant/exp/back/860.json @@ -6,9 +6,7 @@ "352954": "3b1528", "8872b6": "c45949", "5d4694": "8b332d", - "101010": "101010", "433568": "5a1d27", - "000000": "000000", "409555": "244849", "356a3c": "162a35", "47be62": "366c59" @@ -20,9 +18,7 @@ "352954": "a26458", "8872b6": "f6e8b8", "5d4694": "dfc784", - "101010": "101010", "433568": "c98e63", - "000000": "000000", "409555": "272664", "356a3c": "090d50", "47be62": "3f386f" diff --git a/public/images/pokemon/variant/exp/back/861.json b/public/images/pokemon/variant/exp/back/861.json index acdc2e3c502..cec30107ea8 100644 --- a/public/images/pokemon/variant/exp/back/861.json +++ b/public/images/pokemon/variant/exp/back/861.json @@ -1,7 +1,6 @@ { "1": { "356a3c": "162a35", - "101010": "101010", "47be62": "366c59", "409555": "244849", "433568": "5a1d27", @@ -11,7 +10,6 @@ }, "2": { "356a3c": "090d50", - "101010": "101010", "47be62": "3f386f", "409555": "272664", "433568": "c98e63", diff --git a/public/images/pokemon/variant/exp/back/862.json b/public/images/pokemon/variant/exp/back/862.json index d7d0dd5b874..1a003f25573 100644 --- a/public/images/pokemon/variant/exp/back/862.json +++ b/public/images/pokemon/variant/exp/back/862.json @@ -1,7 +1,5 @@ { "1": { - "010101": "010101", - "1b2627": "1b2627", "474749": "156a66", "303034": "094448", "6f7071": "01473a", @@ -10,11 +8,9 @@ "f5f5f6": "f5ffea", "949496": "1c8155", "9b4f69": "d414dd", - "df84ad": "ff69fa", - "fcfcfc": "fcfcfc" + "df84ad": "ff69fa" }, "2": { - "010101": "010101", "1b2627": "180c46", "474749": "8655e1", "303034": "5a3eb9", @@ -24,7 +20,6 @@ "f5f5f6": "342d4c", "949496": "302e89", "9b4f69": "0099ce", - "df84ad": "54f1ff", - "fcfcfc": "fcfcfc" + "df84ad": "54f1ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/863.json b/public/images/pokemon/variant/exp/back/863.json index ba6b2a10477..c100f2e1b4c 100644 --- a/public/images/pokemon/variant/exp/back/863.json +++ b/public/images/pokemon/variant/exp/back/863.json @@ -2,29 +2,22 @@ "1": { "66716c": "59879a", "bfc1bf": "b4e0d3", - "010101": "010101", "8f9c95": "85c1c0", - "181a1d": "181a1d", "272d2e": "342b49", "3d4547": "4e385a", "84726f": "9591a7", "5b4e4d": "4e455c", - "ada09a": "d5d0dd", - "b3b6b3": "b3b6b3", - "a4a5a4": "a4a5a4" + "ada09a": "d5d0dd" }, "2": { "66716c": "331a37", "bfc1bf": "92264b", - "010101": "010101", "8f9c95": "6d0b3c", "181a1d": "0f2127", "272d2e": "234a56", "3d4547": "417778", "84726f": "27293c", "5b4e4d": "141626", - "ada09a": "4c4d62", - "b3b6b3": "b3b6b3", - "a4a5a4": "a4a5a4" + "ada09a": "4c4d62" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/864.json b/public/images/pokemon/variant/exp/back/864.json index a9d6199388e..eeefe5b0166 100644 --- a/public/images/pokemon/variant/exp/back/864.json +++ b/public/images/pokemon/variant/exp/back/864.json @@ -8,8 +8,7 @@ "cbc2d1": "d7d2f6", "7f806a": "4d8894", "fbf2ff": "d3ffff", - "c6bbcb": "a7e6e5", - "101010": "101010" + "c6bbcb": "a7e6e5" }, "2": { "bcb9be": "055946", @@ -20,7 +19,6 @@ "cbc2d1": "567f83", "7f806a": "4b1f28", "fbf2ff": "874059", - "c6bbcb": "773050", - "101010": "101010" + "c6bbcb": "773050" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/867.json b/public/images/pokemon/variant/exp/back/867.json index 124ea0d4f66..edfad6a836d 100644 --- a/public/images/pokemon/variant/exp/back/867.json +++ b/public/images/pokemon/variant/exp/back/867.json @@ -1,7 +1,6 @@ { "1": { "393941": "69d9bf", - "101010": "101010", "927e8d": "a46361", "d9d0d1": "d6b8a0", "c5b9bb": "c69981", @@ -10,7 +9,6 @@ }, "2": { "393941": "a4222c", - "101010": "101010", "927e8d": "1f6455", "d9d0d1": "4fb66a", "c5b9bb": "298a61", diff --git a/public/images/pokemon/variant/exp/back/872.json b/public/images/pokemon/variant/exp/back/872.json index c7b73b39012..cac7ab2c540 100644 --- a/public/images/pokemon/variant/exp/back/872.json +++ b/public/images/pokemon/variant/exp/back/872.json @@ -2,9 +2,7 @@ "0": { "7b8b9b": "345f5c", "d8e9f0": "b7f1d6", - "f5fdff": "f5fdff", "acc3cc": "669a8c", - "101010": "101010", "695e77": "275e43", "edeae0": "a6d6a6", "b3a7c2": "73a878" @@ -12,9 +10,7 @@ "1": { "7b8b9b": "22504c", "d8e9f0": "b6e7df", - "f5fdff": "f5fdff", "acc3cc": "548e8f", - "101010": "101010", "695e77": "354b63", "edeae0": "c1ebf3", "b3a7c2": "89a9be" @@ -22,9 +18,7 @@ "2": { "7b8b9b": "5a3993", "d8e9f0": "d5c3ff", - "f5fdff": "f5fdff", "acc3cc": "a66ac2", - "101010": "101010", "695e77": "5f3465", "edeae0": "e5a2da", "b3a7c2": "a060a0" diff --git a/public/images/pokemon/variant/exp/back/873.json b/public/images/pokemon/variant/exp/back/873.json index b4856a86659..c746623d83d 100644 --- a/public/images/pokemon/variant/exp/back/873.json +++ b/public/images/pokemon/variant/exp/back/873.json @@ -4,23 +4,20 @@ "747489": "547b58", "e7e0e6": "a6d6a6", "8f8f9f": "27532f", - "fdfdfd": "b7f1d7", - "101010": "101010" + "fdfdfd": "b7f1d7" }, "1": { "b3b4bd": "92a9b8", "747489": "556b7d", "e7e0e6": "b6e7df", "8f8f9f": "415366", - "fdfdfd": "eefffb", - "101010": "101010" + "fdfdfd": "eefffb" }, "2": { "b3b4bd": "864c86", "747489": "512d52", "e7e0e6": "d78dcb", "8f8f9f": "5f3465", - "fdfdfd": "d5c3ff", - "101010": "101010" + "fdfdfd": "d5c3ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/876-female.json b/public/images/pokemon/variant/exp/back/876-female.json index 87ee8cb6d13..c33a457c3c0 100644 --- a/public/images/pokemon/variant/exp/back/876-female.json +++ b/public/images/pokemon/variant/exp/back/876-female.json @@ -4,7 +4,6 @@ "7d7493": "5a3736", "2f2642": "2c1419", "564c6c": "4a282a", - "101010": "101010", "6c64a6": "b72e3e", "4d447e": "8c1932", "3d3055": "64102c", @@ -17,7 +16,6 @@ "7d7493": "ecb2c5", "2f2642": "444a8e", "564c6c": "d58da4", - "101010": "101010", "6c64a6": "78aae5", "4d447e": "4c5db1", "3d3055": "4c5db1", diff --git a/public/images/pokemon/variant/exp/back/876.json b/public/images/pokemon/variant/exp/back/876.json index af4f5492efe..024747b2e0b 100644 --- a/public/images/pokemon/variant/exp/back/876.json +++ b/public/images/pokemon/variant/exp/back/876.json @@ -3,7 +3,6 @@ "2e2641": "2c1419", "7d7493": "5a3736", "564c6c": "4a282a", - "101010": "101010", "2f2642": "2c1419", "6c64a6": "b72e3e", "4d447e": "8c1932", @@ -16,7 +15,6 @@ "2e2641": "314c7c", "7d7493": "a3c5e8", "564c6c": "78a5d4", - "101010": "101010", "2f2642": "7a316c", "6c64a6": "f589bb", "4d447e": "d268a7", diff --git a/public/images/pokemon/variant/exp/back/877-hangry.json b/public/images/pokemon/variant/exp/back/877-hangry.json index a4e19c34f67..4ecb7181777 100644 --- a/public/images/pokemon/variant/exp/back/877-hangry.json +++ b/public/images/pokemon/variant/exp/back/877-hangry.json @@ -1,7 +1,6 @@ { "0": { "383634": "3a1010", - "101010": "101010", "4f4b47": "952222", "6c6c6c": "540606", "6b3d96": "967f3d", @@ -9,8 +8,6 @@ "9958ce": "cebb58" }, "1": { - "383634": "383634", - "101010": "101010", "4f4b47": "3a3a3a", "6c6c6c": "212020", "6b3d96": "cb6333", @@ -18,10 +15,6 @@ "9958ce": "cb6333" }, "2": { - "383634": "383634", - "101010": "101010", - "4f4b47": "4f4b47", - "6c6c6c": "6c6c6c", "6b3d96": "568351", "493061": "306135", "9958ce": "7fba7f" diff --git a/public/images/pokemon/variant/exp/back/877.json b/public/images/pokemon/variant/exp/back/877.json index 2a26b83b98f..7bf58e01ba1 100644 --- a/public/images/pokemon/variant/exp/back/877.json +++ b/public/images/pokemon/variant/exp/back/877.json @@ -1,19 +1,13 @@ { "0": { "8a5e48": "383634", - "101010": "101010", - "383634": "383634", "af7044": "4f4b47", - "6c6c6c": "6c6c6c", - "4f4b47": "4f4b47", "cf9c66": "6c6c6c", "d3b351": "8851d3", "f4f489": "b689f4" }, "1": { "8a5e48": "2c439d", - "101010": "101010", - "383634": "383634", "af7044": "86aaff", "6c6c6c": "5c5e6d", "4f4b47": "58666d", @@ -23,11 +17,7 @@ }, "2": { "8a5e48": "4f8a48", - "101010": "101010", - "383634": "383634", "af7044": "71cf66", - "6c6c6c": "6c6c6c", - "4f4b47": "4f4b47", "cf9c66": "a1f38b", "d3b351": "b6b6b6", "f4f489": "ffffff" diff --git a/public/images/pokemon/variant/exp/back/880.json b/public/images/pokemon/variant/exp/back/880.json index 1db9d4f60a3..7470434ac3b 100644 --- a/public/images/pokemon/variant/exp/back/880.json +++ b/public/images/pokemon/variant/exp/back/880.json @@ -1,7 +1,6 @@ { "1": { "8f261b": "1b1829", - "101010": "101010", "ff8d9f": "6a98c4", "ed4e76": "312f47", "975e17": "5b0610", @@ -16,8 +15,6 @@ "025c43": "26253e" }, "2": { - "8f261b": "8f261b", - "101010": "101010", "ff8d9f": "e28854", "ed4e76": "ca5939", "975e17": "211b3d", diff --git a/public/images/pokemon/variant/exp/back/881.json b/public/images/pokemon/variant/exp/back/881.json index 3efad4efe60..580250907bc 100644 --- a/public/images/pokemon/variant/exp/back/881.json +++ b/public/images/pokemon/variant/exp/back/881.json @@ -4,7 +4,6 @@ "975e17": "5b0610", "ffff84": "ee8563", "ead900": "c6362b", - "101010": "101010", "2abbfc": "ceb16f", "09354d": "271014", "9ab8ba": "cea5b9", @@ -24,9 +23,7 @@ "975e17": "211b3d", "ffff84": "dceeeb", "ead900": "636287", - "101010": "101010", "2abbfc": "26c248", - "09354d": "09354d", "9ab8ba": "a3c465", "edf3f2": "fcffe4", "5c7996": "50a751", diff --git a/public/images/pokemon/variant/exp/back/882.json b/public/images/pokemon/variant/exp/back/882.json index bfaf844e6ed..27028180ff4 100644 --- a/public/images/pokemon/variant/exp/back/882.json +++ b/public/images/pokemon/variant/exp/back/882.json @@ -3,7 +3,6 @@ "434c63": "771922", "83bbed": "eaa561", "777ebd": "cc6235", - "101010": "101010", "003319": "1a182b", "005e44": "564e6e", "8f261b": "1d2238", @@ -19,7 +18,6 @@ "434c63": "450940", "83bbed": "8c1f45", "777ebd": "6c1046", - "101010": "101010", "003319": "cc7d3b", "005e44": "f1b45f", "8f261b": "215b68", diff --git a/public/images/pokemon/variant/exp/back/883.json b/public/images/pokemon/variant/exp/back/883.json index 3fb71aaebc6..c28f2eb7f2f 100644 --- a/public/images/pokemon/variant/exp/back/883.json +++ b/public/images/pokemon/variant/exp/back/883.json @@ -1,10 +1,8 @@ { "1": { "434c63": "3a151c", - "ffffff": "ffffff", "83bbed": "eaa561", "172459": "771922", - "101010": "101010", "777ebd": "cc6235", "5c7996": "8c6060", "9ab8ba": "cea5b9", @@ -16,10 +14,8 @@ }, "2": { "434c63": "450940", - "ffffff": "ffffff", "83bbed": "8c1f45", "172459": "320432", - "101010": "101010", "777ebd": "6c1046", "5c7996": "50a751", "9ab8ba": "a3c465", diff --git a/public/images/pokemon/variant/exp/back/884.json b/public/images/pokemon/variant/exp/back/884.json index 4cb8efc516b..e71bc735fdf 100644 --- a/public/images/pokemon/variant/exp/back/884.json +++ b/public/images/pokemon/variant/exp/back/884.json @@ -2,7 +2,6 @@ "1": { "68353c": "871e14", "b96a6a": "cd452b", - "151515": "151515", "a893a8": "a77c69", "e4e5f1": "f8e0cf", "837080": "5d392f", @@ -16,7 +15,6 @@ "2": { "68353c": "062449", "b96a6a": "2077a6", - "151515": "151515", "a893a8": "32234e", "e4e5f1": "65549c", "837080": "1a0e34", diff --git a/public/images/pokemon/variant/exp/back/885.json b/public/images/pokemon/variant/exp/back/885.json index a03ef2a9a01..ba01496a553 100644 --- a/public/images/pokemon/variant/exp/back/885.json +++ b/public/images/pokemon/variant/exp/back/885.json @@ -2,7 +2,6 @@ "0": { "3a583c": "133056", "fa5494": "efa93f", - "101010": "101010", "cc4066": "ac7508", "5f875a": "2f6c89", "476b48": "20486e", @@ -15,7 +14,6 @@ "1": { "3a583c": "2f040d", "fa5494": "4590da", - "101010": "101010", "cc4066": "244f9f", "5f875a": "7d1f2c", "476b48": "2f040d", @@ -28,7 +26,6 @@ "2": { "3a583c": "1f0c2c", "fa5494": "68c7c4", - "101010": "101010", "cc4066": "2a8286", "5f875a": "3c2750", "476b48": "231234", diff --git a/public/images/pokemon/variant/exp/back/886.json b/public/images/pokemon/variant/exp/back/886.json index 9b90d92a77a..3cd9a1fcfe3 100644 --- a/public/images/pokemon/variant/exp/back/886.json +++ b/public/images/pokemon/variant/exp/back/886.json @@ -1,19 +1,16 @@ { "0": { "444e62": "2d365a", - "101010": "101010", "addcbc": "6accd6", "2c323f": "192250", "5f875a": "2f6c89", "566f89": "465272", "fa5494": "efa93f", "5b878c": "4c90a6", - "7fb3b1": "78c3cb", - "d5fffb": "d5fffb" + "7fb3b1": "78c3cb" }, "1": { "444e62": "4a1621", - "101010": "101010", "addcbc": "da6151", "2c323f": "2e080d", "5f875a": "6b242e", @@ -25,7 +22,6 @@ }, "2": { "444e62": "231b45", - "101010": "101010", "addcbc": "927fa1", "2c323f": "251b31", "5f875a": "3c2750", diff --git a/public/images/pokemon/variant/exp/back/887.json b/public/images/pokemon/variant/exp/back/887.json index 46e10fbf747..939363027b1 100644 --- a/public/images/pokemon/variant/exp/back/887.json +++ b/public/images/pokemon/variant/exp/back/887.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "2c323f": "192250", "566f89": "46557b", "444e62": "2c3867", @@ -15,7 +14,6 @@ "48a9b0": "479bb6" }, "1": { - "101010": "101010", "2c323f": "2e080d", "566f89": "6c273d", "444e62": "4a1621", @@ -30,9 +28,7 @@ "48a9b0": "8a212f" }, "2": { - "101010": "101010", "2c323f": "1b163f", - "566f89": "566f89", "444e62": "332a59", "cc4066": "2a666b", "fa5494": "68c7c4", diff --git a/public/images/pokemon/variant/exp/back/888-crowned.json b/public/images/pokemon/variant/exp/back/888-crowned.json index e9fdeccc8f5..74c2ae5645e 100644 --- a/public/images/pokemon/variant/exp/back/888-crowned.json +++ b/public/images/pokemon/variant/exp/back/888-crowned.json @@ -2,45 +2,31 @@ "1": { "8f4e2f": "2f4567", "d79a53": "5a829b", - "101010": "101010", - "111111": "111111", "f2db8a": "a1c9cd", "3471b4": "b74323", "2d4377": "5c1a1d", "4999da": "ec813b", "be3c45": "224d42", "9d6862": "a85f49", - "ffffff": "ffffff", "f45353": "448b48", "d3a79a": "da9772", "fae2c0": "fff8cd", "93262f": "0d2729", - "fff8a9": "c6e5e3", - "454754": "454754", - "121212": "121212", - "3f3736": "3f3736", - "131313": "131313" + "fff8a9": "c6e5e3" }, "2": { "8f4e2f": "692e47", "d79a53": "964c5c", - "101010": "101010", - "111111": "111111", "f2db8a": "c4826b", "3471b4": "9fa7d0", "2d4377": "615c7e", "4999da": "e6ecff", "be3c45": "6c1d59", "9d6862": "1c2238", - "ffffff": "ffffff", "f45353": "902d57", "d3a79a": "243149", "fae2c0": "3d5b72", "93262f": "431042", - "fff8a9": "e5b792", - "454754": "454754", - "121212": "121212", - "3f3736": "3f3736", - "131313": "131313" + "fff8a9": "e5b792" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/888.json b/public/images/pokemon/variant/exp/back/888.json index 84bab51307e..734867645af 100644 --- a/public/images/pokemon/variant/exp/back/888.json +++ b/public/images/pokemon/variant/exp/back/888.json @@ -3,7 +3,6 @@ "2d4377": "5c1a1d", "4999da": "ec813b", "3471b4": "b74323", - "080808": "080808", "93262f": "0d2729", "be3c45": "224d42", "f45353": "448b48", @@ -16,7 +15,6 @@ "2d4377": "615c7e", "4999da": "e6ecff", "3471b4": "9fa7d0", - "080808": "080808", "93262f": "431042", "be3c45": "6c1d59", "f45353": "902d57", diff --git a/public/images/pokemon/variant/exp/back/889-crowned.json b/public/images/pokemon/variant/exp/back/889-crowned.json index cd69c495fff..963684b7306 100644 --- a/public/images/pokemon/variant/exp/back/889-crowned.json +++ b/public/images/pokemon/variant/exp/back/889-crowned.json @@ -1,7 +1,6 @@ { "1": { "2d2f7b": "102c2c", - "080808": "080808", "396dce": "70a757", "2d48a8": "3c6959", "8f4e2f": "2f4567", @@ -17,7 +16,6 @@ }, "2": { "2d2f7b": "244e61", - "080808": "080808", "396dce": "6fc7c1", "2d48a8": "4797a4", "8f4e2f": "692e47", diff --git a/public/images/pokemon/variant/exp/back/889.json b/public/images/pokemon/variant/exp/back/889.json index 8d1334c6172..6d464c3bba8 100644 --- a/public/images/pokemon/variant/exp/back/889.json +++ b/public/images/pokemon/variant/exp/back/889.json @@ -4,7 +4,6 @@ "2d2f7b": "102c2c", "2d48a8": "3c6959", "f2db8a": "a1c9cd", - "080808": "080808", "731a27": "1c163d", "eb363a": "614378", "ae2836": "422b61", @@ -17,7 +16,6 @@ "2d2f7b": "244e61", "2d48a8": "4797a4", "f2db8a": "c4826b", - "080808": "080808", "731a27": "615c7e", "eb363a": "e6ecff", "ae2836": "9fa7d0", diff --git a/public/images/pokemon/variant/exp/back/890.json b/public/images/pokemon/variant/exp/back/890.json index 7c645c633f6..baf741074bc 100644 --- a/public/images/pokemon/variant/exp/back/890.json +++ b/public/images/pokemon/variant/exp/back/890.json @@ -8,11 +8,8 @@ "fb2553": "8cf9ff", "675cc5": "406d89", "b21833": "21779e", - "010101": "010101", "f46d70": "8ef2ff", "f18cd5": "ff7d54", - "fefefe": "fefefe", - "ffbcbc": "ffbcbc", "e22dbc": "ee535a" }, "2": { @@ -24,11 +21,8 @@ "fb2553": "eba32d", "675cc5": "e0ecff", "b21833": "bd5f10", - "010101": "010101", "f46d70": "f1bd4b", "f18cd5": "73e5dc", - "fefefe": "fefefe", - "ffbcbc": "ffbcbc", "e22dbc": "298fb9" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/891.json b/public/images/pokemon/variant/exp/back/891.json index 6a11dfad107..f20000f7a63 100644 --- a/public/images/pokemon/variant/exp/back/891.json +++ b/public/images/pokemon/variant/exp/back/891.json @@ -1,18 +1,13 @@ { "0": { "717674": "6d5755", - "101010": "101010", "d8d1cb": "d1c8ba", "b5ada6": "ad9a8a", - "9194a2": "9194a2", - "fbfbfb": "fbfbfb", - "c9cccd": "c9cccd", "393539": "34302f", "655e65": "5c5653" }, "1": { "717674": "263138", - "101010": "101010", "d8d1cb": "6e8b9b", "b5ada6": "475b68", "9194a2": "181b33", @@ -23,7 +18,6 @@ }, "2": { "717674": "56546b", - "101010": "101010", "d8d1cb": "e8e8ff", "b5ada6": "a4a4bc", "9194a2": "7f1c27", diff --git a/public/images/pokemon/variant/exp/back/892-rapid-strike.json b/public/images/pokemon/variant/exp/back/892-rapid-strike.json index faa8e52bffa..b68fb1aba24 100644 --- a/public/images/pokemon/variant/exp/back/892-rapid-strike.json +++ b/public/images/pokemon/variant/exp/back/892-rapid-strike.json @@ -1,13 +1,10 @@ { "0": { "4f4b58": "4a2e27", - "010101": "010101", "6b6574": "725444", "8d8c8e": "957961", "282d26": "25141f", "605f4d": "513b46", - "fcfcfc": "fcfcfc", - "b9b9b9": "b9b9b9", "9e6225": "8b222f", "42473a": "382334", "fffa60": "ff9736", @@ -15,13 +12,10 @@ }, "1": { "4f4b58": "263138", - "010101": "010101", "6b6574": "4c6877", "8d8c8e": "809ba3", "282d26": "181b33", "605f4d": "444f5b", - "fcfcfc": "fcfcfc", - "b9b9b9": "b9b9b9", "9e6225": "272735", "42473a": "2e3549", "fffa60": "616368", @@ -29,7 +23,6 @@ }, "2": { "4f4b58": "56546b", - "010101": "010101", "6b6574": "a4a4bc", "8d8c8e": "e8e8ff", "282d26": "07073f", diff --git a/public/images/pokemon/variant/exp/back/892.json b/public/images/pokemon/variant/exp/back/892.json index 117ecd51bc6..be0f25cec5d 100644 --- a/public/images/pokemon/variant/exp/back/892.json +++ b/public/images/pokemon/variant/exp/back/892.json @@ -2,21 +2,17 @@ "0": { "282d26": "25141f", "605f4d": "513b46", - "010101": "010101", - "b9b9b9": "b9b9b9", "42473a": "382334", "4f4b58": "4a2e27", "6b6574": "725444", "8d8c8e": "957961", "9e6225": "8b222f", "fffa60": "ff9736", - "fcfcfc": "fcfcfc", "d5a926": "b95826" }, "1": { "282d26": "181b33", "605f4d": "444f5b", - "010101": "010101", "b9b9b9": "768187", "42473a": "2e3549", "4f4b58": "263138", @@ -30,7 +26,6 @@ "2": { "282d26": "3d0015", "605f4d": "870e2a", - "010101": "010101", "b9b9b9": "a52139", "42473a": "51081e", "4f4b58": "56546b", diff --git a/public/images/pokemon/variant/exp/back/896.json b/public/images/pokemon/variant/exp/back/896.json index 48c4828ca18..a88dce32430 100644 --- a/public/images/pokemon/variant/exp/back/896.json +++ b/public/images/pokemon/variant/exp/back/896.json @@ -1,6 +1,5 @@ { "0": { - "000000": "000000", "8cacdd": "8f84c9", "bbd2ff": "b9abea", "4679b7": "5952a1", @@ -10,11 +9,9 @@ "eeeef2": "f6ebf6", "cac0cb": "c9c0d4", "83818f": "6f6982", - "6c6271": "68627a", - "ffffff": "ffffff" + "6c6271": "68627a" }, "1": { - "000000": "000000", "8cacdd": "41d5b3", "bbd2ff": "9dffff", "4679b7": "00816c", @@ -24,11 +21,9 @@ "eeeef2": "93bbf1", "cac0cb": "6f8ec1", "83818f": "506698", - "6c6271": "35486b", - "ffffff": "ffffff" + "6c6271": "35486b" }, "2": { - "000000": "000000", "8cacdd": "bc393b", "bbd2ff": "f68c79", "4679b7": "780024", @@ -38,7 +33,6 @@ "eeeef2": "534444", "cac0cb": "3c2c2f", "83818f": "2b1b1e", - "6c6271": "21161a", - "ffffff": "ffffff" + "6c6271": "21161a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/897.json b/public/images/pokemon/variant/exp/back/897.json index 3f2c4c62b17..0217835accd 100644 --- a/public/images/pokemon/variant/exp/back/897.json +++ b/public/images/pokemon/variant/exp/back/897.json @@ -1,21 +1,15 @@ { "0": { - "3c3c3c": "3c3c3c", "525852": "5d5458", - "101010": "101010", "49478f": "894061", "7c5bcf": "d05a82", "00285c": "632741", - "d9a4e3": "d9a4e3", - "fcfcfc": "fcfcfc", - "755179": "755179", "504e8e": "80447d", "8776e4": "b862b3" }, "1": { "3c3c3c": "622d51", "525852": "904c75", - "101010": "101010", "49478f": "932f27", "7c5bcf": "cc5837", "00285c": "6e1817", @@ -28,7 +22,6 @@ "2": { "3c3c3c": "3a6965", "525852": "5c8a7b", - "101010": "101010", "49478f": "13312b", "7c5bcf": "254a34", "00285c": "0d2222", diff --git a/public/images/pokemon/variant/exp/back/898-ice.json b/public/images/pokemon/variant/exp/back/898-ice.json index a10a4b38293..f7675955d25 100644 --- a/public/images/pokemon/variant/exp/back/898-ice.json +++ b/public/images/pokemon/variant/exp/back/898-ice.json @@ -1,16 +1,12 @@ { "0": { "004037": "00403c", - "000000": "000000", "8cacdd": "8f84c9", "007766": "00776f", "bbd2ff": "b9abea", "00584b": "005852", "4679b7": "5952a1", "525852": "6a5837", - "101010": "101010", - "c7c8cd": "c7c8cd", - "fcfcfc": "fcfcfc", "9e8f87": "ae8b50", "d1c8be": "d7c881", "003071": "2f104f", @@ -20,22 +16,16 @@ "00285c": "3b2948", "cac0cb": "c9c0d4", "83818f": "6f6982", - "6c6271": "68627a", - "3c3c3c": "3c3c3c", - "ffffff": "ffffff" + "6c6271": "68627a" }, "1": { "004037": "00124d", - "000000": "000000", "8cacdd": "41d5b3", "007766": "345ab5", "bbd2ff": "9dffff", "00584b": "183986", "4679b7": "00816c", "525852": "38255f", - "101010": "101010", - "c7c8cd": "c7c8cd", - "fcfcfc": "fcfcfc", "9e8f87": "927ec4", "d1c8be": "ba9ded", "003071": "014837", @@ -45,20 +35,16 @@ "00285c": "8d075a", "cac0cb": "6f8ec1", "83818f": "506698", - "6c6271": "35486b", - "3c3c3c": "3c3c3c", - "ffffff": "ffffff" + "6c6271": "35486b" }, "2": { "004037": "3c1522", - "000000": "000000", "8cacdd": "bc393b", "007766": "88253e", "bbd2ff": "f68c79", "00584b": "601b35", "4679b7": "780024", "525852": "181935", - "101010": "101010", "c7c8cd": "ccc5bb", "fcfcfc": "fefdeb", "9e8f87": "354d8a", @@ -71,7 +57,6 @@ "cac0cb": "3c2c2f", "83818f": "2b1b1e", "6c6271": "21161a", - "3c3c3c": "181935", - "ffffff": "ffffff" + "3c3c3c": "181935" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/898-shadow.json b/public/images/pokemon/variant/exp/back/898-shadow.json index 6b38f34ae6e..0a1856a466e 100644 --- a/public/images/pokemon/variant/exp/back/898-shadow.json +++ b/public/images/pokemon/variant/exp/back/898-shadow.json @@ -4,20 +4,13 @@ "007766": "00776f", "00584b": "005852", "525752": "6a5837", - "101010": "101010", - "c7c8cd": "c7c8cd", - "fbfbfb": "fbfbfb", - "3c3c3c": "3c3c3c", "525852": "5d5458", "9e8f87": "ae8b50", "d1c8be": "d7c881", "49478f": "894061", "7c5bcf": "d05a82", "00285c": "632741", - "d9a4e3": "d9a4e3", - "fcfcfc": "fcfcfc", "00285b": "3b2948", - "755179": "755179", "504e8e": "80447d", "8776e4": "b862b3" }, @@ -26,9 +19,6 @@ "007766": "345ab5", "00584b": "183986", "525752": "38255f", - "101010": "101010", - "c7c8cd": "c7c8cd", - "fbfbfb": "fbfbfb", "3c3c3c": "622d51", "525852": "904c75", "9e8f87": "927ec4", @@ -48,7 +38,6 @@ "007766": "88253e", "00584b": "601b35", "525752": "181935", - "101010": "101010", "c7c8cd": "ccc5bb", "fbfbfb": "fefdeb", "3c3c3c": "3a6965", diff --git a/public/images/pokemon/variant/exp/back/898.json b/public/images/pokemon/variant/exp/back/898.json index a669e986b97..5e979e6d5d5 100644 --- a/public/images/pokemon/variant/exp/back/898.json +++ b/public/images/pokemon/variant/exp/back/898.json @@ -7,8 +7,6 @@ "003a87": "71517a", "007766": "00776f", "615350": "6a5837", - "101010": "101010", - "fcfcfc": "fcfcfc", "c7c8cd": "ccc6d1", "9e8f87": "ae8b50", "797b8f": "8e778d", @@ -23,8 +21,6 @@ "003a87": "c64883", "007766": "345ab5", "615350": "38255f", - "101010": "101010", - "fcfcfc": "fcfcfc", "c7c8cd": "ccc6d1", "9e8f87": "927ec4", "797b8f": "ec6196", @@ -39,7 +35,6 @@ "003a87": "cc8c49", "007766": "88253e", "615350": "181935", - "101010": "101010", "fcfcfc": "fefdeb", "c7c8cd": "c4bdb3", "9e8f87": "354d8a", diff --git a/public/images/pokemon/variant/exp/back/900.json b/public/images/pokemon/variant/exp/back/900.json index 68558c7931b..835b578b32a 100644 --- a/public/images/pokemon/variant/exp/back/900.json +++ b/public/images/pokemon/variant/exp/back/900.json @@ -1,30 +1,14 @@ { "1": { - "080808": "080808", - "3a2e2f": "3a2e2f", - "6a5856": "6a5856", - "4d3d3e": "4d3d3e", - "96856d": "96856d", - "fcfcfc": "fcfcfc", - "2b1f22": "2b1f22", - "c8bdb7": "c8bdb7", "6b563a": "221a69", "af7845": "354da7", - "e2b561": "4b84d2", - "e3d1ae": "e3d1ae" + "e2b561": "4b84d2" }, "2": { - "080808": "080808", - "3a2e2f": "3a2e2f", "6a5856": "424242", "4d3d3e": "808080", - "96856d": "96856d", - "fcfcfc": "fcfcfc", - "2b1f22": "2b1f22", - "c8bdb7": "c8bdb7", "6b563a": "a54200", "af7845": "e68400", - "e2b561": "ffde00", - "e3d1ae": "e3d1ae" + "e2b561": "ffde00" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/901.json b/public/images/pokemon/variant/exp/back/901.json index da538225735..c3fc4fb00ed 100644 --- a/public/images/pokemon/variant/exp/back/901.json +++ b/public/images/pokemon/variant/exp/back/901.json @@ -1,24 +1,16 @@ { "1": { "382423": "1c2825", - "0f0f0f": "0f0f0f", "502f29": "273b32", "231a18": "0c1515", - "77655b": "77655b", - "9c8d86": "9c8d86", - "4b4236": "4b4236", "63443d": "31563f", "ca8b35": "c48e81", "fec643": "f7eee1", - "fcfcfc": "fcfcfc", "25521f": "557f24", - "fec672": "f2cab8", - "95908a": "95908a", - "b4b4b1": "b4b4b1" + "fec672": "f2cab8" }, "2": { "382423": "1e2249", - "0f0f0f": "0f0f0f", "502f29": "323760", "231a18": "111433", "77655b": "c199ae", @@ -27,10 +19,7 @@ "63443d": "46527a", "ca8b35": "437aff", "fec643": "bfeeff", - "fcfcfc": "fcfcfc", "25521f": "f83259", - "fec672": "96b7ff", - "95908a": "95908a", - "b4b4b1": "b4b4b1" + "fec672": "96b7ff" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/903.json b/public/images/pokemon/variant/exp/back/903.json index 3f39c155f99..4ea8aa57c42 100644 --- a/public/images/pokemon/variant/exp/back/903.json +++ b/public/images/pokemon/variant/exp/back/903.json @@ -4,13 +4,10 @@ "415b81": "3a0f0e", "533662": "136e81", "9ebade": "bd795f", - "0f110d": "0f110d", "718fbe": "9f4c3d", "8e2458": "12968b", "6a56b3": "722738", "36326d": "210609", - "f8feff": "f8feff", - "9b98a9": "9b98a9", "de2f41": "31dabb", "eb357c": "31dabb" }, @@ -19,7 +16,6 @@ "415b81": "152b2f", "533662": "982e33", "9ebade": "256258", - "0f110d": "0f110d", "718fbe": "194648", "8e2458": "cc5427", "6a56b3": "65b571", diff --git a/public/images/pokemon/variant/exp/back/909.json b/public/images/pokemon/variant/exp/back/909.json index 5b1be3cbddd..c12bbaf21db 100644 --- a/public/images/pokemon/variant/exp/back/909.json +++ b/public/images/pokemon/variant/exp/back/909.json @@ -9,12 +9,8 @@ "c3916e": "ade4e4", "dac0af": "a4ba9e", "ff512d": "366565", - "546978": "546978", "fafae2": "ffffff", - "ff817a": "448282", - "000000": "000000", - "3d505e": "3d505e", - "202d35": "202d35" + "ff817a": "448282" }, "2": { "cf5d1b": "2ce455", @@ -26,11 +22,7 @@ "c3916e": "33ff65", "dac0af": "82977c", "ff512d": "38583f", - "546978": "546978", "fafae2": "e5ffec", - "ff817a": "4a7854", - "000000": "000000", - "3d505e": "3d505e", - "202d35": "202d35" + "ff817a": "4a7854" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/911.json b/public/images/pokemon/variant/exp/back/911.json index 38cc5f228aa..b7147736a1f 100644 --- a/public/images/pokemon/variant/exp/back/911.json +++ b/public/images/pokemon/variant/exp/back/911.json @@ -4,51 +4,41 @@ "f45511": "91dada", "ee8b08": "81d5d5", "ffd017": "b4e6e6", - "5b5c5e": "5b5c5e", "fcfcfc": "cccccc", "9fa0a2": "758a70", - "333c36": "333c36", "ba3227": "234141", "741010": "152828", "ff4a3c": "366565", - "0f0f0f": "0f0f0f", "d20300": "3fbcbc", "595d5f": "5b5c5e", "f6520d": "91dada", "fafcf9": "cccccc", "ef8b06": "81d5d5", "ffd00b": "d3dfbe", - "343c38": "343c38", "9ca1a3": "758a70", "bc3126": "234141", "750d0d": "152828", - "ff4539": "366565", - "0e100c": "0e100c" + "ff4539": "366565" }, "2": { "d20000": "0ea631", "f45511": "2fe757", "ee8b08": "08e739", "ffd017": "4ffc75", - "5b5c5e": "5b5c5e", "fcfcfc": "e5ffec", "9fa0a2": "82977c", - "333c36": "333c36", "ba3227": "243929", "741010": "162319", "ff4a3c": "38583f", - "0f0f0f": "0f0f0f", "d20300": "0ea631", "595d5f": "5b5c5e", "f6520d": "2fe757", "fafcf9": "e5ffec", "ef8b06": "08e739", "ffd00b": "aaee60", - "343c38": "343c38", "9ca1a3": "82977c", "bc3126": "243929", "750d0d": "162319", - "ff4539": "38583f", - "0e100c": "0e100c" + "ff4539": "38583f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/912.json b/public/images/pokemon/variant/exp/back/912.json index fb1f20998dd..a0caf21d8c3 100644 --- a/public/images/pokemon/variant/exp/back/912.json +++ b/public/images/pokemon/variant/exp/back/912.json @@ -3,7 +3,6 @@ "1f5978": "8c3b14", "84d7ff": "f7ca7b", "2fbee8": "e69c51", - "060606": "060606", "3686b1": "d96536", "ffffff": "ffe3b0", "5a82a1": "975432", @@ -17,7 +16,6 @@ "1f5978": "0a3025", "84d7ff": "58d299", "2fbee8": "33b37e", - "060606": "060606", "3686b1": "1c7962", "ffffff": "6767e3", "5a82a1": "2d185d", diff --git a/public/images/pokemon/variant/exp/back/913.json b/public/images/pokemon/variant/exp/back/913.json index e7ab41d58fc..15de2b2502f 100644 --- a/public/images/pokemon/variant/exp/back/913.json +++ b/public/images/pokemon/variant/exp/back/913.json @@ -6,7 +6,6 @@ "13325e": "3f050e", "174b6a": "642b0f", "30b0ba": "f77122", - "0f0f0f": "0f0f0f", "916a44": "3b2e28", "ddc271": "5b5450", "d0c4d3": "d79f63", @@ -23,7 +22,6 @@ "13325e": "072a2b", "174b6a": "541222", "30b0ba": "a22f49", - "0f0f0f": "0f0f0f", "916a44": "4b251b", "ddc271": "c76740", "d0c4d3": "3b188e", diff --git a/public/images/pokemon/variant/exp/back/919.json b/public/images/pokemon/variant/exp/back/919.json index 69546ed1285..0f03b380dd2 100644 --- a/public/images/pokemon/variant/exp/back/919.json +++ b/public/images/pokemon/variant/exp/back/919.json @@ -4,7 +4,6 @@ "63738c": "4b453d", "798aa2": "6c655c", "4b5870": "302d27", - "121212": "121212", "41485b": "23211d", "dde1e4": "cec890", "c0bdc0": "a29d62", @@ -12,7 +11,6 @@ "7b8ca3": "6c655c", "b0acb0": "a29d62", "ffc608": "d02c35", - "0f0f0f": "0f0f0f", "a38215": "962038", "a49dac": "62654e" }, @@ -21,24 +19,16 @@ "63738c": "498f57", "798aa2": "70ba74", "4b5870": "295449", - "121212": "121212", "41485b": "1c3835", - "dde1e4": "dde1e4", - "c0bdc0": "c0bdc0", - "636164": "636164", "7b8ca3": "70ba74", - "b0acb0": "b0acb0", "ffc608": "c54d2d", - "0f0f0f": "0f0f0f", - "a38215": "7f223a", - "a49dac": "a49dac" + "a38215": "7f223a" }, "2": { "2f323c": "340f21", "63738c": "983444", "798aa2": "c74d51", "4b5870": "601c3a", - "121212": "121212", "41485b": "4b132c", "dde1e4": "444444", "c0bdc0": "444444", @@ -46,7 +36,6 @@ "7b8ca3": "c74d51", "b0acb0": "333333", "ffc608": "2977b6", - "0f0f0f": "0f0f0f", "a38215": "293c7d", "a49dac": "222222" } diff --git a/public/images/pokemon/variant/exp/back/920.json b/public/images/pokemon/variant/exp/back/920.json index 6056b008e28..ca8462bbed5 100644 --- a/public/images/pokemon/variant/exp/back/920.json +++ b/public/images/pokemon/variant/exp/back/920.json @@ -1,12 +1,8 @@ { "0": { "292829": "475316", - "0f0f0f": "0f0f0f", "505050": "dbcf15", "3c393c": "8e931a", - "e6ebef": "e6ebef", - "a59aa5": "a59aa5", - "ffffff": "ffffff", "6b6d6b": "f6ea5f", "607381": "444444", "424e59": "292929", @@ -17,12 +13,8 @@ }, "1": { "292829": "1e391b", - "0f0f0f": "0f0f0f", "505050": "529042", "3c393c": "34642c", - "e6ebef": "e6ebef", - "a59aa5": "a59aa5", - "ffffff": "ffffff", "6b6d6b": "6ea25e", "607381": "919191", "424e59": "676974", @@ -33,12 +25,8 @@ }, "2": { "292829": "47132c", - "0f0f0f": "0f0f0f", "505050": "b52828", "3c393c": "791b2d", - "e6ebef": "e6ebef", - "a59aa5": "a59aa5", - "ffffff": "ffffff", "6b6d6b": "df4747", "607381": "858585", "424e59": "525252", diff --git a/public/images/pokemon/variant/exp/back/932.json b/public/images/pokemon/variant/exp/back/932.json index 6c8cd5ccb66..d6ab4a139fd 100644 --- a/public/images/pokemon/variant/exp/back/932.json +++ b/public/images/pokemon/variant/exp/back/932.json @@ -2,7 +2,6 @@ "1": { "717171": "82556e", "ffffff": "f9c2cd", - "121212": "121212", "b4b4b4": "bc8296", "bc8c79": "deeaf3", "875651": "9ba7b0", @@ -13,7 +12,6 @@ "2": { "717171": "383744", "ffffff": "9ba0a0", - "121212": "121212", "b4b4b4": "63636d", "bc8c79": "7cbf7f", "875651": "618c56", diff --git a/public/images/pokemon/variant/exp/back/933.json b/public/images/pokemon/variant/exp/back/933.json index a233b6a1714..6ecaa101e74 100644 --- a/public/images/pokemon/variant/exp/back/933.json +++ b/public/images/pokemon/variant/exp/back/933.json @@ -1,8 +1,5 @@ { "1": { - "636363": "636363", - "121212": "121212", - "b4b4b4": "b4b4b4", "bc8c79": "bc8296", "8a7367": "bc8296", "e8c8b1": "f9c2cd", @@ -10,14 +7,12 @@ "c6876e": "f9c2cd", "875651": "bc8296", "613339": "6d7982", - "ffffff": "ffffff", "42161c": "3a464f", "8c6464": "d8e9f5", "704b50": "90a4b5" }, "2": { "636363": "444251", - "121212": "121212", "b4b4b4": "63636d", "bc8c79": "5d9157", "8a7367": "3d5e47", diff --git a/public/images/pokemon/variant/exp/back/934.json b/public/images/pokemon/variant/exp/back/934.json index e2806483f2d..0bae922f698 100644 --- a/public/images/pokemon/variant/exp/back/934.json +++ b/public/images/pokemon/variant/exp/back/934.json @@ -1,6 +1,5 @@ { "1": { - "121212": "121212", "636363": "77595f", "b4b4b4": "bc808c", "ffffff": "f9c2cd", @@ -14,7 +13,6 @@ "c6876e": "d8e9f5" }, "2": { - "121212": "121212", "636363": "444251", "b4b4b4": "6a6a72", "ffffff": "9ba0a0", diff --git a/public/images/pokemon/variant/exp/back/94-mega.json b/public/images/pokemon/variant/exp/back/94-mega.json index e6ff9747d89..2b070bd521c 100644 --- a/public/images/pokemon/variant/exp/back/94-mega.json +++ b/public/images/pokemon/variant/exp/back/94-mega.json @@ -1,6 +1,5 @@ { "0": { - "101010": "101010", "4d2a4d": "634b63", "503f73": "d1bcd6", "775499": "fcf4fc", @@ -11,18 +10,14 @@ "ff5991": "72e9f2" }, "1": { - "101010": "101010", "4d2a4d": "23131f", "503f73": "511e3b", "775499": "a44c73", "9469bf": "c56f8a", "453159": "3b132c", - "994c99": "994c99", - "cc47a0": "cc47a0", "ff5991": "c1ea61" }, "2": { - "101010": "101010", "4d2a4d": "1a1320", "503f73": "302433", "775499": "3f324a", diff --git a/public/images/pokemon/variant/exp/back/940.json b/public/images/pokemon/variant/exp/back/940.json index 313dbd273ec..c68f4dc3c10 100644 --- a/public/images/pokemon/variant/exp/back/940.json +++ b/public/images/pokemon/variant/exp/back/940.json @@ -2,11 +2,9 @@ "1": { "2f3135": "372b61", "3f424d": "4c4982", - "181a1b": "181a1b", "ffcd37": "7dffc0", "be8f29": "5dd9c8", "91a5c3": "e39fc5", - "f9f9f9": "f9f9f9", "73bbbf": "f7859b", "643c28": "433382", "c27741": "9a5fd9", @@ -17,11 +15,9 @@ "2": { "2f3135": "e099a5", "3f424d": "edc5c8", - "181a1b": "181a1b", "ffcd37": "d9647b", "be8f29": "b3466a", "91a5c3": "ba73b2", - "f9f9f9": "f9f9f9", "73bbbf": "ffcf4a", "643c28": "2b2745", "c27741": "57436e", diff --git a/public/images/pokemon/variant/exp/back/941.json b/public/images/pokemon/variant/exp/back/941.json index 63e5f56449e..5c0793b1eb9 100644 --- a/public/images/pokemon/variant/exp/back/941.json +++ b/public/images/pokemon/variant/exp/back/941.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "825d21": "217991", "34393f": "2b3863", "aa7e24": "3dd1cc", @@ -8,15 +7,11 @@ "26282c": "1f1d54", "6c7177": "354c70", "73bbbf": "de82ff", - "2b1717": "2b1717", "441e21": "d16492", "692a2f": "ff9ec6", - "0f0f0f": "0f0f0f", - "37415a": "55348a", - "1a1c1f": "1a1c1f" + "37415a": "55348a" }, "2": { - "000000": "000000", "825d21": "8a2f62", "34393f": "f7bebe", "aa7e24": "c44f6c", @@ -24,11 +19,8 @@ "26282c": "e394a7", "6c7177": "f7dfdc", "73bbbf": "ffcf4a", - "2b1717": "2b1717", "441e21": "51467a", "692a2f": "776294", - "0f0f0f": "0f0f0f", - "37415a": "55348a", - "1a1c1f": "1a1c1f" + "37415a": "55348a" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/948.json b/public/images/pokemon/variant/exp/back/948.json index 95469041f71..2e4bb9b06ff 100644 --- a/public/images/pokemon/variant/exp/back/948.json +++ b/public/images/pokemon/variant/exp/back/948.json @@ -6,7 +6,6 @@ "f2b69f": "6d6ba4", "976924": "a50927", "ffec37": "ff6237", - "000000": "000000", "eaba2b": "ce271a", "d2bbac": "e2bea6", "fef8f5": "fff4f1", @@ -19,7 +18,6 @@ "f2b69f": "ce4847", "976924": "254087", "ffec37": "4b86bd", - "000000": "000000", "eaba2b": "2e609b", "d2bbac": "d8bdab", "fef8f5": "ffede5", diff --git a/public/images/pokemon/variant/exp/back/949.json b/public/images/pokemon/variant/exp/back/949.json index d8ff34fee1d..15f4ccd2ce7 100644 --- a/public/images/pokemon/variant/exp/back/949.json +++ b/public/images/pokemon/variant/exp/back/949.json @@ -5,13 +5,10 @@ "86433c": "a50927", "ca7268": "d41929", "5f5f5f": "7462ad", - "000000": "000000", - "ffffff": "ffffff", "ede652": "1672a1", "d6938b": "ff4737", "e7bcb8": "ff9d6d", "cdae52": "0c4a83", - "101010": "101010", "c2ae83": "b29785", "94724b": "60473c", "936839": "042259" @@ -22,13 +19,10 @@ "86433c": "401e54", "ca7268": "613a8a", "5f5f5f": "c64d30", - "000000": "000000", - "ffffff": "ffffff", "ede652": "dd7731", "d6938b": "8e65c1", "e7bcb8": "dd9dff", "cdae52": "af3610", - "101010": "101010", "c2ae83": "d9b591", "94724b": "6f492c", "936839": "7e1200" diff --git a/public/images/pokemon/variant/exp/back/951.json b/public/images/pokemon/variant/exp/back/951.json index 3df07b717e6..ca8046b759b 100644 --- a/public/images/pokemon/variant/exp/back/951.json +++ b/public/images/pokemon/variant/exp/back/951.json @@ -6,10 +6,8 @@ "a6b496": "facf81", "3f9a5f": "be8a84", "2f683c": "9d6b5b", - "0f0f0f": "0f0f0f", "ff9115": "ffb676", "5c7c5c": "4c292f", - "2e302f": "2e302f", "79b97b": "704f4f" }, "2": { @@ -19,10 +17,8 @@ "a6b496": "fa95d1", "3f9a5f": "a78bdc", "2f683c": "7456a8", - "0f0f0f": "0f0f0f", "ff9115": "b6dfff", "5c7c5c": "8e7eb1", - "2e302f": "2e302f", "79b97b": "cfbfe6" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/952.json b/public/images/pokemon/variant/exp/back/952.json index 318dd900b93..ad9bc26b330 100644 --- a/public/images/pokemon/variant/exp/back/952.json +++ b/public/images/pokemon/variant/exp/back/952.json @@ -8,7 +8,6 @@ "3f8147": "627bcd", "69ab7b": "c4a4eb", "42804b": "9884d3", - "0f0f0f": "0f0f0f", "262826": "7a6597", "476b51": "f8f3fe", "3c5042": "cfbfe6", diff --git a/public/images/pokemon/variant/exp/back/953.json b/public/images/pokemon/variant/exp/back/953.json index 6c48dfa65f5..6f2c1602306 100644 --- a/public/images/pokemon/variant/exp/back/953.json +++ b/public/images/pokemon/variant/exp/back/953.json @@ -7,7 +7,6 @@ "575244": "18734a", "777463": "199e46", "f38725": "2e8c19", - "000000": "000000", "c5b4aa": "d3e6e6", "a28e86": "c1d8db", "b96c26": "2f7410" @@ -20,7 +19,6 @@ "575244": "5e2d72", "777463": "8358a1", "f38725": "4baecd", - "000000": "000000", "c5b4aa": "39cfbc", "a28e86": "52b0b0", "b96c26": "4792bd" diff --git a/public/images/pokemon/variant/exp/back/954.json b/public/images/pokemon/variant/exp/back/954.json index 56ad50388fd..2f20c5353e4 100644 --- a/public/images/pokemon/variant/exp/back/954.json +++ b/public/images/pokemon/variant/exp/back/954.json @@ -3,7 +3,6 @@ "6f0c76": "4b5173", "e11bff": "e1efff", "aa13b7": "a0a9da", - "000000": "000000", "91263f": "87ceeb", "ce2d6b": "fffd91", "ff4c90": "ffbc00", @@ -19,7 +18,6 @@ "6f0c76": "3e091a", "e11bff": "9b2217", "aa13b7": "6b1111", - "000000": "000000", "91263f": "c85712", "ce2d6b": "ded051", "ff4c90": "141031", diff --git a/public/images/pokemon/variant/exp/back/957.json b/public/images/pokemon/variant/exp/back/957.json index 53a80212ecc..e981138afcd 100644 --- a/public/images/pokemon/variant/exp/back/957.json +++ b/public/images/pokemon/variant/exp/back/957.json @@ -2,10 +2,8 @@ "0": { "7c5569": "91707b", "f0cfe0": "f2d5cb", - "000000": "000000", "ccb2bf": "cf9faf", "af4c7e": "993868", - "661e42": "661e42", "a87b92": "ef7787", "cc9bb4": "ff9ba0", "de589c": "c65f7e", @@ -17,22 +15,16 @@ "1": { "7c5569": "8598ad", "f0cfe0": "fef8e6", - "000000": "000000", "ccb2bf": "aecdcf", "af4c7e": "ee8363", "661e42": "7f3435", "a87b92": "ffb47f", "cc9bb4": "ffd8ad", - "de589c": "f3ad79", - "717278": "717278", - "3d3f45": "3d3f45", - "8e90a0": "8e90a0", - "a7a8b6": "a7a8b6" + "de589c": "f3ad79" }, "2": { "7c5569": "7d7baf", "f0cfe0": "f3e0ff", - "000000": "000000", "ccb2bf": "c0b3e2", "af4c7e": "44306b", "661e42": "201a3d", diff --git a/public/images/pokemon/variant/exp/back/958.json b/public/images/pokemon/variant/exp/back/958.json index d2a699390b1..12cfbea3b4c 100644 --- a/public/images/pokemon/variant/exp/back/958.json +++ b/public/images/pokemon/variant/exp/back/958.json @@ -1,33 +1,26 @@ { "0": { "62575b": "91707b", - "000000": "000000", "d3c5c9": "f2d5cb", "a89a9e": "ddaaaf", "e998b3": "ff9ba0", - "f0f0f0": "f0f0f0", "d95782": "c65f7e", "752842": "63203b", "31273a": "3f2319", - "ab7788": "ab7788", "786987": "8b5745", "9f8faf": "cb836c", "b33b63": "993868", - "db7c9c": "db7c9c", "6b5283": "6a3443", "50405f": "532835" }, "1": { "62575b": "6f848e", - "000000": "000000", "d3c5c9": "fef8e6", "a89a9e": "aecdcf", "e998b3": "f6c58d", - "f0f0f0": "f0f0f0", "d95782": "f3ad79", "752842": "a54344", "31273a": "3f2319", - "ab7788": "ab7788", "786987": "834436", "9f8faf": "bf7754", "b33b63": "ee8363", @@ -37,15 +30,12 @@ }, "2": { "62575b": "6e628c", - "000000": "000000", "d3c5c9": "f3e0ff", "a89a9e": "c0b3e2", "e998b3": "a074b0", - "f0f0f0": "f0f0f0", "d95782": "7a4889", "752842": "201a3d", "31273a": "1e1d30", - "ab7788": "ab7788", "786987": "353549", "9f8faf": "5b5a68", "b33b63": "44306b", diff --git a/public/images/pokemon/variant/exp/back/959.json b/public/images/pokemon/variant/exp/back/959.json index c91083ed06b..be68144ff1b 100644 --- a/public/images/pokemon/variant/exp/back/959.json +++ b/public/images/pokemon/variant/exp/back/959.json @@ -2,7 +2,6 @@ "0": { "664636": "665b52", "e2c793": "e0c9b8", - "000000": "000000", "aa855d": "a58678", "352245": "592740", "4e3662": "77394b", @@ -21,14 +20,12 @@ "1": { "664636": "535d6c", "e2c793": "aeced0", - "000000": "000000", "aa855d": "80959f", "352245": "19374a", "4e3662": "377377", "543f57": "281738", "a593a8": "bf7754", "836b87": "834436", - "5f203f": "5f203f", "d08fae": "f6c58d", "deccd5": "fef8e6", "87757e": "80959f", @@ -40,7 +37,6 @@ "2": { "664636": "685952", "e2c793": "e7dac2", - "000000": "000000", "aa855d": "ad9c8a", "352245": "6a6e77", "4e3662": "aebab6", diff --git a/public/images/pokemon/variant/exp/back/962.json b/public/images/pokemon/variant/exp/back/962.json index 118a0f26768..b6017f80905 100644 --- a/public/images/pokemon/variant/exp/back/962.json +++ b/public/images/pokemon/variant/exp/back/962.json @@ -1,6 +1,5 @@ { "0": { - "0f0f0f": "0f0f0f", "342930": "3e1d26", "4a3942": "60354a", "efe3e1": "f6cbc4", @@ -15,7 +14,6 @@ "a7aba7": "ddcac6" }, "1": { - "0f0f0f": "0f0f0f", "342930": "142e22", "4a3942": "273c31", "efe3e1": "e8e8c0", @@ -31,7 +29,6 @@ }, "2": { "342930": "754156", - "0f0f0f": "0f0f0f", "4a3942": "a5777f", "937d85": "2f2655", "b9aaaf": "453863", @@ -44,4 +41,4 @@ "501d25": "545151", "7b827b": "a96c4b" } -} +} \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/967.json b/public/images/pokemon/variant/exp/back/967.json index fc531f0de5a..77509a9f98b 100644 --- a/public/images/pokemon/variant/exp/back/967.json +++ b/public/images/pokemon/variant/exp/back/967.json @@ -1,22 +1,15 @@ { "1": { "384a35": "464354", - "0f0f0f": "0f0f0f", "54654e": "67637a", - "b9b7b3": "b9b7b3", - "4b565c": "4b565c", "1c2916": "272431", "f16b32": "bead9d", "34453d": "444a71", "75b07d": "9299c7", - "607d6d": "6e76a9", - "222328": "222328", - "323943": "323943", - "e2e9d7": "e2e9d7" + "607d6d": "6e76a9" }, "2": { "384a35": "5d0c0c", - "0f0f0f": "0f0f0f", "54654e": "942d22", "b9b7b3": "c0ab8b", "4b565c": "815652", diff --git a/public/images/pokemon/variant/exp/back/969.json b/public/images/pokemon/variant/exp/back/969.json index 3f057cf6603..8fe11376246 100644 --- a/public/images/pokemon/variant/exp/back/969.json +++ b/public/images/pokemon/variant/exp/back/969.json @@ -9,7 +9,6 @@ "72fec4": "fbce5d", "5fe3ac": "fbce5d", "41968b": "c57833", - "0f0f0f": "0f0f0f", "453b4d": "2c445a", "635181": "527492", "8475a7": "80aec5", @@ -26,7 +25,6 @@ "72fec4": "df543b", "5fe3ac": "df543b", "41968b": "a51414", - "0f0f0f": "0f0f0f", "453b4d": "0d240f", "635181": "193a1c", "8475a7": "1e5c17", diff --git a/public/images/pokemon/variant/exp/back/970.json b/public/images/pokemon/variant/exp/back/970.json index cc48d2a3f3c..c416ac68851 100644 --- a/public/images/pokemon/variant/exp/back/970.json +++ b/public/images/pokemon/variant/exp/back/970.json @@ -1,6 +1,5 @@ { "1": { - "242737": "242737", "366956": "521d0c", "41968b": "c57833", "5de0aa": "fbce5d", diff --git a/public/images/pokemon/variant/exp/back/973.json b/public/images/pokemon/variant/exp/back/973.json index 267a690cc0b..8efb12eb1aa 100644 --- a/public/images/pokemon/variant/exp/back/973.json +++ b/public/images/pokemon/variant/exp/back/973.json @@ -1,44 +1,26 @@ { "0": { "811f47": "60484a", - "211f28": "211f28", "d43e7c": "988282", "3c3946": "404355", - "2c2936": "2c2936", - "ffffff": "ffffff", "760c38": "7c6364", - "000000": "000000", "ff79b1": "cfbbbc", - "9c174e": "60484a", - "3d3b4e": "3d3b4e", - "c4c1dc": "c4c1dc" + "9c174e": "60484a" }, "1": { "811f47": "430855", - "211f28": "211f28", "d43e7c": "911b92", - "3c3946": "3c3946", - "2c2936": "2c2936", - "ffffff": "ffffff", "760c38": "660f71", - "000000": "000000", "ff79b1": "cb36b9", - "9c174e": "3f0747", - "3d3b4e": "3d3b4e", - "c4c1dc": "c4c1dc" + "9c174e": "3f0747" }, "2": { "811f47": "943615", - "211f28": "211f28", "d43e7c": "d77433", - "3c3946": "3c3946", - "2c2936": "2c2936", "ffffff": "fbf2f4", "760c38": "17167d", - "000000": "000000", "ff79b1": "fabe7d", "9c174e": "2c3ca6", - "3d3b4e": "3d3b4e", "c4c1dc": "978f97" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/974.json b/public/images/pokemon/variant/exp/back/974.json index e6ba5dff1b0..12838b0ecb1 100644 --- a/public/images/pokemon/variant/exp/back/974.json +++ b/public/images/pokemon/variant/exp/back/974.json @@ -3,7 +3,6 @@ "736875": "8c2727", "524951": "661427", "efefef": "ffcc9e", - "0f0f0f": "0f0f0f", "bebaba": "ee9065", "a29793": "c85442", "a44667": "2c7193", @@ -13,7 +12,6 @@ "736875": "1f355e", "524951": "172651", "efefef": "438aa0", - "0f0f0f": "0f0f0f", "bebaba": "2a607f", "a29793": "1c426b", "a44667": "ae664a", diff --git a/public/images/pokemon/variant/exp/back/975.json b/public/images/pokemon/variant/exp/back/975.json index f5ab4ec8a40..aeba260e6cc 100644 --- a/public/images/pokemon/variant/exp/back/975.json +++ b/public/images/pokemon/variant/exp/back/975.json @@ -1,6 +1,5 @@ { "1": { - "000000": "000000", "f7f6f2": "ffcc9e", "c8c4c4": "ee9065", "a44667": "2c7193", @@ -8,7 +7,6 @@ "f493c9": "71e2d3" }, "2": { - "000000": "000000", "f7f6f2": "357489", "c8c4c4": "265777", "a44667": "ae664a", diff --git a/public/images/pokemon/variant/exp/back/978-stretchy.json b/public/images/pokemon/variant/exp/back/978-stretchy.json index d6153da59df..e9acee1c06e 100644 --- a/public/images/pokemon/variant/exp/back/978-stretchy.json +++ b/public/images/pokemon/variant/exp/back/978-stretchy.json @@ -6,7 +6,6 @@ "ce9b24": "485084", "feca2e": "a3a3a3", "ffcf2d": "c1c1c1", - "0f0f0f": "0f0f0f", "adafb8": "dace8e", "626471": "bca353", "fcfcfc": "faf2c4" @@ -18,7 +17,6 @@ "ce9b24": "273f08", "feca2e": "d8d0ad", "ffcf2d": "afa680", - "0f0f0f": "0f0f0f", "adafb8": "91734f", "626471": "604a30", "fcfcfc": "bc996e" diff --git a/public/images/pokemon/variant/exp/back/979.json b/public/images/pokemon/variant/exp/back/979.json index 11de43288e2..4ebcddf7e1c 100644 --- a/public/images/pokemon/variant/exp/back/979.json +++ b/public/images/pokemon/variant/exp/back/979.json @@ -3,21 +3,17 @@ "7b7786": "706394", "c0c1c8": "bbb3d6", "fafafc": "ddd2ff", - "111111": "111111", "a5a6b2": "ada2cd", "8f8d9c": "867ba4", "474958": "38496a", "555c69": "3f5275", "55525c": "625583", - "323132": "323132", - "5d6976": "4d6289", - "464546": "464546" + "5d6976": "4d6289" }, "1": { "7b7786": "c88945", "c0c1c8": "ebd494", "fafafc": "f9e9bd", - "111111": "111111", "a5a6b2": "ddbf6b", "8f8d9c": "d2a357", "474958": "3a302e", @@ -31,7 +27,6 @@ "7b7786": "b12009", "c0c1c8": "f26a3c", "fafafc": "ffa050", - "111111": "111111", "a5a6b2": "f26a3c", "8f8d9c": "d22c10", "474958": "313930", diff --git a/public/images/pokemon/variant/exp/back/981.json b/public/images/pokemon/variant/exp/back/981.json index 30098b9de2d..07d72c394c3 100644 --- a/public/images/pokemon/variant/exp/back/981.json +++ b/public/images/pokemon/variant/exp/back/981.json @@ -1,6 +1,5 @@ { "1": { - "0f0f0f": "0f0f0f", "43341e": "112246", "36383d": "503a2d", "6f5431": "1f4062", @@ -10,11 +9,9 @@ "b4ff68": "ff8f00", "fff42f": "c29925", "6aad21": "dec93d", - "fcfcfc": "fcfcfc", "deb43d": "dec93d", "3d680f": "be6b02", "775c10": "774f10", - "a8abb3": "a8abb3", "513c21": "430b0f", "b1a75c": "7e262d", "fdec8a": "9c3e3e", @@ -27,7 +24,6 @@ "f18d4e": "d8d1ad" }, "2": { - "0f0f0f": "0f0f0f", "43341e": "52ab5f", "36383d": "792e51", "6f5431": "a8e781", @@ -37,11 +33,9 @@ "b4ff68": "dc7346", "fff42f": "ed9233", "6aad21": "d8975d", - "fcfcfc": "fcfcfc", "deb43d": "ebbb72", "3d680f": "953c2f", "775c10": "b35127", - "a8abb3": "a8abb3", "513c21": "1a456c", "b1a75c": "1e7884", "fdec8a": "2a9d8f", diff --git a/public/images/pokemon/variant/exp/back/982-three-segment.json b/public/images/pokemon/variant/exp/back/982-three-segment.json index 967f4a6f4b9..06674c4373c 100644 --- a/public/images/pokemon/variant/exp/back/982-three-segment.json +++ b/public/images/pokemon/variant/exp/back/982-three-segment.json @@ -2,9 +2,7 @@ "1": { "735a41": "53575a", "f6e67b": "f6ffff", - "101010": "101010", "debd39": "aeaeae", - "f6ffff": "f6ffff", "318ba4": "4a6165", "6abdcd": "748da4", "206a83": "2a413f", @@ -16,7 +14,6 @@ "2": { "735a41": "462a3e", "f6e67b": "db4069", - "101010": "101010", "debd39": "a12e55", "f6ffff": "fdffdc", "318ba4": "38a8a6", diff --git a/public/images/pokemon/variant/exp/back/982.json b/public/images/pokemon/variant/exp/back/982.json index fa60db57a7d..330ab0a19a8 100644 --- a/public/images/pokemon/variant/exp/back/982.json +++ b/public/images/pokemon/variant/exp/back/982.json @@ -1,7 +1,5 @@ { "1": { - "101010": "101010", - "f6ffff": "f6ffff", "735a41": "53575a", "f6e67b": "ececec", "debd39": "aeaeae", @@ -14,14 +12,11 @@ "bd8b20": "757575" }, "2": { - "101010": "101010", "f6ffff": "fdffdc", "735a41": "692342", "f6e67b": "db4069", "debd39": "a12e55", - "318ba4": "318ba4", "6abdcd": "73d7d5", - "206a83": "206a83", "c1d1e9": "f4ce91", "fff6c5": "e97798", "5a6273": "5c4a4d", diff --git a/public/images/pokemon/variant/exp/back/987.json b/public/images/pokemon/variant/exp/back/987.json index 5fb59f6979d..9eae5ff8fb1 100644 --- a/public/images/pokemon/variant/exp/back/987.json +++ b/public/images/pokemon/variant/exp/back/987.json @@ -5,7 +5,6 @@ "182941": "132443", "4a83a4": "387fa7", "b36cc1": "d3941a", - "0f0f0f": "0f0f0f", "314a62": "244260", "621841": "71370f", "548e88": "2d60bb", @@ -18,7 +17,6 @@ "182941": "244358", "4a83a4": "a1c8db", "b36cc1": "1dbdb9", - "0f0f0f": "0f0f0f", "314a62": "7396b4", "621841": "7b3c08", "548e88": "a9c0c6", @@ -31,7 +29,6 @@ "182941": "603305", "4a83a4": "e6aa47", "b36cc1": "eece8c", - "0f0f0f": "0f0f0f", "314a62": "b56f2a", "621841": "5a0a05", "548e88": "e0b544", diff --git a/public/images/pokemon/variant/exp/back/988.json b/public/images/pokemon/variant/exp/back/988.json index ca3aa11cfdc..8cae6902168 100644 --- a/public/images/pokemon/variant/exp/back/988.json +++ b/public/images/pokemon/variant/exp/back/988.json @@ -4,14 +4,10 @@ "7b2000": "0b334c", "d8a33f": "56e4ba", "ed7e3d": "28d7bd", - "181820": "181820", "efd165": "66e9c2", "d1fd77": "e2fd77", "7dc536": "d7d346", "f04137": "17b79f", - "35384f": "35384f", - "f1f7f7": "f1f7f7", - "465175": "465175", "a9a9ab": "92c9b9", "359f8f": "23838b" }, @@ -20,13 +16,11 @@ "7b2000": "3d1759", "d8a33f": "9d46a1", "ed7e3d": "b258c9", - "181820": "181820", "efd165": "c273e0", "d1fd77": "71d1fb", "7dc536": "38b9e0", "f04137": "9439c5", "35384f": "123755", - "f1f7f7": "f1f7f7", "465175": "1b233f", "a9a9ab": "8fb8c9", "359f8f": "154e67" diff --git a/public/images/pokemon/variant/exp/back/993.json b/public/images/pokemon/variant/exp/back/993.json index 981f6cf7c61..41f7f39348f 100644 --- a/public/images/pokemon/variant/exp/back/993.json +++ b/public/images/pokemon/variant/exp/back/993.json @@ -2,7 +2,6 @@ "1": { "282828": "292109", "7a787a": "f8f5e2", - "0f0f0f": "0f0f0f", "463741": "754711", "4f4d51": "c59b4b", "4a424a": "533310", @@ -11,14 +10,12 @@ "3a75e6": "543280", "952b7d": "585a5c", "ff4dcb": "b7c6d6", - "fcfcfc": "fcfcfc", "172e57": "160832", "749eed": "b98bd6" }, "2": { "282828": "172220", "7a787a": "a4bfbe", - "0f0f0f": "0f0f0f", "463741": "2a505a", "4f4d51": "467678", "4a424a": "24323e", @@ -27,7 +24,6 @@ "3a75e6": "983b5c", "952b7d": "873954", "ff4dcb": "e3bbd3", - "fcfcfc": "fcfcfc", "172e57": "470e2c", "749eed": "f17ea6" } diff --git a/public/images/pokemon/variant/exp/back/994.json b/public/images/pokemon/variant/exp/back/994.json index 93e19242de6..23be955a78d 100644 --- a/public/images/pokemon/variant/exp/back/994.json +++ b/public/images/pokemon/variant/exp/back/994.json @@ -6,13 +6,11 @@ "f29e42": "00f02c", "fac375": "8bffa0", "626262": "696983", - "090913": "090913", "6a0305": "ae7a24", "dd393e": "fdc263", "a91215": "d79a38", "979797": "9b9bb6", "dddcde": "d9d9ea", - "292933": "292933", "6a8997": "867bc8", "30445a": "3f357c", "96cfd7": "b0a4f8", @@ -24,17 +22,12 @@ "f2dd46": "6bffc9", "f29e42": "00bfe1", "fac375": "a8fbff", - "626262": "626262", - "090913": "090913", "6a0305": "6e2140", "dd393e": "ff5e5e", "a91215": "e72158", - "979797": "979797", "dddcde": "e9dac7", - "292933": "292933", "6a8997": "ff926c", "30445a": "664338", - "96cfd7": "ffc28c", - "fac173": "fac173" + "96cfd7": "ffc28c" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/995.json b/public/images/pokemon/variant/exp/back/995.json index d758c3adfeb..f65c77b5698 100644 --- a/public/images/pokemon/variant/exp/back/995.json +++ b/public/images/pokemon/variant/exp/back/995.json @@ -1,34 +1,22 @@ { "1": { "384800": "4f4528", - "101010": "101010", "687828": "7b6a31", "789828": "8d7f54", "a0d048": "ddcb86", "48b090": "9d3eb9", "78d8a8": "ca72e4", "c8e850": "f6eebd", - "188050": "6a267e", - "202020": "202020", - "fffbff": "fffbff", - "383030": "383030", - "2a2c2e": "2a2c2e", - "504848": "504848" + "188050": "6a267e" }, "2": { "384800": "26292b", - "101010": "101010", "687828": "383c40", "789828": "464b51", "a0d048": "6b737b", "48b090": "9a1f2c", "78d8a8": "d53143", "c8e850": "949ca5", - "188050": "740c18", - "202020": "202020", - "fffbff": "fffbff", - "383030": "383030", - "2a2c2e": "2a2c2e", - "504848": "504848" + "188050": "740c18" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/996.json b/public/images/pokemon/variant/exp/back/996.json index 2891143402e..972620eab18 100644 --- a/public/images/pokemon/variant/exp/back/996.json +++ b/public/images/pokemon/variant/exp/back/996.json @@ -1,6 +1,5 @@ { "1": { - "020202": "020202", "5f5f64": "181f1f", "9ea7af": "293b39", "bec3c7": "325747", @@ -17,7 +16,6 @@ "ffe000": "c5a64d" }, "2": { - "020202": "020202", "5f5f64": "2f2c38", "9ea7af": "ceccef", "bec3c7": "e6e6eb", @@ -25,9 +23,6 @@ "314a5d": "524f60", "c4e9eb": "fcb925", "968201": "2a3064", - "e3e3e3": "e3e3e3", - "bcb7bc": "bcb7bc", - "a39ca1": "a39ca1", "96abac": "ca6d2a", "aecacb": "e38f21", "cab300": "1f46c4", diff --git a/public/images/pokemon/variant/exp/back/997.json b/public/images/pokemon/variant/exp/back/997.json index 40277967be5..965400e70f1 100644 --- a/public/images/pokemon/variant/exp/back/997.json +++ b/public/images/pokemon/variant/exp/back/997.json @@ -1,6 +1,5 @@ { "1": { - "020202": "020202", "516373": "5a3b36", "caefef": "b7926b", "3f6176": "1e2c2f", @@ -15,7 +14,6 @@ "cf9100": "9f7b3e" }, "2": { - "020202": "020202", "516373": "79452f", "caefef": "fcb925", "3f6176": "524f60", @@ -25,8 +23,6 @@ "7b9fb1": "e6e6eb", "4a6b7e": "8a82aa", "ba9e03": "ab324c", - "ffe100": "ff6767", - "feb701": "feb701", - "cf9100": "cf9100" + "ffe100": "ff6767" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/998.json b/public/images/pokemon/variant/exp/back/998.json index 0d4dd6e5dca..841925b0def 100644 --- a/public/images/pokemon/variant/exp/back/998.json +++ b/public/images/pokemon/variant/exp/back/998.json @@ -3,14 +3,12 @@ "5b879b": "5a3b36", "eaf9f9": "e1d4be", "1f3241": "1b2525", - "020202": "020202", "caefef": "b7926b", "416075": "305444", "afc0c7": "8f6049", "314a5d": "293b39", "ffe100": "30d1ff", "837d34": "3b69d3", - "272427": "272427", "bf373e": "c5a64d", "9b2930": "705c39", "8fa7b1": "835344" @@ -19,7 +17,6 @@ "5b879b": "79452f", "eaf9f9": "fff8d3", "1f3241": "524f60", - "020202": "020202", "caefef": "fcb925", "416075": "e6e6eb", "afc0c7": "d3772c", diff --git a/public/images/pokemon/variant/exp/back/999.json b/public/images/pokemon/variant/exp/back/999.json index 6850cf8a578..f5e1913e195 100644 --- a/public/images/pokemon/variant/exp/back/999.json +++ b/public/images/pokemon/variant/exp/back/999.json @@ -3,7 +3,6 @@ "4f4333": "38001c", "ddc126": "d52d70", "836c54": "760040", - "0f0f0f": "0f0f0f", "323437": "142552", "783a52": "492118", "545b6b": "1e2e60", @@ -18,30 +17,24 @@ "4f4333": "131c3b", "ddc126": "65768c", "836c54": "29354e", - "0f0f0f": "0f0f0f", "323437": "1d2c54", "783a52": "4f2e5c", "545b6b": "415073", "ac4454": "794e83", "bfa33e": "485466", - "7a82a9": "7a82a9", "745527": "131c3b", - "a59227": "9c9cbe", - "bac4d8": "bac4d8" + "a59227": "9c9cbe" }, "2": { "4f4333": "0c1b40", "ddc126": "326191", "836c54": "152848", - "0f0f0f": "0f0f0f", "323437": "212857", "783a52": "6d6594", "545b6b": "6467a8", "ac4454": "bcb9d6", "bfa33e": "294f7e", - "7a82a9": "7a82a9", "745527": "0c1b40", - "a59227": "b6d0d7", - "bac4d8": "bac4d8" + "a59227": "b6d0d7" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/back/female/6215.json b/public/images/pokemon/variant/exp/back/female/6215.json index a66e3780d12..a0485ed67c5 100644 --- a/public/images/pokemon/variant/exp/back/female/6215.json +++ b/public/images/pokemon/variant/exp/back/female/6215.json @@ -6,12 +6,9 @@ "956cbe": "31dabb", "514a80": "402010", "dcdbf7": "d0b3a4", - "080808": "080808", "28234b": "220d0a", "7d6ca4": "672e26", "584d80": "401914", - "f6f6ff": "f6f6ff", - "bdbdc5": "bdbdc5", "c52973": "ea903f" }, "2": { @@ -21,12 +18,9 @@ "956cbe": "cc5427", "514a80": "14273a", "dcdbf7": "60ae7e", - "080808": "080808", "28234b": "0a191e", "7d6ca4": "395962", "584d80": "1c3942", - "f6f6ff": "f6f6ff", - "bdbdc5": "bdbdc5", "c52973": "f49633" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/exp/female/6215.json b/public/images/pokemon/variant/exp/female/6215.json index 3198424563b..56ee351cd66 100644 --- a/public/images/pokemon/variant/exp/female/6215.json +++ b/public/images/pokemon/variant/exp/female/6215.json @@ -1,7 +1,6 @@ { "1": { "503678": "0f5d6d", - "080808": "080808", "514a80": "402010", "956cbe": "31dabb", "9c9bce": "ae8976", @@ -12,14 +11,10 @@ "ffde7b": "a7a7a7", "584d80": "562627", "28234b": "220d0a", - "c52973": "ea903f", - "bdbdc5": "bdbdc5", - "f6f6ff": "f6f6ff", - "000000": "000000" + "c52973": "ea903f" }, "2": { "503678": "601522", - "080808": "080808", "514a80": "14273a", "956cbe": "cc5427", "9c9bce": "3c8775", @@ -30,9 +25,6 @@ "ffde7b": "ffe07e", "584d80": "1c3942", "28234b": "0a191e", - "c52973": "f49633", - "bdbdc5": "bdbdc5", - "f6f6ff": "f6f6ff", - "000000": "000000" + "c52973": "f49633" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/111.json b/public/images/pokemon/variant/female/111.json index 3a43aa13e15..b13dc177767 100644 --- a/public/images/pokemon/variant/female/111.json +++ b/public/images/pokemon/variant/female/111.json @@ -1,22 +1,16 @@ { "1": { "5a5a7b": "241e2f", - "101010": "101010", "bdbdce": "6a547a", "e6e6ef": "9781ab", "8484ad": "402f51", - "3a3a52": "261e2d", - "ffffff": "ffffff", - "ad3a29": "ad3a29" + "3a3a52": "261e2d" }, "2": { "5a5a7b": "ab4355", - "101010": "101010", "bdbdce": "e18db3", "e6e6ef": "f7b4d1", "8484ad": "d76688", - "3a3a52": "6d2935", - "ffffff": "ffffff", - "ad3a29": "ad3a29" + "3a3a52": "6d2935" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/112.json b/public/images/pokemon/variant/female/112.json index 1c668cf5aa7..427afde596d 100644 --- a/public/images/pokemon/variant/female/112.json +++ b/public/images/pokemon/variant/female/112.json @@ -1,32 +1,22 @@ { "1": { "8c8c94": "523c5c", - "101010": "101010", "c5c5bd": "6a547a", "52525a": "3c2945", "e6e6de": "9781ab", "735a31": "6b6373", "ffefc5": "cecede", "b5a573": "948cad", - "ffffff": "ffffff", - "a53110": "a53110", - "e6523a": "e6523a", - "e6d6ad": "cecede", - "732110": "732110" + "e6d6ad": "cecede" }, "2": { "8c8c94": "ab3f5c", - "101010": "101010", "c5c5bd": "cb568a", "52525a": "642224", "e6e6de": "ef86b5", "735a31": "6d586d", "ffefc5": "dacad3", "b5a573": "be9bb6", - "ffffff": "ffffff", - "a53110": "a53110", - "e6523a": "e6523a", - "e6d6ad": "dacad3", - "732110": "732110" + "e6d6ad": "dacad3" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/118.json b/public/images/pokemon/variant/female/118.json index ba5a9377fdb..ca5c26c3671 100644 --- a/public/images/pokemon/variant/female/118.json +++ b/public/images/pokemon/variant/female/118.json @@ -2,7 +2,6 @@ "1": { "52525a": "5b3856", "ffffff": "fff9fc", - "101010": "101010", "8c8c94": "7c4b71", "d6d6de": "bf8cb0", "efefef": "e8c3d9", @@ -19,7 +18,6 @@ "2": { "52525a": "2e5453", "ffffff": "f0fff8", - "101010": "101010", "8c8c94": "4c867a", "d6d6de": "9cd8c4", "efefef": "c3f0dd", diff --git a/public/images/pokemon/variant/female/119.json b/public/images/pokemon/variant/female/119.json index b825cb25034..ab80dbccad5 100644 --- a/public/images/pokemon/variant/female/119.json +++ b/public/images/pokemon/variant/female/119.json @@ -5,8 +5,6 @@ "dedee6": "eac5df", "5a5a63": "482b46", "52525a": "49215e", - "cec5c5": "cec5c5", - "101010": "101010", "943119": "471d64", "e67342": "b169c0", "f79463": "d089d6", @@ -22,8 +20,6 @@ "dedee6": "bae6f4", "5a5a63": "3c6189", "52525a": "20355a", - "cec5c5": "cec5c5", - "101010": "101010", "943119": "0e285a", "e67342": "387db1", "f79463": "56aacb", diff --git a/public/images/pokemon/variant/female/123.json b/public/images/pokemon/variant/female/123.json index 5fbefd72224..0b21a71af27 100644 --- a/public/images/pokemon/variant/female/123.json +++ b/public/images/pokemon/variant/female/123.json @@ -2,43 +2,23 @@ "0": { "425a21": "632929", "bde673": "f76b6b", - "101010": "101010", "9c8c31": "9494a5", "fff7d6": "ffffff", "8cce73": "d63a3a", "e6d6ad": "b5b5ce", - "5a9c4a": "a52929", - "ffffff": "ffffff", - "dedede": "dedede", - "bdbdbd": "bdbdbd", - "737373": "737373" + "5a9c4a": "a52929" }, "1": { "425a21": "484e75", "bde673": "7c9ac5", - "101010": "101010", - "9c8c31": "9c8c31", - "fff7d6": "fff7d6", "8cce73": "92b0db", - "e6d6ad": "e6d6ad", - "5a9c4a": "7b94d6", - "ffffff": "ffffff", - "dedede": "dedede", - "bdbdbd": "bdbdbd", - "737373": "737373" + "5a9c4a": "7b94d6" }, "2": { "425a21": "8f3907", "bde673": "f8f581", - "101010": "101010", - "9c8c31": "9c8c31", - "fff7d6": "fff7d6", "8cce73": "f0c947", - "e6d6ad": "e6d6ad", "5a9c4a": "e6a027", - "ffffff": "ffffff", - "dedede": "f0c947", - "bdbdbd": "bdbdbd", - "737373": "737373" + "dedede": "f0c947" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/129.json b/public/images/pokemon/variant/female/129.json index 0189d0d310d..957cdeb4d55 100644 --- a/public/images/pokemon/variant/female/129.json +++ b/public/images/pokemon/variant/female/129.json @@ -7,14 +7,12 @@ "f76319": "8b9bb2", "840042": "22294c", "c5ad73": "c07b3f", - "000000": "000000", "525263": "9b7767", "bd4242": "576582", "ffffff": "fff9f3", "8c8ca5": "be9f8d", "ceced6": "e6d2c4", - "ff9c63": "b4c5d6", - "ffe6c5": "ffe6c5" + "ff9c63": "b4c5d6" }, "2": { "7b6352": "94836f", @@ -24,13 +22,11 @@ "f76319": "a454dc", "840042": "230f55", "c5ad73": "bcaf98", - "000000": "000000", "525263": "74619a", "bd4242": "64309c", "ffffff": "f9efff", "8c8ca5": "af97ce", "ceced6": "d5c7e4", - "ff9c63": "d18bf0", - "ffe6c5": "ffe6c5" + "ff9c63": "d18bf0" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/130.json b/public/images/pokemon/variant/female/130.json index d18ded52775..e6cb6c5b023 100644 --- a/public/images/pokemon/variant/female/130.json +++ b/public/images/pokemon/variant/female/130.json @@ -6,7 +6,6 @@ "d6def7": "e3c7ab", "196394": "a23b0c", "194273": "6c1301", - "191919": "191919", "7bd6ef": "ffd076", "42b5ef": "f29745", "f7e6ad": "ebddd5", @@ -23,7 +22,6 @@ "d6def7": "d9b6b9", "196394": "35135f", "194273": "1c0b46", - "191919": "191919", "7bd6ef": "b16cce", "42b5ef": "7f459a", "f7e6ad": "ebddd5", diff --git a/public/images/pokemon/variant/female/185.json b/public/images/pokemon/variant/female/185.json index 493ad0c8286..c26bab91fb1 100644 --- a/public/images/pokemon/variant/female/185.json +++ b/public/images/pokemon/variant/female/185.json @@ -2,7 +2,6 @@ "1": { "635a4a": "303429", "c5a54a": "82847c", - "101010": "101010", "ad845a": "6f7367", "315a19": "39270c", "4ac542": "a48d29", @@ -16,7 +15,6 @@ "2": { "635a4a": "243075", "c5a54a": "648cc6", - "101010": "101010", "ad845a": "4663b1", "315a19": "427ab3", "4ac542": "96e4ed", diff --git a/public/images/pokemon/variant/female/19.json b/public/images/pokemon/variant/female/19.json index 8fcdaf9cf80..1d34184ef53 100644 --- a/public/images/pokemon/variant/female/19.json +++ b/public/images/pokemon/variant/female/19.json @@ -4,33 +4,25 @@ "8c4a8c": "4e5e7e", "d69cd6": "88a0b1", "4a2942": "262f4f", - "101010": "101010", "a57308": "cb9287", "e6ce73": "dcb2a1", "634a08": "ae6b69", "efdeb5": "fae4d8", "a5193a": "2d943d", - "cecece": "cecece", - "ffffff": "ffffff", "e65a73": "62cb5c", - "cead63": "e8beae", - "5a5a5a": "5a5a5a" + "cead63": "e8beae" }, "2": { "b573bd": "efdcd1", "8c4a8c": "d6b2a6", "d69cd6": "fff5eb", "4a2942": "865c54", - "101010": "101010", "a57308": "ba476f", "e6ce73": "c6667d", "634a08": "7e3754", "efdeb5": "efb5c0", "a5193a": "5b7277", - "cecece": "cecece", - "ffffff": "ffffff", "e65a73": "89a3a6", - "cead63": "d98a9f", - "5a5a5a": "5a5a5a" + "cead63": "d98a9f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/190.json b/public/images/pokemon/variant/female/190.json index 8c8837946be..cc2b9f91b29 100644 --- a/public/images/pokemon/variant/female/190.json +++ b/public/images/pokemon/variant/female/190.json @@ -1,28 +1,22 @@ { "1": { "52216b": "701523", - "000000": "000000", "bd7bde": "dea95a", "8442ad": "ad452f", "a55ac5": "c47440", "8c6b42": "8c7457", "bd8c63": "bd9a7e", "c5ad6b": "c4b487", - "ffdea5": "ffeccc", - "ffffff": "ffffff", - "adada5": "adada5" + "ffdea5": "ffeccc" }, "2": { "52216b": "807870", - "000000": "000000", "bd7bde": "e5dfdf", "8442ad": "a6a297", "a55ac5": "bfbeb4", "8c6b42": "632339", "bd8c63": "802d44", "c5ad6b": "99455d", - "ffdea5": "ed8286", - "ffffff": "ffffff", - "adada5": "adada5" + "ffdea5": "ed8286" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/20.json b/public/images/pokemon/variant/female/20.json index d6c8eab089e..b59ef580ecd 100644 --- a/public/images/pokemon/variant/female/20.json +++ b/public/images/pokemon/variant/female/20.json @@ -7,7 +7,6 @@ "deb54a": "86766e", "c5943a": "644c47", "6b3a00": "331a1b", - "101010": "101010", "ffffff": "fffaf4", "f7f7a5": "fff1d4", "845a29": "956240", @@ -24,7 +23,6 @@ "deb54a": "fff8ef", "c5943a": "e2cbb9", "6b3a00": "7f645c", - "101010": "101010", "ffffff": "fffaf4", "f7f7a5": "c46771", "845a29": "34171d", diff --git a/public/images/pokemon/variant/female/203.json b/public/images/pokemon/variant/female/203.json index a4391436a20..10e0040644a 100644 --- a/public/images/pokemon/variant/female/203.json +++ b/public/images/pokemon/variant/female/203.json @@ -1,7 +1,6 @@ { "1": { "424a73": "351810", - "ffffff": "ffffff", "adb5d6": "8f6f66", "6b8cb5": "512b21", "4a3a3a": "231117", @@ -9,7 +8,6 @@ "9c7b42": "571522", "efde52": "9c3e3e", "9c3a5a": "ab9d75", - "101010": "101010", "ce6b94": "d8d1ad", "947b6b": "1f4062", "635252": "112246", @@ -18,7 +16,6 @@ }, "2": { "424a73": "27091d", - "ffffff": "ffffff", "adb5d6": "c5b0b7", "6b8cb5": "4a1b33", "4a3a3a": "091225", @@ -26,7 +23,6 @@ "9c7b42": "15545d", "efde52": "2a9d8f", "9c3a5a": "52ab5f", - "101010": "101010", "ce6b94": "a8e781", "947b6b": "1a2e43", "635252": "111d34", diff --git a/public/images/pokemon/variant/female/212.json b/public/images/pokemon/variant/female/212.json index 55fcc0858ac..5240f4f81e3 100644 --- a/public/images/pokemon/variant/female/212.json +++ b/public/images/pokemon/variant/female/212.json @@ -2,24 +2,14 @@ "0": { "632929": "215a2d", "f76b6b": "8cce73", - "101010": "101010", - "3a3a4a": "3a3a4a", - "ffffff": "ffffff", "d63a3a": "4a9c53", - "b5b5ce": "b5b5ce", - "9494a5": "9494a5", - "a52929": "2f794e", - "dec510": "dec510", - "9c6b21": "9c6b21" + "a52929": "2f794e" }, "1": { "632929": "2f2962", "f76b6b": "639cf7", - "101010": "101010", "3a3a4a": "3c3c50", - "ffffff": "ffffff", "d63a3a": "4263ef", - "b5b5ce": "b5b5ce", "9494a5": "6262a4", "a52929": "29429c", "dec510": "10bdde", @@ -28,14 +18,9 @@ "2": { "632929": "645117", "f76b6b": "c59f29", - "101010": "101010", "3a3a4a": "282d2c", - "ffffff": "ffffff", "d63a3a": "ffca2a", - "b5b5ce": "b5b5ce", "9494a5": "3c4543", - "a52929": "b88619", - "dec510": "dec510", - "9c6b21": "9c6b21" + "a52929": "b88619" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/215.json b/public/images/pokemon/variant/female/215.json index 970270a1c7d..58805d2bc3d 100644 --- a/public/images/pokemon/variant/female/215.json +++ b/public/images/pokemon/variant/female/215.json @@ -7,7 +7,6 @@ "c52973": "3a5760", "f75273": "637696", "42849c": "902738", - "000000": "000000", "a57b3a": "c3701b", "dece73": "ffcd68", "bdbdc5": "c5a080", @@ -23,12 +22,10 @@ "c52973": "3e7ed2", "f75273": "7ac3f0", "42849c": "eab273", - "000000": "000000", "a57b3a": "d04e6d", "dece73": "ff8ce0", "bdbdc5": "a1a0c3", "4a4a4a": "383d51", - "f7f7ff": "f7f7ff", "8cc5ce": "d1d1ee" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/217.json b/public/images/pokemon/variant/female/217.json index e09efa5de60..79f8ebdfd22 100644 --- a/public/images/pokemon/variant/female/217.json +++ b/public/images/pokemon/variant/female/217.json @@ -1,47 +1,30 @@ { "0": { - "7b7b8c": "7b7b8c", - "101010": "101010", "634229": "1d3d26", - "ffffff": "ffffff", "945221": "2f6324", "422919": "112114", - "dedede": "dedede", "bd7342": "6a8a46", "ffef84": "f7ffa5", - "b5b5bd": "b5b5bd", "c59c4a": "ceb552", "f7c563": "f7de7b", "841931": "a52942", "de3a5a": "ef526b" }, "1": { - "7b7b8c": "7b7b8c", - "101010": "101010", "634229": "6b1d38", - "ffffff": "ffffff", "945221": "8c2a37", "422919": "2d0e1f", - "dedede": "dedede", "bd7342": "b74543", "ffef84": "f9eddb", - "b5b5bd": "b5b5bd", "c59c4a": "c48e81", - "f7c563": "f2cab8", - "841931": "841931", - "de3a5a": "de3a5a" + "f7c563": "f2cab8" }, "2": { - "7b7b8c": "7b7b8c", - "101010": "101010", "634229": "1e2249", - "ffffff": "ffffff", "945221": "323760", "422919": "111433", - "dedede": "dedede", "bd7342": "46527a", "ffef84": "adf2f7", - "b5b5bd": "b5b5bd", "c59c4a": "45a2f9", "f7c563": "5ccaf2", "841931": "a52942", diff --git a/public/images/pokemon/variant/female/229.json b/public/images/pokemon/variant/female/229.json index 519ca256ec5..60cf3e98a76 100644 --- a/public/images/pokemon/variant/female/229.json +++ b/public/images/pokemon/variant/female/229.json @@ -6,16 +6,11 @@ "a59cad": "a84244", "192129": "402b41", "4a4a52": "85738c", - "000000": "000000", "a55a4a": "ceb0a5", "f79c84": "f8f1e7", "841021": "3b59a1", "31313a": "5c435d", - "ada5b3": "ada5b3", - "632910": "8c6362", - "f8f9ff": "f8f9ff", - "e2e0e3": "e2e0e3", - "9c293a": "9c293a" + "632910": "8c6362" }, "2": { "84738c": "101028", @@ -24,15 +19,12 @@ "a59cad": "223657", "192129": "43343c", "4a4a52": "f8faf3", - "000000": "000000", "a55a4a": "613762", "f79c84": "844d76", "841021": "fe8d53", "31313a": "b3a5a2", "ada5b3": "101028", "632910": "3f2440", - "f8f9ff": "223657", - "e2e0e3": "e2e0e3", - "9c293a": "9c293a" + "f8f9ff": "223657" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/232.json b/public/images/pokemon/variant/female/232.json index cb8ad1e06ff..36772bf3f3a 100644 --- a/public/images/pokemon/variant/female/232.json +++ b/public/images/pokemon/variant/female/232.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "6b7373": "7fa0d7", "4a5252": "5f74c7", "3a3a3a": "333a77", @@ -11,8 +10,6 @@ "d6ded6": "f4f4f4", "3a3737": "444b5e", "738484": "6c7488", - "f9f9f9": "f9f9f9", - "d6d6d6": "d6d6d6", "bdc5c5": "cdd1dc", "707f7f": "b6511d", "424242": "7a330e", @@ -21,7 +18,6 @@ "ffffff": "f2db98" }, "2": { - "101010": "101010", "6b7373": "d17e47", "4a5252": "994e30", "3a3a3a": "6f2219", @@ -32,8 +28,6 @@ "d6ded6": "665263", "3a3737": "2c1f2e", "738484": "1e1225", - "f9f9f9": "f9f9f9", - "d6d6d6": "d6d6d6", "bdc5c5": "584158", "707f7f": "1d2a54", "424242": "12123a", diff --git a/public/images/pokemon/variant/female/255.json b/public/images/pokemon/variant/female/255.json index 4637ce061ca..e2cd456df9f 100644 --- a/public/images/pokemon/variant/female/255.json +++ b/public/images/pokemon/variant/female/255.json @@ -3,26 +3,22 @@ "ad8c00": "782a14", "efbd31": "d36f2b", "f7de6b": "f1a545", - "000000": "000000", "ad4210": "318793", "ff8c31": "6bcdb2", "e65a21": "4cada9", "ffad52": "a7ebe2", "7b4a19": "1c2d5b", - "ffffff": "ffffff", "8c5221": "580c0b" }, "2": { "ad8c00": "550d38", "efbd31": "811c3e", "f7de6b": "ad3342", - "000000": "000000", "ad4210": "b3817d", "ff8c31": "f3e5cf", "e65a21": "d3afa0", "ffad52": "fffef6", "7b4a19": "4b2661", - "ffffff": "ffffff", "8c5221": "43082f" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/256.json b/public/images/pokemon/variant/female/256.json index 0895f764700..165e18a8148 100644 --- a/public/images/pokemon/variant/female/256.json +++ b/public/images/pokemon/variant/female/256.json @@ -1,44 +1,36 @@ { "1": { "de5a29": "da8923", - "121212": "121212", "ff7b4a": "f7ca4b", "9c3110": "8e3820", "9c7329": "3a888d", - "191919": "191919", "efde73": "c3f4cd", "efbd4a": "84cfc1", "d63131": "9083aa", "962d0d": "605c8d", - "ffffff": "ffffff", "d05325": "414f7b", "6b6b73": "3e3969", "dedece": "9386b8", "9c8c84": "696098", "645455": "3e3969", "5a4a4a": "2c2a44", - "84736b": "574b6e", - "000000": "000000" + "84736b": "574b6e" }, "2": { "de5a29": "cdb09b", - "121212": "121212", "ff7b4a": "fff7e1", "9c3110": "8a685f", "9c7329": "64163c", - "191919": "191919", "efde73": "c44d52", "efbd4a": "962b4a", "d63131": "d3c3ff", "962d0d": "938bd6", - "ffffff": "ffffff", "d05325": "53346f", "6b6b73": "161c2c", "dedece": "494f67", "9c8c84": "2d2e46", "645455": "211d32", "5a4a4a": "ad662b", - "84736b": "e6a653", - "000000": "000000" + "84736b": "e6a653" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/257.json b/public/images/pokemon/variant/female/257.json index 7d1e3988e81..06614aa28dd 100644 --- a/public/images/pokemon/variant/female/257.json +++ b/public/images/pokemon/variant/female/257.json @@ -3,7 +3,6 @@ "bdb594": "a8c7da", "948463": "8095b3", "b93e3e": "46649c", - "000000": "000000", "63524a": "55607d", "dedeb5": "f0fbff", "ee5e5e": "598dc1", @@ -27,7 +26,6 @@ "bdb594": "a43b45", "948463": "772436", "b93e3e": "55153a", - "000000": "000000", "63524a": "5b1832", "dedeb5": "cc6155", "ee5e5e": "772040", diff --git a/public/images/pokemon/variant/female/3.json b/public/images/pokemon/variant/female/3.json index de2c52f6003..a131e48f154 100644 --- a/public/images/pokemon/variant/female/3.json +++ b/public/images/pokemon/variant/female/3.json @@ -8,15 +8,13 @@ "ff7b73": "712f8f", "bd6b31": "168a69", "de4242": "3f1375", - "101010": "101010", "105242": "190038", "107b6b": "9e1976", "2e5519": "38001c", "5a9c3a": "b34952", "5ad6c5": "f062a4", "21b59c": "de3592", - "84de7b": "ff745e", - "ffffff": "ffffff" + "84de7b": "ff745e" }, "2": { "843100": "420514", @@ -27,7 +25,6 @@ "ff7b73": "9db042", "bd6b31": "852a41", "de4242": "3c8227", - "101010": "101010", "105242": "381601", "107b6b": "d15d04", "2e5519": "011c38", @@ -35,7 +32,6 @@ "5ad6c5": "faa405", "21b59c": "fa8405", "84de7b": "80ced9", - "ffffff": "ffffff", "2f561a": "011b34" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/307.json b/public/images/pokemon/variant/female/307.json index d3e6a2437f1..2037cf72054 100644 --- a/public/images/pokemon/variant/female/307.json +++ b/public/images/pokemon/variant/female/307.json @@ -1,34 +1,25 @@ { "1": { "7b6b6b": "7a5f5f", - "000000": "000000", "e6dede": "deccc3", "b5adad": "9f8383", - "4a4242": "4a4242", - "ffffff": "ffffff", "3a4a5a": "5a2859", "b5d6ff": "f4a8c8", "6bcee6": "ce7bb0", "d65252": "d65287", - "84424a": "84424a", "3a84b5": "7e4377", - "5aa5ce": "b95ba1", - "d65273": "d65273" + "5aa5ce": "b95ba1" }, "2": { "7b6b6b": "314b76", - "000000": "000000", "e6dede": "c2cfdb", "b5adad": "6f89aa", "4a4242": "1e2f52", - "ffffff": "ffffff", "3a4a5a": "113926", "b5d6ff": "7edfb7", "6bcee6": "66c3a3", "d65252": "c067c7", - "84424a": "84424a", "3a84b5": "375a47", - "5aa5ce": "579578", - "d65273": "d65273" + "5aa5ce": "579578" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/308.json b/public/images/pokemon/variant/female/308.json index 02dc68c8d60..e828896b759 100644 --- a/public/images/pokemon/variant/female/308.json +++ b/public/images/pokemon/variant/female/308.json @@ -1,36 +1,30 @@ { "1": { "84424a": "59141d", - "101010": "101010", "e6738c": "8b2e2b", "ef9ca5": "a53835", "ce5a73": "83272c", "52424a": "5a4357", "dedede": "e0cdd9", - "8c848c": "8c848c", "ada5ad": "966f8d", "c5c5c5": "a88da0", "f7de84": "ee9bd5", "efbd5a": "ce5cb6", "b54a5a": "83272c", - "ffffff": "ffffff", "a57329": "722966" }, "2": { "84424a": "461f5d", - "101010": "101010", "e6738c": "7d5187", "ef9ca5": "a37aac", "ce5a73": "71467d", "52424a": "1f344a", "dedede": "cbd0d6", - "8c848c": "8c848c", "ada5ad": "6c7d9e", "c5c5c5": "9faab9", "f7de84": "5abbef", "efbd5a": "3a8dca", "b54a5a": "633971", - "ffffff": "ffffff", "a57329": "205a9e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/315.json b/public/images/pokemon/variant/female/315.json index 2e85f36b55f..b05a8cd0379 100644 --- a/public/images/pokemon/variant/female/315.json +++ b/public/images/pokemon/variant/female/315.json @@ -4,7 +4,6 @@ "3a5229": "0b2337", "a5314a": "9c5910", "a5de73": "4d8393", - "000000": "000000", "f75a84": "d28f31", "ffa5bd": "efc754", "73c55a": "215569", @@ -21,7 +20,6 @@ "3a5229": "2f1c52", "a5314a": "1d6970", "a5de73": "9e76bb", - "000000": "000000", "f75a84": "55b9af", "ffa5bd": "83e4d0", "73c55a": "764f9c", diff --git a/public/images/pokemon/variant/female/369.json b/public/images/pokemon/variant/female/369.json index 1c2750e0d0f..4366c16b465 100644 --- a/public/images/pokemon/variant/female/369.json +++ b/public/images/pokemon/variant/female/369.json @@ -3,8 +3,6 @@ "6b5242": "1e2432", "efcea5": "757e99", "ceb594": "4b5368", - "52423a": "52423a", - "000000": "000000", "524242": "91743c", "b59c9c": "fcef8e", "9c847b": "e0cc66", @@ -20,8 +18,6 @@ "6b5242": "3a421e", "efcea5": "96a558", "ceb594": "758745", - "52423a": "52423a", - "000000": "000000", "524242": "32214a", "b59c9c": "6954a2", "9c847b": "543d7d", diff --git a/public/images/pokemon/variant/female/399.json b/public/images/pokemon/variant/female/399.json index 673550a23b9..cb27d48e595 100644 --- a/public/images/pokemon/variant/female/399.json +++ b/public/images/pokemon/variant/female/399.json @@ -1,30 +1,22 @@ { "1": { - "423110": "423110", "9c6331": "d46378", "c58c42": "e5a5bb", "634a31": "70323f", - "101010": "101010", "cebd84": "eba978", "ffefbd": "fff5d1", - "ffffff": "ffffff", "5a4229": "824561", "ef5a4a": "ffa488", - "cec5c5": "b7b9d0", - "848484": "848484" + "cec5c5": "b7b9d0" }, "2": { "423110": "101e42", "9c6331": "3e5ca8", "c58c42": "617dda", "634a31": "313d63", - "101010": "101010", "cebd84": "8497ce", "ffefbd": "bdcfff", - "ffffff": "ffffff", "5a4229": "42295a", - "ef5a4a": "4a9bef", - "cec5c5": "cec5c5", - "848484": "848484" + "ef5a4a": "4a9bef" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/400.json b/public/images/pokemon/variant/female/400.json index 80cb090f619..486884150fe 100644 --- a/public/images/pokemon/variant/female/400.json +++ b/public/images/pokemon/variant/female/400.json @@ -1,14 +1,10 @@ { "1": { - "5a3a31": "5a3a31", "bd844a": "dba0ac", - "101010": "101010", "8c5a31": "c46269", "e6d69c": "fff5d1", "ad947b": "bd9171", "c5c5b5": "b7b9d0", - "ffffff": "ffffff", - "3a3129": "3a3129", "63523a": "824561", "de4a4a": "ffa488", "423a31": "3e3040" @@ -16,12 +12,10 @@ "2": { "5a3a31": "313d63", "bd844a": "617dda", - "101010": "101010", "8c5a31": "3e5ca8", "e6d69c": "bdcfff", "ad947b": "8497ce", "c5c5b5": "b5b6c5", - "ffffff": "ffffff", "3a3129": "2c183f", "63523a": "42295a", "de4a4a": "4a9bef", diff --git a/public/images/pokemon/variant/female/401.json b/public/images/pokemon/variant/female/401.json index eea4306d842..8d2a77165c1 100644 --- a/public/images/pokemon/variant/female/401.json +++ b/public/images/pokemon/variant/female/401.json @@ -3,7 +3,6 @@ "524a42": "cf8439", "9c9c94": "ffeea0", "7b7363": "f6bb47", - "101010": "101010", "8c6b08": "272344", "ffefad": "56769d", "e6c56b": "454389", @@ -19,7 +18,6 @@ "524a42": "453565", "9c9c94": "ae85ba", "7b7363": "71558c", - "101010": "101010", "8c6b08": "784341", "ffefad": "ffd47c", "e6c56b": "e59a75", @@ -28,7 +26,6 @@ "6b4221": "853360", "e66b63": "70af85", "b54a3a": "2f9378", - "fff2be": "fff2be", "f3d277": "ffd8ed" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/407.json b/public/images/pokemon/variant/female/407.json index c25e377d5de..d6a2535891e 100644 --- a/public/images/pokemon/variant/female/407.json +++ b/public/images/pokemon/variant/female/407.json @@ -4,7 +4,6 @@ "ffffff": "fff1cb", "297b52": "153a51", "d6cede": "e1bf95", - "000000": "000000", "7b3a5a": "9c5910", "bd426b": "d28f31", "ff6384": "efc754", @@ -21,7 +20,6 @@ "ffffff": "fcf8ff", "297b52": "503277", "d6cede": "d6c7e6", - "000000": "000000", "7b3a5a": "18585e", "bd426b": "55b9af", "ff6384": "83e4d0", diff --git a/public/images/pokemon/variant/female/41.json b/public/images/pokemon/variant/female/41.json index 08446ef4908..2660879e7ae 100644 --- a/public/images/pokemon/variant/female/41.json +++ b/public/images/pokemon/variant/female/41.json @@ -1,26 +1,20 @@ { "1": { - "101010": "101010", "637bb5": "37326f", "4a427b": "14093b", "bdceff": "868ecc", "8cb5ef": "4e538f", "b5529c": "cc7b32", "73215a": "aa4c18", - "d673bd": "f0ad57", - "ffffff": "ffffff", - "636363": "636363" + "d673bd": "f0ad57" }, "2": { - "101010": "101010", "637bb5": "916c8b", "4a427b": "4d3259", "bdceff": "e8d2e6", "8cb5ef": "cbabca", "b5529c": "94241c", "73215a": "670f10", - "d673bd": "bc3b1d", - "ffffff": "ffffff", - "636363": "636363" + "d673bd": "bc3b1d" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/418.json b/public/images/pokemon/variant/female/418.json index 628252e5296..7100520550d 100644 --- a/public/images/pokemon/variant/female/418.json +++ b/public/images/pokemon/variant/female/418.json @@ -3,12 +3,8 @@ "ad5a21": "7d1e39", "ef7b19": "9c354f", "7b4221": "611b35", - "191919": "191919", "dec584": "cea49d", "f7f7b5": "e8d4cc", - "ffffff": "ffffff", - "6b6b6b": "6b6b6b", - "d6d6ce": "d6d6ce", "ffde00": "d2e5e8", "9c6300": "995e5c", "e6a531": "a0b3ba", @@ -20,12 +16,9 @@ "ad5a21": "cd91aa", "ef7b19": "e8c3ce", "7b4221": "84466b", - "191919": "191919", "dec584": "8a4370", "f7f7b5": "a8688f", - "ffffff": "ffffff", "6b6b6b": "432e38", - "d6d6ce": "d6d6ce", "ffde00": "eda342", "9c6300": "642858", "e6a531": "ca6e26", diff --git a/public/images/pokemon/variant/female/419.json b/public/images/pokemon/variant/female/419.json index 1ea1637ff2c..6572441f99c 100644 --- a/public/images/pokemon/variant/female/419.json +++ b/public/images/pokemon/variant/female/419.json @@ -2,7 +2,6 @@ "2": { "7b4221": "9e6a86", "ef7b19": "debfc8", - "191919": "191919", "ce6b19": "dca5b5", "ad5a21": "cd91aa", "9c6300": "672e5d", @@ -11,7 +10,6 @@ "99693c": "8e410e", "e6a531": "d4812f", "6b6b6b": "726481", - "ffffff": "ffffff", "ffde00": "eda342", "2163a5": "4b2a70", "63bde6": "744d99" diff --git a/public/images/pokemon/variant/female/42.json b/public/images/pokemon/variant/female/42.json index 000e127793e..fbef4154432 100644 --- a/public/images/pokemon/variant/female/42.json +++ b/public/images/pokemon/variant/female/42.json @@ -6,11 +6,7 @@ "631052": "892d03", "ce6bb5": "f1a139", "adceff": "666fb4", - "000000": "000000", "ad52ad": "d5711b", - "636363": "636363", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6", "943a7b": "af4e0c" }, "2": { @@ -20,11 +16,7 @@ "631052": "54070c", "ce6bb5": "bc3b1d", "adceff": "e8d2e6", - "000000": "000000", "ad52ad": "94241c", - "636363": "636363", - "ffffff": "ffffff", - "d6d6d6": "d6d6d6", "943a7b": "6c1314" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/424.json b/public/images/pokemon/variant/female/424.json index 4e00c3c1234..eace71f2a3a 100644 --- a/public/images/pokemon/variant/female/424.json +++ b/public/images/pokemon/variant/female/424.json @@ -3,7 +3,6 @@ "734a42": "415c73", "ad5242": "428dad", "ff735a": "5ae9ff", - "101010": "101010", "debd73": "c4b487", "ffefa5": "ffeccc", "8c6b42": "8c7457", @@ -13,15 +12,12 @@ "9c4ac5": "c47440", "bd9473": "bd9a7e", "ab5141": "293b94", - "ffffff": "ffffff", - "fc7158": "3973e5", - "adada5": "adada5" + "fc7158": "3973e5" }, "2": { "734a42": "593802", "ad5242": "946212", "ff735a": "ffb338", - "101010": "101010", "debd73": "99455d", "ffefa5": "ed8286", "8c6b42": "632339", @@ -31,8 +27,6 @@ "9c4ac5": "bfbeb4", "bd9473": "802d44", "ab5141": "8c1c2f", - "ffffff": "ffffff", - "fc7158": "b33636", - "adada5": "adada5" + "fc7158": "b33636" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/44.json b/public/images/pokemon/variant/female/44.json index afaf4860bf5..0e017870600 100644 --- a/public/images/pokemon/variant/female/44.json +++ b/public/images/pokemon/variant/female/44.json @@ -1,7 +1,6 @@ { "1": { "5a2900": "162486", - "101010": "101010", "ad523a": "4d75b6", "843a19": "2c489f", "ce734a": "7aa8d2", @@ -17,7 +16,6 @@ }, "2": { "5a2900": "680b10", - "101010": "101010", "ad523a": "bd4e2d", "843a19": "8d1e11", "ce734a": "d98247", diff --git a/public/images/pokemon/variant/female/443.json b/public/images/pokemon/variant/female/443.json index d1de70b1e26..b858d91da50 100644 --- a/public/images/pokemon/variant/female/443.json +++ b/public/images/pokemon/variant/female/443.json @@ -5,15 +5,9 @@ "8cc5d6": "42a5f7", "426b84": "085284", "101010": "101921", - "42d6de": "42d6de", - "c5ced6": "c5ced6", - "3aadc5": "3aadc5", - "ffffff": "ffffff", - "5a6363": "5a6363", "7b1910": "731029", "ad3a10": "a57c10", "de5a29": "e6c529", - "ce7373": "ce7373", "5a1000": "524200" }, "1": { @@ -23,10 +17,7 @@ "426b84": "522521", "101010": "101921", "42d6de": "54b0ff", - "c5ced6": "c5ced6", "3aadc5": "2878e1", - "ffffff": "ffffff", - "5a6363": "5a6363", "7b1910": "811c60", "ad3a10": "92a9b2", "de5a29": "d9f0f1", @@ -40,10 +31,7 @@ "426b84": "223a4a", "101010": "101921", "42d6de": "6fe6a3", - "c5ced6": "c5ced6", "3aadc5": "23b8a8", - "ffffff": "ffffff", - "5a6363": "5a6363", "7b1910": "7b1a43", "ad3a10": "be472f", "de5a29": "dd845e", diff --git a/public/images/pokemon/variant/female/444.json b/public/images/pokemon/variant/female/444.json index c000a06a812..fbfdd2f5b31 100644 --- a/public/images/pokemon/variant/female/444.json +++ b/public/images/pokemon/variant/female/444.json @@ -11,10 +11,7 @@ "de9c19": "e53d3f", "5a1000": "521000", "ad314a": "ad7b08", - "c5ced6": "c5ced6", - "ffffff": "ffffff", - "de5a29": "f7b834", - "737b84": "737b84" + "de5a29": "f7b834" }, "1": { "102952": "3d0a17", @@ -28,10 +25,7 @@ "de9c19": "d9900e", "5a1000": "211e33", "ad314a": "829ca6", - "c5ced6": "c5ced6", - "ffffff": "ffffff", - "de5a29": "c2dedf", - "737b84": "737b84" + "de5a29": "c2dedf" }, "2": { "102952": "092136", @@ -45,9 +39,6 @@ "de9c19": "2c8bf7", "5a1000": "521000", "ad314a": "be472f", - "c5ced6": "c5ced6", - "ffffff": "ffffff", - "de5a29": "ee723e", - "737b84": "737b84" + "de5a29": "ee723e" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/445.json b/public/images/pokemon/variant/female/445.json index 0dfa20b8d25..936369768de 100644 --- a/public/images/pokemon/variant/female/445.json +++ b/public/images/pokemon/variant/female/445.json @@ -6,12 +6,7 @@ "292952": "091f4e", "5a63ad": "33719e", "ffd619": "42d6de", - "737b84": "737b84", - "101010": "101010", - "ffffff": "ffffff", - "c5ced6": "c5ced6", "6b3a5a": "6b4a29", - "bd737b": "bd737b", "e64a31": "f7ac34", "5a1000": "502209", "bd3a42": "b2630f" @@ -23,12 +18,7 @@ "292952": "3d0a17", "5a63ad": "deae7a", "ffd619": "4caaff", - "737b84": "737b84", - "101010": "101010", - "ffffff": "ffffff", - "c5ced6": "c5ced6", "6b3a5a": "6b4a29", - "bd737b": "bd737b", "e64a31": "dce8e8", "5a1000": "393648", "bd3a42": "9fb6bf" @@ -40,12 +30,7 @@ "292952": "051a2e", "5a63ad": "2f434b", "ffd619": "6fe6a3", - "737b84": "737b84", - "101010": "101010", - "ffffff": "ffffff", - "c5ced6": "c5ced6", "6b3a5a": "6b4a29", - "bd737b": "bd737b", "e64a31": "ee723e", "5a1000": "521000", "bd3a42": "be472f" diff --git a/public/images/pokemon/variant/female/45.json b/public/images/pokemon/variant/female/45.json index 0da9343d254..65f2f6544ff 100644 --- a/public/images/pokemon/variant/female/45.json +++ b/public/images/pokemon/variant/female/45.json @@ -1,6 +1,5 @@ { "1": { - "101010": "101010", "731910": "091d79", "f78c8c": "8cbef7", "f7adb5": "add8f7", @@ -18,7 +17,6 @@ "7384a5": "966fbb" }, "2": { - "101010": "101010", "731910": "97696f", "f78c8c": "ebe8d1", "f7adb5": "51030e", diff --git a/public/images/pokemon/variant/female/456.json b/public/images/pokemon/variant/female/456.json index 68b30fe1a31..d4578b7e865 100644 --- a/public/images/pokemon/variant/female/456.json +++ b/public/images/pokemon/variant/female/456.json @@ -2,7 +2,6 @@ "1": { "526b8c": "966764", "94d6e6": "f3e1c6", - "101010": "101010", "7394ad": "cda38c", "833171": "d3633a", "29293a": "7e2023", @@ -10,14 +9,12 @@ "c5e6f7": "fffbf2", "c54591": "f19e53", "426b84": "e2895d", - "efffff": "efffff", "c54a94": "8bbcd9", "ad8cbd": "f6c37c" }, "2": { "526b8c": "162743", "94d6e6": "27616f", - "101010": "101010", "7394ad": "1c405b", "833171": "349b8b", "29293a": "b66736", @@ -25,7 +22,6 @@ "c5e6f7": "429b91", "c54591": "5fd0a4", "426b84": "fff8b0", - "efffff": "efffff", "c54a94": "7b1615", "ad8cbd": "38a493" } diff --git a/public/images/pokemon/variant/female/457.json b/public/images/pokemon/variant/female/457.json index 158974b5d96..a1b8f7ff5fa 100644 --- a/public/images/pokemon/variant/female/457.json +++ b/public/images/pokemon/variant/female/457.json @@ -1,7 +1,6 @@ { "1": { "526b8c": "966764", - "101010": "101010", "c5e6f7": "fffbf2", "94d6e6": "f3e1c6", "29293a": "a42d2f", @@ -10,12 +9,10 @@ "c54591": "ffc369", "9e357b": "c7703c", "73427b": "6f75a0", - "c54a94": "aadff3", - "efffff": "efffff" + "c54a94": "aadff3" }, "2": { "526b8c": "162743", - "101010": "101010", "c5e6f7": "429b91", "94d6e6": "27616f", "29293a": "ffa849", @@ -24,7 +21,6 @@ "c54591": "50c2a1", "9e357b": "2e9b8f", "73427b": "7b1213", - "c54a94": "983121", - "efffff": "efffff" + "c54a94": "983121" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/461.json b/public/images/pokemon/variant/female/461.json index 5ff168f0e65..5c441ed7979 100644 --- a/public/images/pokemon/variant/female/461.json +++ b/public/images/pokemon/variant/female/461.json @@ -4,7 +4,6 @@ "c52973": "3a3d60", "ff94a5": "94a3c5", "f75273": "636896", - "101010": "101010", "424a84": "691043", "7384bd": "ac3755", "6b6bad": "8b274b", @@ -21,12 +20,10 @@ "c52973": "3d81c5", "ff94a5": "78ebfc", "f75273": "5cb0eb", - "101010": "101010", "424a84": "ecaa84", "7384bd": "ffeed4", "6b6bad": "ffd3a7", "293152": "78462e", - "ffffff": "ffffff", "c58c08": "8f1a8d", "ffd642": "e6509f", "c5bdce": "b3cedb", diff --git a/public/images/pokemon/variant/female/464.json b/public/images/pokemon/variant/female/464.json index e97690927a9..adeefb45d27 100644 --- a/public/images/pokemon/variant/female/464.json +++ b/public/images/pokemon/variant/female/464.json @@ -1,25 +1,18 @@ { "1": { - "6b6373": "6b6373", "3a3a4a": "3b2d40", "5a4a63": "514259", - "101010": "101010", - "efefff": "efefff", "29293a": "1f1028", "523100": "3b1f58", "7b6b7b": "6e5d7b", - "948cad": "948cad", "943a00": "4c2f6e", "ef5200": "6f4d9f", - "cecede": "cecede", - "ad2900": "ad2900", "bd4200": "60418a" }, "2": { "6b6373": "b66360", "3a3a4a": "701f38", "5a4a63": "8f2c41", - "101010": "101010", "efefff": "ffdfd1", "29293a": "442339", "523100": "492133", diff --git a/public/images/pokemon/variant/female/592.json b/public/images/pokemon/variant/female/592.json index 7cc683367b9..45c49569a9e 100644 --- a/public/images/pokemon/variant/female/592.json +++ b/public/images/pokemon/variant/female/592.json @@ -1,34 +1,28 @@ { "0": { "7b3a52": "622a1e", - "101010": "101010", "d6b5bd": "f2bba3", "ffdee6": "ffe7df", "bd84a5": "eb8b4d", "ffb5d6": "ffb868", - "ffffff": "ffffff", "ad3142": "de4a29", "5aa5c5": "ffb93c" }, "1": { "7b3a52": "302a85", - "101010": "101010", "d6b5bd": "9d92ce", "ffdee6": "e3deff", "bd84a5": "5052c1", "ffb5d6": "6270e3", - "ffffff": "ffffff", "ad3142": "de4a29", "5aa5c5": "6c00d0" }, "2": { "7b3a52": "4e1b55", - "101010": "101010", "d6b5bd": "703573", "ffdee6": "a65ea3", "bd84a5": "efacd1", "ffb5d6": "ffdbec", - "ffffff": "ffffff", "ad3142": "c04ba4", "5aa5c5": "241098" } diff --git a/public/images/pokemon/variant/female/593.json b/public/images/pokemon/variant/female/593.json index 885e4f12e4d..66366bcfe8e 100644 --- a/public/images/pokemon/variant/female/593.json +++ b/public/images/pokemon/variant/female/593.json @@ -1,35 +1,27 @@ { "0": { "7b3a52": "622a1e", - "101010": "101010", "c5a5bd": "f2bba3", "ffdef7": "ffe7df", "d684b5": "eb8b4d", "ffa5ce": "ffb868", - "de4a29": "de4a29", - "29529c": "622a1e", - "ffffff": "ffffff" + "29529c": "622a1e" }, "1": { "7b3a52": "302a85", - "101010": "101010", "c5a5bd": "9d92ce", "ffdef7": "e3deff", "d684b5": "5052c1", "ffa5ce": "6270e3", - "de4a29": "e267c8", - "29529c": "29529c", - "ffffff": "ffffff" + "de4a29": "e267c8" }, "2": { "7b3a52": "4e1b55", - "101010": "101010", "c5a5bd": "703573", "ffdef7": "a65ea3", "d684b5": "efacd1", "ffa5ce": "ffdbec", "de4a29": "c04ba4", - "29529c": "241098", - "ffffff": "ffffff" + "29529c": "241098" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/6215.json b/public/images/pokemon/variant/female/6215.json index 99e0c880142..56ee351cd66 100644 --- a/public/images/pokemon/variant/female/6215.json +++ b/public/images/pokemon/variant/female/6215.json @@ -1,7 +1,6 @@ { "1": { "503678": "0f5d6d", - "080808": "080808", "514a80": "402010", "956cbe": "31dabb", "9c9bce": "ae8976", @@ -12,13 +11,10 @@ "ffde7b": "a7a7a7", "584d80": "562627", "28234b": "220d0a", - "c52973": "ea903f", - "bdbdc5": "bdbdc5", - "f6f6ff": "f6f6ff" + "c52973": "ea903f" }, "2": { "503678": "601522", - "080808": "080808", "514a80": "14273a", "956cbe": "cc5427", "9c9bce": "3c8775", @@ -29,8 +25,6 @@ "ffde7b": "ffe07e", "584d80": "1c3942", "28234b": "0a191e", - "c52973": "f49633", - "bdbdc5": "bdbdc5", - "f6f6ff": "f6f6ff" + "c52973": "f49633" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/84.json b/public/images/pokemon/variant/female/84.json index 19da28cb8c1..92ee4e872f8 100644 --- a/public/images/pokemon/variant/female/84.json +++ b/public/images/pokemon/variant/female/84.json @@ -4,9 +4,6 @@ "946b5a": "3a8951", "dead73": "a5e6a0", "bd8c52": "65bf75", - "636363": "636363", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "bba689", "635210": "7a614c", "efdead": "ece4ce", @@ -18,8 +15,6 @@ "dead73": "c35d6a", "bd8c52": "9b374e", "636363": "3a2050", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "af85a2", "635210": "4a2240", "efdead": "e7cedb", @@ -31,8 +26,6 @@ "dead73": "b0ebed", "bd8c52": "7abcc7", "636363": "7a355d", - "ffffff": "ffffff", - "101010": "101010", "a5844a": "4a1e41", "635210": "391436", "efdead": "884b71", diff --git a/public/images/pokemon/variant/female/85.json b/public/images/pokemon/variant/female/85.json index 9f78ce39fae..7a8d643d5ac 100644 --- a/public/images/pokemon/variant/female/85.json +++ b/public/images/pokemon/variant/female/85.json @@ -1,13 +1,8 @@ { "0": { - "424242": "424242", - "848484": "848484", - "000000": "000000", "5a4221": "1b4e31", "ce9c52": "65bf75", "a57b5a": "3a8951", - "ffffff": "ffffff", - "d6cece": "d6cece", "635a42": "7a614c", "efdead": "ece4ce", "b5a57b": "bba689", @@ -19,12 +14,9 @@ "1": { "424242": "1c1d49", "848484": "2e3260", - "000000": "000000", "5a4221": "4e0d2f", "ce9c52": "9b374e", "a57b5a": "762141", - "ffffff": "ffffff", - "d6cece": "d6cece", "635a42": "4a2240", "efdead": "e7cedb", "b5a57b": "af85a2", @@ -36,12 +28,9 @@ "2": { "424242": "621e2a", "848484": "973d41", - "000000": "000000", "5a4221": "2e4c6c", "ce9c52": "94d1db", "a57b5a": "6a9dbf", - "ffffff": "ffffff", - "d6cece": "d6cece", "635a42": "391436", "efdead": "784766", "b5a57b": "54284b", From 3b2753f27c520f893599c0a6e380516fefebfe56 Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Fri, 23 May 2025 05:14:52 +0200 Subject: [PATCH 18/44] [i18n] Moved Ball "Cancel" label to a different locale file (#5866) --- src/ui/ball-ui-handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts index eb7c208662a..66d7847213f 100644 --- a/src/ui/ball-ui-handler.ts +++ b/src/ui/ball-ui-handler.ts @@ -32,7 +32,7 @@ export default class BallUiHandler extends UiHandler { for (let pb = 0; pb < Object.keys(globalScene.pokeballCounts).length; pb++) { optionsTextContent += `${getPokeballName(pb)}\n`; } - optionsTextContent += i18next.t("pokeball:cancel"); + optionsTextContent += i18next.t("commandUiHandler:ballCancel"); const optionsText = addTextObject(0, 0, optionsTextContent, TextStyle.WINDOW, { align: "right", maxLines: 6 }); const optionsTextWidth = optionsText.displayWidth; this.pokeballSelectContainer = globalScene.add.container( From a0484bbde1cdb81f648703e86af1b93b7d599730 Mon Sep 17 00:00:00 2001 From: Madmadness65 <59298170+Madmadness65@users.noreply.github.com> Date: Fri, 23 May 2025 02:36:30 -0500 Subject: [PATCH 19/44] [Item] Add Deep Sea Scale & Deep Sea Tooth items (#5078) * Add Deep Sea Scale & Tooth items Also changes Clamperl's evolution method from gender-specific to requiring one of the Deep Sea items to be held. * Move Deep Sea items to Great tier Also gives every species stat booster item a `rare` boolean to split these items from the rest of the species stat booster items. Updated the existing tests accordingly to account for the split. * Reduce Great tier species booster item weight * Fix global scene on evolution conditions * Merge branch 'beta' into deep-sea-items * Change how the held item is found in evolution condition It should no longer look through the entire party's modifiers when seeing if Clamperl is eligible to use a Linking Cord. * Fix wrong type being boosted --------- Co-authored-by: damocleas Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> --- src/data/balance/pokemon-evolutions.ts | 11 ++++--- src/modifier/modifier-type.ts | 45 ++++++++++++++++++++------ test/items/light_ball.test.ts | 10 +++--- test/items/metal_powder.test.ts | 10 +++--- test/items/quick_powder.test.ts | 10 +++--- test/items/thick_club.test.ts | 14 ++++---- 6 files changed, 64 insertions(+), 36 deletions(-) diff --git a/src/data/balance/pokemon-evolutions.ts b/src/data/balance/pokemon-evolutions.ts index 64409c3c989..cf1e4061987 100644 --- a/src/data/balance/pokemon-evolutions.ts +++ b/src/data/balance/pokemon-evolutions.ts @@ -9,14 +9,14 @@ import { Nature } from "#enums/nature"; import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { TimeOfDay } from "#enums/time-of-day"; -import { DamageMoneyRewardModifier, ExtraModifierModifier, MoneyMultiplierModifier, TempExtraModifierModifier } from "#app/modifier/modifier"; import { SpeciesFormKey } from "#enums/species-form-key"; +import { TimeOfDay } from "#enums/time-of-day"; +import { DamageMoneyRewardModifier, ExtraModifierModifier, MoneyMultiplierModifier, SpeciesStatBoosterModifier, TempExtraModifierModifier } from "#app/modifier/modifier"; +import type { SpeciesStatBoosterModifierType } from "#app/modifier/modifier-type"; import { speciesStarterCosts } from "./starters"; import i18next from "i18next"; import { initI18n } from "#app/plugins/i18n"; - export enum SpeciesWildEvolutionDelay { NONE, SHORT, @@ -1793,8 +1793,9 @@ export const pokemonEvolutions: PokemonEvolutions = { new SpeciesEvolution(Species.DUSKNOIR, 1, EvolutionItem.REAPER_CLOTH, null, SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.CLAMPERL]: [ - new SpeciesEvolution(Species.HUNTAIL, 1, EvolutionItem.LINKING_CORD, new GenderEvolutionCondition(Gender.MALE /* Deep Sea Tooth */), SpeciesWildEvolutionDelay.VERY_LONG), - new SpeciesEvolution(Species.GOREBYSS, 1, EvolutionItem.LINKING_CORD, new GenderEvolutionCondition(Gender.FEMALE /* Deep Sea Scale */), SpeciesWildEvolutionDelay.VERY_LONG) + // TODO: Change the SpeciesEvolutionConditions here to use a bespoke HeldItemEvolutionCondition after the modifier rework + new SpeciesEvolution(Species.HUNTAIL, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(p => p.getHeldItems().some(m => m instanceof SpeciesStatBoosterModifier && (m.type as SpeciesStatBoosterModifierType).key === "DEEP_SEA_TOOTH")), SpeciesWildEvolutionDelay.VERY_LONG), + new SpeciesEvolution(Species.GOREBYSS, 1, EvolutionItem.LINKING_CORD, new SpeciesEvolutionCondition(p => p.getHeldItems().some(m => m instanceof SpeciesStatBoosterModifier && (m.type as SpeciesStatBoosterModifierType).key === "DEEP_SEA_SCALE")), SpeciesWildEvolutionDelay.VERY_LONG) ], [Species.BOLDORE]: [ new SpeciesEvolution(Species.GIGALITH, 1, EvolutionItem.LINKING_CORD, null, SpeciesWildEvolutionDelay.VERY_LONG) diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 4c61123eb2d..912e12f19dc 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -873,7 +873,7 @@ export class SpeciesStatBoosterModifierType extends PokemonHeldItemModifierType implements GeneratedPersistentModifierType { - private key: SpeciesStatBoosterItem; + public key: SpeciesStatBoosterItem; constructor(key: SpeciesStatBoosterItem) { const item = SpeciesStatBoosterModifierTypeGenerator.items[key]; @@ -1440,34 +1440,59 @@ class SpeciesStatBoosterModifierTypeGenerator extends ModifierTypeGenerator { stats: [Stat.ATK, Stat.SPATK], multiplier: 2, species: [Species.PIKACHU], + rare: true, }, THICK_CLUB: { stats: [Stat.ATK], multiplier: 2, species: [Species.CUBONE, Species.MAROWAK, Species.ALOLA_MAROWAK], + rare: true, }, METAL_POWDER: { stats: [Stat.DEF], multiplier: 2, species: [Species.DITTO], + rare: true, }, QUICK_POWDER: { stats: [Stat.SPD], multiplier: 2, species: [Species.DITTO], + rare: true, + }, + DEEP_SEA_SCALE: { + stats: [Stat.SPDEF], + multiplier: 2, + species: [Species.CLAMPERL], + rare: false, + }, + DEEP_SEA_TOOTH: { + stats: [Stat.SPATK], + multiplier: 2, + species: [Species.CLAMPERL], + rare: false, }, }; - constructor() { + constructor(rare: boolean) { super((party: Pokemon[], pregenArgs?: any[]) => { const items = SpeciesStatBoosterModifierTypeGenerator.items; if (pregenArgs && pregenArgs.length === 1 && pregenArgs[0] in items) { return new SpeciesStatBoosterModifierType(pregenArgs[0] as SpeciesStatBoosterItem); } - const values = Object.values(items); - const keys = Object.keys(items); - const weights = keys.map(() => 0); + // Get a pool of items based on the rarity. + const keys: (keyof SpeciesStatBoosterItem)[] = []; + const values: (typeof items)[keyof typeof items][] = []; + const weights: number[] = []; + for (const [key, val] of Object.entries(SpeciesStatBoosterModifierTypeGenerator.items)) { + if (val.rare !== rare) { + continue; + } + values.push(val); + keys.push(key as keyof SpeciesStatBoosterItem); + weights.push(0); + } for (const p of party) { const speciesId = p.getSpeciesForm(true).speciesId; @@ -1846,7 +1871,7 @@ export type GeneratorModifierOverride = { count?: number; } & ( | { - name: keyof Pick; + name: keyof Pick; type?: SpeciesStatBoosterItem; } | { @@ -1874,7 +1899,7 @@ export type GeneratorModifierOverride = { type?: EvolutionItem; } | { - name: keyof Pick; + name: keyof Pick; type?: FormChangeItem; } | { @@ -1977,7 +2002,8 @@ export const modifierTypes = { SUPER_LURE: () => new DoubleBattleChanceBoosterModifierType("modifierType:ModifierType.SUPER_LURE", "super_lure", 15), MAX_LURE: () => new DoubleBattleChanceBoosterModifierType("modifierType:ModifierType.MAX_LURE", "max_lure", 30), - SPECIES_STAT_BOOSTER: () => new SpeciesStatBoosterModifierTypeGenerator(), + SPECIES_STAT_BOOSTER: () => new SpeciesStatBoosterModifierTypeGenerator(false), + RARE_SPECIES_STAT_BOOSTER: () => new SpeciesStatBoosterModifierTypeGenerator(true), TEMP_STAT_STAGE_BOOSTER: () => new TempStatStageBoosterModifierTypeGenerator(), @@ -2617,6 +2643,7 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.DIRE_HIT, 4), new WeightedModifierType(modifierTypes.SUPER_LURE, lureWeightFunc(15, 4)), new WeightedModifierType(modifierTypes.NUGGET, skipInLastClassicWaveOrDefault(5)), + new WeightedModifierType(modifierTypes.SPECIES_STAT_BOOSTER, 4), new WeightedModifierType( modifierTypes.EVOLUTION_ITEM, () => { @@ -2713,7 +2740,7 @@ const modifierPool: ModifierPool = { } return 0; }), - new WeightedModifierType(modifierTypes.SPECIES_STAT_BOOSTER, 12), + new WeightedModifierType(modifierTypes.RARE_SPECIES_STAT_BOOSTER, 12), new WeightedModifierType( modifierTypes.LEEK, (party: Pokemon[]) => { diff --git a/test/items/light_ball.test.ts b/test/items/light_ball.test.ts index 91195d0b1e5..cdcffe810fa 100644 --- a/test/items/light_ball.test.ts +++ b/test/items/light_ball.test.ts @@ -29,7 +29,7 @@ describe("Items - Light Ball", () => { }); it("LIGHT_BALL activates in battle correctly", async () => { - game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "LIGHT_BALL" }]); + game.override.startingHeldItems([{ name: "RARE_SPECIES_STAT_BOOSTER", type: "LIGHT_BALL" }]); const consoleSpy = vi.spyOn(console, "log"); await game.classicMode.startBattle([Species.PIKACHU]); @@ -100,7 +100,7 @@ describe("Items - Light Ball", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); @@ -139,7 +139,7 @@ describe("Items - Light Ball", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); @@ -178,7 +178,7 @@ describe("Items - Light Ball", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); @@ -207,7 +207,7 @@ describe("Items - Light Ball", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["LIGHT_BALL"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); diff --git a/test/items/metal_powder.test.ts b/test/items/metal_powder.test.ts index 6be7655ec70..e924d75fce9 100644 --- a/test/items/metal_powder.test.ts +++ b/test/items/metal_powder.test.ts @@ -29,7 +29,7 @@ describe("Items - Metal Powder", () => { }); it("METAL_POWDER activates in battle correctly", async () => { - game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "METAL_POWDER" }]); + game.override.startingHeldItems([{ name: "RARE_SPECIES_STAT_BOOSTER", type: "METAL_POWDER" }]); const consoleSpy = vi.spyOn(console, "log"); await game.classicMode.startBattle([Species.DITTO]); @@ -96,7 +96,7 @@ describe("Items - Metal Powder", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue); @@ -129,7 +129,7 @@ describe("Items - Metal Powder", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue); @@ -162,7 +162,7 @@ describe("Items - Metal Powder", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue); @@ -185,7 +185,7 @@ describe("Items - Metal Powder", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["METAL_POWDER"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.DEF, defValue); diff --git a/test/items/quick_powder.test.ts b/test/items/quick_powder.test.ts index d77f981f04d..fb08d6bc71e 100644 --- a/test/items/quick_powder.test.ts +++ b/test/items/quick_powder.test.ts @@ -29,7 +29,7 @@ describe("Items - Quick Powder", () => { }); it("QUICK_POWDER activates in battle correctly", async () => { - game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "QUICK_POWDER" }]); + game.override.startingHeldItems([{ name: "RARE_SPECIES_STAT_BOOSTER", type: "QUICK_POWDER" }]); const consoleSpy = vi.spyOn(console, "log"); await game.classicMode.startBattle([Species.DITTO]); @@ -96,7 +96,7 @@ describe("Items - Quick Powder", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue); @@ -129,7 +129,7 @@ describe("Items - Quick Powder", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue); @@ -162,7 +162,7 @@ describe("Items - Quick Powder", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue); @@ -185,7 +185,7 @@ describe("Items - Quick Powder", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["QUICK_POWDER"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.SPD, spdValue); diff --git a/test/items/thick_club.test.ts b/test/items/thick_club.test.ts index 2a63a60a0e6..350735a363c 100644 --- a/test/items/thick_club.test.ts +++ b/test/items/thick_club.test.ts @@ -29,7 +29,7 @@ describe("Items - Thick Club", () => { }); it("THICK_CLUB activates in battle correctly", async () => { - game.override.startingHeldItems([{ name: "SPECIES_STAT_BOOSTER", type: "THICK_CLUB" }]); + game.override.startingHeldItems([{ name: "RARE_SPECIES_STAT_BOOSTER", type: "THICK_CLUB" }]); const consoleSpy = vi.spyOn(console, "log"); await game.classicMode.startBattle([Species.CUBONE]); @@ -96,7 +96,7 @@ describe("Items - Thick Club", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); @@ -119,7 +119,7 @@ describe("Items - Thick Club", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); @@ -142,7 +142,7 @@ describe("Items - Thick Club", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); @@ -179,7 +179,7 @@ describe("Items - Thick Club", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); @@ -216,7 +216,7 @@ describe("Items - Thick Club", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); @@ -239,7 +239,7 @@ describe("Items - Thick Club", () => { // Giving Eviolite to party member and testing if it applies await game.scene.addModifier( - modifierTypes.SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), + modifierTypes.RARE_SPECIES_STAT_BOOSTER().generateType([], ["THICK_CLUB"])!.newModifier(partyMember), true, ); game.scene.applyModifiers(SpeciesStatBoosterModifier, true, partyMember, Stat.ATK, atkValue); From 8410aee3a1315dac368bb3d6b59ae0caf27d5e84 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Thu, 22 May 2025 15:25:48 -0400 Subject: [PATCH 20/44] [Sprite] Fix Cacturne and Kyurem variants --- public/images/pokemon/332.png | Bin 6892 -> 6886 bytes public/images/pokemon/646.png | Bin 17027 -> 50251 bytes public/images/pokemon/back/332.png | Bin 19460 -> 19467 bytes public/images/pokemon/back/female/332.png | Bin 19460 -> 19467 bytes public/images/pokemon/female/332.png | Bin 6911 -> 6904 bytes public/images/pokemon/variant/332.json | 38 +++++++++--------- public/images/pokemon/variant/back/332.json | 36 ++++++++--------- .../pokemon/variant/back/female/332.json | 36 ++++++++--------- public/images/pokemon/variant/female/332.json | 38 +++++++++--------- 9 files changed, 76 insertions(+), 72 deletions(-) diff --git a/public/images/pokemon/332.png b/public/images/pokemon/332.png index a9979480673646722fc78640e946c91e4e45b676..44e374426b4dd37171447e1c4d155753e44a3cee 100644 GIT binary patch delta 6534 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 diff --git a/public/images/pokemon/646.png b/public/images/pokemon/646.png index 64b0af2d1518727150cbcd49eaa5747ed8f11b80..e54083bfc7318d9a27185f7b948294ba32950d8b 100644 GIT binary patch literal 50251 zcmXt<1yoes_xFcRX{02jyE_J?8!3krX{1I#Kym=3TR^&{LApz6q(MMZLb`K^nfLnq z{x56Y#ac6WPM>}D-rvuO)YVpbf=i7H0)d{WsVcq%flz+`d$2KqPfE5TYJh(z9xqiC zK-J^V_CO#8keZ^rflt<9r(6t;aVjqY%HK2e<;g<&P1^AAi&5hA7$pf#G@1sXmy!M1 zulv&U-hU^+ba)erLgORv{YH!}-BxEkpEcd?8=lv+aTW-UL4Kbl^7E!%z(C?y!U zz6zm=f3R{kVQe|e%&w*i!+kxFCrP<9k7p-+9$xF%&rpawEj-9TDaEwIFAuE^=zKl! zJjlRyCO7R$$qSRp|LPnUv>Y$%ARJ?zh9`tM*SpZ=ud6IVEB7{HBK>TLe&8#MykWfC z`?h2EcYhE-QU9Llx1-(PAH%6a_g_0(@(D|sdn4X#N7-r$(e>v!Wg;qn@>P&ryrs!D zVl&7+p@)2l%N3Em%bU904OLb(r{2N>>R~K9deXW>h+Fhft6dSQU9lP8fAnsO|3*Pl zF><)vrER|0`rZE0_IEMYk~tL6PpaY58+dGwZ1cHA(i90gnzn-8N)1J@HiK+EW z{epIUX>%wiCY>FO$iY1kx(Si}JKtolVw8H*zxD1z9C?t=(**lw?Wyy$2Grv8G0s~PFrj`F2;QvM~QWs25Km#3yOoBLp( zi=`FN*JPq@6#Vm0s?c+2yP5E(5>ihST6Y*4<$YSDUCDn#6rJ;D4;}Q)GZi);AS2m7 zU#K4>osnJrc7Ta)CRyN4C6$jGhj~k?O1r0G&HVIFF zZhou{>IBN5jQ#YgvqJ$nbpCf#EM(_kiUYJ>aY5>T?-YyJIU4vkaMr|xysT<{M5?Mu zLB@NVepC)P%dLg{(%C)YUIP5qx;!zD6&Pco@yb6YJ%9#u1vCyA@31W~&5-F1i zK#Jo}Z1Z@2w~pOa_)vzFJsm(?^>Ho9-|S5iVhcZA>oN&ff54n#p!-Fh+$O8N^2hi5 z!2;8S*jL<}c%WNj$PfRgICE%i5S%D2qoa=2f58a_?7*Fb4iO@d-;GkE#ilXc`qX(K z8Rv1_zisfFfeFp~jjK<67Z0^bN#e1=K=6j5M zBmecjOHU#fWLUFd%I5fi1MOT_SC2O+K=9L0@~)>KPe6H ztdVy=(B~a?jqqF%8;02D=g=HO?_7c@zsj8X&KZ~}?m%mWN{)4p8*Y77HeJl)j5SbJ zvW;2b<~SS&5q2`w1jy_&U_LHXtokR1y*q4dE63x8F1<8XPaOpv?lHg@asd%Bf)IF*-a=$0j3fN;4N;S?C ze>)@wPZG!_Z5PF9Q)`XK!3kT~a@^#%y^RG83%{40K0Z@X2;nXj@>h z5cb8xqHJu$zVj}~=uFD==p3S)cVpQgx}&cthINeswU#0!sh{YJ%%5_wtT42b1{JlCXX2B7?(1?E(cnxYJ>|p>Ue6uPo5bCNysb@aOjTvUb|aY~ z(_Q9|agTd`NeQ~z$7a zfrDfWNU+u@3Tl#*bTs&bvurm0Htw#K12Y{#D%lpu_ktupxfyv9^@ua8B-z~ry-MRk zB8vTB&xc=SKQYv~W&#UQ{ryfMqmIc{Z5!`m= zk?6ijz)&Y>P@63}?kL06Qy0X0pR#*UwB?nrAqc)@O(@d}dG(6}O;Q01%yh4kuZhIk zcMBpepMfU*j+uzQVDJl+O+ma5;cb3APeYQO2Y`IqEv(KP=vxT)1u^|alvhK#*yV?N zB|cS?2J;Pki1({LbY24No#V{3#-MNcFnfWq6;xtwocShl7xsZ2&U~$-Ah=Sp`lQt9 z722$AwqV|KPjSyfOEzRp`=c#GT~Q2I1%JL@#4!i4T1g6b#lidB%PDd?OX=Lg`y%=e z0ki|bcq4na>6apA2B`vsbm2(&1QJ_VJu#k;j&1{CW%@gsXx}(OEsHa~a7;ssM6qB; zg*8%DFup}cQDOn7d=aFOeKgTK z`VlJsYiSvj|GKAsvExpDgW(Pdu4{aqV$BaY3Yvox{D5Dwb#VE(Qu3ms6NfK$I7zpR zQw)O9>0p0+u)O0X(OFl$DLq%DdTCgy_MMkVYgL^N?3_0g>TJVY*oN|OQUz=I!)~&> zWgBFUTobt;Wf*5ndg3?}%H7_-ZQkkB*aS-%D2THL%U2JD;ezN)cpTp}s`d$8 zW*-syz<^`Fy`v6HBz6)(gO!4;5EYsH=)y-0GOL3xUE$skE&;RK3;mTCLSH&a$xM7z z{@Cc27Oi|=pTngcTUss#39v}BPjW6XjRw<{u-i^D-U-fb@sh}>P%j-YML*UjXr4f8 zuHVPM$a*|DM0z#LX`TG6aVg8*%TXn9w*8VDJLPH$T6cYrAZA}el}55H%Q;(LJH^gz zFO%M+T}=8N$YL_x1};I_O$_j-a}{R4TgGcUrCM znAW2%AeOgwM}CVv`()Nf!$1hrWwlWVM}87UC$wqqu0~d1vyX{Tpg^f`L=OBf<$v7Y zlTEXHs&l#f%4W??t5K03JCJauSQ&-gI=e5h@W^ACfRk75I6<&%b=1RlE%Hg}P1dla|f;1jn z9c#bW6~G}Ddz>t5l=O~Vp1KE*i5gUv-Hl&5z@WZ6M8`LS@U+}rMT20MVuy)lQB;Rx zEg%xNZy+7s&yaLR7)y(A^cA*%%C+u`&`;$bL}lsFLwNX*s1_U+mo7bAqkK7TgY(eu z+i)!sJ*lN=RnC1BuWg3%53CXD3@B?VaEYCarKKh1i`XNA`zB=b;e`#m@MO8_r!-eZ zMUIiZVaj?B9jig&Sclto#Y;|+-2UqyT_4{s;V$SIkCA#t{yqAz-JP1V(}(69InYD_ zG+b3N7KMn%vnZFXwi_36wB|(H*7NHcdINrnIzsa%A$AEAHslYLxN2R0-|E0kJ9-3+ zE#PvQWUJl}irhtXar+T0U>YoXbLUK?zzTSqj2X*HZ|HN)THY=xN9{wHy3(LBJ2V3# zWk;r}d4`GjMBFQr){;?z98;q)K@<_P>SOk`oerajM3xnk*q%B6mj!=Xf)?VKsq#K# zM(f7Po8&*Qmm{K8oL|R%x61N^P6k$pnvx6yMXFl4JtWL_wlfK%74vtIEe%0Rfu_b~5i3^cpKOM^g4qre z4cA1YF|-frIV&J3IZU;%xDkZfgWNa*^ybl$6&#I@v3QU5!BlU=CtPq!n5kuPuT2^h z6ORR2UwY>+eTpU?q{%8;;z9FcM(wpd53w3{&I(^+JB5wfF9S-kY?6Rq`;ezrI9oH~ zTuja2%#XYE3WhsaTjie$s}*yLoQ*zbIax4&F0R+C`s?*s+N&c~jUO_S3a%5- z#i31qguPbAP`nR%w!e?O`B-HQSH99a@f-Ccqkq*SxL5~9-rwcK+A1iCvNHJ;5_&Du z1>R2lUaP^SRI)XLNSr6lhqoW9?vQ~^Ib1Ff(< zCRkt7Jlzvo$c*jCc+K^k# zeu_4VnyHo6ZFIo2y5P_}HwW5a3Y60vx0{ZMe$TTnOZ(;#LHp}u?V~Ig$Nu}Z2y6Gi z>RcNrqm$9aDsZ`!jrU_nn2YGW5!5s{mSCkBYt;(>p;3Bh`eE&x+r72A6xLaGeqZgj zhK#rmxM;`s8*TknAMBBfneNm%lKSpW&D>Hk8M+ zZD5+(wQCFxvw67zYoqrn+>rKKkM46ZM{~agSy}KGiX2vCPF+@jZrMbxX0?F zZ1$ z8r-EbF++J6id3=Ms7b_FY?-D? zEGgZ^(Nnizrha(=zOB@8MM^Re-lP2y0BxMW8mzzRAWkf!Uz_6AaYir&`AEtmeMo#X zxsRe~OB+6O47-^e?8k+Wb~z8=f9>^5r8Sa_-ZI zcT{q4mTU4!tv38532=x5R(wvH>(H(Lfq1qAtSxxNZi08yQe&G&Px`ETXa0TB$|iQW zy}>hKIqWSrBu0nJh*6*8+`4ZaD_6;Pcp&rsvJCztgTZcjD47Jzv=!4T^ zJnPc5eJ|VVWNR(ijJBcDw5ae5K4GVikGVJzZzNx`WGXhS&c$6A7&I&1k2A`d=-@k1 zP5gN1pHz{tHE+baF=8huLg?&9LI9+8ge!;{IX|?ecFg&wpcs`nmyMKu-L%hFPxK*V zHvBC)-yV(7xdww`F!r#sC)HP~WL(|$$3>e`8iCv$4x;POQJ(6S+EXUI7S9GsI^Hd`Aaar8Ux&IPa9*Jx@1!&JeiRU zA`^)Xo~#PW3I>v-0#dnQ&l>KFPLlO|*j5)xqcbK(5ny+G&tsG+q}L$$x^)ZrAX4}G z;CV0Qq!-y9l4+F=|Ljn3VHp+u=?ID^GF z7<18t_Ug7ugltx#y@Pk`E=t(@oPt;qMM2hr+^n$%gJOIo(oTG+tx$T#mIt$=hP@!$&IDAc zhBG@-MSG9^uC2_M7TBOM>c61Rya|h_(DZgA5EFyJ$FR0Lxg&cGhVG5UNgyF9Mm_e& zWeX{XgwqEm6mxJvSaF?0>GJ0!FVR?U9LFt}&a2Z>UY^q8cd*iotUBblyDY(8YaqWi zwiG;afIM<3=t+&u5^8+b5>Mz3)ymVM9-9wdVBJ@rx{P0%>!zIapQPc89w!HW?c;O{ zivQ{04cpz5w6WnM=@joNn5tm?w`R2~NMBxP*dI_rfNu10e5mytFxh$$B^yghQTBIc zfgao50Nm!sutzx=XQp=%_TZu9H$R5NG5dT;cQYwh=byx^3(3J+?EUd#J%8CXtHalQ zyF2tfM}fdWgXEWSmrCcW^j?1o;X6%45QF#t8EDt-LzRO^4$8$&>9V@?tJKr^bow2& z)E4H?fLC!+@wY{3h=hxmcax+-@KJ`y!8>vnr7x*7X4ke{5NCvYsV`-$*>_7&Gg&=Lt&f))!m++l$LqGtc7?Bx&T!;B2&S zJIxM_!J$}MNH6+cEr#()Jk6Ttvby56f5vahBM(NoZg7KV8vSO1_ zI?%cEQ(|i8ow+dJd?T~jTa&!MA7IoH5#k(-(-|uCR3;jJUhX--m~*8X zl`~Mw>m&=9_DqJf4Z2rVheHBHNAws14y3&oetE749iJ2Nu9ZEq!uLzxN9BC|l67#OL2?>CVT^m z4Q&~gl($2&BPm>dWGeZ1n5;bHKBV7%3KX)fz03v#fc5*?Q$fG&#cRO#5YE&xCVx#Y zBYB=#BMY~=m#F#`i3h5aUTmU>of}y)N?k)EbKXh7idb|mPf?rd?1B3EEv=hcL@{yl zF<04r`a3}X3Xz(2nbMrDQq<3`uf z7!(G@gbgjQEk4r&*jGW}a`usWAzRVmbpi)REjq2&^HVP`e_aWAyN?b*bUnK_r_<>U zL10--!FCn%dWRqoOg}54=hm;U>bNg6%o5FQdnZIi6jM;dGW8Kf23azX0$)ZGtgZJ< z?M-e7V+E%mlUHspBM<3He zu6GPZLP`S16NxW)F%_YEhS+Z&0ycM;)_`~f#v;{F6b{a+`R!kX8)Tds=e47X{buh| zLPOY#_D`qNu{wf;+-@^hi^A($&STM*AB5MOL-FnB?fv-QhUN_d8MP&I3n$ z$KE4ygLQ4kW`&-t`bp0W%YCVm?&J~>bVNrwO>C%9lEJHhPd9>;C{R!HIt{98_QAd# zO*0nvnY}>c#(;c?$0m7}t@Zx$pV97qJnBZRfg|o&xJSQ_#fowGx&sML0-r#NdC-dq zJt8tLY{5+8v(b=B?jDkk!SA*Q(jnXll^HnbTp1nZL~}gc6&6WrqYnY6r$jq6xfF1V zx!{41EWu#%ST>{3ULv>oipej;YeON8X03J?j5>xn z6EhP*raQN}oe>h786&a?LvmVhP+S(glj~jQ$%&h@+z_f&m(Fu;Tl3MrV#%h75wU!* zDMbO+rM_1NO^(}8&T2cCA|LOsc+Tuj|2>X-LQ|f-KZBA{velkn_1|F5D$cl?emhe7 z0sY0xp=L2aJj^;W6>W6EG<_$R7eokT(Bj@Noj+PO$PvkoB*e>8Cry~{F7r~v+6}%{ z*yv5FGlOPVVVBDil|DCv2S~sPPG~?)G|!|zcy7J?r0Jd|;_Bu`)6_Zi(CMq48NncR z!9fa9V&j}*%IA$59ZGuqYVa&Ap_n+e!65vGI0YheEAfq9kq})2t6llhQQe-&le|-V zPxGeDP!Y|iY10E@P(2*&e6ElK1PNHM;(?-PLz*1DUn zP98TdcA6X#af9ULCPL};)klSko-NTM_y-T>31s0#h7PZPl6K59H5JS_Vf=m9I+T_D zk>>9F)Ng~vLaFdZ2}eW0LQ00^W9}4nK@EZL=kX-=582a@X9W?T5UfcPG)f6ZbO^$* z6PQ-Q6RiN7Mmfe2q|&_yQs+Lv7L4B#>}`1}(XlryZgWsve_4TT`>5RYnFyPem_BH^ zS8UDsdVOq?apFXzRzrr+Ij+_N&~_rZB+Ip8Y?y?i*G6xZA7a?8)M~VT-1{!v?*ud6 z6|sj@PN$AfbKZ4STQXBC80>M!pNx_EjuA)Q1dF?o-Hyk+kGKd*f4oqD^k&@H=}s0G zyMl_INZOjE{k;DCCkXjC-N-H1>)ts(N*c$^UMI&~6BVajkdj8L*p&#CA^ZmE5+b~% zs$#s`2iz>>8phAXyM+;$3*~px>h?+%z6z-l3Ue~Lv(kd$KasZACG)=)k%i!!frr?m zk?Ti}1Mf0Hu0=21ZQiQ2neP6xm7l$Ak3*_9RlCgD&vj5~yYwPQikkSM+)&4KKkXKF zSEv^3O!8zyfm${rzD7(#Afq3qZ{<4UbO&UJwvmGO6FbII+ep3AjdsJ>OtY<`BePUk zNM(zVo_Tv$nN<4o(PynrLd1}CI?(yk6r}}7Tih?A03zG!wXF!Q?6ddxOh-9k4(Q~$ zWuD5`<_#GXi33R3#xaWd2Flj;$&H`X9?}a$any}`qynwq`ozrFH1A|8XX|8Mwu8`{ z(6)M;RBg%}&Sm22qcqL^^wU?Hj)>;x6Wy3@Bt;c1pG=K1aAl|DA19M&(G?55yp&EZ z4>?S}mDBy{!^}u`Mm>aZtf|sQSYl+1*$rLCZLVLv#aauvK@Apr>Ki;jb!znbVT0&% z0OkK@0Vr-Bg1O{uS&;!>>kWi2h|<-L0)X?%q4{y8$-i1BO7K?se%<@U<(2N0ZR&U( ziB@VW$DE#tVLmRh<~su1`Pl8O+q5N4(Dg7~FR~~bUkw%L3A|as^Z)nU?d`zkA2;dc zFtkxP-{qbNlV^7ve-yrU70o=pS>u~>ZEmcAB{lN}Zi;B~2$(Y^DHrl^m$J5caR?Ll` zf+HLow?*p#1iW{ln=S!L9jmqK@0}*!v=yk;#UpEXnDZQe$^dWkcJBK^cNhOPFDBE@ zg zF+5N3(Z6ICm;kydo@)?vGbnV6|9Tl^l7Z@+gYNIAf5P!x=po`qJRs;ZNX5u_gEkn_ zVVng2`>OxBdL?Q1!~bB3w|&~mlzzX^2lft7tPh;54lU^b4nQiX_FeyoeEp19cye?P z<(GYk=)ac)OG*aE7`E|JN(GvDv4Bco#@{16cIE224+HF;Z4htI*UhJT7-H6H*Szx= zQeDh@c|P!KyJw-B+P!`B_7j4qYa#|l=lR&C?#C)?@H%bk&~v3{F*0~mCx6{u;98C_ z2mK#HGILh{xOO6FpOE*5=JQOg>4oFeV)J77 zq6W3Zis`0+71#GU2>0!8li#U4m8^=B!(3wU3vmOyeq_f=i#acK2dWhjI?fP6@AQjo zx+Q6ify;yxse_}gav>uKjE~Cnsbp18-H>pyIy7064B$Gf51z>@gom*_W`^QvKq40z zXcWi)e94J9JE{=rl9XG-TrBjT@LsXU*I@%Rid}jLWsWugY;b_3i&F@XQ*M})fC|_9 z%+CKXiu@%fKr&P+nd=3@N&8yi8ruZ=2%EYE(+(8P>taG{8T?) z{xEaXS4>z2{(Q6ZtZxRPDjBGDKd0e&ZFM*!9|-Lq>`57pKg z0tgp6Pc_zqG50i~a`vKHIl>|vo%AZ4OKOiA=I}r14t}QBMy^yqDjU%$iTbVv zjfb!f`pQgOpu6cs^pFhs?6t<=Rz*NS=ZE)L!X~q4$0HcBCv*H~pYM-IjJHV7 zzQVK6{%zrgh;1?s|v%?A8Sfm^1#Tvd>*&8 z`C##@Y*@}zgisk6!ho04jQk4b*xdvjq#~GlYj~wcJ`{drHVSlLCT)sAjR(_yp5@hx zdV!3wuYSN$3*y9Y*w9i@1|W`<8Z~mA`G^!ae0?=zqTQ@oNMl)Yph; z>~?N#0`;*Ep^{^mxN@6>b3PAiFt;k4;-BMSUXGAl8^uz7>dZoL@=FWyD|`1wqOcro z*h7x28)@8qmzL12{f|bFz`2U&{)vJVi|8Z09mm2#A>kzDgzrY)vd zLa*{t<+DVGwmtz{m85vUN~G-mRr?pcxyUUqe?(gMLy2xMMsV{1Ijhb+?DbN>en2;8 zCTf#tjo{D-df?O5;SlDI!VJm$o&Dv)gzzu%nS7Zg9ggk zmP;*nqbW6%yI9p07JnY3&7MZ0b%xs;HBfxTj~;a_0MQiZY&^@+P1!u5o;uN2He^eh zKl24NUqBZ1?7xxy$13mz5Hb*c1KuwEY=mKen){sN#2u!ysmh+@ZJ^I~X-136oe=+J z;-$b0PyfMXkb7LBZI7O;g`?1Crwiw)sm+LRdchpgirCPR#XSM2?*7(c&oQygH%ltR zY*ksFJ_actA4*EJy)55;NM!^&Ecdgw`1nN0NB8*gSsay>kv>R&hchIWcUpVmita|? z0To?>b(X>FX#iMd+kDWI1nmj-gwss$8u#b12&yLumHzDq;{=CvQzvhg4Mm3ecuUH5 zzM5A3INF&McP9A#RIeE{non}8_Grj*Ix$f)t&Yn$I-BUcU!*OATi5eN>1XtT-BRuq zs{K^?uPN3tN}`t1oi{nvY3AO$QkxGQ)8J7w$_awxV5#=;jcw_W*H7(hNZPe8@00Yl z<bs zykEpCgDa_3?O1{y{kuCSCa#d#*E}N74U*II zdqMQ{%OP~?It6o)E*gPuE4p7F zFT$Mn6%}bekonAU*GzYeKl8De%QQORXWliWU2S7$nT%o)W-7e!aQptj2iN%eMPIgb z63IV;Vx_lE-0x=Z+f$Y?!ALvn3f;1d5I#cmjm`E{y-0Z@5elW7(6}D->Byh(MM|LB z^;%%}g5p(eUaI=9Oq=|y zl|9?20xP$Js=hIWeu&aFxZpUOxP3=pHXd+KGS5t$@)6U-5GU3NUVa0YQw#wB1C2r4 zpJ=7nE_>W>w-3E`{W0oDI|03JPG@SZH_}4yub1tFo>AjlDssX)H@AgzUaJlOU}55i z<*f}aT0S$z{iX*qu(SWZ0hg}h)Wgb6m1j8xe1<=d+0zKYv^2) zjf5WNl6D0e_BO<@%&xI6@|09cipb#nGfoloeOIq1Btc};hUKo&1u!)6bKBCF)FI{m z8exR!7B@s{dh54Ol}@KF~|MUKKhu89E|=`Woo)=E^V zTe6jHDkuxTGyXckPMgZ06ARYvZppgC zYzLfCjlp*S0PK*ATx|8;n#ynF(diq*V1~Y*JCJZ>@wyhIwNw)JC6Z~5=ABYZ3@|Y2 zSJFzSBKIoZ7d9O7?*y>rg=U5M{>U6U4PZ8^EU)9ax4)hTm-JzU<_l`f^;ToN%6kQq zlgiBlhUMzsyB0ObUpiqG4c(%PVqG$B-silzU4<}_YBr8=yFy0I4j%mQMIF(2ru&vkT=uk6j-gdK z)vg!6Ol4gjdQelNC*Rtn8)Wq`FOmLvR}fF~1rl<|Tfh$E`Z1nRo=&t$#%ky#&eQ2_vEu4OG71O z@WDCeYG85xWDOplJaYvA98;@c=-XVkZ5&bj{aa`+&n zPW$OtJqmliXa^fr4PkUhWQ=^MT&fz z_$wTo;O-EH_rJT%YaRr6L+p!Ssc92^gRt9`7*BNv=(=LzzQq$BVY_tlT(mq}?j)10 zo35P;utywHij0aXNHdF}#zRQ^se1u&=+rdiD=Rgv$ix6+^D&fsXlHH2nqpiz{CEk? zt%PRoZNcn^f8CB2YpOGl0N4pdyOUmdh6UEM$2LaCJy{(XVVDx))(6DEzI#Ce2iKJo zwi`d(=MnU#Fl07u#Mg_LeAM+kdD)R4*jPcdL*RMC+b3J5IQw^9x3td$QA~u($!@_d89j`4 zErK@Wl9H(1uDV*LX9Cd&y^QWl`-g8RQu?E63g=H3zOTsvQ!yK@Kk|$xuVmjB6FffW z=+#sV6KgUySvGsBciIRPk%viLsh2Q&Q?N z>?lrN&tt0%Mh&hUO4ITHwryEhTzS${j1`V*!9?5NQQw+6i$d&6H~f8mag=i^1#E1~ z6qL_%LnLYtuY1R@zwVAm57BEPu_L1VO%MN-)}J?UZ81n&(x~zrlO;u)LP_=H z5#g|)ixSP>$ybrrMD>tbCroDy>HaT-rd5izcY;ctf|IOV*ia!?LFlk(YlBgV|eF2!3&JNsW#y4VfXGxMTFz5W9kTGvKV`7vY! zhLlCZl;j&^R>GlOggz+7__toA>=CM5=Vg3h35Hu(vKoKxC7E*ZvV|48hoGvz&$Lv9 zT(&XJYq_`{t6gaDoLxjEGC!sop#Et!g#$2+0@ScO@k)|JDI#kz5Xf=Xr*> z2qF5s%y7^A#6QM3V0!S-e?v^%eK6=m96%^GbJ2g~w-M|sI5!e#tmVX!brRSpqJ<5A za#mbt+bY7C=o((_cze1(_Cy=uxxG|Zy)JL$?P~N3s@a`8E6N6fu(I5VyL?p5q$aYf z`SmhUO+FP-bsn&oGbCxN0Ud4cNDLo3q1VYPX9Za$>WJ!W+`ma+Ntn!s=5>+RdKmS~ zaFX$O_92KCTjw4cp)*F3YZ6kq=xv|&x&d(Wuf6pp-LqS*H2)0sFdtON%^tt5t;X~H zi!h@-aqYQ^5qrfJMec(GrBW&ow!OaOTT@4_x{AUh#`n>q9RCAD_$j|}J6*s#K5H?* z*q$w77aIENIFLSmH2Et#iBODRVY} z`Rz$V0rLKY;=$rUYeQ>%u4S{b*2GtqJ9T;p3Adl|PCW58$v%QqP>D6L)2Jy1sxbP1 zI-NrBpdo9L;-|t4AcU1JAKbnL5iEzMokTx;Bf-yQAy7i zKIwDUc7<LFdxaFY54=?d~jR8X~yA>1R_sYF|bP5JU1tyQiIsoi=%|FuA)K&^rHElDF z^hZcD@+Hb;YC*65Vyb+#O;7-LN->>jPCw z@&$@>GY`uY^OFoR=TX^2HZ`HRTj~&k#fXGhjKtVmnYU8xo{9x(nR4`7TVUZ{9I>s{Tn(|-Qur`nh z)`kCUrO*=8E3RF1-cOEu#hO0$^-IJojF&5roNB(bw_bDt2lws2kbi$&{a4OU&7 zl^*Hbd<9e`yVERrDxv`J_>;3m2vh zCOy5OcDq-ZV@jwts9^!QSjKUa@32M>XxED!UQ5{lt{Q`IEArxmb*&rV(*wQ`{8klo zGc20a6Im%DhTqU(q5+xOV+e#?i|h{kY76bGE7xF4<%qXfVHH)5AX2IeLR#tb9dZIC zOpcgoGw??*rJ1nXNd|SJEskC)-F|Qe?8Vf@zia~b&g!o}1*(4^9)vH=J%8|Iv$&s5 zytLm5l~++dBY1)PTiWNMXF6ayElHY6Y=4L)hidY~wCZpflR4fl%a3r|wno_IxdO|3 z@gy4q$3r9GsngA;j?pdu<2pvk3Fw5UT>ajB<@!mElCzIV#E=C*;GeQzH=^Sdw{V~^ z_*d^Z*<$^5?5__jYh!p}s1P1!#;nVlq`WmMsK)?Vq>FfZr^mz=IW%8Z6q#vD#&eo{ z8D9FeYE?=*Z~Di*Lc!MxCit$rk5jnl08vSK#3uawWt3&#iS7Ld_Q`hzQ+k(m(^L`; zSy2@7<#ea`&&z#@-R8M;ta4(f7Ad^|W^YW~lM{`H{zJP39Gwr-C}pH%fV6FjeW=MK z9JZDz2F&M{h{_NnO}MlmC&O}tp~zH%-2EV(t0EO#8XnhTR(S8Z%LQEZBfB6g5syUZ zgy?78utr#eoFD0f-TY+#0`XIN8(;KONwtydf}z15p0<9kP1|mi;^y#dOPOq#!jbg4 z(f;Sw+3Fc?nIY(11fF#eS(oB{yvU5|my0GwN(@ULG^d=ux167nh^jrx>R1wDn9zxD zlF4ADV4e=FvfpADaRrEgk5-#H9bOsD7xzr1{=A8z#Qy}V*WY`9C{%c{ulU+G*1bT} z?oHjizHZXH{N3A;0X0xn5~V?PG?nRAe9i=mv@==9zvMYGa#&3w@zBVbsB;m_3FWKz(?gZh3Q}FBerIT@ zYEYPdc+;?CG?^nH!`LVE24c|^&uh!BSL1bC69=UO*MZyVD3Pa(nWKCUD zXTPaeRT-}BE+0d(xo?4m8%wvvR*vy#OB#?=*QvQR^Kc8`AP%CL)gwE}QU0&rdN4S| z3p1%;W~-YdqRKf2MK}j$t=%^yr&sbR8oen=x_B)NWcQUab+^GHhK4Dn4-!PI)N$-e zd^FFprxyV&*9!8~)wRQ--g>NtNvitj{k!wiAn)=%0 z8FJy^%3^a`5S_{${tfrlmbH`&$dwFknJQWAkf#((~DBi#&aeWXFH9tw*saah{Kg0|7`u{9Iv;VRg-b7Kq3$3jv#b6BE zlS_#=j#AN`Xk)qtOj+Hp;BvgcxiY_(Iv#w85=EH$bJ14BYY@T}>YP=tV*bMD^GZyz zin5X}2ITG;L|JL}K>|k84a%4?8Xd8_AU4LIu_rZtTE6D(EuRS%aLeQ# ztm5WtX#LOCxQyS7llp!>LJ3IJkyVqWH>{0Bow)S=2kUz#*;x(|QtX=qbk4*Uas}=e@m-dh z_G-8+bUdOi!-Ap(cF#}_tK0iBjx0`$58VEsKgNns{<{^%Zoi|h^7GlbLi(7vqzx$+ z1gp{^&8~jWXlf{t;?_5d%(G132{wsNy1b^HpSF!b)$Q#jK^J_WJ?+BTY-9;JlX?U{ z7$JkB>)CV#9|T-x`nNt;WT^C_-ZMJ z@FL_8=g&msBZI%2dzX^a;)XJ{L+d8m()lao5H5PiOS7EUS*9M!(sc3dZ|Sb)sKcK%*B!Oy(?fF(|tkX9Ia=#~bhJ5{;_h8~b^=?;kj32AAh`#t=g=Xt+( zeQPm)psYFj?0xpxabNefueBJGKhm~enQPwKp?q-bj#F7AvGWRerlTM1^RL!r$9GC^ zO4j!jgZE?3dbx>Rr8Zwq(O2O?`~4IVnZG4IyTmGn{KKePW6O@Wv6!WiVb;UubO_$$ z!ZvrdA!y%VR7niZe8rTdw(bd~_xd-%N4a*kv<0O9YN2j%?rXbID_#_h!V}lazSQm2 zdYnWqRp7(=^Cw#Arxe)}U=wt(@o|@HGzi`?2hp7=7+|CPI)N6XA#qP-c4xJED-pQQ znL7e+6U2C`J7t)y!AIGDUz&%y`F;g`4+S-TpM}go`Art4w=CUrZY}dS_U7SKB94@nspvuXqYt?l zLLpEn)JQzwYSQB=*k|AH;`#IE%BZDxv;poWb~q(B-!8D9z5#HQ-2YLSn{P+?qTSY& zC6!XEqxtj?30hrr1Ui7qg~WLUqnm^>)ciw_rP%u(btPcgc_s;8w;>)=G^RB(U8#rj8k(LltfOCYiybs5BH}2cQ)l zR9RP#CzAG#VP|j1!Pkl)hS-Bsxs=9~w))I6ZlrFK&)f%(wea>5P9SGgw9fFML#Ul5 zYYi}xm@ewmNq;jVb1S)Mm!3^kqfCBkl0eAkw4*PZqSrzD>KUCx08w*y^M@YzTjUjt zn85AW>mRW|dV-xNVSFMbfK;qsUcXY_Ig95gH#J2@0-P~gu!AGjTqXtD*w%vVfmP7N z*BC3458SFiCN!-9P)&~S*H1=IjPmH->-rzkA(OK(0_3&*UCT?^NEISTv`osx*Z-Bz z7NVteie__cc__UhUqYnPugyF6!@1NcCZy0QcB zH@XbGlBfc9&e-woXkKs~96jJ*ykHbHU&{=ED-QiJ;qarnF*6^C#(dPjnYR-^+CL29?{o^%L z_R}?NN+(P%j|7iro}+2KSJ(KMsH43BT;N=azd+eAWda#iR=5O^KqxE>-^`HzPv8=2 zp~wpKUl6VF#*QRMZ6wgDLv+wpDdW-OAy4TCbTKC>;mt(-3Lh4=)} zQv%Y8l1H@@NQPgm$u`sH(W%OVX-n=zl~qwJR{FyUEX;Gm;u?vI3wK=L=L)pE@BK_^ z*LD+F^N40P4Bbf_{=Y!bXF6Z_pv~fg+N1>hy`mz}^A0c|=2Oq=`?i!4FE?5u)NHgVs0-CQP8&lMj zBHvuhDWrkE&2K2P!lLTEg42$gxjX7n-B^%N!Y*g_ zBH?>fA3Kf@Ru-#c6~{!BtpquQmqM?d8EhP0g!1?T{$6FA2h;foHHX2{Q zDe-la@=ccHd^TYY=IZrrdt}L|lh-voN$~9>KrL( zWt>(gf*wCb~HLn^*xHB zC|@eEmkDHut}NgGR(a(?i$q0Qm#VbfUG+2-kYoYZ=w6#*Z%MEK-g$C|$9X7i;p5}- ziQ{XoFg4ya>j^&8Y&!g$mSI^7Zjk@P`JQ@4&jkaPl!mPKRO)rWkqg(xY3I_vTV50$ zKedG;^a}+DDRLI*TV*F%G1lJ|Khbr+_9-h?mq~u9=hZF-uN?w#8IPo=gF(q)^kfq{ zF9M*G;K3fyPWWJZ+isyj4JFyPfxnDDXs_sEs~RLM$#slV3b*I<90^@$LB7k)g1#Mk zP5Ao8`zlu=uQ?d|%)LF>mkL`oaG*G*QUorLIaN*UwhbzWZc zPBSar5V)5Kpiu{x?p@|LmMr?^RZhehiN6fz?Q+VIwKB!;wE_a}QwGXS*||nqng}Ci zL5~At+uTh7Zmyrq$m3QX%@0Y!H&1v=p8B7`>Gnr~M1NvLN!lggADByI0os`wfPRAC z7OzNAUk0&=*GANHNb})v2bZp2cIus>NCKfm`nlp~HBzjR6C-fHHx8sNTns#TC70V<$KDl0Ss*#QX4rjww;tkgQt7mSV9a@8{ zF%V#q-4D^Ffen@9e@7|eG7uw1%2qYS8h+_+{TI4o|vHB{wsAZOv`^9+zUXn~_tg{BkgxHaM?d9KT zGafA(H#<1-T-oD5Xa=vX{r1;0Vd0{17#48#8EakG@~1*iBD|0B(o>s`N@!M@E2u^p z`s9${rQ)AMPq#Z`rHf|ZB&~h?pAYA8nfNR4 zol2V5_jgd^XBlpQ4^Dr-hVGaI&jX=qJ|}B6`?r*p*g$SQ0g)-Fvyq|MWUzXzjZ$Hw z2|~`y@s)p>-JO~$(}TTN*mcpiz7dezV7S<+-19Ti%y1U*vW@eT1vhLdxZ!K~4c#*w zEIF^tA++z6D|4e;zaN_>jE&W0E{G4vnBIV;U)f?b?J?;5pw~+CCtORgCV4%!rR7&Z zm8(A%5tQsuX**_q!j2ND^zFJHl0UlA++;4V zn|7{xFlVuTiGjWBIcI?&Cg|*a-b8m2-?twszT%B0{L=XlF(UfC1j4GkkqyWo1DQcZ7EN{H%8WE0Gx0rs4p5~G$e;+ssrL1w0!i;D zk6ZFU2vEeUE_<+K2s2T0;o(zBA0-m9OA~hHSINs^fK2P7{J@r^MpK6BiEfFl`rb>< z%2Y>}N-l!xYhxn9kF-m`#WU_jof1pAPlCTM(ekzcj`=r9b*qY!wO2I_OCd&*UIkU&xig#ux5|?cFP3W? z>3oAuXj>8Wb;YyhK>Prz2(#n6w9{48XYZJgZm2KXGJIV5b&|qM4jZ{Q1)ilU;7QzB z|J?>C8B}1<_hN+`pVXMpzwCtQ%E`>wj?=dU>fU4jY$rK>9Mq}Gf5qNAX<@t{A(b48 zX|{Z)kXxF>IgZ~9@mEGMAFDF7xXB{K9ME})ZF)yiLcTYY zTd^@=BU(8G-UBPk+y0F8NcV+`mHGCN^kBGB9MCM9+RT2enafC$6wV~ETFMdR-IYL5 zdg&{t#c|*dXyh(B3F!ITZNSsNnSvdR!bV3XbCwCE&*{yxi8%4fX z+?$Hra&oIGg1{c3e59`=r*qQ$5+Fw6bk5(;t`8wM5DxHt6?g}A-)R?n8DiZg+UaSS z_1d7LrtNyV_)kF=q=@e!RLGm`i(+d~`a&81!d8!Ld@0=Mv7xLb2{~x)&|X2>lH&}n@-Rwln$R|3_>AvA$OCu0 zfs|78Iq115Kk`Oc5&`_n=v1s^aQ*ZybnhzTNJ4aX?aa)#rbR?9PknQp!%_v9-b^Xz z7W?ZxDRk;z1i~GCUB=>G!35|l&1>yh3!piWQsqqlOF0N3$yb85%;Ob|++U zb>CM{0LusaQOwJ-qE>t<)lL9QmHz-dp?P%dX}CSKqh6*{QkP0*2Hf8_C6V5|j4eVO z0FDsA;D>MIimz3S^o&@ieuJDO*t+(U|451ZT--LoR^zzcZNE})x$S5Fd!Ug}1ygx^ z@o-VP^q!-*v|&?ejRtz0`oxLeo1sr$7NA)fGhxo-B`QV01Cwk)?Z^alRU19vN!?9f z#5N2K7i@4^cRhYZTNfP;qk1kWlCc@(3aFi&JZ~DHW$bnz;!$$?6N0O94#fXHv5|=D zo+I-u#DQ;r*GvXwhh?^m2X%@ifVu);G5szJb`N~>+UEvdgcH4ensBoxCipaCD&#W0 z-&9`6#rUOBj<4IF+)MwZz+mP8zUM z2PTmbI(NoV>;O9sl&fjcxXgV&Q$jIilyHDtNvW!e3>o}dhtwFXkofk8u^F|4z?h-2 zdQH82Vg%(&%-H`;?TJ+S zqj$ZPZUUG(jQ*Ai7r?5`6E-i=m)OnmY0Sn@FBzRs3f~X+ul+A^Lu9y=(EC`Mc7Uv5 z6V)Dg^+y5|I`3%o&WuZ1M9L%QNuv_X^m*^{Cjs(Y$ipCIEoo2oN@qc7_y(@teTC#qogL{s&GRst)&Z?Zy8^ zS>ob|CjMVg=l-NG%ndIuD~&Z5<-^oQ6<~*HhZEqTeEE;f@B?yZ1d$v*N#%BO1XMK+ zq8~XXzkZ!0)+a^n7*{)1p_PYQqyofjP&x3Ky=utS(tz;W;~$ao9bV29>~>~jjP?Lg z9ALzLI6(vQ>+pRdhZiAka?O@<1`T3BV-5AVJ7OviDmCo!Sl%{q^_{XV62%kjYS!x` z0tK6}ve+|7&}ly1z!i>#OEP)4o*B-XbBFMeBd(BWMU=D_n%RYrs$vY?1O9 zrPBMsf(piQAF&ao4^G2-ulb(|-EX-CU7ed+s&Mu#SbrpFyD_mP1+%2 z;(dGA>y`2HnFT$o*2=ADMsk|a^L$qm9TkoOv6f+&Zlcya2Mh+C|MD94QfXh>UNUsQ zf0Ke?^i98TPCKEk3Z{T3Ke)A$4uNbn&6g38Rxef1^qAIgr1ja%KoO zrob-HdGg|yE$vM58*!S#?8lLi=Ie*{s1eqIJ2R`m8f%OJE3cDfe1{Hpa9s{+f@kAR zKbON$c}lPL#NRsM;N1Pk1WeLz$8kbY&Gi3&kb`7=#Hbnw7y`C24G7FnrKomzB92+F zrcayaQZVg|ntvC>DF4t>`E}z$J{W;Nmw0=WI&!X3tA`DkmnK%|Lj2OdAw>?9^wS-@ zMC#>5lFzGe=X!4@XEpIa;pA%Pe7ZMdK-p?QLMK7?Q#B#;1Jd6+fO}OM_~Mqucg7S1PQ=GmEzU`P)T!vm-Hf zX$Xg9;~IIWOIV6f{k%<)5$RknX9}m#AdqxK(h$%(z5A*8pcF3M=(X-q*xu&Dva|@e zb8Ajb!#s^R8Bym(Z(i9@4O{{n121Xus&{?oDCTUr9Fw$kQRzOA`O!*pGUx~lq-oW& zY<(a=hPqmt@QxJ?&#t@PzkIjc*K&xxrWX)b zD-T#RC@|KA5AIh?BvErYcQAmhhk^h6(;x}lS|mrWaAEf zkH>;e&}$g-M9RUrX3D_G@I%k7&!RtnvMvrW3MSUF#oFx@R%W$lf$0CS0HZ&e40skL zd5B-*=Kzs^OEVD5^jkTQW;pksy_I|Zf6=w9wLlfj(*w@9_lwbe(0VZv>F=_vlti?z z82KQkyW0E;rh0#q(rvJWi-!G&N_MVz2!3y!+Am%@;e5PbkF47>#XuOk)-XuNGKe}~ zZNtQ?TYK+E`h$W7Y>1oCUj7*8|on8 z&LL>kdf*-3?+YYplwwee%G~5stU9G`!bbvu)k~3B0_HM6v(VwjRTgEG5UHke=Ku6G zTU%S){lU9Dx%m;QA#Qs;q{yMQ^D=JyMYMsUX$j1o&B%+xo|*jOwJm?k9y!S>SBY2e zK1qa`f_kp6)P735p$hINe~NjG-(NRM#82AFQoTGu{F_z=GP&jC3HqLptP3Dfric&e z&=5h>xg4QN*L066MS8rY4lLj9d#RD+7NgCRJ5|O(EyHv--&vi3je!S$dZJ9rc@uID z@3h`w6k|j*5SDt}2xHhHWL=GXp(Of_KSOP<-r-%^=Xi<3RUj&varu1(nu*na6fi9G zl)|pR|DA};B)Uk2!Ka;lc=b=7_G{PUIp;MX;1uU1yj2zmao_<#zmqZEitHum5F^U6 zQ8(;T#kt1cuG-(1@b<DM-{xes$+g!ZD+-`~yAQ7=9pN5Tp zeM(2kXVQ&srKJ{RdDE_r2>8gI7NtsOGmU^o0lL1fti&()L`nw6eGJ*!uTWR`t65jL zx*vq=B_t%y4=STrKrPe4CcDgA;kihQwcoBYUteA~f?4I}O`3R!^{470(b#$&J7~KoZRnm}9KDQY>UKjZZPrahW+{ z(Z6GBv>+$JT&ZUAq!t>skukZnUL;aVa$nk89?_bi2A2O+)(2CUr%f_7a3b)e79Z^v z0?lUVVkYfC?l$@~r}Zf88TRA@>{iFpmq658M_R$855~;uA|R z+v1!8WOtrMb1`S-g%WhU7{oRJ!%e9!uPh@J3|=9umC{0Z0(!qY>3m?)2#4~kgNvK^ zLE9&hE(QQye2kYAH;+lraz`EYc)6b*LmD%&dIHO}Y=%y$I2b!3j)& zbZ`VM_@_j2yU~oA@#iHX^aT)pgOZ$S?kcLc)HYd1<2GJO>x5_tPzQ%x_ zw|{tsm!`EhAT+e!%pwc+q7f5zwKWmeR1X@7f)8C-Tdy0-F;~B6Zeixe&Og|mtIuH@ z+Sj;zM%N%=84r}(LA&skbK}yY!*EspB#fxvpau4Goy|Aa=(|qJl0CT%cqp7m#dM4r zWB#b!H~8rT00W}O&4G98#hri9Wok9?X9d<2wXqsYSV0>KOaeEo2EQlrv0hZzGJ7(SAIu z%VZ3AyyXFajgyyEW=;a1^KXTTKC^%ViLf!dBbY{BlPM^<$X){%N|6>^Ok7-VvscTzG<1{ z;{T5}xsp1*5?mSsfsTb#`dyAU(=E&_@2}&r&{mE*%*_2VRj+q*0jj_0E{B8ub24CBPp&3LcM}tH^IIMqr9Gln)_KZ$PbDH#7>bhio`}I6&<6BP*4%YH} zut4%LMmhufOMg59#l#tEhI&9m<6#x$+Y#k!K_-OZapEr-f81;GcSm?=NVpgC&Xj!#9`spkqzroyGZ zy{#Jc5a*}fW^BVSAPLX8N*37uP2N3)j8_dH9I=aeg`kbB8OH0%mL#nu^y7cLN0r5v z(7T#^3WDU$l!LO0ofL<_pF+M^pwuV#%g}5(`9}N`wlZV4S*gc<2}s}4pIAlTlOz49 zenrXHy8p9Pk@JMdYQt`oZ!yk`;j)bFR)csW*z1zg?%pc3#T z{`+u>>79Elp*w4D(}nzL9R6g+3#sS3;3N$@E(`vXiSi_P(Iwq_!Wf)g39#VsIdWpm zWG(XFaxc59aKqeiq@NTTTzZ^%jl_`Nxo?t2;{S!XWlNXOB^rIy1gvVivJ=0(Yb?aN8cwJ3xOMbas$Tq!0l4W+Y!HSQHu!khw5kA5iGMM3 zx(uPtRzKbg5BGNPwPqPJEC2nly*&2%&I4mc(%2Mye!ed<&<8*RNUH&Wg?_%x{Fmj6 zNAd1smAG77^X$o|5Iq0w=1z~tBdzh}W7oZ_` ze0RMvbxz=b_6G9Te^L)}fkQWn)~TP10?fstzWtNQWr4~Fy_tSQEdiIg421VTXA=RT z|GPkb(!Ncao;MWnYr8o2OzIrdVn&bJ3cP-&jqkkOM z-jfwR)CV>r>tD94E10|pG9NO>7OiE{{Em*sGY1gjPv;diu0aE5*>C<`qA-`iFnGz( zq5fuPmsJYIS0CM@0NGDT3KU-AM_(4;VMq;l;U$^EC7kXggaq}0tVf+@0_%WI6W=>=kcB3O<+Q`v9QVra_ImXk~oNYfLVb; zM1SzDZ~7!55T@M`rw*gpHh4|&SVc<%8XkPAEwjb21l|vD*zSbHzcH*$Fg40Kv!6#m zNY$9e@j=;-$B&_R1hDxxiAn()-Q~Xov)nx%WQoO4Dtx(-VzuUpQ>3aU?bo7gd>_*iqzh-@ zeD}6+AHw{GZVe?Ah4YJ2`5$J}F$~`nqQow0y)NWkoAfCfT<9tiUd}uY*IcwQkl+$jsPCOH?%Npf6u@$ek@%rh0`wZ3(jVm8I!&uVlLxO)U-`{>e z53ds|Aot~Sk@{}q)ND;Ee`=7|->9(@f68UP678h$EquqLimC#-8VQ^X)EONzuo@vR zF^rW=DaP%Yg?U?H$Z77Asuf@zO@O);4wO!6L~}Z>cBGHDV`qcA&v)I%vW=Oh?H0rA z&0RnhC@&f8@SqkSEnPkq>ZksG20vYY(i;_E3zAsh(q*Aeu_1L@>tQZ&{Y0eN7VLZo z8F8H;-!9~5j$i*xsW9y0;EO05nQ(@LN#GtTvdN@cR-v`^y#xsXUx3MpffiI%6*63L z^V5F)J&}3H$Q=PHMV1TaR9{J&9k_dP$dh0yIIwh3Wie+*mu5DY%Iddu8TZV?@qz=N zVSujOh@-q9M8*<`A~OxYm4Nt5Q!x*yD(FUQ_I4~wjLq~-i0Z$d0WD2VA!p}YPTu7g zh~)v7@)BD;+$hRYCMaFxIl!wjG59X*Pw+4z<5k@Z1YM2)5u?)Niw9eTjF?YQTO-+v zoDw^YPIYy;ObU28Csj(KkQ5b%K zd`<-!iy9i3Cev}JDdG8jE_c{be0T_|&Cp`7$QO>hyLTTNHxH^Amp236`kNZ2=8~>x zXFOt#XV{BCVQqRWq0N3-d07M!X4ctcTQ-Al<+F}^%SvhUphW1&zeVhABz=PLJ<9Js z9g90|Z?K+PuxBvvfC{c~fAZn@L?T~bshcjy=OhpkK}azh-rijnddl-xDsB1X6~o0-JceXOg^Nc4nQ8#w4^mi$yOdGtDjwpf!g2L+b9 zYeVEq++07+*m>Y%uO9|)nys=>%_pxQjr2*eyfRlZT3nIBTVC@P7w zwZ^0PP572i*zPeoiuk=^X2boEYBmfNBQ!jpp+ zhqRdLA-bQ9Cpq{Jl3*N@gC!SoClv*Cm}`qn++*XnMcBw*;GFj%BWv@X<-yPk6-Br{ zN*<+dlp8fx1D1+cUH)WVaDidV^8gW$C258WSKZ{iVvm3E?MF6$hZ!m;jS4J+F^p!y zE8;f)Dy{UOiSt8Sq>t5NI|&;any1Ep-#lPm-mt{=fzp?VOc%D*49!kovr!1`{{eKY z%@9^;j^dc?=Y`Qt1qqhVl&TL5UIeL-?=NnmT*hU1w-|T2q$O^ykAi+7=Y?ZxhVgmt3ULB^U$ z=KK?dAh&kG}53@R0m(2L-?MZxgpT^Om>-7DRHseVq(Hj_- z;1QJ9`y>;UZ9wyg?w9lHD>65_vz9v zRS41gDX1k^pnv;QSmT)GE zGf2=$s{WWsIgc{=5jEz|VVBjna;5qRG94iUq?e{~p^1MYe+X?YZVYooF*wQOfaQOT zM>(1NXsg7+XVt(GTqgMM_C;uUXXW-&C8I1-+mxaNx0-{C4zEbtKcFL}r}OVT1Hcmr zcH%6D4*NVr9g3MT3CU=d5OaEHLal#`F-ETA0JQ-MP`? zftMJIHpzNE!>}dz)6fKw!OJ^;ZNGkkxquQlezn~VS~t+XQpj?o>uul0?MAtTD^)|C zSM09F^ca;gWcjz0P*j#qMtdja`C2U#m-elQ8_Cvx*ZkHiD02U{#G}$AD=q8(4Ze-k z>C%nrbJQ4#I8}mtZHfxBG|J}&QOn>#GPDlhYet_{9mcbuN#$uWN45qBx;JPh^tl|3 zO1>jcmXxOgB01F0_{bmVnh62Q9@|qE&x&t0vVdHjO^d3?Er=V`W zWW}7$Y_CPUmWO%N410((5Aqkq!d;5bj9=(#-}SUb6tL#2q0ni)FKuC9=24(rpeV}? zu>3U!(o!cqj%gfmcKg|VQzvo+P3A0%8dBE{3$xZWh@GnhwadBxx?m_^K^>tUHd)|z zKf}(uRLj-KJuPC#*w3Uoh>`zqz?md>GSD-U&FHDO=3C7Eyd|1T_HH*RvVbIOpC1PQ zSa$HSyZ8fyUu7h#siTU?nzv>$Q203(j;!t`^%3Vu2!wN9HhpUzzqYc81`?o zowdF9LW$ys7~LF8$rq7R06W~-Bch14Ae%QPb20CnvHQV8@i{+KwUdKgm3tXUyMfxK zH5l3_8sF(^uP~gozbH~q@-B>wI@LM8VswG2d0y`4a9*tUSdS5(S@B72&4yWn~8q7lWDU=pK zi9!fbl;MPenI#7HVb_|0E4zr^?hH{sy1&~%#Y)Dq5XnZ4rO}8yT#~WarzCybT4E3 zPSk;yNyvy^!RJj@labF6*O4OiJfivQv7If`>jMKDP2@wayta0_5pICt@{0 zKJfd<$kS7nLvK;-iy{=!*A1o^KMM%?CPY$O72VI#|8<$sj>4OyO0O1bFdrP z&0>E{;w-b{Go%l#u-K8yA4&%X4E05EEnv(L52iF)7DhfhtRn9fkCO;e4OMjvPeS_| zUSF>H+#Qa!8@zK*sO!sAXq#FRl2MK&Xt-c}y{y$*n@XPE`OtIToMFW+IHpZO4vRrq zi6%T|pcck;tw(A}_L-fSQ%)e85QUMCbFq)}c(6^b8`$TF}O_FQS$hDQEyzPs=9( z+4r>J(MNp12HM9kKE2_>=T z-iVaSJj^6DznPVkysPi;b*!lyM+TB76)7M|3p7D>4&9N2C{uUwgeWL8)Q^lCB#_;d z<@Jye)(fTq%!b%%YJ(@`aY^0&d#k_&GYn9$1q zUFp*goUQO!CXn}wqX|iRva6SX8FocvvqpXUu}2(`+DE79E29!N;T(xMCuXb}V4=z3 zQwx2MDp_^l?dbbQNaW=FtVJRSuZ5mPWv@@S)r3=8J?*903)CY(z8_2^rOsbjN9sL( z!kX$0!p=`jKOliIKsFkL;wm>4HvOhFI5BrJsjitW6L1KZH;QwiH|C&&EcOl=IpP&~ zRGhbl#z)agkE9JZ{ZoV3=W#YzR^u!-{9>4@XWgQ+swPy?PvKWyIOSf2=cY}mw zD`X8{9--h0RLs*k$#7W!x4I(BV18F5(5soL&<$VUG_yj2K1UM3&rj4$9d6_gwvpJq zJr#?^f1?2-hG>&)qE$XH+*MffP&)65~9jD{;Hu>RH$io<{hH68{t}!QqEt@I~ zFt|T~e0Fttec90WD_2mqTIq9tU3qlf@d?x}w_Ke`A77ThEa;t&NYI!<+oq8I;~_ot zHLU;=%*9q>-`tr8+c=(^o=$>ndQn95I^K2-sTNB$q4awM9gmV+a5DeIiI-|}%`W5s-=BIk^H1nl*k$TlFcmJS)YNDEA0cK*lne6ff~#je%-7~0 zFlW_HiX^GD>LisVXY{;&$tae6kCQ2eK3)vC88+Xalq?Ibl+Y+LOTWq|UeQu1gGJfw z3+Yb!_z^vd1A&yp^J$ZKPz1gKK#1z zr!z_T>Lt-uKEu4m-(vjyJ6xot**fH6Oj8)aks2%Kz0og6&THEn{q8%~`uO=rf6Fk$ zUIj~+VWpaSI`>;{Y1>>T_PAOO-OPmW#CX?g7c%~FJ0ZwU@P4{p>dazP+0K9=3ld?2 znr`&2kl*vZs&r-g_qQLsia!N04{*?C%`i6yt1pl+Yn@8$8t->!VjzHukk;yvq}0IZwuiDfUO<6W2QcR(HKA-Xl}PDILQS;nx_j3)J{}lr zlr1m*cZ0~_?h|kZmL546v6fg86-PWfr8vb;5P7qlpL|Z+L2)yOF~_WVoMCl(ed4`= zS!D@Kl>DlYv!bM@Bw6A~n1ig{vU}>3cTR)t4!#~EBb8nSi5PrMbmBAY%3iJ5ZuM^3 z{wY#b_wV8`%RQ0bjBzBZ7-ZzY|N1fi=)5)J^RH3f9Ti`TogU_fb&g4>VZf<>4OaTm z)#sj^g7Tj(Y414pjq|4&Eq&P~|$9jh{#>3kq?XsS68?fb{ zeu25*mBDwarVINQ@)^*yOm=);LU#!{PCJHTbhK1!ZfmJ1$;tT$uaMmH9Byy&uL%dE z>~7VfDx|kPJ_Yt0*wnA^3WvW#oMkkQ$WpbK3=HLn9d@P}>NVhw862dZHuu~nsKj?J zsKDE!*Zf1VDVHM8(wi?lJdUqH342`;>!{=w@W(6NrJPHB(xE=Di(kUUuTblSn z^&((Sn)RBE=QMjqS4~m7KAnCqUV+?4aw+3qyp$_v|9YZ(LDb328(uxg26ERm%fR=j zH)pnE!5k9=N1dpU75+Tsv9k+xU~v~R!{D+HV@8VsrskVyU;ji&kI?>Ju&MdyvY;3F zYpVxMK(zX|=g29Jqd1ai={Ybbhs~U>ppx%@M2$G?ok-UMybU@ZUs!&!e}(UyO?)52 z)Y5bOYze+_X#S@H(c3#=Hq3Cb9D8LLdR3XNVFI96qsE#q}aBfQQ1fIDMD zSe^!pk|YZnMH@OY5KZYm4TqILVNqeG9=P6}*Gmm6t9yaBm!q^x3tvQ*f8c%`g(<-kNiQ2mVKIpje@Cdv835^=Lx5b$0KGi1tEWWT1afIoLE zB!8V#n1xC0KF;y@9vd``Z*Sn8E8B@jF)#S8rk`zC9Jx(I_w1v;;Mmk+e%!rS&K1z1 zR*@Q$i!4;kJ8MnnzScpJKLg$VxwaJ_vSRy!tZ`cJ zc<9)Cw42E+2C)$n1F*c?XjF(55?Vj;PWk(VU8Voba-d5cX+D{R;>GGt;bBKuF0cRH zN0Z7M=Tp<)U6p!e3xEH9_4N@70=Sa7wW6waiq+b2ikI;UhUyx|oukynz(Osq);%~j z6seU+wPCd&nbPu2>-IwB{>HY@-}RvjKf=iWxi?pWZ#a${f2|!iuHQz>n_Rp@L>)D{ z9mhZ3apeWj<>9*o1oRvtfh_YH~co?w??LVVTBzkvw#w_w5<_wnwQ(c{4$ zr<4(u3#y@AY?D`j2+)SXT)wE_0;Bu#V__05m<(pV6YRc?gw>#~+h;h-t%Yt6Dc>PA zPfoAzSXUp2RQ?o%Bt1i+<)J~61HwUGN1-}|c)cBf^2V`KLw3vg2~ep!ZyjBva34)! zH5ya2YEvLKU*I;`3MhiOtK-|blXk@UyU1#TK{;^(Maf{c1&3_QaBh@kvC3M68i^# z(H2$WhBPo9TJFI>c{@E_8|1b*A;cI?>DAI`S`}YIhqiH~l2f(&sCBG^PX8Vps`~ZM z${Zb$V(kLtHCl@=8Rf=t&Gx$bk$~6MyE`C+u$m2CMS)R_9 zEaP3`0iX_KE^=n+dL3QT0l2}*nvj^7TaFmz+U*gG_i0~Ot@Tgc&|V3Z{ZdP{q@*@= zC*%IED8Mc#>ZBFrg!IK2_c!YgugpA5SkYCS2xicYsNZj!Plhb+iEb>n`v^^#8d6du zQY7%~eGVG^zPU%FD-h2@Vs8kx%ogx2fh0uc{vnGMuWpgDN{T|sHFaQ^W*P{g62^3Q z7zPQp-S#&cE>gR&Suf~eYi)f2JT(qq<+N~CUzFUBWlUU%_ahPI4@oVQ}WCQsk zb5ILD1V!p6Z9}2+T!^ZHTrl)w(hM_<&f3At_#-aT0Qh!2!2VX96pL$9bs9u&d?pPX z)6)0bOyQaL*9zA3VvYu1tIt#wFHeAt0;iqY=9l2O;B??{*Rpd9#{~=e;;|RE!WN3x zYTXe=X1i(oixh1qz>wo!?qjLzZhAGY%dGRd3?(E^%5NqAdE227(%D#OV+OgztiuoN zOji2b5;eLX{$L}P7DC7nNEpWSSy+nM(zrSGvuLR5dm;|caSn+f#pZ=ieVWj8Sp@Y0 zttcm}@-!%KQ>!)ItWSGPGJdv0fsVbXj^g!-x8{ZNzz~js=}0TuUB-$r3KAzLhWDve zZAIEVWunj$td2v?h55NsDMG21jEI3C=HA}qZO!-g^E-<_S0)6;FbSq z{hUH3zUD7xh*H{^@HkzvK0$q4PBoe2}Nut#)IfQxmj3x ziRA~c0f2SRs_uxkOT~AoNNVjj289t)bFK=3O;yPLpXT1eEvhek`yCo2MCp){?oMeC z0RhpOp#&6$E&=II0VzR1qy(gf9zu~2kRDo*lJ4%Vv-rO6?_8(;fa7&pY?!^)+H0?P zKKK2susa4if!>V_E+}wvOdlN{&`dBwJhdgFL}Rg@36%7IzKtqAT0K<+y;qj`xFgrm zF-!F^h2CpOuw9DOr1alMC{&@Vg0@(n*D2ccnq!pcIXgCa4Z)%c>e=K<3qM{e%g2nU zc^VU~E);Dt&c@_e-Im%_8w_XUF$?OI6BZdBf=frUFe{ z1ty;rZY4iB&^L_eO>bmg^xh+JZ%#vc-9AxJdT;^UW;88dCHomfFLFw27|mYzooRaw8oT2k|OS%z@6TJ zqYbU9%bkE50{KhFP5I1s4RSW!nI_7MLv$;DHr#-83kVRgV;*DuJk!DgExYeR&AF7= znq~zBrDH*IYp1RR>D|5br(ArjmanzyE@RX;+7KpbfS2kF3*}vj<6Zr5bbw?)ST;_u za*wHN{JTR2OJj{G?V6m1x?_?Dts=OLt}hP+_KHnUc7N@3WOqKPOI>l^dy?qn#BM^Q zAlJAzxL1P3)AOGcJ{_0COlDo(0GlWSI7y(#P&wj|3}?b!Pec14bgm%R4A z=S3%8(3*RbtTxLw)5ptS9`JcEEeb*gY#{iLk}bNqhJ?xlu;sE3He=Kn(B2J&P_E>? zGuKJpV(wpqow|!&vlQ56IG;1U-u*Jw=E)X8J)#!m(l;=Q1$WAY^>hOo+R?s>H_Ed zqb_cIg{E_C+mwilpDwRo4Xu2+qnOXVY9mV9^l)|w?J&BXLW9UJ;zr!tWF_Wp50o#> zzoldakuDcxM+PAu7XP4Y8DI2UTvsZHHS0wl z*hIpzFDzU)7BuMe^Jz9vnCKAUm*MNWOVPGjMM$}9WLu3^ElmnHUaIQ1r>8#KFJ5`Y zQ^k;6&DH2V-uwHR#^sfsFwze}bw~hXC*-KmRJ5cp(o+`CCpkCDT-Y1{gMtF(>lBd4-% zOTyNtzQ35k<$Z9ue>Xv}09?MBb8GJIF|q2x6WJ>cTbC9>0P08Vquw~;&Jm#h-Rv&h z5*nQ?L{IxT?b##tF40XK=>7aGaOw0WIuow^SIy&ScJ(vc8G{%ekG&J3&S+cFIOxVc+) zaWgApB+`OzLBP(;stHCqus^+P8R(GOyM83hjkKejoam9MiHtOefpPT$yp=HN(h0$&T z^;K>(oR_gU$4A*6h&d#q#j~Y>6e(zIBRbjBK?Vdu%(p$iRnf}Q%$}5|oL+5MtU8i& zb7Cf05QYnaDpUE3I5rngTy9*MH&hmQn(MS=Y%S&)pYA=t1mQEo7GJj5=UVmJ_`X?ljRkoj zjO7+o3eDD;*UU{S5lM@PQE-kn)2F(!<*Er=x#B$rvxE1sLQg+~+R}sC(sMR%W*S@% zVB>tswriCf4|%mCJRy3R<^4^EWrbT#hvmV@K{zp}Y20?IN7ge2>-&HOIAxm3Vn8mh zkM0A0m3vk)X#P*{w1LBV`bFSb#Sk{6K`LP0-_q^Tie37qVnqrKpR=2o(uMBW>TXFg ze{eu!KnX9$sF4F;AL9K?7~sPhbG0}bM0SXUNu+bxICw1erv%c(nt3*;@zRKZN+D#3 z{p0)8lW-q zoxATdJgR*kOf2SYsU@>krKld$8&nsa(~n<(ZtPe*w4Wgofp4wXd>spi zE)U@dG_l77$;$6=Otk6%#F@@Znm!1?zWw8;JM958db#EAyOI0t)?`Ta&t6U){wG{* zL;DeF(6?YSRn2$=o_i}$lK|?*4|!_(bjT~-G+d^hCNDEkG{{SwZV7SL-hA;rBQaN$ z(bNW%l^2wict8Eba`WV!68+W$lZsAZ3Ii_J$l6K;CFpY>9R zj#h5{{HLqcq->QS#^r1vKk0b;pp;arZH;sUAs9PcqQzhT>^7TDtDF(I!}H)a1`ego zZ2EN0rq^RDrH+~?F8=U#QiSGK3DA8E+)MA`L%;zwXq@o4A3^Ff{)p-DW4< z-JeUir9k^!EXwZmjqNaoMP;|OkGF}Bb9kWi^d8z!s;?e9^A&H^GP(~@GGxhSeYvXO zxuR3JmIbf)Q+~W8*9!35adWi_lf|>w5B#$_uj9F1x;;&EN^BXgZ6jAvZJ}T2Pnc$a@ z4&@|`=&{9c6W8pY1TmKh8%JWPN$@EETtixy=6NwgON0zY!ciD1=b+x4Laq>W0s{XY1sTk~oIVZCZH=f$|XSMIuWKjUfdc_ZE_CQsw zBsMdOrJ1;!O;#CR{dK=E-tmF^C8U)gX~7*T5kfl$BreBpo5T#M(i4O32;N`0nFLft z@s+>`=D!A8w!bjunSE4ml?+vULd5T_VWp`}zWbn@Ff@Z}R%+swGdyOf`YZ2St*!tZWyzKXqfH zl@gwadF#4FKc7zb)geLeoP&&p>LJ_eLEGwz>V*X*8yyd`3j@KpI~H9;5>m6rzxcBb z0Xu%*j|@bFo3!(*9(!4nJr3y<1LT^khM*ERAghL;`B+i=-xyXllNtqSct4IJEX|M3 zC*<9qA$Ef{KEO+DI8xUA?VfX1J*q8p_IFLSy?4YXne$CD* zuv|Qx>)2s9lv`nt-;P>%61prgumuo0jMi zmQ;UuVcd&EmT5%@pZ@zI6FYh`E#{!apmA_`y?T5{tF}g#* z7+p{&u?aiL`^gveWQ5=hDMske4OOR{ArKU}e43iMkxq}3&Nt9osNxM^bhVt`lJ6Sk z7!2G_C85iI6oq_LO+a4aSbTd^(X#q7t*(b%_c|E{@46&FhoI%9=bz{j$a<`I2xR`K zP9cmo(fiSbV11|_GXp00qxxDNT6Z%~sbpk`#p4z8x$8KH?>iYEIRZ`txABpEXBu3* z!MIJX#Q9Ancv6b^>+N21c_Y0vrjQyXr8um5FbzKJ`cN%b9g_YPCJa#TvOlbIqT)eQ zZj!^icDR1SZf-g+jeU>k>XE{w<#vO7=UjhMW`P9*2poR-x_LufPrVwDITb~v@=tYM z5}m;*24;F2ikv4QSgS{!#mO+3YFb70mclde{9fI zr12)qM-h|GYV?-iT?+x77BdH3%`yzJ_u`E#+XFP{jC)BQ^dGY$W!u-bGJdj)#3H5j zUzvOQF1Xs|nw0av8oAp_q5!WC#rzETxHN}a4{FcaOfA-dqVq+*R(#*<2M$WZ1IN__ znX6AJFNp;@t;I{9u|59Fu`&?~q$Li-s#8w)!sg+{kyab7fBg=m~tmjqp|3Mfc2&WV5W3 zs-GmCyVv0-MMv(940_Bi6lXIQxmaCHJKuMBBghcWQji`06VF^mt)=oP*BEO~1dI&vw@6k68nmlToTzTJlQhz=(E4a#|saflIB; zUpx-Qnn&*vYnVcnF>o01M)r}_xK>nMFVf=w%too$kU_q9$UVz^x3={_`mVI$NIFV0 zMLi^ayIt_m^RKzU!vUtw3dYk|IGeqfuj_-;40c^GLx9jzNcqjyOe2S*LvKdRy{p}R z^xNs_#>BEzsDnN!%*24#9&m~1&i%gop5i>yTVXPU_vKl`#4+EbTkz+le?_|n+QZ6Y zt3EoiQNbQBY}&$c5CvMZ=8!f!GH5*lCpO0KWN*Xbt9X#V32(zf_5pZJb$l1X_B_dv zq!fyunF=B*@uCP_pjl31S|4e)CUfN&X0XB0lKGc_FsdFbz6|>!y(BUR z@zSyP)6U7)K0^cKl?jqjC_`>6XATxQc1w^LW7-N){{hog>p4LNyjKqgG)P)GHX?Pqxjz_JpNLYI-iSe5TJoaQAx)}4Hz8Mw-P*kjl z%Z8?clN$f^wD9XE2fz9}*x#PRfEwbwZrvbhh+XAHtvIty{4Z1GMXBSew0p@QyM&ur z{BPT8amCo>e%(Va#ETeG+YWx#)TN8gDM>ArPHr3E=6_R=O{c@ZwqXz3Au!3qdVQe%p_3k7~4PoQZlrI+Eson*; z>>kZjP8IKy6zbOz)QC2VN+hQbBZ~XRHCmim!DJ%zQE<9&XQuM){H&(y9&g@72}1Yu z)KX&v5FeCME(U$ZALa4_-VzUa$vG7~9%((2sV3qtMpa%^#5)GK^sbHD`z4gS^!ul_ z)Sph@eh{PW#NZ%Zu~+v>^N7=^ZBty_zZ?_Mz^7#&mqo0}T3DFrQY#gngW2UXYwl$tTc;c0;Q4V@7Cg*U2JhR z4mZ)X>9%Dm3=8gs(dos!gs-t7OEUd~p#_-&kfrH@;t?dgd~^yd48K#KBaMc}ehaA( zcy|GyG!Pea5>OSoT|)MKgsP#YkPm1W>vzMLTYkbKmClU`LF}gZAyMRpUJ+4(HoRSe zq{s};_RE?q>Nh*$-lDIk{3pNttoIB)2Jyc-n|c&unN2ZclQmlYB<68Oqx3&>&L@Y1 z&Cg8yfaBw9L+zvxSy@>^DLw6-rWN{yXxl0quh>JES*Kuu@yc^|!vKaKN zh_3`LNYP^ylNG>dPaw$qi_}p|Sk6wm+lVvOno|PLBipD>9ktW%L-CI6Iy7)QS?8Y@ z$8?ux12+#m`#`t}un5v*ixv}|;r|8h8cuQvnbntbqNKam_IWjz5o>0L?0c5Nzjx+w z=##Ro)IXjJYm+MtL^hgC|BTu&VC$Z>Frb*B&rmy#>2O{m(x#{(Xgug!Igm<&rzwmo zQ&bZe;7D^GY$RSP6EKQ&Z zm+XqZX^@CJSW>%5+?&iCSwH&0BSQHx&(U8yTw7g+Fy~JSYT6#m_8l8d()Tz><_vO6 ztk{r^SZHcd6gP>)sS1p!pWmA7^g=MTk`o{aTN3Z_>U z@`ZSk6@viX{BxWhmwKzYG)Ao5QOhWcFF!Ar0$4cCYGZp);!7`uvHxLYg3#edX0q6- z!>sb>S<1D&%-VijWMQ+{Lf$8FSQhgZ(UK}7RXGt;5^`Ks+)5U2k!Ek)wbCG-=E@V; z&)f5d*atm+*Rk&pvLh%KJAanp@i>@NHwS#o$xaIgEE_%R?< zR9FpORpSCFbSC~!gMW`yi&OXij}{<2C1mxcp~|qbQ>%?jFp~4An3JSvbfb*>hmJ5@ zweU3W>{TYbt^t#7O#kbblvze^(LM39hOx<<`-stvqxeMN zA$6LTJY8VCfi%1R;2yTD4D|N1xi{$DDv4v6exB5(btr%Lac$)GLbNP1vZ+c?+KZY# zR}23|s5tm!4$U?@pxOW4KtFr2v*RFp9Dc?6A(xMKy+%4Vq`YaL|FH|oAUUY;QC~{q zVDQcEwtD+!|NVkyY_zq-`sh$wzJF5n$J(tuRn>hn%NoMRV9y*(o~`MGy9F}M8X&Cd7K zjU4BuKg`-eTpI%}uOpDAHN>E0{Ha8Wtp>u2I!bs$%&Q4N{7Vvc*9D43Sz}S4Q6e-x z*G-lN1OB=OYMK#b;%Gw6x2TVN0oP|Krz7P)r*j?)gXUhXDblllW1+92B3k21fM}P~ z|MYdVj(kj$lQq2s9cUI#_sin@i*M%par7n&9{A)$Gj%>AO7f`oQljc8$g1^yr}2hE zv;4tJRx+ZsFDC1+?05t%TH|>&*A)a43gkYP>~LG^*~IuK5ycL%lj|5Ll5nimjk%}P z3y07vH_`iUnfBTieS306iSGHP0&}XFT6=F}T@>=2ES5-@x^;Bi{inU7TZ8k5hS=GM zYYtl~Az0X&d9dfaD>z&=HrEu{T3<9`JYV2#d)~FUl=8|X6ghquCgnBu@>!6K&l3jp z)`0IBW51V7#e!Z%85WzK%J-ele6uH+4jY?Rqg*&-M8e~yB=t6rb?-|ycd zCx?fNH-xE z1WJuu1U+A#QjdUmz+akSbF*+BN3#!VZFVT+RcMMz9m(9mz)$SJW^;pNB(dctF)kz% zEUI|!B=v*}kAoi{c!ieBcM$yGR~NA$02e})7*Yp+s+6D?UDUrhml!QgNL<=Pt9Hc@ zs`0+CGDeEq$Hx@YY?y(XNlJ1WU2e?0JORjtC#7$jhaDvW^4Z7+r-VvDW0$ny$I{Aj zpSqfSp`+o<0li}>aZ-3RN*czMcsz8kL{`Iaj;bL?p5e}DmvA0s* zpLKfky-EzrgrQ@XDx`Oi8uiOsv8NzvW!6g7_sI~5mU!&-)XQ)9`px{6st@3S_dTe00JYj@=7y@Nb95*)0plS$k3Q)@x5iVsg(W= zg0vur=(n$1YPsy$1l^&oZA({whNg?Y)o#eofX22_J)Pa75i$TIh65Uz8KdV0 zvXFG2{qn%1324Qw@XG1~JQqjzu31+sK-v=4a~|SYQCSy0Yu2hJlO#aO>woqseQU>5 zpvEb=U*b?gw#_qoP9WA;Q1qhbHl~tA0-|4+GEVn^BKLo@9{=}InQ0Bxno`q#?4q4K zqSrnv*6sI~>?T_}V{jp%=?>|MOR;Wyws+30B08wAT?$dz<9g8yUtd~ZuJqHNl;W;h zkuV0_xqi=Z(+F~FRUmjtq&;e}lf;6)xEh1_CZO{RvS5Mx;P=2t8}+rBV0e=+_;Gso zJgrkjt}H{L!hgBK3arCIxZDg;f~J$&&AYAz7gJ|1AkCwC&5L&lN2#+8pM`3NUxRo* z2y^crS(a3>^$(t8kpvZUKxXOAhkPl|GR@HK=>mR*T9WlNVLfNL93jt0xgW;u&Dg2= z{KsrgF=sh~QM{1T-t{jR7N;zQ-zIQTD|Z zCK9=o1L~Vb_iE?(L<*6T?UX*+*^DO(uM$6~g*rWZnA|!{d)`3YCzp_tjn}~ax#&y# z!&-vLjXk{Jl|XAT!)C*~t)1x|sp6KomFoa*P z+kUk-r>T9oBc9#!m$5oG$wL2UfNU=!;Q*sx-)*JE-wLlD+B1&Vw%6Y}NGGe*v`XzQ za@@^TrB!IYandt%3|L_aLLFF-Aa)_uau{aed6ObvTarp~a7d-sGVtDI!>5y;_cxJ> z%~-V2csFx4|Blbg9^mehuUd-RYi3M-oSK$NMyr+in+B9T4{r_NU&l0}y+YI&uftWp3^=H-<(2}S zmOBXeB&nv-8zkrbzd2AC^zmMX{Dv2!LHnEvkYjhG63JHFlqQsnxo@g21mKTUeI3z+ zoR$o=4u!BmULAg2z&q0=f%`rxEfp9Ua;(?Hqq7IpjpT6u6w-N5LaJ_$3B(INHQ@_r z%fH1dey{7R_r3(Bzm4dto2)2hP^oqO+`~-2{@qHqu^0U}W!c&$0l-&aNPVGU5U=)6 z{Xfs>1J4)i{kXZO{qG*N1qkC2ezIe-lf^&kbJIw<(3l=UKXUN9g-K6_Qz%UnJDP!` zm5f00EuOmguEK6;zvE-WCEC3Ux?Csn8Lz~YQ-Pi_#;A~_B>saxAz*LNGtA~E{%mTm z-1|t_$;dP!cPTO9Pwszo$*Ufh&qNCpW&yMLu$?>u@66&mKvV09S{VOovT?VB6{X2%kw`N z9YunHZ>B50irqRf)ZuhV;D(EJ9XL79e;$y5-8rC51S%o?B2PekpafprV?u6VMn2Q7 z`|(rQui2oy5P=M!XpvnSJoor>LGy}I>qQS<(IM4cktp=_s@@cU(Wj&8oSNG%&g$COnH z)Enod=>m$hnrUGD^V1J??^AV+l*v^^h*uWrAdhLXjgNb&H_iDZy}h4>M9FTOP<$rj z#|qb%X=;qFzo+7~o!0}`k)Dko1037wH_MKmu6nu~>=`Es2~3Q+au{`hQ=}i20Xx^# z!mWa^KO|PhPl#C3=oQ%)C!^M07K10l9Dle>lO25aktR{`=Xbygf5A+8ESGXxV_;=UQ%(`hvS!GXVi}ZcE~a zp&b&i->RR7szA?BPoNm)lq2YdL}ZS=-(0LaaK(e^!dUK%K$n^$tg41tb-Cu#sXk8TiUUbs_(RI>Z-^vkuh>#MCSTth}j zJ!Nx`#ojMFHu*&BTxYI_A3Fa0?hfu;a(%T!HKTi_z8a12SCW^R*YC8WPQ9IHF+ib6 zk{NYM`mSJXiKX1s?H+p{#g=V|WF^3+HO3Fl+NTX}CM?QqQH@mLC`R^@XFyfQz4q!J zFO1>LPM$P4_+=Xjg5hPaTTN{3>z5~r=iiJ8`|>HMc}Kc4WL$;PaAt{F3x*^~h@^q!;p(}ttGK`2mfI&A*_!fkpVS)x&( zqaVtyB0lhqubw?jX8fCny?Vy(6j}or_@#8k_0y!A<3(L!ANudgytPH2^SY7qhdVTA ztqgx^ms(&Da7hPlQsg`IJ? z4off9vncn?T(Q^?ajSOjb2f-`bQjrwumjdGeGkwe_rNC^SA%j2U()HyKJ|NBe;wk zeB_eU+J7i=ion*${BGe9ffvmM@4c$3>LpEY-#T}H-6c&Lbx~$eN>wQXrZJwErSR11 z;;!y#8I7hk-Y+P*%D^+;!_QyUDWn|a-nk_rB{_EOd23;!mS846^i!f9YN z`fsLCj?0-1*PGb2OJ>VHX1<=jwj24@8z!7U>+_0?p2A|YN(ruxHYCfLZ(Oj?BVg9m z#x#Cn2{M=JKWA{$L3K{8FWW|g}{oLQ%b2f&q8v8W8M zztR7`!v(ov?akD|)PNf!P2}K_L(%gx0f^L*uKMu%7BFE9ruaBcl@a!FF^;sa3HjWn z$iXeLeJ{p#{s;kq{~U8{3^Q#%;pECiUg5?afpv-7@A=W8iHb^FQj*X|PN zf=OuQ%1-H>Hz;WIM*OI7qNIve#28Y8rRmQa8C=VkD><~g+tziXM$NijR}Ox8(yb{o z+|t1&2q+e4?TS-^B70drJu)trO=X(Wvip2CA&<(w#nb(j^s10=wkq_#*|}PzJXm ztY3C1@|_v4fuU89vB-gAyPq}3-0qbq@rO7m?gUeWSfjeHYM|3mcJtmpgmQnB)dNHgrA@l;`-`W)>x-cvSR z^X@X!YKV>y*GXNKg>8ocS7Ac1ybzjuiM~Nt9u)!6RLTjy}3G z7dl@gdI+`-_7Aw-oh)iyQgn^l$2}Q z^MDDR&rtWiGowi?u%q=jujIr7Fq^%X5@Sx$ks;zIlqBFWtZ$isi=6IqEF83V>?cSP z2%7CTx!wqyYFecywGm}jZMh|g@E=46mWwyHFK&>6@>^7Os{*-d&s(g8QO&&475R+` z?~F<(U_#nHts5ko%@-Fv}W{KVgCAJGXK0b8=3a6HeVH z6rCA(;sydD-MKIvg`yp%g(kw!q%gs=(`D&h8RL2&xR~*~Aa1(;7I2dJy#~X+BR$xz zGK$3(LuHbWY<_QrbC!xn@_*qlPp5NU)KTeUJM#^mifoYBFXlx~n0{91P#ejg!Jyq* zFW*u`LPD$OqlDyv4n5^V@AU;jm7Z_n5Lq>u272>1L+GR6qF_?3S~@Dyw`CV4r|=}f z_RhCpqFB2RZKJv1j;)tmPOnBk-M59+FuDWvz$^isDSy{EOsnfZ?ihM9pTE(o z_S(t*%wHra8{aD0yc+e#FpP9oTq`SN<=-?-nUEO7 z`E?Dk>*f^EE{1AvnZTcu&VA6C)#guVxlLQ~+>!gC8nImW4_J6~x`QD{eu#ECcb_(& zm+A>Hvi}|8VC^f}7d{RgEe8v$6vfXL>{IWVfqJF~PB9zPD4FtYgz%ZL;&I;kXVM=I z51AP_W>ms7D*xcJdN(!=vt#W#L0YpI;~J&9Gk9P$b-(|HrI&bKt6U_AruErv)@XJD z6RA_YtLIH{3RPDn8y{EU>^+hUdjl!M2IWxxYGz=v7valeyO)EpE^PEcsoL*_ui6?} zf+ZZ30wsQ|J0pMBy!@cf>w{%#H=^;6iZ3@Bo;1d@7)*a>nTl{yz zQ|v?$*$JFO2;ICcpjz7Qz3TX0BBhPhLpKMA(k!DIuLO2%iqz|EgnCP7+6wqu;Y=6K z-AlO=QDe*2kPFsQZUZjkOEnb&m#)X4Pk^@)Lk(u3gL1D-vm>xB`z>v3o|cJM^H zN%>AnmK(^9as^@5l!J&TIBBQf*ZRw}b95d=v0VlV{RSqT-vsn_@k!qS2I_?n2 zI+}EITMBTcT25T@5}O5r+gZ|$-&moua`8WXK2%LsC}vlAFDxx;Sx-5I#!nU$yPo}v z+h6kXErCKq<;sea5yq?3g-mi78*x`HjIBu^QsB%Ef%z2TpI`W*n@fpoA8^!SUhrN5 zTC8_7N5B=Qy>2be=hRm_m=CFNuC>SeF=7j=B3qU0)&sKS!+yLEY=}L6z4u`cR)0rH zSOEbEcOnYlTK_f4qWfC`HyiTG#4fKEUIx7hSEu0}FtZUn{qj~IJi9P&rsk4?SKe}b zwisv{e#vO6*On$q>ARo~T^V%ao=}8Y3xgd7F(Ox|OEU%NMU*t(?Ta2?O72sih;B$( znDZOiCb$)ASia~wju#Rz;ow&T@nNHhIlqgjjliiOT01r z$WIePMJ?oCi;L$~rra+^U&D15GcQf%jx;|rSct%TrCV3)^A|RXkGP%^*uz=X3! zzq_v#CvDc@sOvE3=fF;?hgkmn+JptukLc$@*|js*C^wRab|LWA!f+E7M$7 zdTVxDCo{zF66*JhbniG;H*FD^7tX{Fs|H$0>M>5QUV8W5CWM*heNi&HaqR&ja)rC z$G~gG%ZlZTWbSquO)ep7d}4xY+77bQSg5R#S#PTPDgCs|^${v*sMOK;u)v_FdeIqh zo$^fc>*xm7hLFxA@;(+6274M#9hk@vdLCM}LMD$9Z(*crs{}tVC_VVHkYeBM2>NZs zjFh6xvnyjz z2ZujU$dsO8A-&wAdP;W4X7`<#j{I205!QlX2k1StG?ZjW{HiB zz3dD+JV|8t(OGyH8`IlQ2C5+beYI}h+)GbDITk!P;@*mPpBL@TefAJ48G)=J19)`! zcO+H=Ox&4}?o^*pq1Foe3Y1p6xkMyZDHJp6hXmNhe{9|opxnY5543Q&G|f%hokxql zU`)b>0<~WKis3evUwqR}r}0J$pNZ-fCO)jodRnIcKCnhwy@U;h4xTIovl>R>*{5^A z8_@k>Dn`1+TePWpEc<@34HX=DH|CrE$R7FNerDySBvd`gah^);c1q5TyfR?=$9l6p z>9h;t7#@WKKl%tr@#y03J^@=a3l64kt4M^{uI?h6N+LnptxH_(ID0s~Z5HbS1T?v; zG*E%yn8vme+x_8VSO@n#sG+&ey`P*Uz`2M?@r5PnSeHWdm3e@q8AYkbjs8S_4)?_Q z0A_7SKaaYhqWy&9Xz_ zS#M*tK&qb7akJ~Eq+o$GAqM9}0l%UgMy$;eFYBFtcF&(G0qg5f z#8BAL)d^XH*TU?0)oUbKv;2FjKqLP!$i~$>V<8`$TB;m2q2tGUTg>Q^zzVsbhrc_$3&iFEx3$9IXKkjYsASdhXMaND&y(zwpeJPc7SEmS641k;Z>+bq934`Y z{VDE~4{iIP9qs4DCTCbg1umnL*Z0*&tdZfCX*CBy} z*|x$4g${*pbpEUERMO6%JFZdGJky%*HjDsr&BuFuYP`QTwv!(koj*jtA*dIxw%=FA zA-`ZesmT`sC!zMG4}m`5P5ODK{tH17O9S`W|J5@ZX7`bul|XguTp>=ph*oQ}6Lb8r zk`1oW^4mlO?a-9Ds2*F_`#Cr!=HxSU2p`{qDLxMEtY@K+H+s>2f4sF_kT!qcF6*i; z6pAwEFtk-XIP#W7oIL1kNs}PCKJAo;>|Qq4lG|+LnQw!iN*ElFwa|CD^C6zenra zWS!-ho3sJ|zkUU2A7_)SwZBunQS6hysUuCaJ}`x>&d=J$P$S%)<@%?0g;Sq?qpcGD z=3RP6)Ls5s(xa|vd3BZ3jfZqBT>#P~&-{+i^K%lTzeGp5|J1L>1i@kAdiy92&@`z=rN2oZmPy~iVtFInq()`8EwNt8LG`n<4 zLxz|<9yZMBtw?bRQB!PX0Wm8=lfL%eP2^H_P6(^X+}wqlRb{?N?00xlq4{iW#N-Eu z<$B};^D&a4{uiysXDg=jdOx>s#RJN57B(9XMGPraO+1BhUc+}XEO!r>`f9CJ@rNWY z%1)=qN`E;Ze*-c^#90_1V;`}rTjGQ|(Z_!y zB_2eVVES}wuv}Jm6l|_GMfW1Xq*d$iE?V|3CV=ognVu8oq%n;rb^ER_abH4HMvpoj zZjJ3qhOh=5&f3zzK1WB3xSJ*>cKDy^d3B8V0eYEJGX3RQwQNA)Tq+dyg$-9vUr=8o zX?>-s8dS2>EG?q_&ghkj*W*8A46qnxFJtF4w2Z1+tR6&f|F(qN=yEj`&ss;a2=iP^ zb&Ty$S)33M5zCdE z^j_!~H>Bkan$ literal 17027 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 P-RnCl*`L%vjAZ>At>jlK literal 19460 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 P-RnCl*`L%vjAZ>At>jlK literal 19460 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 diff --git a/public/images/pokemon/variant/332.json b/public/images/pokemon/variant/332.json index e9b487bca25..336ef4a22f3 100644 --- a/public/images/pokemon/variant/332.json +++ b/public/images/pokemon/variant/332.json @@ -1,34 +1,36 @@ { "1": { - "319452": "831a1f", - "4a7310": "982443", - "7ba563": "b44040", - "bdef84": "ec8c8c", "8cbd63": "c54b4b", - "215200": "710f2e", + "a5d670": "df5252", + "4aa552": "9f2f2c", "a5d674": "e16363", - "196b21": "891222", + "7aa953": "c54b4b", + "7ba563": "b44040", + "215200": "710f2e", "f7ce00": "7aa1df", "525252": "123a5a", - "63b56b": "b2332f", - "a5d673": "df5252", "8c6b3a": "448bc3", - "4aa552": "9f2f2c" + "bdef84": "ec8c8c", + "63b56b": "b2332f", + "319452": "831a1f", + "196b21": "891222", + "4a7310": "982443" }, "2": { - "319452": "b08d72", - "4a7310": "4f3956", - "7ba563": "704e7e", - "bdef84": "a779ba", "8cbd63": "e3d7a6", - "215200": "583823", + "a5d670": "d7cda7", + "4aa552": "c5a77f", "a5d674": "8c669b", - "196b21": "78582c", + "7aa953": "704e7e", + "7ba563": "704e7e", + "215200": "583823", "f7ce00": "f2aacd", "525252": "a53b6f", - "63b56b": "cfc191", - "a5d673": "d7cda7", "8c6b3a": "df87bb", - "4aa552": "c5a77f" + "bdef84": "a779ba", + "63b56b": "cfc191", + "319452": "b08d72", + "196b21": "78582c", + "4a7310": "4f3956" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/332.json b/public/images/pokemon/variant/back/332.json index c13c07c34b4..fbfb3705202 100644 --- a/public/images/pokemon/variant/back/332.json +++ b/public/images/pokemon/variant/back/332.json @@ -1,28 +1,28 @@ { "1": { + "196b21": "831a1f", + "7ba563": "b44040", + "215201": "630d28", + "215200": "710f2f", + "a5d674": "df5252", + "8cbd63": "c54b4b", + "63b56b": "b2332f", + "a5d670": "e16363", "319452": "831a1f", "4aa552": "9f2f2c", - "7ba563": "b44040", - "8cbd63": "c54b4b", - "215200": "710f2f", - "196b21": "831a1f", - "a5d674": "df5252", - "4a7310": "982443", - "a5d673": "e16363", - "63b56b": "b2332f", - "215201": "630d28" + "4a7310": "982443" }, "2": { + "196b21": "b08d72", + "7ba563": "704e7e", + "215201": "583823", + "215200": "3f3249", + "a5d674": "d7cda7", + "8cbd63": "e3d7a6", + "63b56b": "cfc191", + "a5d670": "8c669b", "319452": "b08d72", "4aa552": "c5a77f", - "7ba563": "704e7e", - "8cbd63": "e3d7a6", - "215200": "3f3249", - "196b21": "b08d72", - "a5d674": "d7cda7", - "4a7310": "4f3956", - "a5d673": "8c669b", - "63b56b": "cfc191", - "215201": "583823" + "4a7310": "4f3956" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/back/female/332.json b/public/images/pokemon/variant/back/female/332.json index 9ec50cb7e92..17f8d3c5f74 100644 --- a/public/images/pokemon/variant/back/female/332.json +++ b/public/images/pokemon/variant/back/female/332.json @@ -1,28 +1,28 @@ { "1": { + "196b21": "780d4a", + "7ba563": "b44040", + "215201": "710f2e", + "215200": "710f2f", + "a5d674": "de5b6f", + "8cbd63": "bf3d64", + "63b56b": "9e2056", + "a5d670": "e16363", "319452": "780d4a", "4aa552": "8a1652", - "7ba563": "b44040", - "8cbd63": "bf3d64", - "215200": "710f2f", - "196b21": "780d4a", - "a5d674": "de5b6f", - "4a7310": "982443", - "a5d673": "e16363", - "63b56b": "9e2056", - "215201": "710f2e" + "4a7310": "982443" }, "2": { + "196b21": "b59c72", + "7ba563": "805a9c", + "215201": "694d37", + "215200": "41334d", + "a5d674": "f6f7df", + "8cbd63": "ebe9ca", + "63b56b": "e3ddb8", + "a5d670": "a473ba", "319452": "b59c72", "4aa552": "c9b991", - "7ba563": "805a9c", - "8cbd63": "ebe9ca", - "215200": "41334d", - "196b21": "b59c72", - "a5d674": "f6f7df", - "4a7310": "4f3956", - "a5d673": "a473ba", - "63b56b": "e3ddb8", - "215201": "694d37" + "4a7310": "4f3956" } } \ No newline at end of file diff --git a/public/images/pokemon/variant/female/332.json b/public/images/pokemon/variant/female/332.json index c86429d13c4..7a1dc0f1457 100644 --- a/public/images/pokemon/variant/female/332.json +++ b/public/images/pokemon/variant/female/332.json @@ -1,34 +1,36 @@ { "1": { - "319452": "780d4a", - "4a7310": "982443", - "7ba563": "b44040", - "bdef84": "ec8c8c", "8cbd63": "bf3d64", - "215200": "710f2e", + "a5d670": "de5b6f", + "4aa552": "8a1652", "a5d674": "e16363", - "196b21": "7d1157", + "7aa953": "bf3d64", + "7ba563": "b44040", + "215200": "710f2e", "f7ce00": "5bcfc3", "525252": "20668c", - "63b56b": "9e2056", - "a5d673": "de5b6f", "8c6b3a": "33a3b0", - "4aa552": "8a1652" + "bdef84": "ec8c8c", + "63b56b": "9e2056", + "319452": "780d4a", + "196b21": "7d1157", + "4a7310": "982443" }, "2": { - "319452": "b59c72", - "4a7310": "4f3956", - "7ba563": "805a9c", - "bdef84": "c193cf", "8cbd63": "f6f7df", - "215200": "694d37", + "a5d670": "ebe9ca", + "4aa552": "c9b991", "a5d674": "a473ba", - "196b21": "9c805f", + "7aa953": "805a9c", + "7ba563": "805a9c", + "215200": "694d37", "f7ce00": "f2aab6", "525252": "983364", - "63b56b": "e3ddb8", - "a5d673": "ebe9ca", "8c6b3a": "df879f", - "4aa552": "c9b991" + "bdef84": "c193cf", + "63b56b": "e3ddb8", + "319452": "b59c72", + "196b21": "9c805f", + "4a7310": "4f3956" } } \ No newline at end of file From e053ead67cbe4c19aeadb9d61ae5bb791c7a0411 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Sun, 25 May 2025 13:37:52 -0500 Subject: [PATCH 21/44] [Bug] Fix crash caused by switching in a transformed pokemon (#5864) * Force reset summon data and load assets prior to switch in * Update src/phases/switch-summon-phase.ts --- src/phases/switch-summon-phase.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index a063b6e6863..3e9cc7718f1 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -124,6 +124,12 @@ export class SwitchSummonPhase extends SummonPhase { const switchedInPokemon: Pokemon | undefined = party[this.slotIndex]; this.lastPokemon = this.getPokemon(); + // Defensive programming: Overcome the bug where the summon data has somehow not been reset + // prior to switching in a new Pokemon. + // Force the switch to occur and load the assets for the new pokemon, ignoring override. + switchedInPokemon.resetSummonData(); + switchedInPokemon.loadAssets(true); + applyPreSummonAbAttrs(PreSummonAbAttr, switchedInPokemon); applyPreSwitchOutAbAttrs(PreSwitchOutAbAttr, this.lastPokemon); if (!switchedInPokemon) { @@ -131,6 +137,7 @@ export class SwitchSummonPhase extends SummonPhase { return; } + if (this.switchType === SwitchType.BATON_PASS) { // If switching via baton pass, update opposing tags coming from the prior pokemon (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach((enemyPokemon: Pokemon) => From b803f6f18a9b7a921dff2910bfd440814032bf5e Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Tue, 27 May 2025 02:38:30 -0700 Subject: [PATCH 22/44] [i18n] Update locales (#5875) --- public/locales | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales b/public/locales index 42cd5cf577f..e9ccbadb6ea 160000 --- a/public/locales +++ b/public/locales @@ -1 +1 @@ -Subproject commit 42cd5cf577f475c22bc82d55e7ca358eb4f3184f +Subproject commit e9ccbadb6eaa3b797f3dec919745befda2ec74bd From 999cbf911e900723a433a8d949f8cfb2084421d0 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Tue, 27 May 2025 03:56:52 -0700 Subject: [PATCH 23/44] [Bug] Fix Pichu form weights (61.5 -> 2) --- src/data/pokemon-species.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 59167ba47f6..6f05d17db6f 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -1697,8 +1697,8 @@ export function initSpecies() { new PokemonSpecies(Species.CHINCHOU, 2, false, false, false, "Angler Pokémon", PokemonType.WATER, PokemonType.ELECTRIC, 0.5, 12, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 330, 75, 38, 38, 56, 56, 67, 190, 50, 66, GrowthRate.SLOW, 50, false), new PokemonSpecies(Species.LANTURN, 2, false, false, false, "Light Pokémon", PokemonType.WATER, PokemonType.ELECTRIC, 1.2, 22.5, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 460, 125, 58, 58, 76, 76, 67, 75, 50, 161, GrowthRate.SLOW, 50, false), new PokemonSpecies(Species.PICHU, 2, false, false, false, "Tiny Mouse Pokémon", PokemonType.ELECTRIC, null, 0.3, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, GrowthRate.MEDIUM_FAST, 50, false, false, - new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true), - new PokemonForm("Spiky-Eared", "spiky", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true), + new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.4, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true), + new PokemonForm("Spiky-Eared", "spiky", PokemonType.ELECTRIC, null, 1.4, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true), ), new PokemonSpecies(Species.CLEFFA, 2, false, false, false, "Star Shape Pokémon", PokemonType.FAIRY, null, 0.3, 3, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 218, 50, 25, 28, 45, 55, 15, 150, 140, 44, GrowthRate.FAST, 25, false), new PokemonSpecies(Species.IGGLYBUFF, 2, false, false, false, "Balloon Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 0.3, 1, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 210, 90, 30, 15, 40, 20, 15, 170, 50, 42, GrowthRate.FAST, 25, false), From 65a90a3a8d4204197e975f6b5da1163d5ef0c136 Mon Sep 17 00:00:00 2001 From: Wlowscha <54003515+Wlowscha@users.noreply.github.com> Date: Tue, 27 May 2025 13:12:29 +0200 Subject: [PATCH 24/44] [UI/UX] Party UI handler refactor (part I) (#5821) * Splitting process input for menu into its own function * Making logic for return button more expressive * Breaking up processOptionMenuInput * Extracting filterResult logic from processInput * Inverting order of several conditional checks (if the function always returns after seeing the summary option, may as well check for it straight away...) * Moving edge case for release option into processReleaseOption * Splitting up options for when selectCallback is present * Added some TODOs for later * Extracted setOptionsCursor function * Extracted updateOptionsWindow() * Changing options so that each case is completely separate (almost) * Added some TODOs * Reorganizing option processing * Fixed Baton Pass; logging for testing * Fixed case of switching out by selecting the Pokemon command * Clearing options when switching out * Changed condition on switch for clarity * Updating TODO * Fixed options not clearing after item transfer * Splitting up processing of transfer and move recall mode; ensuring that the cancel option works properly * Breaking up processInput() * Removed some redundant playSelect * Cleaned up some TODOs * Added private to all new methods * Apply suggestions from code review Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/ui/party-ui-handler.ts | 1470 +++++++++++++++++++++--------------- 1 file changed, 845 insertions(+), 625 deletions(-) diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index f6105c51ee3..74d4e5bcb17 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -52,6 +52,7 @@ export enum PartyUiMode { * Indicates that the party UI is open because of a start-of-encounter optional * switch. This type of switch can be cancelled. */ + // TODO: Rename to PRE_BATTLE_SWITCH POST_BATTLE_SWITCH, /** * Indicates that the party UI is open because of the move Revival Blessing. @@ -356,6 +357,522 @@ export default class PartyUiHandler extends MessageUiHandler { return true; } + private processSummaryOption(pokemon: Pokemon): boolean { + const ui = this.getUi(); + ui.playSelect(); + ui.setModeWithoutClear(UiMode.SUMMARY, pokemon).then(() => this.clearOptions()); + return true; + } + + private processPokedexOption(pokemon: Pokemon): boolean { + const ui = this.getUi(); + ui.playSelect(); + const attributes = { + shiny: pokemon.shiny, + variant: pokemon.variant, + form: pokemon.formIndex, + female: pokemon.gender === Gender.FEMALE, + }; + ui.setOverlayMode(UiMode.POKEDEX_PAGE, pokemon.species, attributes).then(() => this.clearOptions()); + return true; + } + + private processUnpauseEvolutionOption(pokemon: Pokemon): boolean { + const ui = this.getUi(); + this.clearOptions(); + ui.playSelect(); + pokemon.pauseEvolutions = !pokemon.pauseEvolutions; + this.showText( + i18next.t(pokemon.pauseEvolutions ? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", { + pokemonName: getPokemonNameWithAffix(pokemon, false), + }), + undefined, + () => this.showText("", 0), + null, + true, + ); + return true; + } + + private processUnspliceOption(pokemon: PlayerPokemon): boolean { + const ui = this.getUi(); + this.clearOptions(); + ui.playSelect(); + this.showText( + i18next.t("partyUiHandler:unspliceConfirmation", { + fusionName: pokemon.fusionSpecies?.name, + pokemonName: pokemon.getName(), + }), + null, + () => { + ui.setModeWithoutClear( + UiMode.CONFIRM, + () => { + const fusionName = pokemon.getName(); + pokemon.unfuse().then(() => { + this.clearPartySlots(); + this.populatePartySlots(); + ui.setMode(UiMode.PARTY); + this.showText( + i18next.t("partyUiHandler:wasReverted", { + fusionName: fusionName, + pokemonName: pokemon.getName(false), + }), + undefined, + () => { + ui.setMode(UiMode.PARTY); + this.showText("", 0); + }, + null, + true, + ); + }); + }, + () => { + ui.setMode(UiMode.PARTY); + this.showText("", 0); + }, + ); + }, + ); + return true; + } + + private processReleaseOption(pokemon: Pokemon): boolean { + const ui = this.getUi(); + this.clearOptions(); + ui.playSelect(); + // In release mode, we do not ask for confirmation when clicking release. + if (this.partyUiMode === PartyUiMode.RELEASE) { + this.doRelease(this.cursor); + return true; + } + if (this.cursor >= globalScene.currentBattle.getBattlerCount() || !pokemon.isAllowedInBattle()) { + this.blockInput = true; + this.showText( + i18next.t("partyUiHandler:releaseConfirmation", { + pokemonName: getPokemonNameWithAffix(pokemon, false), + }), + null, + () => { + this.blockInput = false; + ui.setModeWithoutClear( + UiMode.CONFIRM, + () => { + ui.setMode(UiMode.PARTY); + this.doRelease(this.cursor); + }, + () => { + ui.setMode(UiMode.PARTY); + this.showText("", 0); + }, + ); + }, + ); + } else { + this.showText(i18next.t("partyUiHandler:releaseInBattle"), null, () => this.showText("", 0), null, true); + } + return true; + } + + private processRenameOption(pokemon: Pokemon): boolean { + const ui = this.getUi(); + this.clearOptions(); + ui.playSelect(); + ui.setModeWithoutClear( + UiMode.RENAME_POKEMON, + { + buttonActions: [ + (nickname: string) => { + ui.playSelect(); + pokemon.nickname = nickname; + pokemon.updateInfo(); + this.clearPartySlots(); + this.populatePartySlots(); + ui.setMode(UiMode.PARTY); + }, + () => { + ui.setMode(UiMode.PARTY); + }, + ], + }, + pokemon, + ); + return true; + } + + // TODO: Does this need to check that selectCallback exists? + private processTransferOption(): boolean { + const ui = this.getUi(); + if (this.transferCursor !== this.cursor) { + if (this.transferAll) { + this.getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor]).forEach( + (_, i, array) => { + const invertedIndex = array.length - 1 - i; + (this.selectCallback as PartyModifierTransferSelectCallback)( + this.transferCursor, + invertedIndex, + this.transferQuantitiesMax[invertedIndex], + this.cursor, + ); + }, + ); + } else { + (this.selectCallback as PartyModifierTransferSelectCallback)( + this.transferCursor, + this.transferOptionCursor, + this.transferQuantities[this.transferOptionCursor], + this.cursor, + ); + } + } + this.clearTransfer(); + this.clearOptions(); + ui.playSelect(); + return true; + } + + // TODO: This will be largely changed with the modifier rework + private processModifierTransferModeInput(pokemon: PlayerPokemon) { + const ui = this.getUi(); + const option = this.options[this.optionsCursor]; + + if (option === PartyOption.TRANSFER) { + return this.processTransferOption(); + } + + // TODO: Revise this condition + if (!this.transferMode) { + this.startTransfer(); + + let ableToTransferText: string; + for (let p = 0; p < globalScene.getPlayerParty().length; p++) { + // this for look goes through each of the party pokemon + const newPokemon = globalScene.getPlayerParty()[p]; + // this next bit checks to see if the the selected item from the original transfer pokemon exists on the new pokemon `p` + // this returns `undefined` if the new pokemon doesn't have the item at all, otherwise it returns the `pokemonHeldItemModifier` for that item + const matchingModifier = globalScene.findModifier( + m => + m instanceof PokemonHeldItemModifier && + m.pokemonId === newPokemon.id && + m.matchType(this.getTransferrableItemsFromPokemon(pokemon)[this.transferOptionCursor]), + ) as PokemonHeldItemModifier; + const partySlot = this.partySlots.filter(m => m.getPokemon() === newPokemon)[0]; // this gets pokemon [p] for us + if (p !== this.transferCursor) { + // this skips adding the able/not able labels on the pokemon doing the transfer + if (matchingModifier) { + // if matchingModifier exists then the item exists on the new pokemon + if (matchingModifier.getMaxStackCount() === matchingModifier.stackCount) { + // checks to see if the stack of items is at max stack; if so, set the description label to "Not able" + ableToTransferText = i18next.t("partyUiHandler:notAble"); + } else { + // if the pokemon isn't at max stack, make the label "Able" + ableToTransferText = i18next.t("partyUiHandler:able"); + } + } else { + // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able" + ableToTransferText = i18next.t("partyUiHandler:able"); + } + } else { + // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text + ableToTransferText = ""; + } + partySlot.slotHpBar.setVisible(false); + partySlot.slotHpOverlay.setVisible(false); + partySlot.slotHpText.setVisible(false); + partySlot.slotDescriptionLabel.setText(ableToTransferText); + partySlot.slotDescriptionLabel.setVisible(true); + } + this.clearOptions(); + ui.playSelect(); + return true; + } + return false; + } + + // TODO: Might need to check here for when this.transferMode is active. + private processModifierTransferModeLeftRightInput(button: Button) { + let success = false; + const option = this.options[this.optionsCursor]; + if (button === Button.LEFT) { + /** Decrease quantity for the current item and update UI */ + if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + this.transferQuantities[option] = + this.transferQuantities[option] === 1 + ? this.transferQuantitiesMax[option] + : this.transferQuantities[option] - 1; + this.updateOptions(); + success = this.setCursor( + this.optionsCursor, + ); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */ + } + } + + if (button === Button.RIGHT) { + /** Increase quantity for the current item and update UI */ + if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + this.transferQuantities[option] = + this.transferQuantities[option] === this.transferQuantitiesMax[option] + ? 1 + : this.transferQuantities[option] + 1; + this.updateOptions(); + success = this.setCursor( + this.optionsCursor, + ); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */ + } + } + return success; + } + + // TODO: Might need to check here for when this.transferMode is active. + private processModifierTransferModeUpDownInput(button: Button.UP | Button.DOWN) { + let success = false; + const option = this.options[this.optionsCursor]; + + if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + if (option !== PartyOption.ALL) { + this.transferQuantities[option] = this.transferQuantitiesMax[option]; + } + this.updateOptions(); + } + success = this.moveOptionCursor(button); + + return success; + } + + private moveOptionCursor(button: Button.UP | Button.DOWN): boolean { + if (button === Button.UP) { + return this.setCursor(this.optionsCursor ? this.optionsCursor - 1 : this.options.length - 1); + } + return this.setCursor(this.optionsCursor < this.options.length - 1 ? this.optionsCursor + 1 : 0); + } + + private processRememberMoveModeInput(pokemon: PlayerPokemon) { + const ui = this.getUi(); + const option = this.options[this.optionsCursor]; + + // clear overlay on cancel + this.moveInfoOverlay.clear(); + const filterResult = (this.selectFilter as PokemonSelectFilter)(pokemon); + if (filterResult === null) { + this.selectCallback?.(this.cursor, option); + this.clearOptions(); + } else { + this.clearOptions(); + this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true); + } + ui.playSelect(); + return true; + } + + private processRememberMoveModeUpDownInput(button: Button.UP | Button.DOWN) { + let success = false; + + success = this.moveOptionCursor(button); + + // show move description + const option = this.options[this.optionsCursor]; + const pokemon = globalScene.getPlayerParty()[this.cursor]; + const move = allMoves[pokemon.getLearnableLevelMoves()[option]]; + if (move) { + this.moveInfoOverlay.show(move); + } else { + // or hide the overlay, in case it's the cancel button + this.moveInfoOverlay.clear(); + } + + return success; + } + + private getTransferrableItemsFromPokemon(pokemon: PlayerPokemon) { + return globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id, + ) as PokemonHeldItemModifier[]; + } + + private getFilterResult(option: number, pokemon: PlayerPokemon): string | null { + let filterResult: string | null; + if (option !== PartyOption.TRANSFER && option !== PartyOption.SPLICE) { + filterResult = (this.selectFilter as PokemonSelectFilter)(pokemon); + if (filterResult === null && (option === PartyOption.SEND_OUT || option === PartyOption.PASS_BATON)) { + filterResult = this.FilterChallengeLegal(pokemon); + } + if (filterResult === null && this.partyUiMode === PartyUiMode.MOVE_MODIFIER) { + filterResult = this.moveSelectFilter(pokemon.moveset[this.optionsCursor]); + } + } else { + filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)( + pokemon, + this.getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor])[ + this.transferOptionCursor + ], + ); + } + return filterResult; + } + + private processActionButtonForOptions(option: PartyOption) { + const ui = this.getUi(); + if (option === PartyOption.CANCEL) { + return this.processOptionMenuInput(Button.CANCEL); + } + + // If the input has been already processed we are done, otherwise move on until the correct option is found + const pokemon = globalScene.getPlayerParty()[this.cursor]; + + // TODO: Careful about using success for the return values here. Find a better way + // PartyOption.ALL, and options specific to the mode (held items) + if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + return this.processModifierTransferModeInput(pokemon); + } + + // options specific to the mode (moves) + if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) { + return this.processRememberMoveModeInput(pokemon); + } + + // These are the options that do not involve a callback + if (option === PartyOption.SUMMARY) { + return this.processSummaryOption(pokemon); + } + if (option === PartyOption.POKEDEX) { + return this.processPokedexOption(pokemon); + } + if (option === PartyOption.UNPAUSE_EVOLUTION) { + return this.processUnpauseEvolutionOption(pokemon); + } + if (option === PartyOption.UNSPLICE) { + return this.processUnspliceOption(pokemon); + } + if (option === PartyOption.RENAME) { + return this.processRenameOption(pokemon); + } + // This is only relevant for PartyUiMode.CHECK + // TODO: This risks hitting the other options (.MOVE_i and ALL) so does it? Do we need an extra check? + if ( + option >= PartyOption.FORM_CHANGE_ITEM && + globalScene.getCurrentPhase() instanceof SelectModifierPhase && + this.partyUiMode === PartyUiMode.CHECK + ) { + const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon); + const modifier = formChangeItemModifiers[option - PartyOption.FORM_CHANGE_ITEM]; + modifier.active = !modifier.active; + globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeItemTrigger, false, true); + } + + // If the pokemon is filtered out for this option, we cannot continue + const filterResult = this.getFilterResult(option, pokemon); + if (filterResult) { + this.clearOptions(); + this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true); + return true; + } + + // For what modes is a selectCallback needed? + // PartyUiMode.SELECT (SELECT) + // PartyUiMode.RELEASE (RELEASE) + // PartyUiMode.FAINT_SWITCH (SEND_OUT or PASS_BATON (?)) + // PartyUiMode.REVIVAL_BLESSING (REVIVE) + // PartyUiMode.MODIFIER_TRANSFER (held items, and ALL) + // PartyUiMode.CHECK --- no specific option, only relevant on cancel? + // PartyUiMode.SPLICE (SPLICE) + // PartyUiMode.MOVE_MODIFIER (MOVE_1, MOVE_2, MOVE_3, MOVE_4) + // PartyUiMode.TM_MODIFIER (TEACH) + // PartyUiMode.REMEMBER_MOVE_MODIFIER (no specific option, callback is invoked when selecting a move) + // PartyUiMode.MODIFIER (APPLY option) + // PartyUiMode.POST_BATTLE_SWITCH (SEND_OUT) + + // These are the options that need a callback + if (option === PartyOption.RELEASE) { + return this.processReleaseOption(pokemon); + } + + if (this.partyUiMode === PartyUiMode.SPLICE) { + if (option === PartyOption.SPLICE) { + (this.selectCallback as PartyModifierSpliceSelectCallback)(this.transferCursor, this.cursor); + this.clearTransfer(); + } else if (option === PartyOption.APPLY) { + this.startTransfer(); + } + this.clearOptions(); + ui.playSelect(); + return true; + } + + // This is used when switching out using the Pokemon command (possibly holding a Baton held item). In this case there is no callback. + if ( + (option === PartyOption.PASS_BATON || option === PartyOption.SEND_OUT) && + this.partyUiMode === PartyUiMode.SWITCH + ) { + this.clearOptions(); + (globalScene.getCurrentPhase() as CommandPhase).handleCommand( + Command.POKEMON, + this.cursor, + option === PartyOption.PASS_BATON, + ); + } + + if ( + [ + PartyOption.SEND_OUT, // When sending out at the start of battle, or due to an effect + PartyOption.PASS_BATON, // When passing the baton due to the Baton Pass move + PartyOption.REVIVE, + PartyOption.APPLY, + PartyOption.TEACH, + PartyOption.MOVE_1, + PartyOption.MOVE_2, + PartyOption.MOVE_3, + PartyOption.MOVE_4, + PartyOption.SELECT, + ].includes(option) && + this.selectCallback + ) { + this.clearOptions(); + const selectCallback = this.selectCallback; + this.selectCallback = null; + selectCallback(this.cursor, option); + return true; + } + + return false; + } + + private processOptionMenuInput(button: Button) { + const ui = this.getUi(); + const option = this.options[this.optionsCursor]; + + // Button.CANCEL has no special behavior for any option + if (button === Button.CANCEL) { + this.clearOptions(); + ui.playSelect(); + return true; + } + + if (button === Button.ACTION) { + return this.processActionButtonForOptions(option); + } + + if (button === Button.UP || button === Button.DOWN) { + if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + return this.processModifierTransferModeUpDownInput(button); + } + + if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) { + return this.processRememberMoveModeUpDownInput(button); + } + + return this.moveOptionCursor(button); + } + + if (button === Button.LEFT || button === Button.RIGHT) { + if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + return this.processModifierTransferModeLeftRightInput(button); + } + } + + return false; + } + processInput(button: Button): boolean { const ui = this.getUi(); @@ -375,463 +892,120 @@ export default class PartyUiHandler extends MessageUiHandler { return false; } - let success = false; - if (this.optionsMode) { - const option = this.options[this.optionsCursor]; - if (button === Button.ACTION) { - const pokemon = globalScene.getPlayerParty()[this.cursor]; - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode && option !== PartyOption.CANCEL) { - this.startTransfer(); - - let ableToTransfer: string; - for (let p = 0; p < globalScene.getPlayerParty().length; p++) { - // this for look goes through each of the party pokemon - const newPokemon = globalScene.getPlayerParty()[p]; - // this next line gets all of the transferable items from pokemon [p]; it does this by getting all the held modifiers that are transferable and checking to see if they belong to pokemon [p] - const getTransferrableItemsFromPokemon = (newPokemon: PlayerPokemon) => - globalScene.findModifiers( - m => - m instanceof PokemonHeldItemModifier && - (m as PokemonHeldItemModifier).isTransferable && - (m as PokemonHeldItemModifier).pokemonId === newPokemon.id, - ) as PokemonHeldItemModifier[]; - // this next bit checks to see if the the selected item from the original transfer pokemon exists on the new pokemon [p]; this returns undefined if the new pokemon doesn't have the item at all, otherwise it returns the pokemonHeldItemModifier for that item - const matchingModifier = globalScene.findModifier( - m => - m instanceof PokemonHeldItemModifier && - m.pokemonId === newPokemon.id && - m.matchType(getTransferrableItemsFromPokemon(pokemon)[this.transferOptionCursor]), - ) as PokemonHeldItemModifier; - const partySlot = this.partySlots.filter(m => m.getPokemon() === newPokemon)[0]; // this gets pokemon [p] for us - if (p !== this.transferCursor) { - // this skips adding the able/not able labels on the pokemon doing the transfer - if (matchingModifier) { - // if matchingModifier exists then the item exists on the new pokemon - if (matchingModifier.getMaxStackCount() === matchingModifier.stackCount) { - // checks to see if the stack of items is at max stack; if so, set the description label to "Not able" - ableToTransfer = i18next.t("partyUiHandler:notAble"); - } else { - // if the pokemon isn't at max stack, make the label "Able" - ableToTransfer = i18next.t("partyUiHandler:able"); - } - } else { - // if matchingModifier doesn't exist, that means the pokemon doesn't have any of the item, and we need to show "Able" - ableToTransfer = i18next.t("partyUiHandler:able"); - } - } else { - // this else relates to the transfer pokemon. We set the text to be blank so there's no "Able"/"Not able" text - ableToTransfer = ""; - } - partySlot.slotHpBar.setVisible(false); - partySlot.slotHpOverlay.setVisible(false); - partySlot.slotHpText.setVisible(false); - partySlot.slotDescriptionLabel.setText(ableToTransfer); - partySlot.slotDescriptionLabel.setVisible(true); - } - - this.clearOptions(); - ui.playSelect(); - return true; - } - if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER && option !== PartyOption.CANCEL) { - // clear overlay on cancel - this.moveInfoOverlay.clear(); - const filterResult = (this.selectFilter as PokemonSelectFilter)(pokemon); - if (filterResult === null) { - this.selectCallback?.(this.cursor, option); - this.clearOptions(); - } else { - this.clearOptions(); - this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true); - } - ui.playSelect(); - return true; - } - if ( - ![ - PartyOption.SUMMARY, - PartyOption.POKEDEX, - PartyOption.UNPAUSE_EVOLUTION, - PartyOption.UNSPLICE, - PartyOption.RELEASE, - PartyOption.CANCEL, - PartyOption.RENAME, - ].includes(option) || - (option === PartyOption.RELEASE && this.partyUiMode === PartyUiMode.RELEASE) - ) { - let filterResult: string | null; - const getTransferrableItemsFromPokemon = (pokemon: PlayerPokemon) => - globalScene.findModifiers( - m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id, - ) as PokemonHeldItemModifier[]; - if (option !== PartyOption.TRANSFER && option !== PartyOption.SPLICE) { - filterResult = (this.selectFilter as PokemonSelectFilter)(pokemon); - if (filterResult === null && (option === PartyOption.SEND_OUT || option === PartyOption.PASS_BATON)) { - filterResult = this.FilterChallengeLegal(pokemon); - } - if (filterResult === null && this.partyUiMode === PartyUiMode.MOVE_MODIFIER) { - filterResult = this.moveSelectFilter(pokemon.moveset[this.optionsCursor]); - } - } else { - filterResult = (this.selectFilter as PokemonModifierTransferSelectFilter)( - pokemon, - getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor])[ - this.transferOptionCursor - ], - ); - } - if (filterResult === null) { - if (this.partyUiMode !== PartyUiMode.SPLICE) { - this.clearOptions(); - } - if (this.selectCallback && this.partyUiMode !== PartyUiMode.CHECK) { - if (option === PartyOption.TRANSFER) { - if (this.transferCursor !== this.cursor) { - if (this.transferAll) { - getTransferrableItemsFromPokemon(globalScene.getPlayerParty()[this.transferCursor]).forEach( - (_, i, array) => { - const invertedIndex = array.length - 1 - i; - (this.selectCallback as PartyModifierTransferSelectCallback)( - this.transferCursor, - invertedIndex, - this.transferQuantitiesMax[invertedIndex], - this.cursor, - ); - }, - ); - } else { - (this.selectCallback as PartyModifierTransferSelectCallback)( - this.transferCursor, - this.transferOptionCursor, - this.transferQuantities[this.transferOptionCursor], - this.cursor, - ); - } - } - this.clearTransfer(); - } else if (this.partyUiMode === PartyUiMode.SPLICE) { - if (option === PartyOption.SPLICE) { - (this.selectCallback as PartyModifierSpliceSelectCallback)(this.transferCursor, this.cursor); - this.clearTransfer(); - } else { - this.startTransfer(); - } - this.clearOptions(); - } else if (option === PartyOption.RELEASE) { - this.doRelease(this.cursor); - } else { - const selectCallback = this.selectCallback; - this.selectCallback = null; - selectCallback(this.cursor, option); - } - } else { - if ( - option >= PartyOption.FORM_CHANGE_ITEM && - globalScene.getCurrentPhase() instanceof SelectModifierPhase - ) { - if (this.partyUiMode === PartyUiMode.CHECK) { - const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon); - const modifier = formChangeItemModifiers[option - PartyOption.FORM_CHANGE_ITEM]; - modifier.active = !modifier.active; - globalScene.triggerPokemonFormChange(pokemon, SpeciesFormChangeItemTrigger, false, true); - } - } else if (this.cursor) { - (globalScene.getCurrentPhase() as CommandPhase).handleCommand( - Command.POKEMON, - this.cursor, - option === PartyOption.PASS_BATON, - ); - } - } - if ( - this.partyUiMode !== PartyUiMode.MODIFIER && - this.partyUiMode !== PartyUiMode.TM_MODIFIER && - this.partyUiMode !== PartyUiMode.MOVE_MODIFIER - ) { - ui.playSelect(); - } - return true; - } - this.clearOptions(); - this.showText(filterResult as string, undefined, () => this.showText("", 0), undefined, true); - } else if (option === PartyOption.SUMMARY) { - ui.playSelect(); - ui.setModeWithoutClear(UiMode.SUMMARY, pokemon).then(() => this.clearOptions()); - return true; - } else if (option === PartyOption.POKEDEX) { - ui.playSelect(); - const attributes = { - shiny: pokemon.shiny, - variant: pokemon.variant, - form: pokemon.formIndex, - female: pokemon.gender === Gender.FEMALE, - }; - ui.setOverlayMode(UiMode.POKEDEX_PAGE, pokemon.species, attributes).then(() => this.clearOptions()); - return true; - } else if (option === PartyOption.UNPAUSE_EVOLUTION) { - this.clearOptions(); - ui.playSelect(); - pokemon.pauseEvolutions = !pokemon.pauseEvolutions; - this.showText( - i18next.t( - pokemon.pauseEvolutions ? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", - { pokemonName: getPokemonNameWithAffix(pokemon, false) }, - ), - undefined, - () => this.showText("", 0), - null, - true, - ); - } else if (option === PartyOption.UNSPLICE) { - this.clearOptions(); - ui.playSelect(); - this.showText( - i18next.t("partyUiHandler:unspliceConfirmation", { - fusionName: pokemon.fusionSpecies?.name, - pokemonName: pokemon.getName(), - }), - null, - () => { - ui.setModeWithoutClear( - UiMode.CONFIRM, - () => { - const fusionName = pokemon.getName(); - pokemon.unfuse().then(() => { - this.clearPartySlots(); - this.populatePartySlots(); - ui.setMode(UiMode.PARTY); - this.showText( - i18next.t("partyUiHandler:wasReverted", { - fusionName: fusionName, - pokemonName: pokemon.getName(false), - }), - undefined, - () => { - ui.setMode(UiMode.PARTY); - this.showText("", 0); - }, - null, - true, - ); - }); - }, - () => { - ui.setMode(UiMode.PARTY); - this.showText("", 0); - }, - ); - }, - ); - } else if (option === PartyOption.RELEASE) { - this.clearOptions(); - ui.playSelect(); - if (this.cursor >= globalScene.currentBattle.getBattlerCount() || !pokemon.isAllowedInBattle()) { - this.blockInput = true; - this.showText( - i18next.t("partyUiHandler:releaseConfirmation", { - pokemonName: getPokemonNameWithAffix(pokemon, false), - }), - null, - () => { - this.blockInput = false; - ui.setModeWithoutClear( - UiMode.CONFIRM, - () => { - ui.setMode(UiMode.PARTY); - this.doRelease(this.cursor); - }, - () => { - ui.setMode(UiMode.PARTY); - this.showText("", 0); - }, - ); - }, - ); - } else { - this.showText(i18next.t("partyUiHandler:releaseInBattle"), null, () => this.showText("", 0), null, true); - } - return true; - } else if (option === PartyOption.RENAME) { - this.clearOptions(); - ui.playSelect(); - ui.setModeWithoutClear( - UiMode.RENAME_POKEMON, - { - buttonActions: [ - (nickname: string) => { - ui.playSelect(); - pokemon.nickname = nickname; - pokemon.updateInfo(); - this.clearPartySlots(); - this.populatePartySlots(); - ui.setMode(UiMode.PARTY); - }, - () => { - ui.setMode(UiMode.PARTY); - }, - ], - }, - pokemon, - ); - return true; - } else if (option === PartyOption.CANCEL) { - return this.processInput(Button.CANCEL); - } else if (option === PartyOption.SELECT) { - ui.playSelect(); - return true; - } - } else if (button === Button.CANCEL) { - this.clearOptions(); + let success = false; + success = this.processOptionMenuInput(button); + if (success) { ui.playSelect(); - return true; + } + return success; + } + + if (button === Button.ACTION) { + return this.processPartyActionInput(); + } + + if (button === Button.CANCEL) { + return this.processPartyCancelInput(); + } + + if (button === Button.UP || button === Button.DOWN || button === Button.RIGHT || button === Button.LEFT) { + return this.processPartyDirectionalInput(button); + } + + return false; + } + + private allowCancel(): boolean { + return !(this.partyUiMode === PartyUiMode.FAINT_SWITCH || this.partyUiMode === PartyUiMode.REVIVAL_BLESSING); + } + + private processPartyActionInput(): boolean { + const ui = this.getUi(); + if (this.cursor < 6) { + if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) { + /** Initialize item quantities for the selected Pokemon */ + const itemModifiers = globalScene.findModifiers( + m => + m instanceof PokemonHeldItemModifier && + m.isTransferable && + m.pokemonId === globalScene.getPlayerParty()[this.cursor].id, + ) as PokemonHeldItemModifier[]; + this.transferQuantities = itemModifiers.map(item => item.getStackCount()); + this.transferQuantitiesMax = itemModifiers.map(item => item.getStackCount()); + } + this.showOptions(); + ui.playSelect(); + } + // Pressing return button + if (this.cursor === 6) { + if (!this.allowCancel()) { + ui.playError(); } else { - switch (button) { - case Button.LEFT: - /** Decrease quantity for the current item and update UI */ - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { - this.transferQuantities[option] = - this.transferQuantities[option] === 1 - ? this.transferQuantitiesMax[option] - : this.transferQuantities[option] - 1; - this.updateOptions(); - success = this.setCursor( - this.optionsCursor, - ); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */ - } - break; - case Button.RIGHT: - /** Increase quantity for the current item and update UI */ - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { - this.transferQuantities[option] = - this.transferQuantities[option] === this.transferQuantitiesMax[option] - ? 1 - : this.transferQuantities[option] + 1; - this.updateOptions(); - success = this.setCursor( - this.optionsCursor, - ); /** Place again the cursor at the same position. Necessary, otherwise the cursor disappears */ - } - break; - case Button.UP: - /** If currently selecting items to transfer, reset quantity selection */ - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { - if (option !== PartyOption.ALL) { - this.transferQuantities[option] = this.transferQuantitiesMax[option]; - } - this.updateOptions(); - } - success = this.setCursor( - this.optionsCursor ? this.optionsCursor - 1 : this.options.length - 1, - ); /** Move cursor */ - break; - case Button.DOWN: - /** If currently selecting items to transfer, reset quantity selection */ - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { - if (option !== PartyOption.ALL) { - this.transferQuantities[option] = this.transferQuantitiesMax[option]; - } - this.updateOptions(); - } - success = this.setCursor( - this.optionsCursor < this.options.length - 1 ? this.optionsCursor + 1 : 0, - ); /** Move cursor */ - break; - } - - // show move description - if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) { - const option = this.options[this.optionsCursor]; - const pokemon = globalScene.getPlayerParty()[this.cursor]; - const move = allMoves[pokemon.getLearnableLevelMoves()[option]]; - if (move) { - this.moveInfoOverlay.show(move); - } else { - // or hide the overlay, in case it's the cancel button - this.moveInfoOverlay.clear(); - } - } + return this.processInput(Button.CANCEL); } - } else { - if (button === Button.ACTION) { - if (this.cursor < 6) { - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) { - /** Initialize item quantities for the selected Pokemon */ - const itemModifiers = globalScene.findModifiers( - m => - m instanceof PokemonHeldItemModifier && - m.isTransferable && - m.pokemonId === globalScene.getPlayerParty()[this.cursor].id, - ) as PokemonHeldItemModifier[]; - this.transferQuantities = itemModifiers.map(item => item.getStackCount()); - this.transferQuantitiesMax = itemModifiers.map(item => item.getStackCount()); - } - this.showOptions(); - ui.playSelect(); - } else if (this.partyUiMode === PartyUiMode.FAINT_SWITCH || this.partyUiMode === PartyUiMode.REVIVAL_BLESSING) { - ui.playError(); - } else { - return this.processInput(Button.CANCEL); - } - return true; + } + return true; + } + + private processPartyCancelInput(): boolean { + const ui = this.getUi(); + if ( + (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER || this.partyUiMode === PartyUiMode.SPLICE) && + this.transferMode + ) { + this.clearTransfer(); + ui.playSelect(); + } else if (this.allowCancel()) { + if (this.selectCallback) { + const selectCallback = this.selectCallback; + this.selectCallback = null; + selectCallback(6, PartyOption.CANCEL); + ui.playSelect(); + } else { + ui.setMode(UiMode.COMMAND, this.fieldIndex); + ui.playSelect(); } - if (button === Button.CANCEL) { - if ( - (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER || this.partyUiMode === PartyUiMode.SPLICE) && - this.transferMode - ) { - this.clearTransfer(); - ui.playSelect(); - } else if (this.partyUiMode !== PartyUiMode.FAINT_SWITCH && this.partyUiMode !== PartyUiMode.REVIVAL_BLESSING) { - if (this.selectCallback) { - const selectCallback = this.selectCallback; - this.selectCallback = null; - selectCallback(6, PartyOption.CANCEL); - ui.playSelect(); - } else { - ui.setMode(UiMode.COMMAND, this.fieldIndex); - ui.playSelect(); - } + } + return true; + } + + private processPartyDirectionalInput(button: Button.UP | Button.DOWN | Button.LEFT | Button.RIGHT): boolean { + const ui = this.getUi(); + const slotCount = this.partySlots.length; + const battlerCount = globalScene.currentBattle.getBattlerCount(); + + let success = false; + switch (button) { + case Button.UP: + success = this.setCursor(this.cursor ? (this.cursor < 6 ? this.cursor - 1 : slotCount - 1) : 6); + break; + case Button.DOWN: + success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0); + break; + case Button.LEFT: + if (this.cursor >= battlerCount && this.cursor <= 6) { + success = this.setCursor(0); } - - return true; - } - - const slotCount = this.partySlots.length; - const battlerCount = globalScene.currentBattle.getBattlerCount(); - - switch (button) { - case Button.UP: - success = this.setCursor(this.cursor ? (this.cursor < 6 ? this.cursor - 1 : slotCount - 1) : 6); + break; + case Button.RIGHT: + if (slotCount === battlerCount) { + success = this.setCursor(6); break; - case Button.DOWN: - success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0); + } + if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1) { + success = this.setCursor(2); break; - case Button.LEFT: - if (this.cursor >= battlerCount && this.cursor <= 6) { - success = this.setCursor(0); - } + } + if (slotCount > battlerCount && this.cursor < battlerCount) { + success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount); break; - case Button.RIGHT: - if (slotCount === battlerCount) { - success = this.setCursor(6); - break; - } - if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1) { - success = this.setCursor(2); - break; - } - if (slotCount > battlerCount && this.cursor < battlerCount) { - success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount); - break; - } - } + } } if (success) { ui.playSelect(); } - return success; } @@ -860,64 +1034,66 @@ export default class PartyUiHandler extends MessageUiHandler { } setCursor(cursor: number): boolean { - let changed: boolean; - if (this.optionsMode) { - changed = this.optionsCursor !== cursor; - let isScroll = false; - if (changed && this.optionsScroll) { - if (Math.abs(cursor - this.optionsCursor) === this.options.length - 1) { - this.optionsScrollCursor = cursor ? this.optionsScrollTotal - 8 : 0; - this.updateOptions(); - } else { - const isDown = cursor && cursor > this.optionsCursor; - if (isDown) { - if (this.options[cursor] === PartyOption.SCROLL_DOWN) { - isScroll = true; - this.optionsScrollCursor++; - } - } else { - if (!cursor && this.optionsScrollCursor) { - isScroll = true; - this.optionsScrollCursor--; - } - } - if (isScroll && this.optionsScrollCursor === 1) { - this.optionsScrollCursor += isDown ? 1 : -1; - } - } + return this.setOptionsCursor(cursor); + } + const changed = this.cursor !== cursor; + if (changed) { + this.lastCursor = this.cursor; + this.cursor = cursor; + if (this.lastCursor < 6) { + this.partySlots[this.lastCursor].deselect(); + } else if (this.lastCursor === 6) { + this.partyCancelButton.deselect(); } - if (isScroll) { + if (cursor < 6) { + this.partySlots[cursor].select(); + } else if (cursor === 6) { + this.partyCancelButton.select(); + } + } + return changed; + } + + private setOptionsCursor(cursor: number): boolean { + const changed = this.optionsCursor !== cursor; + let isScroll = false; + if (changed && this.optionsScroll) { + if (Math.abs(cursor - this.optionsCursor) === this.options.length - 1) { + this.optionsScrollCursor = cursor ? this.optionsScrollTotal - 8 : 0; this.updateOptions(); } else { - this.optionsCursor = cursor; - } - if (!this.optionsCursorObj) { - this.optionsCursorObj = globalScene.add.image(0, 0, "cursor"); - this.optionsCursorObj.setOrigin(0, 0); - this.optionsContainer.add(this.optionsCursorObj); - } - this.optionsCursorObj.setPosition( - 8 - this.optionsBg.displayWidth, - -19 - 16 * (this.options.length - 1 - this.optionsCursor), - ); - } else { - changed = this.cursor !== cursor; - if (changed) { - this.lastCursor = this.cursor; - this.cursor = cursor; - if (this.lastCursor < 6) { - this.partySlots[this.lastCursor].deselect(); - } else if (this.lastCursor === 6) { - this.partyCancelButton.deselect(); + const isDown = cursor && cursor > this.optionsCursor; + if (isDown) { + if (this.options[cursor] === PartyOption.SCROLL_DOWN) { + isScroll = true; + this.optionsScrollCursor++; + } + } else { + if (!cursor && this.optionsScrollCursor) { + isScroll = true; + this.optionsScrollCursor--; + } } - if (cursor < 6) { - this.partySlots[cursor].select(); - } else if (cursor === 6) { - this.partyCancelButton.select(); + if (isScroll && this.optionsScrollCursor === 1) { + this.optionsScrollCursor += isDown ? 1 : -1; } } } + if (isScroll) { + this.updateOptions(); + } else { + this.optionsCursor = cursor; + } + if (!this.optionsCursorObj) { + this.optionsCursorObj = globalScene.add.image(0, 0, "cursor"); + this.optionsCursorObj.setOrigin(0, 0); + this.optionsContainer.add(this.optionsCursorObj); + } + this.optionsCursorObj.setPosition( + 8 - this.optionsBg.displayWidth, + -19 - 16 * (this.options.length - 1 - this.optionsCursor), + ); return changed; } @@ -984,149 +1160,81 @@ export default class PartyUiHandler extends MessageUiHandler { this.setCursor(0); } - updateOptions(): void { - const pokemon = globalScene.getPlayerParty()[this.cursor]; + private allowBatonModifierSwitch(): boolean { + return !!( + this.partyUiMode !== PartyUiMode.FAINT_SWITCH && + globalScene.findModifier( + m => + m instanceof SwitchEffectTransferModifier && + m.pokemonId === globalScene.getPlayerField()[this.fieldIndex].id, + ) + ); + } - const learnableLevelMoves = - this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER ? pokemon.getLearnableLevelMoves() : []; + // TODO: add FORCED_SWITCH (and perhaps also BATON_PASS_SWITCH) to the modes + private isBatonPassMove(): boolean { + const moveHistory = globalScene.getPlayerField()[this.fieldIndex].getMoveHistory(); + return !!( + this.partyUiMode === PartyUiMode.FAINT_SWITCH && + moveHistory.length && + allMoves[moveHistory[moveHistory.length - 1].move].getAttrs(ForceSwitchOutAttr)[0]?.isBatonPass() && + moveHistory[moveHistory.length - 1].result === MoveResult.SUCCESS + ); + } - if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER && learnableLevelMoves?.length) { + private getItemModifiers(pokemon: Pokemon): PokemonHeldItemModifier[] { + return ( + (globalScene.findModifiers( + m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id, + ) as PokemonHeldItemModifier[]) ?? [] + ); + } + + private updateOptionsWithRememberMoveModifierMode(pokemon): void { + const learnableMoves = pokemon.getLearnableLevelMoves(); + for (let m = 0; m < learnableMoves.length; m++) { + this.options.push(m); + } + if (learnableMoves?.length) { // show the move overlay with info for the first move - this.moveInfoOverlay.show(allMoves[learnableLevelMoves[0]]); + this.moveInfoOverlay.show(allMoves[learnableMoves[0]]); } + } - const itemModifiers = - this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER - ? (globalScene.findModifiers( - m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id, - ) as PokemonHeldItemModifier[]) - : []; - - if (this.options.length) { - this.options.splice(0, this.options.length); - this.optionsContainer.removeAll(true); - this.eraseOptionsCursor(); + private updateOptionsWithMoveModifierMode(pokemon): void { + // MOVE_1, MOVE_2, MOVE_3, MOVE_4 + for (let m = 0; m < pokemon.moveset.length; m++) { + this.options.push(PartyOption.MOVE_1 + m); } + } - let formChangeItemModifiers: PokemonFormChangeItemModifier[] | undefined; + private updateOptionsWithModifierTransferMode(pokemon): void { + const itemModifiers = this.getItemModifiers(pokemon); + for (let im = 0; im < itemModifiers.length; im++) { + this.options.push(im); + } + if (itemModifiers.length > 1) { + this.options.push(PartyOption.ALL); + } + } + + private addCommonOptions(pokemon): void { + this.options.push(PartyOption.SUMMARY); + this.options.push(PartyOption.POKEDEX); + this.options.push(PartyOption.RENAME); if ( - this.partyUiMode !== PartyUiMode.MOVE_MODIFIER && - this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && - (this.transferMode || this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER) + pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) || + (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId)) ) { - switch (this.partyUiMode) { - case PartyUiMode.SWITCH: - case PartyUiMode.FAINT_SWITCH: - case PartyUiMode.POST_BATTLE_SWITCH: - if (this.cursor >= globalScene.currentBattle.getBattlerCount()) { - const allowBatonModifierSwitch = - this.partyUiMode !== PartyUiMode.FAINT_SWITCH && - globalScene.findModifier( - m => - m instanceof SwitchEffectTransferModifier && - (m as SwitchEffectTransferModifier).pokemonId === globalScene.getPlayerField()[this.fieldIndex].id, - ); - - const moveHistory = globalScene.getPlayerField()[this.fieldIndex].getMoveHistory(); - const isBatonPassMove = - this.partyUiMode === PartyUiMode.FAINT_SWITCH && - moveHistory.length && - allMoves[moveHistory[moveHistory.length - 1].move].getAttrs(ForceSwitchOutAttr)[0]?.isBatonPass() && - moveHistory[moveHistory.length - 1].result === MoveResult.SUCCESS; - - // isBatonPassMove and allowBatonModifierSwitch shouldn't ever be true - // at the same time, because they both explicitly check for a mutually - // exclusive partyUiMode. But better safe than sorry. - this.options.push( - isBatonPassMove && !allowBatonModifierSwitch ? PartyOption.PASS_BATON : PartyOption.SEND_OUT, - ); - if (allowBatonModifierSwitch && !isBatonPassMove) { - // the BATON modifier gives an extra switch option for - // pokemon-command switches, allowing buffs to be optionally passed - this.options.push(PartyOption.PASS_BATON); - } - } - break; - case PartyUiMode.REVIVAL_BLESSING: - this.options.push(PartyOption.REVIVE); - break; - case PartyUiMode.MODIFIER: - this.options.push(PartyOption.APPLY); - break; - case PartyUiMode.TM_MODIFIER: - this.options.push(PartyOption.TEACH); - break; - case PartyUiMode.MODIFIER_TRANSFER: - this.options.push(PartyOption.TRANSFER); - break; - case PartyUiMode.SPLICE: - if (this.transferMode) { - if (this.cursor !== this.transferCursor) { - this.options.push(PartyOption.SPLICE); - } - } else { - this.options.push(PartyOption.APPLY); - } - break; - case PartyUiMode.RELEASE: - this.options.push(PartyOption.RELEASE); - break; - case PartyUiMode.CHECK: - if (globalScene.getCurrentPhase() instanceof SelectModifierPhase) { - formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon); - for (let i = 0; i < formChangeItemModifiers.length; i++) { - this.options.push(PartyOption.FORM_CHANGE_ITEM + i); - } - } - break; - case PartyUiMode.SELECT: - this.options.push(PartyOption.SELECT); - break; - } - - this.options.push(PartyOption.SUMMARY); - this.options.push(PartyOption.POKEDEX); - this.options.push(PartyOption.RENAME); - - if ( - pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) || - (pokemon.isFusion() && - pokemon.fusionSpecies && - pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId)) - ) { - this.options.push(PartyOption.UNPAUSE_EVOLUTION); - } - - if (this.partyUiMode === PartyUiMode.SWITCH) { - if (pokemon.isFusion()) { - this.options.push(PartyOption.UNSPLICE); - } - this.options.push(PartyOption.RELEASE); - } else if (this.partyUiMode === PartyUiMode.SPLICE && pokemon.isFusion()) { - this.options.push(PartyOption.UNSPLICE); - } - } else if (this.partyUiMode === PartyUiMode.MOVE_MODIFIER) { - for (let m = 0; m < pokemon.moveset.length; m++) { - this.options.push(PartyOption.MOVE_1 + m); - } - } else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) { - const learnableMoves = pokemon.getLearnableLevelMoves(); - for (let m = 0; m < learnableMoves.length; m++) { - this.options.push(m); - } - } else { - for (let im = 0; im < itemModifiers.length; im++) { - this.options.push(im); - } - if (itemModifiers.length > 1) { - this.options.push(PartyOption.ALL); - } + this.options.push(PartyOption.UNPAUSE_EVOLUTION); } + } + private addCancelAndScrollOptions(): void { this.optionsScrollTotal = this.options.length; - let optionStartIndex = this.optionsScrollCursor; - let optionEndIndex = Math.min( + const optionStartIndex = this.optionsScrollCursor; + const optionEndIndex = Math.min( this.optionsScrollTotal, optionStartIndex + (!optionStartIndex || this.optionsScrollCursor + 8 >= this.optionsScrollTotal ? 8 : 7), ); @@ -1145,14 +1253,122 @@ export default class PartyUiHandler extends MessageUiHandler { } this.options.push(PartyOption.CANCEL); + } + + updateOptions(): void { + const pokemon = globalScene.getPlayerParty()[this.cursor]; + + if (this.options.length) { + this.options.splice(0, this.options.length); + this.optionsContainer.removeAll(true); + this.eraseOptionsCursor(); + } + + switch (this.partyUiMode) { + case PartyUiMode.MOVE_MODIFIER: + this.updateOptionsWithMoveModifierMode(pokemon); + break; + case PartyUiMode.REMEMBER_MOVE_MODIFIER: + this.updateOptionsWithRememberMoveModifierMode(pokemon); + break; + case PartyUiMode.MODIFIER_TRANSFER: + if (!this.transferMode) { + this.updateOptionsWithModifierTransferMode(pokemon); + } else { + this.options.push(PartyOption.TRANSFER); + this.addCommonOptions(pokemon); + } + break; + // TODO: This still needs to be broken up. + // It could use a rework differentiating different kind of switches + // to treat baton passing separately from switching on faint. + case PartyUiMode.SWITCH: + case PartyUiMode.FAINT_SWITCH: + case PartyUiMode.POST_BATTLE_SWITCH: + if (this.cursor >= globalScene.currentBattle.getBattlerCount()) { + const allowBatonModifierSwitch = this.allowBatonModifierSwitch(); + const isBatonPassMove = this.isBatonPassMove(); + + // isBatonPassMove and allowBatonModifierSwitch shouldn't ever be true + // at the same time, because they both explicitly check for a mutually + // exclusive partyUiMode. But better safe than sorry. + this.options.push( + isBatonPassMove && !allowBatonModifierSwitch ? PartyOption.PASS_BATON : PartyOption.SEND_OUT, + ); + if (allowBatonModifierSwitch && !isBatonPassMove) { + // the BATON modifier gives an extra switch option for + // pokemon-command switches, allowing buffs to be optionally passed + this.options.push(PartyOption.PASS_BATON); + } + } + this.addCommonOptions(pokemon); + if (this.partyUiMode === PartyUiMode.SWITCH) { + if (pokemon.isFusion()) { + this.options.push(PartyOption.UNSPLICE); + } + this.options.push(PartyOption.RELEASE); + } + break; + case PartyUiMode.REVIVAL_BLESSING: + this.options.push(PartyOption.REVIVE); + this.addCommonOptions(pokemon); + break; + case PartyUiMode.MODIFIER: + this.options.push(PartyOption.APPLY); + this.addCommonOptions(pokemon); + break; + case PartyUiMode.TM_MODIFIER: + this.options.push(PartyOption.TEACH); + this.addCommonOptions(pokemon); + break; + case PartyUiMode.SPLICE: + if (this.transferMode) { + if (this.cursor !== this.transferCursor) { + this.options.push(PartyOption.SPLICE); + } + } else { + this.options.push(PartyOption.APPLY); + } + this.addCommonOptions(pokemon); + if (pokemon.isFusion()) { + this.options.push(PartyOption.UNSPLICE); + } + break; + case PartyUiMode.RELEASE: + this.options.push(PartyOption.RELEASE); + this.addCommonOptions(pokemon); + break; + case PartyUiMode.CHECK: + if (globalScene.getCurrentPhase() instanceof SelectModifierPhase) { + const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon); + for (let i = 0; i < formChangeItemModifiers.length; i++) { + this.options.push(PartyOption.FORM_CHANGE_ITEM + i); + } + } + this.addCommonOptions(pokemon); + break; + case PartyUiMode.SELECT: + this.options.push(PartyOption.SELECT); + this.addCommonOptions(pokemon); + break; + } + + // Generic, these are applied to all Modes + this.addCancelAndScrollOptions(); + + this.updateOptionsWindow(); + } + + private updateOptionsWindow(): void { + const pokemon = globalScene.getPlayerParty()[this.cursor]; this.optionsBg = addWindow(0, 0, 0, 16 * this.options.length + 13); this.optionsBg.setOrigin(1, 1); this.optionsContainer.add(this.optionsBg); - optionStartIndex = 0; - optionEndIndex = this.options.length; + const optionStartIndex = 0; + const optionEndIndex = this.options.length; let widestOptionWidth = 0; const optionTexts: BBCodeText[] = []; @@ -1185,6 +1401,7 @@ export default class PartyUiHandler extends MessageUiHandler { } break; default: + const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon); if (formChangeItemModifiers && option >= PartyOption.FORM_CHANGE_ITEM) { const modifier = formChangeItemModifiers[option - PartyOption.FORM_CHANGE_ITEM]; optionName = `${modifier.active ? i18next.t("partyUiHandler:DEACTIVATE") : i18next.t("partyUiHandler:ACTIVATE")} ${modifier.type.name}`; @@ -1200,6 +1417,7 @@ export default class PartyUiHandler extends MessageUiHandler { break; } } else if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) { + const learnableLevelMoves = pokemon.getLearnableLevelMoves(); const move = learnableLevelMoves[option]; optionName = allMoves[move].name; altText = !pokemon @@ -1209,6 +1427,7 @@ export default class PartyUiHandler extends MessageUiHandler { } else if (option === PartyOption.ALL) { optionName = i18next.t("partyUiHandler:ALL"); } else { + const itemModifiers = this.getItemModifiers(pokemon); const itemModifier = itemModifiers[option]; optionName = itemModifier.type.name; } @@ -1222,6 +1441,7 @@ export default class PartyUiHandler extends MessageUiHandler { optionText.setOrigin(0, 0); /** For every item that has stack bigger than 1, display the current quantity selection */ + const itemModifiers = this.getItemModifiers(pokemon); const itemModifier = itemModifiers[option]; if ( this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && From a98f89759169201b671e1f17c973dce81af28bab Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Tue, 27 May 2025 05:02:39 -0700 Subject: [PATCH 25/44] [Bug] Fix Dipplin's weight (was mistakenly set to the lbs value) --- src/data/pokemon-species.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 6f05d17db6f..5c97f360094 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -3121,7 +3121,7 @@ export function initSpecies() { ), new PokemonSpecies(Species.WALKING_WAKE, 9, false, false, false, "Paradox Pokémon", PokemonType.WATER, PokemonType.DRAGON, 3.5, 280, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 99, 83, 91, 125, 83, 109, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Gouging Fire and Raging Bolt new PokemonSpecies(Species.IRON_LEAVES, 9, false, false, false, "Paradox Pokémon", PokemonType.GRASS, PokemonType.PSYCHIC, 1.5, 125, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 130, 88, 70, 108, 104, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Iron Boulder and Iron Crown - new PokemonSpecies(Species.DIPPLIN, 9, false, false, false, "Candy Apple Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 9.7, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.ERRATIC, 50, false), + new PokemonSpecies(Species.DIPPLIN, 9, false, false, false, "Candy Apple Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 4.4, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.ERRATIC, 50, false), new PokemonSpecies(Species.POLTCHAGEIST, 9, false, false, false, "Matcha Pokémon", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.SLOW, null, false, false, new PokemonForm("Counterfeit Form", "counterfeit", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true), new PokemonForm("Artisan Form", "artisan", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, false, true), From 68dddbc4246aeedea3c8fdb506263c9c217caf08 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Tue, 27 May 2025 07:50:54 -0700 Subject: [PATCH 26/44] [Dev] Enable Biome checking of `pokemon.ts` (#5720) * [Dev] Enable biome parsing of `pokemon.ts` * Apply unsafe fixes * Add + apply rule disallowing the use of the `integer` type alias * Fix typo in comment; remove unnecessary `!!` * Re-apply Biome after merge * Re-apply Biome "unsafe" fixes after merge * Fix import * Add comment to `getFusionIconAtlasKey` too --- biome.jsonc | 20 +- .../the-pokemon-salesman-encounter.ts | 26 +- src/data/trainers/TrainerPartyTemplate.ts | 18 +- src/field/pokemon.ts | 2765 +++++------------ src/phases/revival-blessing-phase.ts | 2 +- src/ui/login-form-ui-handler.ts | 6 +- 6 files changed, 891 insertions(+), 1946 deletions(-) diff --git a/biome.jsonc b/biome.jsonc index 3385614635c..40301b3e0bc 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -32,7 +32,6 @@ // TODO: these files are too big and complex, ignore them until their respective refactors "src/data/moves/move.ts", "src/data/abilities/ability.ts", - "src/field/pokemon.ts", // this file is just too big: "src/data/balance/tms.ts" @@ -58,7 +57,7 @@ }, "style": { "noVar": "error", - "useEnumInitializers": "off", // large enums like Moves/Species would make this cumbersome + "useEnumInitializers": "off", // large enums like Moves/Species would make this cumbersome "useBlockStatements": "error", "useConst": "error", "useImportType": "error", @@ -73,9 +72,9 @@ }, "suspicious": { "noDoubleEquals": "error", - // While this would be a nice rule to enable, the current structure of the codebase makes this infeasible + // While this would be a nice rule to enable, the current structure of the codebase makes this infeasible // due to being used for move/ability `args` params and save data-related code. - // This can likely be enabled for all non-utils files once these are eventually reworked, but until then we leave it off. + // This can likely be enabled for all non-utils files once these are eventually reworked, but until then we leave it off. "noExplicitAny": "off", "noAssignInExpressions": "off", "noPrototypeBuiltins": "off", @@ -92,6 +91,19 @@ "noUselessSwitchCase": "off", // Explicit > Implicit "noUselessConstructor": "warn", // TODO: Refactor and make this an error "noBannedTypes": "warn" // TODO: Refactor and make this an error + }, + "nursery": { + "noRestrictedTypes": { + "level": "error", + "options": { + "types": { + "integer": { + "message": "This is an alias for 'number' that can provide false impressions of what values can actually be contained in this variable. Use 'number' instead.", + "use": "number" + } + } + } + } } } }, diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts index 25798de3b4a..50b9c2da78c 100644 --- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts +++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts @@ -3,7 +3,7 @@ import { transitionMysteryEncounterIntroVisuals, updatePlayerMoney, } from "#app/data/mystery-encounters/utils/encounter-phase-utils"; -import { isNullOrUndefined, NumberHolder, randSeedInt, randSeedItem } from "#app/utils/common"; +import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils/common"; import { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { globalScene } from "#app/global-scene"; import type MysteryEncounter from "#app/data/mystery-encounters/mystery-encounter"; @@ -88,7 +88,7 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui const r = randSeedInt(SHINY_MAGIKARP_WEIGHT); - let validEventEncounters = timedEventManager + const validEventEncounters = timedEventManager .getEventEncounters() .filter( s => @@ -111,22 +111,26 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui if ( r === 0 || ((isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) && - (validEventEncounters.length === 0)) + validEventEncounters.length === 0) ) { // If you roll 1%, give shiny Magikarp with random variant species = getPokemonSpecies(Species.MAGIKARP); pokemon = new PlayerPokemon(species, 5, 2, undefined, undefined, true); - } - else if ( - (validEventEncounters.length > 0 && (r <= EVENT_THRESHOLD || - (isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE))) + } else if ( + validEventEncounters.length > 0 && + (r <= EVENT_THRESHOLD || isNullOrUndefined(species.abilityHidden) || species.abilityHidden === Abilities.NONE) ) { tries = 0; do { // If you roll 20%, give event encounter with 3 extra shiny rolls and its HA, if it has one const enc = randSeedItem(validEventEncounters); species = getPokemonSpecies(enc.species); - pokemon = new PlayerPokemon(species, 5, species.abilityHidden === Abilities.NONE ? undefined : 2, enc.formIndex); + pokemon = new PlayerPokemon( + species, + 5, + species.abilityHidden === Abilities.NONE ? undefined : 2, + enc.formIndex, + ); pokemon.trySetShinySeed(); pokemon.trySetShinySeed(); pokemon.trySetShinySeed(); @@ -145,15 +149,13 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui pokemon.trySetShinySeed(); pokemon.trySetShinySeed(); pokemon.trySetShinySeed(); - } - else { + } else { // If there's, and this would never happen, no eligible event encounters with a hidden ability, just do Magikarp species = getPokemonSpecies(Species.MAGIKARP); pokemon = new PlayerPokemon(species, 5, 2, undefined, undefined, true); } } - } - else { + } else { pokemon = new PlayerPokemon(species, 5, 2, species.formIndex); } pokemon.generateAndPopulateMoveset(); diff --git a/src/data/trainers/TrainerPartyTemplate.ts b/src/data/trainers/TrainerPartyTemplate.ts index ccc494218e9..86201589276 100644 --- a/src/data/trainers/TrainerPartyTemplate.ts +++ b/src/data/trainers/TrainerPartyTemplate.ts @@ -224,16 +224,16 @@ export const trainerPartyTemplates = { */ export function getEvilGruntPartyTemplate(): TrainerPartyTemplate { const waveIndex = globalScene.currentBattle?.waveIndex; - if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_1){ + if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_1) { return trainerPartyTemplates.TWO_AVG; } - if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_2){ + if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_2) { return trainerPartyTemplates.THREE_AVG; } - if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_3){ + if (waveIndex <= ClassicFixedBossWaves.EVIL_GRUNT_3) { return trainerPartyTemplates.TWO_AVG_ONE_STRONG; } - if (waveIndex <= ClassicFixedBossWaves.EVIL_ADMIN_1){ + if (waveIndex <= ClassicFixedBossWaves.EVIL_ADMIN_1) { return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger } return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger @@ -251,7 +251,7 @@ export function getGymLeaderPartyTemplate() { switch (gameMode.modeId) { case GameModes.DAILY: if (currentBattle?.waveIndex <= 20) { - return trainerPartyTemplates.GYM_LEADER_2 + return trainerPartyTemplates.GYM_LEADER_2; } return trainerPartyTemplates.GYM_LEADER_3; case GameModes.CHALLENGE: // In the future, there may be a ChallengeType to call here. For now, use classic's. @@ -259,13 +259,15 @@ export function getGymLeaderPartyTemplate() { if (currentBattle?.waveIndex <= 20) { return trainerPartyTemplates.GYM_LEADER_1; // 1 avg 1 strong } - else if (currentBattle?.waveIndex <= 30) { + if (currentBattle?.waveIndex <= 30) { return trainerPartyTemplates.GYM_LEADER_2; // 1 avg 1 strong 1 stronger } - else if (currentBattle?.waveIndex <= 60) { // 50 and 60 + // 50 and 60 + if (currentBattle?.waveIndex <= 60) { return trainerPartyTemplates.GYM_LEADER_3; // 2 avg 1 strong 1 stronger } - else if (currentBattle?.waveIndex <= 90) { // 80 and 90 + // 80 and 90 + if (currentBattle?.waveIndex <= 90) { return trainerPartyTemplates.GYM_LEADER_4; // 3 avg 1 strong 1 stronger } // 110+ diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 62ec8081c5d..85b003517a6 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -5,10 +5,7 @@ import { globalScene } from "#app/global-scene"; import type { Variant } from "#app/sprites/variant"; import { populateVariantColors, variantColorCache } from "#app/sprites/variant"; import { variantData } from "#app/sprites/variant"; -import BattleInfo, { - PlayerBattleInfo, - EnemyBattleInfo, -} from "#app/ui/battle-info"; +import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from "#app/ui/battle-info"; import type Move from "#app/data/moves/move"; import { HighCritAttr, @@ -50,11 +47,26 @@ import { getPokemonSpecies, getPokemonSpeciesForm, } from "#app/data/pokemon-species"; +import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; import { - getStarterValueFriendshipCap, - speciesStarterCosts, -} from "#app/data/balance/starters"; -import { NumberHolder, randSeedInt, getIvsFromId, BooleanHolder, randSeedItem, isNullOrUndefined, getEnumValues, toDmgValue, fixedInt, rgbaToInt, rgbHexToRgba, rgbToHsv, deltaRgb, isBetween, type nil, type Constructor, randSeedIntRange } from "#app/utils/common"; + NumberHolder, + randSeedInt, + getIvsFromId, + BooleanHolder, + randSeedItem, + isNullOrUndefined, + getEnumValues, + toDmgValue, + fixedInt, + rgbaToInt, + rgbHexToRgba, + rgbToHsv, + deltaRgb, + isBetween, + type nil, + type Constructor, + randSeedIntRange, +} from "#app/utils/common"; import type { TypeDamageMultiplier } from "#app/data/type"; import { getTypeDamageMultiplier, getTypeRgb } from "#app/data/type"; import { PokemonType } from "#enums/pokemon-type"; @@ -92,20 +104,13 @@ import { import { PokeballType } from "#enums/pokeball"; import { Gender } from "#app/data/gender"; import { Status, getRandomStatus } from "#app/data/status-effect"; -import type { - SpeciesFormEvolution, - SpeciesEvolutionCondition, -} from "#app/data/balance/pokemon-evolutions"; +import type { SpeciesFormEvolution, SpeciesEvolutionCondition } from "#app/data/balance/pokemon-evolutions"; import { pokemonEvolutions, pokemonPrevolutions, FusionSpeciesFormEvolution, } from "#app/data/balance/pokemon-evolutions"; -import { - reverseCompatibleTms, - tmSpecies, - tmPoolTiers, -} from "#app/data/balance/tms"; +import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "#app/data/balance/tms"; import { BattlerTag, BattlerTagLapseType, @@ -128,11 +133,7 @@ import { type GrudgeTag, } from "../data/battler-tags"; import { WeatherType } from "#enums/weather-type"; -import { - ArenaTagSide, - NoCritTag, - WeakenMoveScreenTag, -} from "#app/data/arena-tag"; +import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "#app/data/arena-tag"; import type { SuppressAbilitiesTag } from "#app/data/arena-tag"; import type { Ability } from "#app/data/abilities/ability-class"; import type { AbAttr } from "#app/data/abilities/ab-attrs/ab-attr"; @@ -171,7 +172,8 @@ import { MoveTypeChangeAbAttr, FullHpResistTypeAbAttr, applyCheckTrappedAbAttrs, - CheckTrappedAbAttr, InfiltratorAbAttr, + CheckTrappedAbAttr, + InfiltratorAbAttr, AlliedFieldDamageReductionAbAttr, PostDamageAbAttr, applyPostDamageAbAttrs, @@ -196,25 +198,18 @@ import type { PartyOption } from "#app/ui/party-ui-handler"; import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; import type { LevelMoves } from "#app/data/balance/pokemon-level-moves"; -import { - EVOLVE_MOVE, - RELEARN_MOVE, -} from "#app/data/balance/pokemon-level-moves"; +import { EVOLVE_MOVE, RELEARN_MOVE } from "#app/data/balance/pokemon-level-moves"; import { achvs } from "#app/system/achv"; import type { StarterDataEntry, StarterMoveset } from "#app/system/game-data"; import { DexAttr } from "#app/system/game-data"; -import { - QuantizerCelebi, - argbFromRgba, - rgbaFromArgb, -} from "@material/material-color-utilities"; +import { QuantizerCelebi, argbFromRgba, rgbaFromArgb } from "@material/material-color-utilities"; import { getNatureStatMultiplier } from "#app/data/nature"; import type { SpeciesFormChange } from "#app/data/pokemon-forms"; import { SpeciesFormChangeActiveTrigger, SpeciesFormChangeLapseTeraTrigger, SpeciesFormChangeMoveLearnedTrigger, - SpeciesFormChangePostMoveTrigger + SpeciesFormChangePostMoveTrigger, } from "#app/data/pokemon-forms"; import { TerrainType } from "#app/data/terrain"; import type { TrainerSlot } from "#enums/trainer-slot"; @@ -298,10 +293,10 @@ type damageParams = { simulated?: boolean; /** If defined, used in place of calculated effectiveness values */ effectiveness?: number; -} +}; /** Type for the parameters of {@linkcode Pokemon#getBaseDamage | getBaseDamage} */ -type getBaseDamageParams = Omit +type getBaseDamageParams = Omit; /** Type for the parameters of {@linkcode Pokemon#getAttackDamage | getAttackDamage} */ type getAttackDamageParams = Omit; @@ -413,7 +408,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.pokeball = dataSource?.pokeball || PokeballType.POKEBALL; this.level = level; - this.abilityIndex = abilityIndex ?? this.generateAbilityIndex() + this.abilityIndex = abilityIndex ?? this.generateAbilityIndex(); if (formIndex !== undefined) { this.formIndex = formIndex; @@ -427,8 +422,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (variant !== undefined) { this.variant = variant; } - this.exp = - dataSource?.exp || getLevelTotalExp(this.level, species.growthRate); + this.exp = dataSource?.exp || getLevelTotalExp(this.level, species.growthRate); this.levelExp = dataSource?.levelExp || 0; if (dataSource) { @@ -444,18 +438,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.nickname = dataSource.nickname; this.moveset = dataSource.moveset; this.status = dataSource.status!; // TODO: is this bang correct? - this.friendship = - dataSource.friendship !== undefined - ? dataSource.friendship - : this.species.baseFriendship; + this.friendship = dataSource.friendship ?? this.species.baseFriendship; this.metLevel = dataSource.metLevel || 5; this.luck = dataSource.luck; this.metBiome = dataSource.metBiome; this.metSpecies = - dataSource.metSpecies ?? - (this.metBiome !== -1 - ? this.species.speciesId - : this.species.getRootSpeciesId(true)); + dataSource.metSpecies ?? (this.metBiome !== -1 ? this.species.speciesId : this.species.getRootSpeciesId(true)); this.metWave = dataSource.metWave ?? (this.metBiome === -1 ? -1 : 0); this.pauseEvolutions = dataSource.pauseEvolutions; this.pokerus = !!dataSource.pokerus; @@ -475,9 +463,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.fusionCustomPokemonData = dataSource.fusionCustomPokemonData; this.fusionTeraType = dataSource.fusionTeraType; this.usedTMs = dataSource.usedTMs ?? []; - this.customPokemonData = new CustomPokemonData( - dataSource.customPokemonData, - ); + this.customPokemonData = new CustomPokemonData(dataSource.customPokemonData); this.teraType = dataSource.teraType; this.isTerastallized = dataSource.isTerastallized; this.stellarTypesBoosted = dataSource.stellarTypesBoosted ?? []; @@ -490,12 +476,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } if (this.formIndex === undefined) { - this.formIndex = globalScene.getSpeciesFormIndex( - species, - this.gender, - this.nature, - this.isPlayer(), - ); + this.formIndex = globalScene.getSpeciesFormIndex(species, this.gender, this.nature, this.isPlayer()); } if (this.shiny === undefined) { @@ -514,19 +495,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.friendship = species.baseFriendship; this.metLevel = level; - this.metBiome = globalScene.currentBattle - ? globalScene.arena.biomeType - : -1; + this.metBiome = globalScene.currentBattle ? globalScene.arena.biomeType : -1; this.metSpecies = species.speciesId; - this.metWave = globalScene.currentBattle - ? globalScene.currentBattle.waveIndex - : -1; + this.metWave = globalScene.currentBattle ? globalScene.currentBattle.waveIndex : -1; this.pokerus = false; if (level > 1) { - const fused = new BooleanHolder( - globalScene.gameMode.isSplicedOnly, - ); + const fused = new BooleanHolder(globalScene.gameMode.isSplicedOnly); if (!fused.value && !this.isPlayer() && !this.hasTrainer()) { globalScene.applyModifier(EnemyFusionChanceModifier, false, fused); } @@ -536,9 +511,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.generateFusionSpecies(); } } - this.luck = - (this.shiny ? this.variant + 1 : 0) + - (this.fusionShiny ? this.fusionVariant + 1 : 0); + this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); this.fusionLuck = this.luck; this.teraType = randSeedItem(this.getTypes(false, false, true)); @@ -558,15 +531,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!dataSource) { this.calculateStats(); } - } /** - * @param {boolean} useIllusion - Whether we want the fake name or the real name of the Pokemon (for Illusion ability). + * @param useIllusion - Whether we want the fake name or the real name of the Pokemon (for Illusion ability). */ - getNameToRender(useIllusion: boolean = true) { - const name: string = (!useIllusion && this.summonData.illusion) ? this.summonData.illusion.basePokemon.name : this.name; - const nickname: string = (!useIllusion && this.summonData.illusion) ? this.summonData.illusion.basePokemon.nickname : this.nickname; + getNameToRender(useIllusion = true) { + const name: string = + !useIllusion && this.summonData.illusion ? this.summonData.illusion.basePokemon.name : this.name; + const nickname: string = + !useIllusion && this.summonData.illusion ? this.summonData.illusion.basePokemon.nickname : this.nickname; try { if (nickname) { return decodeURIComponent(escape(atob(nickname))); @@ -578,12 +552,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - getPokeball(useIllusion = false){ - if(useIllusion){ - return this.summonData.illusion?.pokeball ?? this.pokeball - } else { - return this.pokeball + getPokeball(useIllusion = false) { + if (useIllusion) { + return this.summonData.illusion?.pokeball ?? this.pokeball; } + return this.pokeball; } init(): void { @@ -645,10 +618,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns `true` if the pokemon is fainted */ public isFainted(checkStatus = false): boolean { - return ( - this.hp <= 0 && - (!checkStatus || this.status?.effect === StatusEffect.FAINT) - ); + return this.hp <= 0 && (!checkStatus || this.status?.effect === StatusEffect.FAINT); } /** @@ -666,11 +636,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ public isAllowedInChallenge(): boolean { const challengeAllowed = new BooleanHolder(true); - applyChallenges( - ChallengeType.POKEMON_IN_BATTLE, - this, - challengeAllowed, - ); + applyChallenges(ChallengeType.POKEMON_IN_BATTLE, this, challengeAllowed); return challengeAllowed.value; } @@ -691,12 +657,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let ret = 0n; ret |= this.gender !== Gender.FEMALE ? DexAttr.MALE : DexAttr.FEMALE; ret |= !this.shiny ? DexAttr.NON_SHINY : DexAttr.SHINY; - ret |= - this.variant >= 2 - ? DexAttr.VARIANT_3 - : this.variant === 1 - ? DexAttr.VARIANT_2 - : DexAttr.DEFAULT_VARIANT; + ret |= this.variant >= 2 ? DexAttr.VARIANT_3 : this.variant === 1 ? DexAttr.VARIANT_2 : DexAttr.DEFAULT_VARIANT; ret |= globalScene.gameData.getFormAttr(this.formIndex); return ret; } @@ -722,17 +683,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** Generate `abilityIndex` based on species and hidden ability if not pre-defined. */ private generateAbilityIndex(): number { - // Roll for hidden ability chance, applying any ability charms for enemy mons - const hiddenAbilityChance = new NumberHolder( - BASE_HIDDEN_ABILITY_CHANCE, - ); + const hiddenAbilityChance = new NumberHolder(BASE_HIDDEN_ABILITY_CHANCE); if (!this.hasTrainer()) { - globalScene.applyModifiers( - HiddenAbilityRateBoosterModifier, - true, - hiddenAbilityChance, - ); + globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); } // If the roll succeeded and we have one, use HA; otherwise pick a random ability @@ -745,8 +699,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return this.species.ability2 !== this.species.ability1 ? randSeedInt(2) : 0; } - - /** * Generate an illusion of the last pokemon in the party, as other wild pokemon in the area. */ @@ -764,7 +716,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { shiny: this.shiny, variant: this.variant, fusionShiny: this.fusionShiny, - fusionVariant: this.fusionVariant + fusionVariant: this.fusionVariant, }, species: speciesId, formIndex: pokemon.formIndex, @@ -772,7 +724,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { pokeball: pokemon.pokeball, fusionFormIndex: pokemon.fusionFormIndex, fusionSpecies: pokemon.fusionSpecies || undefined, - fusionGender: pokemon.fusionGender + fusionGender: pokemon.fusionGender, }; this.name = pokemon.name; @@ -787,7 +739,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.loadAssets(false, true).then(() => this.playAnim()); this.updateInfo(); } else { - const randomIllusion: PokemonSpecies = globalScene.arena.randomSpecies(globalScene.currentBattle.waveIndex, this.level); + const randomIllusion: PokemonSpecies = globalScene.arena.randomSpecies( + globalScene.currentBattle.waveIndex, + this.level, + ); this.summonData.illusion = { basePokemon: { @@ -796,12 +751,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { shiny: this.shiny, variant: this.variant, fusionShiny: this.fusionShiny, - fusionVariant: this.fusionVariant + fusionVariant: this.fusionVariant, }, species: randomIllusion.speciesId, formIndex: randomIllusion.formIndex, gender: this.gender, - pokeball: this.pokeball + pokeball: this.pokeball, }; this.name = randomIllusion.name; @@ -813,15 +768,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { breakIllusion(): boolean { if (!this.summonData.illusion) { return false; - } else { - this.name = this.summonData.illusion.basePokemon.name; - this.nickname = this.summonData.illusion.basePokemon.nickname; - this.shiny = this.summonData.illusion.basePokemon.shiny; - this.variant = this.summonData.illusion.basePokemon.variant; - this.fusionVariant = this.summonData.illusion.basePokemon.fusionVariant; - this.fusionShiny = this.summonData.illusion.basePokemon.fusionShiny; - this.summonData.illusion = null; } + this.name = this.summonData.illusion.basePokemon.name; + this.nickname = this.summonData.illusion.basePokemon.nickname; + this.shiny = this.summonData.illusion.basePokemon.shiny; + this.variant = this.summonData.illusion.basePokemon.variant; + this.fusionVariant = this.summonData.illusion.basePokemon.fusionVariant; + this.fusionShiny = this.summonData.illusion.basePokemon.fusionShiny; + this.summonData.illusion = null; if (this.isOnField()) { globalScene.playSound("PRSFX- Transform"); } @@ -842,9 +796,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { abstract getBattlerIndex(): BattlerIndex; /** -   * @param useIllusion - Whether we want the illusion or not. -   */ - async loadAssets(ignoreOverride = true, useIllusion: boolean = false): Promise { + * @param useIllusion - Whether we want the illusion or not. + */ + async loadAssets(ignoreOverride = true, useIllusion = false): Promise { /** Promises that are loading assets and can be run concurrently. */ const loadPromises: Promise[] = []; // Assets for moves @@ -857,7 +811,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.getGender(useIllusion) === Gender.FEMALE, formIndex, this.isShiny(useIllusion), - this.getVariant(useIllusion) + this.getVariant(useIllusion), ), ); @@ -868,15 +822,24 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ); } if (this.getFusionSpeciesForm()) { - const fusionFormIndex = useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionFormIndex : this.fusionFormIndex; - const fusionShiny = !useIllusion && this.summonData.illusion?.basePokemon ? this.summonData.illusion.basePokemon.fusionShiny : this.fusionShiny; - const fusionVariant = !useIllusion && this.summonData.illusion?.basePokemon ? this.summonData.illusion.basePokemon.fusionVariant : this.fusionVariant; - loadPromises.push(this.getFusionSpeciesForm(false, useIllusion).loadAssets( - this.getFusionGender(false, useIllusion) === Gender.FEMALE, - fusionFormIndex, - fusionShiny, - fusionVariant - )); + const fusionFormIndex = + useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionFormIndex : this.fusionFormIndex; + const fusionShiny = + !useIllusion && this.summonData.illusion?.basePokemon + ? this.summonData.illusion.basePokemon.fusionShiny + : this.fusionShiny; + const fusionVariant = + !useIllusion && this.summonData.illusion?.basePokemon + ? this.summonData.illusion.basePokemon.fusionVariant + : this.fusionVariant; + loadPromises.push( + this.getFusionSpeciesForm(false, useIllusion).loadAssets( + this.getFusionGender(false, useIllusion) === Gender.FEMALE, + fusionFormIndex, + fusionShiny, + fusionVariant, + ), + ); globalScene.loadPokemonAtlas( this.getFusionBattleSpriteKey(true, ignoreOverride), this.getFusionBattleSpriteAtlasPath(true, ignoreOverride), @@ -884,7 +847,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } if (this.isShiny(true)) { - loadPromises.push(populateVariantColors(this, false, ignoreOverride)) + loadPromises.push(populateVariantColors(this, false, ignoreOverride)); if (this.isPlayer()) { loadPromises.push(populateVariantColors(this, true, ignoreOverride)); } @@ -894,7 +857,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // This must be initiated before we queue loading, otherwise the load could have finished before // we reach the line of code that adds the listener, causing a deadlock. - const waitOnLoadPromise = new Promise(resolve => globalScene.load.once(Phaser.Loader.Events.COMPLETE, resolve)); + const waitOnLoadPromise = new Promise(resolve => + globalScene.load.once(Phaser.Loader.Events.COMPLETE, resolve), + ); if (!globalScene.load.isLoading()) { globalScene.load.start(); @@ -966,11 +931,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param useExpSprite should the experimental sprite be used * @param battleSpritePath the filename of the sprite */ - async populateVariantColorCache( - cacheKey: string, - useExpSprite: boolean, - battleSpritePath: string, - ) { + async populateVariantColorCache(cacheKey: string, useExpSprite: boolean, battleSpritePath: string) { const spritePath = `./images/pokemon/variant/${useExpSprite ? "exp/" : ""}${battleSpritePath}.json`; return globalScene .cachedFetch(spritePath) @@ -989,13 +950,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return res.json(); }) .catch(error => { - return this.fallbackVariantColor( - cacheKey, - spritePath, - useExpSprite, - battleSpritePath, - error, - ); + return this.fallbackVariantColor(cacheKey, spritePath, useExpSprite, battleSpritePath, error); }) .then(c => { if (!isNullOrUndefined(c)) { @@ -1005,10 +960,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getFormKey(): string { - if ( - !this.species.forms.length || - this.species.forms.length <= this.formIndex - ) { + if (!this.species.forms.length || this.species.forms.length <= this.formIndex) { return ""; } return this.species.forms[this.formIndex].formKey; @@ -1018,10 +970,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!this.fusionSpecies) { return null; } - if ( - !this.fusionSpecies.forms.length || - this.fusionSpecies.forms.length <= this.fusionFormIndex - ) { + if (!this.fusionSpecies.forms.length || this.fusionSpecies.forms.length <= this.fusionFormIndex) { return ""; } return this.fusionSpecies.forms[this.fusionFormIndex].formKey; @@ -1033,10 +982,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getBattleSpriteAtlasPath(back?: boolean, ignoreOverride?: boolean): string { - const spriteId = this.getBattleSpriteId(back, ignoreOverride).replace( - /\_{2}/g, - "/", - ); + const spriteId = this.getBattleSpriteId(back, ignoreOverride).replace(/\_{2}/g, "/"); return `${/_[1-3]$/.test(spriteId) ? "variant/" : ""}${spriteId}`; } @@ -1046,7 +992,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.getGender(ignoreOverride, true) === Gender.FEMALE, formIndex, this.shiny, - this.variant + this.variant, ); } @@ -1062,7 +1008,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { formIndex, this.shiny, this.variant, - back + back, ); } @@ -1071,7 +1017,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.summonData.illusion?.basePokemon.shiny ?? this.shiny, - this.summonData.illusion?.basePokemon.variant ?? this.variant + this.summonData.illusion?.basePokemon.variant ?? this.variant, ); } @@ -1085,7 +1031,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.getFusionGender(ignoreOverride, true) === Gender.FEMALE, fusionFormIndex, this.fusionShiny, - this.fusionVariant + this.fusionVariant, ); } @@ -1101,7 +1047,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { fusionFormIndex, this.fusionShiny, this.fusionVariant, - back + back, ); } @@ -1109,55 +1055,67 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return `pkmn__${this.getFusionBattleSpriteId(back, ignoreOverride)}`; } - getFusionBattleSpriteAtlasPath( - back?: boolean, - ignoreOverride?: boolean, - ): string { - return this.getFusionBattleSpriteId(back, ignoreOverride).replace( - /\_{2}/g, - "/", - ); + getFusionBattleSpriteAtlasPath(back?: boolean, ignoreOverride?: boolean): string { + return this.getFusionBattleSpriteId(back, ignoreOverride).replace(/\_{2}/g, "/"); } - getIconAtlasKey(ignoreOverride?: boolean, useIllusion: boolean = true): string { - const formIndex = useIllusion && this.summonData.illusion?.formIndex ? this.summonData.illusion?.formIndex : this.formIndex; - const variant = !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.variant : this.variant; + getIconAtlasKey(ignoreOverride = false, useIllusion = true): string { + // TODO: confirm the correct behavior here (is it intentional that the check fails if `illusion.formIndex` is `0`?) + const formIndex = + useIllusion && this.summonData.illusion?.formIndex ? this.summonData.illusion.formIndex : this.formIndex; + const variant = + !useIllusion && this.summonData.illusion ? this.summonData.illusion.basePokemon.variant : this.variant; return this.getSpeciesForm(ignoreOverride, useIllusion).getIconAtlasKey( formIndex, this.isBaseShiny(useIllusion), - variant + variant, ); } - getFusionIconAtlasKey(ignoreOverride?: boolean, useIllusion: boolean = true): string { - const fusionFormIndex = useIllusion && this.summonData.illusion?.fusionFormIndex ? this.summonData.illusion?.fusionFormIndex : this.fusionFormIndex; - const fusionVariant = !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.fusionVariant : this.fusionVariant; + getFusionIconAtlasKey(ignoreOverride = false, useIllusion = true): string { + // TODO: confirm the correct behavior here (is it intentional that the check fails if `illusion.fusionFormIndex` is `0`?) + const fusionFormIndex = + useIllusion && this.summonData.illusion?.fusionFormIndex + ? this.summonData.illusion.fusionFormIndex + : this.fusionFormIndex; + const fusionVariant = + !useIllusion && this.summonData.illusion + ? this.summonData.illusion.basePokemon.fusionVariant + : this.fusionVariant; return this.getFusionSpeciesForm(ignoreOverride, useIllusion).getIconAtlasKey( fusionFormIndex, this.isFusionShiny(), - fusionVariant + fusionVariant, ); } - getIconId(ignoreOverride?: boolean, useIllusion: boolean = true): string { - const formIndex = useIllusion && this.summonData.illusion?.formIndex ? this.summonData.illusion?.formIndex : this.formIndex; - const variant = !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.variant : this.variant; + getIconId(ignoreOverride?: boolean, useIllusion = true): string { + const formIndex = + useIllusion && this.summonData.illusion?.formIndex ? this.summonData.illusion?.formIndex : this.formIndex; + const variant = + !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.variant : this.variant; return this.getSpeciesForm(ignoreOverride, useIllusion).getIconId( this.getGender(ignoreOverride, useIllusion) === Gender.FEMALE, formIndex, this.isBaseShiny(), - variant + variant, ); } - getFusionIconId(ignoreOverride?: boolean, useIllusion: boolean = true): string { - const fusionFormIndex = useIllusion && this.summonData.illusion?.fusionFormIndex ? this.summonData.illusion?.fusionFormIndex : this.fusionFormIndex; - const fusionVariant = !useIllusion && !!this.summonData.illusion ? this.summonData.illusion?.basePokemon.fusionVariant : this.fusionVariant; + getFusionIconId(ignoreOverride?: boolean, useIllusion = true): string { + const fusionFormIndex = + useIllusion && this.summonData.illusion?.fusionFormIndex + ? this.summonData.illusion?.fusionFormIndex + : this.fusionFormIndex; + const fusionVariant = + !useIllusion && !!this.summonData.illusion + ? this.summonData.illusion?.basePokemon.fusionVariant + : this.fusionVariant; return this.getFusionSpeciesForm(ignoreOverride, useIllusion).getIconId( this.getFusionGender(ignoreOverride, useIllusion) === Gender.FEMALE, fusionFormIndex, this.isFusionShiny(), - fusionVariant + fusionVariant, ); } @@ -1167,12 +1125,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * This overrides `useIllusion` if `true`. * @param useIllusion - `true` to use the speciesForm of the illusion; default `false`. */ - getSpeciesForm(ignoreOverride: boolean = false, useIllusion: boolean = false): PokemonSpeciesForm { + getSpeciesForm(ignoreOverride = false, useIllusion = false): PokemonSpeciesForm { if (!ignoreOverride && this.summonData.speciesForm) { return this.summonData.speciesForm; } - const species: PokemonSpecies = useIllusion && this.summonData.illusion ? getPokemonSpecies(this.summonData.illusion.species) : this.species; + const species: PokemonSpecies = + useIllusion && this.summonData.illusion ? getPokemonSpecies(this.summonData.illusion.species) : this.species; const formIndex = useIllusion && this.summonData.illusion ? this.summonData.illusion.formIndex : this.formIndex; if (species.forms && species.forms.length > 0) { @@ -1185,17 +1144,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** * @param {boolean} useIllusion - Whether we want the fusionSpeciesForm of the illusion or not. */ - getFusionSpeciesForm(ignoreOverride?: boolean, useIllusion: boolean = false): PokemonSpeciesForm { - const fusionSpecies: PokemonSpecies = useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionSpecies! : this.fusionSpecies!; - const fusionFormIndex = useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionFormIndex! : this.fusionFormIndex; + getFusionSpeciesForm(ignoreOverride?: boolean, useIllusion = false): PokemonSpeciesForm { + const fusionSpecies: PokemonSpecies = + useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionSpecies! : this.fusionSpecies!; + const fusionFormIndex = + useIllusion && this.summonData.illusion ? this.summonData.illusion.fusionFormIndex! : this.fusionFormIndex; if (!ignoreOverride && this.summonData.fusionSpeciesForm) { return this.summonData.fusionSpeciesForm; } - if ( - !fusionSpecies?.forms?.length || - fusionFormIndex >= fusionSpecies?.forms.length - ) { + if (!fusionSpecies?.forms?.length || fusionFormIndex >= fusionSpecies?.forms.length) { return fusionSpecies; } return fusionSpecies?.forms[fusionFormIndex]; @@ -1206,9 +1164,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getTintSprite(): Phaser.GameObjects.Sprite | null { - return !this.maskEnabled - ? (this.getAt(1) as Phaser.GameObjects.Sprite) - : this.maskSprite; + return !this.maskEnabled ? (this.getAt(1) as Phaser.GameObjects.Sprite) : this.maskSprite; } getSpriteScale(): number { @@ -1289,20 +1245,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param animConfig {@linkcode String} to pass to {@linkcode Phaser.GameObjects.Sprite.play} * @returns true if the sprite was able to be animated */ - tryPlaySprite( - sprite: Phaser.GameObjects.Sprite, - tintSprite: Phaser.GameObjects.Sprite, - key: string, - ): boolean { + tryPlaySprite(sprite: Phaser.GameObjects.Sprite, tintSprite: Phaser.GameObjects.Sprite, key: string): boolean { // Catch errors when trying to play an animation that doesn't exist try { sprite.play(key); tintSprite.play(key); } catch (error: unknown) { - console.error( - `Couldn't play animation for '${key}'!\nIs the image for this Pokemon missing?\n`, - error, - ); + console.error(`Couldn't play animation for '${key}'!\nIs the image for this Pokemon missing?\n`, error); return false; } @@ -1311,11 +1260,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } playAnim(): void { - this.tryPlaySprite( - this.getSprite(), - this.getTintSprite()!, - this.getBattleSpriteKey(), - ); // TODO: is the bag correct? + this.tryPlaySprite(this.getSprite(), this.getTintSprite()!, this.getBattleSpriteKey()); // TODO: is the bang correct? } getFieldPositionOffset(): [number, number] { @@ -1353,30 +1298,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // During the Pokemon's MoveEffect phase, the offset is removed to put the Pokemon "in focus" const currentPhase = globalScene.getCurrentPhase(); - if ( - currentPhase instanceof MoveEffectPhase && - currentPhase.getPokemon() === this - ) { + if (currentPhase instanceof MoveEffectPhase && currentPhase.getPokemon() === this) { return false; } return true; - } else { - return false; } + return false; } /** If this Pokemon has a Substitute on the field, removes its sprite from the field. */ destroySubstitute(): void { const substitute = this.getTag(SubstituteTag); - if (substitute && substitute.sprite) { + if (substitute?.sprite) { substitute.sprite.destroy(); } } - setFieldPosition( - fieldPosition: FieldPosition, - duration?: number, - ): Promise { + setFieldPosition(fieldPosition: FieldPosition, duration?: number): Promise { return new Promise(resolve => { if (fieldPosition === this.fieldPosition) { resolve(); @@ -1441,10 +1379,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns the numeric value of the desired {@linkcode Stat} */ getStat(stat: PermanentStat, bypassSummonData = true): number { - if ( - !bypassSummonData && - this.summonData.stats[stat] !== 0 - ) { + if (!bypassSummonData && this.summonData.stats[stat] !== 0) { return this.summonData.stats[stat]; } return this.stats[stat]; @@ -1518,9 +1453,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const critBoostTag = source.getTag(CritBoostTag); if (critBoostTag) { if (critBoostTag instanceof DragonCheerTag) { - critStage.value += critBoostTag.typesOnAdd.includes(PokemonType.DRAGON) - ? 2 - : 1; + critStage.value += critBoostTag.typesOnAdd.includes(PokemonType.DRAGON) ? 2 : 1; } else { critStage.value += 2; } @@ -1571,57 +1504,37 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ): number { const statValue = new NumberHolder(this.getStat(stat, false)); if (!ignoreHeldItems) { - globalScene.applyModifiers( - StatBoosterModifier, - this.isPlayer(), - this, - stat, - statValue, - ); + globalScene.applyModifiers(StatBoosterModifier, this.isPlayer(), this, stat, statValue); } // The Ruin abilities here are never ignored, but they reveal themselves on summon anyway const fieldApplied = new BooleanHolder(false); for (const pokemon of globalScene.getField(true)) { - applyFieldStatMultiplierAbAttrs( - FieldMultiplyStatAbAttr, - pokemon, - stat, - statValue, - this, - fieldApplied, - simulated, - ); + applyFieldStatMultiplierAbAttrs(FieldMultiplyStatAbAttr, pokemon, stat, statValue, this, fieldApplied, simulated); if (fieldApplied.value) { break; } } if (!ignoreAbility) { - applyStatMultiplierAbAttrs( - StatMultiplierAbAttr, - this, - stat, - statValue, - simulated, - ); + applyStatMultiplierAbAttrs(StatMultiplierAbAttr, this, stat, statValue, simulated); } const ally = this.getAlly(); if (!isNullOrUndefined(ally)) { - applyAllyStatMultiplierAbAttrs(AllyStatMultiplierAbAttr, ally, stat, statValue, simulated, this, move?.hasFlag(MoveFlags.IGNORE_ABILITIES) || ignoreAllyAbility); + applyAllyStatMultiplierAbAttrs( + AllyStatMultiplierAbAttr, + ally, + stat, + statValue, + simulated, + this, + move?.hasFlag(MoveFlags.IGNORE_ABILITIES) || ignoreAllyAbility, + ); } let ret = statValue.value * - this.getStatStageMultiplier( - stat, - opponent, - move, - ignoreOppAbility, - isCritical, - simulated, - ignoreHeldItems, - ); + this.getStatStageMultiplier(stat, opponent, move, ignoreOppAbility, isCritical, simulated, ignoreHeldItems); switch (stat) { case Stat.ATK: @@ -1630,31 +1543,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } break; case Stat.DEF: - if ( - this.isOfType(PokemonType.ICE) && - globalScene.arena.weather?.weatherType === WeatherType.SNOW - ) { + if (this.isOfType(PokemonType.ICE) && globalScene.arena.weather?.weatherType === WeatherType.SNOW) { ret *= 1.5; } break; case Stat.SPATK: break; case Stat.SPDEF: - if ( - this.isOfType(PokemonType.ROCK) && - globalScene.arena.weather?.weatherType === WeatherType.SANDSTORM - ) { + if (this.isOfType(PokemonType.ROCK) && globalScene.arena.weather?.weatherType === WeatherType.SANDSTORM) { ret *= 1.5; } break; - case Stat.SPD: + case Stat.SPD: { const side = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; if (globalScene.arena.getTagOnSide(ArenaTagType.TAILWIND, side)) { ret *= 2; } - if ( - globalScene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, side) - ) { + if (globalScene.arena.getTagOnSide(ArenaTagType.GRASS_WATER_PLEDGE, side)) { ret >>= 2; } @@ -1664,19 +1569,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.status && this.status.effect === StatusEffect.PARALYSIS) { ret >>= 1; } - if ( - this.getTag(BattlerTagType.UNBURDEN) && - this.hasAbility(Abilities.UNBURDEN) - ) { + if (this.getTag(BattlerTagType.UNBURDEN) && this.hasAbility(Abilities.UNBURDEN)) { ret *= 2; } break; + } } const highestStatBoost = this.findTag( - t => - t instanceof HighestStatBoostTag && - (t as HighestStatBoostTag).stat === stat, + t => t instanceof HighestStatBoostTag && (t as HighestStatBoostTag).stat === stat, ) as HighestStatBoostTag; if (highestStatBoost) { ret *= highestStatBoost.multiplier; @@ -1694,18 +1595,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const baseStats = this.calculateBaseStats(); // Using base stats, calculate and store stats one by one for (const s of PERMANENT_STATS) { - const statHolder = new NumberHolder( - Math.floor((2 * baseStats[s] + this.ivs[s]) * this.level * 0.01), - ); + const statHolder = new NumberHolder(Math.floor((2 * baseStats[s] + this.ivs[s]) * this.level * 0.01)); if (s === Stat.HP) { statHolder.value = statHolder.value + this.level + 10; - globalScene.applyModifier( - PokemonIncrementingStatModifier, - this.isPlayer(), - this, - s, - statHolder, - ); + globalScene.applyModifier(PokemonIncrementingStatModifier, this.isPlayer(), this, s, statHolder); if (this.hasAbility(Abilities.WONDER_GUARD, false, true)) { statHolder.value = 1; } @@ -1719,37 +1612,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } else { statHolder.value += 5; - const natureStatMultiplier = new NumberHolder( - getNatureStatMultiplier(this.getNature(), s), - ); - globalScene.applyModifier( - PokemonNatureWeightModifier, - this.isPlayer(), - this, - natureStatMultiplier, - ); + const natureStatMultiplier = new NumberHolder(getNatureStatMultiplier(this.getNature(), s)); + globalScene.applyModifier(PokemonNatureWeightModifier, this.isPlayer(), this, natureStatMultiplier); if (natureStatMultiplier.value !== 1) { statHolder.value = Math.max( - Math[natureStatMultiplier.value > 1 ? "ceil" : "floor"]( - statHolder.value * natureStatMultiplier.value, - ), + Math[natureStatMultiplier.value > 1 ? "ceil" : "floor"](statHolder.value * natureStatMultiplier.value), 1, ); } - globalScene.applyModifier( - PokemonIncrementingStatModifier, - this.isPlayer(), - this, - s, - statHolder, - ); + globalScene.applyModifier(PokemonIncrementingStatModifier, this.isPlayer(), this, s, statHolder); } - statHolder.value = Phaser.Math.Clamp( - statHolder.value, - 1, - Number.MAX_SAFE_INTEGER, - ); + statHolder.value = Phaser.Math.Clamp(statHolder.value, 1, Number.MAX_SAFE_INTEGER); this.setStat(s, statHolder.value); } @@ -1757,32 +1631,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { calculateBaseStats(): number[] { const baseStats = this.getSpeciesForm(true).baseStats.slice(0); - applyChallenges( - ChallengeType.FLIP_STAT, - this, - baseStats, - ); + applyChallenges(ChallengeType.FLIP_STAT, this, baseStats); // Shuckle Juice - globalScene.applyModifiers( - PokemonBaseStatTotalModifier, - this.isPlayer(), - this, - baseStats, - ); + globalScene.applyModifiers(PokemonBaseStatTotalModifier, this.isPlayer(), this, baseStats); // Old Gateau - globalScene.applyModifiers( - PokemonBaseStatFlatModifier, - this.isPlayer(), - this, - baseStats, - ); + globalScene.applyModifiers(PokemonBaseStatFlatModifier, this.isPlayer(), this, baseStats); if (this.isFusion()) { const fusionBaseStats = this.getFusionSpeciesForm(true).baseStats; - applyChallenges( - ChallengeType.FLIP_STAT, - this, - fusionBaseStats, - ); + applyChallenges(ChallengeType.FLIP_STAT, this, fusionBaseStats); for (const s of PERMANENT_STATS) { baseStats[s] = Math.ceil((baseStats[s] + fusionBaseStats[s]) / 2); @@ -1793,20 +1649,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } // Vitamins - globalScene.applyModifiers( - BaseStatModifier, - this.isPlayer(), - this, - baseStats, - ); + globalScene.applyModifiers(BaseStatModifier, this.isPlayer(), this, baseStats); return baseStats; } getNature(): Nature { - return this.customPokemonData.nature !== -1 - ? this.customPokemonData.nature - : this.nature; + return this.customPokemonData.nature !== -1 ? this.customPokemonData.nature : this.nature; } setNature(nature: Nature): void { @@ -1841,9 +1690,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getHpRatio(precise = false): number { - return precise - ? this.hp / this.getMaxHp() - : Math.round((this.hp / this.getMaxHp()) * 100) / 100; + return precise ? this.hp / this.getMaxHp() : Math.round((this.hp / this.getMaxHp()) * 100) / 100; } generateGender(): void { @@ -1860,54 +1707,56 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } /** - * @param {boolean} useIllusion - Whether we want the fake or real gender (illusion ability). + * @param useIllusion - Whether we want the fake or real gender (illusion ability). */ - getGender(ignoreOverride?: boolean, useIllusion: boolean = false): Gender { + getGender(ignoreOverride?: boolean, useIllusion = false): Gender { if (useIllusion && this.summonData.illusion) { return this.summonData.illusion.gender; - } else if (!ignoreOverride && !isNullOrUndefined(this.summonData.gender)) { + } + if (!ignoreOverride && !isNullOrUndefined(this.summonData.gender)) { return this.summonData.gender; } return this.gender; } /** - * @param {boolean} useIllusion - Whether we want the fake or real gender (illusion ability). + * @param useIllusion - Whether we want the fake or real gender (illusion ability). */ - getFusionGender(ignoreOverride?: boolean, useIllusion: boolean = false): Gender { + getFusionGender(ignoreOverride?: boolean, useIllusion = false): Gender { if (useIllusion && this.summonData.illusion?.fusionGender) { return this.summonData.illusion.fusionGender; - } else if (!ignoreOverride && !isNullOrUndefined(this.summonData.fusionGender)) { + } + if (!ignoreOverride && !isNullOrUndefined(this.summonData.fusionGender)) { return this.summonData.fusionGender; } return this.fusionGender; } /** - * @param {boolean} useIllusion - Whether we want the fake or real shininess (illusion ability). + * @param useIllusion - Whether we want the fake or real shininess (illusion ability). */ - isShiny(useIllusion: boolean = false): boolean { + isShiny(useIllusion = false): boolean { if (!useIllusion && this.summonData.illusion) { - return this.summonData.illusion.basePokemon?.shiny || (this.summonData.illusion.fusionSpecies && this.summonData.illusion.basePokemon?.fusionShiny) || false; - } else { - return this.shiny || (this.isFusion(useIllusion) && this.fusionShiny); + return !!( + this.summonData.illusion.basePokemon?.shiny || + (this.summonData.illusion.fusionSpecies && this.summonData.illusion.basePokemon?.fusionShiny) + ); } + return this.shiny || (this.isFusion(useIllusion) && this.fusionShiny); } - isBaseShiny(useIllusion: boolean = false){ + isBaseShiny(useIllusion = false) { if (!useIllusion && this.summonData.illusion) { return !!this.summonData.illusion.basePokemon?.shiny; - } else { - return this.shiny; } + return this.shiny; } - isFusionShiny(useIllusion: boolean = false){ + isFusionShiny(useIllusion = false) { if (!useIllusion && this.summonData.illusion) { return !!this.summonData.illusion.basePokemon?.fusionShiny; - } else { - return this.isFusion(useIllusion) && this.fusionShiny; } + return this.isFusion(useIllusion) && this.fusionShiny; } /** @@ -1915,34 +1764,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param useIllusion - Whether we want the fake or real shininess (illusion ability). * @returns `true` if the {@linkcode Pokemon} is shiny and the fusion is shiny as well, `false` otherwise */ - isDoubleShiny(useIllusion: boolean = false): boolean { + isDoubleShiny(useIllusion = false): boolean { if (!useIllusion && this.summonData.illusion?.basePokemon) { - return this.isFusion(false) && this.summonData.illusion.basePokemon.shiny && this.summonData.illusion.basePokemon.fusionShiny; - } else { - return this.isFusion(useIllusion) && this.shiny && this.fusionShiny; + return ( + this.isFusion(false) && + this.summonData.illusion.basePokemon.shiny && + this.summonData.illusion.basePokemon.fusionShiny + ); } + return this.isFusion(useIllusion) && this.shiny && this.fusionShiny; } /** - * @param {boolean} useIllusion - Whether we want the fake or real variant (illusion ability). + * @param useIllusion - Whether we want the fake or real variant (illusion ability). */ - getVariant(useIllusion: boolean = false): Variant { + getVariant(useIllusion = false): Variant { if (!useIllusion && this.summonData.illusion) { return !this.isFusion(false) - ? this.summonData.illusion.basePokemon!.variant - : Math.max(this.variant, this.fusionVariant) as Variant; - } else { - return !this.isFusion(true) - ? this.variant - : Math.max(this.variant, this.fusionVariant) as Variant; + ? this.summonData.illusion.basePokemon!.variant + : (Math.max(this.variant, this.fusionVariant) as Variant); } + return !this.isFusion(true) ? this.variant : (Math.max(this.variant, this.fusionVariant) as Variant); } getBaseVariant(doubleShiny: boolean): Variant { if (doubleShiny) { return this.summonData.illusion?.basePokemon?.variant ?? this.variant; } - return this.getVariant(); } @@ -1950,7 +1798,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return this.luck + (this.isFusion() ? this.fusionLuck : 0); } - isFusion(useIllusion: boolean = false): boolean { + isFusion(useIllusion = false): boolean { if (useIllusion && this.summonData.illusion) { return !!this.summonData.illusion.fusionSpecies; } @@ -1958,12 +1806,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } /** - * @param {boolean} useIllusion - Whether we want the fake name or the real name of the Pokemon (for Illusion ability). + * @param useIllusion - Whether we want the fake name or the real name of the Pokemon (for Illusion ability). */ - getName(useIllusion: boolean = false): string { - return (!useIllusion && this.summonData.illusion?.basePokemon) - ? this.summonData.illusion.basePokemon.name - : this.name; + getName(useIllusion = false): string { + return !useIllusion && this.summonData.illusion?.basePokemon + ? this.summonData.illusion.basePokemon.name + : this.name; } /** @@ -1983,22 +1831,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ hasSpecies(species: Species, formKey?: string): boolean { if (isNullOrUndefined(formKey)) { - return ( - this.species.speciesId === species || - this.fusionSpecies?.speciesId === species - ); + return this.species.speciesId === species || this.fusionSpecies?.speciesId === species; } - return (this.species.speciesId === species && this.getFormKey() === formKey) || (this.fusionSpecies?.speciesId === species && this.getFusionFormKey() === formKey); + return ( + (this.species.speciesId === species && this.getFormKey() === formKey) || + (this.fusionSpecies?.speciesId === species && this.getFusionFormKey() === formKey) + ); } abstract isBoss(): boolean; getMoveset(ignoreOverride?: boolean): PokemonMove[] { - const ret = - !ignoreOverride && this.summonData.moveset - ? this.summonData.moveset - : this.moveset; + const ret = !ignoreOverride && this.summonData.moveset ? this.summonData.moveset : this.moveset; // Overrides moveset based on arrays specified in overrides.ts let overrideArray: Moves | Array = this.isPlayer() @@ -2013,10 +1858,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } overrideArray.forEach((move: Moves, index: number) => { const ppUsed = this.moveset[index]?.ppUsed ?? 0; - this.moveset[index] = new PokemonMove( - move, - Math.min(ppUsed, allMoves[move].pp), - ); + this.moveset[index] = new PokemonMove(move, Math.min(ppUsed, allMoves[move].pp)); }); } @@ -2033,9 +1875,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { getUnlockedEggMoves(): Moves[] { const moves: Moves[] = []; const species = - this.metSpecies in speciesEggMoves - ? this.metSpecies - : this.getSpeciesForm(true).getRootSpeciesId(true); + this.metSpecies in speciesEggMoves ? this.metSpecies : this.getSpeciesForm(true).getRootSpeciesId(true); if (species in speciesEggMoves) { for (let i = 0; i < 4; i++) { if (globalScene.gameData.starterData[species].eggMoves & (1 << i)) { @@ -2057,17 +1897,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ public getLearnableLevelMoves(): Moves[] { let levelMoves = this.getLevelMoves(1, true, false, true).map(lm => lm[1]); - if ( - this.metBiome === -1 && - !globalScene.gameMode.isFreshStartChallenge() && - !globalScene.gameMode.isDaily - ) { + if (this.metBiome === -1 && !globalScene.gameMode.isFreshStartChallenge() && !globalScene.gameMode.isDaily) { levelMoves = this.getUnlockedEggMoves().concat(levelMoves); } if (Array.isArray(this.usedTMs) && this.usedTMs.length > 0) { - levelMoves = this.usedTMs - .filter(m => !levelMoves.includes(m)) - .concat(levelMoves); + levelMoves = this.usedTMs.filter(m => !levelMoves.includes(m)).concat(levelMoves); } levelMoves = levelMoves.filter(lm => !this.moveset.some(m => m.moveId === lm)); return levelMoves; @@ -2083,9 +1917,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ public getTypes( includeTeraType = false, - forDefend: boolean = false, - ignoreOverride: boolean = false, - useIllusion: boolean = false + forDefend = false, + ignoreOverride = false, + useIllusion = false, ): PokemonType[] { const types: PokemonType[] = []; @@ -2100,7 +1934,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } if (!types.length || !includeTeraType) { - if ( !ignoreOverride && this.summonData.types && @@ -2145,10 +1978,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { secondType = fusionType1; } - if ( - secondType === PokemonType.UNKNOWN && - isNullOrUndefined(fusionType2) - ) { + if (secondType === PokemonType.UNKNOWN && isNullOrUndefined(fusionType2)) { // If second pokemon was monotype and shared its primary type secondType = customTypes && @@ -2187,11 +2017,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } // check type added to Pokemon from moves like Forest's Curse or Trick Or Treat - if ( - !ignoreOverride && - this.summonData.addedType && - !types.includes(this.summonData.addedType) - ) { + if (!ignoreOverride && this.summonData.addedType && !types.includes(this.summonData.addedType)) { types.push(this.summonData.addedType); } @@ -2211,15 +2037,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreOverride - If `true`, ignore ability changing effects; Default: `false` * @returns `true` if the Pokemon's type matches */ - public isOfType( - type: PokemonType, - includeTeraType = true, - forDefend = false, - ignoreOverride = false, - ): boolean { - return this.getTypes(includeTeraType, forDefend, ignoreOverride).some( - t => t === type, - ); + public isOfType(type: PokemonType, includeTeraType = true, forDefend = false, ignoreOverride = false): boolean { + return this.getTypes(includeTeraType, forDefend, ignoreOverride).some(t => t === type); } /** @@ -2241,27 +2060,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return allAbilities[Overrides.OPP_ABILITY_OVERRIDE]; } if (this.isFusion()) { - if ( - !isNullOrUndefined(this.fusionCustomPokemonData?.ability) && - this.fusionCustomPokemonData.ability !== -1 - ) { + if (!isNullOrUndefined(this.fusionCustomPokemonData?.ability) && this.fusionCustomPokemonData.ability !== -1) { return allAbilities[this.fusionCustomPokemonData.ability]; } - return allAbilities[ - this.getFusionSpeciesForm(ignoreOverride).getAbility( - this.fusionAbilityIndex, - ) - ]; + return allAbilities[this.getFusionSpeciesForm(ignoreOverride).getAbility(this.fusionAbilityIndex)]; } - if ( - !isNullOrUndefined(this.customPokemonData.ability) && - this.customPokemonData.ability !== -1 - ) { + if (!isNullOrUndefined(this.customPokemonData.ability) && this.customPokemonData.ability !== -1) { return allAbilities[this.customPokemonData.ability]; } - let abilityId = this.getSpeciesForm(ignoreOverride).getAbility( - this.abilityIndex, - ); + let abilityId = this.getSpeciesForm(ignoreOverride).getAbility(this.abilityIndex); if (abilityId === Abilities.NONE) { abilityId = this.species.ability1; } @@ -2282,10 +2089,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (Overrides.OPP_PASSIVE_ABILITY_OVERRIDE && !this.isPlayer()) { return allAbilities[Overrides.OPP_PASSIVE_ABILITY_OVERRIDE]; } - if ( - !isNullOrUndefined(this.customPokemonData.passive) && - this.customPokemonData.passive !== -1 - ) { + if (!isNullOrUndefined(this.customPokemonData.passive) && this.customPokemonData.passive !== -1) { return allAbilities[this.customPokemonData.passive]; } @@ -2309,9 +2113,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const abilityAttrs: T[] = []; if (!canApply || this.canApplyAbility()) { - abilityAttrs.push( - ...this.getAbility(ignoreOverride).getAttrs(attrType), - ); + abilityAttrs.push(...this.getAbility(ignoreOverride).getAttrs(attrType)); } if (!canApply || this.canApplyAbility(true)) { @@ -2361,11 +2163,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return false; } if ( - ((Overrides.PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE || - Overrides.HAS_PASSIVE_ABILITY_OVERRIDE) && + ((Overrides.PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE || Overrides.HAS_PASSIVE_ABILITY_OVERRIDE) && this.isPlayer()) || - ((Overrides.OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE || - Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE) && + ((Overrides.OPP_PASSIVE_ABILITY_OVERRIDE !== Abilities.NONE || Overrides.OPP_HAS_PASSIVE_ABILITY_OVERRIDE) && !this.isPlayer()) ) { return true; @@ -2402,35 +2202,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return false; } const arena = globalScene?.arena; - if ( - arena.ignoreAbilities && - arena.ignoringEffectSource !== this.getBattlerIndex() && - ability.isIgnorable - ) { + if (arena.ignoreAbilities && arena.ignoringEffectSource !== this.getBattlerIndex() && ability.isIgnorable) { return false; } - if ( - this.summonData.abilitySuppressed && - ability.isSuppressable - ) { + if (this.summonData.abilitySuppressed && ability.isSuppressable) { return false; } - const suppressAbilitiesTag = arena.getTag( - ArenaTagType.NEUTRALIZING_GAS, - ) as SuppressAbilitiesTag; + const suppressAbilitiesTag = arena.getTag(ArenaTagType.NEUTRALIZING_GAS) as SuppressAbilitiesTag; const suppressOffField = ability.hasAttr(PreSummonAbAttr); - if ( - (this.isOnField() || suppressOffField) && - suppressAbilitiesTag && - !suppressAbilitiesTag.isBeingRemoved() - ) { - const thisAbilitySuppressing = ability.hasAttr( - PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, - ); - const hasSuppressingAbility = this.hasAbilityWithAttr( - PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, - false, - ); + if ((this.isOnField() || suppressOffField) && suppressAbilitiesTag && !suppressAbilitiesTag.isBeingRemoved()) { + const thisAbilitySuppressing = ability.hasAttr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr); + const hasSuppressingAbility = this.hasAbilityWithAttr(PreLeaveFieldRemoveSuppressAbilitiesSourceAbAttr, false); // Neutralizing gas is up - suppress abilities unless they are unsuppressable or this pokemon is responsible for the gas // (Balance decided that the other ability of a neutralizing gas pokemon should not be neutralized) // If the ability itself is neutralizing gas, don't suppress it (handled through arena tag) @@ -2442,10 +2224,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return false; } } - return ( - (this.hp > 0 || ability.isBypassFaint) && - !ability.conditions.find(condition => !condition(this)) - ); + return (this.hp > 0 || ability.isBypassFaint) && !ability.conditions.find(condition => !condition(this)); } /** @@ -2457,22 +2236,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreOverride Whether to ignore ability changing effects; default `false` * @returns `true` if the ability is present and active */ - public hasAbility( - ability: Abilities, - canApply = true, - ignoreOverride = false, - ): boolean { - if ( - this.getAbility(ignoreOverride).id === ability && - (!canApply || this.canApplyAbility()) - ) { + public hasAbility(ability: Abilities, canApply = true, ignoreOverride = false): boolean { + if (this.getAbility(ignoreOverride).id === ability && (!canApply || this.canApplyAbility())) { return true; } - if ( - this.getPassiveAbility().id === ability && - this.hasPassive() && - (!canApply || this.canApplyAbility(true)) - ) { + if (this.getPassiveAbility().id === ability && this.hasPassive() && (!canApply || this.canApplyAbility(true))) { return true; } return false; @@ -2488,22 +2256,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreOverride Whether to ignore ability changing effects; default `false` * @returns `true` if an ability with the given {@linkcode AbAttr} is present and active */ - public hasAbilityWithAttr( - attrType: Constructor, - canApply = true, - ignoreOverride = false, - ): boolean { - if ( - (!canApply || this.canApplyAbility()) && - this.getAbility(ignoreOverride).hasAttr(attrType) - ) { + public hasAbilityWithAttr(attrType: Constructor, canApply = true, ignoreOverride = false): boolean { + if ((!canApply || this.canApplyAbility()) && this.getAbility(ignoreOverride).hasAttr(attrType)) { return true; } - if ( - this.hasPassive() && - (!canApply || this.canApplyAbility(true)) && - this.getPassiveAbility().hasAttr(attrType) - ) { + if (this.hasPassive() && (!canApply || this.canApplyAbility(true)) && this.getPassiveAbility().hasAttr(attrType)) { return true; } return false; @@ -2536,10 +2293,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return PokemonType.STELLAR; } if (this.hasSpecies(Species.OGERPON)) { - const ogerponForm = - this.species.speciesId === Species.OGERPON - ? this.formIndex - : this.fusionFormIndex; + const ogerponForm = this.species.speciesId === Species.OGERPON ? this.formIndex : this.fusionFormIndex; switch (ogerponForm) { case 0: case 4: @@ -2579,10 +2333,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param simulated - If `true`, applies abilities via simulated calls. * @returns `true` if the pokemon is trapped */ - public isTrapped( - trappedAbMessages: string[] = [], - simulated = true, - ): boolean { + public isTrapped(trappedAbMessages: string[] = [], simulated = true): boolean { const commandedTag = this.getTag(BattlerTagType.COMMANDED); if (commandedTag?.getSourcePokemon()?.isActive(true)) { return true; @@ -2597,22 +2348,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Contains opposing Pokemon (Enemy/Player Pokemon) depending on perspective * Afterwards, it filters out Pokemon that have been switched out of the field so trapped abilities/moves do not trigger */ - const opposingFieldUnfiltered = this.isPlayer() - ? globalScene.getEnemyField() - : globalScene.getPlayerField(); - const opposingField = opposingFieldUnfiltered.filter( - enemyPkm => enemyPkm.switchOutStatus === false, - ); + const opposingFieldUnfiltered = this.isPlayer() ? globalScene.getEnemyField() : globalScene.getPlayerField(); + const opposingField = opposingFieldUnfiltered.filter(enemyPkm => enemyPkm.switchOutStatus === false); for (const opponent of opposingField) { - applyCheckTrappedAbAttrs( - CheckTrappedAbAttr, - opponent, - trappedByAbility, - this, - trappedAbMessages, - simulated, - ); + applyCheckTrappedAbAttrs(CheckTrappedAbAttr, opponent, trappedByAbility, this, trappedAbMessages, simulated); } const side = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; @@ -2634,26 +2374,19 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const moveTypeHolder = new NumberHolder(move.type); applyMoveAttrs(VariableMoveTypeAttr, this, null, move, moveTypeHolder); - applyPreAttackAbAttrs( - MoveTypeChangeAbAttr, - this, - null, - move, - simulated, - moveTypeHolder - ); + applyPreAttackAbAttrs(MoveTypeChangeAbAttr, this, null, move, simulated, moveTypeHolder); // If the user is terastallized and the move is tera blast, or tera starstorm that is stellar type, // then bypass the check for ion deluge and electrify - if (this.isTerastallized && (move.id === Moves.TERA_BLAST || move.id === Moves.TERA_STARSTORM && moveTypeHolder.value === PokemonType.STELLAR)) { + if ( + this.isTerastallized && + (move.id === Moves.TERA_BLAST || + (move.id === Moves.TERA_STARSTORM && moveTypeHolder.value === PokemonType.STELLAR)) + ) { return moveTypeHolder.value as PokemonType; } - globalScene.arena.applyTags( - ArenaTagType.ION_DELUGE, - simulated, - moveTypeHolder, - ); + globalScene.arena.applyTags(ArenaTagType.ION_DELUGE, simulated, moveTypeHolder); if (this.getTag(BattlerTagType.ELECTRIFIED)) { moveTypeHolder.value = PokemonType.ELECTRIC; } @@ -2678,7 +2411,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ignoreAbility = false, simulated = true, cancelled?: BooleanHolder, - useIllusion: boolean = false + useIllusion = false, ): TypeDamageMultiplier { if (!isNullOrUndefined(this.turnData?.moveEffectiveness)) { return this.turnData?.moveEffectiveness; @@ -2690,28 +2423,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const moveType = source.getMoveType(move); const typeMultiplier = new NumberHolder( - move.category !== MoveCategory.STATUS || - move.hasAttr(RespectAttackTypeImmunityAttr) - ? this.getAttackTypeEffectiveness( - moveType, - source, - false, - simulated, - move, - useIllusion - ) - : 1); - - applyMoveAttrs( - VariableMoveTypeMultiplierAttr, - source, - this, - move, - typeMultiplier, + move.category !== MoveCategory.STATUS || move.hasAttr(RespectAttackTypeImmunityAttr) + ? this.getAttackTypeEffectiveness(moveType, source, false, simulated, move, useIllusion) + : 1, ); - if ( - this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t)) - ) { + + applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier); + if (this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t))) { typeMultiplier.value = 0; } @@ -2721,52 +2439,23 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const cancelledHolder = cancelled ?? new BooleanHolder(false); if (!ignoreAbility) { - applyPreDefendAbAttrs( - TypeImmunityAbAttr, - this, - source, - move, - cancelledHolder, - simulated, - typeMultiplier, - ); + applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier); if (!cancelledHolder.value) { - applyPreDefendAbAttrs( - MoveImmunityAbAttr, - this, - source, - move, - cancelledHolder, - simulated, - typeMultiplier, - ); + applyPreDefendAbAttrs(MoveImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier); } if (!cancelledHolder.value) { - const defendingSidePlayField = this.isPlayer() - ? globalScene.getPlayerField() - : globalScene.getEnemyField(); + const defendingSidePlayField = this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField(); defendingSidePlayField.forEach(p => - applyPreDefendAbAttrs( - FieldPriorityMoveImmunityAbAttr, - p, - source, - move, - cancelledHolder, - ), + applyPreDefendAbAttrs(FieldPriorityMoveImmunityAbAttr, p, source, move, cancelledHolder), ); } } - const immuneTags = this.findTags( - tag => tag instanceof TypeImmuneTag && tag.immuneType === moveType, - ); + const immuneTags = this.findTags(tag => tag instanceof TypeImmuneTag && tag.immuneType === moveType); for (const tag of immuneTags) { - if ( - move && - !move.getAttrs(HitsTagAttr).some(attr => attr.tagType === tag.tagType) - ) { + if (move && !move.getAttrs(HitsTagAttr).some(attr => attr.tagType === tag.tagType)) { typeMultiplier.value = 0; break; } @@ -2774,27 +2463,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Apply Tera Shell's effect to attacks after all immunities are accounted for if (!ignoreAbility && move.category !== MoveCategory.STATUS) { - applyPreDefendAbAttrs( - FullHpResistTypeAbAttr, - this, - source, - move, - cancelledHolder, - simulated, - typeMultiplier, - ); + applyPreDefendAbAttrs(FullHpResistTypeAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier); } - if ( - move.category === MoveCategory.STATUS && - move.hitsSubstitute(source, this) - ) { + if (move.category === MoveCategory.STATUS && move.hitsSubstitute(source, this)) { typeMultiplier.value = 0; } - return ( - !cancelledHolder.value ? typeMultiplier.value : 0 - ) as TypeDamageMultiplier; + return (!cancelledHolder.value ? typeMultiplier.value : 0) as TypeDamageMultiplier; } /** @@ -2810,10 +2486,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { getAttackTypeEffectiveness( moveType: PokemonType, source?: Pokemon, - ignoreStrongWinds: boolean = false, - simulated: boolean = true, + ignoreStrongWinds = false, + simulated = true, move?: Move, - useIllusion: boolean = false + useIllusion = false, ): TypeDamageMultiplier { if (moveType === PokemonType.STELLAR) { return this.isTerastallized ? 2 : 1; @@ -2823,10 +2499,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Handle flying v ground type immunity without removing flying type so effective types are still effective // Related to https://github.com/pagefaultgames/pokerogue/issues/524 - if ( - moveType === PokemonType.GROUND && - (this.isGrounded() || arena.hasTag(ArenaTagType.GRAVITY)) - ) { + if (moveType === PokemonType.GROUND && (this.isGrounded() || arena.hasTag(ArenaTagType.GRAVITY))) { const flyingIndex = types.indexOf(PokemonType.FLYING); if (flyingIndex > -1) { types.splice(flyingIndex, 1); @@ -2835,37 +2508,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let multiplier = types .map(defType => { - const multiplier = new NumberHolder( - getTypeDamageMultiplier(moveType, defType), - ); - applyChallenges( - ChallengeType.TYPE_EFFECTIVENESS, - multiplier, - ); + const multiplier = new NumberHolder(getTypeDamageMultiplier(moveType, defType)); + applyChallenges(ChallengeType.TYPE_EFFECTIVENESS, multiplier); if (move) { - applyMoveAttrs( - VariableMoveTypeChartAttr, - null, - this, - move, - multiplier, - defType, - ); + applyMoveAttrs(VariableMoveTypeChartAttr, null, this, move, multiplier, defType); } if (source) { const ignoreImmunity = new BooleanHolder(false); - if ( - source.isActive(true) && - source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr) - ) { - applyAbAttrs( - IgnoreTypeImmunityAbAttr, - source, - ignoreImmunity, - simulated, - moveType, - defType, - ); + if (source.isActive(true) && source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr)) { + applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, simulated, moveType, defType); } if (ignoreImmunity.value) { if (multiplier.value === 0) { @@ -2873,9 +2524,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } - const exposedTags = this.findTags( - tag => tag instanceof ExposedTag, - ) as ExposedTag[]; + const exposedTags = this.findTags(tag => tag instanceof ExposedTag) as ExposedTag[]; if (exposedTags.some(t => t.ignoreImmunity(defType, moveType))) { if (multiplier.value === 0) { return 1; @@ -2886,13 +2535,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { }) .reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier; - const typeMultiplierAgainstFlying = new NumberHolder( - getTypeDamageMultiplier(moveType, PokemonType.FLYING), - ); - applyChallenges( - ChallengeType.TYPE_EFFECTIVENESS, - typeMultiplierAgainstFlying, - ); + const typeMultiplierAgainstFlying = new NumberHolder(getTypeDamageMultiplier(moveType, PokemonType.FLYING)); + applyChallenges(ChallengeType.TYPE_EFFECTIVENESS, typeMultiplierAgainstFlying); // Handle strong winds lowering effectiveness of types super effective against pure flying if ( !ignoreStrongWinds && @@ -2921,27 +2565,25 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const enemyTypes = opponent.getTypes(true, true, false, true); /** Is this Pokemon faster than the opponent? */ const outspeed = - (this.isActive(true) - ? this.getEffectiveStat(Stat.SPD, opponent) - : this.getStat(Stat.SPD, false)) >= + (this.isActive(true) ? this.getEffectiveStat(Stat.SPD, opponent) : this.getStat(Stat.SPD, false)) >= opponent.getEffectiveStat(Stat.SPD, this); /** * Based on how effective this Pokemon's types are offensively against the opponent's types. * This score is increased by 25 percent if this Pokemon is faster than the opponent. */ - let atkScore = opponent.getAttackTypeEffectiveness(types[0], this, false, true, undefined, true) * (outspeed ? 1.25 : 1); + let atkScore = + opponent.getAttackTypeEffectiveness(types[0], this, false, true, undefined, true) * (outspeed ? 1.25 : 1); /** * Based on how effectively this Pokemon defends against the opponent's types. * This score cannot be higher than 4. */ - let defScore = - 1 / - Math.max(this.getAttackTypeEffectiveness(enemyTypes[0], opponent), 0.25); + let defScore = 1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[0], opponent), 0.25); if (types.length > 1) { atkScore *= opponent.getAttackTypeEffectiveness(types[1], this); } if (enemyTypes.length > 1) { - defScore *= (1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[1], opponent, false, false, undefined, true), 0.25)); + defScore *= + 1 / Math.max(this.getAttackTypeEffectiveness(enemyTypes[1], opponent, false, false, undefined, true), 0.25); } /** * Based on this Pokemon's HP ratio compared to that of the opponent. @@ -2962,38 +2604,26 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if ( !e.item && this.level >= e.level && - (isNullOrUndefined(e.preFormKey) || - this.getFormKey() === e.preFormKey) + (isNullOrUndefined(e.preFormKey) || this.getFormKey() === e.preFormKey) ) { - if ( - e.condition === null || - (e.condition as SpeciesEvolutionCondition).predicate(this) - ) { + if (e.condition === null || (e.condition as SpeciesEvolutionCondition).predicate(this)) { return e; } } } } - if ( - this.isFusion() && - this.fusionSpecies && - pokemonEvolutions.hasOwnProperty(this.fusionSpecies.speciesId) - ) { - const fusionEvolutions = pokemonEvolutions[ - this.fusionSpecies.speciesId - ].map(e => new FusionSpeciesFormEvolution(this.species.speciesId, e)); + if (this.isFusion() && this.fusionSpecies && pokemonEvolutions.hasOwnProperty(this.fusionSpecies.speciesId)) { + const fusionEvolutions = pokemonEvolutions[this.fusionSpecies.speciesId].map( + e => new FusionSpeciesFormEvolution(this.species.speciesId, e), + ); for (const fe of fusionEvolutions) { if ( !fe.item && this.level >= fe.level && - (isNullOrUndefined(fe.preFormKey) || - this.getFusionFormKey() === fe.preFormKey) + (isNullOrUndefined(fe.preFormKey) || this.getFusionFormKey() === fe.preFormKey) ) { - if ( - fe.condition === null || - (fe.condition as SpeciesEvolutionCondition).predicate(this) - ) { + if (fe.condition === null || (fe.condition as SpeciesEvolutionCondition).predicate(this)) { return fe; } } @@ -3023,10 +2653,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!startingLevel) { startingLevel = this.level; } - if ( - learnSituation === LearnMoveSituation.EVOLUTION_FUSED && - this.fusionSpecies - ) { + if (learnSituation === LearnMoveSituation.EVOLUTION_FUSED && this.fusionSpecies) { // For fusion evolutions, get ONLY the moves of the component mon that evolved levelMoves = this.getFusionSpeciesForm(true) .getLevelMoves() @@ -3046,10 +2673,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ); for (let e = 0; e < evolutionChain.length; e++) { // TODO: Might need to pass specific form index in simulated evolution chain - const speciesLevelMoves = getPokemonSpeciesForm( - evolutionChain[e][0], - this.formIndex, - ).getLevelMoves(); + const speciesLevelMoves = getPokemonSpeciesForm(evolutionChain[e][0], this.formIndex).getLevelMoves(); if (includeRelearnerMoves) { levelMoves.push(...speciesLevelMoves); } else { @@ -3057,9 +2681,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ...speciesLevelMoves.filter( lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || - ((!e || lm[0] > 1) && - (e === evolutionChain.length - 1 || - lm[0] <= evolutionChain[e + 1][1])), + ((!e || lm[0] > 1) && (e === evolutionChain.length - 1 || lm[0] <= evolutionChain[e + 1][1])), ), ); } @@ -3074,19 +2696,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { lm[0] > 0, ); } - if ( - this.fusionSpecies && - learnSituation !== LearnMoveSituation.EVOLUTION_FUSED_BASE - ) { + if (this.fusionSpecies && learnSituation !== LearnMoveSituation.EVOLUTION_FUSED_BASE) { // For fusion evolutions, get ONLY the moves of the component mon that evolved if (simulateEvolutionChain) { - const fusionEvolutionChain = - this.fusionSpecies.getSimulatedEvolutionChain( - this.level, - this.hasTrainer(), - this.isBoss(), - this.isPlayer(), - ); + const fusionEvolutionChain = this.fusionSpecies.getSimulatedEvolutionChain( + this.level, + this.hasTrainer(), + this.isBoss(), + this.isPlayer(), + ); for (let e = 0; e < fusionEvolutionChain.length; e++) { // TODO: Might need to pass specific form index in simulated evolution chain const speciesLevelMoves = getPokemonSpeciesForm( @@ -3096,9 +2714,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (includeRelearnerMoves) { levelMoves.push( ...speciesLevelMoves.filter( - lm => - (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || - lm[0] !== EVOLVE_MOVE, + lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || lm[0] !== EVOLVE_MOVE, ), ); } else { @@ -3107,8 +2723,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { lm => (includeEvolutionMoves && lm[0] === EVOLVE_MOVE) || ((!e || lm[0] > 1) && - (e === fusionEvolutionChain.length - 1 || - lm[0] <= fusionEvolutionChain[e + 1][1])), + (e === fusionEvolutionChain.length - 1 || lm[0] <= fusionEvolutionChain[e + 1][1])), ), ); } @@ -3127,9 +2742,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } } - levelMoves.sort((lma: [number, number], lmb: [number, number]) => - lma[0] > lmb[0] ? 1 : lma[0] < lmb[0] ? -1 : 0, - ); + levelMoves.sort((lma: [number, number], lmb: [number, number]) => (lma[0] > lmb[0] ? 1 : lma[0] < lmb[0] ? -1 : 0)); /** * Filter out moves not within the correct level range(s) @@ -3141,10 +2754,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const isRelearner = level < startingLevel; const allowedEvolutionMove = level === 0 && includeEvolutionMoves; - return ( - !(level > this.level) && - (includeRelearnerMoves || !isRelearner || allowedEvolutionMove) - ); + return !(level > this.level) && (includeRelearnerMoves || !isRelearner || allowedEvolutionMove); }); /** @@ -3210,10 +2820,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { */ trySetShiny(thresholdOverride?: number): boolean { // Shiny Pokemon should not spawn in the end biome in endless - if ( - globalScene.gameMode.isEndless && - globalScene.arena.biomeType === Biome.END - ) { + if (globalScene.gameMode.isEndless && globalScene.arena.biomeType === Biome.END) { return false; } @@ -3233,11 +2840,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } if (!this.hasTrainer()) { - globalScene.applyModifiers( - ShinyRateBoosterModifier, - true, - shinyThreshold, - ); + globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); } } else { shinyThreshold.value = thresholdOverride; @@ -3262,10 +2865,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param applyModifiersToOverride If {@linkcode thresholdOverride} is set and this is true, will apply Shiny Charm and event modifiers to {@linkcode thresholdOverride} * @returns `true` if the Pokemon has been set as a shiny, `false` otherwise */ - public trySetShinySeed( - thresholdOverride?: number, - applyModifiersToOverride?: boolean, - ): boolean { + public trySetShinySeed(thresholdOverride?: number, applyModifiersToOverride?: boolean): boolean { if (!this.shiny) { const shinyThreshold = new NumberHolder(BASE_SHINY_CHANCE); if (thresholdOverride === undefined || applyModifiersToOverride) { @@ -3275,13 +2875,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (timedEventManager.isEventActive()) { shinyThreshold.value *= timedEventManager.getShinyMultiplier(); } - globalScene.applyModifiers( - ShinyRateBoosterModifier, - true, - shinyThreshold, - ); - } - else { + globalScene.applyModifiers(ShinyRateBoosterModifier, true, shinyThreshold); + } else { shinyThreshold.value = thresholdOverride; } @@ -3291,8 +2886,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.shiny) { this.variant = this.variant ?? 0; this.variant = Math.max(this.generateShinyVariant(), this.variant) as Variant; // Don't set a variant lower than the current one - this.luck = - this.variant + 1 + (this.fusionShiny ? this.fusionVariant + 1 : 0); + this.luck = this.variant + 1 + (this.fusionShiny ? this.fusionVariant + 1 : 0); this.initShinySparkle(); } @@ -3318,8 +2912,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Checks if there is no variant data for both the index or index with form if ( !this.shiny || - (!variantData.hasOwnProperty(variantDataIndex) && - !variantData.hasOwnProperty(this.species.speciesId)) + (!variantData.hasOwnProperty(variantDataIndex) && !variantData.hasOwnProperty(this.species.speciesId)) ) { return 0; } @@ -3349,10 +2942,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param applyModifiersToOverride If {@linkcode thresholdOverride} is set and this is true, will apply Ability Charm to {@linkcode thresholdOverride} * @returns `true` if the Pokemon has been set to have its hidden ability, `false` otherwise */ - public tryRerollHiddenAbilitySeed( - thresholdOverride?: number, - applyModifiersToOverride?: boolean, - ): boolean { + public tryRerollHiddenAbilitySeed(thresholdOverride?: number, applyModifiersToOverride?: boolean): boolean { if (!this.species.abilityHidden) { return false; } @@ -3362,11 +2952,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { haThreshold.value = thresholdOverride; } if (!this.hasTrainer()) { - globalScene.applyModifiers( - HiddenAbilityRateBoosterModifier, - true, - haThreshold, - ); + globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, haThreshold); } } else { haThreshold.value = thresholdOverride; @@ -3380,15 +2966,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } public generateFusionSpecies(forStarter?: boolean): void { - const hiddenAbilityChance = new NumberHolder( - BASE_HIDDEN_ABILITY_CHANCE, - ); + const hiddenAbilityChance = new NumberHolder(BASE_HIDDEN_ABILITY_CHANCE); if (!this.hasTrainer()) { - globalScene.applyModifiers( - HiddenAbilityRateBoosterModifier, - true, - hiddenAbilityChance, - ); + globalScene.applyModifiers(HiddenAbilityRateBoosterModifier, true, hiddenAbilityChance); } const hasHiddenAbility = !randSeedInt(hiddenAbilityChance.value); @@ -3411,30 +2991,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let fusionOverride: PokemonSpecies | undefined = undefined; - if ( - forStarter && - this instanceof PlayerPokemon && - Overrides.STARTER_FUSION_SPECIES_OVERRIDE - ) { - fusionOverride = getPokemonSpecies( - Overrides.STARTER_FUSION_SPECIES_OVERRIDE, - ); - } else if ( - this instanceof EnemyPokemon && - Overrides.OPP_FUSION_SPECIES_OVERRIDE - ) { + if (forStarter && this instanceof PlayerPokemon && Overrides.STARTER_FUSION_SPECIES_OVERRIDE) { + fusionOverride = getPokemonSpecies(Overrides.STARTER_FUSION_SPECIES_OVERRIDE); + } else if (this instanceof EnemyPokemon && Overrides.OPP_FUSION_SPECIES_OVERRIDE) { fusionOverride = getPokemonSpecies(Overrides.OPP_FUSION_SPECIES_OVERRIDE); } this.fusionSpecies = fusionOverride ?? - globalScene.randomSpecies( - globalScene.currentBattle?.waveIndex || 0, - this.level, - false, - filter, - true, - ); + globalScene.randomSpecies(globalScene.currentBattle?.waveIndex || 0, this.level, false, filter, true); this.fusionAbilityIndex = this.fusionSpecies.abilityHidden && hasHiddenAbility ? 2 @@ -3486,10 +3051,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { let movePool: [Moves, number][] = []; const allLevelMoves = this.getLevelMoves(1, true, true); if (!allLevelMoves) { - console.warn( - "Error encountered trying to generate moveset for:", - this.species.name, - ); + console.warn("Error encountered trying to generate moveset for:", this.species.name); return; } @@ -3504,13 +3066,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { weight = 50; } // Assume level 1 moves with 80+ BP are "move reminder" moves and bump their weight. Trainers use actual relearn moves. - if (weight === 1 && allMoves[levelMove[1]].power >= 80 || weight === RELEARN_MOVE && this.hasTrainer()) { + if ((weight === 1 && allMoves[levelMove[1]].power >= 80) || (weight === RELEARN_MOVE && this.hasTrainer())) { weight = 40; } - if ( - !movePool.some(m => m[0] === levelMove[1]) && - !allMoves[levelMove[1]].name.endsWith(" (N)") - ) { + if (!movePool.some(m => m[0] === levelMove[1]) && !allMoves[levelMove[1]].name.endsWith(" (N)")) { movePool.push([levelMove[1], weight]); } } @@ -3531,30 +3090,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { compatible = true; break; } - } else if ( - p === this.species.speciesId || - (this.fusionSpecies && p === this.fusionSpecies.speciesId) - ) { + } else if (p === this.species.speciesId || (this.fusionSpecies && p === this.fusionSpecies.speciesId)) { compatible = true; break; } } - if ( - compatible && - !movePool.some(m => m[0] === moveId) && - !allMoves[moveId].name.endsWith(" (N)") - ) { + if (compatible && !movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) { if (tmPoolTiers[moveId] === ModifierTier.COMMON && this.level >= 15) { movePool.push([moveId, 4]); - } else if ( - tmPoolTiers[moveId] === ModifierTier.GREAT && - this.level >= 30 - ) { + } else if (tmPoolTiers[moveId] === ModifierTier.GREAT && this.level >= 30) { movePool.push([moveId, 8]); - } else if ( - tmPoolTiers[moveId] === ModifierTier.ULTRA && - this.level >= 50 - ) { + } else if (tmPoolTiers[moveId] === ModifierTier.ULTRA && this.level >= 50) { movePool.push([moveId, 14]); } } @@ -3564,10 +3110,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.level >= 60) { for (let i = 0; i < 3; i++) { const moveId = speciesEggMoves[this.species.getRootSpeciesId()][i]; - if ( - !movePool.some(m => m[0] === moveId) && - !allMoves[moveId].name.endsWith(" (N)") - ) { + if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) { movePool.push([moveId, 40]); } } @@ -3583,17 +3126,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } if (this.fusionSpecies) { for (let i = 0; i < 3; i++) { - const moveId = - speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][i]; - if ( - !movePool.some(m => m[0] === moveId) && - !allMoves[moveId].name.endsWith(" (N)") - ) { + const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][i]; + if (!movePool.some(m => m[0] === moveId) && !allMoves[moveId].name.endsWith(" (N)")) { movePool.push([moveId, 40]); } } - const moveId = - speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][3]; + const moveId = speciesEggMoves[this.fusionSpecies.getRootSpeciesId()][3]; // No rare egg moves before e4 if ( this.level >= 170 && @@ -3612,35 +3150,21 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttr) && !allMoves[m[0]].hasAttr(HpSplitAttr)); } // No one gets Memento or Final Gambit - movePool = movePool.filter( - m => !allMoves[m[0]].hasAttr(SacrificialAttrOnHit), - ); + movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(SacrificialAttrOnHit)); if (this.hasTrainer()) { // Trainers never get OHKO moves movePool = movePool.filter(m => !allMoves[m[0]].hasAttr(OneHitKOAttr)); // Half the weight of self KO moves - movePool = movePool.map(m => [ - m[0], - m[1] * (allMoves[m[0]].hasAttr(SacrificialAttr) ? 0.5 : 1), - ]); + movePool = movePool.map(m => [m[0], m[1] * (allMoves[m[0]].hasAttr(SacrificialAttr) ? 0.5 : 1)]); // Trainers get a weight bump to stat buffing moves movePool = movePool.map(m => [ m[0], - m[1] * - (allMoves[m[0]] - .getAttrs(StatStageChangeAttr) - .some(a => a.stages > 1 && a.selfTarget) - ? 1.25 - : 1), + m[1] * (allMoves[m[0]].getAttrs(StatStageChangeAttr).some(a => a.stages > 1 && a.selfTarget) ? 1.25 : 1), ]); // Trainers get a weight decrease to multiturn moves movePool = movePool.map(m => [ m[0], - m[1] * - (!!allMoves[m[0]].isChargingMove() || - !!allMoves[m[0]].hasAttr(RechargeAttr) - ? 0.7 - : 1), + m[1] * (!!allMoves[m[0]].isChargingMove() || !!allMoves[m[0]].hasAttr(RechargeAttr) ? 0.7 : 1), ]); } @@ -3648,10 +3172,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Caps max power at 90 to avoid something like hyper beam ruining the stats. // This is a pretty soft weighting factor, although it is scaled with the weight multiplier. const maxPower = Math.min( - movePool.reduce( - (v, m) => Math.max(allMoves[m[0]].calculateEffectivePower(), v), - 40, - ), + movePool.reduce((v, m) => Math.max(allMoves[m[0]].calculateEffectivePower(), v), 40), 90, ); movePool = movePool.map(m => [ @@ -3659,10 +3180,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { m[1] * (allMoves[m[0]].category === MoveCategory.STATUS ? 1 - : Math.max( - Math.min(allMoves[m[0]].calculateEffectivePower() / maxPower, 1), - 0.5, - )), + : Math.max(Math.min(allMoves[m[0]].calculateEffectivePower() / maxPower, 1), 0.5)), ]); // Weight damaging moves against the lower stat. This uses a non-linear relationship. @@ -3670,16 +3188,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // One third weight at ~1.58x higher, one quarter weight at ~1.73x higher, one fifth at ~1.87x, and one tenth at ~2.35x higher. const atk = this.getStat(Stat.ATK); const spAtk = this.getStat(Stat.SPATK); - const worseCategory: MoveCategory = - atk > spAtk ? MoveCategory.SPECIAL : MoveCategory.PHYSICAL; - const statRatio = - worseCategory === MoveCategory.PHYSICAL ? atk / spAtk : spAtk / atk; + const worseCategory: MoveCategory = atk > spAtk ? MoveCategory.SPECIAL : MoveCategory.PHYSICAL; + const statRatio = worseCategory === MoveCategory.PHYSICAL ? atk / spAtk : spAtk / atk; movePool = movePool.map(m => [ m[0], - m[1] * - (allMoves[m[0]].category === worseCategory - ? Math.min(Math.pow(statRatio, 3) * 1.3, 1) - : 1), + m[1] * (allMoves[m[0]].category === worseCategory ? Math.min(Math.pow(statRatio, 3) * 1.3, 1) : 1), ]); /** The higher this is the more the game weights towards higher level moves. At `0` all moves are equal weight. */ @@ -3687,16 +3200,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.isBoss()) { weightMultiplier += 0.4; } - const baseWeights: [Moves, number][] = movePool.map(m => [ - m[0], - Math.ceil(Math.pow(m[1], weightMultiplier) * 100), - ]); + const baseWeights: [Moves, number][] = movePool.map(m => [m[0], Math.ceil(Math.pow(m[1], weightMultiplier) * 100)]); // All Pokemon force a STAB move first const stabMovePool = baseWeights.filter( - m => - allMoves[m[0]].category !== MoveCategory.STATUS && - this.isOfType(allMoves[m[0]].type), + m => allMoves[m[0]].category !== MoveCategory.STATUS && this.isOfType(allMoves[m[0]].type), ); if (stabMovePool.length) { @@ -3709,41 +3217,32 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.moveset.push(new PokemonMove(stabMovePool[index][0], 0, 0)); } - while ( - baseWeights.length > this.moveset.length && - this.moveset.length < 4 - ) { + while (baseWeights.length > this.moveset.length && this.moveset.length < 4) { if (this.hasTrainer()) { // Sqrt the weight of any damaging moves with overlapping types. This is about a 0.05 - 0.1 multiplier. // Other damaging moves 2x weight if 0-1 damaging moves, 0.5x if 2, 0.125x if 3. These weights get 20x if STAB. // Status moves remain unchanged on weight, this encourages 1-2 movePool = baseWeights - .filter(m => !this.moveset.some( - mo => - m[0] === mo.moveId || - (allMoves[m[0]].hasAttr(SacrificialAttr) && mo.getMove().hasAttr(SacrificialAttr)) // Only one self-KO move allowed - )) + .filter( + m => + !this.moveset.some( + mo => + m[0] === mo.moveId || + (allMoves[m[0]].hasAttr(SacrificialAttr) && mo.getMove().hasAttr(SacrificialAttr)), // Only one self-KO move allowed + ), + ) .map(m => { let ret: number; if ( this.moveset.some( - mo => - mo.getMove().category !== MoveCategory.STATUS && - mo.getMove().type === allMoves[m[0]].type, + mo => mo.getMove().category !== MoveCategory.STATUS && mo.getMove().type === allMoves[m[0]].type, ) ) { ret = Math.ceil(Math.sqrt(m[1])); } else if (allMoves[m[0]].category !== MoveCategory.STATUS) { ret = Math.ceil( (m[1] / - Math.max( - Math.pow( - 4, - this.moveset.filter(mo => (mo.getMove().power ?? 0) > 1) - .length, - ) / 8, - 0.5, - )) * + Math.max(Math.pow(4, this.moveset.filter(mo => (mo.getMove().power ?? 0) > 1).length) / 8, 0.5)) * (this.isOfType(allMoves[m[0]].type) ? 20 : 1), ); } else { @@ -3753,11 +3252,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { }); } else { // Non-trainer pokemon just use normal weights - movePool = baseWeights.filter(m => !this.moveset.some( - mo => - m[0] === mo.moveId || - (allMoves[m[0]].hasAttr(SacrificialAttr) && mo.getMove().hasAttr(SacrificialAttr)) // Only one self-KO move allowed - )); + movePool = baseWeights.filter( + m => + !this.moveset.some( + mo => + m[0] === mo.moveId || + (allMoves[m[0]].hasAttr(SacrificialAttr) && mo.getMove().hasAttr(SacrificialAttr)), // Only one self-KO move allowed + ), + ); } const totalWeight = movePool.reduce((v, m) => v + m[1], 0); let rand = randSeedInt(totalWeight); @@ -3774,18 +3276,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { !globalScene.currentBattle?.isBattleMysteryEncounter() || !globalScene.currentBattle?.mysteryEncounter ) { - globalScene.triggerPokemonFormChange( - this, - SpeciesFormChangeMoveLearnedTrigger, - ); + globalScene.triggerPokemonFormChange(this, SpeciesFormChangeMoveLearnedTrigger); } } public trySelectMove(moveIndex: number, ignorePp?: boolean): boolean { - const move = - this.getMoveset().length > moveIndex - ? this.getMoveset()[moveIndex] - : null; + const move = this.getMoveset().length > moveIndex ? this.getMoveset()[moveIndex] : null; return move?.isUsable(this, ignorePp) ?? false; } @@ -3794,11 +3290,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const otherBattleInfo = globalScene.fieldUI .getAll() .slice(0, 4) - .filter( - ui => - ui instanceof BattleInfo && - (ui as BattleInfo) instanceof PlayerBattleInfo === this.isPlayer(), - ) + .filter(ui => ui instanceof BattleInfo && (ui as BattleInfo) instanceof PlayerBattleInfo === this.isPlayer()) .find(() => true); if (!otherBattleInfo || !this.getFieldIndex()) { globalScene.fieldUI.sendToBack(this.battleInfo); @@ -3806,10 +3298,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } else { globalScene.fieldUI.moveAbove(this.battleInfo, otherBattleInfo); } - this.battleInfo.setX( - this.battleInfo.x + - (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198), - ); + this.battleInfo.setX(this.battleInfo.x + (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198)); this.battleInfo.setVisible(true); if (this.isPlayer()) { this.battleInfo.expMaskRect.x += 150; @@ -3825,7 +3314,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { hideInfo(): Promise { return new Promise(resolve => { - if (this.battleInfo && this.battleInfo.visible) { + if (this.battleInfo?.visible) { globalScene.tweens.add({ targets: [this.battleInfo, this.battleInfo.expMaskRect], x: this.isPlayer() ? "+=150" : `-=${!this.isBoss() ? 150 : 246}`, @@ -3836,10 +3325,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.battleInfo.expMaskRect.x -= 150; } this.battleInfo.setVisible(false); - this.battleInfo.setX( - this.battleInfo.x - - (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198), - ); + this.battleInfo.setX(this.battleInfo.x - (this.isPlayer() ? 150 : !this.isBoss() ? -150 : -198)); resolve(); }, }); @@ -3886,25 +3372,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const maxExpLevel = globalScene.getMaxExpLevel(ignoreLevelCap); const initialExp = this.exp; this.exp += exp; - while ( - this.level < maxExpLevel && - this.exp >= getLevelTotalExp(this.level + 1, this.species.growthRate) - ) { + while (this.level < maxExpLevel && this.exp >= getLevelTotalExp(this.level + 1, this.species.growthRate)) { this.level++; } if (this.level >= maxExpLevel) { - console.log( - initialExp, - this.exp, - getLevelTotalExp(this.level, this.species.growthRate), - ); - this.exp = Math.max( - getLevelTotalExp(this.level, this.species.growthRate), - initialExp, - ); + console.log(initialExp, this.exp, getLevelTotalExp(this.level, this.species.growthRate)); + this.exp = Math.max(getLevelTotalExp(this.level, this.species.growthRate), initialExp); } - this.levelExp = - this.exp - getLevelTotalExp(this.level, this.species.growthRate); + this.levelExp = this.exp - getLevelTotalExp(this.level, this.species.growthRate); } /** @@ -3918,7 +3393,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { getOpponent(targetIndex: number): Pokemon | null { const ret = this.getOpponents()[targetIndex]; - if (ret.summonData) { // TODO: why does this check for summonData and can we remove it? + // TODO: why does this check for summonData and can we remove it? + if (ret.summonData) { return ret; } return null; @@ -3930,11 +3406,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param onField - whether to also check if the pokemon is currently on the field (defaults to true) */ getOpponents(onField = true): Pokemon[] { - return ( - (this.isPlayer() - ? globalScene.getEnemyField() - : globalScene.getPlayerField()) as Pokemon[] - ).filter(p => p.isActive(onField)); + return ((this.isPlayer() ? globalScene.getEnemyField() : globalScene.getPlayerField()) as Pokemon[]).filter(p => + p.isActive(onField), + ); } getOpponentDescriptor(): string { @@ -3942,17 +3416,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (opponents.length === 1) { return opponents[0].name; } - return this.isPlayer() - ? i18next.t("arenaTag:opposingTeam") - : i18next.t("arenaTag:yourTeam"); + return this.isPlayer() ? i18next.t("arenaTag:opposingTeam") : i18next.t("arenaTag:yourTeam"); } getAlly(): Pokemon | undefined { - return ( - this.isPlayer() - ? globalScene.getPlayerField() - : globalScene.getEnemyField() - )[this.getFieldIndex() ? 0 : 1]; + return (this.isPlayer() ? globalScene.getPlayerField() : globalScene.getEnemyField())[this.getFieldIndex() ? 0 : 1]; } /** @@ -3961,9 +3429,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns An array of Pokémon on the allied field. */ getAlliedField(): Pokemon[] { - return this instanceof PlayerPokemon - ? globalScene.getPlayerField() - : globalScene.getEnemyField(); + return this instanceof PlayerPokemon ? globalScene.getPlayerField() : globalScene.getEnemyField(); } /** @@ -4006,37 +3472,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } if (!ignoreOppAbility) { - applyAbAttrs( - IgnoreOpponentStatStagesAbAttr, - opponent, - null, - simulated, - stat, - ignoreStatStage, - ); + applyAbAttrs(IgnoreOpponentStatStagesAbAttr, opponent, null, simulated, stat, ignoreStatStage); } if (move) { - applyMoveAttrs( - IgnoreOpponentStatStagesAttr, - this, - opponent, - move, - ignoreStatStage, - ); + applyMoveAttrs(IgnoreOpponentStatStagesAttr, this, opponent, move, ignoreStatStage); } } if (!ignoreStatStage.value) { - const statStageMultiplier = new NumberHolder( - Math.max(2, 2 + statStage.value) / Math.max(2, 2 - statStage.value), - ); + const statStageMultiplier = new NumberHolder(Math.max(2, 2 + statStage.value) / Math.max(2, 2 - statStage.value)); if (!ignoreHeldItems) { - globalScene.applyModifiers( - TempStatStageBoosterModifier, - this.isPlayer(), - stat, - statStageMultiplier, - ); + globalScene.applyModifiers(TempStatStageBoosterModifier, this.isPlayer(), stat, statStageMultiplier); } return Math.min(statStageMultiplier.value, 4); } @@ -4060,47 +3506,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } const userAccStage = new NumberHolder(this.getStatStage(Stat.ACC)); - const targetEvaStage = new NumberHolder( - target.getStatStage(Stat.EVA), - ); + const targetEvaStage = new NumberHolder(target.getStatStage(Stat.EVA)); const ignoreAccStatStage = new BooleanHolder(false); const ignoreEvaStatStage = new BooleanHolder(false); - applyAbAttrs( - IgnoreOpponentStatStagesAbAttr, - target, - null, - false, - Stat.ACC, - ignoreAccStatStage, - ); - applyAbAttrs( - IgnoreOpponentStatStagesAbAttr, - this, - null, - false, - Stat.EVA, - ignoreEvaStatStage, - ); - applyMoveAttrs( - IgnoreOpponentStatStagesAttr, - this, - target, - sourceMove, - ignoreEvaStatStage, - ); + applyAbAttrs(IgnoreOpponentStatStagesAbAttr, target, null, false, Stat.ACC, ignoreAccStatStage); + applyAbAttrs(IgnoreOpponentStatStagesAbAttr, this, null, false, Stat.EVA, ignoreEvaStatStage); + applyMoveAttrs(IgnoreOpponentStatStagesAttr, this, target, sourceMove, ignoreEvaStatStage); - globalScene.applyModifiers( - TempStatStageBoosterModifier, - this.isPlayer(), - Stat.ACC, - userAccStage, - ); + globalScene.applyModifiers(TempStatStageBoosterModifier, this.isPlayer(), Stat.ACC, userAccStage); - userAccStage.value = ignoreAccStatStage.value - ? 0 - : Math.min(userAccStage.value, 6); + userAccStage.value = ignoreAccStatStage.value ? 0 : Math.min(userAccStage.value, 6); targetEvaStage.value = ignoreEvaStatStage.value ? 0 : targetEvaStage.value; if (target.findTag(t => t instanceof ExposedTag)) { @@ -4115,22 +3532,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { : 3 / (3 + Math.min(targetEvaStage.value - userAccStage.value, 6)); } - applyStatMultiplierAbAttrs( - StatMultiplierAbAttr, - this, - Stat.ACC, - accuracyMultiplier, - false, - sourceMove, - ); + applyStatMultiplierAbAttrs(StatMultiplierAbAttr, this, Stat.ACC, accuracyMultiplier, false, sourceMove); const evasionMultiplier = new NumberHolder(1); - applyStatMultiplierAbAttrs( - StatMultiplierAbAttr, - target, - Stat.EVA, - evasionMultiplier, - ); + applyStatMultiplierAbAttrs(StatMultiplierAbAttr, target, Stat.EVA, evasionMultiplier); const ally = this.getAlly(); if (!isNullOrUndefined(ally)) { @@ -4156,8 +3561,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param simulated - if `true`, suppresses changes to game state during calculation (defaults to `true`). * @returns The move's base damage against this Pokemon when used by the source Pokemon. */ - getBaseDamage( - { + getBaseDamage({ source, move, moveCategory, @@ -4166,8 +3570,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ignoreAllyAbility = false, ignoreSourceAllyAbility = false, isCritical = false, - simulated = true}: getBaseDamageParams - ): number { + simulated = true, + }: getBaseDamageParams): number { const isPhysical = moveCategory === MoveCategory.PHYSICAL; /** A base damage multiplier based on the source's level */ @@ -4216,25 +3620,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * The attack's base damage, as determined by the source's level, move power * and Attack stat as well as this Pokemon's Defense stat */ - const baseDamage = - (levelMultiplier * power * sourceAtk.value) / targetDef.value / 50 + 2; + const baseDamage = (levelMultiplier * power * sourceAtk.value) / targetDef.value / 50 + 2; /** Debug message for non-simulated calls (i.e. when damage is actually dealt) */ if (!simulated) { - console.log( - "base damage", - baseDamage, - move.name, - power, - sourceAtk.value, - targetDef.value, - ); + console.log("base damage", baseDamage, move.name, power, sourceAtk.value, targetDef.value); } return baseDamage; } - /** Determine the STAB multiplier for a move used against this pokemon. * * @param source - The attacking {@linkcode Pokemon} @@ -4258,31 +3653,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { stabMultiplier.value += 0.5; } - applyMoveAttrs( - CombinedPledgeStabBoostAttr, - source, - this, - move, - stabMultiplier, - ); + applyMoveAttrs(CombinedPledgeStabBoostAttr, source, this, move, stabMultiplier); if (!ignoreSourceAbility) { applyAbAttrs(StabBoostAbAttr, source, null, simulated, stabMultiplier); } - if ( - source.isTerastallized && - sourceTeraType === moveType && - moveType !== PokemonType.STELLAR - ) { + if (source.isTerastallized && sourceTeraType === moveType && moveType !== PokemonType.STELLAR) { stabMultiplier.value += 0.5; } if ( source.isTerastallized && source.getTeraType() === PokemonType.STELLAR && - (!source.stellarTypesBoosted.includes(moveType) || - source.hasSpecies(Species.TERAPAGOS)) + (!source.stellarTypesBoosted.includes(moveType) || source.hasSpecies(Species.TERAPAGOS)) ) { stabMultiplier.value += matchesSourceType ? 0.5 : 0.2; } @@ -4303,31 +3687,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param effectiveness If defined, used in place of calculated effectiveness values * @returns The {@linkcode DamageCalculationResult} */ - getAttackDamage( - { - source, - move, - ignoreAbility = false, - ignoreSourceAbility = false, - ignoreAllyAbility = false, - ignoreSourceAllyAbility = false, - isCritical = false, - simulated = true, - effectiveness}: getAttackDamageParams, - ): DamageCalculationResult { + getAttackDamage({ + source, + move, + ignoreAbility = false, + ignoreSourceAbility = false, + ignoreAllyAbility = false, + ignoreSourceAllyAbility = false, + isCritical = false, + simulated = true, + effectiveness, + }: getAttackDamageParams): DamageCalculationResult { const damage = new NumberHolder(0); - const defendingSide = this.isPlayer() - ? ArenaTagSide.PLAYER - : ArenaTagSide.ENEMY; + const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; const variableCategory = new NumberHolder(move.category); - applyMoveAttrs( - VariableMoveCategoryAttr, - source, - this, - move, - variableCategory, - ); + applyMoveAttrs(VariableMoveCategoryAttr, source, this, move, variableCategory); const moveCategory = variableCategory.value as MoveCategory; /** The move's type after type-changing effects are applied */ @@ -4343,13 +3718,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * * Note that the source's abilities are not ignored here */ - const typeMultiplier = effectiveness ?? this.getMoveEffectiveness( - source, - move, - ignoreAbility, - simulated, - cancelled, - ); + const typeMultiplier = + effectiveness ?? this.getMoveEffectiveness(source, move, ignoreAbility, simulated, cancelled); const isPhysical = moveCategory === MoveCategory.PHYSICAL; @@ -4357,21 +3727,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const arenaAttackTypeMultiplier = new NumberHolder( globalScene.arena.getAttackTypeMultiplier(moveType, source.isGrounded()), ); - applyMoveAttrs( - IgnoreWeatherTypeDebuffAttr, - source, - this, - move, - arenaAttackTypeMultiplier, - ); + applyMoveAttrs(IgnoreWeatherTypeDebuffAttr, source, this, move, arenaAttackTypeMultiplier); const isTypeImmune = typeMultiplier * arenaAttackTypeMultiplier.value === 0; if (cancelled.value || isTypeImmune) { return { cancelled: cancelled.value, - result: - move.id === Moves.SHEER_COLD ? HitResult.IMMUNE : HitResult.NO_EFFECT, + result: move.id === Moves.SHEER_COLD ? HitResult.IMMUNE : HitResult.NO_EFFECT, damage: 0, }; } @@ -4389,9 +3752,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { null, multiLensMultiplier, ); - fixedDamage.value = toDmgValue( - fixedDamage.value * multiLensMultiplier.value, - ); + fixedDamage.value = toDmgValue(fixedDamage.value * multiLensMultiplier.value); return { cancelled: false, @@ -4468,10 +3829,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * A multiplier for random damage spread in the range [0.85, 1] * This is always 1 for simulated calls. */ - const randomMultiplier = simulated - ? 1 - : this.randBattleSeedIntRange(85, 100) / 100; - + const randomMultiplier = simulated ? 1 : this.randBattleSeedIntRange(85, 100) / 100; /** A damage multiplier for when the attack is of the attacker's type and/or Tera type. */ const stabMultiplier = this.calculateStabMultiplier(source, move, ignoreSourceAbility, simulated); @@ -4486,12 +3844,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ) { const burnDamageReductionCancelled = new BooleanHolder(false); if (!ignoreSourceAbility) { - applyAbAttrs( - BypassBurnDamageReductionAbAttr, - source, - burnDamageReductionCancelled, - simulated, - ); + applyAbAttrs(BypassBurnDamageReductionAbAttr, source, burnDamageReductionCancelled, simulated); } if (!burnDamageReductionCancelled.value) { burnMultiplier = 0.5; @@ -4504,13 +3857,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Critical hits should bypass screens if (!isCritical) { globalScene.arena.applyTagsForSide( - WeakenMoveScreenTag, - defendingSide, - simulated, - source, - moveCategory, - screenMultiplier, - ); + WeakenMoveScreenTag, + defendingSide, + simulated, + source, + moveCategory, + screenMultiplier, + ); } /** @@ -4555,14 +3908,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** Doubles damage if the attacker has Tinted Lens and is using a resisted move */ if (!ignoreSourceAbility) { - applyPreAttackAbAttrs( - DamageBoostAbAttr, - source, - this, - move, - simulated, - damage, - ); + applyPreAttackAbAttrs(DamageBoostAbAttr, source, this, move, simulated, damage); } /** Apply the enemy's Damage and Resistance tokens */ @@ -4575,28 +3921,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** Apply this Pokemon's post-calc defensive modifiers (e.g. Fur Coat) */ if (!ignoreAbility) { - applyPreDefendAbAttrs( - ReceivedMoveDamageMultiplierAbAttr, - this, - source, - move, - cancelled, - simulated, - damage, - ); + applyPreDefendAbAttrs(ReceivedMoveDamageMultiplierAbAttr, this, source, move, cancelled, simulated, damage); const ally = this.getAlly(); /** Additionally apply friend guard damage reduction if ally has it. */ if (globalScene.currentBattle.double && !isNullOrUndefined(ally) && ally.isActive(true)) { - applyPreDefendAbAttrs( - AlliedFieldDamageReductionAbAttr, - ally, - source, - move, - cancelled, - simulated, - damage, - ); + applyPreDefendAbAttrs(AlliedFieldDamageReductionAbAttr, ally, source, move, cancelled, simulated, damage); } } @@ -4604,15 +3934,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { applyMoveAttrs(ModifiedDamageAttr, source, this, move, damage); if (this.isFullHp() && !ignoreAbility) { - applyPreDefendAbAttrs( - PreDefendFullHpEndureAbAttr, - this, - source, - move, - cancelled, - false, - damage, - ); + applyPreDefendAbAttrs(PreDefendFullHpEndureAbAttr, this, source, move, cancelled, false, damage); } // debug message for when damage is applied (i.e. not simulated) @@ -4641,8 +3963,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param move - The {@linkcode Move} being used * @param simulated - If `true`, suppresses changes to game state during calculation (defaults to `true`) * @returns whether the move critically hits the pokemon - */ - getCriticalHitResult(source: Pokemon, move: Move, simulated: boolean = true): boolean { + */ + getCriticalHitResult(source: Pokemon, move: Move, simulated = true): boolean { const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; const noCritTag = globalScene.arena.getTagOnSide(NoCritTag, defendingSide); if (noCritTag || Overrides.NEVER_CRIT_OVERRIDE || move.hasAttr(FixedDamageAttr)) { @@ -4656,16 +3978,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { applyMoveAttrs(CritOnlyAttr, source, this, move, isCritical); applyAbAttrs(ConditionalCritAbAttr, source, null, simulated, isCritical, this, move); if (!isCritical.value) { - const critChance = [24, 8, 2, 1][ - Math.max(0, Math.min(this.getCritStage(source, move), 3)) - ]; + const critChance = [24, 8, 2, 1][Math.max(0, Math.min(this.getCritStage(source, move), 3))]; isCritical.value = critChance === 1 || !globalScene.randBattleSeedInt(critChance); } applyAbAttrs(BlockCritAbAttr, this, null, simulated, isCritical); return isCritical.value; - } /** @@ -4676,12 +3995,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreFaintPhas flag on whether to add FaintPhase if pokemon after applying damage faints * @returns integer representing damage dealt */ - damage( - damage: number, - _ignoreSegments = false, - preventEndure = false, - ignoreFaintPhase = false, - ): number { + damage(damage: number, _ignoreSegments = false, preventEndure = false, ignoreFaintPhase = false): number { if (this.isFainted()) { return 0; } @@ -4697,12 +4011,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { surviveDamage.value = this.lapseTag(BattlerTagType.ENDURE_TOKEN); } if (!surviveDamage.value) { - globalScene.applyModifiers( - SurviveDamageModifier, - this.isPlayer(), - this, - surviveDamage, - ); + globalScene.applyModifiers(SurviveDamageModifier, this.isPlayer(), this, surviveDamage); } if (surviveDamage.value) { damage = this.hp - 1; @@ -4720,9 +4029,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Once the MoveEffectPhase is over (and calls it's .end() function, shiftPhase() will reset the PhaseQueueSplice via clearPhaseQueueSplice() ) */ globalScene.setPhaseQueueSplice(); - globalScene.unshiftPhase( - new FaintPhase(this.getBattlerIndex(), preventEndure), - ); + globalScene.unshiftPhase(new FaintPhase(this.getBattlerIndex(), preventEndure)); this.destroySubstitute(); this.lapseTag(BattlerTagType.COMMANDED); } @@ -4741,39 +4048,29 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param ignoreFaintPhase boolean to ignore adding a FaintPhase, passsed to damage() * @returns integer of damage done */ - damageAndUpdate(damage: number, + damageAndUpdate( + damage: number, { result = HitResult.EFFECTIVE, isCritical = false, ignoreSegments = false, ignoreFaintPhase = false, source = undefined, - }: - { - result?: DamageResult, - isCritical?: boolean, - ignoreSegments?: boolean, - ignoreFaintPhase?: boolean, - source?: Pokemon, - } = {} + }: { + result?: DamageResult; + isCritical?: boolean; + ignoreSegments?: boolean; + ignoreFaintPhase?: boolean; + source?: Pokemon; + } = {}, ): number { - const isIndirectDamage = [ HitResult.INDIRECT, HitResult.INDIRECT_KO ].includes(result); - const damagePhase = new DamageAnimPhase( - this.getBattlerIndex(), - damage, - result as DamageResult, - isCritical - ); + const isIndirectDamage = [HitResult.INDIRECT, HitResult.INDIRECT_KO].includes(result); + const damagePhase = new DamageAnimPhase(this.getBattlerIndex(), damage, result as DamageResult, isCritical); globalScene.unshiftPhase(damagePhase); if (this.switchOutStatus && source) { damage = 0; } - damage = this.damage( - damage, - ignoreSegments, - isIndirectDamage, - ignoreFaintPhase, - ); + damage = this.damage(damage, ignoreSegments, isIndirectDamage, ignoreFaintPhase); // Ensure the battle-info bar's HP is updated, though only if the battle info is visible // TODO: When battle-info UI is refactored, make this only update the HP bar if (this.battleInfo.visible) { @@ -4786,15 +4083,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Multi-hits are handled in move-effect-phase.ts for PostDamageAbAttr */ if (!source || source.turnData.hitCount <= 1) { - applyPostDamageAbAttrs( - PostDamageAbAttr, - this, - damage, - this.hasPassive(), - false, - [], - source, - ); + applyPostDamageAbAttrs(PostDamageAbAttr, this, damage, this.hasPassive(), false, [], source); } return damage; } @@ -4810,13 +4099,28 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } isMax(): boolean { - const maxForms = [ SpeciesFormKey.GIGANTAMAX, SpeciesFormKey.GIGANTAMAX_RAPID, SpeciesFormKey.GIGANTAMAX_SINGLE, SpeciesFormKey.ETERNAMAX ] as string[]; - return maxForms.includes(this.getFormKey()) || (!!this.getFusionFormKey() && maxForms.includes(this.getFusionFormKey()!)); + const maxForms = [ + SpeciesFormKey.GIGANTAMAX, + SpeciesFormKey.GIGANTAMAX_RAPID, + SpeciesFormKey.GIGANTAMAX_SINGLE, + SpeciesFormKey.ETERNAMAX, + ] as string[]; + return ( + maxForms.includes(this.getFormKey()) || (!!this.getFusionFormKey() && maxForms.includes(this.getFusionFormKey()!)) + ); } isMega(): boolean { - const megaForms = [ SpeciesFormKey.MEGA, SpeciesFormKey.MEGA_X, SpeciesFormKey.MEGA_Y, SpeciesFormKey.PRIMAL ] as string[]; - return megaForms.includes(this.getFormKey()) || (!!this.getFusionFormKey() && megaForms.includes(this.getFusionFormKey()!)); + const megaForms = [ + SpeciesFormKey.MEGA, + SpeciesFormKey.MEGA_X, + SpeciesFormKey.MEGA_Y, + SpeciesFormKey.PRIMAL, + ] as string[]; + return ( + megaForms.includes(this.getFormKey()) || + (!!this.getFusionFormKey() && megaForms.includes(this.getFusionFormKey()!)) + ); } canAddTag(tagType: BattlerTagType): boolean { @@ -4827,35 +4131,17 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const stubTag = new BattlerTag(tagType, 0, 0); const cancelled = new BooleanHolder(false); - applyPreApplyBattlerTagAbAttrs( - BattlerTagImmunityAbAttr, - this, - stubTag, - cancelled, - true, - ); + applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, stubTag, cancelled, true); const userField = this.getAlliedField(); userField.forEach(pokemon => - applyPreApplyBattlerTagAbAttrs( - UserFieldBattlerTagImmunityAbAttr, - pokemon, - stubTag, - cancelled, - true, - this, - ), + applyPreApplyBattlerTagAbAttrs(UserFieldBattlerTagImmunityAbAttr, pokemon, stubTag, cancelled, true, this), ); return !cancelled.value; } - addTag( - tagType: BattlerTagType, - turnCount = 0, - sourceMove?: Moves, - sourceId?: number, - ): boolean { + addTag(tagType: BattlerTagType, turnCount = 0, sourceMove?: Moves, sourceId?: number): boolean { const existingTag = this.getTag(tagType); if (existingTag) { existingTag.onOverlap(this); @@ -4865,25 +4151,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const newTag = getBattlerTag(tagType, turnCount, sourceMove!, sourceId!); // TODO: are the bangs correct? const cancelled = new BooleanHolder(false); - applyPreApplyBattlerTagAbAttrs( - BattlerTagImmunityAbAttr, - this, - newTag, - cancelled, - ); + applyPreApplyBattlerTagAbAttrs(BattlerTagImmunityAbAttr, this, newTag, cancelled); if (cancelled.value) { return false; } for (const pokemon of this.getAlliedField()) { - applyPreApplyBattlerTagAbAttrs( - UserFieldBattlerTagImmunityAbAttr, - pokemon, - newTag, - cancelled, - false, - this - ); + applyPreApplyBattlerTagAbAttrs(UserFieldBattlerTagImmunityAbAttr, pokemon, newTag, cancelled, false, this); if (cancelled.value) { return false; } @@ -4931,14 +4205,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const tags = this.summonData.tags; const tag = tags.find(t => t.tagType === tagType); if (!tag) { - return false + return false; } if (!tag.lapse(this, BattlerTagLapseType.CUSTOM)) { tag.onRemove(this); tags.splice(tags.indexOf(tag), 1); } - return true + return true; } /** @@ -4952,8 +4226,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { .filter( t => lapseType === BattlerTagLapseType.FAINT || - (t.lapseTypes.some(lType => lType === lapseType) && - !t.lapse(this, lapseType)), + (t.lapseTypes.some(lType => lType === lapseType) && !t.lapse(this, lapseType)), ) .forEach(t => { t.onRemove(this); @@ -4997,7 +4270,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (t.sourceId === sourceId) { t.sourceId = newSourceId; } - }) + }); } /** @@ -5057,21 +4330,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * * @see {@linkcode MoveRestrictionBattlerTag} */ - isMoveTargetRestricted( - moveId: Moves, - user: Pokemon, - target: Pokemon, - ): boolean { - for (const tag of this.findTags( - t => t instanceof MoveRestrictionBattlerTag, - )) { - if ( - (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted( - moveId, - user, - target, - ) - ) { + isMoveTargetRestricted(moveId: Moves, user: Pokemon, target: Pokemon): boolean { + for (const tag of this.findTags(t => t instanceof MoveRestrictionBattlerTag)) { + if ((tag as MoveRestrictionBattlerTag).isMoveTargetRestricted(moveId, user, target)) { return (tag as MoveRestrictionBattlerTag) !== null; } } @@ -5086,26 +4347,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param target - {@linkcode Pokemon} the target of the move, optional and used when the target is a factor in the move's restricted status * @returns The first tag on this Pokemon that restricts the move, or `null` if the move is not restricted. */ - getRestrictingTag( - moveId: Moves, - user?: Pokemon, - target?: Pokemon, - ): MoveRestrictionBattlerTag | null { - for (const tag of this.findTags( - t => t instanceof MoveRestrictionBattlerTag, - )) { + getRestrictingTag(moveId: Moves, user?: Pokemon, target?: Pokemon): MoveRestrictionBattlerTag | null { + for (const tag of this.findTags(t => t instanceof MoveRestrictionBattlerTag)) { if ((tag as MoveRestrictionBattlerTag).isMoveRestricted(moveId, user)) { return tag as MoveRestrictionBattlerTag; } - if ( - user && - target && - (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted( - moveId, - user, - target, - ) - ) { + if (user && target && (tag as MoveRestrictionBattlerTag).isMoveTargetRestricted(moveId, user, target)) { return tag as MoveRestrictionBattlerTag; } } @@ -5135,9 +4382,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { getLastXMoves(moveCount = 1): TurnMove[] { const moveHistory = this.getMoveHistory(); if (moveCount >= 0) { - return moveHistory - .slice(Math.max(moveHistory.length - moveCount, 0)) - .reverse(); + return moveHistory.slice(Math.max(moveHistory.length - moveCount, 0)).reverse(); } return moveHistory.slice(0).reverse(); } @@ -5163,39 +4408,24 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.loadAssets().then(() => { this.calculateStats(); globalScene.updateModifiers(this.isPlayer(), true); - Promise.all([this.updateInfo(), globalScene.updateFieldScale()]).then( - () => resolve(), - ); + Promise.all([this.updateInfo(), globalScene.updateFieldScale()]).then(() => resolve()); }); }); } - cry( - soundConfig?: Phaser.Types.Sound.SoundConfig, - sceneOverride?: BattleScene, - ): AnySound { + cry(soundConfig?: Phaser.Types.Sound.SoundConfig, sceneOverride?: BattleScene): AnySound { const scene = sceneOverride ?? globalScene; // TODO: is `sceneOverride` needed? const cry = this.getSpeciesForm(undefined, true).cry(soundConfig); let duration = cry.totalDuration * 1000; - if ( - this.fusionSpecies && - this.getSpeciesForm(undefined, true) !== this.getFusionSpeciesForm(undefined, true) - ) { + if (this.fusionSpecies && this.getSpeciesForm(undefined, true) !== this.getFusionSpeciesForm(undefined, true)) { let fusionCry = this.getFusionSpeciesForm(undefined, true).cry(soundConfig, true); duration = Math.min(duration, fusionCry.totalDuration * 1000); fusionCry.destroy(); scene.time.delayedCall(fixedInt(Math.ceil(duration * 0.4)), () => { try { - SoundFade.fadeOut( - scene, - cry, - fixedInt(Math.ceil(duration * 0.2)), - ); + SoundFade.fadeOut(scene, cry, fixedInt(Math.ceil(duration * 0.2))); fusionCry = this.getFusionSpeciesForm(undefined, true).cry( - Object.assign( - { seek: Math.max(fusionCry.totalDuration * 0.4, 0) }, - soundConfig, - ), + Object.assign({ seek: Math.max(fusionCry.totalDuration * 0.4, 0) }, soundConfig), ); SoundFade.fadeIn( scene, @@ -5215,10 +4445,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // biome-ignore lint: there are a ton of issues.. faintCry(callback: Function): void { - if ( - this.fusionSpecies && - this.getSpeciesForm() !== this.getFusionSpeciesForm() - ) { + if (this.fusionSpecies && this.getSpeciesForm() !== this.getFusionSpeciesForm()) { return this.fusionFaintCry(callback); } @@ -5238,32 +4465,31 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { sprite.anims.pause(); tintSprite?.anims.pause(); - let faintCryTimer: Phaser.Time.TimerEvent | null = - globalScene.time.addEvent({ - delay: fixedInt(delay), - repeat: -1, - callback: () => { - frameThreshold = sprite.anims.msPerFrame / rate; - frameProgress += delay; - while (frameProgress > frameThreshold) { - if (sprite.anims.duration) { - sprite.anims.nextFrame(); - tintSprite?.anims.nextFrame(); - } - frameProgress -= frameThreshold; + let faintCryTimer: Phaser.Time.TimerEvent | null = globalScene.time.addEvent({ + delay: fixedInt(delay), + repeat: -1, + callback: () => { + frameThreshold = sprite.anims.msPerFrame / rate; + frameProgress += delay; + while (frameProgress > frameThreshold) { + if (sprite.anims.duration) { + sprite.anims.nextFrame(); + tintSprite?.anims.nextFrame(); } - if (cry && !cry.pendingRemove) { - rate *= 0.99; - cry.setRate(rate); - } else { - faintCryTimer?.destroy(); - faintCryTimer = null; - if (callback) { - callback(); - } + frameProgress -= frameThreshold; + } + if (cry && !cry.pendingRemove) { + rate *= 0.99; + cry.setRate(rate); + } else { + faintCryTimer?.destroy(); + faintCryTimer = null; + if (callback) { + callback(); } - }, - }); + } + }, + }); // Failsafe globalScene.time.delayedCall(fixedInt(3000), () => { @@ -5323,61 +4549,53 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { sprite.anims.pause(); tintSprite?.anims.pause(); - let faintCryTimer: Phaser.Time.TimerEvent | null = - globalScene.time.addEvent({ - delay: fixedInt(delay), - repeat: -1, - callback: () => { - ++i; - frameThreshold = sprite.anims.msPerFrame / rate; - frameProgress += delay; - while (frameProgress > frameThreshold) { - if (sprite.anims.duration) { - sprite.anims.nextFrame(); - tintSprite?.anims.nextFrame(); - } - frameProgress -= frameThreshold; + let faintCryTimer: Phaser.Time.TimerEvent | null = globalScene.time.addEvent({ + delay: fixedInt(delay), + repeat: -1, + callback: () => { + ++i; + frameThreshold = sprite.anims.msPerFrame / rate; + frameProgress += delay; + while (frameProgress > frameThreshold) { + if (sprite.anims.duration) { + sprite.anims.nextFrame(); + tintSprite?.anims.nextFrame(); } - if (i === transitionIndex && fusionCryKey) { - SoundFade.fadeOut( - globalScene, - cry, - fixedInt(Math.ceil((duration / rate) * 0.2)), - ); - fusionCry = globalScene.playSound( - fusionCryKey, - Object.assign({ - seek: Math.max(fusionCry.totalDuration * 0.4, 0), - rate: rate, - }), - ); - SoundFade.fadeIn( - globalScene, - fusionCry, - fixedInt(Math.ceil((duration / rate) * 0.2)), - globalScene.masterVolume * globalScene.fieldVolume, - 0, - ); + frameProgress -= frameThreshold; + } + if (i === transitionIndex && fusionCryKey) { + SoundFade.fadeOut(globalScene, cry, fixedInt(Math.ceil((duration / rate) * 0.2))); + fusionCry = globalScene.playSound( + fusionCryKey, + Object.assign({ + seek: Math.max(fusionCry.totalDuration * 0.4, 0), + rate: rate, + }), + ); + SoundFade.fadeIn( + globalScene, + fusionCry, + fixedInt(Math.ceil((duration / rate) * 0.2)), + globalScene.masterVolume * globalScene.fieldVolume, + 0, + ); + } + rate *= 0.99; + if (cry && !cry.pendingRemove) { + cry.setRate(rate); + } + if (fusionCry && !fusionCry.pendingRemove) { + fusionCry.setRate(rate); + } + if ((!cry || cry.pendingRemove) && (!fusionCry || fusionCry.pendingRemove)) { + faintCryTimer?.destroy(); + faintCryTimer = null; + if (callback) { + callback(); } - rate *= 0.99; - if (cry && !cry.pendingRemove) { - cry.setRate(rate); - } - if (fusionCry && !fusionCry.pendingRemove) { - fusionCry.setRate(rate); - } - if ( - (!cry || cry.pendingRemove) && - (!fusionCry || fusionCry.pendingRemove) - ) { - faintCryTimer?.destroy(); - faintCryTimer = null; - if (callback) { - callback(); - } - } - }, - }); + } + }, + }); // Failsafe globalScene.time.delayedCall(fixedInt(3000), () => { @@ -5400,8 +4618,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { isOppositeGender(pokemon: Pokemon): boolean { return ( this.gender !== Gender.GENDERLESS && - pokemon.gender === - (this.gender === Gender.MALE ? Gender.FEMALE : Gender.MALE) + pokemon.gender === (this.gender === Gender.MALE ? Gender.FEMALE : Gender.MALE) ); } @@ -5409,11 +4626,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!effect || quiet) { return; } - const message = effect && this.status?.effect === effect - ? getStatusEffectOverlapText(effect ?? StatusEffect.NONE, getPokemonNameWithAffix(this)) - : i18next.t("abilityTriggers:moveImmunity", { - pokemonNameWithAffix: getPokemonNameWithAffix(this), - }); + const message = + effect && this.status?.effect === effect + ? getStatusEffectOverlapText(effect ?? StatusEffect.NONE, getPokemonNameWithAffix(this)) + : i18next.t("abilityTriggers:moveImmunity", { + pokemonNameWithAffix: getPokemonNameWithAffix(this), + }); globalScene.queueMessage(message); } @@ -5438,11 +4656,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.queueImmuneMessage(quiet, effect); return false; } - if ( - this.isGrounded() && - !ignoreField && - globalScene.arena.terrain?.terrainType === TerrainType.MISTY - ) { + if (this.isGrounded() && !ignoreField && globalScene.arena.terrain?.terrainType === TerrainType.MISTY) { this.queueImmuneMessage(quiet, effect); return false; } @@ -5452,7 +4666,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { switch (effect) { case StatusEffect.POISON: - case StatusEffect.TOXIC: + case StatusEffect.TOXIC: { // Check if the Pokemon is immune to Poison/Toxic or if the source pokemon is canceling the immunity const poisonImmunity = types.map(defType => { // Check if the Pokemon is not immune to Poison/Toxic @@ -5463,20 +4677,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Check if the source Pokemon has an ability that cancels the Poison/Toxic immunity const cancelImmunity = new BooleanHolder(false); if (sourcePokemon) { - applyAbAttrs( - IgnoreTypeStatusEffectImmunityAbAttr, - sourcePokemon, - cancelImmunity, - false, - effect, - defType, - ); + applyAbAttrs(IgnoreTypeStatusEffectImmunityAbAttr, sourcePokemon, cancelImmunity, false, effect, defType); if (cancelImmunity.value) { return false; } } - return true; + return true; }); if (this.isOfType(PokemonType.POISON) || this.isOfType(PokemonType.STEEL)) { @@ -5486,6 +4693,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } } break; + } case StatusEffect.PARALYSIS: if (this.isOfType(PokemonType.ELECTRIC)) { this.queueImmuneMessage(quiet, effect); @@ -5493,10 +4701,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } break; case StatusEffect.SLEEP: - if ( - this.isGrounded() && - globalScene.arena.terrain?.terrainType === TerrainType.ELECTRIC - ) { + if (this.isGrounded() && globalScene.arena.terrain?.terrainType === TerrainType.ELECTRIC) { this.queueImmuneMessage(quiet, effect); return false; } @@ -5506,9 +4711,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.isOfType(PokemonType.ICE) || (!ignoreField && globalScene?.arena?.weather?.weatherType && - [WeatherType.SUNNY, WeatherType.HARSH_SUN].includes( - globalScene.arena.weather.weatherType, - )) + [WeatherType.SUNNY, WeatherType.HARSH_SUN].includes(globalScene.arena.weather.weatherType)) ) { this.queueImmuneMessage(quiet, effect); return false; @@ -5523,13 +4726,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } const cancelled = new BooleanHolder(false); - applyPreSetStatusAbAttrs( - StatusEffectImmunityAbAttr, - this, - effect, - cancelled, - quiet, - ); + applyPreSetStatusAbAttrs(StatusEffectImmunityAbAttr, this, effect, cancelled, quiet); if (cancelled.value) { return false; } @@ -5540,8 +4737,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { pokemon, effect, cancelled, - quiet, this, sourcePokemon, - ) + quiet, + this, + sourcePokemon, + ); if (cancelled.value) { break; } @@ -5551,15 +4750,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return false; } - if ( - sourcePokemon && - sourcePokemon !== this && - this.isSafeguarded(sourcePokemon) - ) { - if(!quiet){ - globalScene.queueMessage( - i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(this) - })); + if (sourcePokemon && sourcePokemon !== this && this.isSafeguarded(sourcePokemon)) { + if (!quiet) { + globalScene.queueMessage(i18next.t("moveTriggers:safeguard", { targetName: getPokemonNameWithAffix(this) })); } return false; } @@ -5600,13 +4793,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.resetStatus(false); } globalScene.unshiftPhase( - new ObtainStatusEffectPhase( - this.getBattlerIndex(), - effect, - turnsRemaining, - sourceText, - sourcePokemon, - ), + new ObtainStatusEffectPhase(this.getBattlerIndex(), effect, turnsRemaining, sourceText, sourcePokemon), ); return true; } @@ -5692,9 +4879,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns `true` if this Pokemon is protected by Safeguard; `false` otherwise. */ isSafeguarded(attacker: Pokemon): boolean { - const defendingSide = this.isPlayer() - ? ArenaTagSide.PLAYER - : ArenaTagSide.ENEMY; + const defendingSide = this.isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY; if (globalScene.arena.getTagOnSide(ArenaTagType.SAFEGUARD, defendingSide)) { const bypassed = new BooleanHolder(false); if (attacker) { @@ -5712,18 +4897,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { public fieldSetup(resetSummonData?: boolean): void { this.setSwitchOutStatus(false); if (globalScene) { - globalScene.triggerPokemonFormChange( - this, - SpeciesFormChangePostMoveTrigger, - true, - ); + globalScene.triggerPokemonFormChange(this, SpeciesFormChangePostMoveTrigger, true); } // If this Pokemon has a Substitute when loading in, play an animation to add its sprite if (this.getTag(SubstituteTag)) { - globalScene.triggerPokemonBattleAnim( - this, - PokemonAnimType.SUBSTITUTE_ADD, - ); + globalScene.triggerPokemonBattleAnim(this, PokemonAnimType.SUBSTITUTE_ADD); this.getTag(SubstituteTag)!.sourceInFocus = false; } @@ -5753,7 +4931,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } this.summonData = new PokemonSummonData(); this.tempSummonData = new PokemonTempSummonData(); - this.summonData.illusion = illusion + this.summonData.illusion = illusion; this.updateInfo(); } @@ -5761,7 +4939,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * Reset a {@linkcode Pokemon}'s per-battle {@linkcode PokemonBattleData | battleData}, * as well as any transient {@linkcode PokemonWaveData | waveData} for the current wave. * Should be called once per arena transition (new biome/trainer battle/Mystery Encounter). - */ + */ resetBattleAndWaveData(): void { this.battleData = new PokemonBattleData(); this.resetWaveData(); @@ -5782,10 +4960,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.stellarTypesBoosted = []; if (wasTerastallized) { this.updateSpritePipelineData(); - globalScene.triggerPokemonFormChange( - this, - SpeciesFormChangeLapseTeraTrigger, - ); + globalScene.triggerPokemonFormChange(this, SpeciesFormChangeLapseTeraTrigger); } } @@ -5803,18 +4978,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { try { this.getSprite().play(this.getBattleSpriteKey()); } catch (err: unknown) { - console.error( - `Failed to play animation for ${this.getBattleSpriteKey()}`, - err, - ); + console.error(`Failed to play animation for ${this.getBattleSpriteKey()}`, err); } try { this.getTintSprite()?.play(this.getBattleSpriteKey()); } catch (err: unknown) { - console.error( - `Failed to play animation for ${this.getBattleSpriteKey()}`, - err, - ); + console.error(`Failed to play animation for ${this.getBattleSpriteKey()}`, err); } } @@ -5865,9 +5034,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.x * this.parentContainer.scale + this.parentContainer.x, this.y * this.parentContainer.scale + this.parentContainer.y, ); - this.maskSprite?.setScale( - this.getSpriteScale() * this.parentContainer.scale, - ); + this.maskSprite?.setScale(this.getSpriteScale() * this.parentContainer.scale); this.maskEnabled = true; } } @@ -5893,12 +5060,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { [this.getSprite(), this.getTintSprite()] .filter(s => !!s) .map(s => { - s.pipelineData[ - `spriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}` - ] = []; - s.pipelineData[ - `fusionSpriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}` - ] = []; + s.pipelineData[`spriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`] = []; + s.pipelineData[`fusionSpriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`] = []; }); return; } @@ -5913,12 +5076,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.variant, ); const backSpriteKey = speciesForm - .getSpriteKey( - this.getGender(ignoreOveride) === Gender.FEMALE, - speciesForm.formIndex, - this.shiny, - this.variant, - ) + .getSpriteKey(this.getGender(ignoreOveride) === Gender.FEMALE, speciesForm.formIndex, this.shiny, this.variant) .replace("pkmn__", "pkmn__back__"); const fusionSpriteKey = fusionSpeciesForm.getSpriteKey( this.getFusionGender(ignoreOveride) === Gender.FEMALE, @@ -5961,40 +5119,28 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const spriteColors: number[][] = []; const pixelData: Uint8ClampedArray[] = []; - [canvas, backCanvas, fusionCanvas, fusionBackCanvas].forEach( - (canv: HTMLCanvasElement, c: number) => { - const context = canv.getContext("2d"); - const frame = [ - sourceFrame, - sourceBackFrame, - fusionFrame, - fusionBackFrame, - ][c]; - canv.width = frame.width; - canv.height = frame.height; + [canvas, backCanvas, fusionCanvas, fusionBackCanvas].forEach((canv: HTMLCanvasElement, c: number) => { + const context = canv.getContext("2d"); + const frame = [sourceFrame, sourceBackFrame, fusionFrame, fusionBackFrame][c]; + canv.width = frame.width; + canv.height = frame.height; - if (context) { - context.drawImage( - [sourceImage, sourceBackImage, fusionImage, fusionBackImage][c], - frame.cutX, - frame.cutY, - frame.width, - frame.height, - 0, - 0, - frame.width, - frame.height, - ); - const imageData = context.getImageData( - frame.cutX, - frame.cutY, - frame.width, - frame.height, - ); - pixelData.push(imageData.data); - } - }, - ); + if (context) { + context.drawImage( + [sourceImage, sourceBackImage, fusionImage, fusionBackImage][c], + frame.cutX, + frame.cutY, + frame.width, + frame.height, + 0, + 0, + frame.width, + frame.height, + ); + const imageData = context.getImageData(frame.cutX, frame.cutY, frame.width, frame.height); + pixelData.push(imageData.data); + } + }); for (let f = 0; f < 2; f++) { const variantColors = variantColorCache[!f ? spriteKey : backSpriteKey]; @@ -6003,9 +5149,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { Object.keys(variantColors[this.variant]).forEach(k => { variantColorSet.set( rgbaToInt(Array.from(Object.values(rgbHexToRgba(k)))), - Array.from( - Object.values(rgbHexToRgba(variantColors[this.variant][k])), - ), + Array.from(Object.values(rgbHexToRgba(variantColors[this.variant][k]))), ); }); } @@ -6035,9 +5179,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const pixelColors: number[] = []; for (let f = 0; f < 2; f++) { for (let i = 0; i < pixelData[f].length; i += 4) { - const total = pixelData[f] - .slice(i, i + 3) - .reduce((total: number, value: number) => total + value, 0); + const total = pixelData[f].slice(i, i + 3).reduce((total: number, value: number) => total + value, 0); if (!total) { continue; } @@ -6054,29 +5196,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const fusionPixelColors: number[] = []; for (let f = 0; f < 2; f++) { - const variantColors = - variantColorCache[!f ? fusionSpriteKey : fusionBackSpriteKey]; + const variantColors = variantColorCache[!f ? fusionSpriteKey : fusionBackSpriteKey]; const variantColorSet = new Map(); - if ( - this.fusionShiny && - variantColors && - variantColors[this.fusionVariant] - ) { + if (this.fusionShiny && variantColors && variantColors[this.fusionVariant]) { for (const k of Object.keys(variantColors[this.fusionVariant])) { variantColorSet.set( rgbaToInt(Array.from(Object.values(rgbHexToRgba(k)))), - Array.from( - Object.values( - rgbHexToRgba(variantColors[this.fusionVariant][k]), - ), - ), + Array.from(Object.values(rgbHexToRgba(variantColors[this.fusionVariant][k]))), ); } } for (let i = 0; i < pixelData[2 + f].length; i += 4) { - const total = pixelData[2 + f] - .slice(i, i + 3) - .reduce((total: number, value: number) => total + value, 0); + const total = pixelData[2 + f].slice(i, i + 3).reduce((total: number, value: number) => total + value, 0); if (!total) { continue; } @@ -6124,101 +5255,94 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { paletteColors = paletteColors!; // erroneously tell TS compiler that paletteColors is defined! fusionPaletteColors = fusionPaletteColors!; // mischievously misinform TS compiler that fusionPaletteColors is defined! - const [palette, fusionPalette] = [paletteColors, fusionPaletteColors].map( - paletteColors => { - let keys = Array.from(paletteColors.keys()).sort( - (a: number, b: number) => - paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1, - ); - let rgbaColors: Map; - let hsvColors: Map; + const [palette, fusionPalette] = [paletteColors, fusionPaletteColors].map(paletteColors => { + let keys = Array.from(paletteColors.keys()).sort((a: number, b: number) => + paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1, + ); + let rgbaColors: Map; + let hsvColors: Map; - const mappedColors = new Map(); + const mappedColors = new Map(); - do { - mappedColors.clear(); + do { + mappedColors.clear(); - rgbaColors = keys.reduce((map: Map, k: number) => { - map.set(k, Object.values(rgbaFromArgb(k))); - return map; - }, new Map()); - hsvColors = Array.from(rgbaColors.keys()).reduce( - (map: Map, k: number) => { - const rgb = rgbaColors.get(k)!.slice(0, 3); - map.set(k, rgbToHsv(rgb[0], rgb[1], rgb[2])); - return map; - }, - new Map(), - ); + rgbaColors = keys.reduce((map: Map, k: number) => { + map.set(k, Object.values(rgbaFromArgb(k))); + return map; + }, new Map()); + hsvColors = Array.from(rgbaColors.keys()).reduce((map: Map, k: number) => { + const rgb = rgbaColors.get(k)!.slice(0, 3); + map.set(k, rgbToHsv(rgb[0], rgb[1], rgb[2])); + return map; + }, new Map()); - for (let c = keys.length - 1; c >= 0; c--) { - const hsv = hsvColors.get(keys[c])!; - for (let c2 = 0; c2 < c; c2++) { - const hsv2 = hsvColors.get(keys[c2])!; - const diff = Math.abs(hsv[0] - hsv2[0]); - if (diff < 30 || diff >= 330) { - if (mappedColors.has(keys[c])) { - mappedColors.get(keys[c])!.push(keys[c2]); - } else { - mappedColors.set(keys[c], [keys[c2]]); - } - break; + for (let c = keys.length - 1; c >= 0; c--) { + const hsv = hsvColors.get(keys[c])!; + for (let c2 = 0; c2 < c; c2++) { + const hsv2 = hsvColors.get(keys[c2])!; + const diff = Math.abs(hsv[0] - hsv2[0]); + if (diff < 30 || diff >= 330) { + if (mappedColors.has(keys[c])) { + mappedColors.get(keys[c])!.push(keys[c2]); + } else { + mappedColors.set(keys[c], [keys[c2]]); } + break; + } + } + } + + mappedColors.forEach((values: number[], key: number) => { + const keyColor = rgbaColors.get(key)!; + const valueColors = values.map(v => rgbaColors.get(v)!); + const color = keyColor.slice(0); + let count = paletteColors.get(key)!; + for (const value of values) { + const valueCount = paletteColors.get(value); + if (!valueCount) { + continue; + } + count += valueCount; + } + + for (let c = 0; c < 3; c++) { + color[c] *= paletteColors.get(key)! / count; + values.forEach((value: number, i: number) => { + if (paletteColors.has(value)) { + const valueCount = paletteColors.get(value)!; + color[c] += valueColors[i][c] * (valueCount / count); + } + }); + color[c] = Math.round(color[c]); + } + + paletteColors.delete(key); + for (const value of values) { + paletteColors.delete(value); + if (mappedColors.has(value)) { + mappedColors.delete(value); } } - mappedColors.forEach((values: number[], key: number) => { - const keyColor = rgbaColors.get(key)!; - const valueColors = values.map(v => rgbaColors.get(v)!); - const color = keyColor.slice(0); - let count = paletteColors.get(key)!; - for (const value of values) { - const valueCount = paletteColors.get(value); - if (!valueCount) { - continue; - } - count += valueCount; - } - - for (let c = 0; c < 3; c++) { - color[c] *= paletteColors.get(key)! / count; - values.forEach((value: number, i: number) => { - if (paletteColors.has(value)) { - const valueCount = paletteColors.get(value)!; - color[c] += valueColors[i][c] * (valueCount / count); - } - }); - color[c] = Math.round(color[c]); - } - - paletteColors.delete(key); - for (const value of values) { - paletteColors.delete(value); - if (mappedColors.has(value)) { - mappedColors.delete(value); - } - } - - paletteColors.set( - argbFromRgba({ - r: color[0], - g: color[1], - b: color[2], - a: color[3], - }), - count, - ); - }); - - keys = Array.from(paletteColors.keys()).sort( - (a: number, b: number) => - paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1, + paletteColors.set( + argbFromRgba({ + r: color[0], + g: color[1], + b: color[2], + a: color[3], + }), + count, ); - } while (mappedColors.size); + }); - return keys.map(c => Object.values(rgbaFromArgb(c))); - }, - ); + keys = Array.from(paletteColors.keys()).sort((a: number, b: number) => + paletteColors.get(a)! < paletteColors.get(b)! ? 1 : -1, + ); + } while (mappedColors.size); + + return keys.map(c => Object.values(rgbaFromArgb(c))); + }); const paletteDeltas: number[][] = []; @@ -6241,10 +5365,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const ratio = easeFunc(delta / 255); const color = [0, 0, 0, fusionSpriteColors[sc][3]]; for (let c = 0; c < 3; c++) { - color[c] = Math.round( - fusionSpriteColors[sc][c] * ratio + - fusionPalette[paletteIndex][c] * (1 - ratio), - ); + color[c] = Math.round(fusionSpriteColors[sc][c] * ratio + fusionPalette[paletteIndex][c] * (1 - ratio)); } fusionSpriteColors[sc] = color; } @@ -6253,12 +5374,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { [this.getSprite(), this.getTintSprite()] .filter(s => !!s) .map(s => { - s.pipelineData[ - `spriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}` - ] = spriteColors; - s.pipelineData[ - `fusionSpriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}` - ] = fusionSpriteColors; + s.pipelineData[`spriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`] = spriteColors; + s.pipelineData[`fusionSpriteColors${ignoreOveride && this.summonData.speciesForm ? "Base" : ""}`] = + fusionSpriteColors; }); canvas.remove(); @@ -6278,9 +5396,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) */ randBattleSeedInt(range: number, min = 0): number { - return globalScene.currentBattle - ? globalScene.randBattleSeedInt(range, min) - : randSeedInt(range, min); + return globalScene.currentBattle ? globalScene.randBattleSeedInt(range, min) : randSeedInt(range, min); } /** @@ -6290,9 +5406,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns a random integer between {@linkcode min} and {@linkcode max} inclusive */ randBattleSeedIntRange(min: number, max: number): number { - return globalScene.currentBattle - ? globalScene.randBattleSeedInt(max - min + 1, min) - : randSeedIntRange(min, max); + return globalScene.currentBattle ? globalScene.randBattleSeedInt(max - min + 1, min) : randSeedIntRange(min, max); } /** @@ -6320,11 +5434,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Trigger abilities that activate upon leaving the field applyPreLeaveFieldAbAttrs(PreLeaveFieldAbAttr, this); this.setSwitchOutStatus(true); - globalScene.triggerPokemonFormChange( - this, - SpeciesFormChangeActiveTrigger, - true, - ); + globalScene.triggerPokemonFormChange(this, SpeciesFormChangeActiveTrigger, true); globalScene.field.remove(this, destroy); } @@ -6346,10 +5456,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { hasSameAbilityInRootForm(abilityIndex: number): boolean { const currentAbilityIndex = this.abilityIndex; const rootForm = getPokemonSpecies(this.species.getRootSpeciesId()); - return ( - rootForm.getAbility(abilityIndex) === - rootForm.getAbility(currentAbilityIndex) - ); + return rootForm.getAbility(abilityIndex) === rootForm.getAbility(currentAbilityIndex); } /** @@ -6378,23 +5485,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param forBattle If `false`, do not trigger in-battle effects (such as Unburden) from losing the item. For example, set this to `false` if the Pokemon is giving away the held item for a Mystery Encounter. Default is `true`. * @returns `true` if the item was removed successfully, `false` otherwise. */ - public loseHeldItem( - heldItem: PokemonHeldItemModifier, - forBattle = true, - ): boolean { + public loseHeldItem(heldItem: PokemonHeldItemModifier, forBattle = true): boolean { if (heldItem.pokemonId !== -1 && heldItem.pokemonId !== this.id) { return false; } - heldItem.stackCount--; - if (heldItem.stackCount <= 0) { - globalScene.removeModifier(heldItem, !this.isPlayer()); - } - if (forBattle) { - applyPostItemLostAbAttrs(PostItemLostAbAttr, this, false); - } + heldItem.stackCount--; + if (heldItem.stackCount <= 0) { + globalScene.removeModifier(heldItem, !this.isPlayer()); + } + if (forBattle) { + applyPostItemLostAbAttrs(PostItemLostAbAttr, this, false); + } - return true; + return true; } /** @@ -6403,11 +5507,11 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @param berryType The type of berry being eaten. * @param updateHarvest Whether to track the berry for harvest; default `true`. */ - public recordEatenBerry(berryType: BerryType, updateHarvest: boolean = true) { + public recordEatenBerry(berryType: BerryType, updateHarvest = true) { this.battleData.hasEatenBerry = true; if (updateHarvest) { // Only track for harvest if we actually consumed the berry - this.battleData.berriesEaten.push(berryType) + this.battleData.berriesEaten.push(berryType); } this.turnData.berriesEaten.push(berryType); } @@ -6428,20 +5532,7 @@ export class PlayerPokemon extends Pokemon { nature?: Nature, dataSource?: Pokemon | PokemonData, ) { - super( - 106, - 148, - species, - level, - abilityIndex, - formIndex, - gender, - shiny, - variant, - ivs, - nature, - dataSource, - ); + super(106, 148, species, level, abilityIndex, formIndex, gender, shiny, variant, ivs, nature, dataSource); if (Overrides.STATUS_OVERRIDE) { this.status = new Status(Overrides.STATUS_OVERRIDE, 0, 4); @@ -6504,17 +5595,13 @@ export class PlayerPokemon extends Pokemon { if (Array.isArray(p)) { const [pkm, form] = p; if ( - (pkm === this.species.speciesId || - (this.fusionSpecies && pkm === this.fusionSpecies.speciesId)) && + (pkm === this.species.speciesId || (this.fusionSpecies && pkm === this.fusionSpecies.speciesId)) && form === this.getFormKey() ) { compatible = true; break; } - } else if ( - p === this.species.speciesId || - (this.fusionSpecies && p === this.fusionSpecies.speciesId) - ) { + } else if (p === this.species.speciesId || (this.fusionSpecies && p === this.fusionSpecies.speciesId)) { compatible = true; break; } @@ -6532,8 +5619,7 @@ export class PlayerPokemon extends Pokemon { if ( !this.getSpeciesForm().validateStarterMoveset( moveset, - globalScene.gameData.starterData[this.species.getRootSpeciesId()] - .eggMoves, + globalScene.gameData.starterData[this.species.getRootSpeciesId()].eggMoves, ) ) { return false; @@ -6559,18 +5645,10 @@ export class PlayerPokemon extends Pokemon { UiMode.PARTY, PartyUiMode.FAINT_SWITCH, this.getFieldIndex(), - (slotIndex: number, option: PartyOption) => { - if ( - slotIndex >= globalScene.currentBattle.getBattlerCount() && - slotIndex < 6 - ) { + (slotIndex: number, _option: PartyOption) => { + if (slotIndex >= globalScene.currentBattle.getBattlerCount() && slotIndex < 6) { globalScene.prependToPhase( - new SwitchSummonPhase( - switchType, - this.getFieldIndex(), - slotIndex, - false, - ), + new SwitchSummonPhase(switchType, this.getFieldIndex(), slotIndex, false), MoveEndPhase, ); } @@ -6584,23 +5662,13 @@ export class PlayerPokemon extends Pokemon { addFriendship(friendship: number): void { if (friendship > 0) { const starterSpeciesId = this.species.getRootSpeciesId(); - const fusionStarterSpeciesId = - this.isFusion() && this.fusionSpecies - ? this.fusionSpecies.getRootSpeciesId() - : 0; + const fusionStarterSpeciesId = this.isFusion() && this.fusionSpecies ? this.fusionSpecies.getRootSpeciesId() : 0; const starterData = [ globalScene.gameData.starterData[starterSpeciesId], - fusionStarterSpeciesId - ? globalScene.gameData.starterData[fusionStarterSpeciesId] - : null, + fusionStarterSpeciesId ? globalScene.gameData.starterData[fusionStarterSpeciesId] : null, ].filter(d => !!d); const amount = new NumberHolder(friendship); - globalScene.applyModifier( - PokemonFriendshipBoosterModifier, - true, - this, - amount, - ); + globalScene.applyModifier(PokemonFriendshipBoosterModifier, true, this, amount); const candyFriendshipMultiplier = globalScene.gameMode.isClassic ? timedEventManager.getClassicFriendshipMultiplier() : 1; @@ -6609,11 +5677,7 @@ export class PlayerPokemon extends Pokemon { ? 1.5 // Divide candy gain for fusions by 1.5 during events : 2 // 2 for fusions outside events : 1; // 1 for non-fused mons - const starterAmount = new NumberHolder( - Math.floor( - (amount.value * candyFriendshipMultiplier) / fusionReduction, - ), - ); + const starterAmount = new NumberHolder(Math.floor((amount.value * candyFriendshipMultiplier) / fusionReduction)); // Add friendship to this PlayerPokemon this.friendship = Math.min(this.friendship + amount.value, 255); @@ -6622,14 +5686,9 @@ export class PlayerPokemon extends Pokemon { } // Add to candy progress for this mon's starter species and its fused species (if it has one) starterData.forEach((sd: StarterDataEntry, i: number) => { - const speciesId = !i - ? starterSpeciesId - : (fusionStarterSpeciesId as Species); + const speciesId = !i ? starterSpeciesId : (fusionStarterSpeciesId as Species); sd.friendship = (sd.friendship || 0) + starterAmount.value; - if ( - sd.friendship >= - getStarterValueFriendshipCap(speciesStarterCosts[speciesId]) - ) { + if (sd.friendship >= getStarterValueFriendshipCap(speciesStarterCosts[speciesId])) { globalScene.gameData.addStarterCandy(getPokemonSpecies(speciesId), 1); sd.friendship = 0; } @@ -6640,9 +5699,7 @@ export class PlayerPokemon extends Pokemon { } } - getPossibleEvolution( - evolution: SpeciesFormEvolution | null, - ): Promise { + getPossibleEvolution(evolution: SpeciesFormEvolution | null): Promise { if (!evolution) { return new Promise(resolve => resolve(this)); } @@ -6657,9 +5714,7 @@ export class PlayerPokemon extends Pokemon { this.fusionFormIndex = evolution.evoFormKey !== null ? Math.max( - evolutionSpecies.forms.findIndex( - f => f.formKey === evolution.evoFormKey, - ), + evolutionSpecies.forms.findIndex(f => f.formKey === evolution.evoFormKey), 0, ) : this.fusionFormIndex; @@ -6681,9 +5736,7 @@ export class PlayerPokemon extends Pokemon { const formIndex = evolution.evoFormKey !== null && !isFusion ? Math.max( - evolutionSpecies.forms.findIndex( - f => f.formKey === evolution.evoFormKey, - ), + evolutionSpecies.forms.findIndex(f => f.formKey === evolution.evoFormKey), 0, ) : this.formIndex; @@ -6704,10 +5757,7 @@ export class PlayerPokemon extends Pokemon { }); } - evolve( - evolution: SpeciesFormEvolution | null, - preEvolution: PokemonSpeciesForm, - ): Promise { + evolve(evolution: SpeciesFormEvolution | null, preEvolution: PokemonSpeciesForm): Promise { if (!evolution) { return new Promise(resolve => resolve()); } @@ -6723,10 +5773,9 @@ export class PlayerPokemon extends Pokemon { } if (evolution.preFormKey !== null) { const formIndex = Math.max( - (!isFusion || !this.fusionSpecies - ? this.species - : this.fusionSpecies - ).forms.findIndex(f => f.formKey === evolution.evoFormKey), + (!isFusion || !this.fusionSpecies ? this.species : this.fusionSpecies).forms.findIndex( + f => f.formKey === evolution.evoFormKey, + ), 0, ); if (!isFusion) { @@ -6741,18 +5790,12 @@ export class PlayerPokemon extends Pokemon { const preEvoAbilityCount = preEvolution.getAbilityCount(); if ([0, 1, 2].includes(this.abilityIndex)) { // Handles cases where a Pokemon with 3 abilities evolves into a Pokemon with 2 abilities (ie: Eevee -> any Eeveelution) - if ( - this.abilityIndex === 2 && - preEvoAbilityCount === 3 && - abilityCount === 2 - ) { + if (this.abilityIndex === 2 && preEvoAbilityCount === 3 && abilityCount === 2) { this.abilityIndex = 1; } } else { // Prevent pokemon with an illegal ability value from breaking things - console.warn( - "this.abilityIndex is somehow an illegal value, please report this", - ); + console.warn("this.abilityIndex is somehow an illegal value, please report this"); console.warn(this.abilityIndex); this.abilityIndex = 0; } @@ -6761,17 +5804,11 @@ export class PlayerPokemon extends Pokemon { const abilityCount = this.getFusionSpeciesForm().getAbilityCount(); const preEvoAbilityCount = preEvolution.getAbilityCount(); if ([0, 1, 2].includes(this.fusionAbilityIndex)) { - if ( - this.fusionAbilityIndex === 2 && - preEvoAbilityCount === 3 && - abilityCount === 2 - ) { + if (this.fusionAbilityIndex === 2 && preEvoAbilityCount === 3 && abilityCount === 2) { this.fusionAbilityIndex = 1; } } else { - console.warn( - "this.fusionAbilityIndex is somehow an illegal value, please report this", - ); + console.warn("this.fusionAbilityIndex is somehow an illegal value, please report this"); console.warn(this.fusionAbilityIndex); this.fusionAbilityIndex = 0; } @@ -6785,22 +5822,15 @@ export class PlayerPokemon extends Pokemon { }); }; if (preEvolution.speciesId === Species.GIMMIGHOUL) { - const evotracker = - this.getHeldItems().filter(m => m instanceof EvoTrackerModifier)[0] ?? - null; + const evotracker = this.getHeldItems().filter(m => m instanceof EvoTrackerModifier)[0] ?? null; if (evotracker) { globalScene.removeModifier(evotracker); } } if (!globalScene.gameMode.isDaily || this.metBiome > -1) { - globalScene.gameData.updateSpeciesDexIvs( - this.species.speciesId, - this.ivs, - ); + globalScene.gameData.updateSpeciesDexIvs(this.species.speciesId, this.ivs); globalScene.gameData.setPokemonSeen(this, false); - globalScene.gameData - .setPokemonCaught(this, false) - .then(() => updateAndResolve()); + globalScene.gameData.setPokemonCaught(this, false).then(() => updateAndResolve()); } else { updateAndResolve(); } @@ -6811,10 +5841,7 @@ export class PlayerPokemon extends Pokemon { const isFusion = evolution instanceof FusionSpeciesFormEvolution; const evoSpecies = !isFusion ? this.species : this.fusionSpecies; - if ( - evoSpecies?.speciesId === Species.NINCADA && - evolution.speciesId === Species.NINJASK - ) { + if (evoSpecies?.speciesId === Species.NINCADA && evolution.speciesId === Species.NINJASK) { const newEvolution = pokemonEvolutions[evoSpecies.speciesId][1]; if (newEvolution.condition?.predicate(this)) { @@ -6850,12 +5877,7 @@ export class PlayerPokemon extends Pokemon { newPokemon.evoCounter = this.evoCounter; globalScene.getPlayerParty().push(newPokemon); - newPokemon.evolve( - !isFusion - ? newEvolution - : new FusionSpeciesFormEvolution(this.id, newEvolution), - evoSpecies, - ); + newPokemon.evolve(!isFusion ? newEvolution : new FusionSpeciesFormEvolution(this.id, newEvolution), evoSpecies); const modifiers = globalScene.findModifiers( m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id, true, @@ -6916,9 +5938,7 @@ export class PlayerPokemon extends Pokemon { }; if (!globalScene.gameMode.isDaily || this.metBiome > -1) { globalScene.gameData.setPokemonSeen(this, false); - globalScene.gameData - .setPokemonCaught(this, false) - .then(() => updateAndResolve()); + globalScene.gameData.setPokemonCaught(this, false).then(() => updateAndResolve()); } else { updateAndResolve(); } @@ -6953,8 +5973,7 @@ export class PlayerPokemon extends Pokemon { // Store the average HP% that each Pokemon has const maxHp = this.getMaxHp(); - const newHpPercent = - (pokemon.hp / pokemon.getMaxHp() + this.hp / maxHp) / 2; + const newHpPercent = (pokemon.hp / pokemon.getMaxHp() + this.hp / maxHp) / 2; this.generateName(); this.calculateStats(); @@ -6985,15 +6004,7 @@ export class PlayerPokemon extends Pokemon { true, ) as PokemonHeldItemModifier[]; for (const modifier of fusedPartyMemberHeldModifiers) { - globalScene.tryTransferHeldItemModifier( - modifier, - this, - false, - modifier.getStackCount(), - true, - true, - false, - ); + globalScene.tryTransferHeldItemModifier(modifier, this, false, modifier.getStackCount(), true, true, false); } globalScene.updateModifiers(true, true); globalScene.removePartyMemberModifiers(fusedPartyMemberIndex); @@ -7001,11 +6012,7 @@ export class PlayerPokemon extends Pokemon { const newPartyMemberIndex = globalScene.getPlayerParty().indexOf(this); pokemon .getMoveset(true) - .map((m: PokemonMove) => - globalScene.unshiftPhase( - new LearnMovePhase(newPartyMemberIndex, m.getMove().id), - ), - ); + .map((m: PokemonMove) => globalScene.unshiftPhase(new LearnMovePhase(newPartyMemberIndex, m.getMove().id))); pokemon.destroy(); this.updateFusionPalette(); } @@ -7107,17 +6114,13 @@ export class EnemyPokemon extends Pokemon { } } - this.luck = - (this.shiny ? this.variant + 1 : 0) + - (this.fusionShiny ? this.fusionVariant + 1 : 0); + this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0); let prevolution: Species; let speciesId = species.speciesId; while ((prevolution = pokemonPrevolutions[speciesId])) { const evolution = pokemonEvolutions[prevolution].find( - pe => - pe.speciesId === speciesId && - (!pe.evoFormKey || pe.evoFormKey === this.getFormKey()), + pe => pe.speciesId === speciesId && (!pe.evoFormKey || pe.evoFormKey === this.getFormKey()), ); if (evolution?.condition?.enforceFunc) { evolution.condition.enforceFunc(this); @@ -7135,8 +6138,7 @@ export class EnemyPokemon extends Pokemon { } } - this.aiType = - boss || this.hasTrainer() ? AiType.SMART : AiType.SMART_RANDOM; + this.aiType = boss || this.hasTrainer() ? AiType.SMART : AiType.SMART_RANDOM; } initBattleInfo(): void { @@ -7160,12 +6162,7 @@ export class EnemyPokemon extends Pokemon { if (boss) { this.bossSegments = bossSegments || - globalScene.getEncounterBossSegments( - globalScene.currentBattle.waveIndex, - this.level, - this.species, - true, - ); + globalScene.getEncounterBossSegments(globalScene.currentBattle.waveIndex, this.level, this.species, true); this.bossSegmentIndex = this.bossSegments - 1; } else { this.bossSegments = 0; @@ -7219,12 +6216,14 @@ export class EnemyPokemon extends Pokemon { const queuedMove = moveQueue[0]; if (queuedMove) { const moveIndex = this.getMoveset().findIndex(m => m.moveId === queuedMove.move); - if ((moveIndex > -1 && this.getMoveset()[moveIndex].isUsable(this, queuedMove.ignorePP)) || queuedMove.virtual) { + if ( + (moveIndex > -1 && this.getMoveset()[moveIndex].isUsable(this, queuedMove.ignorePP)) || + queuedMove.virtual + ) { return queuedMove; - } else { - this.getMoveQueue().shift(); - return this.getNextMove(); } + this.getMoveQueue().shift(); + return this.getNextMove(); } } @@ -7248,11 +6247,13 @@ export class EnemyPokemon extends Pokemon { } } switch (this.aiType) { - case AiType.RANDOM: // No enemy should spawn with this AI type in-game + // No enemy should spawn with this AI type in-game + case AiType.RANDOM: { const moveId = movePool[globalScene.randBattleSeedInt(movePool.length)].moveId; return { move: moveId, targets: this.getNextTargets(moveId) }; + } case AiType.SMART_RANDOM: - case AiType.SMART: + case AiType.SMART: { /** * Search this Pokemon's move pool for moves that will KO an opposing target. * If there are any moves that can KO an opponent (i.e. a player Pokemon), @@ -7273,20 +6274,14 @@ export class EnemyPokemon extends Pokemon { .targets.map(ind => fieldPokemon[ind]) .filter(p => this.isPlayer() !== p.isPlayer()); // Only considers critical hits for crit-only moves or when this Pokemon is under the effect of Laser Focus - const isCritical = - move.hasAttr(CritOnlyAttr) || - !!this.getTag(BattlerTagType.ALWAYS_CRIT); + const isCritical = move.hasAttr(CritOnlyAttr) || !!this.getTag(BattlerTagType.ALWAYS_CRIT); return ( move.category !== MoveCategory.STATUS && moveTargets.some(p => { const doesNotFail = move.applyConditions(this, p, move) || - [ - Moves.SUCKER_PUNCH, - Moves.UPPER_HAND, - Moves.THUNDERCLAP, - ].includes(move.id); + [Moves.SUCKER_PUNCH, Moves.UPPER_HAND, Moves.THUNDERCLAP].includes(move.id); return ( doesNotFail && p.getAttackDamage({ @@ -7297,8 +6292,7 @@ export class EnemyPokemon extends Pokemon { ignoreAllyAbility: !p.getAlly()?.waveData.abilityRevealed, ignoreSourceAllyAbility: false, isCritical, - } - ).damage >= p.hp + }).damage >= p.hp ); }) ); @@ -7314,7 +6308,7 @@ export class EnemyPokemon extends Pokemon { * For more information on how benefit scores are calculated, see `docs/enemy-ai.md`. */ const moveScores = movePool.map(() => 0); - const moveTargets = Object.fromEntries(movePool.map(m => [ m.moveId, this.getNextTargets(m.moveId) ])); + const moveTargets = Object.fromEntries(movePool.map(m => [m.moveId, this.getNextTargets(m.moveId)])); for (const m in movePool) { const pokemonMove = movePool[m]; const move = pokemonMove.getMove(); @@ -7335,8 +6329,7 @@ export class EnemyPokemon extends Pokemon { */ let targetScore = move.getUserBenefitScore(this, target, move) + - move.getTargetBenefitScore(this, target, move) * - (mt < BattlerIndex.ENEMY === this.isPlayer() ? 1 : -1); + move.getTargetBenefitScore(this, target, move) * (mt < BattlerIndex.ENEMY === this.isPlayer() ? 1 : -1); if (Number.isNaN(targetScore)) { console.error(`Move ${move.name} returned score of NaN`); targetScore = 0; @@ -7346,27 +6339,23 @@ export class EnemyPokemon extends Pokemon { * target score to -20 */ if ( - (move.name.endsWith(" (N)") || - !move.applyConditions(this, target, move)) && - ![ - Moves.SUCKER_PUNCH, - Moves.UPPER_HAND, - Moves.THUNDERCLAP, - ].includes(move.id) + (move.name.endsWith(" (N)") || !move.applyConditions(this, target, move)) && + ![Moves.SUCKER_PUNCH, Moves.UPPER_HAND, Moves.THUNDERCLAP].includes(move.id) ) { targetScore = -20; } else if (move instanceof AttackMove) { /** * Attack moves are given extra multipliers to their base benefit score based on * the move's type effectiveness against the target and whether the move is a STAB move. - */ + */ const effectiveness = target.getMoveEffectiveness( this, move, !target.waveData.abilityRevealed, undefined, undefined, - true); + true, + ); if (target.isPlayer() !== this.isPlayer()) { targetScore *= effectiveness; @@ -7405,18 +6394,14 @@ export class EnemyPokemon extends Pokemon { let r = 0; if (this.aiType === AiType.SMART_RANDOM) { // Has a 5/8 chance to select the best move, and a 3/8 chance to advance to the next best move (and repeat this roll) - while ( - r < sortedMovePool.length - 1 && - globalScene.randBattleSeedInt(8) >= 5 - ) { + while (r < sortedMovePool.length - 1 && globalScene.randBattleSeedInt(8) >= 5) { r++; } } else if (this.aiType === AiType.SMART) { // The chance to advance to the next best move increases when the compared moves' scores are closer to each other. while ( r < sortedMovePool.length - 1 && - moveScores[movePool.indexOf(sortedMovePool[r + 1])] / - moveScores[movePool.indexOf(sortedMovePool[r])] >= + moveScores[movePool.indexOf(sortedMovePool[r + 1])] / moveScores[movePool.indexOf(sortedMovePool[r])] >= 0 && globalScene.randBattleSeedInt(100) < Math.round( @@ -7428,8 +6413,14 @@ export class EnemyPokemon extends Pokemon { r++; } } - console.log(movePool.map(m => m.getName()), moveScores, r, sortedMovePool.map(m => m.getName())); + console.log( + movePool.map(m => m.getName()), + moveScores, + r, + sortedMovePool.map(m => m.getName()), + ); return { move: sortedMovePool[r]!.moveId, targets: moveTargets[sortedMovePool[r]!.moveId] }; + } } } @@ -7446,9 +6437,7 @@ export class EnemyPokemon extends Pokemon { */ getNextTargets(moveId: Moves): BattlerIndex[] { const moveTargets = getMoveTargets(this, moveId); - const targets = globalScene - .getField(true) - .filter(p => moveTargets.targets.indexOf(p.getBattlerIndex()) > -1); + const targets = globalScene.getField(true).filter(p => moveTargets.targets.indexOf(p.getBattlerIndex()) > -1); // If the move is multi-target, return all targets' indexes if (moveTargets.multiple) { return targets.map(p => p.getBattlerIndex()); @@ -7462,8 +6451,7 @@ export class EnemyPokemon extends Pokemon { */ const benefitScores = targets.map(p => [ p.getBattlerIndex(), - move.getTargetBenefitScore(this, p, move) * - (p.isPlayer() === this.isPlayer() ? 1 : -1), + move.getTargetBenefitScore(this, p, move) * (p.isPlayer() === this.isPlayer() ? 1 : -1), ]); const sortedBenefitScores = benefitScores.slice(0); @@ -7494,9 +6482,7 @@ export class EnemyPokemon extends Pokemon { } // Remove any targets whose weights are less than half the max of the target weights from consideration - const benefitCutoffIndex = targetWeights.findIndex( - s => s < targetWeights[0] / 2, - ); + const benefitCutoffIndex = targetWeights.findIndex(s => s < targetWeights[0] / 2); if (benefitCutoffIndex > -1) { targetWeights = targetWeights.slice(0, benefitCutoffIndex); } @@ -7555,12 +6541,7 @@ export class EnemyPokemon extends Pokemon { return 0; } - damage( - damage: number, - ignoreSegments = false, - preventEndure = false, - ignoreFaintPhase = false, - ): number { + damage(damage: number, ignoreSegments = false, preventEndure = false, ignoreFaintPhase = false): number { if (this.isFainted()) { return 0; } @@ -7579,16 +6560,13 @@ export class EnemyPokemon extends Pokemon { while ( segmentsBypassed < this.bossSegmentIndex && this.canBypassBossSegments(segmentsBypassed + 1) && - damage - hpRemainder >= - Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1)) + damage - hpRemainder >= Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1)) ) { segmentsBypassed++; //console.log('damage', damage, 'segment', segmentsBypassed + 1, 'segment size', segmentSize, 'damage needed', Math.round(segmentSize * Math.pow(2, segmentsBypassed + 1))); } - damage = toDmgValue( - this.hp - hpThreshold + segmentSize * segmentsBypassed, - ); + damage = toDmgValue(this.hp - hpThreshold + segmentSize * segmentsBypassed); clearedBossSegmentIndex = s - segmentsBypassed; } break; @@ -7603,12 +6581,7 @@ export class EnemyPokemon extends Pokemon { } } - const ret = super.damage( - damage, - ignoreSegments, - preventEndure, - ignoreFaintPhase, - ); + const ret = super.damage(damage, ignoreSegments, preventEndure, ignoreFaintPhase); if (this.isBoss()) { if (ignoreSegments) { @@ -7642,17 +6615,10 @@ export class EnemyPokemon extends Pokemon { * @param segmentIndex index of the segment to get down to (0 = no shield left, 1 = 1 shield left, etc.) */ handleBossSegmentCleared(segmentIndex: number): void { - while ( - this.bossSegmentIndex > 0 && - segmentIndex - 1 < this.bossSegmentIndex - ) { + while (this.bossSegmentIndex > 0 && segmentIndex - 1 < this.bossSegmentIndex) { // Filter out already maxed out stat stages and weigh the rest based on existing stats - const leftoverStats = EFFECTIVE_STATS.filter( - (s: EffectiveStat) => this.getStatStage(s) < 6, - ); - const statWeights = leftoverStats.map((s: EffectiveStat) => - this.getStat(s, false), - ); + const leftoverStats = EFFECTIVE_STATS.filter((s: EffectiveStat) => this.getStatStage(s) < 6); + const statWeights = leftoverStats.map((s: EffectiveStat) => this.getStat(s, false)); let boostedStat: EffectiveStat; const statThresholds: number[] = []; @@ -7684,14 +6650,7 @@ export class EnemyPokemon extends Pokemon { } globalScene.unshiftPhase( - new StatStageChangePhase( - this.getBattlerIndex(), - true, - [boostedStat!], - stages, - true, - true, - ), + new StatStageChangePhase(this.getBattlerIndex(), true, [boostedStat!], stages, true, true), ); this.bossSegmentIndex--; } @@ -7745,11 +6704,7 @@ export class EnemyPokemon extends Pokemon { newPokemon.setVisible(false); ret = newPokemon; - globalScene.triggerPokemonFormChange( - newPokemon, - SpeciesFormChangeActiveTrigger, - true, - ); + globalScene.triggerPokemonFormChange(newPokemon, SpeciesFormChangeActiveTrigger, true); } return ret; @@ -7789,7 +6744,7 @@ interface IllusionData { /** The fusionGender of the illusion if it's a fusion */ fusionGender?: Gender; /** The level of the illusion (not used currently) */ - level?: number + level?: number; } export interface TurnMove { @@ -7838,7 +6793,7 @@ export class PokemonSummonData { /** Data pertaining to this pokemon's illusion. */ public illusion: IllusionData | null = null; - public illusionBroken: boolean = false; + public illusionBroken = false; /** Array containing all berries eaten in the last turn; used by {@linkcode Abilities.CUD_CHEW} */ public berriesEatenLast: BerryType[] = []; @@ -7875,15 +6830,15 @@ export class PokemonSummonData { } } - // TODO: Merge this inside `summmonData` but exclude from save if/when a save data serializer is added +// TODO: Merge this inside `summmonData` but exclude from save if/when a save data serializer is added export class PokemonTempSummonData { /** * The number of turns this pokemon has spent without switching out. * Only currently used for positioning the battle cursor. */ - turnCount: number = 1; + turnCount = 1; - /** + /** * The number of turns this pokemon has spent in the active position since the start of the wave * without switching out. * Reset on switch and new wave, but not stored in `SummonData` to avoid being written to the save file. @@ -7892,7 +6847,6 @@ export class PokemonTempSummonData { * {@linkcode Moves.FAKE_OUT | Fake Out} and {@linkcode Moves.FIRST_IMPRESSION | First Impression}). */ waveTurnCount = 1; - } /** @@ -7903,7 +6857,7 @@ export class PokemonBattleData { /** Counter tracking direct hits this Pokemon has received during this battle; used for {@linkcode Moves.RAGE_FIST} */ public hitCount = 0; /** Whether this Pokemon has eaten a berry this battle; used for {@linkcode Moves.BELCH} */ - public hasEatenBerry: boolean = false; + public hasEatenBerry = false; /** Array containing all berries eaten and not yet recovered during this current battle; used by {@linkcode Abilities.HARVEST} */ public berriesEaten: BerryType[] = []; @@ -7927,7 +6881,7 @@ export class PokemonWaveData { * A set of all the abilities this {@linkcode Pokemon} has used in this wave. * Used to track once per battle conditions, as well as (hopefully) by the updated AI for move effectiveness. */ - public abilitiesApplied: Set = new Set; + public abilitiesApplied: Set = new Set(); /** Whether the pokemon's ability has been revealed or not */ public abilityRevealed = false; } @@ -7967,8 +6921,8 @@ export class PokemonTurnData { * All berries eaten by this pokemon in this turn. * Saved into {@linkcode PokemonSummonData | SummonData} by {@linkcode Abilities.CUD_CHEW} on turn end. * @see {@linkcode PokemonSummonData.berriesEatenLast} - */ - public berriesEaten: BerryType[] = [] + */ + public berriesEaten: BerryType[] = []; } export enum AiType { @@ -8045,13 +6999,7 @@ export class PokemonMove { */ public maxPpOverride?: number; - constructor( - moveId: Moves, - ppUsed = 0, - ppUp = 0, - virtual = false, - maxPpOverride?: number, - ) { + constructor(moveId: Moves, ppUsed = 0, ppUp = 0, virtual = false, maxPpOverride?: number) { this.moveId = moveId; this.ppUsed = ppUsed; this.ppUp = ppUp; @@ -8063,21 +7011,13 @@ export class PokemonMove { * Checks whether the move can be selected or performed by a Pokemon, without consideration for the move's targets. * The move is unusable if it is out of PP, restricted by an effect, or unimplemented. * - * @param {Pokemon} pokemon {@linkcode Pokemon} that would be using this move - * @param {boolean} ignorePp If `true`, skips the PP check - * @param {boolean} ignoreRestrictionTags If `true`, skips the check for move restriction tags (see {@link MoveRestrictionBattlerTag}) + * @param pokemon - {@linkcode Pokemon} that would be using this move + * @param ignorePp - If `true`, skips the PP check + * @param ignoreRestrictionTags - If `true`, skips the check for move restriction tags (see {@link MoveRestrictionBattlerTag}) * @returns `true` if the move can be selected and used by the Pokemon, otherwise `false`. */ - isUsable( - pokemon: Pokemon, - ignorePp = false, - ignoreRestrictionTags = false, - ): boolean { - if ( - this.moveId && - !ignoreRestrictionTags && - pokemon.isMoveRestricted(this.moveId, pokemon) - ) { + isUsable(pokemon: Pokemon, ignorePp = false, ignoreRestrictionTags = false): boolean { + if (this.moveId && !ignoreRestrictionTags && pokemon.isMoveRestricted(this.moveId, pokemon)) { return false; } @@ -8085,9 +7025,7 @@ export class PokemonMove { return false; } - return ( - ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1 - ); + return ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1; } getMove(): Move { @@ -8098,15 +7036,12 @@ export class PokemonMove { * Sets {@link ppUsed} for this move and ensures the value does not exceed {@link getMovePp} * @param count Amount of PP to use */ - usePp(count: number = 1) { + usePp(count = 1) { this.ppUsed = Math.min(this.ppUsed + count, this.getMovePp()); } getMovePp(): number { - return ( - this.maxPpOverride || - this.getMove().pp + this.ppUp * toDmgValue(this.getMove().pp / 5) - ); + return this.maxPpOverride || this.getMove().pp + this.ppUp * toDmgValue(this.getMove().pp / 5); } getPpRatio(): number { @@ -8123,12 +7058,6 @@ export class PokemonMove { * @returns A valid {@linkcode PokemonMove} object */ static loadMove(source: PokemonMove | any): PokemonMove { - return new PokemonMove( - source.moveId, - source.ppUsed, - source.ppUp, - source.virtual, - source.maxPpOverride, - ); + return new PokemonMove(source.moveId, source.ppUsed, source.ppUp, source.virtual, source.maxPpOverride); } } diff --git a/src/phases/revival-blessing-phase.ts b/src/phases/revival-blessing-phase.ts index 598d9109abc..428acaf9ed4 100644 --- a/src/phases/revival-blessing-phase.ts +++ b/src/phases/revival-blessing-phase.ts @@ -24,7 +24,7 @@ export class RevivalBlessingPhase extends BattlePhase { UiMode.PARTY, PartyUiMode.REVIVAL_BLESSING, this.user.getFieldIndex(), - (slotIndex: integer, _option: PartyOption) => { + (slotIndex: number, _option: PartyOption) => { if (slotIndex >= 0 && slotIndex < 6) { const pokemon = globalScene.getPlayerParty()[slotIndex]; if (!pokemon || !pokemon.isFainted()) { diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts index 714a9b39771..5c48cf55753 100644 --- a/src/ui/login-form-ui-handler.ts +++ b/src/ui/login-form-ui-handler.ts @@ -151,9 +151,9 @@ export default class LoginFormUiHandler extends FormModalUiHandler { // Prevent overlapping overrides on action modification this.submitAction = originalLoginAction; this.sanitizeInputs(); - globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] }); + globalScene.ui.setMode(UiMode.LOADING, { buttonActions: [] }); const onFail = error => { - globalScene.ui.setMode(UiMode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() })); + globalScene.ui.setMode(UiMode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() })); globalScene.ui.playError(); }; if (!this.inputs[0].text) { @@ -243,7 +243,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler { }, }); } - globalScene.ui.setOverlayMode(UiMode.OPTION_SELECT, { + globalScene.ui.setOverlayMode(UiMode.OPTION_SELECT, { options: options, delay: 1000, }); From 6c676f1f11215a23826432bd552be5cd22c1195e Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Tue, 27 May 2025 15:41:06 -0500 Subject: [PATCH 27/44] [Misc] Add decrypt-save.js utility script (#5731) * Add decrypt-save.js * Update scripts/decrypt-save.js Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com> --------- Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com> --- scripts/decrypt-save.js | 149 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 scripts/decrypt-save.js diff --git a/scripts/decrypt-save.js b/scripts/decrypt-save.js new file mode 100644 index 00000000000..a7239a40df6 --- /dev/null +++ b/scripts/decrypt-save.js @@ -0,0 +1,149 @@ +import pkg from "crypto-js"; +const { AES, enc } = pkg; +// biome-ignore lint: This is how you import fs from node +import * as fs from "node:fs"; + +const SAVE_KEY = "x0i2O7WRiANTqPmZ"; + +/** + * A map of condensed keynames to their associated full names + * NOTE: Update this if `src/system/game-data#systemShortKeys` ever changes! + */ +const systemShortKeys = { + seenAttr: "$sa", + caughtAttr: "$ca", + natureAttr: "$na", + seenCount: "$s", + caughtCount: "$c", + hatchedCount: "$hc", + ivs: "$i", + moveset: "$m", + eggMoves: "$em", + candyCount: "$x", + friendship: "$f", + abilityAttr: "$a", + passiveAttr: "$pa", + valueReduction: "$vr", + classicWinCount: "$wc", +}; + +/** + * Replace the shortened key names with their full names + * @param {string} dataStr - The string to convert + * @returns {string} The string with shortened keynames replaced with full names + */ +function convertSystemDataStr(dataStr) { + const fromKeys = Object.values(systemShortKeys); + const toKeys = Object.keys(systemShortKeys); + for (const k in fromKeys) { + dataStr = dataStr.replace(new RegExp(`${fromKeys[k].replace("$", "\\$")}`, "g"), toKeys[k]); + } + + return dataStr; +} + +/** + * Decrypt a save + * @param {string} path - The path to the encrypted save file + * @returns {string} The decrypted save data + */ +function decryptSave(path) { + // Check if the file exists + if (!fs.existsSync(path)) { + console.error(`File not found: ${path}`); + process.exit(1); + } + let fileData; + try { + fileData = fs.readFileSync(path, "utf8"); + } catch (e) { + switch (e.code) { + case "ENOENT": + console.error(`File not found: ${path}`); + break; + case "EACCES": + console.error(`Could not open ${path}: Permission denied`); + break; + case "EISDIR": + console.error(`Unable to read ${path} as it is a directory`); + break; + default: + console.error(`Error reading file: ${e.message}`); + } + process.exit(1); + } + return convertSystemDataStr(AES.decrypt(fileData, SAVE_KEY).toString(enc.Utf8)); +} + +/* Print the usage message and exits */ +function printUsage() { + console.log(` +Usage: node decrypt-save.js [save-file] + +Arguments: + file-path Path to the encrypted save file to decrypt. + save-file Path to where the decrypted data should be written. If not provided, the decrypted data will be printed to the console. + +Options: + -h, --help Show this help message and exit. + +Description: + This script decrypts an encrypted pokerogue save file +`); +} + +/** + * Write `data` to `filePath`, gracefully communicating errors that arise + * @param {string} filePath + * @param {string} data + */ +function writeToFile(filePath, data) { + try { + fs.writeFileSync(filePath, data); + } catch (e) { + switch (e.code) { + case "EACCES": + console.error(`Could not open ${filePath}: Permission denied`); + break; + case "EISDIR": + console.error(`Unable to write to ${filePath} as it is a directory`); + break; + default: + console.error(`Error writing file: ${e.message}`); + } + process.exit(1); + } +} + +function main() { + let args = process.argv.slice(2); + // Get options + const options = args.filter(arg => arg.startsWith("-")); + // get args + args = args.filter(arg => !arg.startsWith("-")); + + if (args.length === 0 || options.includes("-h") || options.includes("--help") || args.length > 2) { + printUsage(); + process.exit(0); + } + // If the user provided a second argument, check if the file exists already and refuse to write to it. + if (args.length === 2) { + const destPath = args[1]; + if (fs.existsSync(destPath)) { + console.error(`Refusing to overwrite ${destPath}`); + process.exit(1); + } + } + + // Otherwise, commence decryption. + const decrypt = decryptSave(args[0]); + + if (args.length === 1) { + process.stdout.write(decrypt); + process.exit(0); + } + + writeToFile(destPath, decrypt); +} + +main(); From 2deced5565c92e5f9d99a6cd8fbb683d767ce105 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Tue, 27 May 2025 16:46:56 -0500 Subject: [PATCH 28/44] [Bug][Move] Allow gastro acid to suppress passives if main ability is unsuppressable (#5854) * Allow gastro acid to suppress passives if main ability is unsuppressable * Update gastro_acid.test.ts * Update src/data/moves/move.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * Add test to ensure unsuppressable main ability is not suppressed --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/data/moves/move.ts | 2 +- test/moves/gastro_acid.test.ts | 29 ++++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 31ad3337926..8a0da5f35c2 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -7521,7 +7521,7 @@ export class SuppressAbilitiesAttr extends MoveEffectAttr { /** Causes the effect to fail when the target's ability is unsupressable or already suppressed. */ getCondition(): MoveConditionFunc { - return (user, target, move) => target.getAbility().isSuppressable && !target.summonData.abilitySuppressed; + return (_user, target, _move) => !target.summonData.abilitySuppressed && (target.getAbility().isSuppressable || (target.hasPassive() && target.getPassiveAbility().isSuppressable)); } } diff --git a/test/moves/gastro_acid.test.ts b/test/moves/gastro_acid.test.ts index 8247d29c0a0..333619d16db 100644 --- a/test/moves/gastro_acid.test.ts +++ b/test/moves/gastro_acid.test.ts @@ -25,7 +25,7 @@ describe("Moves - Gastro Acid", () => { game.override.battleStyle("double"); game.override.startingLevel(1); game.override.enemyLevel(100); - game.override.ability(Abilities.NONE); + game.override.ability(Abilities.BALL_FETCH); game.override.moveset([Moves.GASTRO_ACID, Moves.WATER_GUN, Moves.SPLASH, Moves.CORE_ENFORCER]); game.override.enemySpecies(Species.BIDOOF); game.override.enemyMoveset(Moves.SPLASH); @@ -40,7 +40,7 @@ describe("Moves - Gastro Acid", () => { * - player mon 1 should have dealt damage, player mon 2 should have not */ - await game.startBattle(); + await game.classicMode.startBattle(); game.move.select(Moves.GASTRO_ACID, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); @@ -63,7 +63,7 @@ describe("Moves - Gastro Acid", () => { it("fails if used on an enemy with an already-suppressed ability", async () => { game.override.battleStyle("single"); - await game.startBattle(); + await game.classicMode.startBattle(); game.move.select(Moves.CORE_ENFORCER); // Force player to be slower to enable Core Enforcer to proc its suppression effect @@ -77,4 +77,27 @@ describe("Moves - Gastro Acid", () => { expect(game.scene.getPlayerPokemon()!.getLastXMoves()[0].result).toBe(MoveResult.FAIL); }); + + it("should suppress the passive of a target even if its main ability is unsuppressable and not suppress main abli", async () => { + game.override + .enemyAbility(Abilities.COMATOSE) + .enemyPassiveAbility(Abilities.WATER_ABSORB) + .moveset([Moves.SPLASH, Moves.GASTRO_ACID, Moves.WATER_GUN]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + const enemyPokemon = game.scene.getEnemyPokemon(); + + game.move.select(Moves.GASTRO_ACID); + await game.toNextTurn(); + expect(enemyPokemon?.summonData.abilitySuppressed).toBe(true); + + game.move.select(Moves.WATER_GUN); + await game.toNextTurn(); + expect(enemyPokemon?.getHpRatio()).toBeLessThan(1); + + game.move.select(Moves.SPORE); + await game.phaseInterceptor.to("BerryPhase"); + + expect(enemyPokemon?.status?.effect).toBeFalsy(); + }); }); From c236996a02f581f9fd54c873d4aba5cfd4836eeb Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Wed, 28 May 2025 00:08:49 +0200 Subject: [PATCH 29/44] [UI/UX] [Localization] starterInfoText adjustments and clean up (#5859) * starterInfoText adjustments and clean up * starterInfoText adjustments and clean up * Update starter-select-ui-handler.ts * Update starter-select-ui-handler.ts --------- Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com> --- src/ui/starter-select-ui-handler.ts | 41 +++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 80acac6a6b4..a971ba86479 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -108,17 +108,21 @@ const languageSettings: { [key: string]: LanguageSetting } = { instructionTextSize: "38px", }, de: { - starterInfoTextSize: "48px", + starterInfoTextSize: "54px", instructionTextSize: "35px", - starterInfoXPos: 33, + starterInfoXPos: 35, }, "es-ES": { - starterInfoTextSize: "52px", - instructionTextSize: "35px", + starterInfoTextSize: "50px", + instructionTextSize: "38px", + starterInfoYOffset: 0.5, + starterInfoXPos: 38, }, "es-MX": { - starterInfoTextSize: "52px", - instructionTextSize: "35px", + starterInfoTextSize: "50px", + instructionTextSize: "38px", + starterInfoYOffset: 0.5, + starterInfoXPos: 38, }, fr: { starterInfoTextSize: "54px", @@ -128,21 +132,16 @@ const languageSettings: { [key: string]: LanguageSetting } = { starterInfoTextSize: "56px", instructionTextSize: "38px", }, - pt_BR: { - starterInfoTextSize: "47px", - instructionTextSize: "38px", + "pt-BR": { + starterInfoTextSize: "48px", + instructionTextSize: "42px", + starterInfoYOffset: 0.5, starterInfoXPos: 33, }, zh: { - starterInfoTextSize: "47px", - instructionTextSize: "38px", - starterInfoYOffset: 1, - starterInfoXPos: 24, - }, - pt: { - starterInfoTextSize: "48px", - instructionTextSize: "42px", - starterInfoXPos: 33, + starterInfoTextSize: "56px", + instructionTextSize: "36px", + starterInfoXPos: 26, }, ko: { starterInfoTextSize: "60px", @@ -156,9 +155,11 @@ const languageSettings: { [key: string]: LanguageSetting } = { starterInfoYOffset: 0.5, starterInfoXPos: 33, }, - "ca-ES": { - starterInfoTextSize: "52px", + ca: { + starterInfoTextSize: "48px", instructionTextSize: "38px", + starterInfoYOffset: 0.5, + starterInfoXPos: 29, }, }; From d5789105f344abd6b6234d2b14410d03ae91e4bf Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Wed, 28 May 2025 12:29:03 -0500 Subject: [PATCH 30/44] [Refactor][UI/UX] Cleanup battle-info ui code (#5696) * Create battle-info directory and move battle-info.ts to it * Move player and enemy battle info to their own files * Move subclass specific parts of constructor to subclass constructor * Fixup mock gameobject methods to match phaser gameobject returns * Make statOrder specific to subclass * Create getShinyDescriptor function in utils * Move icon construction to its own function * Cleanup enemybattleinfo constructor to use chaining * Make flyout exclusive to EnemyBattleInfo * Move EnemyPokemon specific init Logic to its class * Break up initInfo into different methods * Remove hp bar segment dividers from base battle info * Move setMini to pokemoninfo * Breakup updateInfo into smaller parts * Remove hp info handling from base updateInfo * Use phaser object chaining methods * Add some docs * Add missing chain usage * Use getShinyDescriptor in pokemon-info-container * Minor cleanup of updatePokemonExp * Fixup setSizeToFrame mock * Ensure pokemon hp numbers are not visible during stat display * Update src/utils/common.ts Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com> * Make summary-ui-handler use new shinyDescriptor method * Remove `undefined` parameter pass Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com> * Address kev's review comments Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * Ensure hp number display fades in/out * Ensure ribbon and caught indicator fade with stat display * Update src/ui/battle-info/battle-info.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * Move construction of stats and type icons to their own methods * Make setPositionRelative return this * Improve doc comment on paddingX param * Fix mock sprite's setPositionRelative --------- Co-authored-by: Wlowscha <54003515+Wlowscha@users.noreply.github.com> Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com> Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/field/pokemon.ts | 31 +- src/main.ts | 2 +- src/typings/phaser/index.d.ts | 12 +- src/ui-inputs.ts | 2 +- src/ui/battle-flyout.ts | 4 +- src/ui/battle-info.ts | 986 ------------------ src/ui/battle-info/battle-info.ts | 688 ++++++++++++ src/ui/battle-info/enemy-battle-info.ts | 235 +++++ src/ui/battle-info/player-battle-info.ts | 242 +++++ src/ui/fight-ui-handler.ts | 6 +- src/ui/pokemon-info-container.ts | 27 +- src/ui/summary-ui-handler.ts | 26 +- src/utils/common.ts | 16 + test/testUtils/mocks/mockGameObject.ts | 1 + .../mocks/mocksContainer/mockContainer.ts | 187 ++-- .../mocks/mocksContainer/mockGraphics.ts | 53 +- .../mocks/mocksContainer/mockRectangle.ts | 42 +- .../mocks/mocksContainer/mockSprite.ts | 153 +-- .../mocks/mocksContainer/mockText.ts | 104 +- test/testUtils/testFileInitialization.ts | 4 +- 20 files changed, 1602 insertions(+), 1219 deletions(-) delete mode 100644 src/ui/battle-info.ts create mode 100644 src/ui/battle-info/battle-info.ts create mode 100644 src/ui/battle-info/enemy-battle-info.ts create mode 100644 src/ui/battle-info/player-battle-info.ts diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 85b003517a6..329ba06fd09 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -5,7 +5,9 @@ import { globalScene } from "#app/global-scene"; import type { Variant } from "#app/sprites/variant"; import { populateVariantColors, variantColorCache } from "#app/sprites/variant"; import { variantData } from "#app/sprites/variant"; -import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from "#app/ui/battle-info"; +import BattleInfo from "#app/ui/battle-info/battle-info"; +import { EnemyBattleInfo } from "#app/ui/battle-info/enemy-battle-info"; +import { PlayerBattleInfo } from "#app/ui/battle-info/player-battle-info"; import type Move from "#app/data/moves/move"; import { HighCritAttr, @@ -3347,22 +3349,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return this.battleInfo.updateInfo(this, instant); } - /** - * Show or hide the type effectiveness multiplier window - * Passing undefined will hide the window - */ - updateEffectiveness(effectiveness?: string) { - this.battleInfo.updateEffectiveness(effectiveness); - } - toggleStats(visible: boolean): void { this.battleInfo.toggleStats(visible); } - toggleFlyout(visible: boolean): void { - this.battleInfo.toggleFlyout(visible); - } - /** * Adds experience to this PlayerPokemon, subject to wave based level caps. * @param exp The amount of experience to add @@ -5518,6 +5508,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } export class PlayerPokemon extends Pokemon { + protected battleInfo: PlayerBattleInfo; public compatibleTms: Moves[]; constructor( @@ -6038,6 +6029,7 @@ export class PlayerPokemon extends Pokemon { } export class EnemyPokemon extends Pokemon { + protected battleInfo: EnemyBattleInfo; public trainerSlot: TrainerSlot; public aiType: AiType; public bossSegments: number; @@ -6709,6 +6701,19 @@ export class EnemyPokemon extends Pokemon { return ret; } + + + /** + * Show or hide the type effectiveness multiplier window + * Passing undefined will hide the window + */ + updateEffectiveness(effectiveness?: string) { + this.battleInfo.updateEffectiveness(effectiveness); + } + + toggleFlyout(visible: boolean): void { + this.battleInfo.toggleFlyout(visible); + } } /** diff --git a/src/main.ts b/src/main.ts index 7db663d14c7..38bfcbe5636 100644 --- a/src/main.ts +++ b/src/main.ts @@ -29,7 +29,7 @@ window.addEventListener("unhandledrejection", event => { const setPositionRelative = function (guideObject: Phaser.GameObjects.GameObject, x: number, y: number) { const offsetX = guideObject.width * (-0.5 + (0.5 - guideObject.originX)); const offsetY = guideObject.height * (-0.5 + (0.5 - guideObject.originY)); - this.setPosition(guideObject.x + offsetX + x, guideObject.y + offsetY + y); + return this.setPosition(guideObject.x + offsetX + x, guideObject.y + offsetY + y); }; Phaser.GameObjects.Container.prototype.setPositionRelative = setPositionRelative; diff --git a/src/typings/phaser/index.d.ts b/src/typings/phaser/index.d.ts index f3665768cec..26fbcff75bd 100644 --- a/src/typings/phaser/index.d.ts +++ b/src/typings/phaser/index.d.ts @@ -20,37 +20,37 @@ declare module "phaser" { /** * Sets this object's position relative to another object with a given offset */ - setPositionRelative(guideObject: any, x: number, y: number): void; + setPositionRelative(guideObject: any, x: number, y: number): this; } interface Sprite { /** * Sets this object's position relative to another object with a given offset */ - setPositionRelative(guideObject: any, x: number, y: number): void; + setPositionRelative(guideObject: any, x: number, y: number): this; } interface Image { /** * Sets this object's position relative to another object with a given offset */ - setPositionRelative(guideObject: any, x: number, y: number): void; + setPositionRelative(guideObject: any, x: number, y: number): this; } interface NineSlice { /** * Sets this object's position relative to another object with a given offset */ - setPositionRelative(guideObject: any, x: number, y: number): void; + setPositionRelative(guideObject: any, x: number, y: number): this; } interface Text { /** * Sets this object's position relative to another object with a given offset */ - setPositionRelative(guideObject: any, x: number, y: number): void; + setPositionRelative(guideObject: any, x: number, y: number): this; } interface Rectangle { /** * Sets this object's position relative to another object with a given offset */ - setPositionRelative(guideObject: any, x: number, y: number): void; + setPositionRelative(guideObject: any, x: number, y: number): this; } } diff --git a/src/ui-inputs.ts b/src/ui-inputs.ts index 0c13cdb9512..e4f11e1c93c 100644 --- a/src/ui-inputs.ts +++ b/src/ui-inputs.ts @@ -161,7 +161,7 @@ export class UiInputs { buttonInfo(pressed = true): void { if (globalScene.showMovesetFlyout) { - for (const p of globalScene.getField().filter(p => p?.isActive(true))) { + for (const p of globalScene.getEnemyField().filter(p => p?.isActive(true))) { p.toggleFlyout(pressed); } } diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts index e590bebcf5a..f8ef5fc1ec4 100644 --- a/src/ui/battle-flyout.ts +++ b/src/ui/battle-flyout.ts @@ -1,4 +1,4 @@ -import type { default as Pokemon } from "../field/pokemon"; +import type { EnemyPokemon, default as Pokemon } from "../field/pokemon"; import { addTextObject, TextStyle } from "./text"; import { fixedInt } from "#app/utils/common"; import { globalScene } from "#app/global-scene"; @@ -126,7 +126,7 @@ export default class BattleFlyout extends Phaser.GameObjects.Container { * Links the given {@linkcode Pokemon} and subscribes to the {@linkcode BattleSceneEventType.MOVE_USED} event * @param pokemon {@linkcode Pokemon} to link to this flyout */ - initInfo(pokemon: Pokemon) { + initInfo(pokemon: EnemyPokemon) { this.pokemon = pokemon; this.name = `Flyout ${getPokemonNameWithAffix(this.pokemon)}`; diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts deleted file mode 100644 index 2822e8364ec..00000000000 --- a/src/ui/battle-info.ts +++ /dev/null @@ -1,986 +0,0 @@ -import type { EnemyPokemon, default as Pokemon } from "../field/pokemon"; -import { getLevelTotalExp, getLevelRelExp } from "../data/exp"; -import { getLocalizedSpriteKey, fixedInt } from "#app/utils/common"; -import { addTextObject, TextStyle } from "./text"; -import { getGenderSymbol, getGenderColor, Gender } from "../data/gender"; -import { StatusEffect } from "#enums/status-effect"; -import { globalScene } from "#app/global-scene"; -import { getTypeRgb } from "#app/data/type"; -import { PokemonType } from "#enums/pokemon-type"; -import { getVariantTint } from "#app/sprites/variant"; -import { Stat } from "#enums/stat"; -import BattleFlyout from "./battle-flyout"; -import { WindowVariant, addWindow } from "./ui-theme"; -import i18next from "i18next"; -import { ExpGainsSpeed } from "#app/enums/exp-gains-speed"; - -export default class BattleInfo extends Phaser.GameObjects.Container { - public static readonly EXP_GAINS_DURATION_BASE = 1650; - - private baseY: number; - - private player: boolean; - private mini: boolean; - private boss: boolean; - private bossSegments: number; - private offset: boolean; - private lastName: string | null; - private lastTeraType: PokemonType; - private lastStatus: StatusEffect; - private lastHp: number; - private lastMaxHp: number; - private lastHpFrame: string | null; - private lastExp: number; - private lastLevelExp: number; - private lastLevel: number; - private lastLevelCapped: boolean; - private lastStats: string; - - private box: Phaser.GameObjects.Sprite; - private nameText: Phaser.GameObjects.Text; - private genderText: Phaser.GameObjects.Text; - private ownedIcon: Phaser.GameObjects.Sprite; - private championRibbon: Phaser.GameObjects.Sprite; - private teraIcon: Phaser.GameObjects.Sprite; - private shinyIcon: Phaser.GameObjects.Sprite; - private fusionShinyIcon: Phaser.GameObjects.Sprite; - private splicedIcon: Phaser.GameObjects.Sprite; - private statusIndicator: Phaser.GameObjects.Sprite; - private levelContainer: Phaser.GameObjects.Container; - private hpBar: Phaser.GameObjects.Image; - private hpBarSegmentDividers: Phaser.GameObjects.Rectangle[]; - private levelNumbersContainer: Phaser.GameObjects.Container; - private hpNumbersContainer: Phaser.GameObjects.Container; - private type1Icon: Phaser.GameObjects.Sprite; - private type2Icon: Phaser.GameObjects.Sprite; - private type3Icon: Phaser.GameObjects.Sprite; - private expBar: Phaser.GameObjects.Image; - - // #region Type effectiveness hint objects - private effectivenessContainer: Phaser.GameObjects.Container; - private effectivenessWindow: Phaser.GameObjects.NineSlice; - private effectivenessText: Phaser.GameObjects.Text; - private currentEffectiveness?: string; - // #endregion - - public expMaskRect: Phaser.GameObjects.Graphics; - - private statsContainer: Phaser.GameObjects.Container; - private statsBox: Phaser.GameObjects.Sprite; - private statValuesContainer: Phaser.GameObjects.Container; - private statNumbers: Phaser.GameObjects.Sprite[]; - - public flyoutMenu?: BattleFlyout; - - private statOrder: Stat[]; - private readonly statOrderPlayer = [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD]; - private readonly statOrderEnemy = [Stat.HP, Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD]; - - constructor(x: number, y: number, player: boolean) { - super(globalScene, x, y); - this.baseY = y; - this.player = player; - this.mini = !player; - this.boss = false; - this.offset = false; - this.lastName = null; - this.lastTeraType = PokemonType.UNKNOWN; - this.lastStatus = StatusEffect.NONE; - this.lastHp = -1; - this.lastMaxHp = -1; - this.lastHpFrame = null; - this.lastExp = -1; - this.lastLevelExp = -1; - this.lastLevel = -1; - - // Initially invisible and shown via Pokemon.showInfo - this.setVisible(false); - - this.box = globalScene.add.sprite(0, 0, this.getTextureName()); - this.box.setName("box"); - this.box.setOrigin(1, 0.5); - this.add(this.box); - - this.nameText = addTextObject(player ? -115 : -124, player ? -15.2 : -11.2, "", TextStyle.BATTLE_INFO); - this.nameText.setName("text_name"); - this.nameText.setOrigin(0, 0); - this.add(this.nameText); - - this.genderText = addTextObject(0, 0, "", TextStyle.BATTLE_INFO); - this.genderText.setName("text_gender"); - this.genderText.setOrigin(0, 0); - this.genderText.setPositionRelative(this.nameText, 0, 2); - this.add(this.genderText); - - if (!this.player) { - this.ownedIcon = globalScene.add.sprite(0, 0, "icon_owned"); - this.ownedIcon.setName("icon_owned"); - this.ownedIcon.setVisible(false); - this.ownedIcon.setOrigin(0, 0); - this.ownedIcon.setPositionRelative(this.nameText, 0, 11.75); - this.add(this.ownedIcon); - - this.championRibbon = globalScene.add.sprite(0, 0, "champion_ribbon"); - this.championRibbon.setName("icon_champion_ribbon"); - this.championRibbon.setVisible(false); - this.championRibbon.setOrigin(0, 0); - this.championRibbon.setPositionRelative(this.nameText, 8, 11.75); - this.add(this.championRibbon); - } - - this.teraIcon = globalScene.add.sprite(0, 0, "icon_tera"); - this.teraIcon.setName("icon_tera"); - this.teraIcon.setVisible(false); - this.teraIcon.setOrigin(0, 0); - this.teraIcon.setScale(0.5); - this.teraIcon.setPositionRelative(this.nameText, 0, 2); - this.teraIcon.setInteractive(new Phaser.Geom.Rectangle(0, 0, 12, 15), Phaser.Geom.Rectangle.Contains); - this.add(this.teraIcon); - - this.shinyIcon = globalScene.add.sprite(0, 0, "shiny_star"); - this.shinyIcon.setName("icon_shiny"); - this.shinyIcon.setVisible(false); - this.shinyIcon.setOrigin(0, 0); - this.shinyIcon.setScale(0.5); - this.shinyIcon.setPositionRelative(this.nameText, 0, 2); - this.shinyIcon.setInteractive(new Phaser.Geom.Rectangle(0, 0, 12, 15), Phaser.Geom.Rectangle.Contains); - this.add(this.shinyIcon); - - this.fusionShinyIcon = globalScene.add.sprite(0, 0, "shiny_star_2"); - this.fusionShinyIcon.setName("icon_fusion_shiny"); - this.fusionShinyIcon.setVisible(false); - this.fusionShinyIcon.setOrigin(0, 0); - this.fusionShinyIcon.setScale(0.5); - this.fusionShinyIcon.setPosition(this.shinyIcon.x, this.shinyIcon.y); - this.add(this.fusionShinyIcon); - - this.splicedIcon = globalScene.add.sprite(0, 0, "icon_spliced"); - this.splicedIcon.setName("icon_spliced"); - this.splicedIcon.setVisible(false); - this.splicedIcon.setOrigin(0, 0); - this.splicedIcon.setScale(0.5); - this.splicedIcon.setPositionRelative(this.nameText, 0, 2); - this.splicedIcon.setInteractive(new Phaser.Geom.Rectangle(0, 0, 12, 15), Phaser.Geom.Rectangle.Contains); - this.add(this.splicedIcon); - - this.statusIndicator = globalScene.add.sprite(0, 0, getLocalizedSpriteKey("statuses")); - this.statusIndicator.setName("icon_status"); - this.statusIndicator.setVisible(false); - this.statusIndicator.setOrigin(0, 0); - this.statusIndicator.setPositionRelative(this.nameText, 0, 11.5); - this.add(this.statusIndicator); - - this.levelContainer = globalScene.add.container(player ? -41 : -50, player ? -10 : -5); - this.levelContainer.setName("container_level"); - this.add(this.levelContainer); - - const levelOverlay = globalScene.add.image(0, 0, "overlay_lv"); - this.levelContainer.add(levelOverlay); - - this.hpBar = globalScene.add.image(player ? -61 : -71, player ? -1 : 4.5, "overlay_hp"); - this.hpBar.setName("hp_bar"); - this.hpBar.setOrigin(0); - this.add(this.hpBar); - - this.hpBarSegmentDividers = []; - - this.levelNumbersContainer = globalScene.add.container(9.5, globalScene.uiTheme ? 0 : -0.5); - this.levelNumbersContainer.setName("container_level"); - this.levelContainer.add(this.levelNumbersContainer); - - if (this.player) { - this.hpNumbersContainer = globalScene.add.container(-15, 10); - this.hpNumbersContainer.setName("container_hp"); - this.add(this.hpNumbersContainer); - - const expBar = globalScene.add.image(-98, 18, "overlay_exp"); - expBar.setName("overlay_exp"); - expBar.setOrigin(0); - this.add(expBar); - - const expMaskRect = globalScene.make.graphics({}); - expMaskRect.setScale(6); - expMaskRect.fillStyle(0xffffff); - expMaskRect.beginPath(); - expMaskRect.fillRect(127, 126, 85, 2); - - const expMask = expMaskRect.createGeometryMask(); - - expBar.setMask(expMask); - - this.expBar = expBar; - this.expMaskRect = expMaskRect; - } - - this.statsContainer = globalScene.add.container(0, 0); - this.statsContainer.setName("container_stats"); - this.statsContainer.setAlpha(0); - this.add(this.statsContainer); - - this.statsBox = globalScene.add.sprite(0, 0, `${this.getTextureName()}_stats`); - this.statsBox.setName("box_stats"); - this.statsBox.setOrigin(1, 0.5); - this.statsContainer.add(this.statsBox); - - const statLabels: Phaser.GameObjects.Sprite[] = []; - this.statNumbers = []; - - this.statValuesContainer = globalScene.add.container(0, 0); - this.statsContainer.add(this.statValuesContainer); - - // this gives us a different starting location from the left of the label and padding between stats for a player vs enemy - // since the player won't have HP to show, it doesn't need to change from the current version - const startingX = this.player ? -this.statsBox.width + 8 : -this.statsBox.width + 5; - const paddingX = this.player ? 4 : 2; - const statOverflow = this.player ? 1 : 0; - this.statOrder = this.player ? this.statOrderPlayer : this.statOrderEnemy; // this tells us whether or not to use the player or enemy battle stat order - - this.statOrder.map((s, i) => { - // we do a check for i > statOverflow to see when the stat labels go onto the next column - // For enemies, we have HP (i=0) by itself then a new column, so we check for i > 0 - // For players, we don't have HP, so we start with i = 0 and i = 1 for our first column, and so need to check for i > 1 - const statX = - i > statOverflow - ? this.statNumbers[Math.max(i - 2, 0)].x + this.statNumbers[Math.max(i - 2, 0)].width + paddingX - : startingX; // we have the Math.max(i - 2, 0) in there so for i===1 to not return a negative number; since this is now based on anything >0 instead of >1, we need to allow for i-2 < 0 - - const baseY = -this.statsBox.height / 2 + 4; // this is the baseline for the y-axis - let statY: number; // this will be the y-axis placement for the labels - if (this.statOrder[i] === Stat.SPD || this.statOrder[i] === Stat.HP) { - statY = baseY + 5; - } else { - statY = baseY + (!!(i % 2) === this.player ? 10 : 0); // we compare i % 2 against this.player to tell us where to place the label; because this.battleStatOrder for enemies has HP, this.battleStatOrder[1]=ATK, but for players this.battleStatOrder[0]=ATK, so this comparing i % 2 to this.player fixes this issue for us - } - - const statLabel = globalScene.add.sprite(statX, statY, "pbinfo_stat", Stat[s]); - statLabel.setName("icon_stat_label_" + i.toString()); - statLabel.setOrigin(0, 0); - statLabels.push(statLabel); - this.statValuesContainer.add(statLabel); - - const statNumber = globalScene.add.sprite( - statX + statLabel.width, - statY, - "pbinfo_stat_numbers", - this.statOrder[i] !== Stat.HP ? "3" : "empty", - ); - statNumber.setName("icon_stat_number_" + i.toString()); - statNumber.setOrigin(0, 0); - this.statNumbers.push(statNumber); - this.statValuesContainer.add(statNumber); - - if (this.statOrder[i] === Stat.HP) { - statLabel.setVisible(false); - statNumber.setVisible(false); - } - }); - - if (!this.player) { - this.flyoutMenu = new BattleFlyout(this.player); - this.add(this.flyoutMenu); - - this.moveBelow(this.flyoutMenu, this.box); - } - - this.type1Icon = globalScene.add.sprite( - player ? -139 : -15, - player ? -17 : -15.5, - `pbinfo_${player ? "player" : "enemy"}_type1`, - ); - this.type1Icon.setName("icon_type_1"); - this.type1Icon.setOrigin(0, 0); - this.add(this.type1Icon); - - this.type2Icon = globalScene.add.sprite( - player ? -139 : -15, - player ? -1 : -2.5, - `pbinfo_${player ? "player" : "enemy"}_type2`, - ); - this.type2Icon.setName("icon_type_2"); - this.type2Icon.setOrigin(0, 0); - this.add(this.type2Icon); - - this.type3Icon = globalScene.add.sprite( - player ? -154 : 0, - player ? -17 : -15.5, - `pbinfo_${player ? "player" : "enemy"}_type`, - ); - this.type3Icon.setName("icon_type_3"); - this.type3Icon.setOrigin(0, 0); - this.add(this.type3Icon); - - if (!this.player) { - this.effectivenessContainer = globalScene.add.container(0, 0); - this.effectivenessContainer.setPositionRelative(this.type1Icon, 22, 4); - this.effectivenessContainer.setVisible(false); - this.add(this.effectivenessContainer); - - this.effectivenessText = addTextObject(5, 4.5, "", TextStyle.BATTLE_INFO); - this.effectivenessWindow = addWindow(0, 0, 0, 20, undefined, false, undefined, undefined, WindowVariant.XTHIN); - - this.effectivenessContainer.add(this.effectivenessWindow); - this.effectivenessContainer.add(this.effectivenessText); - } - } - - getStatsValueContainer(): Phaser.GameObjects.Container { - return this.statValuesContainer; - } - - initInfo(pokemon: Pokemon) { - this.updateNameText(pokemon); - const nameTextWidth = this.nameText.displayWidth; - - this.name = pokemon.getNameToRender(); - this.box.name = pokemon.getNameToRender(); - - this.flyoutMenu?.initInfo(pokemon); - - this.genderText.setText(getGenderSymbol(pokemon.gender)); - this.genderText.setColor(getGenderColor(pokemon.gender)); - this.genderText.setPositionRelative(this.nameText, nameTextWidth, 0); - - this.lastTeraType = pokemon.getTeraType(); - - this.teraIcon.setPositionRelative(this.nameText, nameTextWidth + this.genderText.displayWidth + 1, 2); - this.teraIcon.setVisible(pokemon.isTerastallized); - this.teraIcon.on("pointerover", () => { - if (pokemon.isTerastallized) { - globalScene.ui.showTooltip( - "", - i18next.t("fightUiHandler:teraHover", { - type: i18next.t(`pokemonInfo:Type.${PokemonType[this.lastTeraType]}`), - }), - ); - } - }); - this.teraIcon.on("pointerout", () => globalScene.ui.hideTooltip()); - - const isFusion = pokemon.isFusion(true); - - this.splicedIcon.setPositionRelative( - this.nameText, - nameTextWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), - 2.5, - ); - this.splicedIcon.setVisible(isFusion); - if (this.splicedIcon.visible) { - this.splicedIcon.on("pointerover", () => - globalScene.ui.showTooltip( - "", - `${pokemon.species.getName(pokemon.formIndex)}/${pokemon.fusionSpecies?.getName(pokemon.fusionFormIndex)}`, - ), - ); - this.splicedIcon.on("pointerout", () => globalScene.ui.hideTooltip()); - } - - const doubleShiny = isFusion && pokemon.shiny && pokemon.fusionShiny; - const baseVariant = !doubleShiny ? pokemon.getVariant(true) : pokemon.variant; - - this.shinyIcon.setPositionRelative( - this.nameText, - nameTextWidth + - this.genderText.displayWidth + - 1 + - (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + - (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), - 2.5, - ); - this.shinyIcon.setTexture(`shiny_star${doubleShiny ? "_1" : ""}`); - this.shinyIcon.setVisible(pokemon.isShiny()); - this.shinyIcon.setTint(getVariantTint(baseVariant)); - if (this.shinyIcon.visible) { - const shinyDescriptor = - doubleShiny || baseVariant - ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` - : ""; - this.shinyIcon.on("pointerover", () => - globalScene.ui.showTooltip( - "", - `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, - ), - ); - this.shinyIcon.on("pointerout", () => globalScene.ui.hideTooltip()); - } - - this.fusionShinyIcon.setPosition(this.shinyIcon.x, this.shinyIcon.y); - this.fusionShinyIcon.setVisible(doubleShiny); - if (isFusion) { - this.fusionShinyIcon.setTint(getVariantTint(pokemon.fusionVariant)); - } - - if (!this.player) { - if (this.nameText.visible) { - this.nameText.on("pointerover", () => - globalScene.ui.showTooltip( - "", - i18next.t("battleInfo:generation", { - generation: i18next.t(`starterSelectUiHandler:gen${pokemon.species.generation}`), - }), - ), - ); - this.nameText.on("pointerout", () => globalScene.ui.hideTooltip()); - } - - const dexEntry = globalScene.gameData.dexData[pokemon.species.speciesId]; - this.ownedIcon.setVisible(!!dexEntry.caughtAttr); - const opponentPokemonDexAttr = pokemon.getDexAttr(); - if (globalScene.gameMode.isClassic) { - if ( - globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].classicWinCount > 0 && - globalScene.gameData.starterData[pokemon.species.getRootSpeciesId(true)].classicWinCount > 0 - ) { - this.championRibbon.setVisible(true); - } - } - - // Check if Player owns all genders and forms of the Pokemon - const missingDexAttrs = (dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr; - - const ownedAbilityAttrs = globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr; - - // Check if the player owns ability for the root form - const playerOwnsThisAbility = pokemon.checkIfPlayerHasAbilityOfStarter(ownedAbilityAttrs); - - if (missingDexAttrs || !playerOwnsThisAbility) { - this.ownedIcon.setTint(0x808080); - } - - if (this.boss) { - this.updateBossSegmentDividers(pokemon as EnemyPokemon); - } - } - - this.hpBar.setScale(pokemon.getHpRatio(true), 1); - this.lastHpFrame = this.hpBar.scaleX > 0.5 ? "high" : this.hpBar.scaleX > 0.25 ? "medium" : "low"; - this.hpBar.setFrame(this.lastHpFrame); - if (this.player) { - this.setHpNumbers(pokemon.hp, pokemon.getMaxHp()); - } - this.lastHp = pokemon.hp; - this.lastMaxHp = pokemon.getMaxHp(); - - this.setLevel(pokemon.level); - this.lastLevel = pokemon.level; - - this.shinyIcon.setVisible(pokemon.isShiny()); - - const types = pokemon.getTypes(true, false, undefined, true); - this.type1Icon.setTexture(`pbinfo_${this.player ? "player" : "enemy"}_type${types.length > 1 ? "1" : ""}`); - this.type1Icon.setFrame(PokemonType[types[0]].toLowerCase()); - this.type2Icon.setVisible(types.length > 1); - this.type3Icon.setVisible(types.length > 2); - if (types.length > 1) { - this.type2Icon.setFrame(PokemonType[types[1]].toLowerCase()); - } - if (types.length > 2) { - this.type3Icon.setFrame(PokemonType[types[2]].toLowerCase()); - } - - if (this.player) { - this.expMaskRect.x = (pokemon.levelExp / getLevelTotalExp(pokemon.level, pokemon.species.growthRate)) * 510; - this.lastExp = pokemon.exp; - this.lastLevelExp = pokemon.levelExp; - - this.statValuesContainer.setPosition(8, 7); - } - - const stats = this.statOrder.map(() => 0); - - this.lastStats = stats.join(""); - this.updateStats(stats); - } - - getTextureName(): string { - return `pbinfo_${this.player ? "player" : "enemy"}${!this.player && this.boss ? "_boss" : this.mini ? "_mini" : ""}`; - } - - setMini(mini: boolean): void { - if (this.mini === mini) { - return; - } - - this.mini = mini; - - this.box.setTexture(this.getTextureName()); - this.statsBox.setTexture(`${this.getTextureName()}_stats`); - - if (this.player) { - this.y -= 12 * (mini ? 1 : -1); - this.baseY = this.y; - } - - const offsetElements = [ - this.nameText, - this.genderText, - this.teraIcon, - this.splicedIcon, - this.shinyIcon, - this.statusIndicator, - this.levelContainer, - ]; - offsetElements.forEach(el => (el.y += 1.5 * (mini ? -1 : 1))); - - [this.type1Icon, this.type2Icon, this.type3Icon].forEach(el => { - el.x += 4 * (mini ? 1 : -1); - el.y += -8 * (mini ? 1 : -1); - }); - - this.statValuesContainer.x += 2 * (mini ? 1 : -1); - this.statValuesContainer.y += -7 * (mini ? 1 : -1); - - const toggledElements = [this.hpNumbersContainer, this.expBar]; - toggledElements.forEach(el => el.setVisible(!mini)); - } - - toggleStats(visible: boolean): void { - globalScene.tweens.add({ - targets: this.statsContainer, - duration: fixedInt(125), - ease: "Sine.easeInOut", - alpha: visible ? 1 : 0, - }); - } - - updateBossSegments(pokemon: EnemyPokemon): void { - const boss = !!pokemon.bossSegments; - - if (boss !== this.boss) { - this.boss = boss; - - [ - this.nameText, - this.genderText, - this.teraIcon, - this.splicedIcon, - this.shinyIcon, - this.ownedIcon, - this.championRibbon, - this.statusIndicator, - this.statValuesContainer, - ].map(e => (e.x += 48 * (boss ? -1 : 1))); - this.hpBar.x += 38 * (boss ? -1 : 1); - this.hpBar.y += 2 * (this.boss ? -1 : 1); - this.levelContainer.x += 2 * (boss ? -1 : 1); - this.hpBar.setTexture(`overlay_hp${boss ? "_boss" : ""}`); - this.box.setTexture(this.getTextureName()); - this.statsBox.setTexture(`${this.getTextureName()}_stats`); - } - - this.bossSegments = boss ? pokemon.bossSegments : 0; - this.updateBossSegmentDividers(pokemon); - } - - updateBossSegmentDividers(pokemon: EnemyPokemon): void { - while (this.hpBarSegmentDividers.length) { - this.hpBarSegmentDividers.pop()?.destroy(); - } - - if (this.boss && this.bossSegments > 1) { - const uiTheme = globalScene.uiTheme; - const maxHp = pokemon.getMaxHp(); - for (let s = 1; s < this.bossSegments; s++) { - const dividerX = (Math.round((maxHp / this.bossSegments) * s) / maxHp) * this.hpBar.width; - const divider = globalScene.add.rectangle( - 0, - 0, - 1, - this.hpBar.height - (uiTheme ? 0 : 1), - pokemon.bossSegmentIndex >= s ? 0xffffff : 0x404040, - ); - divider.setOrigin(0.5, 0); - divider.setName("hpBar_divider_" + s.toString()); - this.add(divider); - this.moveBelow(divider as Phaser.GameObjects.GameObject, this.statsContainer); - - divider.setPositionRelative(this.hpBar, dividerX, uiTheme ? 0 : 1); - this.hpBarSegmentDividers.push(divider); - } - } - } - - setOffset(offset: boolean): void { - if (this.offset === offset) { - return; - } - - this.offset = offset; - - this.x += 10 * (this.offset === this.player ? 1 : -1); - this.y += 27 * (this.offset ? 1 : -1); - this.baseY = this.y; - } - - updateInfo(pokemon: Pokemon, instant?: boolean): Promise { - return new Promise(resolve => { - if (!globalScene) { - return resolve(); - } - - const gender = pokemon.summonData.illusion?.gender ?? pokemon.gender; - - this.genderText.setText(getGenderSymbol(gender)); - this.genderText.setColor(getGenderColor(gender)); - - const nameUpdated = this.lastName !== pokemon.getNameToRender(); - - if (nameUpdated) { - this.updateNameText(pokemon); - this.genderText.setPositionRelative(this.nameText, this.nameText.displayWidth, 0); - } - - const teraType = pokemon.isTerastallized ? pokemon.getTeraType() : PokemonType.UNKNOWN; - const teraTypeUpdated = this.lastTeraType !== teraType; - - if (teraTypeUpdated) { - this.teraIcon.setVisible(teraType !== PokemonType.UNKNOWN); - this.teraIcon.setPositionRelative( - this.nameText, - this.nameText.displayWidth + this.genderText.displayWidth + 1, - 2, - ); - this.teraIcon.setTintFill(Phaser.Display.Color.GetColor(...getTypeRgb(teraType))); - this.lastTeraType = teraType; - } - - const isFusion = pokemon.isFusion(true); - - if (nameUpdated || teraTypeUpdated) { - this.splicedIcon.setVisible(isFusion); - - this.teraIcon.setPositionRelative( - this.nameText, - this.nameText.displayWidth + this.genderText.displayWidth + 1, - 2, - ); - this.splicedIcon.setPositionRelative( - this.nameText, - this.nameText.displayWidth + - this.genderText.displayWidth + - 1 + - (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), - 1.5, - ); - this.shinyIcon.setPositionRelative( - this.nameText, - this.nameText.displayWidth + - this.genderText.displayWidth + - 1 + - (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + - (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), - 2.5, - ); - } - - if (this.lastStatus !== (pokemon.status?.effect || StatusEffect.NONE)) { - this.lastStatus = pokemon.status?.effect || StatusEffect.NONE; - - if (this.lastStatus !== StatusEffect.NONE) { - this.statusIndicator.setFrame(StatusEffect[this.lastStatus].toLowerCase()); - } - - const offsetX = !this.player ? (this.ownedIcon.visible ? 8 : 0) + (this.championRibbon.visible ? 8 : 0) : 0; - this.statusIndicator.setPositionRelative(this.nameText, offsetX, 11.5); - - this.statusIndicator.setVisible(!!this.lastStatus); - } - - const types = pokemon.getTypes(true, false, undefined, true); - this.type1Icon.setTexture(`pbinfo_${this.player ? "player" : "enemy"}_type${types.length > 1 ? "1" : ""}`); - this.type1Icon.setFrame(PokemonType[types[0]].toLowerCase()); - this.type2Icon.setVisible(types.length > 1); - this.type3Icon.setVisible(types.length > 2); - if (types.length > 1) { - this.type2Icon.setFrame(PokemonType[types[1]].toLowerCase()); - } - if (types.length > 2) { - this.type3Icon.setFrame(PokemonType[types[2]].toLowerCase()); - } - - const updateHpFrame = () => { - const hpFrame = this.hpBar.scaleX > 0.5 ? "high" : this.hpBar.scaleX > 0.25 ? "medium" : "low"; - if (hpFrame !== this.lastHpFrame) { - this.hpBar.setFrame(hpFrame); - this.lastHpFrame = hpFrame; - } - }; - - const updatePokemonHp = () => { - let duration = !instant ? Phaser.Math.Clamp(Math.abs(this.lastHp - pokemon.hp) * 5, 250, 5000) : 0; - const speed = globalScene.hpBarSpeed; - if (speed) { - duration = speed >= 3 ? 0 : duration / Math.pow(2, speed); - } - globalScene.tweens.add({ - targets: this.hpBar, - ease: "Sine.easeOut", - scaleX: pokemon.getHpRatio(true), - duration: duration, - onUpdate: () => { - if (this.player && this.lastHp !== pokemon.hp) { - const tweenHp = Math.ceil(this.hpBar.scaleX * pokemon.getMaxHp()); - this.setHpNumbers(tweenHp, pokemon.getMaxHp()); - this.lastHp = tweenHp; - } - - updateHpFrame(); - }, - onComplete: () => { - updateHpFrame(); - // If, after tweening, the hp is different from the original (due to rounding), force the hp number display - // to update to the correct value. - if (this.player && this.lastHp !== pokemon.hp) { - this.setHpNumbers(pokemon.hp, pokemon.getMaxHp()); - this.lastHp = pokemon.hp; - } - resolve(); - }, - }); - if (!this.player) { - this.lastHp = pokemon.hp; - } - this.lastMaxHp = pokemon.getMaxHp(); - }; - - if (this.player) { - const isLevelCapped = pokemon.level >= globalScene.getMaxExpLevel(); - - if (this.lastExp !== pokemon.exp || this.lastLevel !== pokemon.level) { - const originalResolve = resolve; - const durationMultipler = Math.max( - Phaser.Tweens.Builders.GetEaseFunction("Cubic.easeIn")( - 1 - Math.min(pokemon.level - this.lastLevel, 10) / 10, - ), - 0.1, - ); - resolve = () => this.updatePokemonExp(pokemon, false, durationMultipler).then(() => originalResolve()); - } else if (isLevelCapped !== this.lastLevelCapped) { - this.setLevel(pokemon.level); - } - - this.lastLevelCapped = isLevelCapped; - } - - if (this.lastHp !== pokemon.hp || this.lastMaxHp !== pokemon.getMaxHp()) { - return updatePokemonHp(); - } - if (!this.player && this.lastLevel !== pokemon.level) { - this.setLevel(pokemon.level); - this.lastLevel = pokemon.level; - } - - const stats = pokemon.getStatStages(); - const statsStr = stats.join(""); - - if (this.lastStats !== statsStr) { - this.updateStats(stats); - this.lastStats = statsStr; - } - - this.shinyIcon.setVisible(pokemon.isShiny(true)); - - const doubleShiny = isFusion && pokemon.shiny && pokemon.fusionShiny; - const baseVariant = !doubleShiny ? pokemon.getVariant(true) : pokemon.variant; - this.shinyIcon.setTint(getVariantTint(baseVariant)); - - this.fusionShinyIcon.setVisible(doubleShiny); - if (isFusion) { - this.fusionShinyIcon.setTint(getVariantTint(pokemon.fusionVariant)); - } - this.fusionShinyIcon.setPosition(this.shinyIcon.x, this.shinyIcon.y); - - resolve(); - }); - } - - updateNameText(pokemon: Pokemon): void { - let displayName = pokemon.getNameToRender().replace(/[♂♀]/g, ""); - let nameTextWidth: number; - - const nameSizeTest = addTextObject(0, 0, displayName, TextStyle.BATTLE_INFO); - nameTextWidth = nameSizeTest.displayWidth; - - const gender = pokemon.summonData.illusion?.gender ?? pokemon.gender; - while ( - nameTextWidth > - (this.player || !this.boss ? 60 : 98) - - ((gender !== Gender.GENDERLESS ? 6 : 0) + - (pokemon.fusionSpecies ? 8 : 0) + - (pokemon.isShiny() ? 8 : 0) + - (Math.min(pokemon.level.toString().length, 3) - 3) * 8) - ) { - displayName = `${displayName.slice(0, displayName.endsWith(".") ? -2 : -1).trimEnd()}.`; - nameSizeTest.setText(displayName); - nameTextWidth = nameSizeTest.displayWidth; - } - - nameSizeTest.destroy(); - - this.nameText.setText(displayName); - this.lastName = pokemon.getNameToRender(); - - if (this.nameText.visible) { - this.nameText.setInteractive( - new Phaser.Geom.Rectangle(0, 0, this.nameText.width, this.nameText.height), - Phaser.Geom.Rectangle.Contains, - ); - } - } - - updatePokemonExp(pokemon: Pokemon, instant?: boolean, levelDurationMultiplier = 1): Promise { - return new Promise(resolve => { - const levelUp = this.lastLevel < pokemon.level; - const relLevelExp = getLevelRelExp(this.lastLevel + 1, pokemon.species.growthRate); - const levelExp = levelUp ? relLevelExp : pokemon.levelExp; - let ratio = relLevelExp ? levelExp / relLevelExp : 0; - if (this.lastLevel >= globalScene.getMaxExpLevel(true)) { - if (levelUp) { - ratio = 1; - } else { - ratio = 0; - } - instant = true; - } - const durationMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")( - 1 - Math.max(this.lastLevel - 100, 0) / 150, - ); - let duration = - this.visible && !instant - ? ((levelExp - this.lastLevelExp) / relLevelExp) * - BattleInfo.EXP_GAINS_DURATION_BASE * - durationMultiplier * - levelDurationMultiplier - : 0; - const speed = globalScene.expGainsSpeed; - if (speed && speed >= ExpGainsSpeed.DEFAULT) { - duration = speed >= ExpGainsSpeed.SKIP ? ExpGainsSpeed.DEFAULT : duration / Math.pow(2, speed); - } - if (ratio === 1) { - this.lastLevelExp = 0; - this.lastLevel++; - } else { - this.lastExp = pokemon.exp; - this.lastLevelExp = pokemon.levelExp; - } - if (duration) { - globalScene.playSound("se/exp"); - } - globalScene.tweens.add({ - targets: this.expMaskRect, - ease: "Sine.easeIn", - x: ratio * 510, - duration: duration, - onComplete: () => { - if (!globalScene) { - return resolve(); - } - if (duration) { - globalScene.sound.stopByKey("se/exp"); - } - if (ratio === 1) { - globalScene.playSound("se/level_up"); - this.setLevel(this.lastLevel); - globalScene.time.delayedCall(500 * levelDurationMultiplier, () => { - this.expMaskRect.x = 0; - this.updateInfo(pokemon, instant).then(() => resolve()); - }); - return; - } - resolve(); - }, - }); - }); - } - - setLevel(level: number): void { - const isCapped = level >= globalScene.getMaxExpLevel(); - this.levelNumbersContainer.removeAll(true); - const levelStr = level.toString(); - for (let i = 0; i < levelStr.length; i++) { - this.levelNumbersContainer.add( - globalScene.add.image(i * 8, 0, `numbers${isCapped && this.player ? "_red" : ""}`, levelStr[i]), - ); - } - this.levelContainer.setX((this.player ? -41 : -50) - 8 * Math.max(levelStr.length - 3, 0)); - } - - setHpNumbers(hp: number, maxHp: number): void { - if (!this.player || !globalScene) { - return; - } - this.hpNumbersContainer.removeAll(true); - const hpStr = hp.toString(); - const maxHpStr = maxHp.toString(); - let offset = 0; - for (let i = maxHpStr.length - 1; i >= 0; i--) { - this.hpNumbersContainer.add(globalScene.add.image(offset++ * -8, 0, "numbers", maxHpStr[i])); - } - this.hpNumbersContainer.add(globalScene.add.image(offset++ * -8, 0, "numbers", "/")); - for (let i = hpStr.length - 1; i >= 0; i--) { - this.hpNumbersContainer.add(globalScene.add.image(offset++ * -8, 0, "numbers", hpStr[i])); - } - } - - updateStats(stats: number[]): void { - this.statOrder.map((s, i) => { - if (s !== Stat.HP) { - this.statNumbers[i].setFrame(stats[s - 1].toString()); - } - }); - } - - /** - * Request the flyoutMenu to toggle if available and hides or shows the effectiveness window where necessary - */ - toggleFlyout(visible: boolean): void { - this.flyoutMenu?.toggleFlyout(visible); - - if (visible) { - this.effectivenessContainer?.setVisible(false); - } else { - this.updateEffectiveness(this.currentEffectiveness); - } - } - - /** - * Show or hide the type effectiveness multiplier window - * Passing undefined will hide the window - */ - updateEffectiveness(effectiveness?: string) { - if (this.player) { - return; - } - this.currentEffectiveness = effectiveness; - - if (!globalScene.typeHints || effectiveness === undefined || this.flyoutMenu?.flyoutVisible) { - this.effectivenessContainer.setVisible(false); - return; - } - - this.effectivenessText.setText(effectiveness); - this.effectivenessWindow.width = 10 + this.effectivenessText.displayWidth; - this.effectivenessContainer.setVisible(true); - } - - getBaseY(): number { - return this.baseY; - } - - resetY(): void { - this.y = this.baseY; - } -} - -export class PlayerBattleInfo extends BattleInfo { - constructor() { - super(Math.floor(globalScene.game.canvas.width / 6) - 10, -72, true); - } -} - -export class EnemyBattleInfo extends BattleInfo { - constructor() { - super(140, -141, false); - } - - setMini(_mini: boolean): void {} // Always mini -} diff --git a/src/ui/battle-info/battle-info.ts b/src/ui/battle-info/battle-info.ts new file mode 100644 index 00000000000..71596bf0f43 --- /dev/null +++ b/src/ui/battle-info/battle-info.ts @@ -0,0 +1,688 @@ +import type { default as Pokemon } from "../../field/pokemon"; +import { getLocalizedSpriteKey, fixedInt, getShinyDescriptor } from "#app/utils/common"; +import { addTextObject, TextStyle } from "../text"; +import { getGenderSymbol, getGenderColor, Gender } from "../../data/gender"; +import { StatusEffect } from "#enums/status-effect"; +import { globalScene } from "#app/global-scene"; +import { getTypeRgb } from "#app/data/type"; +import { PokemonType } from "#enums/pokemon-type"; +import { getVariantTint } from "#app/sprites/variant"; +import { Stat } from "#enums/stat"; +import i18next from "i18next"; + +/** + * Parameters influencing the position of elements within the battle info container + */ +export type BattleInfoParamList = { + /** X offset for the name text*/ + nameTextX: number; + /** Y offset for the name text */ + nameTextY: number; + /** X offset for the level container */ + levelContainerX: number; + /** Y offset for the level container */ + levelContainerY: number; + /** X offset for the hp bar */ + hpBarX: number; + /** Y offset for the hp bar */ + hpBarY: number; + /** Parameters for the stat box container */ + statBox: { + /** The starting offset from the left of the label for the entries in the stat box */ + xOffset: number; + /** The X padding between each number column */ + paddingX: number; + /** The index of the stat entries at which paddingX is used instead of startingX */ + statOverflow: number; + }; +}; + +export default abstract class BattleInfo extends Phaser.GameObjects.Container { + public static readonly EXP_GAINS_DURATION_BASE = 1650; + + protected baseY: number; + protected baseLvContainerX: number; + + protected player: boolean; + protected mini: boolean; + protected boss: boolean; + protected bossSegments: number; + protected offset: boolean; + protected lastName: string | null; + protected lastTeraType: PokemonType; + protected lastStatus: StatusEffect; + protected lastHp: number; + protected lastMaxHp: number; + protected lastHpFrame: string | null; + protected lastExp: number; + protected lastLevelExp: number; + protected lastLevel: number; + protected lastLevelCapped: boolean; + protected lastStats: string; + + protected box: Phaser.GameObjects.Sprite; + protected nameText: Phaser.GameObjects.Text; + protected genderText: Phaser.GameObjects.Text; + protected teraIcon: Phaser.GameObjects.Sprite; + protected shinyIcon: Phaser.GameObjects.Sprite; + protected fusionShinyIcon: Phaser.GameObjects.Sprite; + protected splicedIcon: Phaser.GameObjects.Sprite; + protected statusIndicator: Phaser.GameObjects.Sprite; + protected levelContainer: Phaser.GameObjects.Container; + protected hpBar: Phaser.GameObjects.Image; + protected levelNumbersContainer: Phaser.GameObjects.Container; + protected type1Icon: Phaser.GameObjects.Sprite; + protected type2Icon: Phaser.GameObjects.Sprite; + protected type3Icon: Phaser.GameObjects.Sprite; + protected expBar: Phaser.GameObjects.Image; + + public expMaskRect: Phaser.GameObjects.Graphics; + + protected statsContainer: Phaser.GameObjects.Container; + protected statsBox: Phaser.GameObjects.Sprite; + protected statValuesContainer: Phaser.GameObjects.Container; + protected statNumbers: Phaser.GameObjects.Sprite[]; + + get statOrder(): Stat[] { + return []; + } + + /** Helper method used by the constructor to create the tera and shiny icons next to the name */ + private constructIcons() { + const hitArea = new Phaser.Geom.Rectangle(0, 0, 12, 15); + const hitCallback = Phaser.Geom.Rectangle.Contains; + + this.teraIcon = globalScene.add + .sprite(0, 0, "icon_tera") + .setName("icon_tera") + .setVisible(false) + .setOrigin(0) + .setScale(0.5) + .setInteractive(hitArea, hitCallback) + .setPositionRelative(this.nameText, 0, 2); + + this.shinyIcon = globalScene.add + .sprite(0, 0, "shiny_star") + .setName("icon_shiny") + .setVisible(false) + .setOrigin(0) + .setScale(0.5) + .setInteractive(hitArea, hitCallback) + .setPositionRelative(this.nameText, 0, 2); + + this.fusionShinyIcon = globalScene.add + .sprite(0, 0, "shiny_star_2") + .setName("icon_fusion_shiny") + .setVisible(false) + .setOrigin(0) + .setScale(0.5) + .copyPosition(this.shinyIcon); + + this.splicedIcon = globalScene.add + .sprite(0, 0, "icon_spliced") + .setName("icon_spliced") + .setVisible(false) + .setOrigin(0) + .setScale(0.5) + .setInteractive(hitArea, hitCallback) + .setPositionRelative(this.nameText, 0, 2); + + this.add([this.teraIcon, this.shinyIcon, this.fusionShinyIcon, this.splicedIcon]); + } + + /** + * Submethod of the constructor that creates and adds the stats container to the battle info + */ + protected constructStatContainer({ xOffset, paddingX, statOverflow }: BattleInfoParamList["statBox"]): void { + this.statsContainer = globalScene.add.container(0, 0).setName("container_stats").setAlpha(0); + this.add(this.statsContainer); + + this.statsBox = globalScene.add + .sprite(0, 0, `${this.getTextureName()}_stats`) + .setName("box_stats") + .setOrigin(1, 0.5); + this.statsContainer.add(this.statsBox); + + const statLabels: Phaser.GameObjects.Sprite[] = []; + this.statNumbers = []; + + this.statValuesContainer = globalScene.add.container(); + this.statsContainer.add(this.statValuesContainer); + + const startingX = -this.statsBox.width + xOffset; + + // this gives us a different starting location from the left of the label and padding between stats for a player vs enemy + // since the player won't have HP to show, it doesn't need to change from the current version + + for (const [i, s] of this.statOrder.entries()) { + const isHp = s === Stat.HP; + // we do a check for i > statOverflow to see when the stat labels go onto the next column + // For enemies, we have HP (i=0) by itself then a new column, so we check for i > 0 + // For players, we don't have HP, so we start with i = 0 and i = 1 for our first column, and so need to check for i > 1 + const statX = + i > statOverflow + ? this.statNumbers[Math.max(i - 2, 0)].x + this.statNumbers[Math.max(i - 2, 0)].width + paddingX + : startingX; // we have the Math.max(i - 2, 0) in there so for i===1 to not return a negative number; since this is now based on anything >0 instead of >1, we need to allow for i-2 < 0 + + let statY = -this.statsBox.height / 2 + 4; // this is the baseline for the y-axis + if (isHp || s === Stat.SPD) { + statY += 5; + } else if (this.player === !!(i % 2)) { + // we compare i % 2 against this.player to tell us where to place the label + // because this.battleStatOrder for enemies has HP, this.battleStatOrder[1]=ATK, but for players + // this.battleStatOrder[0]=ATK, so this comparing i % 2 to this.player fixes this issue for us + statY += 10; + } + + const statLabel = globalScene.add + .sprite(statX, statY, "pbinfo_stat", Stat[s]) + .setName("icon_stat_label_" + i.toString()) + .setOrigin(0); + statLabels.push(statLabel); + this.statValuesContainer.add(statLabel); + + const statNumber = globalScene.add + .sprite(statX + statLabel.width, statY, "pbinfo_stat_numbers", !isHp ? "3" : "empty") + .setName("icon_stat_number_" + i.toString()) + .setOrigin(0); + this.statNumbers.push(statNumber); + this.statValuesContainer.add(statNumber); + + if (isHp) { + statLabel.setVisible(false); + statNumber.setVisible(false); + } + } + } + + /** + * Submethod of the constructor that creates and adds the pokemon type icons to the battle info + */ + protected abstract constructTypeIcons(): void; + + /** + * @param x - The x position of the battle info container + * @param y - The y position of the battle info container + * @param player - Whether this battle info belongs to a player or an enemy + * @param posParams - The parameters influencing the position of elements within the battle info container + */ + constructor(x: number, y: number, player: boolean, posParams: BattleInfoParamList) { + super(globalScene, x, y); + this.baseY = y; + this.player = player; + this.mini = !player; + this.boss = false; + this.offset = false; + this.lastName = null; + this.lastTeraType = PokemonType.UNKNOWN; + this.lastStatus = StatusEffect.NONE; + this.lastHp = -1; + this.lastMaxHp = -1; + this.lastHpFrame = null; + this.lastExp = -1; + this.lastLevelExp = -1; + this.lastLevel = -1; + this.baseLvContainerX = posParams.levelContainerX; + + // Initially invisible and shown via Pokemon.showInfo + this.setVisible(false); + + this.box = globalScene.add.sprite(0, 0, this.getTextureName()).setName("box").setOrigin(1, 0.5); + this.add(this.box); + + this.nameText = addTextObject(player ? -115 : -124, player ? -15.2 : -11.2, "", TextStyle.BATTLE_INFO) + .setName("text_name") + .setOrigin(0); + this.add(this.nameText); + + this.genderText = addTextObject(0, 0, "", TextStyle.BATTLE_INFO) + .setName("text_gender") + .setOrigin(0) + .setPositionRelative(this.nameText, 0, 2); + this.add(this.genderText); + + this.constructIcons(); + + this.statusIndicator = globalScene.add + .sprite(0, 0, getLocalizedSpriteKey("statuses")) + .setName("icon_status") + .setVisible(false) + .setOrigin(0) + .setPositionRelative(this.nameText, 0, 11.5); + this.add(this.statusIndicator); + + this.levelContainer = globalScene.add + .container(posParams.levelContainerX, posParams.levelContainerY) + .setName("container_level"); + this.add(this.levelContainer); + + const levelOverlay = globalScene.add.image(0, 0, "overlay_lv"); + this.levelContainer.add(levelOverlay); + + this.hpBar = globalScene.add.image(posParams.hpBarX, posParams.hpBarY, "overlay_hp").setName("hp_bar").setOrigin(0); + this.add(this.hpBar); + + this.levelNumbersContainer = globalScene.add + .container(9.5, globalScene.uiTheme ? 0 : -0.5) + .setName("container_level"); + this.levelContainer.add(this.levelNumbersContainer); + + this.constructStatContainer(posParams.statBox); + + this.constructTypeIcons(); + } + + getStatsValueContainer(): Phaser.GameObjects.Container { + return this.statValuesContainer; + } + + //#region Initialization methods + + initSplicedIcon(pokemon: Pokemon, baseWidth: number) { + this.splicedIcon.setPositionRelative( + this.nameText, + baseWidth + this.genderText.displayWidth + 1 + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), + 2.5, + ); + this.splicedIcon.setVisible(pokemon.isFusion(true)); + if (!this.splicedIcon.visible) { + return; + } + this.splicedIcon + .on("pointerover", () => + globalScene.ui.showTooltip( + "", + `${pokemon.species.getName(pokemon.formIndex)}/${pokemon.fusionSpecies?.getName(pokemon.fusionFormIndex)}`, + ), + ) + .on("pointerout", () => globalScene.ui.hideTooltip()); + } + + /** + * Called by {@linkcode initInfo} to initialize the shiny icon + * @param pokemon - The pokemon object attached to this battle info + * @param baseXOffset - The x offset to use for the shiny icon + * @param doubleShiny - Whether the pokemon is shiny and its fusion species is also shiny + */ + protected initShinyIcon(pokemon: Pokemon, xOffset: number, doubleShiny: boolean) { + const baseVariant = !doubleShiny ? pokemon.getVariant(true) : pokemon.variant; + + this.shinyIcon.setPositionRelative( + this.nameText, + xOffset + + this.genderText.displayWidth + + 1 + + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), + 2.5, + ); + this.shinyIcon + .setTexture(`shiny_star${doubleShiny ? "_1" : ""}`) + .setVisible(pokemon.isShiny()) + .setTint(getVariantTint(baseVariant)); + + if (!this.shinyIcon.visible) { + return; + } + + let shinyDescriptor = ""; + if (doubleShiny || baseVariant) { + shinyDescriptor = " (" + getShinyDescriptor(baseVariant); + if (doubleShiny) { + shinyDescriptor += "/" + getShinyDescriptor(pokemon.fusionVariant); + } + shinyDescriptor += ")"; + } + + this.shinyIcon + .on("pointerover", () => globalScene.ui.showTooltip("", i18next.t("common:shinyOnHover") + shinyDescriptor)) + .on("pointerout", () => globalScene.ui.hideTooltip()); + } + + initInfo(pokemon: Pokemon) { + this.updateNameText(pokemon); + const nameTextWidth = this.nameText.displayWidth; + + this.name = pokemon.getNameToRender(); + this.box.name = pokemon.getNameToRender(); + + this.genderText + .setText(getGenderSymbol(pokemon.gender)) + .setColor(getGenderColor(pokemon.gender)) + .setPositionRelative(this.nameText, nameTextWidth, 0); + + this.lastTeraType = pokemon.getTeraType(); + + this.teraIcon + .setVisible(pokemon.isTerastallized) + .on("pointerover", () => { + if (pokemon.isTerastallized) { + globalScene.ui.showTooltip( + "", + i18next.t("fightUiHandler:teraHover", { + type: i18next.t(`pokemonInfo:Type.${PokemonType[this.lastTeraType]}`), + }), + ); + } + }) + .on("pointerout", () => globalScene.ui.hideTooltip()) + .setPositionRelative(this.nameText, nameTextWidth + this.genderText.displayWidth + 1, 2); + + const isFusion = pokemon.isFusion(true); + this.initSplicedIcon(pokemon, nameTextWidth); + + const doubleShiny = isFusion && pokemon.shiny && pokemon.fusionShiny; + this.initShinyIcon(pokemon, nameTextWidth, doubleShiny); + + this.fusionShinyIcon.setVisible(doubleShiny).copyPosition(this.shinyIcon); + if (isFusion) { + this.fusionShinyIcon.setTint(getVariantTint(pokemon.fusionVariant)); + } + + this.hpBar.setScale(pokemon.getHpRatio(true), 1); + this.lastHpFrame = this.hpBar.scaleX > 0.5 ? "high" : this.hpBar.scaleX > 0.25 ? "medium" : "low"; + this.hpBar.setFrame(this.lastHpFrame); + this.lastHp = pokemon.hp; + this.lastMaxHp = pokemon.getMaxHp(); + + this.setLevel(pokemon.level); + this.lastLevel = pokemon.level; + + this.shinyIcon.setVisible(pokemon.isShiny()); + + this.setTypes(pokemon.getTypes(true, false, undefined, true)); + + const stats = this.statOrder.map(() => 0); + + this.lastStats = stats.join(""); + this.updateStats(stats); + } + //#endregion + + /** + * Return the texture name of the battle info box + */ + abstract getTextureName(): string; + + setMini(_mini: boolean): void {} + + toggleStats(visible: boolean): void { + globalScene.tweens.add({ + targets: this.statsContainer, + duration: fixedInt(125), + ease: "Sine.easeInOut", + alpha: visible ? 1 : 0, + }); + } + + setOffset(offset: boolean): void { + if (this.offset === offset) { + return; + } + + this.offset = offset; + + this.x += 10 * (this.offset === this.player ? 1 : -1); + this.y += 27 * (this.offset ? 1 : -1); + this.baseY = this.y; + } + + //#region Update methods and helpers + + /** + * Update the status icon to match the pokemon's current status + * @param pokemon - The pokemon object attached to this battle info + * @param xOffset - The offset from the name text + */ + updateStatusIcon(pokemon: Pokemon, xOffset = 0) { + if (this.lastStatus !== (pokemon.status?.effect || StatusEffect.NONE)) { + this.lastStatus = pokemon.status?.effect || StatusEffect.NONE; + + if (this.lastStatus !== StatusEffect.NONE) { + this.statusIndicator.setFrame(StatusEffect[this.lastStatus].toLowerCase()); + } + + this.statusIndicator.setVisible(!!this.lastStatus).setPositionRelative(this.nameText, xOffset, 11.5); + } + } + + /** Update the pokemon name inside the container */ + protected updateName(name: string): boolean { + if (this.lastName === name) { + return false; + } + this.nameText.setText(name).setPositionRelative(this.box, -this.nameText.displayWidth, 0); + this.lastName = name; + + return true; + } + + protected updateTeraType(ty: PokemonType): boolean { + if (this.lastTeraType === ty) { + return false; + } + + this.teraIcon + .setVisible(ty !== PokemonType.UNKNOWN) + .setTintFill(Phaser.Display.Color.GetColor(...getTypeRgb(ty))) + .setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1, 2); + this.lastTeraType = ty; + + return true; + } + + /** + * Update the type icons to match the pokemon's types + */ + setTypes(types: PokemonType[]): void { + this.type1Icon + .setTexture(`pbinfo_${this.player ? "player" : "enemy"}_type${types.length > 1 ? "1" : ""}`) + .setFrame(PokemonType[types[0]].toLowerCase()); + this.type2Icon.setVisible(types.length > 1); + this.type3Icon.setVisible(types.length > 2); + if (types.length > 1) { + this.type2Icon.setFrame(PokemonType[types[1]].toLowerCase()); + } + if (types.length > 2) { + this.type3Icon.setFrame(PokemonType[types[2]].toLowerCase()); + } + } + + /** + * Called by {@linkcode updateInfo} to update the position of the tera, spliced, and shiny icons + * @param isFusion - Whether the pokemon is a fusion or not + */ + protected updateIconDisplay(isFusion: boolean): void { + this.teraIcon.setPositionRelative(this.nameText, this.nameText.displayWidth + this.genderText.displayWidth + 1, 2); + this.splicedIcon + .setVisible(isFusion) + .setPositionRelative( + this.nameText, + this.nameText.displayWidth + + this.genderText.displayWidth + + 1 + + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0), + 1.5, + ); + this.shinyIcon.setPositionRelative( + this.nameText, + this.nameText.displayWidth + + this.genderText.displayWidth + + 1 + + (this.teraIcon.visible ? this.teraIcon.displayWidth + 1 : 0) + + (this.splicedIcon.visible ? this.splicedIcon.displayWidth + 1 : 0), + 2.5, + ); + } + + //#region Hp Bar Display handling + /** + * Called every time the hp frame is updated by the tween + * @param pokemon - The pokemon object attached to this battle info + */ + protected updateHpFrame(): void { + const hpFrame = this.hpBar.scaleX > 0.5 ? "high" : this.hpBar.scaleX > 0.25 ? "medium" : "low"; + if (hpFrame !== this.lastHpFrame) { + this.hpBar.setFrame(hpFrame); + this.lastHpFrame = hpFrame; + } + } + + /** + * Called by every frame in the hp animation tween created in {@linkcode updatePokemonHp} + * @param _pokemon - The pokemon the battle-info bar belongs to + */ + protected onHpTweenUpdate(_pokemon: Pokemon): void { + this.updateHpFrame(); + } + + /** Update the pokemonHp bar */ + protected updatePokemonHp(pokemon: Pokemon, resolve: (r: void | PromiseLike) => void, instant?: boolean): void { + let duration = !instant ? Phaser.Math.Clamp(Math.abs(this.lastHp - pokemon.hp) * 5, 250, 5000) : 0; + const speed = globalScene.hpBarSpeed; + if (speed) { + duration = speed >= 3 ? 0 : duration / Math.pow(2, speed); + } + globalScene.tweens.add({ + targets: this.hpBar, + ease: "Sine.easeOut", + scaleX: pokemon.getHpRatio(true), + duration: duration, + onUpdate: () => { + this.onHpTweenUpdate(pokemon); + }, + onComplete: () => { + this.updateHpFrame(); + resolve(); + }, + }); + this.lastMaxHp = pokemon.getMaxHp(); + } + + //#endregion + + async updateInfo(pokemon: Pokemon, instant?: boolean): Promise { + let resolve: (r: void | PromiseLike) => void = () => {}; + const promise = new Promise(r => (resolve = r)); + if (!globalScene) { + return resolve(); + } + + const gender: Gender = pokemon.summonData?.illusion?.gender ?? pokemon.gender; + + this.genderText.setText(getGenderSymbol(gender)).setColor(getGenderColor(gender)); + + const nameUpdated = this.updateName(pokemon.getNameToRender()); + + const teraTypeUpdated = this.updateTeraType(pokemon.isTerastallized ? pokemon.getTeraType() : PokemonType.UNKNOWN); + + const isFusion = pokemon.isFusion(true); + + if (nameUpdated || teraTypeUpdated) { + this.updateIconDisplay(isFusion); + } + + this.updateStatusIcon(pokemon); + + if (this.lastHp !== pokemon.hp || this.lastMaxHp !== pokemon.getMaxHp()) { + return this.updatePokemonHp(pokemon, resolve, instant); + } + if (!this.player && this.lastLevel !== pokemon.level) { + this.setLevel(pokemon.level); + this.lastLevel = pokemon.level; + } + + const stats = pokemon.getStatStages(); + const statsStr = stats.join(""); + + if (this.lastStats !== statsStr) { + this.updateStats(stats); + this.lastStats = statsStr; + } + + this.shinyIcon.setVisible(pokemon.isShiny(true)); + + const doubleShiny = isFusion && pokemon.shiny && pokemon.fusionShiny; + const baseVariant = !doubleShiny ? pokemon.getVariant(true) : pokemon.variant; + this.shinyIcon.setTint(getVariantTint(baseVariant)); + + this.fusionShinyIcon.setVisible(doubleShiny).setPosition(this.shinyIcon.x, this.shinyIcon.y); + if (isFusion) { + this.fusionShinyIcon.setTint(getVariantTint(pokemon.fusionVariant)); + } + + resolve(); + await promise; + } + //#endregion + + updateNameText(pokemon: Pokemon): void { + let displayName = pokemon.getNameToRender().replace(/[♂♀]/g, ""); + let nameTextWidth: number; + + const nameSizeTest = addTextObject(0, 0, displayName, TextStyle.BATTLE_INFO); + nameTextWidth = nameSizeTest.displayWidth; + + const gender = pokemon.summonData.illusion?.gender ?? pokemon.gender; + while ( + nameTextWidth > + (this.player || !this.boss ? 60 : 98) - + ((gender !== Gender.GENDERLESS ? 6 : 0) + + (pokemon.fusionSpecies ? 8 : 0) + + (pokemon.isShiny() ? 8 : 0) + + (Math.min(pokemon.level.toString().length, 3) - 3) * 8) + ) { + displayName = `${displayName.slice(0, displayName.endsWith(".") ? -2 : -1).trimEnd()}.`; + nameSizeTest.setText(displayName); + nameTextWidth = nameSizeTest.displayWidth; + } + + nameSizeTest.destroy(); + + this.nameText.setText(displayName); + this.lastName = pokemon.getNameToRender(); + + if (this.nameText.visible) { + this.nameText.setInteractive( + new Phaser.Geom.Rectangle(0, 0, this.nameText.width, this.nameText.height), + Phaser.Geom.Rectangle.Contains, + ); + } + } + + /** + * Set the level numbers container to display the provided level + * + * @remarks + * The numbers in the pokemon's level uses images for each number rather than a text object with a special font. + * This method sets the images for each digit of the level number and then positions the level container based + * on the number of digits. + * + * @param level - The level to display + * @param textureKey - The texture key for the level numbers + */ + setLevel(level: number, textureKey: "numbers" | "numbers_red" = "numbers"): void { + this.levelNumbersContainer.removeAll(true); + const levelStr = level.toString(); + for (let i = 0; i < levelStr.length; i++) { + this.levelNumbersContainer.add(globalScene.add.image(i * 8, 0, textureKey, levelStr[i])); + } + this.levelContainer.setX(this.baseLvContainerX - 8 * Math.max(levelStr.length - 3, 0)); + } + + updateStats(stats: number[]): void { + for (const [i, s] of this.statOrder.entries()) { + if (s !== Stat.HP) { + this.statNumbers[i].setFrame(stats[s - 1].toString()); + } + } + } + + getBaseY(): number { + return this.baseY; + } + + resetY(): void { + this.y = this.baseY; + } +} diff --git a/src/ui/battle-info/enemy-battle-info.ts b/src/ui/battle-info/enemy-battle-info.ts new file mode 100644 index 00000000000..e8f5434dcf2 --- /dev/null +++ b/src/ui/battle-info/enemy-battle-info.ts @@ -0,0 +1,235 @@ +import { globalScene } from "#app/global-scene"; +import BattleFlyout from "../battle-flyout"; +import { addTextObject, TextStyle } from "#app/ui/text"; +import { addWindow, WindowVariant } from "#app/ui/ui-theme"; +import { Stat } from "#enums/stat"; +import i18next from "i18next"; +import type { EnemyPokemon } from "#app/field/pokemon"; +import type { GameObjects } from "phaser"; +import BattleInfo from "./battle-info"; +import type { BattleInfoParamList } from "./battle-info"; + +export class EnemyBattleInfo extends BattleInfo { + protected player: false = false; + protected championRibbon: Phaser.GameObjects.Sprite; + protected ownedIcon: Phaser.GameObjects.Sprite; + protected flyoutMenu: BattleFlyout; + + protected hpBarSegmentDividers: GameObjects.Rectangle[] = []; + + // #region Type effectiveness hint objects + protected effectivenessContainer: Phaser.GameObjects.Container; + protected effectivenessWindow: Phaser.GameObjects.NineSlice; + protected effectivenessText: Phaser.GameObjects.Text; + protected currentEffectiveness?: string; + // #endregion + + override get statOrder(): Stat[] { + return [Stat.HP, Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD]; + } + + override getTextureName(): string { + return this.boss ? "pbinfo_enemy_boss_mini" : "pbinfo_enemy_mini"; + } + + override constructTypeIcons(): void { + this.type1Icon = globalScene.add.sprite(-15, -15.5, "pbinfo_enemy_type1").setName("icon_type_1").setOrigin(0); + this.type2Icon = globalScene.add.sprite(-15, -2.5, "pbinfo_enemy_type2").setName("icon_type_2").setOrigin(0); + this.type3Icon = globalScene.add.sprite(0, 15.5, "pbinfo_enemy_type3").setName("icon_type_3").setOrigin(0); + this.add([this.type1Icon, this.type2Icon, this.type3Icon]); + } + + constructor() { + const posParams: BattleInfoParamList = { + nameTextX: -124, + nameTextY: -11.2, + levelContainerX: -50, + levelContainerY: -5, + hpBarX: -71, + hpBarY: 4.5, + statBox: { + xOffset: 5, + paddingX: 2, + statOverflow: 0, + }, + }; + + super(140, -141, false, posParams); + + this.ownedIcon = globalScene.add + .sprite(0, 0, "icon_owned") + .setName("icon_owned") + .setVisible(false) + .setOrigin(0, 0) + .setPositionRelative(this.nameText, 0, 11.75); + + this.championRibbon = globalScene.add + .sprite(0, 0, "champion_ribbon") + .setName("icon_champion_ribbon") + .setVisible(false) + .setOrigin(0, 0) + .setPositionRelative(this.nameText, 8, 11.75); + // Ensure these two icons are positioned below the stats container + this.addAt([this.ownedIcon, this.championRibbon], this.getIndex(this.statsContainer)); + + this.flyoutMenu = new BattleFlyout(this.player); + this.add(this.flyoutMenu); + + this.moveBelow(this.flyoutMenu, this.box); + + this.effectivenessContainer = globalScene.add + .container(0, 0) + .setVisible(false) + .setPositionRelative(this.type1Icon, 22, 4); + this.add(this.effectivenessContainer); + + this.effectivenessText = addTextObject(5, 4.5, "", TextStyle.BATTLE_INFO); + this.effectivenessWindow = addWindow(0, 0, 0, 20, undefined, false, undefined, undefined, WindowVariant.XTHIN); + + this.effectivenessContainer.add([this.effectivenessWindow, this.effectivenessText]); + } + + override initInfo(pokemon: EnemyPokemon): void { + this.flyoutMenu.initInfo(pokemon); + super.initInfo(pokemon); + + if (this.nameText.visible) { + this.nameText + .on("pointerover", () => + globalScene.ui.showTooltip( + "", + i18next.t("battleInfo:generation", { + generation: i18next.t(`starterSelectUiHandler:gen${pokemon.species.generation}`), + }), + ), + ) + .on("pointerout", () => globalScene.ui.hideTooltip()); + } + + const dexEntry = globalScene.gameData.dexData[pokemon.species.speciesId]; + this.ownedIcon.setVisible(!!dexEntry.caughtAttr); + const opponentPokemonDexAttr = pokemon.getDexAttr(); + if ( + globalScene.gameMode.isClassic && + globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].classicWinCount > 0 && + globalScene.gameData.starterData[pokemon.species.getRootSpeciesId(true)].classicWinCount > 0 + ) { + this.championRibbon.setVisible(true); + } + + // Check if Player owns all genders and forms of the Pokemon + const missingDexAttrs = (dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr; + + const ownedAbilityAttrs = globalScene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr; + + // Check if the player owns ability for the root form + const playerOwnsThisAbility = pokemon.checkIfPlayerHasAbilityOfStarter(ownedAbilityAttrs); + + if (missingDexAttrs || !playerOwnsThisAbility) { + this.ownedIcon.setTint(0x808080); + } + + if (this.boss) { + this.updateBossSegmentDividers(pokemon as EnemyPokemon); + } + } + + /** + * Show or hide the type effectiveness multiplier window + * Passing undefined will hide the window + */ + updateEffectiveness(effectiveness?: string) { + this.currentEffectiveness = effectiveness; + + if (!globalScene.typeHints || effectiveness === undefined || this.flyoutMenu.flyoutVisible) { + this.effectivenessContainer.setVisible(false); + return; + } + + this.effectivenessText.setText(effectiveness); + this.effectivenessWindow.width = 10 + this.effectivenessText.displayWidth; + this.effectivenessContainer.setVisible(true); + } + + /** + * Request the flyoutMenu to toggle if available and hides or shows the effectiveness window where necessary + */ + toggleFlyout(visible: boolean): void { + this.flyoutMenu.toggleFlyout(visible); + + if (visible) { + this.effectivenessContainer.setVisible(false); + } else { + this.updateEffectiveness(this.currentEffectiveness); + } + } + + updateBossSegments(pokemon: EnemyPokemon): void { + const boss = !!pokemon.bossSegments; + + if (boss !== this.boss) { + this.boss = boss; + + [ + this.nameText, + this.genderText, + this.teraIcon, + this.splicedIcon, + this.shinyIcon, + this.ownedIcon, + this.championRibbon, + this.statusIndicator, + this.levelContainer, + this.statValuesContainer, + ].map(e => (e.x += 48 * (boss ? -1 : 1))); + this.hpBar.x += 38 * (boss ? -1 : 1); + this.hpBar.y += 2 * (this.boss ? -1 : 1); + this.hpBar.setTexture(`overlay_hp${boss ? "_boss" : ""}`); + this.box.setTexture(this.getTextureName()); + this.statsBox.setTexture(`${this.getTextureName()}_stats`); + } + + this.bossSegments = boss ? pokemon.bossSegments : 0; + this.updateBossSegmentDividers(pokemon); + } + + updateBossSegmentDividers(pokemon: EnemyPokemon): void { + while (this.hpBarSegmentDividers.length) { + this.hpBarSegmentDividers.pop()?.destroy(); + } + + if (this.boss && this.bossSegments > 1) { + const uiTheme = globalScene.uiTheme; + const maxHp = pokemon.getMaxHp(); + for (let s = 1; s < this.bossSegments; s++) { + const dividerX = (Math.round((maxHp / this.bossSegments) * s) / maxHp) * this.hpBar.width; + const divider = globalScene.add.rectangle( + 0, + 0, + 1, + this.hpBar.height - (uiTheme ? 0 : 1), + pokemon.bossSegmentIndex >= s ? 0xffffff : 0x404040, + ); + divider.setOrigin(0.5, 0).setName("hpBar_divider_" + s.toString()); + this.add(divider); + this.moveBelow(divider as Phaser.GameObjects.GameObject, this.statsContainer); + + divider.setPositionRelative(this.hpBar, dividerX, uiTheme ? 0 : 1); + this.hpBarSegmentDividers.push(divider); + } + } + } + + override updateStatusIcon(pokemon: EnemyPokemon): void { + super.updateStatusIcon(pokemon, (this.ownedIcon.visible ? 8 : 0) + (this.championRibbon.visible ? 8 : 0)); + } + + protected override updatePokemonHp( + pokemon: EnemyPokemon, + resolve: (r: void | PromiseLike) => void, + instant?: boolean, + ): void { + super.updatePokemonHp(pokemon, resolve, instant); + this.lastHp = pokemon.hp; + } +} diff --git a/src/ui/battle-info/player-battle-info.ts b/src/ui/battle-info/player-battle-info.ts new file mode 100644 index 00000000000..634f89b7922 --- /dev/null +++ b/src/ui/battle-info/player-battle-info.ts @@ -0,0 +1,242 @@ +import { getLevelRelExp, getLevelTotalExp } from "#app/data/exp"; +import type { PlayerPokemon } from "#app/field/pokemon"; +import { globalScene } from "#app/global-scene"; +import { ExpGainsSpeed } from "#enums/exp-gains-speed"; +import { Stat } from "#enums/stat"; +import BattleInfo from "./battle-info"; +import type { BattleInfoParamList } from "./battle-info"; + +export class PlayerBattleInfo extends BattleInfo { + protected player: true = true; + protected hpNumbersContainer: Phaser.GameObjects.Container; + + override get statOrder(): Stat[] { + return [Stat.ATK, Stat.DEF, Stat.SPATK, Stat.SPDEF, Stat.ACC, Stat.EVA, Stat.SPD]; + } + + override getTextureName(): string { + return this.mini ? "pbinfo_player_mini" : "pbinfo_player"; + } + + override constructTypeIcons(): void { + this.type1Icon = globalScene.add.sprite(-139, -17, "pbinfo_player_type1").setName("icon_type_1").setOrigin(0); + this.type2Icon = globalScene.add.sprite(-139, -1, "pbinfo_player_type2").setName("icon_type_2").setOrigin(0); + this.type3Icon = globalScene.add.sprite(-154, -17, "pbinfo_player_type3").setName("icon_type_3").setOrigin(0); + this.add([this.type1Icon, this.type2Icon, this.type3Icon]); + } + + constructor() { + const posParams: BattleInfoParamList = { + nameTextX: -115, + nameTextY: -15.2, + levelContainerX: -41, + levelContainerY: -10, + hpBarX: -61, + hpBarY: -1, + statBox: { + xOffset: 8, + paddingX: 4, + statOverflow: 1, + }, + }; + super(Math.floor(globalScene.game.canvas.width / 6) - 10, -72, true, posParams); + + this.hpNumbersContainer = globalScene.add.container(-15, 10).setName("container_hp"); + + // hp number container must be beneath the stat container for overlay to display properly + this.addAt(this.hpNumbersContainer, this.getIndex(this.statsContainer)); + + const expBar = globalScene.add.image(-98, 18, "overlay_exp").setName("overlay_exp").setOrigin(0); + this.add(expBar); + + const expMaskRect = globalScene.make + .graphics({}) + .setScale(6) + .fillStyle(0xffffff) + .beginPath() + .fillRect(127, 126, 85, 2); + + const expMask = expMaskRect.createGeometryMask(); + + expBar.setMask(expMask); + + this.expBar = expBar; + this.expMaskRect = expMaskRect; + } + + override initInfo(pokemon: PlayerPokemon): void { + super.initInfo(pokemon); + this.setHpNumbers(pokemon.hp, pokemon.getMaxHp()); + this.expMaskRect.x = (pokemon.levelExp / getLevelTotalExp(pokemon.level, pokemon.species.growthRate)) * 510; + this.lastExp = pokemon.exp; + this.lastLevelExp = pokemon.levelExp; + + this.statValuesContainer.setPosition(8, 7); + } + + override setMini(mini: boolean): void { + if (this.mini === mini) { + return; + } + + this.mini = mini; + + this.box.setTexture(this.getTextureName()); + this.statsBox.setTexture(`${this.getTextureName()}_stats`); + + if (this.player) { + this.y -= 12 * (mini ? 1 : -1); + this.baseY = this.y; + } + + const offsetElements = [ + this.nameText, + this.genderText, + this.teraIcon, + this.splicedIcon, + this.shinyIcon, + this.statusIndicator, + this.levelContainer, + ]; + offsetElements.forEach(el => (el.y += 1.5 * (mini ? -1 : 1))); + + [this.type1Icon, this.type2Icon, this.type3Icon].forEach(el => { + el.x += 4 * (mini ? 1 : -1); + el.y += -8 * (mini ? 1 : -1); + }); + + this.statValuesContainer.x += 2 * (mini ? 1 : -1); + this.statValuesContainer.y += -7 * (mini ? 1 : -1); + + const toggledElements = [this.hpNumbersContainer, this.expBar]; + toggledElements.forEach(el => el.setVisible(!mini)); + } + + /** + * Updates the Hp Number text (that is the "HP/Max HP" text that appears below the player's health bar) + * while the health bar is tweening. + * @param pokemon - The Pokemon the health bar belongs to. + */ + protected override onHpTweenUpdate(pokemon: PlayerPokemon): void { + const tweenHp = Math.ceil(this.hpBar.scaleX * pokemon.getMaxHp()); + this.setHpNumbers(tweenHp, pokemon.getMaxHp()); + this.lastHp = tweenHp; + this.updateHpFrame(); + } + + updatePokemonExp(pokemon: PlayerPokemon, instant?: boolean, levelDurationMultiplier = 1): Promise { + const levelUp = this.lastLevel < pokemon.level; + const relLevelExp = getLevelRelExp(this.lastLevel + 1, pokemon.species.growthRate); + const levelExp = levelUp ? relLevelExp : pokemon.levelExp; + let ratio = relLevelExp ? levelExp / relLevelExp : 0; + if (this.lastLevel >= globalScene.getMaxExpLevel(true)) { + ratio = levelUp ? 1 : 0; + instant = true; + } + const durationMultiplier = Phaser.Tweens.Builders.GetEaseFunction("Sine.easeIn")( + 1 - Math.max(this.lastLevel - 100, 0) / 150, + ); + let duration = + this.visible && !instant + ? ((levelExp - this.lastLevelExp) / relLevelExp) * + BattleInfo.EXP_GAINS_DURATION_BASE * + durationMultiplier * + levelDurationMultiplier + : 0; + const speed = globalScene.expGainsSpeed; + if (speed && speed >= ExpGainsSpeed.DEFAULT) { + duration = speed >= ExpGainsSpeed.SKIP ? ExpGainsSpeed.DEFAULT : duration / Math.pow(2, speed); + } + if (ratio === 1) { + this.lastLevelExp = 0; + this.lastLevel++; + } else { + this.lastExp = pokemon.exp; + this.lastLevelExp = pokemon.levelExp; + } + if (duration) { + globalScene.playSound("se/exp"); + } + return new Promise(resolve => { + globalScene.tweens.add({ + targets: this.expMaskRect, + ease: "Sine.easeIn", + x: ratio * 510, + duration: duration, + onComplete: () => { + if (!globalScene) { + return resolve(); + } + if (duration) { + globalScene.sound.stopByKey("se/exp"); + } + if (ratio === 1) { + globalScene.playSound("se/level_up"); + this.setLevel(this.lastLevel); + globalScene.time.delayedCall(500 * levelDurationMultiplier, () => { + this.expMaskRect.x = 0; + this.updateInfo(pokemon, instant).then(() => resolve()); + }); + return; + } + resolve(); + }, + }); + }); + } + + /** + * Updates the info on the info bar. + * + * In addition to performing all the steps of {@linkcode BattleInfo.updateInfo}, + * it also updates the EXP Bar + */ + override async updateInfo(pokemon: PlayerPokemon, instant?: boolean): Promise { + await super.updateInfo(pokemon, instant); + const isLevelCapped = pokemon.level >= globalScene.getMaxExpLevel(); + const oldLevelCapped = this.lastLevelCapped; + this.lastLevelCapped = isLevelCapped; + + if (this.lastExp !== pokemon.exp || this.lastLevel !== pokemon.level) { + const durationMultipler = Math.max( + Phaser.Tweens.Builders.GetEaseFunction("Cubic.easeIn")(1 - Math.min(pokemon.level - this.lastLevel, 10) / 10), + 0.1, + ); + await this.updatePokemonExp(pokemon, false, durationMultipler); + } else if (isLevelCapped !== oldLevelCapped) { + this.setLevel(pokemon.level); + } + } + + /** + * Set the HP numbers text, that is the "HP/Max HP" text that appears below the player's health bar. + * @param hp - The current HP of the player. + * @param maxHp - The maximum HP of the player. + */ + setHpNumbers(hp: number, maxHp: number): void { + if (!globalScene) { + return; + } + this.hpNumbersContainer.removeAll(true); + const hpStr = hp.toString(); + const maxHpStr = maxHp.toString(); + let offset = 0; + for (let i = maxHpStr.length - 1; i >= 0; i--) { + this.hpNumbersContainer.add(globalScene.add.image(offset++ * -8, 0, "numbers", maxHpStr[i])); + } + this.hpNumbersContainer.add(globalScene.add.image(offset++ * -8, 0, "numbers", "/")); + for (let i = hpStr.length - 1; i >= 0; i--) { + this.hpNumbersContainer.add(globalScene.add.image(offset++ * -8, 0, "numbers", hpStr[i])); + } + } + + /** + * Set the level numbers container to display the provided level + * + * Overrides the default implementation to handle displaying level capped numbers in red. + * @param level - The level to display + */ + override setLevel(level: number): void { + super.setLevel(level, level >= globalScene.getMaxExpLevel() ? "numbers_red" : "numbers"); + } +} diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 5a0978a934d..6dbbcd47300 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -10,7 +10,7 @@ import { getLocalizedSpriteKey, fixedInt, padInt } from "#app/utils/common"; import { MoveCategory } from "#enums/MoveCategory"; import i18next from "i18next"; import { Button } from "#enums/buttons"; -import type { PokemonMove } from "#app/field/pokemon"; +import type { EnemyPokemon, PokemonMove } from "#app/field/pokemon"; import type Pokemon from "#app/field/pokemon"; import type { CommandPhase } from "#app/phases/command-phase"; import MoveInfoOverlay from "./move-info-overlay"; @@ -279,7 +279,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { this.moveInfoOverlay.show(pokemonMove.getMove()); pokemon.getOpponents().forEach(opponent => { - opponent.updateEffectiveness(this.getEffectivenessText(pokemon, opponent, pokemonMove)); + (opponent as EnemyPokemon).updateEffectiveness(this.getEffectivenessText(pokemon, opponent, pokemonMove)); }); } @@ -391,7 +391,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { const opponents = (globalScene.getCurrentPhase() as CommandPhase).getPokemon().getOpponents(); opponents.forEach(opponent => { - opponent.updateEffectiveness(undefined); + (opponent as EnemyPokemon).updateEffectiveness(); }); } diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts index 18b5d2384ef..d8012a58875 100644 --- a/src/ui/pokemon-info-container.ts +++ b/src/ui/pokemon-info-container.ts @@ -8,7 +8,7 @@ import type Pokemon from "../field/pokemon"; import i18next from "i18next"; import type { DexEntry, StarterDataEntry } from "../system/game-data"; import { DexAttr } from "../system/game-data"; -import { fixedInt } from "#app/utils/common"; +import { fixedInt, getShinyDescriptor } from "#app/utils/common"; import ConfirmUiHandler from "./confirm-ui-handler"; import { StatsContainer } from "./stats-container"; import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text"; @@ -343,18 +343,19 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonShinyIcon.setVisible(pokemon.isShiny()); this.pokemonShinyIcon.setTint(getVariantTint(baseVariant)); if (this.pokemonShinyIcon.visible) { - const shinyDescriptor = - doubleShiny || baseVariant - ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` - : ""; - this.pokemonShinyIcon.on("pointerover", () => - globalScene.ui.showTooltip( - "", - `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, - true, - ), - ); - this.pokemonShinyIcon.on("pointerout", () => globalScene.ui.hideTooltip()); + let shinyDescriptor = ""; + if (doubleShiny || baseVariant) { + shinyDescriptor = " (" + getShinyDescriptor(baseVariant); + if (doubleShiny) { + shinyDescriptor += "/" + getShinyDescriptor(pokemon.fusionVariant); + } + shinyDescriptor += ")"; + } + this.pokemonShinyIcon + .on("pointerover", () => + globalScene.ui.showTooltip("", i18next.t("common:shinyOnHover") + shinyDescriptor, true), + ) + .on("pointerout", () => globalScene.ui.hideTooltip()); const newShiny = BigInt(1 << (pokemon.shiny ? 1 : 0)); const newVariant = BigInt(1 << (pokemon.variant + 4)); diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index f93a1826b3e..24e790f7c61 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -11,6 +11,7 @@ import { isNullOrUndefined, toReadableString, formatStat, + getShinyDescriptor, } from "#app/utils/common"; import type { PlayerPokemon, PokemonMove } from "#app/field/pokemon"; import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/balance/starters"; @@ -444,18 +445,19 @@ export default class SummaryUiHandler extends UiHandler { this.shinyIcon.setVisible(this.pokemon.isShiny(false)); this.shinyIcon.setTint(getVariantTint(baseVariant)); if (this.shinyIcon.visible) { - const shinyDescriptor = - doubleShiny || baseVariant - ? `${baseVariant === 2 ? i18next.t("common:epicShiny") : baseVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}${doubleShiny ? `/${this.pokemon.fusionVariant === 2 ? i18next.t("common:epicShiny") : this.pokemon.fusionVariant === 1 ? i18next.t("common:rareShiny") : i18next.t("common:commonShiny")}` : ""}` - : ""; - this.shinyIcon.on("pointerover", () => - globalScene.ui.showTooltip( - "", - `${i18next.t("common:shinyOnHover")}${shinyDescriptor ? ` (${shinyDescriptor})` : ""}`, - true, - ), - ); - this.shinyIcon.on("pointerout", () => globalScene.ui.hideTooltip()); + let shinyDescriptor = ""; + if (doubleShiny || baseVariant) { + shinyDescriptor = " (" + getShinyDescriptor(baseVariant); + if (doubleShiny) { + shinyDescriptor += "/" + getShinyDescriptor(this.pokemon.fusionVariant); + } + shinyDescriptor += ")"; + } + this.shinyIcon + .on("pointerover", () => + globalScene.ui.showTooltip("", i18next.t("common:shinyOnHover") + shinyDescriptor, true), + ) + .on("pointerout", () => globalScene.ui.hideTooltip()); } this.fusionShinyIcon.setPosition(this.shinyIcon.x, this.shinyIcon.y); diff --git a/src/utils/common.ts b/src/utils/common.ts index b9111578e2f..a018b49da3c 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -2,6 +2,7 @@ import { MoneyFormat } from "#enums/money-format"; import { Moves } from "#enums/moves"; import i18next from "i18next"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; +import type { Variant } from "#app/sprites/variant"; export type nil = null | undefined; @@ -576,3 +577,18 @@ export function animationFileName(move: Moves): string { export function camelCaseToKebabCase(str: string): string { return str.replace(/[A-Z]+(?![a-z])|[A-Z]/g, (s, o) => (o ? "-" : "") + s.toLowerCase()); } + +/** Get the localized shiny descriptor for the provided variant + * @param variant - The variant to get the shiny descriptor for + * @returns The localized shiny descriptor + */ +export function getShinyDescriptor(variant: Variant): string { + switch (variant) { + case 2: + return i18next.t("common:epicShiny"); + case 1: + return i18next.t("common:rareShiny"); + case 0: + return i18next.t("common:commonShiny"); + } +} diff --git a/test/testUtils/mocks/mockGameObject.ts b/test/testUtils/mocks/mockGameObject.ts index 4c243ec9ca1..0dff7c48c73 100644 --- a/test/testUtils/mocks/mockGameObject.ts +++ b/test/testUtils/mocks/mockGameObject.ts @@ -1,3 +1,4 @@ export interface MockGameObject { name: string; + destroy?(): void; } diff --git a/test/testUtils/mocks/mocksContainer/mockContainer.ts b/test/testUtils/mocks/mocksContainer/mockContainer.ts index 5e739fbe3cc..e116e7d151a 100644 --- a/test/testUtils/mocks/mocksContainer/mockContainer.ts +++ b/test/testUtils/mocks/mocksContainer/mockContainer.ts @@ -2,199 +2,253 @@ import type MockTextureManager from "#test/testUtils/mocks/mockTextureManager"; import type { MockGameObject } from "../mockGameObject"; export default class MockContainer implements MockGameObject { - protected x; - protected y; + protected x: number; + protected y: number; protected scene; - protected width; - protected height; - protected visible; - private alpha; + protected width: number; + protected height: number; + protected visible: boolean; + private alpha: number; private style; public frame; protected textureManager; public list: MockGameObject[] = []; public name: string; - constructor(textureManager: MockTextureManager, x, y) { + constructor(textureManager: MockTextureManager, x: number, y: number) { this.x = x; this.y = y; this.frame = {}; this.textureManager = textureManager; } - setVisible(visible) { + setVisible(visible: boolean): this { this.visible = visible; + return this; } - once(_event, _callback, _source) {} + once(_event, _callback, _source): this { + return this; + } - off(_event, _callback, _source) {} + off(_event, _callback, _source): this { + return this; + } - removeFromDisplayList() { + removeFromDisplayList(): this { // same as remove or destroy + return this; } - removeBetween(_startIndex, _endIndex, _destroyChild) { + removeBetween(_startIndex, _endIndex, _destroyChild): this { // Removes multiple children across an index range + return this; } addedToScene() { // This callback is invoked when this Game Object is added to a Scene. } - setSize(_width, _height) { + setSize(_width: number, _height: number): this { // Sets the size of this Game Object. + return this; } - setMask() { + setMask(): this { /// Sets the mask that this Game Object will use to render with. + return this; } - setPositionRelative(_source, _x, _y) { + setPositionRelative(_source, _x, _y): this { /// Sets the position of this Game Object to be a relative position from the source Game Object. + return this; } - setInteractive = () => null; + setInteractive(): this { + return this; + } - setOrigin(x, y) { + setOrigin(x = 0.5, y = x): this { this.x = x; this.y = y; + return this; } - setAlpha(alpha) { + setAlpha(alpha = 1): this { this.alpha = alpha; + return this; } - setFrame(_frame, _updateSize?: boolean, _updateOrigin?: boolean) { + setFrame(_frame, _updateSize?: boolean, _updateOrigin?: boolean): this { // Sets the frame this Game Object will use to render with. + return this; } - setScale(_scale) { + setScale(_x = 1, _y = _x): this { // Sets the scale of this Game Object. + return this; } - setPosition(x, y) { + setPosition(x = 0, y = x, _z = 0, _w = 0): this { this.x = x; this.y = y; + return this; } - setX(x) { + setX(x = 0): this { this.x = x; + return this; } - setY(y) { + setY(y = 0): this { this.y = y; + return this; } destroy() { this.list = []; } - setShadow(_shadowXpos, _shadowYpos, _shadowColor) { + setShadow(_shadowXpos, _shadowYpos, _shadowColor): this { // Sets the shadow settings for this Game Object. + return this; } - setLineSpacing(_lineSpacing) { + setLineSpacing(_lineSpacing): this { // Sets the line spacing value of this Game Object. + return this; } - setText(_text) { + setText(_text): this { // Sets the text this Game Object will display. + return this; } - setAngle(_angle) { + setAngle(_angle): this { // Sets the angle of this Game Object. + return this; } - setShadowOffset(_offsetX, _offsetY) { + setShadowOffset(_offsetX, _offsetY): this { // Sets the shadow offset values. + return this; } setWordWrapWidth(_width) { // Sets the width (in pixels) to use for wrapping lines. } - setFontSize(_fontSize) { + setFontSize(_fontSize): this { // Sets the font size of this Game Object. + return this; } getBounds() { return { width: this.width, height: this.height }; } - setColor(_color) { + setColor(_color): this { // Sets the tint of this Game Object. + return this; } - setShadowColor(_color) { + setShadowColor(_color): this { // Sets the shadow color. + return this; } - setTint(_color) { + setTint(_color: this) { // Sets the tint of this Game Object. + return this; } - setStrokeStyle(_thickness, _color) { + setStrokeStyle(_thickness, _color): this { // Sets the stroke style for the graphics. return this; } - setDepth(_depth) { - // Sets the depth of this Game Object. + setDepth(_depth): this { + // Sets the depth of this Game Object.\ + return this; } - setTexture(_texture) { - // Sets the texture this Game Object will use to render with. + setTexture(_texture): this { + // Sets the texture this Game Object will use to render with.\ + return this; } - clearTint() { - // Clears any previously set tint. + clearTint(): this { + // Clears any previously set tint.\ + return this; } - sendToBack() { - // Sends this Game Object to the back of its parent's display list. + sendToBack(): this { + // Sends this Game Object to the back of its parent's display list.\ + return this; } - moveTo(_obj) { - // Moves this Game Object to the given index in the list. + moveTo(_obj): this { + // Moves this Game Object to the given index in the list.\ + return this; } - moveAbove(_obj) { + moveAbove(_obj): this { // Moves this Game Object to be above the given Game Object in the display list. + return this; } - moveBelow(_obj) { + moveBelow(_obj): this { // Moves this Game Object to be below the given Game Object in the display list. + return this; } - setName(name: string) { + setName(name: string): this { this.name = name; + return this; } - bringToTop(_obj) { + bringToTop(_obj): this { // Brings this Game Object to the top of its parents display list. + return this; } - on(_event, _callback, _source) {} + on(_event, _callback, _source): this { + return this; + } - add(obj) { + add(...obj: MockGameObject[]): this { // Adds a child to this Game Object. - this.list.push(obj); + this.list.push(...obj); + return this; } - removeAll() { + removeAll(): this { // Removes all Game Objects from this Container. this.list = []; + return this; } - addAt(obj, index) { + addAt(obj: MockGameObject | MockGameObject[], index = 0): this { // Adds a Game Object to this Container at the given index. - this.list.splice(index, 0, obj); + if (!Array.isArray(obj)) { + obj = [obj]; + } + this.list.splice(index, 0, ...obj); + return this; } - remove(obj) { - const index = this.list.indexOf(obj); - if (index !== -1) { - this.list.splice(index, 1); + remove(obj: MockGameObject | MockGameObject[], destroyChild = false): this { + if (!Array.isArray(obj)) { + obj = [obj]; } + for (const item of obj) { + const index = this.list.indexOf(item); + if (index !== -1) { + this.list.splice(index, 1); + } + if (destroyChild) { + item.destroy?.(); + } + } + return this; } getIndex(obj) { @@ -210,15 +264,28 @@ export default class MockContainer implements MockGameObject { return this.list; } - getByName(key: string) { + getByName(key: string): MockGameObject | null { return this.list.find(v => v.name === key) ?? new MockContainer(this.textureManager, 0, 0); } - disableInteractive = () => null; + disableInteractive(): this { + return this; + } - each(method) { + each(method): this { for (const item of this.list) { method(item); } + return this; + } + + copyPosition(source: { x?: number; y?: number }): this { + if (source.x !== undefined) { + this.x = source.x; + } + if (source.y !== undefined) { + this.y = source.y; + } + return this; } } diff --git a/test/testUtils/mocks/mocksContainer/mockGraphics.ts b/test/testUtils/mocks/mocksContainer/mockGraphics.ts index ebf84e935e3..1650d2f9f60 100644 --- a/test/testUtils/mocks/mocksContainer/mockGraphics.ts +++ b/test/testUtils/mocks/mocksContainer/mockGraphics.ts @@ -8,57 +8,76 @@ export default class MockGraphics implements MockGameObject { this.scene = textureManager.scene; } - fillStyle(_color) { + fillStyle(_color): this { // Sets the fill style to be used by the fill methods. + return this; } - beginPath() { + beginPath(): this { // Starts a new path by emptying the list of sub-paths. Call this method when you want to create a new path. + return this; } - fillRect(_x, _y, _width, _height) { + fillRect(_x, _y, _width, _height): this { // Adds a rectangle shape to the path which is filled when you call fill(). + return this; } - createGeometryMask() { + createGeometryMask(): this { // Creates a geometry mask. + return this; } - setOrigin(_x, _y) {} + setOrigin(_x, _y): this { + return this; + } - setAlpha(_alpha) {} + setAlpha(_alpha): this { + return this; + } - setVisible(_visible) {} + setVisible(_visible): this { + return this; + } - setName(_name) {} + setName(_name) { + return this; + } - once(_event, _callback, _source) {} + once(_event, _callback, _source) { + return this; + } - removeFromDisplayList() { + removeFromDisplayList(): this { // same as remove or destroy + return this; } addedToScene() { // This callback is invoked when this Game Object is added to a Scene. } - setPositionRelative(_source, _x, _y) { + setPositionRelative(_source, _x, _y): this { /// Sets the position of this Game Object to be a relative position from the source Game Object. + return this; } destroy() { this.list = []; } - setScale(_scale) { - // Sets the scale of this Game Object. + setScale(_scale): this { + return this; } - off(_event, _callback, _source) {} + off(_event, _callback, _source): this { + return this; + } - add(obj) { + add(obj): this { // Adds a child to this Game Object. this.list.push(obj); + return this; } removeAll() { @@ -90,4 +109,8 @@ export default class MockGraphics implements MockGameObject { getAll() { return this.list; } + + copyPosition(_source): this { + return this; + } } diff --git a/test/testUtils/mocks/mocksContainer/mockRectangle.ts b/test/testUtils/mocks/mocksContainer/mockRectangle.ts index 7bdf343759d..f9a92c41904 100644 --- a/test/testUtils/mocks/mocksContainer/mockRectangle.ts +++ b/test/testUtils/mocks/mocksContainer/mockRectangle.ts @@ -10,34 +10,47 @@ export default class MockRectangle implements MockGameObject { this.fillColor = fillColor; this.scene = textureManager.scene; } - setOrigin(_x, _y) {} + setOrigin(_x, _y): this { + return this; + } - setAlpha(_alpha) {} - setVisible(_visible) {} + setAlpha(_alpha): this { + return this; + } + setVisible(_visible): this { + return this; + } - setName(_name) {} + setName(_name): this { + return this; + } - once(_event, _callback, _source) {} + once(_event, _callback, _source): this { + return this; + } - removeFromDisplayList() { + removeFromDisplayList(): this { // same as remove or destroy + return this; } addedToScene() { // This callback is invoked when this Game Object is added to a Scene. } - setPositionRelative(_source, _x, _y) { + setPositionRelative(_source, _x, _y): this { /// Sets the position of this Game Object to be a relative position from the source Game Object. + return this; } destroy() { this.list = []; } - add(obj) { + add(obj): this { // Adds a child to this Game Object. this.list.push(obj); + return this; } removeAll() { @@ -45,16 +58,18 @@ export default class MockRectangle implements MockGameObject { this.list = []; } - addAt(obj, index) { + addAt(obj, index): this { // Adds a Game Object to this Container at the given index. this.list.splice(index, 0, obj); + return this; } - remove(obj) { + remove(obj): this { const index = this.list.indexOf(obj); if (index !== -1) { this.list.splice(index, 1); } + return this; } getIndex(obj) { @@ -69,9 +84,12 @@ export default class MockRectangle implements MockGameObject { getAll() { return this.list; } - setScale(_scale) { + setScale(_scale): this { // return this.phaserText.setScale(scale); + return this; } - off() {} + off(): this { + return this; + } } diff --git a/test/testUtils/mocks/mocksContainer/mockSprite.ts b/test/testUtils/mocks/mocksContainer/mockSprite.ts index dcc3588f127..b8ccfcced1f 100644 --- a/test/testUtils/mocks/mocksContainer/mockSprite.ts +++ b/test/testUtils/mocks/mocksContainer/mockSprite.ts @@ -1,6 +1,5 @@ import Phaser from "phaser"; import type { MockGameObject } from "../mockGameObject"; -import Sprite = Phaser.GameObjects.Sprite; import Frame = Phaser.Textures.Frame; export default class MockSprite implements MockGameObject { @@ -21,7 +20,9 @@ export default class MockSprite implements MockGameObject { Phaser.GameObjects.Sprite.prototype.setInteractive = this.setInteractive; // @ts-ignore Phaser.GameObjects.Sprite.prototype.setTexture = this.setTexture; + // @ts-ignore Phaser.GameObjects.Sprite.prototype.setSizeToFrame = this.setSizeToFrame; + // @ts-ignore Phaser.GameObjects.Sprite.prototype.setFrame = this.setFrame; // Phaser.GameObjects.Sprite.prototype.disable = this.disable; @@ -37,46 +38,55 @@ export default class MockSprite implements MockGameObject { }; } - setTexture(_key: string, _frame?: string | number) { + setTexture(_key: string, _frame?: string | number): this { return this; } - setSizeToFrame(_frame?: boolean | Frame): Sprite { - return {} as Sprite; + setSizeToFrame(_frame?: boolean | Frame): this { + return this; } - setPipeline(obj) { + setPipeline(obj): this { // Sets the pipeline of this Game Object. - return this.phaserSprite.setPipeline(obj); + this.phaserSprite.setPipeline(obj); + return this; } - off(_event, _callback, _source) {} + off(_event, _callback, _source): this { + return this; + } - setTintFill(color) { + setTintFill(color): this { // Sets the tint fill color. - return this.phaserSprite.setTintFill(color); + this.phaserSprite.setTintFill(color); + return this; } - setScale(scale) { - return this.phaserSprite.setScale(scale); + setScale(scale = 1): this { + this.phaserSprite.setScale(scale); + return this; } - setOrigin(x, y) { - return this.phaserSprite.setOrigin(x, y); + setOrigin(x = 0.5, y = x): this { + this.phaserSprite.setOrigin(x, y); + return this; } - setSize(width, height) { + setSize(width, height): this { // Sets the size of this Game Object. - return this.phaserSprite.setSize(width, height); + this.phaserSprite.setSize(width, height); + return this; } - once(event, callback, source) { - return this.phaserSprite.once(event, callback, source); + once(event, callback, source): this { + this.phaserSprite.once(event, callback, source); + return this; } - removeFromDisplayList() { + removeFromDisplayList(): this { // same as remove or destroy - return this.phaserSprite.removeFromDisplayList(); + this.phaserSprite.removeFromDisplayList(); + return this; } addedToScene() { @@ -84,97 +94,117 @@ export default class MockSprite implements MockGameObject { return this.phaserSprite.addedToScene(); } - setVisible(visible) { - return this.phaserSprite.setVisible(visible); + setVisible(visible): this { + this.phaserSprite.setVisible(visible); + return this; } - setPosition(x, y) { - return this.phaserSprite.setPosition(x, y); + setPosition(x, y): this { + this.phaserSprite.setPosition(x, y); + return this; } - setRotation(radians) { - return this.phaserSprite.setRotation(radians); + setRotation(radians): this { + this.phaserSprite.setRotation(radians); + return this; } - stop() { - return this.phaserSprite.stop(); + stop(): this { + this.phaserSprite.stop(); + return this; } - setInteractive = () => null; - - on(event, callback, source) { - return this.phaserSprite.on(event, callback, source); + setInteractive(): this { + return this; } - setAlpha(alpha) { - return this.phaserSprite.setAlpha(alpha); + on(event, callback, source): this { + this.phaserSprite.on(event, callback, source); + return this; } - setTint(color) { + setAlpha(alpha): this { + this.phaserSprite.setAlpha(alpha); + return this; + } + + setTint(color): this { // Sets the tint of this Game Object. - return this.phaserSprite.setTint(color); + this.phaserSprite.setTint(color); + return this; } - setFrame(frame, _updateSize?: boolean, _updateOrigin?: boolean) { + setFrame(frame, _updateSize?: boolean, _updateOrigin?: boolean): this { // Sets the frame this Game Object will use to render with. this.frame = frame; - return frame; + return this; } - setPositionRelative(source, x, y) { + setPositionRelative(source, x, y): this { /// Sets the position of this Game Object to be a relative position from the source Game Object. - return this.phaserSprite.setPositionRelative(source, x, y); + this.phaserSprite.setPositionRelative(source, x, y); + return this; } - setY(y) { - return this.phaserSprite.setY(y); + setY(y: number): this { + this.phaserSprite.setY(y); + return this; } - setCrop(x, y, width, height) { + setCrop(x: number, y: number, width: number, height: number): this { // Sets the crop size of this Game Object. - return this.phaserSprite.setCrop(x, y, width, height); + this.phaserSprite.setCrop(x, y, width, height); + return this; } - clearTint() { + clearTint(): this { // Clears any previously set tint. - return this.phaserSprite.clearTint(); + this.phaserSprite.clearTint(); + return this; } - disableInteractive() { + disableInteractive(): this { // Disables Interactive features of this Game Object. - return null; + return this; } apply() { - return this.phaserSprite.apply(); + this.phaserSprite.apply(); + return this; } - play() { + play(): this { // return this.phaserSprite.play(); return this; } - setPipelineData(key, value) { + setPipelineData(key: string, value: any): this { this.pipelineData[key] = value; + return this; } destroy() { return this.phaserSprite.destroy(); } - setName(name) { - return this.phaserSprite.setName(name); + setName(name: string): this { + this.phaserSprite.setName(name); + return this; } - setAngle(angle) { - return this.phaserSprite.setAngle(angle); + setAngle(angle): this { + this.phaserSprite.setAngle(angle); + return this; } - setMask() {} + setMask(): this { + return this; + } - add(obj) { + add(obj): this { // Adds a child to this Game Object. this.list.push(obj); + return this; } removeAll() { @@ -182,16 +212,18 @@ export default class MockSprite implements MockGameObject { this.list = []; } - addAt(obj, index) { + addAt(obj, index): this { // Adds a Game Object to this Container at the given index. this.list.splice(index, 0, obj); + return this; } - remove(obj) { + remove(obj): this { const index = this.list.indexOf(obj); if (index !== -1) { this.list.splice(index, 1); } + return this; } getIndex(obj) { @@ -206,4 +238,9 @@ export default class MockSprite implements MockGameObject { getAll() { return this.list; } + + copyPosition(obj): this { + this.phaserSprite.copyPosition(obj); + return this; + } } diff --git a/test/testUtils/mocks/mocksContainer/mockText.ts b/test/testUtils/mocks/mocksContainer/mockText.ts index 1f3f0ad792f..dc648616fe6 100644 --- a/test/testUtils/mocks/mocksContainer/mockText.ts +++ b/test/testUtils/mocks/mocksContainer/mockText.ts @@ -107,42 +107,51 @@ export default class MockText implements MockGameObject { } } - setScale(_scale) { + setScale(_scale): this { // return this.phaserText.setScale(scale); + return this; } - setShadow(_shadowXpos, _shadowYpos, _shadowColor) { + setShadow(_shadowXpos, _shadowYpos, _shadowColor): this { // Sets the shadow settings for this Game Object. // return this.phaserText.setShadow(shadowXpos, shadowYpos, shadowColor); + return this; } - setLineSpacing(_lineSpacing) { + setLineSpacing(_lineSpacing): this { // Sets the line spacing value of this Game Object. // return this.phaserText.setLineSpacing(lineSpacing); + return this; } - setOrigin(_x, _y) { + setOrigin(_x, _y): this { // return this.phaserText.setOrigin(x, y); + return this; } - once(_event, _callback, _source) { + once(_event, _callback, _source): this { // return this.phaserText.once(event, callback, source); + return this; } off(_event, _callback, _obj) {} removedFromScene() {} - addToDisplayList() {} - - setStroke(_color, _thickness) { - // Sets the stroke color and thickness. - // return this.phaserText.setStroke(color, thickness); + addToDisplayList(): this { + return this; } - removeFromDisplayList() { + setStroke(_color, _thickness): this { + // Sets the stroke color and thickness. + // return this.phaserText.setStroke(color, thickness); + return this; + } + + removeFromDisplayList(): this { // same as remove or destroy // return this.phaserText.removeFromDisplayList(); + return this; } addedToScene() { @@ -154,12 +163,14 @@ export default class MockText implements MockGameObject { // return this.phaserText.setVisible(visible); } - setY(_y) { + setY(_y): this { // return this.phaserText.setY(y); + return this; } - setX(_x) { + setX(_x): this { // return this.phaserText.setX(x); + return this; } /** @@ -169,27 +180,33 @@ export default class MockText implements MockGameObject { * @param z The z position of this Game Object. Default 0. * @param w The w position of this Game Object. Default 0. */ - setPosition(_x?: number, _y?: number, _z?: number, _w?: number) {} + setPosition(_x?: number, _y?: number, _z?: number, _w?: number): this { + return this; + } - setText(text) { + setText(text): this { // Sets the text this Game Object will display. // return this.phaserText.setText\(text); this.text = text; + return this; } - setAngle(_angle) { + setAngle(_angle): this { // Sets the angle of this Game Object. // return this.phaserText.setAngle(angle); + return this; } - setPositionRelative(_source, _x, _y) { + setPositionRelative(_source, _x, _y): this { /// Sets the position of this Game Object to be a relative position from the source Game Object. // return this.phaserText.setPositionRelative(source, x, y); + return this; } - setShadowOffset(_offsetX, _offsetY) { + setShadowOffset(_offsetX, _offsetY): this { // Sets the shadow offset values. // return this.phaserText.setShadowOffset(offsetX, offsetY); + return this; } setWordWrapWidth(width) { @@ -197,9 +214,10 @@ export default class MockText implements MockGameObject { this.wordWrapWidth = width; } - setFontSize(_fontSize) { + setFontSize(_fontSize): this { // Sets the font size of this Game Object. // return this.phaserText.setFontSize(fontSize); + return this; } getBounds() { @@ -209,25 +227,31 @@ export default class MockText implements MockGameObject { }; } - setColor(color: string) { + setColor(color: string): this { this.color = color; + return this; } - setInteractive = () => null; + setInteractive(): this { + return this; + } - setShadowColor(_color) { + setShadowColor(_color): this { // Sets the shadow color. // return this.phaserText.setShadowColor(color); + return this; } - setTint(_color) { + setTint(_color): this { // Sets the tint of this Game Object. // return this.phaserText.setTint(color); + return this; } - setStrokeStyle(_thickness, _color) { + setStrokeStyle(_thickness, _color): this { // Sets the stroke style for the graphics. // return this.phaserText.setStrokeStyle(thickness, color); + return this; } destroy() { @@ -235,20 +259,24 @@ export default class MockText implements MockGameObject { this.list = []; } - setAlpha(_alpha) { + setAlpha(_alpha): this { // return this.phaserText.setAlpha(alpha); + return this; } - setName(name: string) { + setName(name: string): this { this.name = name; + return this; } - setAlign(_align) { + setAlign(_align): this { // return this.phaserText.setAlign(align); + return this; } - setMask() { + setMask(): this { /// Sets the mask that this Game Object will use to render with. + return this; } getBottomLeft() { @@ -265,37 +293,43 @@ export default class MockText implements MockGameObject { }; } - disableInteractive() { + disableInteractive(): this { // Disables interaction with this Game Object. + return this; } - clearTint() { + clearTint(): this { // Clears tint on this Game Object. + return this; } - add(obj) { + add(obj): this { // Adds a child to this Game Object. this.list.push(obj); + return this; } - removeAll() { + removeAll(): this { // Removes all Game Objects from this Container. this.list = []; + return this; } - addAt(obj, index) { + addAt(obj, index): this { // Adds a Game Object to this Container at the given index. this.list.splice(index, 0, obj); + return this; } - remove(obj) { + remove(obj): this { const index = this.list.indexOf(obj); if (index !== -1) { this.list.splice(index, 1); } + return this; } - getIndex(obj) { + getIndex(obj): number { const index = this.list.indexOf(obj); return index || -1; } diff --git a/test/testUtils/testFileInitialization.ts b/test/testUtils/testFileInitialization.ts index 15635289e6f..ba90cba7d5b 100644 --- a/test/testUtils/testFileInitialization.ts +++ b/test/testUtils/testFileInitialization.ts @@ -70,10 +70,10 @@ export function initTestFile() { * @param x The relative x position * @param y The relative y position */ - const setPositionRelative = function (guideObject: any, x: number, y: number) { + const setPositionRelative = function (guideObject: any, x: number, y: number): any { const offsetX = guideObject.width * (-0.5 + (0.5 - guideObject.originX)); const offsetY = guideObject.height * (-0.5 + (0.5 - guideObject.originY)); - this.setPosition(guideObject.x + offsetX + x, guideObject.y + offsetY + y); + return this.setPosition(guideObject.x + offsetX + x, guideObject.y + offsetY + y); }; Phaser.GameObjects.Container.prototype.setPositionRelative = setPositionRelative; From d8c00616fc155fdf5a6b90a48a2cc3bb65c80819 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Wed, 28 May 2025 20:00:54 -0500 Subject: [PATCH 31/44] [Test] Add iterate, fix each method in mock container (#5882) --- .../mocks/mocksContainer/mockContainer.ts | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/test/testUtils/mocks/mocksContainer/mockContainer.ts b/test/testUtils/mocks/mocksContainer/mockContainer.ts index e116e7d151a..b392e61f9f7 100644 --- a/test/testUtils/mocks/mocksContainer/mockContainer.ts +++ b/test/testUtils/mocks/mocksContainer/mockContainer.ts @@ -272,9 +272,24 @@ export default class MockContainer implements MockGameObject { return this; } - each(method): this { + // biome-ignore lint/complexity/noBannedTypes: This matches the signature of the method it mocks + each(callback: Function, context?: object, ...args: any[]): this { + if (context !== undefined) { + callback = callback.bind(context); + } + for (const item of this.list.slice()) { + callback(item, ...args); + } + return this; + } + + // biome-ignore lint/complexity/noBannedTypes: This matches the signature of the method it mocks + iterate(callback: Function, context?: object, ...args: any[]): this { + if (context !== undefined) { + callback = callback.bind(context); + } for (const item of this.list) { - method(item); + callback(item, ...args); } return this; } From 86fa3198fd897b3aafbcba7abf5d4dc6e972738e Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Wed, 28 May 2025 21:47:27 -0500 Subject: [PATCH 32/44] [Test] Fix mock text to make it compatible with method chaining (#5884) --- test/testUtils/mocks/mocksContainer/mockText.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/testUtils/mocks/mocksContainer/mockText.ts b/test/testUtils/mocks/mocksContainer/mockText.ts index dc648616fe6..8f72cd0d34f 100644 --- a/test/testUtils/mocks/mocksContainer/mockText.ts +++ b/test/testUtils/mocks/mocksContainer/mockText.ts @@ -159,8 +159,8 @@ export default class MockText implements MockGameObject { // return this.phaserText.addedToScene(); } - setVisible(_visible) { - // return this.phaserText.setVisible(visible); + setVisible(_visible): this { + return this; } setY(_y): this { @@ -209,9 +209,10 @@ export default class MockText implements MockGameObject { return this; } - setWordWrapWidth(width) { + setWordWrapWidth(width): this { // Sets the width (in pixels) to use for wrapping lines. this.wordWrapWidth = width; + return this; } setFontSize(_fontSize): this { @@ -351,5 +352,6 @@ export default class MockText implements MockGameObject { return this.runWordWrap(this.text).split("\n"); } + // biome-ignore lint/complexity/noBannedTypes: This matches the signature of the class this mocks on(_event: string | symbol, _fn: Function, _context?: any) {} } From f9e6785c351d07e7f2a7e11299831aff476c6db4 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Wed, 28 May 2025 22:18:06 -0500 Subject: [PATCH 33/44] [Test] Fix mocks' add method to match phaser signature (#5885) --- test/testUtils/mocks/mocksContainer/mockContainer.ts | 9 ++++++--- test/testUtils/mocks/mocksContainer/mockRectangle.ts | 8 ++++++-- test/testUtils/mocks/mocksContainer/mockSprite.ts | 8 ++++++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/test/testUtils/mocks/mocksContainer/mockContainer.ts b/test/testUtils/mocks/mocksContainer/mockContainer.ts index b392e61f9f7..883c3856c26 100644 --- a/test/testUtils/mocks/mocksContainer/mockContainer.ts +++ b/test/testUtils/mocks/mocksContainer/mockContainer.ts @@ -214,9 +214,12 @@ export default class MockContainer implements MockGameObject { return this; } - add(...obj: MockGameObject[]): this { - // Adds a child to this Game Object. - this.list.push(...obj); + add(obj: MockGameObject | MockGameObject[]): this { + if (Array.isArray(obj)) { + this.list.push(...obj); + } else { + this.list.push(obj); + } return this; } diff --git a/test/testUtils/mocks/mocksContainer/mockRectangle.ts b/test/testUtils/mocks/mocksContainer/mockRectangle.ts index f9a92c41904..c11af824c56 100644 --- a/test/testUtils/mocks/mocksContainer/mockRectangle.ts +++ b/test/testUtils/mocks/mocksContainer/mockRectangle.ts @@ -47,9 +47,13 @@ export default class MockRectangle implements MockGameObject { this.list = []; } - add(obj): this { + add(obj: MockGameObject | MockGameObject[]): this { // Adds a child to this Game Object. - this.list.push(obj); + if (Array.isArray(obj)) { + this.list.push(...obj); + } else { + this.list.push(obj); + } return this; } diff --git a/test/testUtils/mocks/mocksContainer/mockSprite.ts b/test/testUtils/mocks/mocksContainer/mockSprite.ts index b8ccfcced1f..ad70b6ced07 100644 --- a/test/testUtils/mocks/mocksContainer/mockSprite.ts +++ b/test/testUtils/mocks/mocksContainer/mockSprite.ts @@ -201,9 +201,13 @@ export default class MockSprite implements MockGameObject { return this; } - add(obj): this { + add(obj: MockGameObject | MockGameObject[]): this { // Adds a child to this Game Object. - this.list.push(obj); + if (Array.isArray(obj)) { + this.list.push(...obj); + } else { + this.list.push(obj); + } return this; } From 8fcb33d11aab3586e452ed02a668774677f65239 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Thu, 29 May 2025 19:11:53 -0500 Subject: [PATCH 34/44] [Bug] Fix improperly named sprite key for enemy boss' battle UI (#5888) --- src/ui/battle-info/battle-info.ts | 2 +- src/ui/battle-info/enemy-battle-info.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/battle-info/battle-info.ts b/src/ui/battle-info/battle-info.ts index 71596bf0f43..7e6cc12bd3d 100644 --- a/src/ui/battle-info/battle-info.ts +++ b/src/ui/battle-info/battle-info.ts @@ -230,7 +230,7 @@ export default abstract class BattleInfo extends Phaser.GameObjects.Container { this.box = globalScene.add.sprite(0, 0, this.getTextureName()).setName("box").setOrigin(1, 0.5); this.add(this.box); - this.nameText = addTextObject(player ? -115 : -124, player ? -15.2 : -11.2, "", TextStyle.BATTLE_INFO) + this.nameText = addTextObject(posParams.nameTextX, posParams.nameTextY, "", TextStyle.BATTLE_INFO) .setName("text_name") .setOrigin(0); this.add(this.nameText); diff --git a/src/ui/battle-info/enemy-battle-info.ts b/src/ui/battle-info/enemy-battle-info.ts index e8f5434dcf2..7c16f01ac38 100644 --- a/src/ui/battle-info/enemy-battle-info.ts +++ b/src/ui/battle-info/enemy-battle-info.ts @@ -29,7 +29,7 @@ export class EnemyBattleInfo extends BattleInfo { } override getTextureName(): string { - return this.boss ? "pbinfo_enemy_boss_mini" : "pbinfo_enemy_mini"; + return this.boss ? "pbinfo_enemy_boss" : "pbinfo_enemy_mini"; } override constructTypeIcons(): void { From 14e01c3da12e1fa6cabdb87259eaef0bec9c8cbb Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Thu, 29 May 2025 22:27:39 -0500 Subject: [PATCH 35/44] [Test] Add missing methods to many mocks (#5891) --- test/testUtils/mocks/mockGameObject.ts | 3 +++ test/testUtils/mocks/mockVideoGameObject.ts | 17 +++++++++++++---- .../mocks/mocksContainer/mockContainer.ts | 6 ++++++ .../mocks/mocksContainer/mockGraphics.ts | 6 ++++++ .../mocks/mocksContainer/mockRectangle.ts | 6 ++++++ .../mocks/mocksContainer/mockSprite.ts | 6 ++++++ test/testUtils/mocks/mocksContainer/mockText.ts | 5 +++++ .../mocks/mocksContainer/mockTexture.ts | 11 +++++++++++ 8 files changed, 56 insertions(+), 4 deletions(-) diff --git a/test/testUtils/mocks/mockGameObject.ts b/test/testUtils/mocks/mockGameObject.ts index 0dff7c48c73..1e156b99d21 100644 --- a/test/testUtils/mocks/mockGameObject.ts +++ b/test/testUtils/mocks/mockGameObject.ts @@ -1,4 +1,7 @@ export interface MockGameObject { name: string; + active: boolean; destroy?(): void; + setActive(active: boolean): this; + setName(name: string): this; } diff --git a/test/testUtils/mocks/mockVideoGameObject.ts b/test/testUtils/mocks/mockVideoGameObject.ts index 65a5c37b244..1789229b1c7 100644 --- a/test/testUtils/mocks/mockVideoGameObject.ts +++ b/test/testUtils/mocks/mockVideoGameObject.ts @@ -3,11 +3,20 @@ import type { MockGameObject } from "./mockGameObject"; /** Mocks video-related stuff */ export class MockVideoGameObject implements MockGameObject { public name: string; + public active = true; public play = () => null; public stop = () => this; - public setOrigin = () => null; - public setScale = () => null; - public setVisible = () => null; - public setLoop = () => null; + public setOrigin = () => this; + public setScale = () => this; + public setVisible = () => this; + public setLoop = () => this; + public setName = (name: string) => { + this.name = name; + return this; + }; + public setActive = (active: boolean) => { + this.active = active; + return this; + }; } diff --git a/test/testUtils/mocks/mocksContainer/mockContainer.ts b/test/testUtils/mocks/mocksContainer/mockContainer.ts index 883c3856c26..f1371643ce3 100644 --- a/test/testUtils/mocks/mocksContainer/mockContainer.ts +++ b/test/testUtils/mocks/mocksContainer/mockContainer.ts @@ -14,6 +14,7 @@ export default class MockContainer implements MockGameObject { protected textureManager; public list: MockGameObject[] = []; public name: string; + public active = true; constructor(textureManager: MockTextureManager, x: number, y: number) { this.x = x; @@ -306,4 +307,9 @@ export default class MockContainer implements MockGameObject { } return this; } + + setActive(active: boolean): this { + this.active = active; + return this; + } } diff --git a/test/testUtils/mocks/mocksContainer/mockGraphics.ts b/test/testUtils/mocks/mocksContainer/mockGraphics.ts index 1650d2f9f60..cd43bb3a877 100644 --- a/test/testUtils/mocks/mocksContainer/mockGraphics.ts +++ b/test/testUtils/mocks/mocksContainer/mockGraphics.ts @@ -4,6 +4,7 @@ export default class MockGraphics implements MockGameObject { private scene; public list: MockGameObject[] = []; public name: string; + public active = true; constructor(textureManager, _config) { this.scene = textureManager.scene; } @@ -113,4 +114,9 @@ export default class MockGraphics implements MockGameObject { copyPosition(_source): this { return this; } + + setActive(active: boolean): this { + this.active = active; + return this; + } } diff --git a/test/testUtils/mocks/mocksContainer/mockRectangle.ts b/test/testUtils/mocks/mocksContainer/mockRectangle.ts index c11af824c56..7f54a0e255f 100644 --- a/test/testUtils/mocks/mocksContainer/mockRectangle.ts +++ b/test/testUtils/mocks/mocksContainer/mockRectangle.ts @@ -5,6 +5,7 @@ export default class MockRectangle implements MockGameObject { private scene; public list: MockGameObject[] = []; public name: string; + public active = true; constructor(textureManager, _x, _y, _width, _height, fillColor) { this.fillColor = fillColor; @@ -96,4 +97,9 @@ export default class MockRectangle implements MockGameObject { off(): this { return this; } + + setActive(active: boolean): this { + this.active = active; + return this; + } } diff --git a/test/testUtils/mocks/mocksContainer/mockSprite.ts b/test/testUtils/mocks/mocksContainer/mockSprite.ts index ad70b6ced07..df36b3a29fd 100644 --- a/test/testUtils/mocks/mocksContainer/mockSprite.ts +++ b/test/testUtils/mocks/mocksContainer/mockSprite.ts @@ -13,6 +13,7 @@ export default class MockSprite implements MockGameObject { public anims; public list: MockGameObject[] = []; public name: string; + public active = true; constructor(textureManager, x, y, texture) { this.textureManager = textureManager; this.scene = textureManager.scene; @@ -247,4 +248,9 @@ export default class MockSprite implements MockGameObject { this.phaserSprite.copyPosition(obj); return this; } + + setActive(active: boolean): this { + this.phaserSprite.setActive(active); + return this; + } } diff --git a/test/testUtils/mocks/mocksContainer/mockText.ts b/test/testUtils/mocks/mocksContainer/mockText.ts index 8f72cd0d34f..2345ff70c0d 100644 --- a/test/testUtils/mocks/mocksContainer/mockText.ts +++ b/test/testUtils/mocks/mocksContainer/mockText.ts @@ -12,6 +12,7 @@ export default class MockText implements MockGameObject { public text = ""; public name: string; public color?: string; + public active = true; constructor(textureManager, _x, _y, _content, _styleOptions) { this.scene = textureManager.scene; @@ -354,4 +355,8 @@ export default class MockText implements MockGameObject { // biome-ignore lint/complexity/noBannedTypes: This matches the signature of the class this mocks on(_event: string | symbol, _fn: Function, _context?: any) {} + + setActive(_active: boolean): this { + return this; + } } diff --git a/test/testUtils/mocks/mocksContainer/mockTexture.ts b/test/testUtils/mocks/mocksContainer/mockTexture.ts index eb8b70902fa..3b01f9ab4ea 100644 --- a/test/testUtils/mocks/mocksContainer/mockTexture.ts +++ b/test/testUtils/mocks/mocksContainer/mockTexture.ts @@ -12,6 +12,7 @@ export default class MockTexture implements MockGameObject { public frames: object; public firstFrame: string; public name: string; + public active: boolean; constructor(manager, key: string, source) { this.manager = manager; @@ -39,4 +40,14 @@ export default class MockTexture implements MockGameObject { getSourceImage() { return null; } + + setActive(active: boolean): this { + this.active = active; + return this; + } + + setName(name: string): this { + this.name = name; + return this; + } } From ff6f9131ae50da6002a7114a721bea1d727a8dde Mon Sep 17 00:00:00 2001 From: Jimmybald1 <122436263+Jimmybald1@users.noreply.github.com> Date: Fri, 30 May 2025 05:39:55 +0200 Subject: [PATCH 36/44] [Dev] Fixed biome override not working for Daily Mode (#5776) --- src/game-mode.ts | 10 +++++++--- src/overrides.ts | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/game-mode.ts b/src/game-mode.ts index ec7171b0024..97398d2b0a9 100644 --- a/src/game-mode.ts +++ b/src/game-mode.ts @@ -7,7 +7,7 @@ import type PokemonSpecies from "./data/pokemon-species"; import { allSpecies } from "./data/pokemon-species"; import type { Arena } from "./field/arena"; import Overrides from "#app/overrides"; -import { randSeedInt, randSeedItem } from "#app/utils/common"; +import { isNullOrUndefined, randSeedInt, randSeedItem } from "#app/utils/common"; import { Biome } from "#enums/biome"; import { Species } from "#enums/species"; import { Challenges } from "./enums/challenges"; @@ -124,16 +124,20 @@ export class GameMode implements GameModeConfig { /** * @returns either: - * - random biome for Daily mode * - override from overrides.ts + * - random biome for Daily mode * - Town */ getStartingBiome(): Biome { + if (!isNullOrUndefined(Overrides.STARTING_BIOME_OVERRIDE)) { + return Overrides.STARTING_BIOME_OVERRIDE; + } + switch (this.modeId) { case GameModes.DAILY: return getDailyStartingBiome(); default: - return Overrides.STARTING_BIOME_OVERRIDE || Biome.TOWN; + return Biome.TOWN; } } diff --git a/src/overrides.ts b/src/overrides.ts index 5bbd29b355f..95c758d7c43 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -73,7 +73,7 @@ class DefaultOverrides { */ readonly BATTLE_STYLE_OVERRIDE: BattleStyle | null = null; readonly STARTING_WAVE_OVERRIDE: number = 0; - readonly STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN; + readonly STARTING_BIOME_OVERRIDE: Biome | null = null; readonly ARENA_TINT_OVERRIDE: TimeOfDay | null = null; /** Multiplies XP gained by this value including 0. Set to null to ignore the override. */ readonly XP_MULTIPLIER_OVERRIDE: number | null = null; From 901ed7324770e7a8d94cd13f78b5d20796b36ed4 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Thu, 29 May 2025 22:51:36 -0500 Subject: [PATCH 37/44] Cleanup evolution scene handler --- src/ui/evolution-scene-handler.ts | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/evolution-scene-handler.ts index cea91ce4e2c..7372fc6f2b5 100644 --- a/src/ui/evolution-scene-handler.ts +++ b/src/ui/evolution-scene-handler.ts @@ -22,18 +22,12 @@ export default class EvolutionSceneHandler extends MessageUiHandler { const ui = this.getUi(); this.evolutionContainer = globalScene.add.container(0, -globalScene.game.canvas.height / 6); - ui.add(this.evolutionContainer); - const messageBg = globalScene.add.sprite(0, 0, "bg", globalScene.windowType); - messageBg.setOrigin(0, 1); - messageBg.setVisible(false); - ui.add(messageBg); + const messageBg = globalScene.add.sprite(0, 0, "bg", globalScene.windowType).setOrigin(0, 1).setVisible(false); this.messageBg = messageBg; - this.messageContainer = globalScene.add.container(12, -39); - this.messageContainer.setVisible(false); - ui.add(this.messageContainer); + this.messageContainer = globalScene.add.container(12, -39).setVisible(false); const message = addTextObject(0, 0, "", TextStyle.MESSAGE, { maxLines: 2, @@ -43,6 +37,8 @@ export default class EvolutionSceneHandler extends MessageUiHandler { }); this.messageContainer.add(message); + ui.add([this.evolutionContainer, this.messageBg, this.messageContainer]); + this.message = message; this.initPromptSprite(this.messageContainer); @@ -52,10 +48,8 @@ export default class EvolutionSceneHandler extends MessageUiHandler { super.show(_args); globalScene.ui.bringToTop(this.evolutionContainer); - globalScene.ui.bringToTop(this.messageBg); - globalScene.ui.bringToTop(this.messageContainer); - this.messageBg.setVisible(true); - this.messageContainer.setVisible(true); + globalScene.ui.bringToTop(this.messageBg.setVisible(true)); + globalScene.ui.bringToTop(this.messageContainer.setVisible(true)); return true; } From d5f7665b15ef923d102b18c2e812edd73604c372 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Fri, 30 May 2025 12:24:05 -0700 Subject: [PATCH 38/44] [Test] Update test utils (#5848) * [Test] Add/update test utils - Add `FieldHelper` which has methods to mock a pokemon's ability or force a pokemon to be Terastallized - Add `MoveHelper#use` which can be used to remove the need for setting pokemon move overrides by modifying the moveset of the pokemon - Add `MoveHelper#selectEnemyMove` to make an enemy pokemon select a specific move - Add `MoveHelper#forceEnemyMove` which modifies the pokemon's moveset and then uses `selectEnemyMove` - Fix `GameManager#toNextTurn` to work correctly in double battles - Add `GameManager#toEndOfTurn` which advances to the end of the turn * Update some tests - Disable broken Good As Gold test and add `.edgeCase` to Good As Gold - Fix Powder test - Update some tests to demonstrate new methods --- src/data/abilities/ability.ts | 7 +- test/abilities/good_as_gold.test.ts | 32 ++++---- test/moves/alluring_voice.test.ts | 10 +-- test/moves/chloroblast.test.ts | 15 ++-- test/moves/powder.test.ts | 17 ++-- test/testUtils/gameManager.ts | 30 ++++--- test/testUtils/helpers/field-helper.ts | 87 +++++++++++++++++++++ test/testUtils/helpers/moveHelper.ts | 104 ++++++++++++++++++++++++- 8 files changed, 252 insertions(+), 50 deletions(-) create mode 100644 test/testUtils/helpers/field-helper.ts diff --git a/src/data/abilities/ability.ts b/src/data/abilities/ability.ts index b677dd2bd11..f49863639f0 100644 --- a/src/data/abilities/ability.ts +++ b/src/data/abilities/ability.ts @@ -7425,7 +7425,12 @@ export function initAbilities() { .uncopiable() .attr(NoTransformAbilityAbAttr), new Ability(Abilities.GOOD_AS_GOLD, 9) - .attr(MoveImmunityAbAttr, (pokemon, attacker, move) => pokemon !== attacker && move.category === MoveCategory.STATUS && ![ MoveTarget.ENEMY_SIDE, MoveTarget.BOTH_SIDES, MoveTarget.USER_SIDE ].includes(move.moveTarget)) + .attr(MoveImmunityAbAttr, (pokemon, attacker, move) => + pokemon !== attacker + && move.category === MoveCategory.STATUS + && ![ MoveTarget.ENEMY_SIDE, MoveTarget.BOTH_SIDES, MoveTarget.USER_SIDE ].includes(move.moveTarget) + ) + .edgeCase() // Heal Bell should not cure the status of a Pokemon with Good As Gold .ignorable(), new Ability(Abilities.VESSEL_OF_RUIN, 9) .attr(FieldMultiplyStatAbAttr, Stat.SPATK, 0.75) diff --git a/test/abilities/good_as_gold.test.ts b/test/abilities/good_as_gold.test.ts index 09bdaafb11f..9b1d582f64c 100644 --- a/test/abilities/good_as_gold.test.ts +++ b/test/abilities/good_as_gold.test.ts @@ -1,6 +1,6 @@ import { BattlerIndex } from "#app/battle"; -import { allAbilities } from "#app/data/data-lists"; import { ArenaTagSide } from "#app/data/arena-tag"; +import { allAbilities } from "#app/data/data-lists"; import { ArenaTagType } from "#app/enums/arena-tag-type"; import { BattlerTagType } from "#app/enums/battler-tag-type"; import { Stat } from "#app/enums/stat"; @@ -107,35 +107,33 @@ describe("Abilities - Good As Gold", () => { expect(game.scene.getPlayerField()[1].getTag(BattlerTagType.HELPING_HAND)).toBeUndefined(); }); - it("should block the ally's heal bell, but only if the good as gold user is on the field", async () => { - game.override.battleStyle("double"); - game.override.moveset([Moves.HEAL_BELL, Moves.SPLASH]); - game.override.statusEffect(StatusEffect.BURN); - await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.ABRA]); - const [good_as_gold, ball_fetch] = game.scene.getPlayerField(); - - // Force second pokemon to have ball fetch to isolate to a single mon. - vi.spyOn(ball_fetch, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]); + // TODO: re-enable when heal bell is fixed + it.todo("should block the ally's heal bell, but only if the good as gold user is on the field", async () => { + game.override.battleStyle("double").statusEffect(StatusEffect.BURN); + await game.classicMode.startBattle([Species.MILOTIC, Species.FEEBAS, Species.ABRA]); + const [milotic, feebas, abra] = game.scene.getPlayerParty(); + game.field.mockAbility(milotic, Abilities.GOOD_AS_GOLD); + game.field.mockAbility(feebas, Abilities.BALL_FETCH); + game.field.mockAbility(abra, Abilities.BALL_FETCH); // turn 1 - game.move.select(Moves.SPLASH, 0); - game.move.select(Moves.HEAL_BELL, 1); + game.move.use(Moves.SPLASH, 0); + game.move.use(Moves.HEAL_BELL, 1); await game.toNextTurn(); - expect(good_as_gold.status?.effect).toBe(StatusEffect.BURN); + expect(milotic.status?.effect).toBe(StatusEffect.BURN); game.doSwitchPokemon(2); - game.move.select(Moves.HEAL_BELL, 0); + game.move.use(Moves.HEAL_BELL, 1); await game.toNextTurn(); - expect(good_as_gold.status?.effect).toBeUndefined(); + expect(milotic.status?.effect).toBeUndefined(); }); it("should not block field targeted effects like rain dance", async () => { game.override.battleStyle("single"); game.override.enemyMoveset([Moves.RAIN_DANCE]); - game.override.weather(WeatherType.NONE); await game.classicMode.startBattle([Species.MAGIKARP]); - game.move.select(Moves.SPLASH, 0); + game.move.use(Moves.SPLASH, 0); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.RAIN); diff --git a/test/moves/alluring_voice.test.ts b/test/moves/alluring_voice.test.ts index 240e008f311..9265c5f970d 100644 --- a/test/moves/alluring_voice.test.ts +++ b/test/moves/alluring_voice.test.ts @@ -29,20 +29,18 @@ describe("Moves - Alluring Voice", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.ICE_SCALES) - .enemyMoveset([Moves.HOWL]) + .enemyMoveset(Moves.HOWL) .startingLevel(10) .enemyLevel(10) - .starterSpecies(Species.FEEBAS) - .ability(Abilities.BALL_FETCH) - .moveset([Moves.ALLURING_VOICE]); + .ability(Abilities.BALL_FETCH); }); it("should confuse the opponent if their stat stages were raised", async () => { - await game.classicMode.startBattle(); + await game.classicMode.startBattle([Species.FEEBAS]); const enemy = game.scene.getEnemyPokemon()!; - game.move.select(Moves.ALLURING_VOICE); + game.move.use(Moves.ALLURING_VOICE); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to(BerryPhase); diff --git a/test/moves/chloroblast.test.ts b/test/moves/chloroblast.test.ts index 175227bbd5e..b2130da83eb 100644 --- a/test/moves/chloroblast.test.ts +++ b/test/moves/chloroblast.test.ts @@ -1,3 +1,4 @@ +import { MoveResult } from "#app/field/pokemon"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -22,21 +23,23 @@ describe("Moves - Chloroblast", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override - .moveset([Moves.CHLOROBLAST]) .ability(Abilities.BALL_FETCH) .battleStyle("single") .disableCrits() .enemySpecies(Species.MAGIKARP) - .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(Moves.PROTECT); + .enemyAbility(Abilities.BALL_FETCH); }); it("should not deal recoil damage if the opponent uses protect", async () => { await game.classicMode.startBattle([Species.FEEBAS]); - game.move.select(Moves.CHLOROBLAST); - await game.phaseInterceptor.to("BerryPhase"); + game.move.use(Moves.CHLOROBLAST); + await game.move.forceEnemyMove(Moves.PROTECT); + await game.toEndOfTurn(); - expect(game.scene.getPlayerPokemon()!.isFullHp()).toBe(true); + const player = game.field.getPlayerPokemon(); + + expect(player.isFullHp()).toBe(true); + expect(player.getLastXMoves()[0]).toMatchObject({ result: MoveResult.MISS, move: Moves.CHLOROBLAST }); }); }); diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts index 457beb60f91..c6114db3ff1 100644 --- a/test/moves/powder.test.ts +++ b/test/moves/powder.test.ts @@ -1,15 +1,15 @@ -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import Phaser from "phaser"; -import GameManager from "#test/testUtils/gameManager"; +import { BattlerIndex } from "#app/battle"; +import { MoveResult, PokemonMove } from "#app/field/pokemon"; +import { BerryPhase } from "#app/phases/berry-phase"; +import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { MoveResult, PokemonMove } from "#app/field/pokemon"; import { PokemonType } from "#enums/pokemon-type"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; +import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; -import { BattlerIndex } from "#app/battle"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Powder", () => { let phaserGame: Phaser.Game; @@ -161,7 +161,6 @@ describe("Moves - Powder", () => { game.move.select(Moves.ROAR, 0, BattlerIndex.ENEMY_2); game.move.select(Moves.SPLASH, 1); await game.toNextTurn(); - await game.toNextTurn(); // Requires game.toNextTurn() twice due to double battle // Turn 2: Enemy should activate Powder twice: From using Ember, and from copying Fiery Dance via Dancer playerPokemon.hp = playerPokemon.getMaxHp(); diff --git a/test/testUtils/gameManager.ts b/test/testUtils/gameManager.ts index 8dd90decf1a..07cea3b1328 100644 --- a/test/testUtils/gameManager.ts +++ b/test/testUtils/gameManager.ts @@ -5,6 +5,7 @@ import { getMoveTargets } from "#app/data/moves/move"; import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import Trainer from "#app/field/trainer"; import { GameModes, getGameMode } from "#app/game-mode"; +import { globalScene } from "#app/global-scene"; import { ModifierTypeOption, modifierTypes } from "#app/modifier/modifier-type"; import overrides from "#app/overrides"; import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; @@ -22,15 +23,13 @@ import { TitlePhase } from "#app/phases/title-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; -import ErrorInterceptor from "#test/testUtils/errorInterceptor"; -import type InputsHandler from "#test/testUtils/inputsHandler"; import type BallUiHandler from "#app/ui/ball-ui-handler"; import type BattleMessageUiHandler from "#app/ui/battle-message-ui-handler"; import type CommandUiHandler from "#app/ui/command-ui-handler"; import type ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; import type PartyUiHandler from "#app/ui/party-ui-handler"; +import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler"; import type TargetSelectUiHandler from "#app/ui/target-select-ui-handler"; -import { UiMode } from "#enums/ui-mode"; import { isNullOrUndefined } from "#app/utils/common"; import { BattleStyle } from "#enums/battle-style"; import { Button } from "#enums/buttons"; @@ -40,24 +39,26 @@ import type { Moves } from "#enums/moves"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PlayerGender } from "#enums/player-gender"; import type { Species } from "#enums/species"; +import { UiMode } from "#enums/ui-mode"; +import ErrorInterceptor from "#test/testUtils/errorInterceptor"; import { generateStarter, waitUntil } from "#test/testUtils/gameManagerUtils"; import GameWrapper from "#test/testUtils/gameWrapper"; import { ChallengeModeHelper } from "#test/testUtils/helpers/challengeModeHelper"; import { ClassicModeHelper } from "#test/testUtils/helpers/classicModeHelper"; import { DailyModeHelper } from "#test/testUtils/helpers/dailyModeHelper"; +import { FieldHelper } from "#test/testUtils/helpers/field-helper"; import { ModifierHelper } from "#test/testUtils/helpers/modifiersHelper"; import { MoveHelper } from "#test/testUtils/helpers/moveHelper"; import { OverridesHelper } from "#test/testUtils/helpers/overridesHelper"; import { ReloadHelper } from "#test/testUtils/helpers/reloadHelper"; import { SettingsHelper } from "#test/testUtils/helpers/settingsHelper"; +import type InputsHandler from "#test/testUtils/inputsHandler"; +import { MockFetch } from "#test/testUtils/mocks/mockFetch"; import PhaseInterceptor from "#test/testUtils/phaseInterceptor"; import TextInterceptor from "#test/testUtils/TextInterceptor"; import { AES, enc } from "crypto-js"; import fs from "node:fs"; import { expect, vi } from "vitest"; -import { globalScene } from "#app/global-scene"; -import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler"; -import { MockFetch } from "#test/testUtils/mocks/mockFetch"; /** * Class to manage the game state and transitions between phases. @@ -76,6 +77,7 @@ export default class GameManager { public readonly settings: SettingsHelper; public readonly reload: ReloadHelper; public readonly modifiers: ModifierHelper; + public readonly field: FieldHelper; /** * Creates an instance of GameManager. @@ -123,6 +125,7 @@ export default class GameManager { this.settings = new SettingsHelper(this); this.reload = new ReloadHelper(this); this.modifiers = new ModifierHelper(this); + this.field = new FieldHelper(this); this.override.sanitizeOverrides(); // Disables Mystery Encounters on all tests (can be overridden at test level) @@ -383,6 +386,7 @@ export default class GameManager { * @param moveId - The {@linkcode Moves | move} the enemy will use * @param target - The {@linkcode BattlerIndex} of the target against which the enemy will use the given move; * will use normal target selection priorities if omitted. + * @deprecated Use {@linkcode MoveHelper.forceEnemyMove} or {@linkcode MoveHelper.selectEnemyMove} */ async forceEnemyMove(moveId: Moves, target?: BattlerIndex) { // Wait for the next EnemyCommandPhase to start @@ -417,9 +421,15 @@ export default class GameManager { }; } - /** Transition to the next upcoming {@linkcode CommandPhase} */ + /** Transition to the first {@linkcode CommandPhase} of the next turn. */ async toNextTurn() { - await this.phaseInterceptor.to(CommandPhase); + await this.phaseInterceptor.to("TurnInitPhase"); + await this.phaseInterceptor.to("CommandPhase"); + } + + /** Transition to the {@linkcode TurnEndPhase | end of the current turn}. */ + async toEndOfTurn() { + await this.phaseInterceptor.to("TurnEndPhase"); } /** @@ -541,8 +551,8 @@ export default class GameManager { } /** - * Select a pokemon from the party menu during the given phase. - * Only really handles the basic case of "navigate to party slot and press Action twice" - + * Select a pokemon from the party menu during the given phase. + * Only really handles the basic case of "navigate to party slot and press Action twice" - * any menus that come up afterwards are ignored and must be handled separately by the caller. * @param slot - The 0-indexed position of the pokemon in your party to switch to * @param inPhase - Which phase to expect the selection to occur in. Defaults to `SwitchPhase` diff --git a/test/testUtils/helpers/field-helper.ts b/test/testUtils/helpers/field-helper.ts new file mode 100644 index 00000000000..6d762853cad --- /dev/null +++ b/test/testUtils/helpers/field-helper.ts @@ -0,0 +1,87 @@ +// -- start tsdoc imports -- +// biome-ignore lint/correctness/noUnusedImports: TSDoc import +import type { globalScene } from "#app/global-scene"; +// -- end tsdoc imports -- + +import type { BattlerIndex } from "#app/battle"; +import type { Ability } from "#app/data/abilities/ability-class"; +import { allAbilities } from "#app/data/data-lists"; +import type Pokemon from "#app/field/pokemon"; +import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; +import type { Abilities } from "#enums/abilities"; +import type { PokemonType } from "#enums/pokemon-type"; +import { Stat } from "#enums/stat"; +import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; +import { expect, type MockInstance, vi } from "vitest"; + +/** Helper to manage pokemon */ +export class FieldHelper extends GameManagerHelper { + /** + * Passthrough for {@linkcode globalScene.getPlayerPokemon} that adds an `undefined` check for + * the Pokemon so that the return type for the function doesn't have `undefined`. + * This removes the need to add a `!` like when calling `game.scene.getPlayerPokemon()!`. + * @param includeSwitching Whether a pokemon that is currently switching out is valid, default `true` + * @returns The first {@linkcode PlayerPokemon} that is {@linkcode globalScene.getPlayerField on the field} + * and {@linkcode PlayerPokemon.isActive is active} + * (aka {@linkcode PlayerPokemon.isAllowedInBattle is allowed in battle}). + */ + public getPlayerPokemon(includeSwitching = true): PlayerPokemon { + const pokemon = this.game.scene.getPlayerPokemon(includeSwitching); + expect(pokemon).toBeDefined(); + return pokemon!; + } + + /** + * Passthrough for {@linkcode globalScene.getEnemyPokemon} that adds an `undefined` check for + * the Pokemon so that the return type for the function doesn't have `undefined`. + * This removes the need to add a `!` like when calling `game.scene.getEnemyPokemon()!`. + * @param includeSwitching Whether a pokemon that is currently switching out is valid, default `true` + * @returns The first {@linkcode EnemyPokemon} that is {@linkcode globalScene.getEnemyField on the field} + * and {@linkcode EnemyPokemon.isActive is active} + * (aka {@linkcode EnemyPokemon.isAllowedInBattle is allowed in battle}). + */ + public getEnemyPokemon(includeSwitching = true): EnemyPokemon { + const pokemon = this.game.scene.getEnemyPokemon(includeSwitching); + expect(pokemon).toBeDefined(); + return pokemon!; + } + + /** + * @returns The {@linkcode BattlerIndex | indexes} of Pokemon on the field in order of decreasing Speed. + * Speed ties are returned in increasing order of index. + * + * Note: Trick Room does not modify the speed of Pokemon on the field. + */ + public getSpeedOrder(): BattlerIndex[] { + return this.game.scene + .getField(true) + .sort((pA, pB) => pB.getEffectiveStat(Stat.SPD) - pA.getEffectiveStat(Stat.SPD)) + .map(p => p.getBattlerIndex()); + } + + /** + * Mocks a pokemon's ability, overriding its existing ability (takes precedence over global overrides) + * @param pokemon - The pokemon to mock the ability of + * @param ability - The ability to be mocked + * @returns A {@linkcode MockInstance} object + * @see {@linkcode vi.spyOn} + * @see https://vitest.dev/api/mock#mockreturnvalue + */ + public mockAbility(pokemon: Pokemon, ability: Abilities): MockInstance<(baseOnly?: boolean) => Ability> { + return vi.spyOn(pokemon, "getAbility").mockReturnValue(allAbilities[ability]); + } + + /** + * Forces a pokemon to be terastallized. Defaults to the pokemon's primary type if not specified. + * + * This function only mocks the Pokemon's tera-related variables; it does NOT activate any tera-related abilities. + * + * @param pokemon - The pokemon to terastallize. + * @param teraType - (optional) The {@linkcode PokemonType} to terastallize it as. + */ + public forceTera(pokemon: Pokemon, teraType?: PokemonType): void { + vi.spyOn(pokemon, "isTerastallized", "get").mockReturnValue(true); + teraType ??= pokemon.getSpeciesForm(true).type1; + vi.spyOn(pokemon, "teraType", "get").mockReturnValue(teraType); + } +} diff --git a/test/testUtils/helpers/moveHelper.ts b/test/testUtils/helpers/moveHelper.ts index 269cf65ea56..ab10486867d 100644 --- a/test/testUtils/helpers/moveHelper.ts +++ b/test/testUtils/helpers/moveHelper.ts @@ -1,14 +1,16 @@ import type { BattlerIndex } from "#app/battle"; +import { getMoveTargets } from "#app/data/moves/move"; import { Button } from "#app/enums/buttons"; import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; import Overrides from "#app/overrides"; import type { CommandPhase } from "#app/phases/command-phase"; +import type { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { LearnMovePhase } from "#app/phases/learn-move-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Command } from "#app/ui/command-ui-handler"; -import { UiMode } from "#enums/ui-mode"; import { Moves } from "#enums/moves"; +import { UiMode } from "#enums/ui-mode"; import { getMovePosition } from "#test/testUtils/gameManagerUtils"; import { GameManagerHelper } from "#test/testUtils/helpers/gameManagerHelper"; import { vi } from "vitest"; @@ -92,6 +94,35 @@ export class MoveHelper extends GameManagerHelper { } } + /** + * Modifies a player pokemon's moveset to contain only the selected move and then + * selects it to be used during the next {@linkcode CommandPhase}. + * + * Warning: Will disable the player moveset override if it is enabled! + * + * Note: If you need to check for changes in the player's moveset as part of the test, it may be + * best to use {@linkcode changeMoveset} and {@linkcode select} instead. + * @param moveId - the move to use + * @param pkmIndex - the pokemon index. Relevant for double-battles only (defaults to 0) + * @param targetIndex - (optional) The {@linkcode BattlerIndex} of the Pokemon to target for single-target moves, or `null` if a manual call to `selectTarget()` is required + * @param useTera - If `true`, the Pokemon also chooses to Terastallize. This does not require a Tera Orb. Default: `false`. + */ + public use(moveId: Moves, pkmIndex: 0 | 1 = 0, targetIndex?: BattlerIndex | null, useTera = false): void { + if ([Overrides.MOVESET_OVERRIDE].flat().length > 0) { + vi.spyOn(Overrides, "MOVESET_OVERRIDE", "get").mockReturnValue([]); + console.warn("Warning: `use` overwrites the Pokemon's moveset and disables the player moveset override!"); + } + + const pokemon = this.game.scene.getPlayerField()[pkmIndex]; + pokemon.moveset = [new PokemonMove(moveId)]; + + if (useTera) { + this.selectWithTera(moveId, pkmIndex, targetIndex); + return; + } + this.select(moveId, pkmIndex, targetIndex); + } + /** * Forces the Paralysis or Freeze status to activate on the next move by temporarily mocking {@linkcode Overrides.STATUS_ACTIVATION_OVERRIDE}, * advancing to the next `MovePhase`, and then resetting the override to `null` @@ -132,6 +163,77 @@ export class MoveHelper extends GameManagerHelper { console.log(`Pokemon ${pokemon.species.name}'s moveset manually set to ${movesetStr} (=[${moveset.join(", ")}])!`); } + /** + * Forces the next enemy selecting a move to use the given move in its moveset + * against the given target (if applicable). + * @param moveId The {@linkcode MoveId | move} the enemy will use + * @param target (Optional) the {@linkcode BattlerIndex | target} which the enemy will use the given move against + */ + public async selectEnemyMove(moveId: Moves, target?: BattlerIndex) { + // Wait for the next EnemyCommandPhase to start + await this.game.phaseInterceptor.to("EnemyCommandPhase", false); + const enemy = + this.game.scene.getEnemyField()[(this.game.scene.getCurrentPhase() as EnemyCommandPhase).getFieldIndex()]; + const legalTargets = getMoveTargets(enemy, moveId); + + vi.spyOn(enemy, "getNextMove").mockReturnValueOnce({ + move: moveId, + targets: + target !== undefined && !legalTargets.multiple && legalTargets.targets.includes(target) + ? [target] + : enemy.getNextTargets(moveId), + }); + + /** + * Run the EnemyCommandPhase to completion. + * This allows this function to be called consecutively to + * force a move for each enemy in a double battle. + */ + await this.game.phaseInterceptor.to("EnemyCommandPhase"); + } + + /** + * Forces the next enemy selecting a move to use the given move against the given target (if applicable). + * + * Warning: Overwrites the pokemon's moveset and disables the moveset override! + * + * Note: If you need to check for changes in the enemy's moveset as part of the test, it may be + * best to use {@linkcode changeMoveset} and {@linkcode selectEnemyMove} instead. + * @param moveId The {@linkcode MoveId | move} the enemy will use + * @param target (Optional) the {@linkcode BattlerIndex | target} which the enemy will use the given move against + */ + public async forceEnemyMove(moveId: Moves, target?: BattlerIndex) { + // Wait for the next EnemyCommandPhase to start + await this.game.phaseInterceptor.to("EnemyCommandPhase", false); + + const enemy = + this.game.scene.getEnemyField()[(this.game.scene.getCurrentPhase() as EnemyCommandPhase).getFieldIndex()]; + + if ([Overrides.OPP_MOVESET_OVERRIDE].flat().length > 0) { + vi.spyOn(Overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue([]); + console.warn( + "Warning: `forceEnemyMove` overwrites the Pokemon's moveset and disables the enemy moveset override!", + ); + } + enemy.moveset = [new PokemonMove(moveId)]; + const legalTargets = getMoveTargets(enemy, moveId); + + vi.spyOn(enemy, "getNextMove").mockReturnValueOnce({ + move: moveId, + targets: + target !== undefined && !legalTargets.multiple && legalTargets.targets.includes(target) + ? [target] + : enemy.getNextTargets(moveId), + }); + + /** + * Run the EnemyCommandPhase to completion. + * This allows this function to be called consecutively to + * force a move for each enemy in a double battle. + */ + await this.game.phaseInterceptor.to("EnemyCommandPhase"); + } + /** * Simulates learning a move for a player pokemon. * @param move The {@linkcode Moves} being learnt From 5eeff184071cd28bc522355e6c330c9ffe116a22 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Fri, 30 May 2025 14:35:38 -0500 Subject: [PATCH 39/44] [GitHub] Fix gh action path filter (#5904) * Fix test workflow syntax to use negation properly * Add missing id and comparison check in tests.yml * Fix missing curly brace --- .github/test-filters.yml | 14 +++++--------- .github/workflows/tests.yml | 3 ++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/test-filters.yml b/.github/test-filters.yml index 89f4322adea..fc52e85082c 100644 --- a/.github/test-filters.yml +++ b/.github/test-filters.yml @@ -1,7 +1,8 @@ all: - - "src/**" - - "test/**" - - "public/**" + # Negations syntax from https://github.com/dorny/paths-filter/issues/184#issuecomment-2786521554 + - "src/**/!(*.{md,py,sh,gitkeep,gitignore})" + - "test/**/!(*.{md,py,sh,gitkeep,gitignore})" + - "public/**/!(*.{md,py,sh,gitkeep,gitignore})" # Workflows that can impact tests - ".github/workflows/test*.yml" - ".github/test-filters.yml" @@ -11,9 +12,4 @@ all: - "vite*" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts - "tsconfig*.json" # tsconfig.json tweaking can impact compilation - "global.d.ts" - - ".env*" - # Blanket negations for files that cannot impact tests - - "!**/*.py" # No .py files - - "!**/*.sh" # No .sh files - - "!**/*.md" # No .md files - - "!**/.git*" # .gitkeep and family + - ".env*" \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f04a1987eff..f9d26b5568a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,6 +25,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 + id: filter with: filters: .github/test-filters.yml @@ -39,4 +40,4 @@ jobs: project: main shard: ${{ matrix.shard }} totalShards: 10 - skip: ${{ needs.check-path-change-filter.outputs.all == 'false'}} + skip: ${{ needs.check-path-change-filter.outputs.all != 'true'}} From e1be360e74467fa3ec7804580228891fb8c16b25 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Fri, 30 May 2025 16:42:12 -0500 Subject: [PATCH 40/44] [GitHub] Change total shard numbers and change job name (#5905) --- .github/workflows/test-shard-template.yml | 9 +++++---- .github/workflows/tests.yml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-shard-template.yml b/.github/workflows/test-shard-template.yml index a1146cb3497..98836bd335a 100644 --- a/.github/workflows/test-shard-template.yml +++ b/.github/workflows/test-shard-template.yml @@ -19,19 +19,20 @@ on: jobs: test: - name: Shard ${{ inputs.shard }} of ${{ inputs.totalShards }} + # We can't use dynmically named jobs until https://github.com/orgs/community/discussions/13261 is implemented + name: Shard runs-on: ubuntu-latest if: ${{ !inputs.skip }} steps: - name: Check out Git repository uses: actions/checkout@v4.2.2 with: - submodules: 'recursive' + submodules: "recursive" - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' - cache: 'npm' + node-version-file: ".nvmrc" + cache: "npm" - name: Install Node.js dependencies run: npm ci - name: Run tests diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f9d26b5568a..c3b9666caa9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,10 +34,10 @@ jobs: needs: check-path-change-filter strategy: matrix: - shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + shard: [1, 2, 3, 4, 5] uses: ./.github/workflows/test-shard-template.yml with: project: main shard: ${{ matrix.shard }} - totalShards: 10 + totalShards: 5 skip: ${{ needs.check-path-change-filter.outputs.all != 'true'}} From ed0251ea9055cd0c321cbe2d1865cc22f6993100 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Fri, 30 May 2025 18:08:52 -0500 Subject: [PATCH 41/44] [Refactor] Cleanup egg-counter-container (#5892) --- src/ui/egg-counter-container.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ui/egg-counter-container.ts b/src/ui/egg-counter-container.ts index 7bec7c97480..7bb32189681 100644 --- a/src/ui/egg-counter-container.ts +++ b/src/ui/egg-counter-container.ts @@ -43,14 +43,13 @@ export default class EggCounterContainer extends Phaser.GameObjects.Container { this.add(this.eggCountWindow); - const eggSprite = globalScene.add.sprite(19, 18, "egg", "egg_0"); - eggSprite.setScale(0.32); + const eggSprite = globalScene.add.sprite(19, 18, "egg", "egg_0").setScale(0.32); - this.eggCountText = addTextObject(28, 13, `${this.eggCount}`, TextStyle.MESSAGE, { fontSize: "66px" }); - this.eggCountText.setName("text-egg-count"); + this.eggCountText = addTextObject(28, 13, `${this.eggCount}`, TextStyle.MESSAGE, { fontSize: "66px" }).setName( + "text-egg-count", + ); - this.add(eggSprite); - this.add(this.eggCountText); + this.add([eggSprite, this.eggCountText]); } /** From 9a60cc9c716b043764270f6b160d5302663f521e Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Fri, 30 May 2025 18:12:35 -0500 Subject: [PATCH 42/44] [Refactor] Cleanup filter bar (#5896) * Cleanup filter bar * Move DropDownColumn to its own file --------- Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com> --- src/enums/drop-down-column.ts | 9 +++++++++ src/ui/filter-bar.ts | 19 +++---------------- src/ui/pokedex-ui-handler.ts | 3 ++- src/ui/starter-select-ui-handler.ts | 3 ++- test/ui/pokedex.test.ts | 2 +- 5 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 src/enums/drop-down-column.ts diff --git a/src/enums/drop-down-column.ts b/src/enums/drop-down-column.ts new file mode 100644 index 00000000000..b413d1f0bf4 --- /dev/null +++ b/src/enums/drop-down-column.ts @@ -0,0 +1,9 @@ +export enum DropDownColumn { + GEN, + TYPES, + BIOME, + CAUGHT, + UNLOCKS, + MISC, + SORT +} diff --git a/src/ui/filter-bar.ts b/src/ui/filter-bar.ts index 2aade130ed1..622488c04cd 100644 --- a/src/ui/filter-bar.ts +++ b/src/ui/filter-bar.ts @@ -5,16 +5,7 @@ import { addTextObject, getTextColor, TextStyle } from "./text"; import type { UiTheme } from "#enums/ui-theme"; import { addWindow, WindowVariant } from "./ui-theme"; import { globalScene } from "#app/global-scene"; - -export enum DropDownColumn { - GEN, - TYPES, - BIOME, - CAUGHT, - UNLOCKS, - MISC, - SORT, -} +import type { DropDownColumn } from "#enums/drop-down-column"; export class FilterBar extends Phaser.GameObjects.Container { private window: Phaser.GameObjects.NineSlice; @@ -49,13 +40,9 @@ export class FilterBar extends Phaser.GameObjects.Container { this.cursorOffset = cursorOffset; this.window = addWindow(0, 0, width, height, false, false, undefined, undefined, WindowVariant.THIN); - this.add(this.window); - this.cursorObj = globalScene.add.image(1, 1, "cursor"); - this.cursorObj.setScale(0.5); - this.cursorObj.setVisible(false); - this.cursorObj.setOrigin(0, 0); - this.add(this.cursorObj); + this.cursorObj = globalScene.add.image(1, 1, "cursor").setScale(0.5).setVisible(false).setOrigin(0); + this.add([this.window, this.cursorObj]); } /** diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts index 08fe5d7442f..179d5b4664b 100644 --- a/src/ui/pokedex-ui-handler.ts +++ b/src/ui/pokedex-ui-handler.ts @@ -23,7 +23,8 @@ import type { Species } from "#enums/species"; import { Button } from "#enums/buttons"; import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#app/ui/dropdown"; import { PokedexMonContainer } from "#app/ui/pokedex-mon-container"; -import { DropDownColumn, FilterBar } from "#app/ui/filter-bar"; +import { FilterBar } from "#app/ui/filter-bar"; +import { DropDownColumn } from "#enums/drop-down-column"; import { ScrollBar } from "#app/ui/scroll-bar"; import { Abilities } from "#enums/abilities"; import { diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index a971ba86479..ff2298f268d 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -53,7 +53,8 @@ import { Button } from "#enums/buttons"; import { EggSourceType } from "#enums/egg-source-types"; import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#app/ui/dropdown"; import { StarterContainer } from "#app/ui/starter-container"; -import { DropDownColumn, FilterBar } from "#app/ui/filter-bar"; +import { FilterBar } from "#app/ui/filter-bar"; +import { DropDownColumn } from "#enums/drop-down-column"; import { ScrollBar } from "#app/ui/scroll-bar"; import { SelectChallengePhase } from "#app/phases/select-challenge-phase"; import { EncounterPhase } from "#app/phases/encounter-phase"; diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts index ff5ca116ba8..007fc43c3b9 100644 --- a/test/ui/pokedex.test.ts +++ b/test/ui/pokedex.test.ts @@ -8,7 +8,7 @@ import { Abilities } from "#enums/abilities"; import { Species } from "#enums/species"; import { allSpecies, getPokemonSpecies, type PokemonForm } from "#app/data/pokemon-species"; import { Button } from "#enums/buttons"; -import { DropDownColumn } from "#app/ui/filter-bar"; +import { DropDownColumn } from "#enums/drop-down-column"; import type PokemonSpecies from "#app/data/pokemon-species"; import { PokemonType } from "#enums/pokemon-type"; import { UiMode } from "#enums/ui-mode"; From a33638a7a36b01935e40ea876532c770b53f0994 Mon Sep 17 00:00:00 2001 From: Bertie690 <136088738+Bertie690@users.noreply.github.com> Date: Fri, 30 May 2025 19:50:25 -0400 Subject: [PATCH 43/44] [Test] Remove deprecated test funcs (#5906) * Removed `game.startBattle` * Removed `game.forceEnemyMove` * Removed near-unused learn move macro --- test/abilities/aroma_veil.test.ts | 6 +-- test/abilities/battery.test.ts | 6 +-- test/abilities/commander.test.ts | 12 ++--- test/abilities/costar.test.ts | 4 +- test/abilities/cud_chew.test.ts | 4 +- test/abilities/dancer.test.ts | 4 +- test/abilities/desolate-land.test.ts | 12 ++--- test/abilities/flower_gift.test.ts | 8 +-- test/abilities/flower_veil.test.ts | 14 ++--- test/abilities/forecast.test.ts | 14 ++--- test/abilities/friend_guard.test.ts | 24 ++++----- test/abilities/good_as_gold.test.ts | 4 +- test/abilities/gorilla_tactics.test.ts | 6 +-- test/abilities/gulp_missile.test.ts | 4 +- test/abilities/harvest.test.ts | 24 ++++----- test/abilities/heatproof.test.ts | 4 +- test/abilities/hyper_cutter.test.ts | 2 +- test/abilities/libero.test.ts | 30 +++++------ test/abilities/magic_bounce.test.ts | 12 ++--- test/abilities/magic_guard.test.ts | 38 +++++++------- test/abilities/mimicry.test.ts | 8 +-- test/abilities/mirror_armor.test.ts | 42 +++++++-------- test/abilities/moxie.test.ts | 4 +- test/abilities/mycelium_might.test.ts | 6 +-- test/abilities/neutralizing_gas.test.ts | 8 +-- test/abilities/pastel_veil.test.ts | 4 +- test/abilities/perish_body.test.ts | 10 ++-- test/abilities/power_spot.test.ts | 6 +-- test/abilities/protean.test.ts | 30 +++++------ test/abilities/quick_draw.test.ts | 6 +-- test/abilities/sand_veil.test.ts | 2 +- test/abilities/schooling.test.ts | 2 +- test/abilities/screen_cleaner.test.ts | 6 +-- test/abilities/shields_down.test.ts | 12 ++--- test/abilities/simple.test.ts | 2 +- test/abilities/stakeout.test.ts | 8 +-- test/abilities/stall.test.ts | 6 +-- test/abilities/sturdy.test.ts | 8 +-- test/abilities/supreme_overlord.test.ts | 2 +- test/abilities/sweet_veil.test.ts | 8 +-- test/abilities/unburden.test.ts | 16 +++--- test/abilities/wimp_out.test.ts | 4 +- test/abilities/wind_power.test.ts | 8 +-- test/abilities/wonder_skin.test.ts | 4 +- test/abilities/zero_to_hero.test.ts | 8 +-- test/arena/weather_fog.test.ts | 2 +- test/battle/battle-order.test.ts | 10 ++-- test/battle/battle.test.ts | 22 ++++---- test/battle/double_battle.test.ts | 2 +- test/battle/special_battle.test.ts | 18 +++---- test/daily_mode.test.ts | 2 +- test/evolution.test.ts | 6 +-- test/items/dire_hit.test.ts | 4 +- test/items/exp_booster.test.ts | 2 +- test/items/leek.test.ts | 12 ++--- test/items/leftovers.test.ts | 2 +- test/items/light_ball.test.ts | 4 +- test/items/metal_powder.test.ts | 8 +-- test/items/scope_lens.test.ts | 2 +- test/moves/astonish.test.ts | 2 +- test/moves/beat_up.test.ts | 4 +- test/moves/belly_drum.test.ts | 8 +-- test/moves/chilly_reception.test.ts | 2 +- test/moves/clangorous_soul.test.ts | 8 +-- test/moves/crafty_shield.test.ts | 8 +-- test/moves/defog.test.ts | 6 +-- test/moves/disable.test.ts | 4 +- test/moves/double_team.test.ts | 2 +- test/moves/dragon_tail.test.ts | 10 ++-- test/moves/dynamax_cannon.test.ts | 16 +++--- test/moves/encore.test.ts | 2 +- test/moves/fairy_lock.test.ts | 32 +++++------ test/moves/fillet_away.test.ts | 8 +-- test/moves/flame_burst.test.ts | 8 +-- test/moves/flower_shield.test.ts | 8 +-- test/moves/fly.test.ts | 4 +- test/moves/follow_me.test.ts | 16 +++--- test/moves/foresight.test.ts | 4 +- test/moves/fusion_bolt.test.ts | 2 +- test/moves/fusion_flare.test.ts | 2 +- test/moves/fusion_flare_bolt.test.ts | 2 +- test/moves/growth.test.ts | 2 +- test/moves/grudge.test.ts | 8 +-- test/moves/guard_split.test.ts | 4 +- test/moves/hard_press.test.ts | 8 +-- test/moves/haze.test.ts | 2 +- test/moves/hyper_beam.test.ts | 2 +- test/moves/imprison.test.ts | 12 ++--- test/moves/instruct.test.ts | 60 ++++++++++----------- test/moves/jaw_lock.test.ts | 10 ++-- test/moves/last-resort.test.ts | 8 +-- test/moves/lucky_chant.test.ts | 6 +-- test/moves/lunar_blessing.test.ts | 4 +- test/moves/magic_coat.test.ts | 18 +++---- test/moves/magnet_rise.test.ts | 4 +- test/moves/make_it_rain.test.ts | 8 +-- test/moves/mat_block.test.ts | 6 +-- test/moves/metal_burst.test.ts | 8 +-- test/moves/mirror_move.test.ts | 4 +- test/moves/multi_target.test.ts | 4 +- test/moves/parting_shot.test.ts | 20 ++++--- test/moves/plasma_fists.test.ts | 4 +- test/moves/pledge_moves.test.ts | 8 +-- test/moves/powder.test.ts | 12 ++--- test/moves/power_split.test.ts | 4 +- test/moves/purify.test.ts | 4 +- test/moves/quash.test.ts | 16 +++--- test/moves/rage_fist.test.ts | 8 +-- test/moves/rage_powder.test.ts | 8 +-- test/moves/reflect_type.test.ts | 6 +-- test/moves/retaliate.test.ts | 2 +- test/moves/revival_blessing.test.ts | 4 +- test/moves/rollout.test.ts | 2 +- test/moves/round.test.ts | 4 +- test/moves/secret_power.test.ts | 4 +- test/moves/shell_trap.test.ts | 10 ++-- test/moves/speed_swap.test.ts | 2 +- test/moves/spikes.test.ts | 6 +-- test/moves/spit_up.test.ts | 12 ++--- test/moves/spotlight.test.ts | 8 +-- test/moves/stockpile.test.ts | 4 +- test/moves/swallow.test.ts | 12 ++--- test/moves/tackle.test.ts | 4 +- test/moves/tail_whip.test.ts | 2 +- test/moves/taunt.test.ts | 4 +- test/moves/telekinesis.test.ts | 4 +- test/moves/thousand_arrows.test.ts | 6 +-- test/moves/thunder_wave.test.ts | 10 ++-- test/moves/torment.test.ts | 6 +-- test/moves/whirlwind.test.ts | 26 ++++----- test/moves/wide_guard.test.ts | 8 +-- test/phases/learn-move-phase.test.ts | 68 +----------------------- test/testUtils/gameManager.ts | 70 ------------------------- test/testUtils/helpers/moveHelper.ts | 37 ------------- test/ui/type-hints.test.ts | 4 +- 135 files changed, 563 insertions(+), 730 deletions(-) diff --git a/test/abilities/aroma_veil.test.ts b/test/abilities/aroma_veil.test.ts index 38683bcb1e3..aeec33eccf7 100644 --- a/test/abilities/aroma_veil.test.ts +++ b/test/abilities/aroma_veil.test.ts @@ -40,7 +40,7 @@ describe("Moves - Aroma Veil", () => { game.move.select(Moves.GROWL); game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.HEAL_BLOCK); + await game.move.selectEnemyMove(Moves.HEAL_BLOCK); await game.toNextTurn(); party.forEach(p => { expect(p.getTag(BattlerTagType.HEAL_BLOCK)).toBeUndefined(); @@ -54,8 +54,8 @@ describe("Moves - Aroma Veil", () => { game.move.select(Moves.GROWL); game.move.select(Moves.GROWL, 1); - await game.forceEnemyMove(Moves.IMPRISON, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.IMPRISON, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(game.scene.arena.getTag(ArenaTagType.IMPRISON)).toBeDefined(); party.forEach(p => { diff --git a/test/abilities/battery.test.ts b/test/abilities/battery.test.ts index 251ca6ccf16..123889c24af 100644 --- a/test/abilities/battery.test.ts +++ b/test/abilities/battery.test.ts @@ -39,7 +39,7 @@ describe("Abilities - Battery", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([Species.PIKACHU, Species.CHARJABUG]); + await game.classicMode.startBattle([Species.PIKACHU, Species.CHARJABUG]); game.move.select(Moves.DAZZLING_GLEAM); game.move.select(Moves.SPLASH, 1); @@ -54,7 +54,7 @@ describe("Abilities - Battery", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([Species.PIKACHU, Species.CHARJABUG]); + await game.classicMode.startBattle([Species.PIKACHU, Species.CHARJABUG]); game.move.select(Moves.BREAKING_SWIPE); game.move.select(Moves.SPLASH, 1); @@ -69,7 +69,7 @@ describe("Abilities - Battery", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([Species.CHARJABUG, Species.PIKACHU]); + await game.classicMode.startBattle([Species.CHARJABUG, Species.PIKACHU]); game.move.select(Moves.DAZZLING_GLEAM); game.move.select(Moves.SPLASH, 1); diff --git a/test/abilities/commander.test.ts b/test/abilities/commander.test.ts index 0e6cb1b9208..0fddb8e9bf6 100644 --- a/test/abilities/commander.test.ts +++ b/test/abilities/commander.test.ts @@ -59,8 +59,8 @@ describe("Abilities - Commander", () => { expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy(); // Force both enemies to target the Tatsugiri - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); await game.phaseInterceptor.to("BerryPhase", false); game.scene.getEnemyField().forEach(enemy => expect(enemy.getLastXMoves(1)[0].result).toBe(MoveResult.MISS)); @@ -100,8 +100,8 @@ describe("Abilities - Commander", () => { expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy(); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER]); @@ -183,8 +183,8 @@ describe("Abilities - Commander", () => { expect(game.scene.currentBattle.turnCommands[0]?.skip).toBeTruthy(); - await game.forceEnemyMove(Moves.WHIRLWIND, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.WHIRLWIND, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); // Test may time out here if Whirlwind forced out a Pokemon await game.phaseInterceptor.to("TurnEndPhase"); diff --git a/test/abilities/costar.test.ts b/test/abilities/costar.test.ts index 7b1e362689d..02d607c2e9f 100644 --- a/test/abilities/costar.test.ts +++ b/test/abilities/costar.test.ts @@ -33,7 +33,7 @@ describe("Abilities - COSTAR", () => { test("ability copies positive stat stages", async () => { game.override.enemyAbility(Abilities.BALL_FETCH); - await game.startBattle([Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO]); let [leftPokemon, rightPokemon] = game.scene.getPlayerField(); @@ -58,7 +58,7 @@ describe("Abilities - COSTAR", () => { test("ability copies negative stat stages", async () => { game.override.enemyAbility(Abilities.INTIMIDATE); - await game.startBattle([Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP, Species.FLAMIGO]); let [leftPokemon, rightPokemon] = game.scene.getPlayerField(); diff --git a/test/abilities/cud_chew.test.ts b/test/abilities/cud_chew.test.ts index 2f65ac5fd97..60205b62b70 100644 --- a/test/abilities/cud_chew.test.ts +++ b/test/abilities/cud_chew.test.ts @@ -76,7 +76,7 @@ describe("Abilities - Cud Chew", () => { farigiraf.hp = farigiraf.getMaxHp() / 2 - 1; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); // doesn't trigger since cud chew hasn't eaten berry yet @@ -86,7 +86,7 @@ describe("Abilities - Cud Chew", () => { // get heal pulsed back to full before the cud chew proc game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.HEAL_PULSE); + await game.move.selectEnemyMove(Moves.HEAL_PULSE); await game.phaseInterceptor.to("TurnEndPhase"); // globalScene.queueAbilityDisplay should be called twice: diff --git a/test/abilities/dancer.test.ts b/test/abilities/dancer.test.ts index cdd1e3221e9..b85fc7bdcd4 100644 --- a/test/abilities/dancer.test.ts +++ b/test/abilities/dancer.test.ts @@ -77,8 +77,8 @@ describe("Abilities - Dancer", () => { game.move.select(Moves.REVELATION_DANCE, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2); game.move.select(Moves.FIERY_DANCE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.INSTRUCT, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.MIRROR_MOVE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.INSTRUCT, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.MIRROR_MOVE, BattlerIndex.PLAYER); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MovePhase"); // Oricorio rev dance await game.phaseInterceptor.to("MovePhase"); // Feebas fiery dance diff --git a/test/abilities/desolate-land.test.ts b/test/abilities/desolate-land.test.ts index 697bd0a4c48..da2c285e38f 100644 --- a/test/abilities/desolate-land.test.ts +++ b/test/abilities/desolate-land.test.ts @@ -50,8 +50,8 @@ describe("Abilities - Desolate Land", () => { game.move.select(Moves.SPLASH, 0, 2); game.move.select(Moves.SPLASH, 1, 2); - await game.forceEnemyMove(Moves.ROAR, 0); - await game.forceEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.ROAR, 0); + await game.move.selectEnemyMove(Moves.SPLASH, 1); await game.phaseInterceptor.to("TurnEndPhase"); @@ -66,8 +66,8 @@ describe("Abilities - Desolate Land", () => { game.move.select(Moves.SPLASH, 0, 2); game.move.select(Moves.SPLASH, 1, 2); - await game.forceEnemyMove(Moves.ROAR, 1); - await game.forceEnemyMove(Moves.SPLASH, 0); + await game.move.selectEnemyMove(Moves.ROAR, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 0); await game.phaseInterceptor.to("TurnEndPhase"); @@ -103,8 +103,8 @@ describe("Abilities - Desolate Land", () => { game.move.select(Moves.SPLASH, 0, 2); game.move.select(Moves.SPLASH, 1, 2); - await game.forceEnemyMove(Moves.MEMENTO, 0); - await game.forceEnemyMove(Moves.MEMENTO, 1); + await game.move.selectEnemyMove(Moves.MEMENTO, 0); + await game.move.selectEnemyMove(Moves.MEMENTO, 1); await game.phaseInterceptor.to("TurnEndPhase"); diff --git a/test/abilities/flower_gift.test.ts b/test/abilities/flower_gift.test.ts index f2b32dc4c80..df8830bca6d 100644 --- a/test/abilities/flower_gift.test.ts +++ b/test/abilities/flower_gift.test.ts @@ -67,8 +67,8 @@ describe("Abilities - Flower Gift", () => { // turn 1 game.move.select(Moves.SUNNY_DAY, 0); game.move.select(ally_move, 1, ally_target); - await game.forceEnemyMove(enemy_move, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(enemy_move, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); // Ensure sunny day is used last. await game.setTurnOrder([attacker_index, target_index, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER]); await game.phaseInterceptor.to(TurnEndPhase); @@ -79,8 +79,8 @@ describe("Abilities - Flower Gift", () => { // turn 2. Make target use recover to reset hp calculation. game.move.select(Moves.SPLASH, 0, target_index); game.move.select(ally_move, 1, ally_target); - await game.forceEnemyMove(enemy_move, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(enemy_move, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, target_index, attacker_index]); await game.phaseInterceptor.to(TurnEndPhase); const damageWithGift = initialHp - target.hp; diff --git a/test/abilities/flower_veil.test.ts b/test/abilities/flower_veil.test.ts index ce45906c4a9..7f51414d8a5 100644 --- a/test/abilities/flower_veil.test.ts +++ b/test/abilities/flower_veil.test.ts @@ -49,7 +49,7 @@ describe("Abilities - Flower Veil", () => { await game.classicMode.startBattle([Species.BULBASAUR]); const user = game.scene.getPlayerPokemon()!; game.move.select(Moves.REST); - await game.forceEnemyMove(Moves.TACKLE); + await game.move.selectEnemyMove(Moves.TACKLE); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(user.status?.effect).toBe(StatusEffect.SLEEP); @@ -57,7 +57,7 @@ describe("Abilities - Flower Veil", () => { // remove sleep status so we can get burn from the orb user.resetStatus(); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(user.status?.effect).toBe(StatusEffect.BURN); }); @@ -71,8 +71,8 @@ describe("Abilities - Flower Veil", () => { vi.spyOn(ally, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.YAWN, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.YAWN, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.YAWN, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.YAWN, BattlerIndex.PLAYER_2); await game.phaseInterceptor.to("BerryPhase"); const user = game.scene.getPlayerPokemon()!; @@ -86,7 +86,7 @@ describe("Abilities - Flower Veil", () => { await game.classicMode.startBattle([Species.BULBASAUR]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.THUNDER_WAVE); + await game.move.selectEnemyMove(Moves.THUNDER_WAVE); await game.toNextTurn(); expect(game.scene.getPlayerPokemon()!.status).toBeUndefined(); vi.spyOn(allMoves[Moves.THUNDER_WAVE], "accuracy", "get").mockClear(); @@ -101,8 +101,8 @@ describe("Abilities - Flower Veil", () => { vi.spyOn(ally, "getAbility").mockReturnValue(allAbilities[Abilities.BALL_FETCH]); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.THUNDER_WAVE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.THUNDER_WAVE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.THUNDER_WAVE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.THUNDER_WAVE, BattlerIndex.PLAYER_2); await game.phaseInterceptor.to("BerryPhase"); expect(user.status?.effect).toBe(StatusEffect.PARALYSIS); expect(ally.status?.effect).toBe(StatusEffect.PARALYSIS); diff --git a/test/abilities/forecast.test.ts b/test/abilities/forecast.test.ts index 03b5d993a54..f2aa350ef37 100644 --- a/test/abilities/forecast.test.ts +++ b/test/abilities/forecast.test.ts @@ -30,7 +30,7 @@ describe("Abilities - Forecast", () => { */ const testWeatherFormChange = async (game: GameManager, weather: WeatherType, form: number, initialForm?: number) => { game.override.weather(weather).starterForms({ [Species.CASTFORM]: initialForm }); - await game.startBattle([Species.CASTFORM]); + await game.classicMode.startBattle([Species.CASTFORM]); game.move.select(Moves.SPLASH); @@ -44,7 +44,7 @@ describe("Abilities - Forecast", () => { */ const testRevertFormAgainstAbility = async (game: GameManager, ability: Abilities) => { game.override.starterForms({ [Species.CASTFORM]: SUNNY_FORM }).enemyAbility(ability); - await game.startBattle([Species.CASTFORM]); + await game.classicMode.startBattle([Species.CASTFORM]); game.move.select(Moves.SPLASH); @@ -81,7 +81,7 @@ describe("Abilities - Forecast", () => { [Species.GROUDON]: 1, [Species.RAYQUAZA]: 1, }); - await game.startBattle([ + await game.classicMode.startBattle([ Species.CASTFORM, Species.FEEBAS, Species.KYOGRE, @@ -201,7 +201,7 @@ describe("Abilities - Forecast", () => { it("has no effect on Pokémon other than Castform", async () => { game.override.enemyAbility(Abilities.FORECAST).enemySpecies(Species.SHUCKLE); - await game.startBattle([Species.CASTFORM]); + await game.classicMode.startBattle([Species.CASTFORM]); game.move.select(Moves.RAIN_DANCE); await game.phaseInterceptor.to(TurnEndPhase); @@ -212,7 +212,7 @@ describe("Abilities - Forecast", () => { it("reverts to Normal Form when Forecast is suppressed, changes form to match the weather when it regains it", async () => { game.override.enemyMoveset([Moves.GASTRO_ACID]).weather(WeatherType.RAIN); - await game.startBattle([Species.CASTFORM, Species.PIKACHU]); + await game.classicMode.startBattle([Species.CASTFORM, Species.PIKACHU]); const castform = game.scene.getPlayerPokemon()!; expect(castform.formIndex).toBe(RAINY_FORM); @@ -243,7 +243,7 @@ describe("Abilities - Forecast", () => { it("does not change Castform's form until after Stealth Rock deals damage", async () => { game.override.weather(WeatherType.RAIN).enemyMoveset([Moves.STEALTH_ROCK]); - await game.startBattle([Species.PIKACHU, Species.CASTFORM]); + await game.classicMode.startBattle([Species.PIKACHU, Species.CASTFORM]); // First turn - set up stealth rock game.move.select(Moves.SPLASH); @@ -267,7 +267,7 @@ describe("Abilities - Forecast", () => { it("should be in Normal Form after the user is switched out", async () => { game.override.weather(WeatherType.RAIN); - await game.startBattle([Species.CASTFORM, Species.MAGIKARP]); + await game.classicMode.startBattle([Species.CASTFORM, Species.MAGIKARP]); const castform = game.scene.getPlayerPokemon()!; expect(castform.formIndex).toBe(RAINY_FORM); diff --git a/test/abilities/friend_guard.test.ts b/test/abilities/friend_guard.test.ts index 0afe678b175..350ff737c58 100644 --- a/test/abilities/friend_guard.test.ts +++ b/test/abilities/friend_guard.test.ts @@ -43,8 +43,8 @@ describe("Moves - Friend Guard", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); // Get the last return value from `getAttackDamage` @@ -60,8 +60,8 @@ describe("Moves - Friend Guard", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); // Get the last return value from `getAttackDamage` @@ -83,8 +83,8 @@ describe("Moves - Friend Guard", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const turn1Damage = spy.mock.results[spy.mock.results.length - 1].value.damage; @@ -93,8 +93,8 @@ describe("Moves - Friend Guard", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const turn2Damage = spy.mock.results[spy.mock.results.length - 1].value.damage; @@ -109,8 +109,8 @@ describe("Moves - Friend Guard", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.DRAGON_RAGE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.DRAGON_RAGE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const turn1Damage = spy.mock.results[spy.mock.results.length - 1].value.damage; @@ -120,8 +120,8 @@ describe("Moves - Friend Guard", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.DRAGON_RAGE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.DRAGON_RAGE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const turn2Damage = spy.mock.results[spy.mock.results.length - 1].value.damage; diff --git a/test/abilities/good_as_gold.test.ts b/test/abilities/good_as_gold.test.ts index 9b1d582f64c..adb54810381 100644 --- a/test/abilities/good_as_gold.test.ts +++ b/test/abilities/good_as_gold.test.ts @@ -74,8 +74,8 @@ describe("Abilities - Good As Gold", () => { game.move.select(Moves.SWORDS_DANCE, 0); game.move.select(Moves.SAFEGUARD, 1); - await game.forceEnemyMove(Moves.STEALTH_ROCK); - await game.forceEnemyMove(Moves.HAZE); + await game.move.selectEnemyMove(Moves.STEALTH_ROCK); + await game.move.selectEnemyMove(Moves.HAZE); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); expect(good_as_gold.getAbility().id).toBe(Abilities.GOOD_AS_GOLD); diff --git a/test/abilities/gorilla_tactics.test.ts b/test/abilities/gorilla_tactics.test.ts index edaf1669809..06f0c1d0e3d 100644 --- a/test/abilities/gorilla_tactics.test.ts +++ b/test/abilities/gorilla_tactics.test.ts @@ -39,7 +39,7 @@ describe("Abilities - Gorilla Tactics", () => { const initialAtkStat = darmanitan.getStat(Stat.ATK); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); @@ -57,13 +57,13 @@ describe("Abilities - Gorilla Tactics", () => { // First turn, lock move to Growl game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); // Second turn, Growl is interrupted by Disable await game.toNextTurn(); game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.DISABLE); + await game.move.selectEnemyMove(Moves.DISABLE); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); diff --git a/test/abilities/gulp_missile.test.ts b/test/abilities/gulp_missile.test.ts index 4db2ae4190d..64cd106cc5e 100644 --- a/test/abilities/gulp_missile.test.ts +++ b/test/abilities/gulp_missile.test.ts @@ -241,13 +241,13 @@ describe("Abilities - Gulp Missile", () => { await game.classicMode.startBattle([Species.CRAMORANT]); game.move.select(Moves.SURF); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(game.scene.getPlayerPokemon()!.formIndex).toBe(GULPING_FORM); game.move.select(Moves.SUBSTITUTE); - await game.forceEnemyMove(Moves.POWER_TRIP); + await game.move.selectEnemyMove(Moves.POWER_TRIP); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); diff --git a/test/abilities/harvest.test.ts b/test/abilities/harvest.test.ts index 23c0ed9088c..36b1b879598 100644 --- a/test/abilities/harvest.test.ts +++ b/test/abilities/harvest.test.ts @@ -61,7 +61,7 @@ describe("Abilities - Harvest", () => { await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.NUZZLE); + await game.move.selectEnemyMove(Moves.NUZZLE); await game.phaseInterceptor.to("BerryPhase"); expect(getPlayerBerries()).toHaveLength(0); expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toHaveLength(1); @@ -87,7 +87,7 @@ describe("Abilities - Harvest", () => { // Chug a few berries without harvest (should get tracked) game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.NUZZLE); + await game.move.selectEnemyMove(Moves.NUZZLE); await game.toNextTurn(); expect(milotic.battleData.berriesEaten).toEqual(expect.arrayContaining([BerryType.ENIGMA, BerryType.LUM])); @@ -98,7 +98,7 @@ describe("Abilities - Harvest", () => { vi.spyOn(PostTurnRestoreBerryAbAttr.prototype, "canApplyPostTurn").mockReturnValueOnce(false); game.override.ability(Abilities.HARVEST); game.move.select(Moves.GASTRO_ACID); - await game.forceEnemyMove(Moves.NUZZLE); + await game.move.selectEnemyMove(Moves.NUZZLE); await game.toNextTurn(); @@ -109,7 +109,7 @@ describe("Abilities - Harvest", () => { // proc a high roll and we _should_ get a berry back! game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(milotic.battleData.berriesEaten).toHaveLength(3); @@ -126,7 +126,7 @@ describe("Abilities - Harvest", () => { regieleki.hp = 1; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.doKillOpponents(); await game.phaseInterceptor.to("TurnEndPhase"); @@ -154,7 +154,7 @@ describe("Abilities - Harvest", () => { regieleki.hp = regieleki.getMaxHp() / 4 + 1; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SUPER_FANG); + await game.move.selectEnemyMove(Moves.SUPER_FANG); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); @@ -165,7 +165,7 @@ describe("Abilities - Harvest", () => { // heal up so harvest doesn't proc and kill enemy game.move.select(Moves.EARTHQUAKE); - await game.forceEnemyMove(Moves.HEAL_PULSE); + await game.move.selectEnemyMove(Moves.HEAL_PULSE); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextWave(); @@ -191,7 +191,7 @@ describe("Abilities - Harvest", () => { feebas.battleData.berriesEaten = [BerryType.LUM, BerryType.STARF]; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase"); // Force RNG roll to hit the first berry we find that matches. @@ -219,7 +219,7 @@ describe("Abilities - Harvest", () => { player.battleData.berriesEaten = [BerryType.LUM, BerryType.STARF]; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); expectBerriesContaining(...initBerries); @@ -231,7 +231,7 @@ describe("Abilities - Harvest", () => { await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.INCINERATE); + await game.move.selectEnemyMove(Moves.INCINERATE); await game.phaseInterceptor.to("TurnEndPhase"); expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toEqual([]); @@ -242,7 +242,7 @@ describe("Abilities - Harvest", () => { await game.classicMode.startBattle([Species.FEEBAS]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.KNOCK_OFF); + await game.move.selectEnemyMove(Moves.KNOCK_OFF); await game.phaseInterceptor.to("TurnEndPhase"); expect(game.scene.getPlayerPokemon()?.battleData.berriesEaten).toEqual([]); @@ -308,7 +308,7 @@ describe("Abilities - Harvest", () => { // steal a sitrus and immediately consume it game.move.select(Moves.FALSE_SWIPE); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase"); expect(player.battleData.berriesEaten).toEqual([BerryType.SITRUS]); diff --git a/test/abilities/heatproof.test.ts b/test/abilities/heatproof.test.ts index 016237bb02f..0bec7e4a3db 100644 --- a/test/abilities/heatproof.test.ts +++ b/test/abilities/heatproof.test.ts @@ -38,7 +38,7 @@ describe("Abilities - Heatproof", () => { }); it("reduces Fire type damage by half", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; const initialHP = 1000; @@ -61,7 +61,7 @@ describe("Abilities - Heatproof", () => { it("reduces Burn damage by half", async () => { game.override.enemyStatusEffect(StatusEffect.BURN).enemySpecies(Species.ABRA); - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/abilities/hyper_cutter.test.ts b/test/abilities/hyper_cutter.test.ts index 99a9db28025..76b66c2990e 100644 --- a/test/abilities/hyper_cutter.test.ts +++ b/test/abilities/hyper_cutter.test.ts @@ -34,7 +34,7 @@ describe("Abilities - Hyper Cutter", () => { // Reference Link: https://bulbapedia.bulbagarden.net/wiki/Hyper_Cutter_(Ability) it("only prevents ATK drops", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/abilities/libero.test.ts b/test/abilities/libero.test.ts index a6942b18aad..ea4e288bdb0 100644 --- a/test/abilities/libero.test.ts +++ b/test/abilities/libero.test.ts @@ -39,7 +39,7 @@ describe("Abilities - Libero", () => { test("ability applies and changes a pokemon's type", async () => { game.override.moveset([Moves.SPLASH]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -54,7 +54,7 @@ describe("Abilities - Libero", () => { test.skip("ability applies only once per switch in", async () => { game.override.moveset([Moves.SPLASH, Moves.AGILITY]); - await game.startBattle([Species.MAGIKARP, Species.BULBASAUR]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.BULBASAUR]); let leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -90,7 +90,7 @@ describe("Abilities - Libero", () => { test("ability applies correctly even if the pokemon's move has a variable type", async () => { game.override.moveset([Moves.WEATHER_BALL]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -110,7 +110,7 @@ describe("Abilities - Libero", () => { game.override.moveset([Moves.TACKLE]); game.override.passiveAbility(Abilities.REFRIGERATE); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -128,7 +128,7 @@ describe("Abilities - Libero", () => { test("ability applies correctly even if the pokemon's move calls another move", async () => { game.override.moveset([Moves.NATURE_POWER]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -143,7 +143,7 @@ describe("Abilities - Libero", () => { test("ability applies correctly even if the pokemon's move is delayed / charging", async () => { game.override.moveset([Moves.DIG]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -158,7 +158,7 @@ describe("Abilities - Libero", () => { game.override.moveset([Moves.TACKLE]); game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -176,7 +176,7 @@ describe("Abilities - Libero", () => { game.override.moveset([Moves.TACKLE]); game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -191,7 +191,7 @@ describe("Abilities - Libero", () => { game.override.moveset([Moves.TACKLE]); game.override.enemySpecies(Species.GASTLY); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -205,7 +205,7 @@ describe("Abilities - Libero", () => { test("ability is not applied if pokemon's type is the same as the move's type", async () => { game.override.moveset([Moves.SPLASH]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -220,7 +220,7 @@ describe("Abilities - Libero", () => { test("ability is not applied if pokemon is terastallized", async () => { game.override.moveset([Moves.SPLASH]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -236,7 +236,7 @@ describe("Abilities - Libero", () => { test("ability is not applied if pokemon uses struggle", async () => { game.override.moveset([Moves.STRUGGLE]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -250,7 +250,7 @@ describe("Abilities - Libero", () => { test("ability is not applied if the pokemon's move fails", async () => { game.override.moveset([Moves.BURN_UP]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -265,7 +265,7 @@ describe("Abilities - Libero", () => { game.override.moveset([Moves.TRICK_OR_TREAT]); game.override.enemySpecies(Species.GASTLY); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -279,7 +279,7 @@ describe("Abilities - Libero", () => { test("ability applies correctly and the pokemon curses itself", async () => { game.override.moveset([Moves.CURSE]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); diff --git a/test/abilities/magic_bounce.test.ts b/test/abilities/magic_bounce.test.ts index 78e4114724c..be1ad2b413a 100644 --- a/test/abilities/magic_bounce.test.ts +++ b/test/abilities/magic_bounce.test.ts @@ -52,7 +52,7 @@ describe("Abilities - Magic Bounce", () => { game.override.enemyMoveset([Moves.FLY]); game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.FLY); + await game.move.selectEnemyMove(Moves.FLY); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); @@ -183,7 +183,7 @@ describe("Abilities - Magic Bounce", () => { // turn 1 game.move.select(Moves.ENCORE); - await game.forceEnemyMove(Moves.TACKLE); + await game.move.selectEnemyMove(Moves.TACKLE); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE); @@ -209,7 +209,7 @@ describe("Abilities - Magic Bounce", () => { // turn 1 game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.TACKLE); + await game.move.selectEnemyMove(Moves.TACKLE); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); @@ -218,7 +218,7 @@ describe("Abilities - Magic Bounce", () => { // turn 2 game.move.select(Moves.ENCORE); - await game.forceEnemyMove(Moves.TACKLE); + await game.move.selectEnemyMove(Moves.TACKLE); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase"); expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE); @@ -254,7 +254,7 @@ describe("Abilities - Magic Bounce", () => { vi.spyOn(stomping_tantrum, "calculateBattlePower"); game.move.select(Moves.SPORE); - await game.forceEnemyMove(Moves.CHARM); + await game.move.selectEnemyMove(Moves.CHARM); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.getLastXMoves(1)[0].result).toBe("success"); @@ -346,7 +346,7 @@ describe("Abilities - Magic Bounce", () => { game.override.moveset([Moves.TOXIC, Moves.CHARM]); await game.classicMode.startBattle([Species.BULBASAUR]); game.move.select(Moves.TOXIC); - await game.forceEnemyMove(Moves.FLY); + await game.move.selectEnemyMove(Moves.FLY); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.TOXIC); diff --git a/test/abilities/magic_guard.test.ts b/test/abilities/magic_guard.test.ts index 96a9f4dab74..61d06a74c58 100644 --- a/test/abilities/magic_guard.test.ts +++ b/test/abilities/magic_guard.test.ts @@ -46,7 +46,7 @@ describe("Abilities - Magic Guard", () => { it("ability should prevent damage caused by weather", async () => { game.override.weather(WeatherType.SANDSTORM); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -70,7 +70,7 @@ describe("Abilities - Magic Guard", () => { //Toxic keeps track of the turn counters -> important that Magic Guard keeps track of post-Toxic turns game.override.statusEffect(StatusEffect.POISON); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -91,7 +91,7 @@ describe("Abilities - Magic Guard", () => { game.override.enemyMoveset([Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED, Moves.WORRY_SEED]); game.override.statusEffect(StatusEffect.POISON); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -110,7 +110,7 @@ describe("Abilities - Magic Guard", () => { game.override.enemyStatusEffect(StatusEffect.BURN); game.override.enemyAbility(Abilities.MAGIC_GUARD); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.SPLASH); @@ -132,7 +132,7 @@ describe("Abilities - Magic Guard", () => { game.override.enemyStatusEffect(StatusEffect.TOXIC); game.override.enemyAbility(Abilities.MAGIC_GUARD); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.SPLASH); @@ -159,7 +159,7 @@ describe("Abilities - Magic Guard", () => { const newTag = getArenaTag(ArenaTagType.SPIKES, 5, Moves.SPIKES, 0, 0, ArenaTagSide.BOTH)!; game.scene.arena.tags.push(newTag); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); @@ -184,7 +184,7 @@ describe("Abilities - Magic Guard", () => { game.scene.arena.tags.push(playerTag); game.scene.arena.tags.push(enemyTag); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); @@ -206,7 +206,7 @@ describe("Abilities - Magic Guard", () => { }); it("Magic Guard prevents against damage from volatile status effects", async () => { - await game.startBattle([Species.DUSKULL]); + await game.classicMode.startBattle([Species.DUSKULL]); game.override.moveset([Moves.CURSE]); game.override.enemyAbility(Abilities.MAGIC_GUARD); @@ -231,7 +231,7 @@ describe("Abilities - Magic Guard", () => { it("Magic Guard prevents crash damage", async () => { game.override.moveset([Moves.HIGH_JUMP_KICK]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -249,7 +249,7 @@ describe("Abilities - Magic Guard", () => { it("Magic Guard prevents damage from recoil", async () => { game.override.moveset([Moves.TAKE_DOWN]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -266,7 +266,7 @@ describe("Abilities - Magic Guard", () => { it("Magic Guard does not prevent damage from Struggle's recoil", async () => { game.override.moveset([Moves.STRUGGLE]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -284,7 +284,7 @@ describe("Abilities - Magic Guard", () => { //This tests different move attributes than the recoil tests above it("Magic Guard prevents self-damage from attacking moves", async () => { game.override.moveset([Moves.STEEL_BEAM]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -301,7 +301,7 @@ describe("Abilities - Magic Guard", () => { /* it("Magic Guard does not prevent self-damage from confusion", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.CHARM); @@ -311,7 +311,7 @@ describe("Abilities - Magic Guard", () => { it("Magic Guard does not prevent self-damage from non-attacking moves", async () => { game.override.moveset([Moves.BELLY_DRUM]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -333,7 +333,7 @@ describe("Abilities - Magic Guard", () => { game.override.enemyMoveset([Moves.SPORE, Moves.SPORE, Moves.SPORE, Moves.SPORE]); game.override.enemyAbility(Abilities.BAD_DREAMS); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -355,7 +355,7 @@ describe("Abilities - Magic Guard", () => { game.override.moveset([Moves.TACKLE]); game.override.enemyAbility(Abilities.AFTERMATH); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -379,7 +379,7 @@ describe("Abilities - Magic Guard", () => { game.override.moveset([Moves.TACKLE]); game.override.enemyAbility(Abilities.IRON_BARBS); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -402,7 +402,7 @@ describe("Abilities - Magic Guard", () => { game.override.moveset([Moves.ABSORB]); game.override.enemyAbility(Abilities.LIQUID_OOZE); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -425,7 +425,7 @@ describe("Abilities - Magic Guard", () => { game.override.passiveAbility(Abilities.SOLAR_POWER); game.override.weather(WeatherType.SUNNY); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase); diff --git a/test/abilities/mimicry.test.ts b/test/abilities/mimicry.test.ts index 598f5790aa8..de196ffc939 100644 --- a/test/abilities/mimicry.test.ts +++ b/test/abilities/mimicry.test.ts @@ -55,7 +55,7 @@ describe("Abilities - Mimicry", () => { const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.TRANSFORM); - await game.forceEnemyMove(Moves.PSYCHIC_TERRAIN); + await game.move.selectEnemyMove(Moves.PSYCHIC_TERRAIN); await game.toNextTurn(); expect(playerPokemon?.getTypes().includes(PokemonType.PSYCHIC)).toBe(true); @@ -64,7 +64,7 @@ describe("Abilities - Mimicry", () => { } game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(playerPokemon?.getTypes().includes(PokemonType.ELECTRIC)).toBe(true); }); @@ -75,13 +75,13 @@ describe("Abilities - Mimicry", () => { const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.FORESTS_CURSE); + await game.move.selectEnemyMove(Moves.FORESTS_CURSE); await game.toNextTurn(); expect(playerPokemon?.summonData.addedType).toBe(PokemonType.GRASS); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.GRASSY_TERRAIN); + await game.move.selectEnemyMove(Moves.GRASSY_TERRAIN); await game.phaseInterceptor.to("TurnEndPhase"); expect(playerPokemon?.summonData.addedType).toBeNull(); diff --git a/test/abilities/mirror_armor.test.ts b/test/abilities/mirror_armor.test.ts index bd61f39ba75..5f9c63531d4 100644 --- a/test/abilities/mirror_armor.test.ts +++ b/test/abilities/mirror_armor.test.ts @@ -46,7 +46,7 @@ describe("Ability - Mirror Armor", () => { // Enemy has intimidate, enemy should lose -1 atk game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); await game.toNextTurn(); expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1); @@ -63,7 +63,7 @@ describe("Ability - Mirror Armor", () => { // Enemy has intimidate, enemy should lose -1 atk game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); await game.toNextTurn(); expect(userPokemon.getStatStage(Stat.ATK)).toBe(-1); @@ -82,8 +82,8 @@ describe("Ability - Mirror Armor", () => { // Enemy has intimidate, enemy should lose -2 atk each game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); await game.toNextTurn(); expect(enemy1.getStatStage(Stat.ATK)).toBe(-2); @@ -104,8 +104,8 @@ describe("Ability - Mirror Armor", () => { // Enemy has intimidate, enemy should lose -1 atk game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); await game.toNextTurn(); expect(enemy1.getStatStage(Stat.ATK)).toBe(0); @@ -124,7 +124,7 @@ describe("Ability - Mirror Armor", () => { // Enemy has intimidate and uses tickle, enemy receives -2 atk and -1 defense game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); await game.toNextTurn(); expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(-1); @@ -144,8 +144,8 @@ describe("Ability - Mirror Armor", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER_2); await game.toNextTurn(); expect(player1.getStatStage(Stat.ATK)).toBe(0); @@ -168,7 +168,7 @@ describe("Ability - Mirror Armor", () => { // Enemy has intimidate and uses tickle, enemy receives -2 atk and -1 defense game.move.select(Moves.TICKLE); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); await game.toNextTurn(); expect(userPokemon.getStatStage(Stat.DEF)).toBe(-1); @@ -187,7 +187,7 @@ describe("Ability - Mirror Armor", () => { // Enemy has intimidate and uses tickle, enemy has white smoke, no one loses stats game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TICKLE, BattlerIndex.PLAYER); await game.toNextTurn(); expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); @@ -206,7 +206,7 @@ describe("Ability - Mirror Armor", () => { // Enemy has intimidate and uses tickle, enemy has white smoke, no one loses stats game.move.select(Moves.TICKLE); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); await game.toNextTurn(); expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); @@ -224,7 +224,7 @@ describe("Ability - Mirror Armor", () => { // Enemy uses octolock, player loses stats at end of turn game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.OCTOLOCK, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.OCTOLOCK, BattlerIndex.PLAYER); await game.toNextTurn(); expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); @@ -242,7 +242,7 @@ describe("Ability - Mirror Armor", () => { // Player uses octolock, enemy loses stats at end of turn game.move.select(Moves.OCTOLOCK); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); await game.toNextTurn(); expect(userPokemon.getStatStage(Stat.DEF)).toBe(0); @@ -261,7 +261,7 @@ describe("Ability - Mirror Armor", () => { const userPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); await game.toNextTurn(); expect(userPokemon.getStatStage(Stat.ATK)).toBe(-1); @@ -276,11 +276,11 @@ describe("Ability - Mirror Armor", () => { const userPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.STICKY_WEB, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.STICKY_WEB, BattlerIndex.PLAYER); await game.toNextTurn(); game.doSwitchPokemon(1); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); await game.toNextTurn(); expect(userPokemon.getStatStage(Stat.SPD)).toBe(0); @@ -297,14 +297,14 @@ describe("Ability - Mirror Armor", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.STICKY_WEB, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.STICKY_WEB, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); await game.toNextTurn(); game.doSwitchPokemon(2); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER_2); await game.toNextTurn(); expect(enemy1.getStatStage(Stat.SPD)).toBe(-1); diff --git a/test/abilities/moxie.test.ts b/test/abilities/moxie.test.ts index bccdeda2b93..d4e1927e077 100644 --- a/test/abilities/moxie.test.ts +++ b/test/abilities/moxie.test.ts @@ -38,7 +38,7 @@ describe("Abilities - Moxie", () => { it("should raise ATK stat stage by 1 when winning a battle", async () => { const moveToUse = Moves.AERIAL_ACE; - await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -56,7 +56,7 @@ describe("Abilities - Moxie", () => { async () => { game.override.battleStyle("double"); const moveToUse = Moves.AERIAL_ACE; - await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); const [firstPokemon, secondPokemon] = game.scene.getPlayerField(); diff --git a/test/abilities/mycelium_might.test.ts b/test/abilities/mycelium_might.test.ts index 4a5700045fa..18465f9b64e 100644 --- a/test/abilities/mycelium_might.test.ts +++ b/test/abilities/mycelium_might.test.ts @@ -41,7 +41,7 @@ describe("Abilities - Mycelium Might", () => { **/ it("will move last in its priority bracket and ignore protective abilities", async () => { - await game.startBattle([Species.REGIELEKI]); + await game.classicMode.startBattle([Species.REGIELEKI]); const enemyPokemon = game.scene.getEnemyPokemon(); const playerIndex = game.scene.getPlayerPokemon()?.getBattlerIndex(); @@ -65,7 +65,7 @@ describe("Abilities - Mycelium Might", () => { it("will still go first if a status move that is in a higher priority bracket than the opponent's move is used", async () => { game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); - await game.startBattle([Species.REGIELEKI]); + await game.classicMode.startBattle([Species.REGIELEKI]); const enemyPokemon = game.scene.getEnemyPokemon(); const playerIndex = game.scene.getPlayerPokemon()?.getBattlerIndex(); @@ -87,7 +87,7 @@ describe("Abilities - Mycelium Might", () => { }, 20000); it("will not affect non-status moves", async () => { - await game.startBattle([Species.REGIELEKI]); + await game.classicMode.startBattle([Species.REGIELEKI]); const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex(); const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex(); diff --git a/test/abilities/neutralizing_gas.test.ts b/test/abilities/neutralizing_gas.test.ts index 979583b7d97..cf19f36c9d0 100644 --- a/test/abilities/neutralizing_gas.test.ts +++ b/test/abilities/neutralizing_gas.test.ts @@ -110,16 +110,16 @@ describe("Abilities - Neutralizing Gas", () => { await game.classicMode.startBattle([Species.ACCELGOR, Species.ACCELGOR]); game.move.select(Moves.SPLASH, 0); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.ENTRAINMENT, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.ENTRAINMENT, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeDefined(); // Now one neut gas user is left game.move.select(Moves.SPLASH, 0); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.ENTRAINMENT, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.ENTRAINMENT, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.arena.getTag(ArenaTagType.NEUTRALIZING_GAS)).toBeUndefined(); // No neut gas users are left diff --git a/test/abilities/pastel_veil.test.ts b/test/abilities/pastel_veil.test.ts index 4ae9763c4a6..21da1d1353d 100644 --- a/test/abilities/pastel_veil.test.ts +++ b/test/abilities/pastel_veil.test.ts @@ -34,7 +34,7 @@ describe("Abilities - Pastel Veil", () => { }); it("prevents the user and its allies from being afflicted by poison", async () => { - await game.startBattle([Species.MAGIKARP, Species.GALAR_PONYTA]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.GALAR_PONYTA]); const ponyta = game.scene.getPlayerField()[1]; const magikarp = game.scene.getPlayerField()[0]; ponyta.abilityIndex = 1; @@ -50,7 +50,7 @@ describe("Abilities - Pastel Veil", () => { }); it("it heals the poisoned status condition of allies if user is sent out into battle", async () => { - await game.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.GALAR_PONYTA]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS, Species.GALAR_PONYTA]); const ponyta = game.scene.getPlayerParty()[2]; const magikarp = game.scene.getPlayerField()[0]; ponyta.abilityIndex = 1; diff --git a/test/abilities/perish_body.test.ts b/test/abilities/perish_body.test.ts index 27e76cb52ad..140e087843c 100644 --- a/test/abilities/perish_body.test.ts +++ b/test/abilities/perish_body.test.ts @@ -64,14 +64,14 @@ describe("Abilities - Perish Song", () => { const magikarp = game.scene.getEnemyPokemon(); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.PERISH_SONG); + await game.move.selectEnemyMove(Moves.PERISH_SONG); await game.toNextTurn(); expect(feebas?.summonData.tags[0].turnCount).toBe(3); expect(magikarp?.summonData.tags[0].turnCount).toBe(3); game.doSwitchPokemon(1); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const cursola = game.scene.getPlayerPokemon(); @@ -79,7 +79,7 @@ describe("Abilities - Perish Song", () => { expect(magikarp?.summonData.tags[0].turnCount).toBe(2); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.AQUA_JET); + await game.move.selectEnemyMove(Moves.AQUA_JET); await game.toNextTurn(); expect(cursola?.summonData.tags.length).toBe(0); @@ -94,7 +94,7 @@ describe("Abilities - Perish Song", () => { const cursola = game.scene.getPlayerPokemon(); game.move.select(Moves.WHIRLWIND); - await game.forceEnemyMove(Moves.PERISH_SONG); + await game.move.selectEnemyMove(Moves.PERISH_SONG); await game.toNextTurn(); const magikarp = game.scene.getEnemyPokemon(); @@ -102,7 +102,7 @@ describe("Abilities - Perish Song", () => { expect(magikarp?.summonData.tags.length).toBe(0); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.AQUA_JET); + await game.move.selectEnemyMove(Moves.AQUA_JET); await game.toNextTurn(); expect(cursola?.summonData.tags[0].turnCount).toBe(2); diff --git a/test/abilities/power_spot.test.ts b/test/abilities/power_spot.test.ts index c3accdb04f8..0a062537202 100644 --- a/test/abilities/power_spot.test.ts +++ b/test/abilities/power_spot.test.ts @@ -39,7 +39,7 @@ describe("Abilities - Power Spot", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([Species.REGIELEKI, Species.STONJOURNER]); + await game.classicMode.startBattle([Species.REGIELEKI, Species.STONJOURNER]); game.move.select(Moves.DAZZLING_GLEAM); game.move.select(Moves.SPLASH, 1); await game.phaseInterceptor.to(MoveEffectPhase); @@ -53,7 +53,7 @@ describe("Abilities - Power Spot", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([Species.REGIELEKI, Species.STONJOURNER]); + await game.classicMode.startBattle([Species.REGIELEKI, Species.STONJOURNER]); game.move.select(Moves.BREAKING_SWIPE); game.move.select(Moves.SPLASH, 1); await game.phaseInterceptor.to(MoveEffectPhase); @@ -67,7 +67,7 @@ describe("Abilities - Power Spot", () => { vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([Species.STONJOURNER, Species.REGIELEKI]); + await game.classicMode.startBattle([Species.STONJOURNER, Species.REGIELEKI]); game.move.select(Moves.BREAKING_SWIPE); game.move.select(Moves.SPLASH, 1); await game.phaseInterceptor.to(TurnEndPhase); diff --git a/test/abilities/protean.test.ts b/test/abilities/protean.test.ts index 8e6b69dabd6..bfe6dd32282 100644 --- a/test/abilities/protean.test.ts +++ b/test/abilities/protean.test.ts @@ -39,7 +39,7 @@ describe("Abilities - Protean", () => { test("ability applies and changes a pokemon's type", async () => { game.override.moveset([Moves.SPLASH]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -54,7 +54,7 @@ describe("Abilities - Protean", () => { test.skip("ability applies only once per switch in", async () => { game.override.moveset([Moves.SPLASH, Moves.AGILITY]); - await game.startBattle([Species.MAGIKARP, Species.BULBASAUR]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.BULBASAUR]); let leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -90,7 +90,7 @@ describe("Abilities - Protean", () => { test("ability applies correctly even if the pokemon's move has a variable type", async () => { game.override.moveset([Moves.WEATHER_BALL]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -110,7 +110,7 @@ describe("Abilities - Protean", () => { game.override.moveset([Moves.TACKLE]); game.override.passiveAbility(Abilities.REFRIGERATE); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -128,7 +128,7 @@ describe("Abilities - Protean", () => { test("ability applies correctly even if the pokemon's move calls another move", async () => { game.override.moveset([Moves.NATURE_POWER]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -143,7 +143,7 @@ describe("Abilities - Protean", () => { test("ability applies correctly even if the pokemon's move is delayed / charging", async () => { game.override.moveset([Moves.DIG]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -158,7 +158,7 @@ describe("Abilities - Protean", () => { game.override.moveset([Moves.TACKLE]); game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -176,7 +176,7 @@ describe("Abilities - Protean", () => { game.override.moveset([Moves.TACKLE]); game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -191,7 +191,7 @@ describe("Abilities - Protean", () => { game.override.moveset([Moves.TACKLE]); game.override.enemySpecies(Species.GASTLY); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -205,7 +205,7 @@ describe("Abilities - Protean", () => { test("ability is not applied if pokemon's type is the same as the move's type", async () => { game.override.moveset([Moves.SPLASH]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -220,7 +220,7 @@ describe("Abilities - Protean", () => { test("ability is not applied if pokemon is terastallized", async () => { game.override.moveset([Moves.SPLASH]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -236,7 +236,7 @@ describe("Abilities - Protean", () => { test("ability is not applied if pokemon uses struggle", async () => { game.override.moveset([Moves.STRUGGLE]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -250,7 +250,7 @@ describe("Abilities - Protean", () => { test("ability is not applied if the pokemon's move fails", async () => { game.override.moveset([Moves.BURN_UP]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -265,7 +265,7 @@ describe("Abilities - Protean", () => { game.override.moveset([Moves.TRICK_OR_TREAT]); game.override.enemySpecies(Species.GASTLY); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); @@ -279,7 +279,7 @@ describe("Abilities - Protean", () => { test("ability applies correctly and the pokemon curses itself", async () => { game.override.moveset([Moves.CURSE]); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; expect(leadPokemon).not.toBe(undefined); diff --git a/test/abilities/quick_draw.test.ts b/test/abilities/quick_draw.test.ts index 79a29b0ce77..e761d236a93 100644 --- a/test/abilities/quick_draw.test.ts +++ b/test/abilities/quick_draw.test.ts @@ -41,7 +41,7 @@ describe("Abilities - Quick Draw", () => { }); test("makes pokemon going first in its priority bracket", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const pokemon = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -63,7 +63,7 @@ describe("Abilities - Quick Draw", () => { retry: 5, }, async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const pokemon = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -83,7 +83,7 @@ describe("Abilities - Quick Draw", () => { test("does not increase priority", async () => { game.override.enemyMoveset([Moves.EXTREME_SPEED]); - await game.startBattle(); + await game.classicMode.startBattle(); const pokemon = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/abilities/sand_veil.test.ts b/test/abilities/sand_veil.test.ts index b82c79c681b..116850e1e5a 100644 --- a/test/abilities/sand_veil.test.ts +++ b/test/abilities/sand_veil.test.ts @@ -38,7 +38,7 @@ describe("Abilities - Sand Veil", () => { }); test("ability should increase the evasiveness of the source", async () => { - await game.startBattle([Species.SNORLAX, Species.BLISSEY]); + await game.classicMode.startBattle([Species.SNORLAX, Species.BLISSEY]); const leadPokemon = game.scene.getPlayerField(); diff --git a/test/abilities/schooling.test.ts b/test/abilities/schooling.test.ts index 803b4d2062a..ac4e3c837c5 100644 --- a/test/abilities/schooling.test.ts +++ b/test/abilities/schooling.test.ts @@ -39,7 +39,7 @@ describe("Abilities - SCHOOLING", () => { [Species.WISHIWASHI]: schoolForm, }); - await game.startBattle([Species.MAGIKARP, Species.WISHIWASHI]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.WISHIWASHI]); const wishiwashi = game.scene.getPlayerParty().find(p => p.species.speciesId === Species.WISHIWASHI)!; expect(wishiwashi).not.toBe(undefined); diff --git a/test/abilities/screen_cleaner.test.ts b/test/abilities/screen_cleaner.test.ts index 840291f6420..ea99ba00f87 100644 --- a/test/abilities/screen_cleaner.test.ts +++ b/test/abilities/screen_cleaner.test.ts @@ -33,7 +33,7 @@ describe("Abilities - Screen Cleaner", () => { game.override.moveset([Moves.HAIL]); game.override.enemyMoveset([Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL, Moves.AURORA_VEIL]); - await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); game.move.select(Moves.HAIL); await game.phaseInterceptor.to(TurnEndPhase); @@ -50,7 +50,7 @@ describe("Abilities - Screen Cleaner", () => { it("removes Light Screen", async () => { game.override.enemyMoveset([Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN, Moves.LIGHT_SCREEN]); - await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase); @@ -67,7 +67,7 @@ describe("Abilities - Screen Cleaner", () => { it("removes Reflect", async () => { game.override.enemyMoveset([Moves.REFLECT, Moves.REFLECT, Moves.REFLECT, Moves.REFLECT]); - await game.startBattle([Species.MAGIKARP, Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.MAGIKARP]); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase); diff --git a/test/abilities/shields_down.test.ts b/test/abilities/shields_down.test.ts index 2f9d2fb1f97..444b1fabf73 100644 --- a/test/abilities/shields_down.test.ts +++ b/test/abilities/shields_down.test.ts @@ -76,7 +76,7 @@ describe("Abilities - SHIELDS DOWN", () => { await game.classicMode.startBattle([Species.MINIOR]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPORE); + await game.move.selectEnemyMove(Moves.SPORE); await game.phaseInterceptor.to(TurnEndPhase); expect(game.scene.getPlayerPokemon()!.status).toBe(undefined); @@ -115,12 +115,12 @@ describe("Abilities - SHIELDS DOWN", () => { // turn 1 game.move.select(Moves.GRAVITY); - await game.forceEnemyMove(Moves.TOXIC_SPIKES); + await game.move.selectEnemyMove(Moves.TOXIC_SPIKES); await game.toNextTurn(); // turn 2 game.doSwitchPokemon(1); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(game.scene.getPlayerPokemon()!.species.speciesId).toBe(Species.MINIOR); @@ -134,7 +134,7 @@ describe("Abilities - SHIELDS DOWN", () => { await game.classicMode.startBattle([Species.MAGIKARP, Species.MINIOR]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.YAWN); + await game.move.selectEnemyMove(Moves.YAWN); await game.phaseInterceptor.to(TurnEndPhase); expect(game.scene.getPlayerPokemon()!.findTag(tag => tag.tagType === BattlerTagType.DROWSY)).toBe(undefined); @@ -146,7 +146,7 @@ describe("Abilities - SHIELDS DOWN", () => { await game.classicMode.startBattle([Species.MINIOR]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.CONFUSE_RAY); + await game.move.selectEnemyMove(Moves.CONFUSE_RAY); await game.phaseInterceptor.to(TurnEndPhase); @@ -162,7 +162,7 @@ describe("Abilities - SHIELDS DOWN", () => { await game.classicMode.startBattle([Species.MINIOR]); game.move.select(Moves.SPORE); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase); expect(game.scene.getEnemyPokemon()!.status?.effect).toBe(StatusEffect.SLEEP); diff --git a/test/abilities/simple.test.ts b/test/abilities/simple.test.ts index 1f084b1bf4c..cf3a692a7b0 100644 --- a/test/abilities/simple.test.ts +++ b/test/abilities/simple.test.ts @@ -31,7 +31,7 @@ describe("Abilities - Simple", () => { }); it("should double stat changes when applied", async () => { - await game.startBattle([Species.SLOWBRO]); + await game.classicMode.startBattle([Species.SLOWBRO]); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/abilities/stakeout.test.ts b/test/abilities/stakeout.test.ts index 8a2231bba0b..d986046a7e1 100644 --- a/test/abilities/stakeout.test.ts +++ b/test/abilities/stakeout.test.ts @@ -42,7 +42,7 @@ describe("Abilities - Stakeout", () => { const [enemy1] = game.scene.getEnemyParty(); game.move.select(Moves.SURF); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const damage1 = enemy1.getInverseHp(); enemy1.hp = enemy1.getMaxHp(); @@ -65,17 +65,17 @@ describe("Abilities - Stakeout", () => { const [enemy1] = game.scene.getEnemyParty(); game.move.select(Moves.SURF); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const damage1 = enemy1.getInverseHp(); enemy1.hp = enemy1.getMaxHp(); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.FLIP_TURN); + await game.move.selectEnemyMove(Moves.FLIP_TURN); await game.toNextTurn(); game.move.select(Moves.SURF); - await game.forceEnemyMove(Moves.FLIP_TURN); + await game.move.selectEnemyMove(Moves.FLIP_TURN); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); diff --git a/test/abilities/stall.test.ts b/test/abilities/stall.test.ts index 68b3fdedcd8..5c17f71c48d 100644 --- a/test/abilities/stall.test.ts +++ b/test/abilities/stall.test.ts @@ -37,7 +37,7 @@ describe("Abilities - Stall", () => { **/ it("Pokemon with Stall should move last in its priority bracket regardless of speed", async () => { - await game.startBattle([Species.SHUCKLE]); + await game.classicMode.startBattle([Species.SHUCKLE]); const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex(); const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex(); @@ -55,7 +55,7 @@ describe("Abilities - Stall", () => { }, 20000); it("Pokemon with Stall will go first if a move that is in a higher priority bracket than the opponent's move is used", async () => { - await game.startBattle([Species.SHUCKLE]); + await game.classicMode.startBattle([Species.SHUCKLE]); const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex(); const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex(); @@ -74,7 +74,7 @@ describe("Abilities - Stall", () => { it("If both Pokemon have stall and use the same move, speed is used to determine who goes first.", async () => { game.override.ability(Abilities.STALL); - await game.startBattle([Species.SHUCKLE]); + await game.classicMode.startBattle([Species.SHUCKLE]); const playerIndex = game.scene.getPlayerPokemon()!.getBattlerIndex(); const enemyIndex = game.scene.getEnemyPokemon()!.getBattlerIndex(); diff --git a/test/abilities/sturdy.test.ts b/test/abilities/sturdy.test.ts index bda8c6d1e35..dbdd1b4570e 100644 --- a/test/abilities/sturdy.test.ts +++ b/test/abilities/sturdy.test.ts @@ -36,14 +36,14 @@ describe("Abilities - Sturdy", () => { }); test("Sturdy activates when user is at full HP", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); game.move.select(Moves.CLOSE_COMBAT); await game.phaseInterceptor.to(MoveEndPhase); expect(game.scene.getEnemyParty()[0].hp).toBe(1); }); test("Sturdy doesn't activate when user is not at full HP", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon: EnemyPokemon = game.scene.getEnemyParty()[0]; enemyPokemon.hp = enemyPokemon.getMaxHp() - 1; @@ -56,7 +56,7 @@ describe("Abilities - Sturdy", () => { }); test("Sturdy pokemon should be immune to OHKO moves", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); game.move.select(Moves.FISSURE); await game.phaseInterceptor.to(MoveEndPhase); @@ -67,7 +67,7 @@ describe("Abilities - Sturdy", () => { test("Sturdy is ignored by pokemon with `Abilities.MOLD_BREAKER`", async () => { game.override.ability(Abilities.MOLD_BREAKER); - await game.startBattle(); + await game.classicMode.startBattle(); game.move.select(Moves.CLOSE_COMBAT); await game.phaseInterceptor.to(DamageAnimPhase); diff --git a/test/abilities/supreme_overlord.test.ts b/test/abilities/supreme_overlord.test.ts index 6cc52de64bf..4c0be80daea 100644 --- a/test/abilities/supreme_overlord.test.ts +++ b/test/abilities/supreme_overlord.test.ts @@ -44,7 +44,7 @@ describe("Abilities - Supreme Overlord", () => { }); it("should increase Power by 20% if 2 Pokemon are fainted in the party", async () => { - await game.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE]); game.move.select(Moves.EXPLOSION); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); diff --git a/test/abilities/sweet_veil.test.ts b/test/abilities/sweet_veil.test.ts index e609aa6e7d2..80d7165619f 100644 --- a/test/abilities/sweet_veil.test.ts +++ b/test/abilities/sweet_veil.test.ts @@ -33,7 +33,7 @@ describe("Abilities - Sweet Veil", () => { }); it("prevents the user and its allies from falling asleep", async () => { - await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]); + await game.classicMode.startBattle([Species.SWIRLIX, Species.MAGIKARP]); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); @@ -45,7 +45,7 @@ describe("Abilities - Sweet Veil", () => { it("causes Rest to fail when used by the user or its allies", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]); + await game.classicMode.startBattle([Species.SWIRLIX, Species.MAGIKARP]); game.move.select(Moves.SPLASH); game.move.select(Moves.REST, 1); @@ -57,7 +57,7 @@ describe("Abilities - Sweet Veil", () => { it("causes Yawn to fail if used on the user or its allies", async () => { game.override.enemyMoveset([Moves.YAWN, Moves.YAWN, Moves.YAWN, Moves.YAWN]); - await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]); + await game.classicMode.startBattle([Species.SWIRLIX, Species.MAGIKARP]); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); @@ -73,7 +73,7 @@ describe("Abilities - Sweet Veil", () => { game.override.startingLevel(5); game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([Species.SHUCKLE, Species.SHUCKLE, Species.SWIRLIX]); + await game.classicMode.startBattle([Species.SHUCKLE, Species.SHUCKLE, Species.SWIRLIX]); game.move.select(Moves.SPLASH); game.move.select(Moves.YAWN, 1, BattlerIndex.PLAYER); diff --git a/test/abilities/unburden.test.ts b/test/abilities/unburden.test.ts index ff28c3b6a09..ea4f84545aa 100644 --- a/test/abilities/unburden.test.ts +++ b/test/abilities/unburden.test.ts @@ -244,8 +244,8 @@ describe("Abilities - Unburden", () => { // Turn 1: Treecko gets hit by False Swipe and eats Sitrus Berry, activating Unburden game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.FALSE_SWIPE, 0); - await game.forceEnemyMove(Moves.FALSE_SWIPE, 0); + await game.move.selectEnemyMove(Moves.FALSE_SWIPE, 0); + await game.move.selectEnemyMove(Moves.FALSE_SWIPE, 0); await game.phaseInterceptor.to("TurnEndPhase"); expect(getHeldItemCount(treecko)).toBeLessThan(playerHeldItems); @@ -302,7 +302,7 @@ describe("Abilities - Unburden", () => { // Turn 1: Get hit by False Swipe and eat Sitrus Berry, activating Unburden game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.FALSE_SWIPE); + await game.move.selectEnemyMove(Moves.FALSE_SWIPE); await game.toNextTurn(); expect(getHeldItemCount(playerPokemon)).toBeLessThan(playerHeldItems); @@ -310,7 +310,7 @@ describe("Abilities - Unburden", () => { // Turn 2: Get hit by Worry Seed, deactivating Unburden game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.WORRY_SEED); + await game.move.selectEnemyMove(Moves.WORRY_SEED); await game.toNextTurn(); expect(getHeldItemCount(playerPokemon)).toBeLessThan(playerHeldItems); @@ -343,13 +343,13 @@ describe("Abilities - Unburden", () => { const initialSpeed = treecko.getStat(Stat.SPD); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.THIEF); + await game.move.selectEnemyMove(Moves.THIEF); game.doSelectPartyPokemon(1); await game.toNextTurn(); game.doRevivePokemon(1); game.doSwitchPokemon(1); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(game.scene.getPlayerPokemon()!).toBe(treecko); @@ -372,8 +372,8 @@ describe("Abilities - Unburden", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.REVIVAL_BLESSING, 1); - await game.forceEnemyMove(Moves.THIEF, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.THIEF, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]); game.doSelectPartyPokemon(0, "RevivalBlessingPhase"); await game.toNextTurn(); diff --git a/test/abilities/wimp_out.test.ts b/test/abilities/wimp_out.test.ts index 67885a82163..32a627f20f9 100644 --- a/test/abilities/wimp_out.test.ts +++ b/test/abilities/wimp_out.test.ts @@ -544,8 +544,8 @@ describe("Abilities - Wimp Out", () => { // turn 1 game.move.select(Moves.DRAGON_ENERGY, 0); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.ENDURE); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.ENDURE); await game.phaseInterceptor.to("SelectModifierPhase"); expect(game.scene.currentBattle.waveIndex).toBe(wave + 1); diff --git a/test/abilities/wind_power.test.ts b/test/abilities/wind_power.test.ts index 66c72d454ab..11585520c73 100644 --- a/test/abilities/wind_power.test.ts +++ b/test/abilities/wind_power.test.ts @@ -31,7 +31,7 @@ describe("Abilities - Wind Power", () => { }); it("it becomes charged when hit by wind moves", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const shiftry = game.scene.getEnemyPokemon()!; expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined(); @@ -46,7 +46,7 @@ describe("Abilities - Wind Power", () => { game.override.ability(Abilities.WIND_POWER); game.override.enemySpecies(Species.MAGIKARP); - await game.startBattle([Species.SHIFTRY]); + await game.classicMode.startBattle([Species.SHIFTRY]); const shiftry = game.scene.getPlayerPokemon()!; expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined(); @@ -61,7 +61,7 @@ describe("Abilities - Wind Power", () => { game.override.enemySpecies(Species.MAGIKARP); game.override.ability(Abilities.WIND_POWER); - await game.startBattle([Species.SHIFTRY]); + await game.classicMode.startBattle([Species.SHIFTRY]); const magikarp = game.scene.getEnemyPokemon()!; const shiftry = game.scene.getPlayerPokemon()!; @@ -79,7 +79,7 @@ describe("Abilities - Wind Power", () => { it("does not interact with Sandstorm", async () => { game.override.enemySpecies(Species.MAGIKARP); - await game.startBattle([Species.SHIFTRY]); + await game.classicMode.startBattle([Species.SHIFTRY]); const shiftry = game.scene.getPlayerPokemon()!; expect(shiftry.getTag(BattlerTagType.CHARGED)).toBeUndefined(); diff --git a/test/abilities/wonder_skin.test.ts b/test/abilities/wonder_skin.test.ts index fd4cc77bd1c..cb5dd4e117f 100644 --- a/test/abilities/wonder_skin.test.ts +++ b/test/abilities/wonder_skin.test.ts @@ -36,7 +36,7 @@ describe("Abilities - Wonder Skin", () => { vi.spyOn(moveToCheck, "calculateBattleAccuracy"); - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.CHARM); await game.phaseInterceptor.to(MoveEffectPhase); @@ -48,7 +48,7 @@ describe("Abilities - Wonder Skin", () => { vi.spyOn(moveToCheck, "calculateBattleAccuracy"); - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.TACKLE); await game.phaseInterceptor.to(MoveEffectPhase); diff --git a/test/abilities/zero_to_hero.test.ts b/test/abilities/zero_to_hero.test.ts index 2cdc516dc6b..c159d007765 100644 --- a/test/abilities/zero_to_hero.test.ts +++ b/test/abilities/zero_to_hero.test.ts @@ -39,7 +39,7 @@ describe("Abilities - ZERO TO HERO", () => { [Species.PALAFIN]: heroForm, }); - await game.startBattle([Species.FEEBAS, Species.PALAFIN, Species.PALAFIN]); + await game.classicMode.startBattle([Species.FEEBAS, Species.PALAFIN, Species.PALAFIN]); const palafin1 = game.scene.getPlayerParty()[1]; const palafin2 = game.scene.getPlayerParty()[2]; @@ -61,7 +61,7 @@ describe("Abilities - ZERO TO HERO", () => { }); it("should swap to Hero form when switching out during a battle", async () => { - await game.startBattle([Species.PALAFIN, Species.FEEBAS]); + await game.classicMode.startBattle([Species.PALAFIN, Species.FEEBAS]); const palafin = game.scene.getPlayerPokemon()!; expect(palafin.formIndex).toBe(baseForm); @@ -72,7 +72,7 @@ describe("Abilities - ZERO TO HERO", () => { }); it("should not swap to Hero form if switching due to faint", async () => { - await game.startBattle([Species.PALAFIN, Species.FEEBAS]); + await game.classicMode.startBattle([Species.PALAFIN, Species.FEEBAS]); const palafin = game.scene.getPlayerPokemon()!; expect(palafin.formIndex).toBe(baseForm); @@ -89,7 +89,7 @@ describe("Abilities - ZERO TO HERO", () => { [Species.PALAFIN]: heroForm, }); - await game.startBattle([Species.PALAFIN, Species.FEEBAS]); + await game.classicMode.startBattle([Species.PALAFIN, Species.FEEBAS]); const palafin = game.scene.getPlayerPokemon()!; expect(palafin.formIndex).toBe(heroForm); diff --git a/test/arena/weather_fog.test.ts b/test/arena/weather_fog.test.ts index ae41c9d14e8..69f167b8cf1 100644 --- a/test/arena/weather_fog.test.ts +++ b/test/arena/weather_fog.test.ts @@ -37,7 +37,7 @@ describe("Weather - Fog", () => { vi.spyOn(moveToCheck, "calculateBattleAccuracy"); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); game.move.select(Moves.TACKLE); await game.phaseInterceptor.to(MoveEffectPhase); diff --git a/test/battle/battle-order.test.ts b/test/battle/battle-order.test.ts index 43fa1e59c14..876730169f9 100644 --- a/test/battle/battle-order.test.ts +++ b/test/battle/battle-order.test.ts @@ -32,7 +32,7 @@ describe("Battle order", () => { }); it("opponent faster than player 50 vs 150", async () => { - await game.startBattle([Species.BULBASAUR]); + await game.classicMode.startBattle([Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -51,7 +51,7 @@ describe("Battle order", () => { }, 20000); it("Player faster than opponent 150 vs 50", async () => { - await game.startBattle([Species.BULBASAUR]); + await game.classicMode.startBattle([Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -71,7 +71,7 @@ describe("Battle order", () => { it("double - both opponents faster than player 50/50 vs 150/150", async () => { game.override.battleStyle("double"); - await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); @@ -95,7 +95,7 @@ describe("Battle order", () => { it("double - speed tie except 1 - 100/100 vs 100/150", async () => { game.override.battleStyle("double"); - await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); @@ -119,7 +119,7 @@ describe("Battle order", () => { it("double - speed tie 100/150 vs 100/150", async () => { game.override.battleStyle("double"); - await game.startBattle([Species.BULBASAUR, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); diff --git a/test/battle/battle.test.ts b/test/battle/battle.test.ts index e980984580e..8c4315dcabc 100644 --- a/test/battle/battle.test.ts +++ b/test/battle/battle.test.ts @@ -85,7 +85,7 @@ describe("Test Battle Phase", () => { }, 20000); it("newGame one-liner", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -98,7 +98,7 @@ describe("Test Battle Phase", () => { game.override.moveset([Moves.TACKLE]); game.override.enemyAbility(Abilities.HYDRATION); game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); - await game.startBattle(); + await game.classicMode.startBattle(); game.move.select(Moves.TACKLE); await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(SelectModifierPhase, false); }, 20000); @@ -112,7 +112,7 @@ describe("Test Battle Phase", () => { game.override.enemyAbility(Abilities.HYDRATION); game.override.enemyMoveset([Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP, Moves.TAIL_WHIP]); game.override.battleStyle("single"); - await game.startBattle(); + await game.classicMode.startBattle(); game.move.select(Moves.TACKLE); await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(TurnInitPhase, false); }, 20000); @@ -127,7 +127,7 @@ describe("Test Battle Phase", () => { }, 20000); it("start battle with selected team", async () => { - await game.startBattle([Species.CHARIZARD, Species.CHANSEY, Species.MEW]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.CHANSEY, Species.MEW]); expect(game.scene.getPlayerParty()[0].species.speciesId).toBe(Species.CHARIZARD); expect(game.scene.getPlayerParty()[1].species.speciesId).toBe(Species.CHANSEY); expect(game.scene.getPlayerParty()[2].species.speciesId).toBe(Species.MEW); @@ -207,7 +207,7 @@ describe("Test Battle Phase", () => { game.override.enemySpecies(Species.MIGHTYENA); game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -217,7 +217,7 @@ describe("Test Battle Phase", () => { game.override.enemySpecies(Species.MIGHTYENA); game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); - await game.startBattle([Species.BLASTOISE]); + await game.classicMode.startBattle([Species.BLASTOISE]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -228,7 +228,7 @@ describe("Test Battle Phase", () => { game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); game.override.startingWave(3); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -239,7 +239,7 @@ describe("Test Battle Phase", () => { game.override.enemyAbility(Abilities.HYDRATION); game.override.ability(Abilities.HYDRATION); game.override.startingWave(3); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD, Species.DARKRAI, Species.GABITE]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD, Species.DARKRAI, Species.GABITE]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); @@ -255,7 +255,7 @@ describe("Test Battle Phase", () => { game.override.startingWave(3); game.override.moveset([moveToUse]); game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); - await game.startBattle([Species.DARMANITAN, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.DARMANITAN, Species.CHARIZARD]); game.move.select(moveToUse); await game.phaseInterceptor.to(DamageAnimPhase, false); @@ -275,7 +275,7 @@ describe("Test Battle Phase", () => { game.override.startingWave(3); game.override.moveset([moveToUse]); game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); - await game.startBattle(); + await game.classicMode.startBattle(); const turn = game.scene.currentBattle.turn; game.move.select(moveToUse); await game.toNextTurn(); @@ -318,7 +318,7 @@ describe("Test Battle Phase", () => { .enemyMoveset(Moves.SPLASH) .startingHeldItems([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }]); - await game.startBattle(); + await game.classicMode.startBattle(); game.scene.getPlayerPokemon()!.hp = 1; game.move.select(moveToUse); diff --git a/test/battle/double_battle.test.ts b/test/battle/double_battle.test.ts index a30d55aac3d..99c52ea5add 100644 --- a/test/battle/double_battle.test.ts +++ b/test/battle/double_battle.test.ts @@ -34,7 +34,7 @@ describe("Double Battles", () => { // (There were bugs that either only summon one when can summon two, player stuck in switchPhase etc) it("3v2 edge case: player summons 2 pokemon on the next battle after being fainted and revived", async () => { game.override.battleStyle("double").enemyMoveset(Moves.SPLASH).moveset(Moves.SPLASH); - await game.startBattle([Species.BULBASAUR, Species.CHARIZARD, Species.SQUIRTLE]); + await game.classicMode.startBattle([Species.BULBASAUR, Species.CHARIZARD, Species.SQUIRTLE]); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH, 1); diff --git a/test/battle/special_battle.test.ts b/test/battle/special_battle.test.ts index 163f23e488d..6f4034cd8cd 100644 --- a/test/battle/special_battle.test.ts +++ b/test/battle/special_battle.test.ts @@ -33,63 +33,63 @@ describe("Test Battle Phase", () => { it("startBattle 2vs1 boss", async () => { game.override.battleStyle("single").startingWave(10); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); it("startBattle 2vs2 boss", async () => { game.override.battleStyle("double").startingWave(10); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); it("startBattle 2vs2 trainer", async () => { game.override.battleStyle("double").startingWave(5); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); it("startBattle 2vs1 trainer", async () => { game.override.battleStyle("single").startingWave(5); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); it("startBattle 2vs1 rival", async () => { game.override.battleStyle("single").startingWave(8); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); it("startBattle 2vs2 rival", async () => { game.override.battleStyle("double").startingWave(8); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); it("startBattle 1vs1 trainer", async () => { game.override.battleStyle("single").startingWave(5); - await game.startBattle([Species.BLASTOISE]); + await game.classicMode.startBattle([Species.BLASTOISE]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); it("startBattle 2vs2 trainer", async () => { game.override.battleStyle("double").startingWave(5); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); it("startBattle 4vs2 trainer", async () => { game.override.battleStyle("double").startingWave(5); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD, Species.DARKRAI, Species.GABITE]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD, Species.DARKRAI, Species.GABITE]); expect(game.scene.ui?.getMode()).toBe(UiMode.COMMAND); expect(game.scene.getCurrentPhase()!.constructor.name).toBe(CommandPhase.name); }, 20000); diff --git a/test/daily_mode.test.ts b/test/daily_mode.test.ts index a7f5784087a..a5901da4821 100644 --- a/test/daily_mode.test.ts +++ b/test/daily_mode.test.ts @@ -30,7 +30,7 @@ describe("Daily Mode", () => { }); it("should initialize properly", async () => { - await game.dailyMode.runToSummon(); + await game.dailyMode.startBattle(); const party = game.scene.getPlayerParty(); expect(party).toHaveLength(3); diff --git a/test/evolution.test.ts b/test/evolution.test.ts index 4f91cd99382..a453d744da8 100644 --- a/test/evolution.test.ts +++ b/test/evolution.test.ts @@ -110,7 +110,7 @@ describe("Evolution", () => { .startingLevel(16) .enemyLevel(50); - await game.startBattle([Species.TOTODILE]); + await game.classicMode.startBattle([Species.TOTODILE]); const totodile = game.scene.getPlayerPokemon()!; const hpBefore = totodile.hp; @@ -138,7 +138,7 @@ describe("Evolution", () => { .startingLevel(13) .enemyLevel(30); - await game.startBattle([Species.CYNDAQUIL]); + await game.classicMode.startBattle([Species.CYNDAQUIL]); const cyndaquil = game.scene.getPlayerPokemon()!; cyndaquil.hp = Math.floor(cyndaquil.getMaxHp() / 2); @@ -171,7 +171,7 @@ describe("Evolution", () => { * If the value is 0, it's a 3 family maushold, whereas if the value is * 1, 2 or 3, it's a 4 family maushold */ - await game.startBattle([Species.TANDEMAUS]); // starts us off with a tandemaus + await game.classicMode.startBattle([Species.TANDEMAUS]); // starts us off with a tandemaus const playerPokemon = game.scene.getPlayerPokemon()!; playerPokemon.level = 25; // tandemaus evolves at level 25 vi.spyOn(Utils, "randSeedInt").mockReturnValue(0); // setting the random generator to be 0 to force a three family maushold diff --git a/test/items/dire_hit.test.ts b/test/items/dire_hit.test.ts index 6e20bc723e5..e848bceb514 100644 --- a/test/items/dire_hit.test.ts +++ b/test/items/dire_hit.test.ts @@ -40,7 +40,7 @@ describe("Items - Dire Hit", () => { }, 20000); it("should raise CRIT stage by 1", async () => { - await game.startBattle([Species.GASTLY]); + await game.classicMode.startBattle([Species.GASTLY]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -56,7 +56,7 @@ describe("Items - Dire Hit", () => { it("should renew how many battles are left of existing DIRE_HIT when picking up new DIRE_HIT", async () => { game.override.itemRewards([{ name: "DIRE_HIT" }]); - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.SPLASH); diff --git a/test/items/exp_booster.test.ts b/test/items/exp_booster.test.ts index ec7528c3b23..106574b6849 100644 --- a/test/items/exp_booster.test.ts +++ b/test/items/exp_booster.test.ts @@ -29,7 +29,7 @@ describe("EXP Modifier Items", () => { it("EXP booster items stack multiplicatively", async () => { game.override.startingHeldItems([{ name: "LUCKY_EGG", count: 3 }, { name: "GOLDEN_EGG" }]); - await game.startBattle(); + await game.classicMode.startBattle(); const partyMember = game.scene.getPlayerPokemon()!; partyMember.exp = 100; diff --git a/test/items/leek.test.ts b/test/items/leek.test.ts index 9bde2c86339..7a6975f6dae 100644 --- a/test/items/leek.test.ts +++ b/test/items/leek.test.ts @@ -32,7 +32,7 @@ describe("Items - Leek", () => { }); it("should raise CRIT stage by 2 when held by FARFETCHD", async () => { - await game.startBattle([Species.FARFETCHD]); + await game.classicMode.startBattle([Species.FARFETCHD]); const enemyMember = game.scene.getEnemyPokemon()!; @@ -46,7 +46,7 @@ describe("Items - Leek", () => { }, 20000); it("should raise CRIT stage by 2 when held by GALAR_FARFETCHD", async () => { - await game.startBattle([Species.GALAR_FARFETCHD]); + await game.classicMode.startBattle([Species.GALAR_FARFETCHD]); const enemyMember = game.scene.getEnemyPokemon()!; @@ -60,7 +60,7 @@ describe("Items - Leek", () => { }, 20000); it("should raise CRIT stage by 2 when held by SIRFETCHD", async () => { - await game.startBattle([Species.SIRFETCHD]); + await game.classicMode.startBattle([Species.SIRFETCHD]); const enemyMember = game.scene.getEnemyPokemon()!; @@ -77,7 +77,7 @@ describe("Items - Leek", () => { // Randomly choose from the Farfetch'd line const species = [Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD]; - await game.startBattle([species[randInt(species.length)], Species.PIKACHU]); + await game.classicMode.startBattle([species[randInt(species.length)], Species.PIKACHU]); const [partyMember, ally] = game.scene.getPlayerParty(); @@ -105,7 +105,7 @@ describe("Items - Leek", () => { // Randomly choose from the Farfetch'd line const species = [Species.FARFETCHD, Species.GALAR_FARFETCHD, Species.SIRFETCHD]; - await game.startBattle([Species.PIKACHU, species[randInt(species.length)]]); + await game.classicMode.startBattle([Species.PIKACHU, species[randInt(species.length)]]); const [partyMember, ally] = game.scene.getPlayerParty(); @@ -130,7 +130,7 @@ describe("Items - Leek", () => { }, 20000); it("should not raise CRIT stage when held by a Pokemon outside of FARFETCHD line", async () => { - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); const enemyMember = game.scene.getEnemyPokemon()!; diff --git a/test/items/leftovers.test.ts b/test/items/leftovers.test.ts index 19739703f19..f4825c2b721 100644 --- a/test/items/leftovers.test.ts +++ b/test/items/leftovers.test.ts @@ -34,7 +34,7 @@ describe("Items - Leftovers", () => { }); it("leftovers works", async () => { - await game.startBattle([Species.ARCANINE]); + await game.classicMode.startBattle([Species.ARCANINE]); // Make sure leftovers are there expect(game.scene.modifiers[0].type.id).toBe("LEFTOVERS"); diff --git a/test/items/light_ball.test.ts b/test/items/light_ball.test.ts index cdcffe810fa..214f6f624e6 100644 --- a/test/items/light_ball.test.ts +++ b/test/items/light_ball.test.ts @@ -150,7 +150,7 @@ describe("Items - Light Ball", () => { }, 20000); it("LIGHT_BALL held by fused PIKACHU (part)", async () => { - await game.startBattle([Species.MAROWAK, Species.PIKACHU]); + await game.classicMode.startBattle([Species.MAROWAK, Species.PIKACHU]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -189,7 +189,7 @@ describe("Items - Light Ball", () => { }, 20000); it("LIGHT_BALL not held by PIKACHU", async () => { - await game.startBattle([Species.MAROWAK]); + await game.classicMode.startBattle([Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; diff --git a/test/items/metal_powder.test.ts b/test/items/metal_powder.test.ts index e924d75fce9..a9a81072622 100644 --- a/test/items/metal_powder.test.ts +++ b/test/items/metal_powder.test.ts @@ -82,7 +82,7 @@ describe("Items - Metal Powder", () => { }); it("METAL_POWDER held by DITTO", async () => { - await game.startBattle([Species.DITTO]); + await game.classicMode.startBattle([Species.DITTO]); const partyMember = game.scene.getPlayerParty()[0]; @@ -105,7 +105,7 @@ describe("Items - Metal Powder", () => { }, 20000); it("METAL_POWDER held by fused DITTO (base)", async () => { - await game.startBattle([Species.DITTO, Species.MAROWAK]); + await game.classicMode.startBattle([Species.DITTO, Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -138,7 +138,7 @@ describe("Items - Metal Powder", () => { }, 20000); it("METAL_POWDER held by fused DITTO (part)", async () => { - await game.startBattle([Species.MAROWAK, Species.DITTO]); + await game.classicMode.startBattle([Species.MAROWAK, Species.DITTO]); const partyMember = game.scene.getPlayerParty()[0]; const ally = game.scene.getPlayerParty()[1]; @@ -171,7 +171,7 @@ describe("Items - Metal Powder", () => { }, 20000); it("METAL_POWDER not held by DITTO", async () => { - await game.startBattle([Species.MAROWAK]); + await game.classicMode.startBattle([Species.MAROWAK]); const partyMember = game.scene.getPlayerParty()[0]; diff --git a/test/items/scope_lens.test.ts b/test/items/scope_lens.test.ts index f67966ea3c9..c8061ea3696 100644 --- a/test/items/scope_lens.test.ts +++ b/test/items/scope_lens.test.ts @@ -31,7 +31,7 @@ describe("Items - Scope Lens", () => { }, 20000); it("should raise CRIT stage by 1", async () => { - await game.startBattle([Species.GASTLY]); + await game.classicMode.startBattle([Species.GASTLY]); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/moves/astonish.test.ts b/test/moves/astonish.test.ts index accddcd545d..daa9b0bb878 100644 --- a/test/moves/astonish.test.ts +++ b/test/moves/astonish.test.ts @@ -39,7 +39,7 @@ describe("Moves - Astonish", () => { }); test("move effect should cancel the target's move on the turn it applies", async () => { - await game.startBattle([Species.MEOWSCARADA]); + await game.classicMode.startBattle([Species.MEOWSCARADA]); const leadPokemon = game.scene.getPlayerPokemon()!; diff --git a/test/moves/beat_up.test.ts b/test/moves/beat_up.test.ts index ad6cad40d32..09166dafb9d 100644 --- a/test/moves/beat_up.test.ts +++ b/test/moves/beat_up.test.ts @@ -35,7 +35,7 @@ describe("Moves - Beat Up", () => { }); it("should hit once for each healthy player Pokemon", async () => { - await game.startBattle([ + await game.classicMode.startBattle([ Species.MAGIKARP, Species.BULBASAUR, Species.CHARMANDER, @@ -63,7 +63,7 @@ describe("Moves - Beat Up", () => { }); it("should not count player Pokemon with status effects towards hit count", async () => { - await game.startBattle([ + await game.classicMode.startBattle([ Species.MAGIKARP, Species.BULBASAUR, Species.CHARMANDER, diff --git a/test/moves/belly_drum.test.ts b/test/moves/belly_drum.test.ts index 8ee1026bf20..9deff207446 100644 --- a/test/moves/belly_drum.test.ts +++ b/test/moves/belly_drum.test.ts @@ -42,7 +42,7 @@ describe("Moves - BELLY DRUM", () => { // Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Belly_Drum_(move) test("raises the user's ATK stat stage to its max, at the cost of 1/2 of its maximum HP", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); @@ -55,7 +55,7 @@ describe("Moves - BELLY DRUM", () => { }); test("will still take effect if an uninvolved stat stage is at max", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); @@ -73,7 +73,7 @@ describe("Moves - BELLY DRUM", () => { }); test("fails if the pokemon's ATK stat stage is at its maximum", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -87,7 +87,7 @@ describe("Moves - BELLY DRUM", () => { }); test("fails if the user's health is less than 1/2", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); diff --git a/test/moves/chilly_reception.test.ts b/test/moves/chilly_reception.test.ts index 56da5dd400c..1c6c5ce127e 100644 --- a/test/moves/chilly_reception.test.ts +++ b/test/moves/chilly_reception.test.ts @@ -77,7 +77,7 @@ describe("Moves - Chilly Reception", () => { await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.TACKLE); + await game.move.selectEnemyMove(Moves.TACKLE); await game.phaseInterceptor.to("BerryPhase", false); expect(game.scene.arena.weather?.weatherType).toBe(undefined); diff --git a/test/moves/clangorous_soul.test.ts b/test/moves/clangorous_soul.test.ts index 56f19a0e088..c7165a0a881 100644 --- a/test/moves/clangorous_soul.test.ts +++ b/test/moves/clangorous_soul.test.ts @@ -38,7 +38,7 @@ describe("Moves - Clangorous Soul", () => { //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Clangorous_Soul_(move) it("raises the user's ATK, DEF, SPATK, SPDEF, and SPD stat stages by 1 each at the cost of 1/3 of its maximum HP", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); @@ -55,7 +55,7 @@ describe("Moves - Clangorous Soul", () => { }); it("will still take effect if one or more of the involved stat stages are not at max", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); @@ -78,7 +78,7 @@ describe("Moves - Clangorous Soul", () => { }); it("fails if all stat stages involved are at max", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -100,7 +100,7 @@ describe("Moves - Clangorous Soul", () => { }); it("fails if the user's health is less than 1/3", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = Math.floor(leadPokemon.getMaxHp() / RATIO); diff --git a/test/moves/crafty_shield.test.ts b/test/moves/crafty_shield.test.ts index c61e6d3848a..ec4c87fa060 100644 --- a/test/moves/crafty_shield.test.ts +++ b/test/moves/crafty_shield.test.ts @@ -39,7 +39,7 @@ describe("Moves - Crafty Shield", () => { }); test("should protect the user and allies from status moves", async () => { - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); @@ -57,7 +57,7 @@ describe("Moves - Crafty Shield", () => { test("should not protect the user and allies from attack moves", async () => { game.override.enemyMoveset([Moves.TACKLE]); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); @@ -76,7 +76,7 @@ describe("Moves - Crafty Shield", () => { game.override.enemySpecies(Species.DUSCLOPS); game.override.enemyMoveset([Moves.CURSE]); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); @@ -92,7 +92,7 @@ describe("Moves - Crafty Shield", () => { }); test("should not block allies' self-targeted moves", async () => { - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); diff --git a/test/moves/defog.test.ts b/test/moves/defog.test.ts index 58631150b6f..87c3845d55c 100644 --- a/test/moves/defog.test.ts +++ b/test/moves/defog.test.ts @@ -39,7 +39,7 @@ describe("Moves - Defog", () => { const enemyPokemon = game.scene.getEnemyField(); game.move.select(Moves.SAFEGUARD); - await game.forceEnemyMove(Moves.DEFOG); + await game.move.selectEnemyMove(Moves.DEFOG); await game.phaseInterceptor.to("BerryPhase"); expect(playerPokemon[0].isSafeguarded(enemyPokemon[0])).toBe(false); @@ -53,12 +53,12 @@ describe("Moves - Defog", () => { const playerPokemon = game.scene.getPlayerField(); game.move.select(Moves.MIST); - await game.forceEnemyMove(Moves.DEFOG); + await game.move.selectEnemyMove(Moves.DEFOG); await game.toNextTurn(); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.GROWL); + await game.move.selectEnemyMove(Moves.GROWL); await game.phaseInterceptor.to("BerryPhase"); diff --git a/test/moves/disable.test.ts b/test/moves/disable.test.ts index d21716145a4..5b2b687bd5d 100644 --- a/test/moves/disable.test.ts +++ b/test/moves/disable.test.ts @@ -139,12 +139,12 @@ describe("Moves - Disable", () => { const enemyMon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH, BattlerIndex.PLAYER); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); game.move.select(Moves.DISABLE); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); diff --git a/test/moves/double_team.test.ts b/test/moves/double_team.test.ts index 8eac6be11f4..b97fb1a338e 100644 --- a/test/moves/double_team.test.ts +++ b/test/moves/double_team.test.ts @@ -33,7 +33,7 @@ describe("Moves - Double Team", () => { }); it("raises the user's EVA stat stage by 1", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const ally = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/moves/dragon_tail.test.ts b/test/moves/dragon_tail.test.ts index 0e7cd04d078..409ce7e28f8 100644 --- a/test/moves/dragon_tail.test.ts +++ b/test/moves/dragon_tail.test.ts @@ -206,7 +206,7 @@ describe("Moves - Dragon Tail", () => { return min; }); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.DRAGON_TAIL); + await game.move.selectEnemyMove(Moves.DRAGON_TAIL); await game.toNextTurn(); expect(bulbasaur.isOnField()).toBe(false); @@ -260,7 +260,7 @@ describe("Moves - Dragon Tail", () => { eevee.status = new Status(StatusEffect.FAINT); expect(eevee.isFainted()).toBe(true); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted @@ -268,7 +268,7 @@ describe("Moves - Dragon Tail", () => { return min; }); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.DRAGON_TAIL); + await game.move.selectEnemyMove(Moves.DRAGON_TAIL); await game.toNextTurn(); expect(lapras.isOnField()).toBe(false); @@ -289,7 +289,7 @@ describe("Moves - Dragon Tail", () => { eevee.status = new Status(StatusEffect.FAINT); expect(eevee.isFainted()).toBe(true); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted @@ -297,7 +297,7 @@ describe("Moves - Dragon Tail", () => { return min; }); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.DRAGON_TAIL); + await game.move.selectEnemyMove(Moves.DRAGON_TAIL); await game.toNextTurn(); expect(lapras.isOnField()).toBe(true); diff --git a/test/moves/dynamax_cannon.test.ts b/test/moves/dynamax_cannon.test.ts index 6c4f1a321e3..62004e62778 100644 --- a/test/moves/dynamax_cannon.test.ts +++ b/test/moves/dynamax_cannon.test.ts @@ -45,7 +45,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 100 power against an enemy below level cap", async () => { game.override.enemyLevel(1); - await game.startBattle([Species.ETERNATUS]); + await game.classicMode.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -57,7 +57,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 100 power against an enemy at level cap", async () => { game.override.enemyLevel(10); - await game.startBattle([Species.ETERNATUS]); + await game.classicMode.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -69,7 +69,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 120 power against an enemy 1% above level cap", async () => { game.override.enemyLevel(101); - await game.startBattle([Species.ETERNATUS]); + await game.classicMode.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -84,7 +84,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 140 power against an enemy 2% above level capp", async () => { game.override.enemyLevel(102); - await game.startBattle([Species.ETERNATUS]); + await game.classicMode.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -99,7 +99,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 160 power against an enemy 3% above level cap", async () => { game.override.enemyLevel(103); - await game.startBattle([Species.ETERNATUS]); + await game.classicMode.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -114,7 +114,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 180 power against an enemy 4% above level cap", async () => { game.override.enemyLevel(104); - await game.startBattle([Species.ETERNATUS]); + await game.classicMode.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -129,7 +129,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 200 power against an enemy 5% above level cap", async () => { game.override.enemyLevel(105); - await game.startBattle([Species.ETERNATUS]); + await game.classicMode.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); @@ -144,7 +144,7 @@ describe("Moves - Dynamax Cannon", () => { it("should return 200 power against an enemy way above level cap", async () => { game.override.enemyLevel(999); - await game.startBattle([Species.ETERNATUS]); + await game.classicMode.startBattle([Species.ETERNATUS]); game.move.select(dynamaxCannon.id); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); diff --git a/test/moves/encore.test.ts b/test/moves/encore.test.ts index 519e7860c04..f941328fc90 100644 --- a/test/moves/encore.test.ts +++ b/test/moves/encore.test.ts @@ -42,7 +42,7 @@ describe("Moves - Encore", () => { const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.ENCORE); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(enemyPokemon.getTag(BattlerTagType.ENCORE)).toBeDefined(); diff --git a/test/moves/fairy_lock.test.ts b/test/moves/fairy_lock.test.ts index e967221bcae..faffdee2304 100644 --- a/test/moves/fairy_lock.test.ts +++ b/test/moves/fairy_lock.test.ts @@ -40,8 +40,8 @@ describe("Moves - Fairy Lock", () => { game.move.select(Moves.FAIRY_LOCK); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER)).toBeDefined(); expect(game.scene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.ENEMY)).toBeDefined(); @@ -50,8 +50,8 @@ describe("Moves - Fairy Lock", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); await game.phaseInterceptor.to("BerryPhase"); expect(playerPokemon[0].isTrapped()).toEqual(true); expect(playerPokemon[1].isTrapped()).toEqual(true); @@ -70,8 +70,8 @@ describe("Moves - Fairy Lock", () => { game.move.select(Moves.FAIRY_LOCK); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER)).toBeDefined(); @@ -84,8 +84,8 @@ describe("Moves - Fairy Lock", () => { game.move.select(Moves.SPLASH); game.doSwitchPokemon(2); - await game.forceEnemyMove(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); await game.phaseInterceptor.to("BerryPhase"); await game.toNextTurn(); @@ -98,8 +98,8 @@ describe("Moves - Fairy Lock", () => { game.move.select(Moves.FAIRY_LOCK); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER)).toBeDefined(); @@ -108,9 +108,9 @@ describe("Moves - Fairy Lock", () => { await game.toNextTurn(); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.WHIRLWIND, 0); + await game.move.selectEnemyMove(Moves.WHIRLWIND, 0); game.doSelectPartyPokemon(2); - await game.forceEnemyMove(Moves.WHIRLWIND, 1); + await game.move.selectEnemyMove(Moves.WHIRLWIND, 1); game.doSelectPartyPokemon(2); await game.phaseInterceptor.to("BerryPhase"); await game.toNextTurn(); @@ -126,8 +126,8 @@ describe("Moves - Fairy Lock", () => { game.move.select(Moves.FAIRY_LOCK); game.move.select(Moves.MEMENTO, 1); game.doSelectPartyPokemon(2); - await game.forceEnemyMove(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.PLAYER)).toBeDefined(); expect(game.scene.arena.getTagOnSide(ArenaTagType.FAIRY_LOCK, ArenaTagSide.ENEMY)).toBeDefined(); @@ -135,8 +135,8 @@ describe("Moves - Fairy Lock", () => { await game.toNextTurn(); game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); + await game.move.selectEnemyMove(Moves.SPLASH, 1); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.getPlayerField()[0].isTrapped()).toEqual(true); expect(game.scene.getPlayerField()[1].isTrapped()).toEqual(true); diff --git a/test/moves/fillet_away.test.ts b/test/moves/fillet_away.test.ts index 477cdf76fc7..9de237b28a1 100644 --- a/test/moves/fillet_away.test.ts +++ b/test/moves/fillet_away.test.ts @@ -39,7 +39,7 @@ describe("Moves - FILLET AWAY", () => { //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/fillet_away_(move) test("raises the user's ATK, SPATK, and SPD stat stages by 2 each, at the cost of 1/2 of its maximum HP", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); @@ -54,7 +54,7 @@ describe("Moves - FILLET AWAY", () => { }); test("still takes effect if one or more of the involved stat stages are not at max", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); @@ -73,7 +73,7 @@ describe("Moves - FILLET AWAY", () => { }); test("fails if all stat stages involved are at max", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; @@ -91,7 +91,7 @@ describe("Moves - FILLET AWAY", () => { }); test("fails if the user's health is less than 1/2", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const hpLost = toDmgValue(leadPokemon.getMaxHp() / RATIO); diff --git a/test/moves/flame_burst.test.ts b/test/moves/flame_burst.test.ts index fb92537a238..963b0f04a9a 100644 --- a/test/moves/flame_burst.test.ts +++ b/test/moves/flame_burst.test.ts @@ -46,7 +46,7 @@ describe("Moves - Flame Burst", () => { }); it("inflicts damage to the target's ally equal to 1/16 of its max HP", async () => { - await game.startBattle([Species.PIKACHU, Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU, Species.PIKACHU]); const [leftEnemy, rightEnemy] = game.scene.getEnemyField(); game.move.select(Moves.FLAME_BURST, 0, leftEnemy.getBattlerIndex()); @@ -60,7 +60,7 @@ describe("Moves - Flame Burst", () => { it("does not inflict damage to the target's ally if the target was not affected by Flame Burst", async () => { game.override.enemyAbility(Abilities.FLASH_FIRE); - await game.startBattle([Species.PIKACHU, Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU, Species.PIKACHU]); const [leftEnemy, rightEnemy] = game.scene.getEnemyField(); game.move.select(Moves.FLAME_BURST, 0, leftEnemy.getBattlerIndex()); @@ -72,7 +72,7 @@ describe("Moves - Flame Burst", () => { }); it("does not interact with the target ally's abilities", async () => { - await game.startBattle([Species.PIKACHU, Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU, Species.PIKACHU]); const [leftEnemy, rightEnemy] = game.scene.getEnemyField(); vi.spyOn(rightEnemy, "getAbility").mockReturnValue(allAbilities[Abilities.FLASH_FIRE]); @@ -86,7 +86,7 @@ describe("Moves - Flame Burst", () => { }); it("effect damage is prevented by Magic Guard", async () => { - await game.startBattle([Species.PIKACHU, Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU, Species.PIKACHU]); const [leftEnemy, rightEnemy] = game.scene.getEnemyField(); vi.spyOn(rightEnemy, "getAbility").mockReturnValue(allAbilities[Abilities.MAGIC_GUARD]); diff --git a/test/moves/flower_shield.test.ts b/test/moves/flower_shield.test.ts index 4840c6f018f..d95ef6299b7 100644 --- a/test/moves/flower_shield.test.ts +++ b/test/moves/flower_shield.test.ts @@ -36,7 +36,7 @@ describe("Moves - Flower Shield", () => { it("raises DEF stat stage by 1 for all Grass-type Pokemon on the field by one stage - single battle", async () => { game.override.enemySpecies(Species.CHERRIM); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const cherrim = game.scene.getEnemyPokemon()!; const magikarp = game.scene.getPlayerPokemon()!; @@ -53,7 +53,7 @@ describe("Moves - Flower Shield", () => { it("raises DEF stat stage by 1 for all Grass-type Pokemon on the field by one stage - double battle", async () => { game.override.enemySpecies(Species.MAGIKARP).startingBiome(Biome.GRASS).battleStyle("double"); - await game.startBattle([Species.CHERRIM, Species.MAGIKARP]); + await game.classicMode.startBattle([Species.CHERRIM, Species.MAGIKARP]); const field = game.scene.getField(true); const grassPokemons = field.filter(p => p.getTypes().includes(PokemonType.GRASS)); @@ -78,7 +78,7 @@ describe("Moves - Flower Shield", () => { game.override.enemyMoveset([Moves.DIG, Moves.DIG, Moves.DIG, Moves.DIG]); game.override.enemyLevel(50); - await game.startBattle([Species.CHERRIM]); + await game.classicMode.startBattle([Species.CHERRIM]); const paras = game.scene.getEnemyPokemon()!; const cherrim = game.scene.getPlayerPokemon()!; @@ -97,7 +97,7 @@ describe("Moves - Flower Shield", () => { it("does nothing if there are no Grass-type Pokemon on the field", async () => { game.override.enemySpecies(Species.MAGIKARP); - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemy = game.scene.getEnemyPokemon()!; const ally = game.scene.getPlayerPokemon()!; diff --git a/test/moves/fly.test.ts b/test/moves/fly.test.ts index 74f8bc4a770..81d04f53ff8 100644 --- a/test/moves/fly.test.ts +++ b/test/moves/fly.test.ts @@ -104,10 +104,10 @@ describe("Moves - Fly", () => { game.move.select(Moves.FLY); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); - await game.forceEnemyMove(Moves.GRAVITY); + await game.move.selectEnemyMove(Moves.GRAVITY); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); diff --git a/test/moves/follow_me.test.ts b/test/moves/follow_me.test.ts index 68c4f111bb1..228a835b17d 100644 --- a/test/moves/follow_me.test.ts +++ b/test/moves/follow_me.test.ts @@ -43,8 +43,8 @@ describe("Moves - Follow Me", () => { game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY); // Force both enemies to target the player Pokemon that did not use Follow Me - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); await game.phaseInterceptor.to(TurnEndPhase, false); @@ -61,8 +61,8 @@ describe("Moves - Follow Me", () => { game.move.select(Moves.FOLLOW_ME, 1); // Each player is targeted by an enemy - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); await game.phaseInterceptor.to(TurnEndPhase, false); @@ -84,8 +84,8 @@ describe("Moves - Follow Me", () => { game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); // Target doesn't need to be specified if the move is self-targeted - await game.forceEnemyMove(Moves.FOLLOW_ME); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.FOLLOW_ME); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase, false); @@ -104,8 +104,8 @@ describe("Moves - Follow Me", () => { game.move.select(Moves.SNIPE_SHOT, 0, BattlerIndex.ENEMY); game.move.select(Moves.SNIPE_SHOT, 1, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.FOLLOW_ME); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.FOLLOW_ME); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase, false); diff --git a/test/moves/foresight.test.ts b/test/moves/foresight.test.ts index d33a00bf136..82a39eceae5 100644 --- a/test/moves/foresight.test.ts +++ b/test/moves/foresight.test.ts @@ -31,7 +31,7 @@ describe("Moves - Foresight", () => { }); it("should allow Normal and Fighting moves to hit Ghost types", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; @@ -55,7 +55,7 @@ describe("Moves - Foresight", () => { it("should ignore target's evasiveness boosts", async () => { game.override.enemyMoveset([Moves.MINIMIZE]); - await game.startBattle(); + await game.classicMode.startBattle(); const pokemon = game.scene.getPlayerPokemon()!; vi.spyOn(pokemon, "getAccuracyMultiplier"); diff --git a/test/moves/fusion_bolt.test.ts b/test/moves/fusion_bolt.test.ts index 33498a857a9..5e515a3bc47 100644 --- a/test/moves/fusion_bolt.test.ts +++ b/test/moves/fusion_bolt.test.ts @@ -36,7 +36,7 @@ describe("Moves - Fusion Bolt", () => { }); it("should not make contact", async () => { - await game.startBattle([Species.ZEKROM]); + await game.classicMode.startBattle([Species.ZEKROM]); const partyMember = game.scene.getPlayerPokemon()!; const initialHp = partyMember.hp; diff --git a/test/moves/fusion_flare.test.ts b/test/moves/fusion_flare.test.ts index 61bb126a75a..b947b9e7f7e 100644 --- a/test/moves/fusion_flare.test.ts +++ b/test/moves/fusion_flare.test.ts @@ -36,7 +36,7 @@ describe("Moves - Fusion Flare", () => { }); it("should thaw freeze status condition", async () => { - await game.startBattle([Species.RESHIRAM]); + await game.classicMode.startBattle([Species.RESHIRAM]); const partyMember = game.scene.getPlayerPokemon()!; diff --git a/test/moves/fusion_flare_bolt.test.ts b/test/moves/fusion_flare_bolt.test.ts index da2d48a7cdb..1d248e09510 100644 --- a/test/moves/fusion_flare_bolt.test.ts +++ b/test/moves/fusion_flare_bolt.test.ts @@ -138,7 +138,7 @@ describe("Moves - Fusion Flare and Fusion Bolt", () => { }, 20000); it("FUSION_FLARE should double power of subsequent FUSION_BOLT if moves are aimed at allies", async () => { - await game.startBattle([Species.ZEKROM, Species.RESHIRAM]); + await game.classicMode.startBattle([Species.ZEKROM, Species.RESHIRAM]); game.move.select(fusionBolt.id, 0, BattlerIndex.PLAYER_2); game.move.select(fusionFlare.id, 1, BattlerIndex.PLAYER); diff --git a/test/moves/growth.test.ts b/test/moves/growth.test.ts index 37cd84638ba..2e3ebfcde52 100644 --- a/test/moves/growth.test.ts +++ b/test/moves/growth.test.ts @@ -32,7 +32,7 @@ describe("Moves - Growth", () => { }); it("should raise SPATK stat stage by 1", async () => { - await game.startBattle([Species.MIGHTYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA]); const playerPokemon = game.scene.getPlayerPokemon()!; diff --git a/test/moves/grudge.test.ts b/test/moves/grudge.test.ts index ecde5351d6d..48bb79c5f02 100644 --- a/test/moves/grudge.test.ts +++ b/test/moves/grudge.test.ts @@ -37,7 +37,7 @@ describe("Moves - Grudge", () => { const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.EMBER); - await game.forceEnemyMove(Moves.GRUDGE); + await game.move.selectEnemyMove(Moves.GRUDGE); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); @@ -51,12 +51,12 @@ describe("Moves - Grudge", () => { const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.GRUDGE); + await game.move.selectEnemyMove(Moves.GRUDGE); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); game.move.select(Moves.EMBER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase"); @@ -78,7 +78,7 @@ describe("Moves - Grudge", () => { const playerPokemon = game.scene.getPlayerPokemon(); game.move.select(Moves.FALSE_SWIPE); - await game.forceEnemyMove(Moves.GRUDGE); + await game.move.selectEnemyMove(Moves.GRUDGE); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("BerryPhase"); diff --git a/test/moves/guard_split.test.ts b/test/moves/guard_split.test.ts index d182e94b203..0f5c69c7d85 100644 --- a/test/moves/guard_split.test.ts +++ b/test/moves/guard_split.test.ts @@ -34,7 +34,7 @@ describe("Moves - Guard Split", () => { it("should average the user's DEF and SPDEF stats with those of the target", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([Species.INDEEDEE]); + await game.classicMode.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -54,7 +54,7 @@ describe("Moves - Guard Split", () => { it("should be idempotent", async () => { game.override.enemyMoveset([Moves.GUARD_SPLIT]); - await game.startBattle([Species.INDEEDEE]); + await game.classicMode.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/moves/hard_press.test.ts b/test/moves/hard_press.test.ts index e1a01c0109d..12cf049a022 100644 --- a/test/moves/hard_press.test.ts +++ b/test/moves/hard_press.test.ts @@ -37,7 +37,7 @@ describe("Moves - Hard Press", () => { }); it("should return 100 power if target HP ratio is at 100%", async () => { - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.HARD_PRESS); await game.phaseInterceptor.to(MoveEffectPhase); @@ -46,7 +46,7 @@ describe("Moves - Hard Press", () => { }); it("should return 50 power if target HP ratio is at 50%", async () => { - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); const targetHpRatio = 0.5; const enemy = game.scene.getEnemyPokemon()!; @@ -59,7 +59,7 @@ describe("Moves - Hard Press", () => { }); it("should return 1 power if target HP ratio is at 1%", async () => { - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); const targetHpRatio = 0.01; const enemy = game.scene.getEnemyPokemon()!; @@ -72,7 +72,7 @@ describe("Moves - Hard Press", () => { }); it("should return 1 power if target HP ratio is less than 1%", async () => { - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); const targetHpRatio = 0.005; const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/moves/haze.test.ts b/test/moves/haze.test.ts index 4ddb6d1c7c5..33d4fe2dfda 100644 --- a/test/moves/haze.test.ts +++ b/test/moves/haze.test.ts @@ -36,7 +36,7 @@ describe("Moves - Haze", () => { }); it("should reset all stat changes of all Pokemon on field", async () => { - await game.startBattle([Species.RATTATA]); + await game.classicMode.startBattle([Species.RATTATA]); const user = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/moves/hyper_beam.test.ts b/test/moves/hyper_beam.test.ts index e6b3955ef0d..a4cbf7d9245 100644 --- a/test/moves/hyper_beam.test.ts +++ b/test/moves/hyper_beam.test.ts @@ -38,7 +38,7 @@ describe("Moves - Hyper Beam", () => { }); it("should force the user to recharge on the next turn (and only that turn)", async () => { - await game.startBattle([Species.MAGIKARP]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/moves/imprison.test.ts b/test/moves/imprison.test.ts index cefbaa52cad..dfa3b3ad757 100644 --- a/test/moves/imprison.test.ts +++ b/test/moves/imprison.test.ts @@ -36,7 +36,7 @@ describe("Moves - Imprison", () => { const playerPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.TRANSFORM); - await game.forceEnemyMove(Moves.IMPRISON); + await game.move.selectEnemyMove(Moves.IMPRISON); await game.toNextTurn(); const playerMoveset = playerPokemon.getMoveset().map(x => x?.moveId); const enemyMoveset = game.scene @@ -51,7 +51,7 @@ describe("Moves - Imprison", () => { // Second turn, Imprison forces Struggle to occur game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const move1 = playerPokemon.getLastXMoves(1)[0]!; expect(move1.move).toBe(Moves.STRUGGLE); @@ -63,7 +63,7 @@ describe("Moves - Imprison", () => { const playerPokemon1 = game.scene.getPlayerPokemon()!; game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.IMPRISON); + await game.move.selectEnemyMove(Moves.IMPRISON); await game.toNextTurn(); const imprisonArenaTag = game.scene.arena.getTag(ArenaTagType.IMPRISON); const imprisonBattlerTag1 = playerPokemon1.getTag(BattlerTagType.IMPRISON); @@ -72,7 +72,7 @@ describe("Moves - Imprison", () => { // Second turn, Imprison forces Struggle to occur game.doSwitchPokemon(1); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const playerPokemon2 = game.scene.getPlayerPokemon()!; const imprisonBattlerTag2 = playerPokemon2.getTag(BattlerTagType.IMPRISON); @@ -87,12 +87,12 @@ describe("Moves - Imprison", () => { const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.IMPRISON); - await game.forceEnemyMove(Moves.GROWL); + await game.move.selectEnemyMove(Moves.GROWL); await game.toNextTurn(); expect(game.scene.arena.getTag(ArenaTagType.IMPRISON)).toBeDefined(); expect(enemyPokemon.getTag(BattlerTagType.IMPRISON)).toBeDefined(); game.doSwitchPokemon(1); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(playerPokemon.isActive(true)).toBeFalsy(); expect(game.scene.arena.getTag(ArenaTagType.IMPRISON)).toBeUndefined(); diff --git a/test/moves/instruct.test.ts b/test/moves/instruct.test.ts index dd25db4ec90..719349760dc 100644 --- a/test/moves/instruct.test.ts +++ b/test/moves/instruct.test.ts @@ -48,7 +48,7 @@ describe("Moves - Instruct", () => { game.move.changeMoveset(enemy, Moves.SONIC_BOOM); game.move.select(Moves.INSTRUCT); - await game.forceEnemyMove(Moves.SONIC_BOOM); + await game.move.selectEnemyMove(Moves.SONIC_BOOM); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("MovePhase"); // enemy attacks us @@ -75,12 +75,12 @@ describe("Moves - Instruct", () => { game.move.changeMoveset(enemy, [Moves.SONIC_BOOM, Moves.SUBSTITUTE]); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SUBSTITUTE); + await game.move.selectEnemyMove(Moves.SUBSTITUTE); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); game.move.select(Moves.INSTRUCT); - await game.forceEnemyMove(Moves.SONIC_BOOM); + await game.move.selectEnemyMove(Moves.SONIC_BOOM); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase", false); @@ -169,7 +169,7 @@ describe("Moves - Instruct", () => { moveUsed.ppUsed = moveUsed.getMovePp() - 1; game.move.select(Moves.INSTRUCT); - await game.forceEnemyMove(Moves.HIDDEN_POWER); + await game.move.selectEnemyMove(Moves.HIDDEN_POWER); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase", false); @@ -210,8 +210,8 @@ describe("Moves - Instruct", () => { game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); game.move.select(Moves.FIERY_DANCE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); - await game.forceEnemyMove(Moves.INSTRUCT, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.INSTRUCT, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); @@ -248,7 +248,7 @@ describe("Moves - Instruct", () => { await game.classicMode.startBattle([Species.AMOONGUSS]); game.move.select(Moves.INSTRUCT); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("TurnEndPhase", false); @@ -265,7 +265,7 @@ describe("Moves - Instruct", () => { game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.ENEMY); game.move.select(Moves.DISABLE, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); - await game.forceEnemyMove(Moves.SONIC_BOOM, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SONIC_BOOM, BattlerIndex.PLAYER); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("TurnEndPhase", false); @@ -311,7 +311,7 @@ describe("Moves - Instruct", () => { ]; game.move.select(Moves.INSTRUCT); - await game.forceEnemyMove(Moves.HYPER_BEAM); + await game.move.selectEnemyMove(Moves.HYPER_BEAM); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); @@ -326,23 +326,21 @@ describe("Moves - Instruct", () => { }); it("should not repeat move since forgotten by target", async () => { - game.override.enemyLevel(5).xpMultiplier(0).enemySpecies(Species.WURMPLE).enemyMoveset(Moves.INSTRUCT); + game.override.enemyMoveset(Moves.INSTRUCT); await game.classicMode.startBattle([Species.REGIELEKI]); const regieleki = game.scene.getPlayerPokemon()!; - // fill out moveset with random moves - game.move.changeMoveset(regieleki, [Moves.ELECTRO_DRIFT, Moves.SPLASH, Moves.ICE_BEAM, Moves.ANCIENT_POWER]); - - game.move.select(Moves.ELECTRO_DRIFT); - await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); - await game.phaseInterceptor.to("FaintPhase"); - await game.move.learnMove(Moves.ELECTROWEB); - await game.toNextWave(); + regieleki.pushMoveHistory({ + move: Moves.ELECTRO_DRIFT, + targets: [BattlerIndex.PLAYER], + result: MoveResult.SUCCESS, + virtual: false, + }); game.move.select(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); - await game.phaseInterceptor.to("TurnEndPhase", false); - expect(game.scene.getEnemyField()[0].getLastXMoves()[0].result).toBe(MoveResult.FAIL); + await game.toEndOfTurn(); + expect(game.field.getEnemyPokemon().getLastXMoves()[0].result).toBe(MoveResult.FAIL); }); it("should disregard priority of instructed move on use", async () => { @@ -360,7 +358,7 @@ describe("Moves - Instruct", () => { ]; game.move.select(Moves.INSTRUCT); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase", false); // lucario instructed enemy whirlwind at 0 priority to switch itself out @@ -379,8 +377,8 @@ describe("Moves - Instruct", () => { game.move.select(Moves.QUICK_ATTACK, BattlerIndex.PLAYER, BattlerIndex.ENEMY); // succeeds due to terrain no game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.PSYCHIC_TERRAIN); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.PSYCHIC_TERRAIN); await game.toNextTurn(); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); @@ -404,8 +402,8 @@ describe("Moves - Instruct", () => { game.move.select(Moves.VINE_WHIP, BattlerIndex.PLAYER, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.PSYCHIC_TERRAIN); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.PSYCHIC_TERRAIN); await game.toNextTurn(); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); @@ -515,14 +513,14 @@ describe("Moves - Instruct", () => { game.move.select(Moves.SPLASH, BattlerIndex.PLAYER); game.move.select(Moves.SPLASH, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.ENEMY); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); - await game.forceEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to("BerryPhase"); @@ -531,8 +529,8 @@ describe("Moves - Instruct", () => { await game.toNextTurn(); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER, BattlerIndex.ENEMY); game.move.select(Moves.INSTRUCT, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY); - await game.forceEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.BULLET_SEED, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2]); await game.phaseInterceptor.to("BerryPhase"); diff --git a/test/moves/jaw_lock.test.ts b/test/moves/jaw_lock.test.ts index 71896dc3b62..85750b6efda 100644 --- a/test/moves/jaw_lock.test.ts +++ b/test/moves/jaw_lock.test.ts @@ -40,7 +40,7 @@ describe("Moves - Jaw Lock", () => { }); it("should trap the move's user and target", async () => { - await game.startBattle([Species.BULBASAUR]); + await game.classicMode.startBattle([Species.BULBASAUR]); const leadPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -61,7 +61,7 @@ describe("Moves - Jaw Lock", () => { it("should not trap either pokemon if the target faints", async () => { game.override.enemyLevel(1); - await game.startBattle([Species.BULBASAUR]); + await game.classicMode.startBattle([Species.BULBASAUR]); const leadPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -86,7 +86,7 @@ describe("Moves - Jaw Lock", () => { }); it("should only trap the user until the target faints", async () => { - await game.startBattle([Species.BULBASAUR]); + await game.classicMode.startBattle([Species.BULBASAUR]); const leadPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -109,7 +109,7 @@ describe("Moves - Jaw Lock", () => { it("should not trap other targets after the first target is trapped", async () => { game.override.battleStyle("double"); - await game.startBattle([Species.CHARMANDER, Species.BULBASAUR]); + await game.classicMode.startBattle([Species.CHARMANDER, Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); @@ -138,7 +138,7 @@ describe("Moves - Jaw Lock", () => { it("should not trap either pokemon if the target is protected", async () => { game.override.enemyMoveset([Moves.PROTECT]); - await game.startBattle([Species.BULBASAUR]); + await game.classicMode.startBattle([Species.BULBASAUR]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/moves/last-resort.test.ts b/test/moves/last-resort.test.ts index a7b462f3ca4..65b50bc4e89 100644 --- a/test/moves/last-resort.test.ts +++ b/test/moves/last-resort.test.ts @@ -86,11 +86,11 @@ describe("Moves - Last Resort", () => { // use mirror move normally to trigger absorb virtually game.move.select(Moves.MIRROR_MOVE); - await game.forceEnemyMove(Moves.ABSORB); + await game.move.selectEnemyMove(Moves.ABSORB); await game.toNextTurn(); game.move.select(Moves.LAST_RESORT); - await game.forceEnemyMove(Moves.SWORDS_DANCE); // goes first to proc dancer ahead of time + await game.move.selectEnemyMove(Moves.SWORDS_DANCE); // goes first to proc dancer ahead of time await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); expectLastResortFail(); @@ -154,10 +154,10 @@ describe("Moves - Last Resort", () => { // ensure enemy last resort succeeds game.move.select(Moves.MIRROR_MOVE); - await game.forceEnemyMove(Moves.ABSORB); + await game.move.selectEnemyMove(Moves.ABSORB); await game.phaseInterceptor.to("TurnEndPhase"); game.move.select(Moves.MIRROR_MOVE); - await game.forceEnemyMove(Moves.LAST_RESORT); + await game.move.selectEnemyMove(Moves.LAST_RESORT); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); diff --git a/test/moves/lucky_chant.test.ts b/test/moves/lucky_chant.test.ts index e2a28a7bbe3..9fa6ff43eab 100644 --- a/test/moves/lucky_chant.test.ts +++ b/test/moves/lucky_chant.test.ts @@ -35,7 +35,7 @@ describe("Moves - Lucky Chant", () => { }); it("should prevent critical hits from moves", async () => { - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -56,7 +56,7 @@ describe("Moves - Lucky Chant", () => { it("should prevent critical hits against the user's ally", async () => { game.override.battleStyle("double"); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerField(); @@ -79,7 +79,7 @@ describe("Moves - Lucky Chant", () => { it("should prevent critical hits from field effects", async () => { game.override.enemyMoveset([Moves.TACKLE]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/moves/lunar_blessing.test.ts b/test/moves/lunar_blessing.test.ts index ee35107fccd..5021a47ff7f 100644 --- a/test/moves/lunar_blessing.test.ts +++ b/test/moves/lunar_blessing.test.ts @@ -33,7 +33,7 @@ describe("Moves - Lunar Blessing", () => { }); it("should restore 25% HP of the user and its ally", async () => { - await game.startBattle([Species.RATTATA, Species.RATTATA]); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA]); const [leftPlayer, rightPlayer] = game.scene.getPlayerField(); vi.spyOn(leftPlayer, "getMaxHp").mockReturnValue(100); @@ -61,7 +61,7 @@ describe("Moves - Lunar Blessing", () => { it("should cure status effect of the user and its ally", async () => { game.override.statusEffect(StatusEffect.BURN); - await game.startBattle([Species.RATTATA, Species.RATTATA]); + await game.classicMode.startBattle([Species.RATTATA, Species.RATTATA]); const [leftPlayer, rightPlayer] = game.scene.getPlayerField(); vi.spyOn(leftPlayer, "resetStatus"); diff --git a/test/moves/magic_coat.test.ts b/test/moves/magic_coat.test.ts index 4e0bd7f0a98..ad0bd47d7cf 100644 --- a/test/moves/magic_coat.test.ts +++ b/test/moves/magic_coat.test.ts @@ -62,12 +62,12 @@ describe("Moves - Magic Coat", () => { // turn 1 game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.MAGIC_COAT); + await game.move.selectEnemyMove(Moves.MAGIC_COAT); await game.toNextTurn(); // turn 2 game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.getEnemyPokemon()!.getStatStage(Stat.ATK)).toBe(-1); }); @@ -102,8 +102,8 @@ describe("Moves - Magic Coat", () => { game.move.select(Moves.GROWL, 0); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.MAGIC_COAT); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.MAGIC_COAT); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.getPlayerField().every(p => p.getStatStage(Stat.ATK) === -1)).toBeTruthy(); @@ -129,8 +129,8 @@ describe("Moves - Magic Coat", () => { game.move.select(Moves.MAGIC_COAT, 0); game.move.select(Moves.GROWL, 1); - await game.forceEnemyMove(Moves.MAGIC_COAT); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.MAGIC_COAT); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase"); expect(game.scene.getEnemyField()[0].getStatStage(Stat.ATK)).toBe(0); @@ -192,12 +192,12 @@ describe("Moves - Magic Coat", () => { // turn 1 game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.MAGIC_COAT); + await game.move.selectEnemyMove(Moves.MAGIC_COAT); await game.toNextTurn(); // turn 2 game.move.select(Moves.ENCORE); - await game.forceEnemyMove(Moves.TACKLE); + await game.move.selectEnemyMove(Moves.TACKLE); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("BerryPhase"); expect(enemyPokemon.getTag(BattlerTagType.ENCORE)!["moveId"]).toBe(Moves.TACKLE); @@ -233,7 +233,7 @@ describe("Moves - Magic Coat", () => { vi.spyOn(stomping_tantrum, "calculateBattlePower"); game.move.select(Moves.SPORE); - await game.forceEnemyMove(Moves.CHARM); + await game.move.selectEnemyMove(Moves.CHARM); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.getLastXMoves(1)[0].result).toBe("success"); diff --git a/test/moves/magnet_rise.test.ts b/test/moves/magnet_rise.test.ts index 62ad0c88091..3f15a109f11 100644 --- a/test/moves/magnet_rise.test.ts +++ b/test/moves/magnet_rise.test.ts @@ -33,7 +33,7 @@ describe("Moves - Magnet Rise", () => { }); it("MAGNET RISE", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const startingHp = game.scene.getPlayerParty()[0].hp; game.move.select(moveToUse); @@ -44,7 +44,7 @@ describe("Moves - Magnet Rise", () => { }, 20000); it("MAGNET RISE - Gravity", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const startingHp = game.scene.getPlayerParty()[0].hp; game.move.select(moveToUse); diff --git a/test/moves/make_it_rain.test.ts b/test/moves/make_it_rain.test.ts index 4d94537bcec..b897304662d 100644 --- a/test/moves/make_it_rain.test.ts +++ b/test/moves/make_it_rain.test.ts @@ -34,7 +34,7 @@ describe("Moves - Make It Rain", () => { }); it("should only lower SPATK stat stage by 1 once in a double battle", async () => { - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerPokemon()!; @@ -50,7 +50,7 @@ describe("Moves - Make It Rain", () => { game.override.enemyLevel(1); // ensures the enemy will faint game.override.battleStyle("single"); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -66,7 +66,7 @@ describe("Moves - Make It Rain", () => { it("should reduce Sp. Atk. once after KOing two enemies", async () => { game.override.enemyLevel(1); // ensures the enemy will faint - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyField(); @@ -81,7 +81,7 @@ describe("Moves - Make It Rain", () => { }); it("should lower SPATK stat stage by 1 if it only hits the second target", async () => { - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const playerPokemon = game.scene.getPlayerPokemon()!; diff --git a/test/moves/mat_block.test.ts b/test/moves/mat_block.test.ts index 9ed0f497af9..3e7958d665b 100644 --- a/test/moves/mat_block.test.ts +++ b/test/moves/mat_block.test.ts @@ -39,7 +39,7 @@ describe("Moves - Mat Block", () => { }); test("should protect the user and allies from attack moves", async () => { - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); @@ -57,7 +57,7 @@ describe("Moves - Mat Block", () => { test("should not protect the user and allies from status moves", async () => { game.override.enemyMoveset([Moves.GROWL]); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); @@ -73,7 +73,7 @@ describe("Moves - Mat Block", () => { }); test("should fail when used after the first turn", async () => { - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); const leadPokemon = game.scene.getPlayerField(); diff --git a/test/moves/metal_burst.test.ts b/test/moves/metal_burst.test.ts index 7fa5434dc58..cadcbe07a0d 100644 --- a/test/moves/metal_burst.test.ts +++ b/test/moves/metal_burst.test.ts @@ -42,8 +42,8 @@ describe("Moves - Metal Burst", () => { game.move.select(Moves.METAL_BURST); game.move.select(Moves.FISSURE, 1, BattlerIndex.ENEMY); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); @@ -63,8 +63,8 @@ describe("Moves - Metal Burst", () => { game.move.select(Moves.METAL_BURST); game.move.select(Moves.PRECIPICE_BLADES, 1); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY_2]); diff --git a/test/moves/mirror_move.test.ts b/test/moves/mirror_move.test.ts index 438c594d839..6a73e3a1f05 100644 --- a/test/moves/mirror_move.test.ts +++ b/test/moves/mirror_move.test.ts @@ -40,8 +40,8 @@ describe("Moves - Mirror Move", () => { game.move.select(Moves.MIRROR_MOVE, 0, BattlerIndex.ENEMY); // target's last move is Tackle, enemy should receive damage from Mirror Move copying Tackle game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.GROWL, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.GROWL, BattlerIndex.PLAYER_2); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.PLAYER]); await game.toNextTurn(); diff --git a/test/moves/multi_target.test.ts b/test/moves/multi_target.test.ts index ad47d540a14..af98c9a89f4 100644 --- a/test/moves/multi_target.test.ts +++ b/test/moves/multi_target.test.ts @@ -36,7 +36,7 @@ describe("Multi-target damage reduction", () => { }); it("should reduce d.gleam damage when multiple enemies but not tackle", async () => { - await game.startBattle([Species.MAGIKARP, Species.FEEBAS]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const [enemy1, enemy2] = game.scene.getEnemyField(); @@ -76,7 +76,7 @@ describe("Multi-target damage reduction", () => { }); it("should reduce earthquake when more than one pokemon other than user is not fainted", async () => { - await game.startBattle([Species.MAGIKARP, Species.FEEBAS]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const player2 = game.scene.getPlayerParty()[1]; const [enemy1, enemy2] = game.scene.getEnemyField(); diff --git a/test/moves/parting_shot.test.ts b/test/moves/parting_shot.test.ts index a65c1a5b3a5..26f8790d3b9 100644 --- a/test/moves/parting_shot.test.ts +++ b/test/moves/parting_shot.test.ts @@ -35,7 +35,7 @@ describe("Moves - Parting Shot", () => { test("Parting Shot when buffed by prankster should fail against dark types", async () => { game.override.enemySpecies(Species.POOCHYENA).ability(Abilities.PRANKSTER); - await game.startBattle([Species.MURKROW, Species.MEOWTH]); + await game.classicMode.startBattle([Species.MURKROW, Species.MEOWTH]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon).toBeDefined(); @@ -50,7 +50,7 @@ describe("Moves - Parting Shot", () => { test("Parting shot should fail against good as gold ability", async () => { game.override.enemySpecies(Species.GHOLDENGO).enemyAbility(Abilities.GOOD_AS_GOLD); - await game.startBattle([Species.MURKROW, Species.MEOWTH]); + await game.classicMode.startBattle([Species.MURKROW, Species.MEOWTH]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon).toBeDefined(); @@ -68,7 +68,13 @@ describe("Moves - Parting Shot", () => { "Parting shot should fail if target is -6/-6 de-buffed", async () => { game.override.moveset([Moves.PARTING_SHOT, Moves.MEMENTO, Moves.SPLASH]); - await game.startBattle([Species.MEOWTH, Species.MEOWTH, Species.MEOWTH, Species.MURKROW, Species.ABRA]); + await game.classicMode.startBattle([ + Species.MEOWTH, + Species.MEOWTH, + Species.MEOWTH, + Species.MURKROW, + Species.ABRA, + ]); // use Memento 3 times to debuff enemy game.move.select(Moves.MEMENTO); @@ -111,7 +117,7 @@ describe("Moves - Parting Shot", () => { "Parting shot shouldn't allow switch out when mist is active", async () => { game.override.enemySpecies(Species.ALTARIA).enemyAbility(Abilities.NONE).enemyMoveset([Moves.MIST]); - await game.startBattle([Species.SNORLAX, Species.MEOWTH]); + await game.classicMode.startBattle([Species.SNORLAX, Species.MEOWTH]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon).toBeDefined(); @@ -130,7 +136,7 @@ describe("Moves - Parting Shot", () => { "Parting shot shouldn't allow switch out against clear body ability", async () => { game.override.enemySpecies(Species.TENTACOOL).enemyAbility(Abilities.CLEAR_BODY); - await game.startBattle([Species.SNORLAX, Species.MEOWTH]); + await game.classicMode.startBattle([Species.SNORLAX, Species.MEOWTH]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon).toBeDefined(); @@ -148,7 +154,7 @@ describe("Moves - Parting Shot", () => { // TODO: fix this bug to pass the test! "Parting shot should de-buff and not fail if no party available to switch - party size 1", async () => { - await game.startBattle([Species.MURKROW]); + await game.classicMode.startBattle([Species.MURKROW]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon).toBeDefined(); @@ -166,7 +172,7 @@ describe("Moves - Parting Shot", () => { // TODO: fix this bug to pass the test! "Parting shot regularly not fail if no party available to switch - party fainted", async () => { - await game.startBattle([Species.MURKROW, Species.MEOWTH]); + await game.classicMode.startBattle([Species.MURKROW, Species.MEOWTH]); game.move.select(Moves.SPLASH); // intentionally kill party pokemon, switch to second slot (now 1 party mon is fainted) diff --git a/test/moves/plasma_fists.test.ts b/test/moves/plasma_fists.test.ts index b6a5ceaed68..0c3412d8e60 100644 --- a/test/moves/plasma_fists.test.ts +++ b/test/moves/plasma_fists.test.ts @@ -42,8 +42,8 @@ describe("Moves - Plasma Fists", () => { game.move.select(Moves.PLASMA_FISTS, 0, BattlerIndex.ENEMY); game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.TACKLE, BattlerIndex.PLAYER_2); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); diff --git a/test/moves/pledge_moves.test.ts b/test/moves/pledge_moves.test.ts index 9dbf2b4cb02..6c66c4bbe2d 100644 --- a/test/moves/pledge_moves.test.ts +++ b/test/moves/pledge_moves.test.ts @@ -256,8 +256,8 @@ describe("Moves - Pledge Moves", () => { game.move.select(Moves.FIRE_PLEDGE, 0, BattlerIndex.ENEMY); game.move.select(Moves.GRASS_PLEDGE, 1, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.SPORE, BattlerIndex.PLAYER_2); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPORE, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2]); @@ -290,8 +290,8 @@ describe("Moves - Pledge Moves", () => { game.move.select(Moves.WATER_PLEDGE, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.FOLLOW_ME); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.FOLLOW_ME); await game.phaseInterceptor.to("BerryPhase", false); diff --git a/test/moves/powder.test.ts b/test/moves/powder.test.ts index c6114db3ff1..b65525109ad 100644 --- a/test/moves/powder.test.ts +++ b/test/moves/powder.test.ts @@ -233,8 +233,8 @@ describe("Moves - Powder", () => { game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.GRASS_PLEDGE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.GRASS_PLEDGE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(BerryPhase, false); @@ -250,8 +250,8 @@ describe("Moves - Powder", () => { game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); await game.phaseInterceptor.to(BerryPhase, false); @@ -267,8 +267,8 @@ describe("Moves - Powder", () => { game.move.select(Moves.POWDER, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.FIRE_PLEDGE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.WATER_PLEDGE, BattlerIndex.PLAYER); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY_2, BattlerIndex.ENEMY]); await game.phaseInterceptor.to(BerryPhase, false); diff --git a/test/moves/power_split.test.ts b/test/moves/power_split.test.ts index f15275fce9e..ca712f0a64e 100644 --- a/test/moves/power_split.test.ts +++ b/test/moves/power_split.test.ts @@ -34,7 +34,7 @@ describe("Moves - Power Split", () => { it("should average the user's ATK and SPATK stats with those of the target", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([Species.INDEEDEE]); + await game.classicMode.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -54,7 +54,7 @@ describe("Moves - Power Split", () => { it("should be idempotent", async () => { game.override.enemyMoveset([Moves.POWER_SPLIT]); - await game.startBattle([Species.INDEEDEE]); + await game.classicMode.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/moves/purify.test.ts b/test/moves/purify.test.ts index 191539d8cec..0439ba39108 100644 --- a/test/moves/purify.test.ts +++ b/test/moves/purify.test.ts @@ -37,7 +37,7 @@ describe("Moves - Purify", () => { }); test("Purify heals opponent status effect and restores user hp", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!; const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!; @@ -54,7 +54,7 @@ describe("Moves - Purify", () => { }); test("Purify does not heal if opponent doesnt have any status effect", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const playerPokemon: PlayerPokemon = game.scene.getPlayerPokemon()!; diff --git a/test/moves/quash.test.ts b/test/moves/quash.test.ts index 5bf8271320b..f242dafe365 100644 --- a/test/moves/quash.test.ts +++ b/test/moves/quash.test.ts @@ -39,8 +39,8 @@ describe("Moves - Quash", () => { game.move.select(Moves.QUASH, 0, BattlerIndex.PLAYER_2); game.move.select(Moves.SUNNY_DAY, 1); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.RAIN_DANCE); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.RAIN_DANCE); await game.phaseInterceptor.to("TurnEndPhase", false); // will be sunny if player_2 moved last because of quash, rainy otherwise @@ -67,8 +67,8 @@ describe("Moves - Quash", () => { game.move.select(Moves.RAIN_DANCE, 0); game.move.select(Moves.SUNNY_DAY, 1); - await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.QUASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.QUASH, BattlerIndex.PLAYER_2); await game.phaseInterceptor.to("TurnEndPhase", false); expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SUNNY); @@ -81,15 +81,15 @@ describe("Moves - Quash", () => { game.move.select(Moves.SPLASH, 0); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.TRICK_ROOM); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.TRICK_ROOM); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnInitPhase"); // both users are quashed - accelgor should move last w/ TR so rain should be up at end of turn game.move.select(Moves.RAIN_DANCE, 0); game.move.select(Moves.SUNNY_DAY, 1); - await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.QUASH, BattlerIndex.PLAYER_2); + await game.move.selectEnemyMove(Moves.QUASH, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.QUASH, BattlerIndex.PLAYER_2); await game.phaseInterceptor.to("TurnEndPhase", false); expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.RAIN); diff --git a/test/moves/rage_fist.test.ts b/test/moves/rage_fist.test.ts index 0aabb717f1b..9e5810039a8 100644 --- a/test/moves/rage_fist.test.ts +++ b/test/moves/rage_fist.test.ts @@ -75,7 +75,7 @@ describe("Moves - Rage Fist", () => { await game.classicMode.startBattle([Species.REGIROCK]); game.move.select(Moves.SUBSTITUTE); - await game.forceEnemyMove(Moves.DOUBLE_KICK); + await game.move.selectEnemyMove(Moves.DOUBLE_KICK); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); @@ -84,12 +84,12 @@ describe("Moves - Rage Fist", () => { // remove substitute and get confused game.move.select(Moves.TIDY_UP); - await game.forceEnemyMove(Moves.CONFUSE_RAY); + await game.move.selectEnemyMove(Moves.CONFUSE_RAY); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.toNextTurn(); game.move.select(Moves.RAGE_FIST); - await game.forceEnemyMove(Moves.CONFUSE_RAY); + await game.move.selectEnemyMove(Moves.CONFUSE_RAY); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceConfusionActivation(true); await game.toNextTurn(); @@ -123,7 +123,7 @@ describe("Moves - Rage Fist", () => { // beat up a magikarp game.move.select(Moves.RAGE_FIST); - await game.forceEnemyMove(Moves.DOUBLE_KICK); + await game.move.selectEnemyMove(Moves.DOUBLE_KICK); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); diff --git a/test/moves/rage_powder.test.ts b/test/moves/rage_powder.test.ts index 284b558f842..206fd590896 100644 --- a/test/moves/rage_powder.test.ts +++ b/test/moves/rage_powder.test.ts @@ -38,8 +38,8 @@ describe("Moves - Rage Powder", () => { game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.RAGE_POWDER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.RAGE_POWDER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase", false); @@ -61,8 +61,8 @@ describe("Moves - Rage Powder", () => { game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.RAGE_POWDER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.RAGE_POWDER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("BerryPhase", false); diff --git a/test/moves/reflect_type.test.ts b/test/moves/reflect_type.test.ts index efd58bfeadf..63772aa746f 100644 --- a/test/moves/reflect_type.test.ts +++ b/test/moves/reflect_type.test.ts @@ -37,17 +37,17 @@ describe("Moves - Reflect Type", () => { const enemyPokemon = game.scene.getEnemyPokemon(); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.BURN_UP); + await game.move.selectEnemyMove(Moves.BURN_UP); await game.toNextTurn(); game.move.select(Moves.FORESTS_CURSE); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); expect(enemyPokemon?.getTypes().includes(PokemonType.UNKNOWN)).toBe(true); expect(enemyPokemon?.getTypes().includes(PokemonType.GRASS)).toBe(true); game.move.select(Moves.REFLECT_TYPE); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); expect(playerPokemon?.getTypes()[0]).toBe(PokemonType.NORMAL); expect(playerPokemon?.getTypes().includes(PokemonType.GRASS)).toBe(true); diff --git a/test/moves/retaliate.test.ts b/test/moves/retaliate.test.ts index 81ea353a120..40f31635d9b 100644 --- a/test/moves/retaliate.test.ts +++ b/test/moves/retaliate.test.ts @@ -37,7 +37,7 @@ describe("Moves - Retaliate", () => { it("increases power if ally died previous turn", async () => { vi.spyOn(retaliate, "calculateBattlePower"); - await game.startBattle([Species.ABRA, Species.COBALION]); + await game.classicMode.startBattle([Species.ABRA, Species.COBALION]); game.move.select(Moves.RETALIATE); await game.phaseInterceptor.to("TurnEndPhase"); expect(retaliate.calculateBattlePower).toHaveLastReturnedWith(70); diff --git a/test/moves/revival_blessing.test.ts b/test/moves/revival_blessing.test.ts index b36cd43eb83..ded18e3ffb8 100644 --- a/test/moves/revival_blessing.test.ts +++ b/test/moves/revival_blessing.test.ts @@ -98,8 +98,8 @@ describe("Moves - Revival Blessing", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.REVIVAL_BLESSING, 1); - await game.forceEnemyMove(Moves.FISSURE, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.FISSURE, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2]); await game.phaseInterceptor.to("MoveEndPhase"); diff --git a/test/moves/rollout.test.ts b/test/moves/rollout.test.ts index dab9ef67596..dafa72dd5fa 100644 --- a/test/moves/rollout.test.ts +++ b/test/moves/rollout.test.ts @@ -42,7 +42,7 @@ describe("Moves - Rollout", () => { const turns = 6; const dmgHistory: number[] = []; - await game.startBattle(); + await game.classicMode.startBattle(); const playerPkm = game.scene.getPlayerParty()[0]; vi.spyOn(playerPkm, "stats", "get").mockReturnValue([500000, 1, 1, 1, 1, 1]); // HP, ATK, DEF, SPATK, SPDEF, SPD diff --git a/test/moves/round.test.ts b/test/moves/round.test.ts index 43e505705ae..ccdf4cbf089 100644 --- a/test/moves/round.test.ts +++ b/test/moves/round.test.ts @@ -45,8 +45,8 @@ describe("Moves - Round", () => { game.move.select(Moves.ROUND, 0, BattlerIndex.ENEMY); game.move.select(Moves.ROUND, 1, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.ROUND, BattlerIndex.PLAYER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.ROUND, BattlerIndex.PLAYER); + await game.move.selectEnemyMove(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY_2, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY]); diff --git a/test/moves/secret_power.test.ts b/test/moves/secret_power.test.ts index f6870c5ed1d..99945002b8d 100644 --- a/test/moves/secret_power.test.ts +++ b/test/moves/secret_power.test.ts @@ -49,13 +49,13 @@ describe("Moves - Secret Power", () => { // No Terrain + Biome.VOLCANO --> Burn game.move.select(Moves.SECRET_POWER); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemyPokemon.status?.effect).toBe(StatusEffect.BURN); // Misty Terrain --> SpAtk -1 game.move.select(Moves.SECRET_POWER); - await game.forceEnemyMove(Moves.MISTY_TERRAIN); + await game.move.selectEnemyMove(Moves.MISTY_TERRAIN); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(-1); }); diff --git a/test/moves/shell_trap.test.ts b/test/moves/shell_trap.test.ts index 313d02b4d73..2aa4712152d 100644 --- a/test/moves/shell_trap.test.ts +++ b/test/moves/shell_trap.test.ts @@ -38,7 +38,7 @@ describe("Moves - Shell Trap", () => { }); it("should activate after the user is hit by a physical attack", async () => { - await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.TURTONATOR]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); @@ -61,7 +61,7 @@ describe("Moves - Shell Trap", () => { it("should fail if the user is only hit by special attacks", async () => { game.override.enemyMoveset([Moves.SWIFT]); - await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.TURTONATOR]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); @@ -84,7 +84,7 @@ describe("Moves - Shell Trap", () => { it("should fail if the user isn't hit with any attack", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.TURTONATOR]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); @@ -107,7 +107,7 @@ describe("Moves - Shell Trap", () => { it("should not activate from an ally's attack", async () => { game.override.enemyMoveset(Moves.SPLASH); - await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); + await game.classicMode.startBattle([Species.BLASTOISE, Species.CHARIZARD]); const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); @@ -131,7 +131,7 @@ describe("Moves - Shell Trap", () => { game.override.battleStyle("single"); vi.spyOn(allMoves[Moves.RAZOR_LEAF], "priority", "get").mockReturnValue(-4); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const playerPokemon = game.scene.getPlayerPokemon()!; const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/moves/speed_swap.test.ts b/test/moves/speed_swap.test.ts index 2b010885e34..f2be761b64e 100644 --- a/test/moves/speed_swap.test.ts +++ b/test/moves/speed_swap.test.ts @@ -34,7 +34,7 @@ describe("Moves - Speed Swap", () => { }); it("should swap the user's SPD and the target's SPD stats", async () => { - await game.startBattle([Species.INDEEDEE]); + await game.classicMode.startBattle([Species.INDEEDEE]); const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; diff --git a/test/moves/spikes.test.ts b/test/moves/spikes.test.ts index 3dfa398d7d6..f37b54a2904 100644 --- a/test/moves/spikes.test.ts +++ b/test/moves/spikes.test.ts @@ -32,7 +32,7 @@ describe("Moves - Spikes", () => { }); it("should not damage the team that set them", async () => { - await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); game.move.select(Moves.SPIKES); await game.toNextTurn(); @@ -52,7 +52,7 @@ describe("Moves - Spikes", () => { it("should damage opposing pokemon that are forced to switch in", async () => { game.override.startingWave(5); - await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); game.move.select(Moves.SPIKES); await game.toNextTurn(); @@ -66,7 +66,7 @@ describe("Moves - Spikes", () => { it("should damage opposing pokemon that choose to switch in", async () => { game.override.startingWave(5); - await game.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA, Species.POOCHYENA]); game.move.select(Moves.SPIKES); await game.toNextTurn(); diff --git a/test/moves/spit_up.test.ts b/test/moves/spit_up.test.ts index 7197d9b75c3..b11d74da64a 100644 --- a/test/moves/spit_up.test.ts +++ b/test/moves/spit_up.test.ts @@ -50,7 +50,7 @@ describe("Moves - Spit Up", () => { const stacksToSetup = 1; const expectedPower = 100; - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -72,7 +72,7 @@ describe("Moves - Spit Up", () => { const stacksToSetup = 2; const expectedPower = 200; - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -95,7 +95,7 @@ describe("Moves - Spit Up", () => { const stacksToSetup = 3; const expectedPower = 300; - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -117,7 +117,7 @@ describe("Moves - Spit Up", () => { }); it("fails without stacks", async () => { - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; @@ -138,7 +138,7 @@ describe("Moves - Spit Up", () => { describe("restores stat boosts granted by stacks", () => { it("decreases stats based on stored values (both boosts equal)", async () => { - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -169,7 +169,7 @@ describe("Moves - Spit Up", () => { }); it("decreases stats based on stored values (different boosts)", async () => { - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); diff --git a/test/moves/spotlight.test.ts b/test/moves/spotlight.test.ts index 2c4f652e408..e617682bdd5 100644 --- a/test/moves/spotlight.test.ts +++ b/test/moves/spotlight.test.ts @@ -39,8 +39,8 @@ describe("Moves - Spotlight", () => { game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY); game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase, false); @@ -56,8 +56,8 @@ describe("Moves - Spotlight", () => { game.move.select(Moves.SPOTLIGHT, 0, BattlerIndex.ENEMY); game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.FOLLOW_ME); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.FOLLOW_ME); await game.phaseInterceptor.to("BerryPhase", false); diff --git a/test/moves/stockpile.test.ts b/test/moves/stockpile.test.ts index 4b8f51c32b2..196a1d8ca9a 100644 --- a/test/moves/stockpile.test.ts +++ b/test/moves/stockpile.test.ts @@ -39,7 +39,7 @@ describe("Moves - Stockpile", () => { }); it("gains a stockpile stack and raises user's DEF and SPDEF stat stages by 1 on each use, fails at max stacks (3)", async () => { - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const user = game.scene.getPlayerPokemon()!; @@ -83,7 +83,7 @@ describe("Moves - Stockpile", () => { }); it("gains a stockpile stack even if user's DEF and SPDEF stat stages are at +6", async () => { - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const user = game.scene.getPlayerPokemon()!; diff --git a/test/moves/swallow.test.ts b/test/moves/swallow.test.ts index d548522068b..cff9daaf97a 100644 --- a/test/moves/swallow.test.ts +++ b/test/moves/swallow.test.ts @@ -43,7 +43,7 @@ describe("Moves - Swallow", () => { const stacksToSetup = 1; const expectedHeal = 25; - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100); @@ -70,7 +70,7 @@ describe("Moves - Swallow", () => { const stacksToSetup = 2; const expectedHeal = 50; - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100); @@ -98,7 +98,7 @@ describe("Moves - Swallow", () => { const stacksToSetup = 3; const expectedHeal = 100; - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; vi.spyOn(pokemon, "getMaxHp").mockReturnValue(100); @@ -125,7 +125,7 @@ describe("Moves - Swallow", () => { }); it("fails without stacks", async () => { - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; @@ -144,7 +144,7 @@ describe("Moves - Swallow", () => { describe("restores stat stage boosts granted by stacks", () => { it("decreases stats based on stored values (both boosts equal)", async () => { - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); @@ -173,7 +173,7 @@ describe("Moves - Swallow", () => { }); it("lower stat stages based on stored values (different boosts)", async () => { - await game.startBattle([Species.ABOMASNOW]); + await game.classicMode.startBattle([Species.ABOMASNOW]); const pokemon = game.scene.getPlayerPokemon()!; pokemon.addTag(BattlerTagType.STOCKPILING); diff --git a/test/moves/tackle.test.ts b/test/moves/tackle.test.ts index 162836cd181..5fd8ba589fc 100644 --- a/test/moves/tackle.test.ts +++ b/test/moves/tackle.test.ts @@ -36,7 +36,7 @@ describe("Moves - Tackle", () => { it("TACKLE against ghost", async () => { const moveToUse = Moves.TACKLE; game.override.enemySpecies(Species.GENGAR); - await game.startBattle([Species.MIGHTYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA]); const hpOpponent = game.scene.currentBattle.enemyParty[0].hp; game.move.select(moveToUse); await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(TurnEndPhase); @@ -46,7 +46,7 @@ describe("Moves - Tackle", () => { it("TACKLE against not resistant", async () => { const moveToUse = Moves.TACKLE; - await game.startBattle([Species.MIGHTYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA]); game.scene.currentBattle.enemyParty[0].stats[Stat.DEF] = 50; game.scene.getPlayerParty()[0].stats[Stat.ATK] = 50; diff --git a/test/moves/tail_whip.test.ts b/test/moves/tail_whip.test.ts index 2d3ade2691d..d15864dd671 100644 --- a/test/moves/tail_whip.test.ts +++ b/test/moves/tail_whip.test.ts @@ -36,7 +36,7 @@ describe("Moves - Tail whip", () => { it("should lower DEF stat stage by 1", async () => { const moveToUse = Moves.TAIL_WHIP; - await game.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); + await game.classicMode.startBattle([Species.MIGHTYENA, Species.MIGHTYENA]); const enemyPokemon = game.scene.getEnemyPokemon()!; expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); diff --git a/test/moves/taunt.test.ts b/test/moves/taunt.test.ts index e0bb13c61fb..bcb4789f888 100644 --- a/test/moves/taunt.test.ts +++ b/test/moves/taunt.test.ts @@ -37,7 +37,7 @@ describe("Moves - Taunt", () => { // First turn, Player Pokemon succeeds using Growl without Taunt game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.TAUNT); + await game.move.selectEnemyMove(Moves.TAUNT); await game.toNextTurn(); const move1 = playerPokemon.getLastXMoves(1)[0]!; expect(move1.move).toBe(Moves.GROWL); @@ -46,7 +46,7 @@ describe("Moves - Taunt", () => { // Second turn, Taunt forces Struggle to occur game.move.select(Moves.GROWL); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const move2 = playerPokemon.getLastXMoves(1)[0]!; expect(move2.move).toBe(Moves.STRUGGLE); diff --git a/test/moves/telekinesis.test.ts b/test/moves/telekinesis.test.ts index e889926b5c8..e5a21e915fa 100644 --- a/test/moves/telekinesis.test.ts +++ b/test/moves/telekinesis.test.ts @@ -106,7 +106,7 @@ describe("Moves - Telekinesis", () => { const enemyOpponent = game.scene.getEnemyPokemon()!; game.move.select(Moves.TELEKINESIS); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemyOpponent.getTag(BattlerTagType.TELEKINESIS)).toBeDefined(); expect(enemyOpponent.getTag(BattlerTagType.FLOATING)).toBeDefined(); @@ -114,7 +114,7 @@ describe("Moves - Telekinesis", () => { await game.toNextTurn(); vi.spyOn(allMoves[Moves.MUD_SHOT], "accuracy", "get").mockReturnValue(0); game.move.select(Moves.MUD_SHOT); - await game.forceEnemyMove(Moves.INGRAIN); + await game.move.selectEnemyMove(Moves.INGRAIN); await game.phaseInterceptor.to("TurnEndPhase"); expect(enemyOpponent.getTag(BattlerTagType.TELEKINESIS)).toBeDefined(); expect(enemyOpponent.getTag(BattlerTagType.INGRAIN)).toBeDefined(); diff --git a/test/moves/thousand_arrows.test.ts b/test/moves/thousand_arrows.test.ts index 7259fda8560..39bc8617767 100644 --- a/test/moves/thousand_arrows.test.ts +++ b/test/moves/thousand_arrows.test.ts @@ -33,7 +33,7 @@ describe("Moves - Thousand Arrows", () => { }); it("move should hit and ground Flying-type targets", async () => { - await game.startBattle([Species.ILLUMISE]); + await game.classicMode.startBattle([Species.ILLUMISE]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -53,7 +53,7 @@ describe("Moves - Thousand Arrows", () => { game.override.enemySpecies(Species.SNORLAX); game.override.enemyAbility(Abilities.LEVITATE); - await game.startBattle([Species.ILLUMISE]); + await game.classicMode.startBattle([Species.ILLUMISE]); const enemyPokemon = game.scene.getEnemyPokemon()!; @@ -72,7 +72,7 @@ describe("Moves - Thousand Arrows", () => { it("move should hit and ground targets under the effects of Magnet Rise", async () => { game.override.enemySpecies(Species.SNORLAX); - await game.startBattle([Species.ILLUMISE]); + await game.classicMode.startBattle([Species.ILLUMISE]); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/moves/thunder_wave.test.ts b/test/moves/thunder_wave.test.ts index abfb5828d3b..326d7ecbdc0 100644 --- a/test/moves/thunder_wave.test.ts +++ b/test/moves/thunder_wave.test.ts @@ -34,7 +34,7 @@ describe("Moves - Thunder Wave", () => { it("paralyzes non-statused Pokemon that are not Ground types", async () => { game.override.enemySpecies(Species.MAGIKARP); - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!; @@ -47,7 +47,7 @@ describe("Moves - Thunder Wave", () => { it("does not paralyze if the Pokemon is a Ground-type", async () => { game.override.enemySpecies(Species.DIGLETT); - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!; @@ -60,7 +60,7 @@ describe("Moves - Thunder Wave", () => { it("does not paralyze if the Pokemon already has a status effect", async () => { game.override.enemySpecies(Species.MAGIKARP).enemyStatusEffect(StatusEffect.BURN); - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!; @@ -73,7 +73,7 @@ describe("Moves - Thunder Wave", () => { it("affects Ground types if the user has Normalize", async () => { game.override.ability(Abilities.NORMALIZE).enemySpecies(Species.DIGLETT); - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!; @@ -86,7 +86,7 @@ describe("Moves - Thunder Wave", () => { it("does not affect Ghost types if the user has Normalize", async () => { game.override.ability(Abilities.NORMALIZE).enemySpecies(Species.HAUNTER); - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon: EnemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/test/moves/torment.test.ts b/test/moves/torment.test.ts index d06837d2806..d11de46bf10 100644 --- a/test/moves/torment.test.ts +++ b/test/moves/torment.test.ts @@ -40,7 +40,7 @@ describe("Moves - Torment", () => { // First turn, Player Pokemon uses Tackle successfully game.move.select(Moves.TACKLE); - await game.forceEnemyMove(Moves.TORMENT); + await game.move.selectEnemyMove(Moves.TORMENT); await game.toNextTurn(); const move1 = playerPokemon.getLastXMoves(1)[0]!; expect(move1.move).toBe(Moves.TACKLE); @@ -49,14 +49,14 @@ describe("Moves - Torment", () => { // Second turn, Torment forces Struggle to occur game.move.select(Moves.TACKLE); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); const move2 = playerPokemon.getLastXMoves(1)[0]!; expect(move2.move).toBe(Moves.STRUGGLE); // Third turn, Tackle can be used. game.move.select(Moves.TACKLE); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.phaseInterceptor.to(TurnEndPhase); const move3 = playerPokemon.getLastXMoves(1)[0]!; expect(move3.move).toBe(Moves.TACKLE); diff --git a/test/moves/whirlwind.test.ts b/test/moves/whirlwind.test.ts index 67ffb77612c..3558f968c66 100644 --- a/test/moves/whirlwind.test.ts +++ b/test/moves/whirlwind.test.ts @@ -51,7 +51,7 @@ describe("Moves - Whirlwind", () => { const staraptor = game.scene.getPlayerPokemon()!; game.move.select(move); - await game.forceEnemyMove(Moves.WHIRLWIND); + await game.move.selectEnemyMove(Moves.WHIRLWIND); await game.phaseInterceptor.to("BerryPhase", false); @@ -69,7 +69,7 @@ describe("Moves - Whirlwind", () => { return min; }); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.WHIRLWIND); + await game.move.selectEnemyMove(Moves.WHIRLWIND); await game.toNextTurn(); expect(bulbasaur.isOnField()).toBe(false); @@ -81,7 +81,7 @@ describe("Moves - Whirlwind", () => { return min + 1; }); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.WHIRLWIND); + await game.move.selectEnemyMove(Moves.WHIRLWIND); await game.toNextTurn(); expect(bulbasaur.isOnField()).toBe(false); @@ -101,7 +101,7 @@ describe("Moves - Whirlwind", () => { return min; }); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.WHIRLWIND); + await game.move.selectEnemyMove(Moves.WHIRLWIND); await game.toNextTurn(); expect(lapras.isOnField()).toBe(false); @@ -120,7 +120,7 @@ describe("Moves - Whirlwind", () => { eevee.status = new Status(StatusEffect.FAINT); expect(eevee.isFainted()).toBe(true); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted @@ -128,7 +128,7 @@ describe("Moves - Whirlwind", () => { return min; }); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.WHIRLWIND); + await game.move.selectEnemyMove(Moves.WHIRLWIND); await game.toNextTurn(); expect(lapras.isOnField()).toBe(false); @@ -147,7 +147,7 @@ describe("Moves - Whirlwind", () => { eevee.status = new Status(StatusEffect.FAINT); expect(eevee.isFainted()).toBe(true); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); // Turn 2: Mock an RNG call that would normally call for switching to Eevee, but it is fainted @@ -155,7 +155,7 @@ describe("Moves - Whirlwind", () => { return min; }); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.WHIRLWIND); + await game.move.selectEnemyMove(Moves.WHIRLWIND); await game.toNextTurn(); expect(lapras.isOnField()).toBe(true); @@ -184,7 +184,7 @@ describe("Moves - Whirlwind", () => { // Player uses Whirlwind; opponent uses Splash game.move.select(Moves.WHIRLWIND); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); // Verify that the failure message is displayed for Whirlwind @@ -214,8 +214,8 @@ describe("Moves - Whirlwind", () => { game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH); - await game.forceEnemyMove(Moves.MEMENTO); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.MEMENTO); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); // Get the enemy pokemon id so we can check if is the same after switch. @@ -225,8 +225,8 @@ describe("Moves - Whirlwind", () => { game.move.select(Moves.WHIRLWIND, 0, BattlerIndex.ENEMY); game.move.select(Moves.SPLASH, 1); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.SPLASH); await game.toNextTurn(); diff --git a/test/moves/wide_guard.test.ts b/test/moves/wide_guard.test.ts index 85ebad806d7..08357476e5e 100644 --- a/test/moves/wide_guard.test.ts +++ b/test/moves/wide_guard.test.ts @@ -38,7 +38,7 @@ describe("Moves - Wide Guard", () => { }); test("should protect the user and allies from multi-target attack moves", async () => { - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); @@ -56,7 +56,7 @@ describe("Moves - Wide Guard", () => { test("should protect the user and allies from multi-target status moves", async () => { game.override.enemyMoveset([Moves.GROWL]); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); @@ -74,7 +74,7 @@ describe("Moves - Wide Guard", () => { test("should not protect the user and allies from single-target moves", async () => { game.override.enemyMoveset([Moves.TACKLE]); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); @@ -92,7 +92,7 @@ describe("Moves - Wide Guard", () => { test("should protect the user from its ally's multi-target move", async () => { game.override.enemyMoveset([Moves.SPLASH]); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); diff --git a/test/phases/learn-move-phase.test.ts b/test/phases/learn-move-phase.test.ts index 019b833d386..b8b718a9669 100644 --- a/test/phases/learn-move-phase.test.ts +++ b/test/phases/learn-move-phase.test.ts @@ -56,9 +56,7 @@ describe("Learn Move Phase", () => { game.scene.ui.processInput(Button.ACTION); }); game.onNextPrompt("LearnMovePhase", UiMode.SUMMARY, () => { - for (let x = 0; x < moveSlotNum; x++) { - game.scene.ui.processInput(Button.DOWN); - } + game.scene.ui.setCursor(moveSlotNum); game.scene.ui.processInput(Button.ACTION); }); await game.phaseInterceptor.to(LearnMovePhase); @@ -88,9 +86,7 @@ describe("Learn Move Phase", () => { game.scene.ui.processInput(Button.ACTION); }); game.onNextPrompt("LearnMovePhase", UiMode.SUMMARY, () => { - for (let x = 0; x < 4; x++) { - game.scene.ui.processInput(Button.DOWN); // moves down 4 times to the 5th move slot - } + game.scene.ui.setCursor(4); game.scene.ui.processInput(Button.ACTION); }); game.onNextPrompt("LearnMovePhase", UiMode.CONFIRM, () => { @@ -102,64 +98,4 @@ describe("Learn Move Phase", () => { expect(bulbasaur.level).toBeGreaterThanOrEqual(levelReq); expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual(prevMoveset); }); - - it("macro should add moves in free slots normally", async () => { - await game.classicMode.startBattle([Species.BULBASAUR]); - const bulbasaur = game.scene.getPlayerPokemon()!; - - game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID]); - game.move.select(Moves.SPLASH); - await game.move.learnMove(Moves.SACRED_FIRE, 0, 1); - expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ - Moves.SPLASH, - Moves.ABSORB, - Moves.ACID, - Moves.SACRED_FIRE, - ]); - }); - - it("macro should replace moves", async () => { - await game.classicMode.startBattle([Species.BULBASAUR]); - const bulbasaur = game.scene.getPlayerPokemon()!; - - game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]); - game.move.select(Moves.SPLASH); - await game.move.learnMove(Moves.SACRED_FIRE, 0, 1); - expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ - Moves.SPLASH, - Moves.SACRED_FIRE, - Moves.ACID, - Moves.VINE_WHIP, - ]); - }); - - it("macro should allow for cancelling move learning", async () => { - await game.classicMode.startBattle([Species.BULBASAUR]); - const bulbasaur = game.scene.getPlayerPokemon()!; - - game.move.changeMoveset(bulbasaur, [Moves.SPLASH, Moves.ABSORB, Moves.ACID, Moves.VINE_WHIP]); - game.move.select(Moves.SPLASH); - await game.move.learnMove(Moves.SACRED_FIRE, 0, 4); - expect(bulbasaur.getMoveset().map(m => m?.moveId)).toEqual([ - Moves.SPLASH, - Moves.ABSORB, - Moves.ACID, - Moves.VINE_WHIP, - ]); - }); - - it("macro works on off-field party members", async () => { - await game.classicMode.startBattle([Species.BULBASAUR, Species.SQUIRTLE]); - const squirtle = game.scene.getPlayerParty()[1]!; - - game.move.changeMoveset(squirtle, [Moves.SPLASH, Moves.WATER_GUN, Moves.FREEZE_DRY, Moves.GROWL]); - game.move.select(Moves.TACKLE); - await game.move.learnMove(Moves.SHELL_SMASH, 1, 0); - expect(squirtle.getMoveset().map(m => m?.moveId)).toEqual([ - Moves.SHELL_SMASH, - Moves.WATER_GUN, - Moves.FREEZE_DRY, - Moves.GROWL, - ]); - }); }); diff --git a/test/testUtils/gameManager.ts b/test/testUtils/gameManager.ts index 07cea3b1328..39b6000e308 100644 --- a/test/testUtils/gameManager.ts +++ b/test/testUtils/gameManager.ts @@ -1,7 +1,6 @@ import { updateUserInfo } from "#app/account"; import { BattlerIndex } from "#app/battle"; import BattleScene from "#app/battle-scene"; -import { getMoveTargets } from "#app/data/moves/move"; import type { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon"; import Trainer from "#app/field/trainer"; import { GameModes, getGameMode } from "#app/game-mode"; @@ -11,7 +10,6 @@ import overrides from "#app/overrides"; import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; import { CommandPhase } from "#app/phases/command-phase"; import { EncounterPhase } from "#app/phases/encounter-phase"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { FaintPhase } from "#app/phases/faint-phase"; import { LoginPhase } from "#app/phases/login-phase"; import { MovePhase } from "#app/phases/move-phase"; @@ -31,11 +29,9 @@ import type PartyUiHandler from "#app/ui/party-ui-handler"; import type StarterSelectUiHandler from "#app/ui/starter-select-ui-handler"; import type TargetSelectUiHandler from "#app/ui/target-select-ui-handler"; import { isNullOrUndefined } from "#app/utils/common"; -import { BattleStyle } from "#enums/battle-style"; import { Button } from "#enums/buttons"; import { ExpGainsSpeed } from "#enums/exp-gains-speed"; import { ExpNotification } from "#enums/exp-notification"; -import type { Moves } from "#enums/moves"; import type { MysteryEncounterType } from "#enums/mystery-encounter-type"; import { PlayerGender } from "#enums/player-gender"; import type { Species } from "#enums/species"; @@ -274,42 +270,6 @@ export default class GameManager { } } - /** - * @deprecated Use `game.classicMode.startBattle()` or `game.dailyMode.startBattle()` instead - * - * Transitions to the start of a battle. - * @param species - Optional array of species to start the battle with. - * @returns A promise that resolves when the battle is started. - */ - async startBattle(species?: Species[]) { - await this.classicMode.runToSummon(species); - - if (this.scene.battleStyle === BattleStyle.SWITCH) { - this.onNextPrompt( - "CheckSwitchPhase", - UiMode.CONFIRM, - () => { - this.setMode(UiMode.MESSAGE); - this.endPhase(); - }, - () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase), - ); - - this.onNextPrompt( - "CheckSwitchPhase", - UiMode.CONFIRM, - () => { - this.setMode(UiMode.MESSAGE); - this.endPhase(); - }, - () => this.isCurrentPhase(CommandPhase) || this.isCurrentPhase(TurnInitPhase), - ); - } - - await this.phaseInterceptor.to(CommandPhase); - console.log("==================[New Turn]=================="); - } - /** * Emulate a player's target selection after a move is chosen, usually called automatically by {@linkcode MoveHelper.select}. * Will trigger during the next {@linkcode SelectTargetPhase} @@ -380,36 +340,6 @@ export default class GameManager { ); } - /** - * Forces the next enemy selecting a move to use the given move in its moveset against the - * given target (if applicable). - * @param moveId - The {@linkcode Moves | move} the enemy will use - * @param target - The {@linkcode BattlerIndex} of the target against which the enemy will use the given move; - * will use normal target selection priorities if omitted. - * @deprecated Use {@linkcode MoveHelper.forceEnemyMove} or {@linkcode MoveHelper.selectEnemyMove} - */ - async forceEnemyMove(moveId: Moves, target?: BattlerIndex) { - // Wait for the next EnemyCommandPhase to start - await this.phaseInterceptor.to(EnemyCommandPhase, false); - const enemy = this.scene.getEnemyField()[(this.scene.getCurrentPhase() as EnemyCommandPhase).getFieldIndex()]; - const legalTargets = getMoveTargets(enemy, moveId); - - vi.spyOn(enemy, "getNextMove").mockReturnValueOnce({ - move: moveId, - targets: - target !== undefined && !legalTargets.multiple && legalTargets.targets.includes(target) - ? [target] - : enemy.getNextTargets(moveId), - }); - - /** - * Run the EnemyCommandPhase to completion. - * This allows this function to be called consecutively to - * force a move for each enemy in a double battle. - */ - await this.phaseInterceptor.to(EnemyCommandPhase); - } - forceEnemyToSwitch() { const originalMatchupScore = Trainer.prototype.getPartyMemberMatchupScores; Trainer.prototype.getPartyMemberMatchupScores = () => { diff --git a/test/testUtils/helpers/moveHelper.ts b/test/testUtils/helpers/moveHelper.ts index ab10486867d..b3cdffeb636 100644 --- a/test/testUtils/helpers/moveHelper.ts +++ b/test/testUtils/helpers/moveHelper.ts @@ -1,12 +1,10 @@ import type { BattlerIndex } from "#app/battle"; import { getMoveTargets } from "#app/data/moves/move"; -import { Button } from "#app/enums/buttons"; import type Pokemon from "#app/field/pokemon"; import { PokemonMove } from "#app/field/pokemon"; import Overrides from "#app/overrides"; import type { CommandPhase } from "#app/phases/command-phase"; import type { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; -import { LearnMovePhase } from "#app/phases/learn-move-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Command } from "#app/ui/command-ui-handler"; import { Moves } from "#enums/moves"; @@ -233,39 +231,4 @@ export class MoveHelper extends GameManagerHelper { */ await this.game.phaseInterceptor.to("EnemyCommandPhase"); } - - /** - * Simulates learning a move for a player pokemon. - * @param move The {@linkcode Moves} being learnt - * @param partyIndex The party position of the {@linkcode PlayerPokemon} learning the move (defaults to 0) - * @param moveSlotIndex The INDEX (0-4) of the move slot to replace if existent move slots are full; - * defaults to 0 (first slot) and 4 aborts the procedure - * @returns a promise that resolves once the move has been successfully learnt - */ - public async learnMove(move: Moves | number, partyIndex = 0, moveSlotIndex = 0) { - return new Promise(async (resolve, reject) => { - this.game.scene.pushPhase(new LearnMovePhase(partyIndex, move)); - - // if slots are full, queue up inputs to replace existing moves - if (this.game.scene.getPlayerParty()[partyIndex].moveset.filter(m => m).length === 4) { - this.game.onNextPrompt("LearnMovePhase", UiMode.CONFIRM, () => { - this.game.scene.ui.processInput(Button.ACTION); // "Should a move be forgotten and replaced with XXX?" - }); - this.game.onNextPrompt("LearnMovePhase", UiMode.SUMMARY, () => { - for (let x = 0; x < (moveSlotIndex ?? 0); x++) { - this.game.scene.ui.processInput(Button.DOWN); // Scrolling in summary pane to move position - } - this.game.scene.ui.processInput(Button.ACTION); - if (moveSlotIndex === 4) { - this.game.onNextPrompt("LearnMovePhase", UiMode.CONFIRM, () => { - this.game.scene.ui.processInput(Button.ACTION); // "Give up on learning XXX?" - }); - } - }); - } - - await this.game.phaseInterceptor.to(LearnMovePhase).catch(e => reject(e)); - resolve(); - }); - } } diff --git a/test/ui/type-hints.test.ts b/test/ui/type-hints.test.ts index 2051af76754..b32f5ed9b88 100644 --- a/test/ui/type-hints.test.ts +++ b/test/ui/type-hints.test.ts @@ -99,8 +99,8 @@ describe("UI - Type Hints", () => { // Use soak to change type of remaining abra to water game.move.select(Moves.SOAK, 1); - await game.forceEnemyMove(Moves.SPLASH); - await game.forceEnemyMove(Moves.TELEPORT); + await game.move.selectEnemyMove(Moves.SPLASH); + await game.move.selectEnemyMove(Moves.TELEPORT); await game.toNextTurn(); game.onNextPrompt("CommandPhase", UiMode.COMMAND, () => { From ccd9480240ea26285683fb997fcb1af67e3d4a9b Mon Sep 17 00:00:00 2001 From: Lugiad <2070109+Adri1@users.noreply.github.com> Date: Sat, 31 May 2025 01:54:17 +0200 Subject: [PATCH 44/44] [Localization] Secondary pending languages inclusion (#5903) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update mysterious-chest-dialogue.json * Update mysterious-chest-dialogue.json * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update i18n.ts * Update settings.ts * Update settings-display-ui-handler.ts * Update starter-select-ui-handler.ts * Update i18n.ts * Update i18n.ts * Update settings.ts * Update settings-display-ui-handler.ts * Update i18n.ts * Update starter-select-ui-handler.ts * Update utils.ts * Update utils.ts * Add files via upload * Rename statuses_dk.json to statuses_da.json * Update statuses_da.json * Update and rename types_dk.json to types_da.json * Rename statuses_dk.png to statuses_da.png * Rename types_dk.png to types_da.png * Delete src/locales/dk directory * Add files via upload * Apply suggestions from code review * Delete src/locales/da directory * Delete src/locales/tr directory * Update i18n.ts * Update i18n.ts * Update utils.ts * Main -> Beta (1.1.6) (#4751) * Comment out startGame call on manifest fetch failure * [Hotfix] Fix status damage triggering before berry usage (#4732) * [Hotfix] Fix Eternatus egg tier (#4734) * [Hotfix] Fix manifest getting loaded before the game is initialized (#4739) * fix locales path for offline builds (#4739) * [Sprite] Hotfix cut off Binacle sprite (#4741) * [Sprite][hotfix] Fixed cropping on 658 static greninja and ash greninja (#4743) * [Sprite][hotfix] Fixed cropping on static greninja and ash greninja * [Hotfix] Fix crash when Mist would block a stat drop (#4746) --------- Co-authored-by: Frederico Santos Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com> Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com> Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com> Co-authored-by: pom-eranian * Update settings-display-ui-handler.ts * Delete src/utils.ts * Update common.ts * Delete src/utils.ts * Update common.ts * Romanian workspace (#25) * Russian workspace (#26) * Update settings-display-ui-handler.ts * Update settings-display-ui-handler.ts * Update settings.ts * Update settings-display-ui-handler.ts * Update i18n.ts * Update settings.ts * Update settings-display-ui-handler.ts * Update common.ts * Update and rename statuses_ca-ES.json to statuses_ca.json * Update and rename types_ca-ES.json to types_ca.json * Add files via upload * Delete public/images/statuses_ca-ES.png * Delete public/images/types_ca-ES.png * Update locales submodule --------- Co-authored-by: Moka <54149968+MokaStitcher@users.noreply.github.com> Co-authored-by: Frederico Santos Co-authored-by: innerthunder <168692175+innerthunder@users.noreply.github.com> Co-authored-by: PigeonBar <56974298+PigeonBar@users.noreply.github.com> Co-authored-by: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com> Co-authored-by: pom-eranian Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- .../{statuses_ca-ES.json => statuses_ca.json} | 2 +- .../{statuses_ca-ES.png => statuses_ca.png} | Bin public/images/statuses_da.json | 188 ++++++++ public/images/statuses_da.png | Bin 0 -> 2355 bytes public/images/statuses_ro.json | 188 ++++++++ public/images/statuses_ro.png | Bin 0 -> 2111 bytes public/images/statuses_ru.json | 188 ++++++++ public/images/statuses_ru.png | Bin 0 -> 2091 bytes public/images/statuses_tr.json | 188 ++++++++ public/images/statuses_tr.png | Bin 0 -> 441 bytes .../{types_ca-ES.json => types_ca.json} | 2 +- .../images/{types_ca-ES.png => types_ca.png} | Bin public/images/types_da.json | 440 ++++++++++++++++++ public/images/types_da.png | Bin 0 -> 6247 bytes public/images/types_ro.json | 440 ++++++++++++++++++ public/images/types_ro.png | Bin 0 -> 6536 bytes public/images/types_ru.json | 440 ++++++++++++++++++ public/images/types_ru.png | Bin 0 -> 7570 bytes public/images/types_tr.json | 440 ++++++++++++++++++ public/images/types_tr.png | Bin 0 -> 4467 bytes public/locales | 2 +- src/plugins/i18n.ts | 6 +- src/system/settings/settings.ts | 44 +- .../settings/settings-display-ui-handler.ts | 64 ++- src/ui/starter-select-ui-handler.ts | 18 + src/utils/common.ts | 6 +- 26 files changed, 2615 insertions(+), 41 deletions(-) rename public/images/{statuses_ca-ES.json => statuses_ca.json} (98%) rename public/images/{statuses_ca-ES.png => statuses_ca.png} (100%) create mode 100644 public/images/statuses_da.json create mode 100644 public/images/statuses_da.png create mode 100644 public/images/statuses_ro.json create mode 100644 public/images/statuses_ro.png create mode 100644 public/images/statuses_ru.json create mode 100644 public/images/statuses_ru.png create mode 100644 public/images/statuses_tr.json create mode 100644 public/images/statuses_tr.png rename public/images/{types_ca-ES.json => types_ca.json} (99%) rename public/images/{types_ca-ES.png => types_ca.png} (100%) create mode 100644 public/images/types_da.json create mode 100644 public/images/types_da.png create mode 100644 public/images/types_ro.json create mode 100644 public/images/types_ro.png create mode 100644 public/images/types_ru.json create mode 100644 public/images/types_ru.png create mode 100644 public/images/types_tr.json create mode 100644 public/images/types_tr.png diff --git a/public/images/statuses_ca-ES.json b/public/images/statuses_ca.json similarity index 98% rename from public/images/statuses_ca-ES.json rename to public/images/statuses_ca.json index be1b78e0e41..6ff0f74a73b 100644 --- a/public/images/statuses_ca-ES.json +++ b/public/images/statuses_ca.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "statuses_ca_ES.png", + "image": "statuses_ca.png", "format": "RGBA8888", "size": { "w": 22, diff --git a/public/images/statuses_ca-ES.png b/public/images/statuses_ca.png similarity index 100% rename from public/images/statuses_ca-ES.png rename to public/images/statuses_ca.png diff --git a/public/images/statuses_da.json b/public/images/statuses_da.json new file mode 100644 index 00000000000..b9bf56324de --- /dev/null +++ b/public/images/statuses_da.json @@ -0,0 +1,188 @@ +{ + "textures": [ + { + "image": "statuses_da.png", + "format": "RGBA8888", + "size": { + "w": 22, + "h": 64 + }, + "scale": 1, + "frames": [ + { + "filename": "pokerus", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 22, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 22, + "h": 8 + }, + "frame": { + "x": 0, + "y": 0, + "w": 22, + "h": 8 + } + }, + { + "filename": "burn", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 8, + "w": 20, + "h": 8 + } + }, + { + "filename": "faint", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 16, + "w": 20, + "h": 8 + } + }, + { + "filename": "freeze", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 24, + "w": 20, + "h": 8 + } + }, + { + "filename": "paralysis", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 32, + "w": 20, + "h": 8 + } + }, + { + "filename": "poison", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 40, + "w": 20, + "h": 8 + } + }, + { + "filename": "sleep", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 48, + "w": 20, + "h": 8 + } + }, + { + "filename": "toxic", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 56, + "w": 20, + "h": 8 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:37686e85605d17b806f22d43081c1139:70535ffee63ba61b3397d8470c2c8982:e6649238c018d3630e55681417c698ca$" + } +} diff --git a/public/images/statuses_da.png b/public/images/statuses_da.png new file mode 100644 index 0000000000000000000000000000000000000000..02780bddd98699e74c276fb44903db9426131710 GIT binary patch literal 2355 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 BAo>6R literal 0 HcmV?d00001 diff --git a/public/images/statuses_ru.json b/public/images/statuses_ru.json new file mode 100644 index 00000000000..5e4790b2874 --- /dev/null +++ b/public/images/statuses_ru.json @@ -0,0 +1,188 @@ +{ + "textures": [ + { + "image": "statuses_ru.png", + "format": "RGBA8888", + "size": { + "w": 22, + "h": 64 + }, + "scale": 1, + "frames": [ + { + "filename": "pokerus", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 22, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 22, + "h": 8 + }, + "frame": { + "x": 0, + "y": 0, + "w": 22, + "h": 8 + } + }, + { + "filename": "burn", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 8, + "w": 20, + "h": 8 + } + }, + { + "filename": "faint", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 16, + "w": 20, + "h": 8 + } + }, + { + "filename": "freeze", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 24, + "w": 20, + "h": 8 + } + }, + { + "filename": "paralysis", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 32, + "w": 20, + "h": 8 + } + }, + { + "filename": "poison", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 40, + "w": 20, + "h": 8 + } + }, + { + "filename": "sleep", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 48, + "w": 20, + "h": 8 + } + }, + { + "filename": "toxic", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 20, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 20, + "h": 8 + }, + "frame": { + "x": 0, + "y": 56, + "w": 20, + "h": 8 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:37686e85605d17b806f22d43081c1139:70535ffee63ba61b3397d8470c2c8982:e6649238c018d3630e55681417c698ca$" + } +} diff --git a/public/images/statuses_ru.png b/public/images/statuses_ru.png new file mode 100644 index 0000000000000000000000000000000000000000..1da8b66a4f8be4867fe00ade4eed9bbd67e0e449 GIT binary patch literal 2091 zcmbVN2~ZPP7~ZHwjp7L6fmU5Z#RHPv4G_peB1c4UNI;GOkE+XNlkAW^OcoNninfX( z$XF1m7ebL*McYE7RjgPnU=g)C7AjD+BI1p8s@PiFZa6a9(Q)dVdHb&KegFM-V~l2w zvv9l+008I62vsaUj^TUo5GVdS3D3O14@23A`DOqZHp<=w!1kTv0ANr%8K1-@siRPw zp(L1=NhTy#isjJ&5H!omVt5L{fysoPq!psBs%jBPY89eHKQ*jo!w3TzvD`$&E!V{3 z%TsW}%xg3I}kW?z>5n^*X&0$tCZT9GAP!VR_M6w*o(4d_WOJ-6zg^1U* z*93}n(9-5UH}MXGtQZR+64-814^WFcaBQl{*dttvLxho_2%0nVSj2&44GhPa4a{q( z9mg*T;9aX$J7m047m9L-Fmtohcr*GO@=CNhKAk0?Si;Ptns8!v8n32@-5M4RGZ7fa znBp16*dM5vewD$nFmQSzNoyI4dBzKHLWOaJLL`NyzG7G|M*QPpDT*Lo{1=9MacV|O z>e63@llr56@JmoWTeKL5y%DU%Q5|EVFy2;@!t?~h(s~i-@E{t-7#R~Um{-lGM+>zY zjik*SM&m@JN+IISm5`(s^_O7;=I;lK310*kYcXFRu^dMN#ByCgKyorJ*JX)OkVCw*P4dogB4$5}8F5u)c^^@cQpc)cNe_4S$n{nxslvllA0AI_J* zed>63_=V%;B53}(GV$-yG(liC01S8#sS1ftT6eZ^3ioO7$n_ssH*EFVa{BoGxvF03qP;Oii?^mEN;9sIKOL0$yZ-;MU!feg=MnBnz83y zqGxWm)l^>oJWs8Q0!I|%(UcG@Z%3-p<;4Obl;T z6|DElY9AN3`I@c6Z|h`lc%`+JscdBv3rE~x-N(%hJhi9wuRCWuKXbmdf6|kN%K6Bo z<^!WIJ?OrM5A{oT%G0M6L!N8W8k6)#L)VsZ6O;ve3u8+Yy%tVbJO@1tg{RJHvDyZ} zi;6zXUFTD56W z33t11H3wz1E6+C{$$9K)8g=f^`IDb<`>!q>uKX!DeC9k2wbHiB>q?We@Tkp`wIb(kbvSJLmK4Z=-oxl+~les_s^V{&~YJjfp_P! zWlj5XJ4(#9)AS>iGDjC=W6RwZZE0#~TCcAtb!&4M01_x7%KzeP1y+B2_I7G_xHE-s8-)5{aFy1?zvW;$NS#fE(5J*QH>;TO# zqj-;m3y@V^jDKUiXB4T~am+que5?h|bD2QvJlYc8%_G~aG}z~@!Q2dSmt873PQXLU zg+O|T!QM`p^A|K=@Suc&?b@)04> jC;!H^NCF;OJ`4N>xriuwM360I00000NkvXXu0mjf67avU literal 0 HcmV?d00001 diff --git a/public/images/types_ca-ES.json b/public/images/types_ca.json similarity index 99% rename from public/images/types_ca-ES.json rename to public/images/types_ca.json index fa3abaaf259..aaa04fbad36 100644 --- a/public/images/types_ca-ES.json +++ b/public/images/types_ca.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "types_ca-ES.png", + "image": "types_ca.png", "format": "RGBA8888", "size": { "w": 32, diff --git a/public/images/types_ca-ES.png b/public/images/types_ca.png similarity index 100% rename from public/images/types_ca-ES.png rename to public/images/types_ca.png diff --git a/public/images/types_da.json b/public/images/types_da.json new file mode 100644 index 00000000000..d1c01de1e0e --- /dev/null +++ b/public/images/types_da.json @@ -0,0 +1,440 @@ +{ + "textures": [ + { + "image": "types_da.png", + "format": "RGBA8888", + "size": { + "w": 32, + "h": 280 + }, + "scale": 1, + "frames": [ + { + "filename": "unknown", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + } + }, + { + "filename": "bug", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 14, + "w": 32, + "h": 14 + } + }, + { + "filename": "dark", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 28, + "w": 32, + "h": 14 + } + }, + { + "filename": "dragon", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 42, + "w": 32, + "h": 14 + } + }, + { + "filename": "electric", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 56, + "w": 32, + "h": 14 + } + }, + { + "filename": "fairy", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 70, + "w": 32, + "h": 14 + } + }, + { + "filename": "fighting", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 84, + "w": 32, + "h": 14 + } + }, + { + "filename": "fire", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 98, + "w": 32, + "h": 14 + } + }, + { + "filename": "flying", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 112, + "w": 32, + "h": 14 + } + }, + { + "filename": "ghost", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 126, + "w": 32, + "h": 14 + } + }, + { + "filename": "grass", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 140, + "w": 32, + "h": 14 + } + }, + { + "filename": "ground", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 154, + "w": 32, + "h": 14 + } + }, + { + "filename": "ice", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 168, + "w": 32, + "h": 14 + } + }, + { + "filename": "normal", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 182, + "w": 32, + "h": 14 + } + }, + { + "filename": "poison", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 196, + "w": 32, + "h": 14 + } + }, + { + "filename": "psychic", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 210, + "w": 32, + "h": 14 + } + }, + { + "filename": "rock", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 224, + "w": 32, + "h": 14 + } + }, + { + "filename": "steel", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 238, + "w": 32, + "h": 14 + } + }, + { + "filename": "water", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 252, + "w": 32, + "h": 14 + } + }, + { + "filename": "stellar", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 266, + "w": 32, + "h": 14 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$" + } +} diff --git a/public/images/types_da.png b/public/images/types_da.png new file mode 100644 index 0000000000000000000000000000000000000000..f2b7af8967aef2e29fa68d2dd0cecfaf99562458 GIT binary patch literal 6247 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 literal 0 HcmV?d00001 diff --git a/public/images/types_ro.json b/public/images/types_ro.json new file mode 100644 index 00000000000..efdbeba38a0 --- /dev/null +++ b/public/images/types_ro.json @@ -0,0 +1,440 @@ +{ + "textures": [ + { + "image": "types_ro.png", + "format": "RGBA8888", + "size": { + "w": 32, + "h": 280 + }, + "scale": 1, + "frames": [ + { + "filename": "unknown", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + } + }, + { + "filename": "bug", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 14, + "w": 32, + "h": 14 + } + }, + { + "filename": "dark", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 28, + "w": 32, + "h": 14 + } + }, + { + "filename": "dragon", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 42, + "w": 32, + "h": 14 + } + }, + { + "filename": "electric", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 56, + "w": 32, + "h": 14 + } + }, + { + "filename": "fairy", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 70, + "w": 32, + "h": 14 + } + }, + { + "filename": "fighting", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 84, + "w": 32, + "h": 14 + } + }, + { + "filename": "fire", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 98, + "w": 32, + "h": 14 + } + }, + { + "filename": "flying", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 112, + "w": 32, + "h": 14 + } + }, + { + "filename": "ghost", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 126, + "w": 32, + "h": 14 + } + }, + { + "filename": "grass", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 140, + "w": 32, + "h": 14 + } + }, + { + "filename": "ground", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 154, + "w": 32, + "h": 14 + } + }, + { + "filename": "ice", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 168, + "w": 32, + "h": 14 + } + }, + { + "filename": "normal", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 182, + "w": 32, + "h": 14 + } + }, + { + "filename": "poison", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 196, + "w": 32, + "h": 14 + } + }, + { + "filename": "psychic", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 210, + "w": 32, + "h": 14 + } + }, + { + "filename": "rock", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 224, + "w": 32, + "h": 14 + } + }, + { + "filename": "steel", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 238, + "w": 32, + "h": 14 + } + }, + { + "filename": "water", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 252, + "w": 32, + "h": 14 + } + }, + { + "filename": "stellar", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 266, + "w": 32, + "h": 14 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$" + } +} diff --git a/public/images/types_ro.png b/public/images/types_ro.png new file mode 100644 index 0000000000000000000000000000000000000000..35b09a37035c42476115e2bbf166650358cc5a92 GIT binary patch literal 6536 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 LBtrK7-_HFH=U70Y literal 0 HcmV?d00001 diff --git a/public/images/types_ru.json b/public/images/types_ru.json new file mode 100644 index 00000000000..536a0e31929 --- /dev/null +++ b/public/images/types_ru.json @@ -0,0 +1,440 @@ +{ + "textures": [ + { + "image": "types_ru.png", + "format": "RGBA8888", + "size": { + "w": 32, + "h": 280 + }, + "scale": 1, + "frames": [ + { + "filename": "unknown", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + } + }, + { + "filename": "bug", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 14, + "w": 32, + "h": 14 + } + }, + { + "filename": "dark", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 28, + "w": 32, + "h": 14 + } + }, + { + "filename": "dragon", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 42, + "w": 32, + "h": 14 + } + }, + { + "filename": "electric", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 56, + "w": 32, + "h": 14 + } + }, + { + "filename": "fairy", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 70, + "w": 32, + "h": 14 + } + }, + { + "filename": "fighting", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 84, + "w": 32, + "h": 14 + } + }, + { + "filename": "fire", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 98, + "w": 32, + "h": 14 + } + }, + { + "filename": "flying", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 112, + "w": 32, + "h": 14 + } + }, + { + "filename": "ghost", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 126, + "w": 32, + "h": 14 + } + }, + { + "filename": "grass", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 140, + "w": 32, + "h": 14 + } + }, + { + "filename": "ground", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 154, + "w": 32, + "h": 14 + } + }, + { + "filename": "ice", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 168, + "w": 32, + "h": 14 + } + }, + { + "filename": "normal", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 182, + "w": 32, + "h": 14 + } + }, + { + "filename": "poison", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 196, + "w": 32, + "h": 14 + } + }, + { + "filename": "psychic", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 210, + "w": 32, + "h": 14 + } + }, + { + "filename": "rock", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 224, + "w": 32, + "h": 14 + } + }, + { + "filename": "steel", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 238, + "w": 32, + "h": 14 + } + }, + { + "filename": "water", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 252, + "w": 32, + "h": 14 + } + }, + { + "filename": "stellar", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 266, + "w": 32, + "h": 14 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$" + } +} diff --git a/public/images/types_ru.png b/public/images/types_ru.png new file mode 100644 index 0000000000000000000000000000000000000000..571e162e8dc9f3da298566982b2634402f9ff570 GIT binary patch literal 7570 zcmcgx2{@E%`+uo$D!V9COe1T??8A(N7;;V|OGwFU7ACVbGZ?98AyOli7E6jsX+xIE z8cBudBs(RgMPn&MlK(p`zVm(m(|68y{g=5e@B6&ZbMN=>zMuQL#JRdSD$doO3jlzk z(`tJ+=nV$|nS}~+(8_ArNEGz?g}2&A002sNq<=C=%avdNFkheP;VtxbUPGpG*=8V( z8$dS`v3U?R0IaYU@jz-YT?h}L2QoQUh{57=1e{5;LU<9J(atO#^u$3x=dpohyp1H=LkU&k|WUjA;F$5pz@hKA(P92 zOC^E<+z_D^06B2&OuZl82!w9*f5h`|utVfC%t9vPC%n>=e{za0V*Z3wdNM=GBir%mppeV= z;Br|%u;cn8if}tSxRDo=L*s@CjHMoYC#TzkLb??Ki^k%SXaW*L@W7(UXgnE@UXI3+ z(dcia&RiOk5k5moK%%iojD-h8fgwSNTP}s(4^jxjG*AfsB{7XkW^nmz5Xu0P4F=Lt zJWe12K9g6n9hb%BLy95ma9^!(b|yP<1VWHQr90VMAs`pbm`oZOOQc$$Nkj~iL8F35 z5QE1fNtgh0B!p@jgGi+Y&;sy3`0csW5GmB8{NJjM#-&0s{-KpXrO{|0iH^i#&rVJ!UtJ@lq$7~21&#dEHG3e9)m>FaRg)l4j+Id z;Vf`SDw>YR;R1-X06Gl;m*$!biGfT4rPXDHzDHIsC>S7DR`#_ixJR8<~L15Qc$#x@{no z^1moj)Xz*8fT921a5@7MfF(hYqtl60Bms{{BT3i*EE0#t;YdV~Mup(_!|^{eoM1u5 z5r5SGe{T5qkWzy{P9Pn+4^fDpxr`1rZLzYHCoL8Vy`K|0joKrE6@#S@Sql}bYrusFJf zIR>O-iKL%|jwtPiXmc_i^ZydMzjTE}Ab}8s@kpWtoq+@y5FS7r21F7-EDjqGK%?QQ z=Ksx=pSAY?Qxwdk`iD7x#KG6>|3$*3n3w^`&$Ivc(e}Ti?=MsI_wKHL=`jD-Df-%c zzjaR3zc$rx-}c|C)AB16~k%*Fhl+!Rv4Ncp+{)2mq8p}so) zhgtW>7BoOhmot+)^f5F0(>YLs<3p4E2h_xK08mwTvbXgRrPgnXboFdWo9=8WUcfG{ zJ{fAlx!iEzf=%Npn!Kyt9b(*TwON)Gr~BygzN}0GnECCi3w2?g0hSCkMItNi7t98l z>@E8<%(n@xmudU04}0$^-+*CMv(C>eX6msXcTV-bFCFX@G?acUsoB#T*jI1)D#H5J zcI#J@Rv#A+?D%MfuR=HOl+2nn*VW=>N^&=}%=~a~=YlW0ignTXPf%8ww2|4HVn)`q zZ2>Ai=S`x++VU>2^fZT{jXG4ZGBC9M0}5UKZe@R0g8?+N>Z_}S8U(`<0c}rH;-c~M zQS~TNVnHfsn~O7`5hu|JyrRg_-#|+D@FV$_UAJ%B?(rkxjwlvB zZ09o!VEwi8RBZzL(zb!L z`|IU7^z}y%sGMAR(X<4MFq{zlZbi8tJG{p=%4m*XNl^zfVx3{17W z$y*Q=>!;`gOQIC+&L1UOZVs$%hs@dIk^+7D*HUFldpn837nJ$f>mde5~OrfrCwzwMEdW?A6jDu>W7?TM@= zhdb&|E=C6HFMjZD)h19SB-)l0G)Qs2(V*tzwJ<-QnN>Y!Z&Dkg?<cp0hn&LqX-q_!n!Ngo`ESa_t2DFY1rDvuSAw*I)_RMMZZ# zD{PA8u1v3+9)fnbNi8pb92}n*S)RyanN4%nO*6WcWa3Fz<$90h4IjW3YQh3 zdp(MVRUGn%7UU3$AE?K{0-B4H#q|ukrM>%A$hOO^surU~Sw=->&+H z%@f#Q_1nW6GW|z>#;nSa=59}ct`fNh7$Krk30$Ku$@#B{8Z*8w9+YUsL}qG=pS_OiuseB zoYvNDkAqmH%;LMtFJB1VDF42&a{rc;D>)hMZ}&Z5J-tJJ3iIW*r)L<4w|)Wa?pGBw z$6L7!B1fMz4Aj88u=TXZ;!Rm#jHKwP}b$9msrgJr9 z!Kzg69^;C&R<&`StLu!1p5KenUDz%5GJUl71tjFMcZQF;iMDIxGBM&#dH;%&>2Eko zij%@?I6EHsWU`iK#L8tTvP*1Kf1h7fF?ES(91%;w&7Wl$d68kB8ljAzdVvC0JpCO? z$NJ2QMiUdIi(QJ#O_WHXWp#6EmxMgOnM4U`HhAvov3P%{as8AyJmJ|L7|Mo*tBnVM z(b0HQmmO1xr3pn8F@?1V_dud$06mwes9727xwlcDmyrj>v90N?Qjy+bzYeY6p; z@3|lSVZ+AG;DMO1?t)cNPhJvPUE;nWZ2Qf*(*Q7~DAeYjVtVvi&59`;7CyQ%>Wfct z(>szkk~sfe#Mpr=J00o!4>}Ud(qIi<013HcSrucJe_LDc`UxMB4ytl%idg?fQZJ~t z8d-f*j%dQ#lJSy)jFKF3sERrED))@maE4|DS$rJ1MFy*Ku0na0Oa`uE(4wI@6I)%R z3%Hi4%-Pw|m{~W$g>9?r;U`foJwK{UZ-aN+Xk-_ucA*+mn<&tlq+QsoV{D@vMO^bk9r`tzzSf+@5=bHUC)N*ckW(aORkr%myA6v>AK6f%C?X-+pTw1CP>C(&Rkwpi67tf`|Bso z22lnFeCK|4cqjKpBS%l`T-3WcYsr?+9~;c8S?q7w(|=i^tj@*1`|fccqs_6hlYYhL z>n6%tuAVFg+umLLHKXx!x2M2-#ktplD$A@@kJoOB9v+EwoR&;(x~QI5kgeTyu;AVX z&x0d18Pnpo)DyIzms!-wv8lE!$y1b=0>CG{hOai=Yalmv4hifZ zc`ku?#R@k;`<6MmF=>>#hC@R0<^Zp^_HPnzE$venI-@I)vDxnSYx+TeGwujAvOMCZ%c zRQeYYB`ylJBRu*1^qT~)11%j-wsS;WaMziFfp8betC%Yhr>?JTSYBFQ;opBb&B|qQ zw^=Y%^6Bt%PlY5+86bJAV5!H3+0DfEoaSAJ56jlrCL+6eU5Y7V1)$TgNj_SaWiAQ6 z{zL}uv4OUgA_<2*?e?^}kbm!Os`hY5#Q`;Fj}p)})}1iC`h3Mf!^eJxo@WnLbi``) zzYqprb64poYG%ryIh4opNnkG_k8{j&XkuVtiAr!)TDolcaU@K(gl9 z%T>FNhKQ;2+?sn@tU88&9c*w|3oLD4w{2;*Mx#-0+y%r?|0&5;1jk%`}?TZMd1`oc> z)k3@37icxEW``(?pYELlw1h-e`YcE_GcDfrYP^1)bVfcFr;cJtN?8Lj)+MF(P8vH$ zCN)2_4+-9RA>dK+_$k3VbFpNHXLRI?q^d@xL1V9otdXHpd@7IEsIbGbOC_mP99@<+ zaO2XiMAZb=yV^pP`sLlx56=0B`Bk?$9%l8GB>~s#_K0$AZm6vsSAJ88?LVMZ`5{Bo zCX;5Vc5wZR10q($I$za>_5&uz8E1O@&HZ*_-amywA5PI;cRu9h?i8M?=<~&IFpm{s ziCz7tOROK;X^3`$3Fy>zNE?DFn?snwt~?U*%KxBi1}TDJ%qaZnq* z1X;p9TF|HHe)L#rxJPv4QL{Sp{Nz$cPJM7ycE-j_B_dCKG7QEVE!lmj`phj~%P|Y( zo)BBlb!M8^vh)3#7EM0nL+8B9nfLp=HBYt7;bi+1!wk)2KUbWm#2Efs9cxzKs&Rj4 z+~c4(08f`SKZTydx!$de$Asq?KkK=rG<4>{as?k^QC@8A9^F`|K|eb$G?j|$R2=l1 zICR)(aog14n=l>HRfc)Vq*>6X#9nmvf~n0{HdHk7wGa9Z9&b}{^qTK;Em%TOiZCVW zlttVgIZOsBULI3C;pc|?%qemuAb-L0d)!IDjwJG{(2SpeTAwr))OA@PNRdB?Fq#|=@w z<0TS1C9#*btY7?IQ<`IK?}mtjH(@R}%N_3Xw@aRy2j4o+w0Q4wz4uuiYTLATdy94P zvz63NEK|k$>fY*N)900y zZKCT_R=&NC$Mv6`oV7~+?{dA#HBju61w#A`B*D7N zB60}JK&FYc{8Ggqedua+k3e>-^f0;vxIy4VSj- zgUAu5J$-^_C*x~*Wsg6PEcuLGw~&YlelRx2qmf#jHm z!p5Qprc2k)&Z})k2(~T)o(ThSSgqqri|dv-kJoNoqm8d+w)I6<--x?-VbC`|4KQ;a zhp~RE16JO*aa)CWmyqXRBTngN7Cva^+`!?L?WTIs{k|yxAYJfQK3XRi75#Kthr!;z zrcrtN6LI9M28fn<4Oh2Uux3?5QX}zUzuhtD05b^UH+-Yy>dsC!-_+uU)py**MEgF z$zdjk>hrq|Z(M%s^h=z=#_;LWRk`T`b5~2?1{V3ACh^~WBJy=u%^4Y+0Xxq^qs~

4oN6_d$h(=No=`(HwA?WO-Ub)vY~UtQ(D G`@aB6|Ab5c literal 0 HcmV?d00001 diff --git a/public/images/types_tr.json b/public/images/types_tr.json new file mode 100644 index 00000000000..ee82cce3fb4 --- /dev/null +++ b/public/images/types_tr.json @@ -0,0 +1,440 @@ +{ + "textures": [ + { + "image": "types_tr.png", + "format": "RGBA8888", + "size": { + "w": 32, + "h": 280 + }, + "scale": 1, + "frames": [ + { + "filename": "unknown", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + } + }, + { + "filename": "bug", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 14, + "w": 32, + "h": 14 + } + }, + { + "filename": "dark", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 28, + "w": 32, + "h": 14 + } + }, + { + "filename": "dragon", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 42, + "w": 32, + "h": 14 + } + }, + { + "filename": "electric", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 56, + "w": 32, + "h": 14 + } + }, + { + "filename": "fairy", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 70, + "w": 32, + "h": 14 + } + }, + { + "filename": "fighting", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 84, + "w": 32, + "h": 14 + } + }, + { + "filename": "fire", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 98, + "w": 32, + "h": 14 + } + }, + { + "filename": "flying", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 112, + "w": 32, + "h": 14 + } + }, + { + "filename": "ghost", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 126, + "w": 32, + "h": 14 + } + }, + { + "filename": "grass", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 140, + "w": 32, + "h": 14 + } + }, + { + "filename": "ground", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 154, + "w": 32, + "h": 14 + } + }, + { + "filename": "ice", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 168, + "w": 32, + "h": 14 + } + }, + { + "filename": "normal", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 182, + "w": 32, + "h": 14 + } + }, + { + "filename": "poison", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 196, + "w": 32, + "h": 14 + } + }, + { + "filename": "psychic", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 210, + "w": 32, + "h": 14 + } + }, + { + "filename": "rock", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 224, + "w": 32, + "h": 14 + } + }, + { + "filename": "steel", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 238, + "w": 32, + "h": 14 + } + }, + { + "filename": "water", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 252, + "w": 32, + "h": 14 + } + }, + { + "filename": "stellar", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 32, + "h": 14 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 32, + "h": 14 + }, + "frame": { + "x": 0, + "y": 266, + "w": 32, + "h": 14 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:f14cf47d9a8f1d40c8e03aa6ba00fff3:6fc4227b57a95d429a1faad4280f7ec8:5961efbfbf4c56b8745347e7a663a32f$" + } +} diff --git a/public/images/types_tr.png b/public/images/types_tr.png new file mode 100644 index 0000000000000000000000000000000000000000..8b644f1041c4236c9e729b30c529149e209a286c GIT binary patch literal 4467 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 = [ unicodeRange: rangesByLanguage.chinese, }), extraOptions: { sizeAdjust: "70%", format: "woff2" }, - only: ["en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca"], + only: ["en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca", "da", "tr", "ro", "ru"], }, { face: new FontFace("pkmnems", "url(./fonts/unifont-15.1.05.subset.woff2)", { unicodeRange: rangesByLanguage.chinese, }), extraOptions: { format: "woff2" }, - only: ["en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca"], + only: ["en", "es", "fr", "it", "de", "zh", "pt", "ko", "ca", "da", "tr", "ro", "ru"], }, // japanese { @@ -174,7 +174,7 @@ export async function initI18n(): Promise { "es-MX": ["es-ES", "en"], default: ["en"], }, - supportedLngs: ["en", "es-ES", "es-MX", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca-ES"], + supportedLngs: ["en", "es-ES", "es-MX", "fr", "it", "de", "zh-CN", "zh-TW", "pt-BR", "ko", "ja", "ca", "da", "tr", "ro", "ru"], backend: { loadPath(lng: string, [ns]: string[]) { let fileName: string; diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index 8bbba267bd6..8a0e4f8cdc0 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -921,10 +921,6 @@ export function setSetting(setting: string, value: number): boolean { label: "Español (LATAM)", handler: () => changeLocaleHandler("es-MX"), }, - { - label: "Italiano", - handler: () => changeLocaleHandler("it"), - }, { label: "Français", handler: () => changeLocaleHandler("fr"), @@ -933,18 +929,14 @@ export function setSetting(setting: string, value: number): boolean { label: "Deutsch", handler: () => changeLocaleHandler("de"), }, + { + label: "Italiano", + handler: () => changeLocaleHandler("it"), + }, { label: "Português (BR)", handler: () => changeLocaleHandler("pt-BR"), }, - { - label: "简体中文", - handler: () => changeLocaleHandler("zh-CN"), - }, - { - label: "繁體中文", - handler: () => changeLocaleHandler("zh-TW"), - }, { label: "한국어", handler: () => changeLocaleHandler("ko"), @@ -954,8 +946,32 @@ export function setSetting(setting: string, value: number): boolean { handler: () => changeLocaleHandler("ja"), }, { - label: "Català", - handler: () => changeLocaleHandler("ca-ES"), + label: "简体中文", + handler: () => changeLocaleHandler("zh-CN"), + }, + { + label: "繁體中文", + handler: () => changeLocaleHandler("zh-TW"), + }, + { + label: "Català (Needs Help)", + handler: () => changeLocaleHandler("ca"), + }, + { + label: "Türkçe (Needs Help)", + handler: () => changeLocaleHandler("tr") + }, + { + label: "Русский (Needs Help)", + handler: () => changeLocaleHandler("ru"), + }, + { + label: "Dansk (Needs Help)", + handler: () => changeLocaleHandler("da") + }, + { + label: "Română (Needs Help)", + handler: () => changeLocaleHandler("ro") }, { label: i18next.t("settings:back"), diff --git a/src/ui/settings/settings-display-ui-handler.ts b/src/ui/settings/settings-display-ui-handler.ts index 4878bae72cb..0636bd25567 100644 --- a/src/ui/settings/settings-display-ui-handler.ts +++ b/src/ui/settings/settings-display-ui-handler.ts @@ -39,12 +39,6 @@ export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler label: "Español (LATAM)", }; break; - case "it": - this.settings[languageIndex].options[0] = { - value: "Italiano", - label: "Italiano", - }; - break; case "fr": this.settings[languageIndex].options[0] = { value: "Français", @@ -57,24 +51,18 @@ export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler label: "Deutsch", }; break; + case "it": + this.settings[languageIndex].options[0] = { + value: "Italiano", + label: "Italiano", + }; + break; case "pt-BR": this.settings[languageIndex].options[0] = { value: "Português (BR)", label: "Português (BR)", }; break; - case "zh-CN": - this.settings[languageIndex].options[0] = { - value: "简体中文", - label: "简体中文", - }; - break; - case "zh-TW": - this.settings[languageIndex].options[0] = { - value: "繁體中文", - label: "繁體中文", - }; - break; case "ko": case "ko-KR": this.settings[languageIndex].options[0] = { @@ -88,10 +76,46 @@ export default class SettingsDisplayUiHandler extends AbstractSettingsUiHandler label: "日本語", }; break; - case "ca-ES": + case "zh-CN": + this.settings[languageIndex].options[0] = { + value: "简体中文", + label: "简体中文", + }; + break; + case "zh-TW": + this.settings[languageIndex].options[0] = { + value: "繁體中文", + label: "繁體中文", + }; + break; + case "ca": this.settings[languageIndex].options[0] = { value: "Català", - label: "Català", + label: "Català (Needs Help)", + }; + break; + case "tr": + this.settings[languageIndex].options[0] = { + value: "Türkçe", + label: "Türkçe (Needs Help)", + }; + break; + case "ru": + this.settings[languageIndex].options[0] = { + value: "Русский", + label: "Русский (Needs Help)", + }; + break; + case "da": + this.settings[languageIndex].options[0] = { + value: "Dansk", + label: "Dansk (Needs Help)", + }; + break; + case "ro": + this.settings[languageIndex].options[0] = { + value: "Română", + label: "Română (Needs Help)", }; break; default: diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index ff2298f268d..945ddaa6ed4 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -162,6 +162,24 @@ const languageSettings: { [key: string]: LanguageSetting } = { starterInfoYOffset: 0.5, starterInfoXPos: 29, }, + da:{ + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, + tr:{ + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, + ro:{ + starterInfoTextSize: "56px", + instructionTextSize: "38px", + }, + ru: { + starterInfoTextSize: "46px", + instructionTextSize: "38px", + starterInfoYOffset: 0.5, + starterInfoXPos: 26, + }, }; const valueReductionMax = 2; diff --git a/src/utils/common.ts b/src/utils/common.ts index a018b49da3c..1c7ea60da16 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -435,14 +435,18 @@ export function hasAllLocalizedSprites(lang?: string): boolean { case "es-ES": case "es-MX": case "fr": + case "da": case "de": case "it": case "zh-CN": case "zh-TW": case "pt-BR": + case "ro": + case "tr": case "ko": case "ja": - case "ca-ES": + case "ca": + case "ru": return true; default: return false;