Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trainerslide animation fix #6040

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

hedara90
Copy link
Collaborator

@hedara90 hedara90 commented Jan 17, 2025

Description

Decoupled trainer slide sprites from battlers.
Enemy battler shadows set to GEN_LATEST since that setting no longer interferes with trainerslides.

Images

slide.mp4

Issue(s) that this PR fixes

Fixes #5565

Things to note in the release changelog:

  • B_ENEMY_MON_SHADOW_STYLE set to GEN_LATEST since that setting no longer interferes with trainerslides. Set it to GEN_3 to use regular Gen 3 shadow style.

Discord contact info

hedara

@hedara90 hedara90 added the bugfix Bugfixes label Jan 17, 2025
@@ -290,7 +290,6 @@
#define B_SHOW_TYPES SHOW_TYPES_NEVER // When defined as SHOW_TYPES_ALWAYS, after selecting "Fight" in battle, the types of all Pokemon are revealed. Whe defined as SHOW_TYPES_OWN, types are only revealed if the player owns the mon in question.

// Pokémon battle sprite settings
#define B_ENEMY_MON_SHADOW_STYLE GEN_3 // In Gen4+, all enemy Pokemon will have a shadow drawn beneath them.
// Currently Gen4+ shadows don't properly work with Trainerslides
#define B_ENEMY_MON_SHADOW_STYLE GEN_LATEST // In Gen4+, all enemy Pokemon will have a shadow drawn beneath them.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be worth mentioning in the changelog (using the PRing template to make sure the changelog generator parses it properly)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it already mentioned in the PR description and the auto-parsing part of it?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I glanced over that, yeah. Regardless, I do think "re-enabling" doesn't automatically imply the default state of a config has changed - at least for me, it'd imply something deeper in the codebase was changed instead.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reworded and expanded upon

@Bassoonian
Copy link
Collaborator

Just to check: has this also been confirmed to work in double battles?

@hedara90
Copy link
Collaborator Author

Just to check: has this also been confirmed to work in double battles?

Double battles work for both slots, multi-battles work for both slots.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Bugfixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shadows for all 'mons interact badly with trainerslide messages
3 participants