-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Merrp merge (September 9th) #5359
Merrp merge (September 9th) #5359
Conversation
Backported OBJ_EVENT_GFX_SPECIES macros from pokeemerald-expansion
…to _RHH/pr/master/merrpMerge
I'm personally conflicted on if the |
Hmm... can I at least add a comment saying that it applies to both followers and other overworld mon? |
I would personally leave the sync PRs as "pure" as they can be and just make a follow-up PR for the config rename. That way, we also have the syncing in the sync section in the changelog and the rename (which is expansion-related and has nothing to do with merrp's branch) elsewhere. |
Would brace adjustments also fall into these "impure" changes? |
They wouldn't imo because that is just plain conversion of something to match expansion (like making something actually build when it otherwise wouldn't), so I personally consider that a necessity. Renaming a config falls under a different category imo. |
Got it. I'll force-push to undo the name change commit. |
2c233bc
to
60803cd
Compare
Ready! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some minor style remarks
Co-authored-by: Bassoonian <[email protected]>
Ready! |
This is a merrp merge - DO NOT SQUASH!
Description
OW_MON_BOBBING
)Discord contact info
AsparagusEduardo