Skip to content
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

Name OOT samples in sample bank 0 #1695

Open
wants to merge 10 commits into
base: main
Choose a base branch
from

Conversation

louist103
Copy link
Contributor

Name copied samples from OOT in bank 0.
I couldn't take the exact names because the current tooling doesn't allow spaces and symbols so those were removed.
I also noticed even though I removed the sample rate the rom still matched and the wav files the same.

Copy link
Contributor

@Thar0 Thar0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No thoughts on the names themselves yet, but 2 things

  • The samplerate properties should be restored. The samplerate and basenote that the extractor determines for a sample are usually redundant up to multiples of 2, so these properties exist to tweak the samplerate and basenote if the decision made by the extractor isn't a good one. This hasn't been done yet but probably will in the future to correct any samplerates that are too fast or too slow compared to in-game or other sources.

  • Various formatting changes will be overwritten if these files are ever regenerated by the extractor, specifically

    • file -> File
    • 4 spaces to tabs
    • Spaces at the end of the lines

    Since these formatting changes don't interact well with the tools and are inconsistent with the other xmls, they should be reverted.

@hensldm hensldm added documentation Improvements or additions to documentation Audio Needs-second-approval Second approval Needs-first-approval First approval labels Sep 22, 2024
@hensldm
Copy link
Collaborator

hensldm commented Sep 23, 2024

Missing a newline at the end of the xml which is making Jenkins not happy.

@hensldm
Copy link
Collaborator

hensldm commented Sep 27, 2024

While we still have the separate FileName attribute, I feel like we should still use snake_case for the filenames.

@hensldm hensldm added the Waiting-for-author Author needs fix to conflicts or address reviews label Oct 11, 2024
Fix FileName

FIx

Revert "FIx"

This reverts commit 510dcd8c03242f49d88173357c36fd0cc8911945.

Fix
@hensldm hensldm removed the Waiting-for-author Author needs fix to conflicts or address reviews label Nov 30, 2024
Copy link
Collaborator

@hensldm hensldm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1 small comment

assets/xml/audio/samplebanks/SampleBank_0.xml Show resolved Hide resolved
@hensldm hensldm removed the Needs-first-approval First approval label Nov 30, 2024
Comment on lines +155 to +156
# ZAPD can't handle audio, skip those XMLs.
if file.endswith(".xml") and (fullPath.find("audio") == -1):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checked and we do indeed were passing audio xmls to ZAPD.
I wonder why it just complained now, there doesn't seem to be any change that to the format of the xmls to guarantee this problem.
Also, the error it gives doesn't make much sense. I wonder if that check if bugged.

assets/xml/audio/samplebanks/SampleBank_0.xml Outdated Show resolved Hide resolved
assets/xml/audio/samplebanks/SampleBank_0.xml Outdated Show resolved Hide resolved
assets/xml/audio/samplebanks/SampleBank_0.xml Outdated Show resolved Hide resolved
assets/xml/audio/samplebanks/SampleBank_0.xml Show resolved Hide resolved
assets/xml/audio/samplebanks/SampleBank_0.xml Outdated Show resolved Hide resolved
<Sample Name="SAMPLE_0_590" FileName="Sample590" Offset="0x4009E0" SampleRate="32000" BaseNote="C4"/>
<Sample Name="SAMPLE_0_591" FileName="Sample591" Offset="0x40A1A0" SampleRate="32000" BaseNote="EF3"/>
<Sample Name="DrumSidestick" FileName="drum_sidestick" Offset="0x3F3980" SampleRate="32000" BaseNote="C4"/>
<Sample Name="Trombone" FileName="trombone" Offset="0x3F43C0" SampleRate="32000" BaseNote="F3"/>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do you even differentiate this instrument from the one you called trumpet. They sound like the same instrument but playing different notes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't actually make these names. I took them from the old Audio XML from OOT. I am fine with changing them.

@AngheloAlf AngheloAlf added Merge-ready All reviewers satisfied, just waiting for CI and removed Needs-second-approval Second approval labels Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Audio documentation Improvements or additions to documentation Merge-ready All reviewers satisfied, just waiting for CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants