Follower Object Event refactor #6129
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hedara90
added
bugfix
AlexOn1ine
reviewed
Jan 27, 2025
AlexOn1ine
reviewed
Jan 27, 2025
AlexOn1ine
approved these changes
Feb 6, 2025
hedara90
added a commit
to hedara90/pokeemerald-expansion
that referenced
this pull request
Feb 6, 2025
Co-authored-by: Hedara <hedara90@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Supersedes #6117
Fixes shiny pokemon object events and adds the possibility to female forms if they exist, also with shiny.
Also fixes the Swinub OW palette tag collision with the weather.
Refactored how follower
graphicsIds are calculated.Now they are calculated by taking the species number and adding
1 << 13to signify that it is an OW follower/object event.Furthermore the bits
1 << 14and1 << 15are used to signify if is shiny and female.Images
Issue(s) that this PR fixes
Fixes #5683 , fixes #5147
People who collaborated with me in this PR
@AsparagusEduardo
Things to note in the release changelog:
OBJ_EVENT_GFX_SPECIES_SHINYOBJ_EVENT_GFX_SPECIES_FEMALEandOBJ_EVENT_GFX_SPECIES_SHINY_FEMALEDiscord contact info
hedara