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

Sync upstream #57

Merged
merged 17 commits into from
May 27, 2024
Merged

Sync upstream #57

merged 17 commits into from
May 27, 2024

Conversation

bates64
Copy link
Owner

@bates64 bates64 commented Mar 24, 2024

Needs work still. Main conflicts come from pmret/papermario#1173 and pmret/papermario#1177.

bates64 and others added 9 commits February 28, 2024 04:23
* document D_802946E0

* silly me

* make not static

* whoops again
* suggest possible bgm name if it is not found

* remove pointless ()

* run black

* ...run updated black
* merge asm in src all versions

* main: refactor and eliminate SHIFT_BSS

* engine1 static BSS

* engine2

* folder move

* fix shift build

* cleanup msg & msg_draw

* wtf?

* un-static-ized

* .

* remove unnecess. rodata pad

* populate dangling common syms
* so far

* leftover

* first batch

* part zwei

* item name changes

* misspelling

* comments

* THE

* fix pal

* muurgle

---------

Co-authored-by: HailSanta <[email protected]>
* suggest possible bgm name if it is not found

* remove pointless ()

* run black

* ...run updated black

* unhardcode many for loop conditions

* fix inconsistent RGBA_BUF_SIZE naming

* requested macro changes
* unhardcode 64 in pause_badges.c
@bates64 bates64 requested a review from z64a March 24, 2024 07:39
@bates64 bates64 added the help wanted Extra attention is needed label Mar 29, 2024
@bates64 bates64 mentioned this pull request Apr 25, 2024
@bates64 bates64 marked this pull request as ready for review May 25, 2024 22:32
@bates64
Copy link
Owner Author

bates64 commented May 27, 2024

You hero :shipit:

@bates64 bates64 merged commit 5f087ea into main May 27, 2024
7 checks passed
@bates64 bates64 deleted the sync branch May 27, 2024 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
help wanted Extra attention is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants