[Sprite] Move Victini graphics to Generation 5 atlases (#3320)

* Move Victini graphics to Generation 5 atlases

* Minor change
This commit is contained in:
Madmadness65 2024-08-03 15:03:59 -05:00 committed by GitHub
parent 3fa2088f5b
commit 153d8ba557
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 10321 additions and 10327 deletions

View File

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 303 B

View File

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 342 B

View File

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 510 B

View File

Before

Width:  |  Height:  |  Size: 513 B

After

Width:  |  Height:  |  Size: 513 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 63 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -312,13 +312,7 @@ export abstract class PokemonSpeciesForm {
getIconAtlasKey(formIndex?: integer, shiny?: boolean, variant?: integer): string {
const variantDataIndex = this.getVariantDataIndex(formIndex);
const isVariant = shiny && variantData[variantDataIndex] && variantData[variantDataIndex][variant];
const species = getPokemonSpecies(this.speciesId);
/**
* Currently, Victini's icon sprite is located in Gen 4, so we will temporarily bypass this issue with the following code.
* In the future, when Victini's icon sprite is properly moved to Gen 5, the temporary code below should be removed.
*/
const generation = species.speciesId === Species.VICTINI ? 4 : this.generation;
return `pokemon_icons_${generation}${isVariant ? "v" : ""}`;
return `pokemon_icons_${this.generation}${isVariant ? "v" : ""}`;
}
getIconId(female: boolean, formIndex?: integer, shiny?: boolean, variant?: integer): string {
@ -2952,8 +2946,8 @@ export const speciesStarters = {
[Species.DARKRAI]: 6,
[Species.SHAYMIN]: 6,
[Species.ARCEUS]: 9,
[Species.VICTINI]: 7,
[Species.VICTINI]: 7,
[Species.SNIVY]: 3,
[Species.TEPIG]: 3,
[Species.OSHAWOTT]: 3,