Commit Graph

4195 Commits

Author SHA1 Message Date
Yonmaru40
30ec0e7e57
Merge branch 'beta' into zh_cn-fix-9-26 2024-09-26 10:57:30 +08:00
Yonmaru40
c2780df56b
Update move.json 2024-09-26 10:53:23 +08:00
Yonmaru40
f5f59aeb81
Update dialogue.json 2024-09-26 10:51:40 +08:00
flx-sta
67d8ec1d42
[P1 Bug] Fix freeze after replacing first pokemon (#4427)
* fix: new pokemon not being hidden initially

When switching the active pokemon (slot 1) with the new one, the new ones visibility is `true` causing a crash with animation frames

* chore: fix typo

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>

---------

Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com>
2024-09-25 22:33:30 -04:00
innerthunder
029d26b4c9
[Beta][P2 Bug] Fix Sappy Seed applying its secondary effect against targets with Substitute (#4430)
* Fix Sappy Seed applying Leech Seed through Substitutes

* Add docs
2024-09-25 22:32:20 -04:00
Yonmaru40
8fd057df52
Update trainer-names.json 2024-09-26 10:29:50 +08:00
pom-eranian
0500e34f87
[Sprite][Color][Anim] Various Pokemon Sprite Fixes (#4346)
* 451 - Skorupi [Animation Fix] - @rival_kieran

- Fixed chopped up legs in Front Base, Front Shiny, Back Base and Back Shiny.
- Fixed in all animations a single choppy/weird animation loop that cut off and gave the animation itself a weird janky feeling. Removed it entirely.
- Fixed .json files accordingly. All files should be indexed, too.

* 582 Vanillite [Position Fix] - @rival_kieran

- Moves Front Base and Front Shiny to the center of the stage via adding padding to the right side of the sprite (currently the total width is 96 pixels wide, biggest allowed) and by centering the frames.
- Both should work and Vanillite doesn't have variants yet.

* 696 697 Tyrunt Tyrantrum [Colorfixes] - @ rival_kieran

- Fixed Front Shiny exp for Tyrunt (used to have the base color in 5/6 of the frames of its exp on the tailspike, it should load properly now without flicker).
- !! IMPORTANT !! Back Shiny exp for Tyrunt is currently unused because there's a worse copy of it in the /variant/exp/back folder (and I've checked and this is the one the masterlist calls for) it'd be best to revert it as the one in /variant/exp/back has extra colors due to two weird pixels + there's no real need as Tyrunt doesn't have a Base Replace
- Epic variant has been tweaked for all sprites to un-custom the eye (as it had been edited to have a slit eye instead of the ring it should have in Tyrantrum and a slightly modified ring in Tyrunt) and slightly tweak the claws (in Tyrunt, the arm claws had an extra unneeded color as border that caused issues, in Tyrantrum they weren't split properly for a change the Epic introduced). (This affects: Static Front, Static Back, Front exp, Back exp)
- Base sprites have been edited so all variants can load from shader/.json file. .json file has been put in its respective folder and should work.
- All spritesheets should be indexed and clean.

* 774 Minior ordered palettes on static sprites

* 774 minior ordered palette on exp front

* 774 Minior ordered palette exp back

* 774 Minior ordered palettes on shiny back

* 774 Minior ordered palettes on shiny exp front & back

* 774 Minior standard json for all front & back exp

all front colors have identical json values
all back colors have identical json values

* 493 Arceus fairy

* ordered palette for default silvally

palette is identical between front, back, exp front and exp back.

* standarized palettes for all silvally base images

all palettes have the same order
al images of the same type have the exact same palette
indexed rgb files

* 773-water

matched all palettes
indexed all images

* 773-bug

matched all palettes
indexed all images

* 773-psychic

matched all palettes
indexed all images

* 773-dark

matched all palettes
indexed all images

* 773-fire

matched all palettes
indexed all images

* 773-grass

matched all palettes
indexed all images

* 773-rock

matched all palettes
indexed all images

* 773-dragon

matched all palettes
indexed all images

* 773-ghost

matched all palettes
indexed all images

* 773-ground

matched all palettes
indexed all images

* 773-electric

matched all palettes
indexed all images

* 773-fairy

matched all palettes
indexed all images

* 773-flying

matched all palettes
indexed all images

* 773-poison

matched all palettes
indexed all images

* 773-steel

matched all palettes
indexed all images

* 773-ice

matched all palettes
indexed all images

* forgot 2 flying files

* 773-fighting

matched all palettes
indexed all images

* 454 Toxicroak (Base + Shiny Fix) @ vari

Adjusted base sprites to get rid of floating mouth corner.
Sprites have been saved in indexed format.

* 453 454 Croagunk Toxicroak gender variants  @ vari

Recolored the new base sprites in the Variant colors. Affected sprites: All Toxicroak front sprites

added a gender difference - Rare male and epic female changed colors compared to the previous version. Affected sprites: Male rare sprites, female epic sprites.

* 4144 articuno galar json palettes

* 4146 galarian moltres palette json

* 4145 galarian zapdos palette json

* variant masterlist: set galar birds to use json palette

* [Sprite] 60 62 Poliwag Poliwrath - cleaned up stray pixels

* 280 281 282 Ralts Kirlia Gardevoir

fixed clipped horn on kirlia front and back
standard palettes
ignore mega gardevoir and gallade for now.

* 773 Silvally - created all variant palette files

* Removed variant image and anim json files

deleted "*_2"  & "*_3" as they are no longer needed.
added palette file for normal-type exp front
2024-09-25 22:29:34 -04:00
Yonmaru40
096c65cbab
Update trainer-classes.json 2024-09-26 10:28:54 +08:00
Yonmaru40
819bf3705f
Update trainer-titles.json 2024-09-26 10:28:08 +08:00
Yonmaru40
44401cca5d
Update trainer-classes.json 2024-09-26 10:25:49 +08:00
Yonmaru40
c9fe68918d
Update pokemon-form.json 2024-09-26 10:21:16 +08:00
Yonmaru40
7185d048dd
Update party-ui-handler.json 2024-09-26 10:03:14 +08:00
Yonmaru40
3ffa8021d3
Update modifier-select-ui-handler.json 2024-09-26 10:00:08 +08:00
Yonmaru40
c69e9970b1
Update fight-ui-handler.json 2024-09-26 09:58:37 +08:00
Yonmaru40
e5910ff4ca
Update challenges.json 2024-09-26 09:57:38 +08:00
Yonmaru40
94dd21732a
Update bgm-name.json 2024-09-26 09:55:36 +08:00
Yonmaru40
a34cb6ef88
Update achv.json 2024-09-26 09:53:15 +08:00
Yonmaru40
35ffc17f9b
Update weird-dream-dialogue.json 2024-09-26 09:51:59 +08:00
Yonmaru40
00d4ac055b
Update uncommon-breed-dialogue.json 2024-09-26 09:51:30 +08:00
Yonmaru40
5c8cbcd4ee
Update trash-to-treasure-dialogue.json 2024-09-26 09:50:43 +08:00
Yonmaru40
fb7d9c31c5
Update training-session-dialogue.json 2024-09-26 09:50:01 +08:00
Yonmaru40
c77983f5b2
Update the-winstrate-challenge-dialogue.json 2024-09-26 09:49:11 +08:00
Yonmaru40
0f9051b055
Update the-strong-stuff-dialogue.json 2024-09-26 09:48:44 +08:00
Yonmaru40
97a9a1db37
Update the-pokemon-salesman-dialogue.json 2024-09-26 09:48:22 +08:00
Yonmaru40
7d518c25ac
Update the-expert-pokemon-breeder-dialogue.json 2024-09-26 09:47:44 +08:00
Yonmaru40
678f046f82
Update teleporting-hijinks-dialogue.json 2024-09-26 09:46:53 +08:00
Yonmaru40
dd0e09f1ad
Update slumbering-snorlax-dialogue.json 2024-09-26 09:46:07 +08:00
Yonmaru40
4ed0b5f989
Update shady-vitamin-dealer-dialogue.json 2024-09-26 09:45:34 +08:00
Yonmaru40
48f53a75f2
Update safari-zone-dialogue.json 2024-09-26 09:44:56 +08:00
Yonmaru40
c7ef7147f6
Update part-timer-dialogue.json 2024-09-26 09:44:18 +08:00
Yonmaru40
5935d2ef86
Update mysterious-chest-dialogue.json 2024-09-26 09:42:47 +08:00
Yonmaru40
32a4ae9234
Update mysterious-challengers-dialogue.json 2024-09-26 09:41:00 +08:00
Yonmaru40
e09d39105e
Update lost-at-sea-dialogue.json 2024-09-26 09:40:33 +08:00
Yonmaru40
755c714e30
Update global-trade-system-dialogue.json 2024-09-26 09:40:10 +08:00
Yonmaru40
63acfee959
Update fun-and-games-dialogue.json 2024-09-26 09:39:04 +08:00
Yonmaru40
f11939170f
Update fight-or-flight-dialogue.json 2024-09-26 09:38:30 +08:00
Yonmaru40
3090c28971
Update fiery-fallout-dialogue.json 2024-09-26 09:37:55 +08:00
Yonmaru40
1c2dc51d6e
Update dark-deal-dialogue.json 2024-09-26 09:36:58 +08:00
Yonmaru40
c79bd2556e
Update delibirdy-dialogue.json 2024-09-26 09:36:39 +08:00
Yonmaru40
32c7073205
Update dark-deal-dialogue.json 2024-09-26 09:35:50 +08:00
Yonmaru40
fc2b005de7
Update dancing-lessons-dialogue.json 2024-09-26 09:34:52 +08:00
Yonmaru40
2eebfef95a
Update clowning-around-dialogue.json 2024-09-26 09:34:31 +08:00
Mumble
8b9dc79e20
fixed torment lapse condition (#4440)
Co-authored-by: frutescens <info@laptop>
2024-09-26 10:34:16 +09:00
Yonmaru40
ba9b8bb5b1
Update bug-type-superfan-dialogue.json 2024-09-26 09:32:47 +08:00
Yonmaru40
47586221c7
Update berries-abound-dialogue.json 2024-09-26 09:32:06 +08:00
Yonmaru40
e6776296cf
Update an-offer-you-cant-refuse-dialogue.json 2024-09-26 09:30:12 +08:00
Yonmaru40
eca023fc9f
Update absolute-avarice-dialogue.json 2024-09-26 09:25:41 +08:00
innerthunder
a6a61b2984
[Move] Implement Shed Tail (#4382)
* Implement Shed Tail

* Fix leftover batonPass reference in docs

* Fix ChillyReceptionAttr

* oops

* Remove unneeded default arg in ReturnPhase

* Fix imports per Kev's suggestions

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>

* Docs and Shed Tail on-add message

* Remove mixin attribute

* Update battler-tags.json

* Update battler-tags.json

* Update battler-tags.json

* Update battler-tags.json

* Update battler-tags.json

* Update battler-tags.json

* Update battler-tags.json

* Update battler-tags.json

* Update battler-tags.json

* Update battler-tags.json

* Fix indents

* More nit fixes

* Make Switch[Summon]Phase params readonly

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
Co-authored-by: Lugiad <adrien.grivel@hotmail.fr>
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-09-25 17:17:46 -07:00
Frederico Santos
70c6edfaed
Merge pull request #4438 from pagefaultgames/dependabot/npm_and_yarn/rollup-4.22.4
Dependabot/npm and yarn/rollup 4.22.4
2024-09-25 23:03:10 +01:00
Frederico Santos
05c84aaa8a
Revert "Bump rollup from 4.18.1 to 4.22.4 (#4429)" (#4437)
This reverts commit eab610ca22.
2024-09-25 23:02:11 +01:00