-
Notifications
You must be signed in to change notification settings - Fork 614
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Extract NTSC assets for gc-us #1973
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good job on the steady progress, thanks :)
Can't say I'm enthusiastic about the amount of duplication. Is this specific to introducing ntsc versions or can we expect even more?
AFAIK the NTSC/PAL assets are the same for all NTSC/PAL versions so this is basically the last round of duplication. The remaining differences are: nintendo_rogo_static: changed after NTSC 1.0 EDIT: at least for objects. I'm not sure about scenes/rooms |
gameplay_keep diffs for easier review: https://discord.com/channels/688807550715560050/688851317593997489/1254952193128403127 |
zeldaret/mm#1536 Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay for now, again I didn't look closely at the xmls, we'll catch things to fix eventually and I'm sure it's fine ™️ .
FTR, two things I want to change later (with the new assets system):
-
reference gkeep per-asset instead of globally (this PR references it globally with
<ExternalFile XmlPath="objects/gameplay_keep_pal.xml" OutPath="assets/objects/gameplay_keep/"/>
intools/ZAPDConfigs/VERSION/Config.xml
).
The reason this PR references it globally is because it introduces two gkeep versions, one ntsc and one pal. If each xml had to reference it we currently would have to duplicate these xmls for ntsc and pal too.
In the future we'll probably add a better way to indicate referencing gkeep with some indirection rather than pointing to the xml directly -
un-duplicate the xmls, this PR duplicates a lot of them because of changing offsets mostly, and some resources are also added/removed.
In the future we'll figure out a way to have finer grained version handling inside the xmls rather than completely duplicate them
(my personal preference for now would leverage xml namespaces as someone suggested on discord and could look like<Resource ... Offset="0x120" gc_eu_mq:Offset="0x150" />
but this is up for discussion)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also did not review too thoroughly
except text, which @Thar0 has been working on.
I created new XMLs for:
<ExternalFile>
, so I moved this<ExternalFile>
to Config.xml instead so it can change between versions. I think this probably slows down the build a bit but it's not too bad.kanji
ROM segment (based on Extract Kanji + some adjacent docs mm#1536)