mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 05:43:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Audio Files & Data: Fix File/Data Splits and Compiler Flags (#456)

Browse Source 
* Properly split audio voice

* Split off jpeg code from audio

* Fix compiler flags

* Properly split libultra audio file

* Split audio data for many files correctly

* Fix remaining data splits

* Fix up troublesome data

* Fix variables.txt

* Missed two files that need to go in audio/

* Add missing `/`

* `D_801E1100` -> audio_init_params

* Properly split code_801D9090.data.s

* Fix code_801A5BD0 bss

* Move audio_dramStack to a blob
This commit is contained in:
engineer124
2021-11-20 01:36:50 +11:00
committed by GitHub
parent dfc146663f
commit d190b265f6
21 changed files with 107 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/audio_effects.c → src/code/audio/audio_effects.c
View File
src/code/audio_heap.c → src/code/audio/audio_heap.c
View File
src/code/audio_load.c → src/code/audio/audio_load.c
View File
src/code/audio_playback.c → src/code/audio/audio_playback.c
View File
src/code/audio_seqplayer.c → src/code/audio/audio_seqplayer.c
View File
src/code/audio_synthesis.c → src/code/audio/audio_synthesis.c
View File
src/code/code_80192BE0.c → src/code/audio/code_80192BE0.c
View File
src/code/audio/code_80194710.c
+5
View File
@@ -0,0 +1,5 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194710.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194750.s")
src/code/audio/code_80194790.c
+9
View File
@@ -0,0 +1,9 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194790/func_80194790.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194790/func_80194804.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194790/func_80194840.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194790/func_801948B0.s")
src/code/code_8019AF00.c → src/code/audio/code_8019AF00.c
-16
View File
@@ -411,19 +411,3 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4DF4.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4E64.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4EB0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4EB8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4FD8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5080.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A50C0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5100.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A510C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5118.s")
src/code/audio/code_801A4EB0.c
+17
View File
@@ -0,0 +1,17 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4EB0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4EB8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4FD8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5080.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A50C0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5100.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A510C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5118.s")
src/code/code_801A51F0.c → src/code/audio/code_801A51F0.c
View File
src/code/code_801A5BD0.c → src/code/audio/code_801A5BD0.c
View File
src/code/code_801A7B10.c → src/code/audio/code_801A7B10.c
-16
View File
@@ -29,19 +29,3 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A99B8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9A74.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9B10.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9B78.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9BFC.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9C68.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9D10.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9DCC.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9EA4.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A7B10/func_801A9F4C.s")
src/code/code_80194710.c
-13
View File
@@ -1,13 +0,0 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194710.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194750.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194790.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194804.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_80194840.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80194710/func_801948B0.s")
src/code/code_801AA020.c
-2
View File
@@ -1,7 +1,5 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/D_801E1100.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/func_801AA020.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801AA020/func_801AA248.s")
src/code/jpegutils.c
+17
View File
@@ -0,0 +1,17 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9B10.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9B78.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9BFC.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9C68.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9D10.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9DCC.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9EA4.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/jpegutils/func_801A9F4C.s")