[OoT] Fix custom-path OoT/MM DL import not reading object header#714
Open
mike-r129 wants to merge 1 commit into
Open
[OoT] Fix custom-path OoT/MM DL import not reading object header#714mike-r129 wants to merge 1 commit into
mike-r129 wants to merge 1 commit into
Conversation
mike-r129
changed the title
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
1 participant
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 custom-path import reads the given .c file but never reads the matching .h.
OoT/MM objects define the texture width/height in the .h, so the import fails:
ootGetObjectHeaderPath returned the .c path unchanged for custom imports, so OOT_ImportDL read the .c twice and the header was never loaded. This derives the .h next to the .c instead.
Tested with object_toki_objects (DL object_toki_objects_DL_000880) from an ntsc-1.2 extract via custom path: errors as above before the change, imports correctly after.
The skeleton importer uses the same helper, so custom skeleton import is fixed too.