Fix extract, add audio yml

7 files changed, 30 insertions, 69 deletions

diff --git a/config.yml b/config.yml
index 3acb82f53..d69e23ea9 100644
--- a/config.yml
+++ b/config.yml
@@ -10,7 +10,6 @@
       binary: spaghetti.otr
       headers: include/assets
       code: assets/code
-  metadata: [yamls/courses]
   segments:
     - 0x000000
     - 0x000000
diff --git a/yamls/us/audio.yml b/yamls/us/audio.yml
new file mode 100644
index 000000000..30f1d5762
--- /dev/null
+++ b/yamls/us/audio.yml
@@ -0,0 +1,30 @@
+:config:
+  force: true
+  header:
+    code:
+      - '#include <libultraship.h>'
+    header:
+      - '#include <libultraship.h>'
+audio_setup:
+  type: NAUDIO:V1:AUDIO_SETUP
+  audio_seq:
+    size: 0x23180
+    offset: 0xBC5F60
+  audio_bank:
+    size: 0x13840
+    offset: 0x966260
+  audio_table:
+    size: 0x24C4C0
+    offset: 0x979AA0
+
+audio_sample_bank_table:
+  { type: NAUDIO:V1:AUDIO_TABLE, format: SAMPLE, offset: 0x966260, symbol: gSampleBankTableInit }
+
+audio_seq_table:
+  { type: NAUDIO:V1:AUDIO_TABLE, format: SEQUENCE, offset: 0xBC5F60, symbol: gSeqTableInit }
+
+audio_soundfont_table:
+  { type: NAUDIO:V1:AUDIO_TABLE, format: SOUNDFONT, offset: 0x979AA4, symbol: gSoundFontTableInit }
+
+audio_seq_font_table:
+  { type: ARRAY, count: 283, array_type: u8, offset: 0xBE90E0, symbol: gSeqFontTableInit }
\ No newline at end of file
diff --git a/yamls/us/audio_banks.yml b/yamls/us/audio_banks.yml
deleted file mode 100644
index ea38d8593..000000000
--- a/yamls/us/audio_banks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-:config:
-  vram:
-    addr: 0x800E8700
-    offset: 0x966260
-  header:
-    code:
-      - '#include <libultraship.h>'
-      - '#include <assets/audiobanks.h>'
-    header:
-      - '#include <libultraship.h>'
-      - '#include <align_asset_macro.h>'
-audiobanks:
-  symbol: gAudioBanks
-  type: bob
-  offset: 0x0 # or is it 0x13840?
-  size: 0x13840
diff --git a/yamls/us/audio_instrument_sets.yml b/yamls/us/audio_instrument_sets.yml
deleted file mode 100644
index 43ee0a996..000000000
--- a/yamls/us/audio_instrument_sets.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-:config:
-  vram:
-    addr: 0x800E8700
-    offset: 0xBE90E0
-  header:
-    code:
-      - '#include <libultraship.h>'
-      - '#include <assets/audiobanks.h>'
-    header:
-      - '#include <libultraship.h>'
-      - '#include <align_asset_macro.h>'
-instrument_sets:
-  symbol: gInstrumentSets
-  type: bob
-  offset: 0x0
-  size: 0x80
diff --git a/yamls/us/audio_sequences.yml b/yamls/us/audio_sequences.yml
deleted file mode 100644
index 8d107188c..000000000
--- a/yamls/us/audio_sequences.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-:config:
-  vram:
-    addr: 0x800E8700
-    offset: 0xBC5F60
-  header:
-    code:
-      - '#include <libultraship.h>'
-      - '#include <assets/audiobanks.h>'
-    header:
-      - '#include <libultraship.h>'
-      - '#include <align_asset_macro.h>'
-audio_sequences:
-  symbol: gAudioSequences
-  type: bob
-  offset: 0x0
-  size: 0x23180
diff --git a/yamls/us/audio_tables.yml b/yamls/us/audio_tables.yml
deleted file mode 100644
index 5848018ed..000000000
--- a/yamls/us/audio_tables.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-:config:
-  vram:
-    addr: 0x800E8700
-    offset: 0x979AA0
-  header:
-    code:
-      - '#include <libultraship.h>'
-      - '#include <assets/audiobanks.h>'
-    header:
-      - '#include <libultraship.h>'
-      - '#include <align_asset_macro.h>'
-audio_tables:
-  symbol: gAudioTables
-  type: bob
-  offset: 0x0
-  size: 0x24C4C0
\ No newline at end of file
diff --git a/yamls/us/course_metadata.yml b/yamls/us/course_metadata.yml
deleted file mode 100644
index 67d780d64..000000000
--- a/yamls/us/course_metadata.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-course_metadata:
-  type: mk64:metadata
-  input_directory: yamls/courses
-  out_directory: "assets/course_metadata"