From f6d4a8731e4a4385a25d9a6dc42b4c6dfd4a577b Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Thu, 12 Dec 2024 20:46:26 -0500 Subject: [PATCH] Name OOT samples in sample bank 0 (#1695) * Name samples Fix FileName FIx Revert "FIx" This reverts commit 510dcd8c03242f49d88173357c36fd0cc8911945. Fix * Formatting fixes * fix * \n * snake case * format * Bank 2 * Fix extract assets * Update SampleBank_0.xml * Fix copy errors --- assets/xml/audio/samplebanks/SampleBank_0.xml | 482 +++++++++--------- assets/xml/audio/samplebanks/SampleBank_2.xml | 12 +- tools/extract_assets.py | 3 +- 3 files changed, 249 insertions(+), 248 deletions(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index df880d5433..07e4c7a06f 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -1,120 +1,120 @@ - - + + - - - - + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - + + + - - + + - - - + + + - - - + + + @@ -138,30 +138,30 @@ - - - - - - - + + + + + + + - - + + - + - + - + - + - - - + + + - + @@ -179,9 +179,9 @@ - + - + @@ -199,8 +199,8 @@ - - + + @@ -215,36 +215,36 @@ - - + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + @@ -373,58 +373,58 @@ - - - - - + + + + + - - + + - + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -438,21 +438,21 @@ - - - - - - - - - + + + + + + + + + - - - - - + + + + + @@ -461,13 +461,13 @@ - - + + - + @@ -485,7 +485,7 @@ - + @@ -575,45 +575,45 @@ - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + @@ -623,8 +623,8 @@ - - + + @@ -639,38 +639,38 @@ - - - - - - - - + + + + + + + + - + - + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/assets/xml/audio/samplebanks/SampleBank_2.xml b/assets/xml/audio/samplebanks/SampleBank_2.xml index 5d211590b0..3fbeefd97f 100644 --- a/assets/xml/audio/samplebanks/SampleBank_2.xml +++ b/assets/xml/audio/samplebanks/SampleBank_2.xml @@ -1,9 +1,9 @@ - - - - - - + + + + + + diff --git a/tools/extract_assets.py b/tools/extract_assets.py index 64ce99aa7b..848b71c6da 100755 --- a/tools/extract_assets.py +++ b/tools/extract_assets.py @@ -152,7 +152,8 @@ def main(): for currentPath, _, files in os.walk(os.path.join("assets", "xml")): for file in files: fullPath = os.path.join(currentPath, file) - if file.endswith(".xml"): + # ZAPD can't handle audio, skip those XMLs. + if file.endswith(".xml") and (fullPath.find("audio") == -1): xmlFiles.append(fullPath) try: