Commit Graph

233 Commits

Author SHA1 Message Date
NightKev
560ebbaee2 Merge branch 'beta' into minor-1.9.6 2025-06-18 18:27:37 -07:00
AJ Fontaine
80ae42d3ba
[Sprite] Minior and Ferrothorn variants (#6005)
* Minior variants

* Add Ferrothorn variants

* Fix shiny Minior front and icons
2025-06-18 19:49:21 -04:00
AJ Fontaine
59a00e0af3
[Sprite] Fix Appletun variants (#6003)
Fix Appletun variants
2025-06-17 23:54:58 -04:00
damocleas
eb0937a09b
Hotfix 1.9.5 to Beta
Hotfix 1.9.5 to beta
2025-05-27 23:57:16 -04:00
AJ Fontaine
8410aee3a1 [Sprite] Fix Cacturne and Kyurem variants 2025-05-27 03:34:02 -07:00
pom-eranian
da6cdaf187
[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)
2025-05-22 03:25:07 +00:00
Madmadness65
ebac2d1126
[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.
2025-05-21 20:38:24 +00:00
AJ Fontaine
3c934808c0
[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>
2025-05-21 03:42:17 +00:00
AJ Fontaine
b42b2f6752
[Test] Fix sprite test due to unused files (#5783)
Fix sprite test due to unused files
2025-05-05 20:38:49 -04:00
AJ Fontaine
92f1cfdd50
[Hotfix] Remove Charcadet line from exp variant masterlist (#5782)
* Remove Charcadet line from exp variant masterlist

* Remove line's backsprite from masterlist
2025-05-05 18:34:17 -04:00
AJ Fontaine
bd913a201c
[Sprite] Fix Clauncher consistent variants, floating Jangmo-o (#5777)
Fix Clauncher consistent variants, flying Jangmo-o
2025-05-05 17:18:24 -04:00
Madmadness65
3cb3fd15ec
[Sprite] Add missing variant icons, fix misnamed variant icons (#5751)
Add missing variant icons, fix misnamed variant icons
2025-05-03 01:50:23 +00:00
Unicorn_Power
bee06410dd
[Sprite] Variant Spring Implementation (#5483)
* 566 567 variant icons and palettes @ bytezor

* Add Archen & Archeops to variant icon atlas

* [554 - 555 + zen ] Variant Implementation

* [626 ] Variant Implementation

* Removal of The base-replacement Genies

* [ 746 ]-[ 746-school ] Implementation

* Variant Palette for 2037-2038

* Variant palette 32-33-34

Plus base fix for front and back 34.

* 645 both forms variant palette

Icons gets pushed at a later date.

* 299 - 476 variant palette

* 299 - 476 _masterlist

somehow mangage to miss this

* Removing 905 who wasnt working correctly

* 422- 421 both forms variant palettes

* 143+ form - 446 variant Palette

* 417 Variant palette

* 498-499-500 variant palette

* 88-89 variant palette

plus the variant json for 500 I missed

* 572 - 573 variant palette.

found another lose one that should be pushed lmao

* 187-188-189 Variant palette

* 871 variant palette

* 780 Variant palette

* 331 332 + female variant palette

* 782-783-784 variant palette

transfer to consistent sprite set. removal of exp. due to statics not lining up.

* 2038 json adjustments on breaking

* 204 205 variant palette

* [Bug][UI/UX] Fix type hint after enemy disappears (#5677)

* Fix type hint after enemy disappears

* Add automated test for type hint bugfix

* Make onField default to true

* Replace reference to Mode with UiMode and battleType with BattleStyle

* [Bug] Fix Login Screen Buttons can be Pressed While Animating (#5170)

* destroy containers when processing external containers

* make form buttons uninteractible until tweens finished instead

* fix holding enter spam

* fix conflicts

* [Balance] Update Gym Leader Teams and Teras (#5670)

* Update Gym Leader Teams

* Set Tera slots for Gym Leaders

* Change Giovanni's Specialty Type to Ground

---

Co-authored-by: damocleas <damocleas25@gmail.com>

* [Bug] Properly handle suppression with Illusion (#5671)

* Remove extra attributes on neutralizing gas

* Add IllusionBreakAbAttr to applyOnLose

* Add test case

* [Bug] Fix order of operations when displaying enemy Boss level (#5685)

* order of operations in creating boss battleInfo

fixed a bug where because of an order of operations error in this file it ignored the position update of the boss life value set in battle-info.ts (around line 562)

* [Dev] Fix imports in `overrides.ts` and `illusion.test.ts` (#5686)

* applin familly variant palette

* 522 523 variant palette

* 403 404 405 variant palette

* 511 512 515 516 variant palette

masterlist have code for 513 514 but fixes was broken add will be added once fixed

* 313 314 variant palettes

plus disabaling Landorus and other 2.

* 692 693 Variant palette.

* 535 536 537 variant palette

fixing up mess found in masterlist json and the masterlist inclusion of 692 693

* 207 female variants palette

plus adjustments of gliscor color to have better contrats.

* 325 326 variant palette

* 345 346 variant palette

* Adding all variant Icons

to the correct folder under variant icons.

* Removal of Variant files triggering errors for sprite test

these arent going to be implemented at this time due to the other 3 not being ready.

* File adjustment

the animation adjsutment for 750 to make the neck look less like a block.
fixing the line issue that appeared in 523 back sprite

* fixing the variant break for 572 573

* 513 514 variant palette

been fully fix and is not working

* 396 397 398 variant palette

* fixing back variant palette and fix for 554

* fixing the missing files for 692 and 693

* Updated masterlist

* fix flagging issue

* Update all Pokemon variant icon atlases

Fixed incorrectly sized Bouffalant icons, re-exported gen 5 icon atlas as it had broken graphics in it

* Last Gen 5 icons

* Export gen 5 variant icon atlas

* 643 644 646 + form variant palette

---------

Co-authored-by: Madmadness65 <blaze.the.fireman@gmail.com>
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Co-authored-by: Chris <75648912+ChrisLolz@users.noreply.github.com>
Co-authored-by: Blitzy <118096277+Blitz425@users.noreply.github.com>
Co-authored-by: damocleas <damocleas25@gmail.com>
Co-authored-by: Dean <69436131+emdeann@users.noreply.github.com>
Co-authored-by: zaccie <zaccie.adams@gmail.com>
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-05-01 20:12:57 -04:00
Sirz Benjie
787feceb14
[Refactor] Refactor variant sprite code part 1 (#5592)
* Move exp to its own masterlist, simplify initVariantData

* Update test/sprites/pokemonSprite.test.ts

* Extract loadPokemonVariantAssets out of BattleScene

* move variant.ts and update pokemon.loadAssets

* Add fuzzy matching for applying variant recolors

* Move glsl shaders to their own files

* Remove extra variants from shader masterlist

Their exp sprites have since been removed.

Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>

* Make exp sprite keys a set instead of an array

* Remove outdated exp sprite jsons

Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>

---------

Co-authored-by: Unicorn_Power <189861924+Unicornpowerstar@users.noreply.github.com>
2025-04-09 10:43:05 -05:00
Unicorn_Power
a7394130a7
(Beta) Undoing the Pika-etern stuff (#5615) 2025-04-02 17:21:04 -04:00
Unicorn_Power
16bce25333
Pika-e (#5597) 2025-04-01 00:39:54 +02:00
Unicorn_Power
2ad030ec16
[Sprite] Animation updated for gen 7 batch 1 (#5558)
* 749-750 animation updated.

* Fix the animation json error plus missing files.

back shiny had placement issues and needed to be redone and i forgot to include the static updates.

* Remove the code that got merged by accident again

* Wishiwashi and schooling animations 746

* 728-729-730 Animation implementation

also Variant compatibility

* Final touch ups for 728-729-730

* Yes...... another undo redo

* 2037-2038 Alolan vulpix line animations

plus the Primarina back exp I show how missed

* 2074-2075-2076- animations

plus fixing the back shiny vulpix sprite not working correctly

* 2088-2089 animation and variant support.

* Fixing the base shiny 730

* 780 animation update
2025-03-30 01:57:15 +00:00
NightKev
4e1ee9e50b
Revert "[Enhancement] Add form changes for Solgaleo, Lunala, & Marshadow cosmetic forms" (#5512) 2025-03-13 22:32:35 +01:00
Madmadness65
f3f43f4a44
[Enhancement] Add form changes for Solgaleo, Lunala, & Marshadow cosmetic forms (#5344) 2025-03-12 01:00:33 -04:00
Unicorn_Power
9544973f1f
[Sprite] Gmax animation implementation + Palkia-Origin fix (#5468) 2025-03-05 14:05:59 -08:00
Unicorn_Power
f902716837
[Sprite] Froakie static scuff (#5434) 2025-02-27 19:05:37 +00:00
Unicorn_Power
d11f02aa3d
[Sprite] Variant json and deletion of the pngs for Vivillon-666 (#5408)
* Variant json and deletion of the pngs

* Variant color adjustment

adjusted some color that werent mapped correctly.
adjusted some colors due to contrast issues

* Fixing  the reason sprite test kept failing.

.....669
2025-02-25 06:54:24 -08:00
Unicorn_Power
1c192d434b
[Sprite] 666-Vivillion back exp change and scuff fix (#5382)
* [Sprite] Vivillion back exp change and scuff fix

scuff is the incorrect labeling in the exp-sprite.json.
fully updated meadow pattern.
all incorrect labeled back sprites are no more a thing.

* fix the last issues with Shiny exp backs

* Last adjustment for the future variant Pr

added 1 color
2025-02-24 10:44:41 -05:00
Unicorn_Power
5fa77b7177
[Sprite][Exp First batch of exp change (#5231)
* [Sprite][Exp change] Gen 6 - Gen 7

* Sylveon new exp

* 702 Dedenne

* 712-713 exp changes
2025-02-17 20:32:17 -06:00
Unicorn_Power
fd066ac9b2
[Sprite]Batch 5 exp change (#5243)
* 718 and 718-10 exp change and removal of experimental

* 719 exp change and removal of exp

* 362-mega exp change

* 248-mega exp change

* Fix missing pixels on 248-mega back-exp

* screwing up the master.json to properly commit it

Somehow its ignoring the master.json changes when checking mega tyranitar

* Reverted the screw up on Master.json

Trying to fix so test check the correct files and not look for a png that dont exists

* update the exp-sprites.json

after Kev gave me the Info I needed I did this

* fix it and pokemonSprites text is passing

* Final Adjustment for the colors regarding 248-mega.

Adjusted the colors so that it would GLOW and not become darker.

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-02-17 20:27:19 -06:00
Unicorn_Power
3018a747bd
DuskNoir sprite fix and base sprite fix (#5338) 2025-02-17 20:26:36 -06:00
Unicorn_Power
62bacf52a7
[Sprite] Batch 6 exp change last for Gen 6 (#5248)
* 653-654 exp change

* 656 exp change

* 664-665 + 663 exp change.

Will need to remove Exp need in the future

* 714 exp change and removal of Experimental need

Its a better improved version of what we already had all around.

* 656 exp change + static change

Undoing the smiling froakie sadge

* 715 files and base fix

I fix the sprite bug that has been around for the longest time. HELL YEAH

* Finishing touches to 654 variants

Gave Braxien tier 2 and tier 3 custom fire color matching the variants for contrast.
2025-02-17 20:24:05 -06:00
AJ Fontaine
c7ee0173f6
Fix Impidimp front Arctozolt back variants (#5342) 2025-02-17 20:23:10 -06:00
Unicorn_Power
a8bf385899
[Sprite]Batch 3 of exp changes (#5232)
* Pancham-exp change

* 698 -Exp change and undo experimental need

* 703.exp change and undo experimental

* 694-exp and removal of experimental

* 698-fixing missing pixels and removing uneeded files
2025-02-17 19:52:43 -06:00
Unicorn_Power
200d52cd99
[Sprite]-2.0-batch-4-exp-change (#5277)
* 707 Klefki animation change and removal of experimental need

Animation is high enough quality plus personality for the pokemon that there wont be a need to try and make 1 better. this is the best animation for klefki

* 704-705 change of exp + 707 Experimental removal

* +707

 fix a Json over sight and now are displaying properly

* 708 animation change and removal of Experimental need

Phantump's animation quality is already top notch and dont need to stay in exp prison

* 692-693 exp change
2025-02-17 19:52:21 -06:00
Unicorn_Power
9e1cc1f188
651. 661-662. 672 exp change (#5314) 2025-02-17 19:45:28 -06:00
AJ Fontaine
7463bedbfd
Un-screw the pooch (#5363) 2025-02-17 19:44:51 -06:00
Madmadness65
4d5f9cecf1
Fix Zenith Marshadow missing a party icon (#5301) 2025-02-15 20:32:07 -06:00
AJ Fontaine
7b9d1d6570
[Hotfix] Fix crash involving female Pyroar fusions with exp sprites (#5331)
* Fix crash involving female Pyroar fusions with exp sprites

* Update locales submodule
2025-02-14 18:51:41 -08:00
AJ Fontaine
b483aa0465
[Sprite] Fix Stunfisk variant backs to use shader (#5293) 2025-02-11 14:39:04 -08:00
AJ Fontaine
195a3936b3
[Sprite] Update Litleo/Pyroar exp sprites, enable female exp sprites (#5260)
* Enable female experimental sprites

* Update Litleo/Pyroar exp sprites

Co-authored-by: Unicornpowerstar <gabriella.pahankala@hotmail.se>

* Update sprite test to check exp female variants

* Fix shading on shiny Pyroar, remove unused 668-female files

---------

Co-authored-by: Unicornpowerstar <gabriella.pahankala@hotmail.se>
2025-02-11 14:34:40 -08:00
AJ Fontaine
de5aba3d5e
Fix Greninja floating static backsprite (#5292) 2025-02-10 20:17:01 -06:00
AJ Fontaine
20ed4db88b
Index Zangoose sprites (#5042) 2025-02-10 20:15:59 -06:00
AJ Fontaine
f1c06a5476
[Sprite] Fix Lugia backsprite being cut off (#5144) 2025-01-25 18:58:21 -08:00
Unicornpowerstar
ce30897c0a
[Sprite] Update Primal Kyogre Backsprite (#5156) 2025-01-19 16:48:07 -07:00
Unicornpowerstar
05485aefdd
[Sprite] Flutter mane back sprite adjustments (#5057)
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-19 11:15:33 -07:00
Unicornpowerstar
46e1268a64
[Sprite][Color fix] 3 Venusaur and all forms (#5153) 2025-01-19 11:26:59 -06:00
AJ Fontaine
481616c2ad
[Sprite] Fix female Scizor variants not showing (#5097)
Co-authored-by: damocleas <damocleas25@gmail.com>
2025-01-16 16:25:50 -05:00
Unicornpowerstar
07b69c9485
[Sprite] Fix Issues with the 658-ash.json to display sprite correctly (#5055)
* [Sprite][Color] Fixing Issues with the 658-ash.json to display sprite correctly

- Fix colors not being shown correctly in the json.
   - Said fix are adding a new entry to separate the whites that are F8f8f8 by adding f4f4f4
   - Changed the wrong color into the correct one on the rare.

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
2025-01-06 16:26:00 -08:00
Moka
4d341bf1fd
[Sprite] Add fixed Skorupi and Parasect front sprites (#4944)
* [sprite] add fixed Parasect front sprite by Kieran

* [sprite] add fixed Skorupi front sprite by Kieran

* [sprite] fix shiny skorupi fusions
2024-11-29 13:25:50 -08:00
chaosgrimmon
6442b8345f
[Sprite] Index spritesheets to load faster (#4907)
Reduces the size of files significantly by changing the .png encoding format.
2024-11-18 21:46:33 -05:00
chaosgrimmon
f2a2281ff1
[Sprite] Implement female icon assets for Meganium and Doduo + Torchic lines (#4841)
* [Sprite] Implement more female icons

* [Sprite] Add female Doduo/Dodrio icons

* [Sprite] Add female Meganium icons

* [Sprite] Add female Torchic line icons

* [Sprite] Add female Meganium icons

* [Sprite] Add female Torchic line icons

Identical to male counterpart icons
2024-11-10 14:37:21 -05:00
pom-eranian
5797f265a4
[Sprite][hotfix] Fixed cropping on 658 static greninja and ash greninja (#4743)
* [Sprite][hotfix] Fixed cropping on static greninja and ash greninja

* bump version number
2024-10-28 02:32:36 +00:00
chaosgrimmon
33f5f4c33b
[Sprite] Hotfix cut off Binacle sprite (#4741)
* Trim 688.json duration

* Trim 688.json duration

* Fix cut off Binacle back

* Fix cut off shiny Binacle back

* Bump version

* Bump version

* Revert cutting off hair

* Revert cutting off hair

* Remove trailing comma

* Remove trailing comma
2024-10-27 23:23:09 +01:00
pom-eranian
4be0214d5a
[fix] added missing rare icons for spinarak, ariados. added to icon sheet (#4729) 2024-10-26 21:09:19 +01:00