Skip to content

murray matches#262

Merged
TheOnlyZac merged 4 commits into
TheOnlyZac:mainfrom
tmess:murray_functions
Jun 23, 2026
Merged

murray matches#262
TheOnlyZac merged 4 commits into
TheOnlyZac:mainfrom
tmess:murray_functions

Conversation

@tmess

@tmess tmess commented Jun 22, 2026

Copy link
Copy Markdown
Contributor
  • Matches in P2/murray and P2/stepguard
  • Some updated mangled names in symbol_addrs.txt
  • A few new OIDs added

Some updated mangled names in symbol_addrs.txt
A few new OIDs added

@TheOnlyZac TheOnlyZac left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Thanks so much for the PR! Some of these functions have a pretty interesting structure. Before merging I just want to make some cosmetic/style changes for consistency, mainly putting the curly braces on a new line. I'm happy to take care of it myself though, I'll have time tomorrow.

Comment thread src/P2/murray.c Outdated
Comment thread src/P2/murray.c Outdated
Comment thread src/P2/murray.c Outdated
@tmess

tmess commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Fixed formatting differences, and changed to use the MSGID enum. Thanks for taking a look.

@TheOnlyZac TheOnlyZac left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Fixed formatting differences, and changed to use the MSGID enum. Thanks for taking a look.

No problem, thank you again! I gave it one more look with the formatting changes, and spotted a couple more minor things I would want to tweak before merging. Again, I don't mind taking care of them before I merge later today if you don't have time.

Comment thread src/P2/murray.c
Comment thread src/P2/murray.c Outdated
Comment thread src/P2/stepguard.c Outdated
Comment thread src/P2/murray.c Outdated
Comment thread src/P2/murray.c Outdated
@tmess

tmess commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Done, simple enough for me to do, appreciate it again.

@TheOnlyZac TheOnlyZac left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Perfect, thanks! One last question, I just have to ask since you forked the repo before the license was added, do you agree to license your contributions under CC0 1.0 Universal?

@TheOnlyZac

Copy link
Copy Markdown
Owner

Also, let me know your Discord username if you would like the Decomp Contributor role in the server.

@tmess

tmess commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

I agree

@TheOnlyZac TheOnlyZac merged commit f893ef0 into TheOnlyZac:main Jun 23, 2026
2 checks passed
@tmess tmess deleted the murray_functions branch June 23, 2026 20:50
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