diff --git a/include/variables.h b/include/variables.h index 12e739c72e..cefacad574 100644 --- a/include/variables.h +++ b/include/variables.h @@ -3090,8 +3090,8 @@ extern f32 D_801E0E24; extern f64 D_801E0EB0; // extern UNK_TYPE4 D_801E1068; extern UNK_PTR D_801E10B0; -// extern UNK_TYPE2 D_801E1102; -// extern UNK_TYPE4 D_801E1104; +extern const s16 gAudioTatumInit[]; +extern const AudioContextInitSizes gAudioContextInitSizes; // extern UNK_TYPE4 D_801E1108; // extern UNK_TYPE4 D_801E110C; // extern UNK_TYPE2 D_801E1180; diff --git a/spec b/spec index b409e53075..59c3e7e02e 100644 --- a/spec +++ b/spec @@ -670,7 +670,7 @@ beginseg include "build/src/code/audio/code_801A7B10.o" include "build/data/code/code_801A7B10.data.o" include "build/data/code/code_801A7B10.bss.o" - include "build/data/code/audio_init_params.rodata.o" + include "build/src/code/audio/audio_init_params.o" include "build/src/code/jpegutils.o" include "build/src/code/jpegdecoder.o" include_readonly "build/src/code/z_game_over.o" diff --git a/src/code/audio/audio_init_params.c b/src/code/audio/audio_init_params.c new file mode 100644 index 0000000000..4e6ef9dfbb --- /dev/null +++ b/src/code/audio/audio_init_params.c @@ -0,0 +1,12 @@ +#include "global.h" + +const s16 gAudioTatumInit[] = { + 0x1C00, // unused + 0x30, // gTatumsPerBeat +}; + +const AudioContextInitSizes gAudioContextInitSizes = { + 0x137F00, // heapSize + 0x1C480, // initPoolSize + 0x1A000, // permanentPoolSize +}; diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index 39a9ab6021..fcb848c18e 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -3873,11 +3873,8 @@ 0x801E1070:("jtbl_801E1070","UNK_PTR","",0x4), 0x801E10B0:("jtbl_801E10B0","UNK_PTR","",0x4), 0x801E10C4:("jtbl_801E10C4","UNK_PTR","",0x4), - 0x801E1100:("D_801E1100","UNK_TYPE2","",0x2), - 0x801E1102:("D_801E1102","UNK_TYPE2","",0x2), - 0x801E1104:("D_801E1104","UNK_TYPE4","",0x4), - 0x801E1108:("D_801E1108","UNK_TYPE4","",0x4), - 0x801E110C:("D_801E110C","UNK_TYPE4","",0x4), + 0x801E1100:("gAudioTatumInit","s16","[2]",0x4), + 0x801E1104:("gAudioContextInitSizes","AudioContextInitSizes","",0xC), 0x801E1110:("sGameOverTimer","UNK_TYPE2","",0x2), 0x801E1120:("jtbl_801E1120","UNK_PTR","",0x4), 0x801E1180:("D_801E1180","UNK_TYPE2","",0x2),