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

Adjust entity_relic_orb.h; use it for ST0 #1646

Merged
merged 25 commits into from
Sep 21, 2024

Conversation

bismurphy
Copy link
Collaborator

After decompiling this function for ST0, I've now gone ahead and added all the necessary ifdef in order to make the .h file match for ST0 as well.

This version is also very close to matching for PSP, so if/when we figure out the final adjustments needed, it should be easy to integrate that.

Next I will make ST0 use e_misc.h, but for now since there are already so many changes here I wanted to split it up so the PR didn't get too major.

Copy link
Owner

@Xeeynamo Xeeynamo left a comment

Choose a reason for hiding this comment

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

Looks cleaner, despite the various #ifdef. I cannot imagine how tedious this was. Nice one!

@Xeeynamo Xeeynamo merged commit c2d8382 into Xeeynamo:master Sep 21, 2024
14 checks passed
@bismurphy bismurphy deleted the st0_misc_unify branch September 21, 2024 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants