Port over OoT's new text pipeline #1685
Open
+3,696
−1,250
Conversation
This file contains 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
hensldm
added
Tooling
Asset
Needs-second-approval
Thar0
suggested changes
Sep 7, 2024
Comment on lines
+2589
to
+2596
| def format_sfx_id(self, c : int) -> str: | ||
| try: | ||
| if c & 0x800: | ||
| return sfx_ids[c & ~0x800] | ||
| else: | ||
| return f"{sfx_ids[c]} - SFX_FLAG" | ||
| except KeyError: | ||
| return f"0x{c:04X}" |
There was a problem hiding this comment.
You mentioned this case in the PR description, could you list the sfx ids that this applies to?
There was a problem hiding this comment.
MessageID: SfxID
0x08E8: 0x2693
0x0963: 0x6394
0x0CEA: 0x3AE8
0x0CEF: 0x3AE8
0x0E14: 0x3AFD
AngheloAlf
approved these changes
Sep 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Ported over OoT's newish msgdis.py and msgenc.py. The extracted data is much nicer imo with a new HEADER macro for the message headers, ability to use sfxIDs directly, decimal for timers, and imporved formatting.
Main differences in order to get it to work with MM are:
One thing to note is I decided to follow OoT and not use the
CMDprefix for message commands.This also splits off text extraction out of extract_assets.py and just calls msgdis.py directly
Tested myself and everything seems to be working fine, including adding additional text. Additional testing would be appreciated though.
Note: their is no check anymore for if the data has already been extracted, so running the script will overwrite the message data (including anything added). This will be better when we switch to actually extracting assets to extracted.