Merge branch 'modding' into modsnew

Makefile

@@ -384,7 +384,7 @@ BIN2C                 := $(PYTHON) $(TOOLS_DIR)/bin2c.py
 EXTRACT_DATA_FOR_MIO  := $(TOOLS_DIR)/extract_data_for_mio
 ASSET_EXTRACT         := $(PYTHON) $(TOOLS_DIR)/new_extract_assets.py
 LINKONLY_GENERATOR    := $(PYTHON) $(TOOLS_DIR)/linkonly_generator.py
-TORCH                 := $(TOOLS_DIR)/torch/cmake-build-release/torch
+TORCH                 := ./torch/cmake-build-release/torch
 EMULATOR               = mupen64plus
 EMU_FLAGS              = --noosd
 LOADER                 = loader64

yamls/us/audio.yml

@@ -5,26 +5,12 @@
       - '#include <libultraship.h>'
     header:
       - '#include <libultraship.h>'
-audio_setup:
-  type: NAUDIO:V1:AUDIO_SETUP
-  audio_seq:
-    size: 0x23180
-    offset: 0xBC5F60
-  audio_bank:
-    size: 0x13840
+
+header:
+  type: NAUDIO:V0:AUDIO_HEADER
+  ctl:
     offset: 0x966260
-  audio_table:
-    size: 0x24C4C0
+    size: 0x13840
+  tbl:
     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 }
+    size: 0x24C4C0