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

John's networking code #20

Merged
merged 10 commits into from
Sep 19, 2024
Merged

John's networking code #20

merged 10 commits into from
Sep 19, 2024

Conversation

L5050
Copy link
Contributor

@L5050 L5050 commented Sep 15, 2024

  • Added John's addresses from his networking code to spm-headers
  • Ported addresses to US0 and JP0
  • Added his spm-errno.h
    After this is merged you'll be able to use both his evtpatch and his networking code together and on the 4 main versions of the game

include/spm/mario_status.h Outdated Show resolved Hide resolved
include/spm/mario_status.h Outdated Show resolved Hide resolved
mod/spm_errno.h Outdated

#include <common.h>

extern "C" {
Copy link
Owner

Choose a reason for hiding this comment

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

This should have a CPP_WRAPPER with the msl namespace. It'd also be ideal to have the official name of errno rather thatn spm_errno, but I don't know if that would affect compatibility with the network mod's setup at all

Copy link
Contributor Author

Choose a reason for hiding this comment

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

annoyingly enough it does, I think ill just remove it from spm headers and put it in the include folder for now

Copy link
Owner

Choose a reason for hiding this comment

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

The symbol is still in the lsts

Copy link
Contributor Author

Choose a reason for hiding this comment

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

found a way to keep errno.h in the msl namespace while also keeping compatibility with the network mod
__errno doesnt appear to be a real spm function, its just one that john made for this mod specifically, so I removed that from spm headers and made a .h file in the network mod's include so that the mod would still work

Copy link
Owner

Choose a reason for hiding this comment

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

But the symbol name is still spm_errno

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed, sorry

Copy link
Owner

Choose a reason for hiding this comment

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

And this definitely doesn't break the network mod in any way?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nope, I just had to change some of the local code in my fork
Ill probably make a PR to johns repo with the changed local code

include/spm/mario_status.h Outdated Show resolved Hide resolved
@L5050 L5050 requested a review from SeekyCt September 19, 2024 17:41
@SeekyCt SeekyCt merged commit 84d1f2c into SeekyCt:master Sep 19, 2024
40 checks passed
@L5050 L5050 deleted the dev branch September 23, 2024 07:38
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