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

Wrong macro used for EmotionBubblesOAM #472

Merged
merged 5 commits into from
Sep 29, 2024
Merged

Conversation

Vortyne
Copy link
Contributor

@Vortyne Vortyne commented Sep 26, 2024

It's actually just the last 2 bytes of 4 OAM entries, see WriteOAMBlock for when it is used. BC is pre-loaded with the x and y pixels, whereas de (emotionBubblesOAM) is the tile id and attributes only. Not sure if there's a specific macro for this type of declaration.

It's actually just the last 2 bytes of 4 OAM entries, see WriteOAMBlock for when it is used. BC is pre-loaded with the x and y pixels, whereas de (emotionBubblesOAM) is the tile id and attributes only. Not sure if there's a specific macro for this type of declaration.
@Rangi42
Copy link
Member

Rangi42 commented Sep 26, 2024

Nice, thank you for noticing this!

There's more OAM block data with this problem too, e.g. CutOrBoulderDustAnimationTilesAndAttributes (and probably most/all other WriteOAMBlock call sites). Can you please update them in this PR as well?

Also, nitpick, but the comment generally goes below the label, not above. (Yes we're very inconsistent about this.)

@Rangi42 Rangi42 merged commit 1aa3fb2 into pret:master Sep 29, 2024
1 check passed
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