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

Merrp merge (September 9th) #5359

Merged

Conversation

AsparagusEduardo
Copy link

@AsparagusEduardo AsparagusEduardo commented Sep 9, 2024

This is a merrp merge - DO NOT SQUASH!

Description

Discord contact info

AsparagusEduardo

@AsparagusEduardo AsparagusEduardo changed the title Backported OBJ_EVENT_GFX_SPECIES macro from Expansion Merrp merge (September 9th) Sep 9, 2024
@AsparagusEduardo AsparagusEduardo added the type: sync Syncing with pret's upstream label Sep 10, 2024
@Bassoonian
Copy link
Collaborator

I'm personally conflicted on if the OW_FOLLOWERS_BOBBING rename should be in a PR that is otherwise a very strict sync

@AsparagusEduardo
Copy link
Author

I'm personally conflicted on if the OW_FOLLOWERS_BOBBING rename should be in a PR that is otherwise a very strict sync

Hmm... can I at least add a comment saying that it applies to both followers and other overworld mon?

@Bassoonian
Copy link
Collaborator

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.

@AsparagusEduardo
Copy link
Author

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?

@Bassoonian
Copy link
Collaborator

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.

@AsparagusEduardo
Copy link
Author

Got it. I'll force-push to undo the name change commit.

@AsparagusEduardo AsparagusEduardo force-pushed the _RHH/pr/master/merrpMerge branch from 2c233bc to 60803cd Compare September 12, 2024 12:09
@AsparagusEduardo
Copy link
Author

Ready!

Copy link
Collaborator

@Bassoonian Bassoonian left a 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

@AsparagusEduardo
Copy link
Author

Ready!

@AsparagusEduardo AsparagusEduardo mentioned this pull request Sep 13, 2024
@Bassoonian Bassoonian merged commit 0b429a8 into rh-hideout:master Sep 15, 2024
1 check passed
@AsparagusEduardo AsparagusEduardo deleted the _RHH/pr/master/merrpMerge branch September 15, 2024 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: sync Syncing with pret's upstream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants