Reorganize the ASM/src directory#2354
Open
mzxrules wants to merge 2 commits intoOoTRandomizer:Devfrom
Open
Conversation
|
I recommend adding the desired way to use these folders to |
fenhl
added
Type: Bug
Author
|
I feel like that sort of information doesn't belong in |
Collaborator
|
|
fenhl
reviewed
May 17, 2025
| ; Item restriction table | ||
| ;================================================================================================== | ||
|
|
||
| ; TODO: correct headersize |
Collaborator
There was a problem hiding this comment.
Seems like this still needs to be fixed? Or does this not actually break anything?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The goal for this PR is to sort .asm files into two folders (base and payload) with the hopes that it will someday make it easier to convert baserom modifications into C using Decomp. This PR avoids creating differences in rom_patch.txt and asm_symbols.txt so that in-game testing is not required. However, note that this PR includes the fix from #2352.
Once merged, the next step is to do a more thorough clean up code in the base game files, and break up hacks.asm.
For the base folder, the idea is to roughly match the directory layout of decomp:
Modifications that edit the "code" segment should be split into separate files named after the source file within the code segment that they modify, due to the large number of source files within the segment.
Otherwise, new base game .asm files should be named after the segment they modify.
For the payload folder, I'm not really sure how best to organize it. I mainly stuck a handful of seemingly important files into the root of payload, stuck drop_overrides in it, and put everything else into the mods folder.