Skip to content

Decompile func_80048600 and compile marina as C (us1)#14

Open
DodongoRex wants to merge 2 commits intoDrahsid:cleanup2024from
DodongoRex:reserve-src-49200
Open

Decompile func_80048600 and compile marina as C (us1)#14
DodongoRex wants to merge 2 commits intoDrahsid:cleanup2024from
DodongoRex:reserve-src-49200

Conversation

@DodongoRex
Copy link

Reserving func_80048600 in src/49200.c per contributing guidelines.

@DodongoRex
Copy link
Author

This PR is for reservation only. I’ll push matching C code for func_80048600 to this branch once complete.

@Drahsid
Copy link
Owner

Drahsid commented Jan 26, 2026

Hey, thanks for working on this.
Can you go ahead and make sure it's directed at the cleanup2024 branch, which currently has more up-to-date code.

@DodongoRex DodongoRex changed the base branch from master to cleanup2024 January 26, 2026 18:39
@DodongoRex
Copy link
Author

Updated — PR is now targeting cleanup2024 and conflicts are resolved.

@DodongoRex
Copy link
Author

Decompiled func_80048600 and converted marina segment to C. Build matches baserom; checksum OK.

@DodongoRex
Copy link
Author

I refreshed the branch history on top of cleanup2024 to present a clean and linear diff for review. This PR now contains only the marina C conversion, the func_80048600 decomp, and required symbol/header updates. Build matches baserom; checksum OK.

@DodongoRex DodongoRex changed the title Reserve src 49200 Decompile func_80048600 and compile marina as C (us1) Jan 29, 2026
@Drahsid
Copy link
Owner

Drahsid commented Feb 4, 2026

For each of the PRs you have open, let me know when they are ready to merge.
Also, if possible, try to OK the data, rodata, and bss of this file and double check that the code still matches.
Great work!

@DodongoRex
Copy link
Author

Confirmed marina is compiled as C and contributes 0 bytes to .data/.rodata/.bss per build/mischiefmakers.map. Rebuild still matches (checksum OK, first_diff.py = No differences). Ready to merge.

@Drahsid
Copy link
Owner

Drahsid commented Feb 17, 2026

It looks like func_80048600 is in a NON_MATCHING guard - is the decompiled function actually matching?

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