WorldMap function labels - #142
Merged
Merged
Conversation
Contributor
Author
|
I had this floating as a branch in my repo, but PR #129 and #134 seem to have had more done than just this simple label import. If the conflicts for those PRs are resolved by @devcheckra1n then they can take precedence over this PR and this PR can be closed. |
Contributor
|
heads up, i rebased #134 onto current main and pushed the conflict fixes, so it's green and mergeable again. per your offer that means my names stay on the ones we both landed on. there are 13 overlaps:
the other 166 in your set don't touch anything i named, so a rebase should be clean apart from those 13. |
Xeeynamo
approved these changes
Sep 5, 2026
devcheckra1n
added a commit
to devcheckra1n/ff7-decomp
that referenced
this pull request
Sep 5, 2026
Xeeynamo#142 named 13 of the same functions this branch did, and named 27 more that it calls; take upstream's names for all of them rather than renaming merged work. Xeeynamo#141 renamed DS_read to SysCdromStartLoadLzs.
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.
More labels imported form the Q-gears Reverse project