diff options
| author | zelda2774 <69368340+zelda2774@users.noreply.github.com> | 2021-08-30 02:08:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-29 20:08:41 -0400 |
| commit | a75c70358cba32c6ffbdb820f700a994c3a715fd (patch) | |
| tree | d8ccec3fec07cb60233608b8cef575b253a925b3 /src/code/code_800EC960.c | |
| parent | 28e72bb486e271db133e61d7548f9009ed8f1d3a (diff) | |
Match func_800EEA50 + some surrounding doc (#916)
* Match func_800EEA50
* Document some audio debug stuff
* more doc
* more doc
* formatting
* Fix enums, and some more bits of doc
* review
* LIM -> MAX
* missed review suggestion...
* more review
* ganon comments
* more review
* 🐍☠️
* more review
* Update functions.h
* quotes
* review
Co-authored-by: zelda2774 <zelda2774@invalid>
Diffstat (limited to 'src/code/code_800EC960.c')
| -rw-r--r-- | src/code/code_800EC960.c | 2087 |
1 files changed, 1043 insertions, 1044 deletions
diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index 239830925..1d18761b6 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -3,20 +3,20 @@ typedef struct { f32 unk_00; - f32 unk_04; - s8 unk_08; - s8 unk_09; - s8 unk_0A; + f32 freqScale; + s8 reverb; + s8 panSigned; + s8 reverbFlg; u8 unk_0B; u8 unk_0C; } unk_s1; typedef struct { - f32 unk_00; - f32 unk_04; - f32 unk_08; - s32 unk_0C; -} unk_s2; + f32 value; + f32 target; + f32 step; + s32 remainingFrames; +} FreqLerp; typedef struct { u16 unk_00; @@ -24,70 +24,84 @@ typedef struct { u8 unk_04[100]; } D_801306DC_s; // size = 0x68 -void Audio_SetVolScale(u8, u8, u8, u8); -void func_800F5550(u16); -void func_800F5E18(u8 arg0, u16 arg1, u8 arg2, s8 arg3, s8 arg4); -void func_800F4784(unk_s2* arg0); -void func_800F56A8(void); -void func_800F6FB4(u8); -s32 func_800F491C(u8 arg0); +typedef enum { + /* 0x0 */ PAGE_NON, + /* 0x1 */ PAGE_SOUND_CONTROL, + /* 0x2 */ PAGE_SPEC_INFO, // unused + /* 0x3 */ PAGE_HEAP_INFO, + /* 0x4 */ PAGE_GROUP_TRACK_INFO, // unused + /* 0x5 */ PAGE_SUB_TRACK_INFO, + /* 0x6 */ PAGE_CHANNEL_INFO, // unused + /* 0x7 */ PAGE_INTERFACE_INFO, + /* 0x8 */ PAGE_SE_FLAG_SWAP, + /* 0x9 */ PAGE_BLOCK_CHANGE_BGM, + /* 0xA */ PAGE_NATURAL_SOUND_CONTROL, // unused + /* 0xB */ PAGE_OCARINA_TEST, + /* 0xC */ PAGE_SE_PARAMETER_CHANGE, + /* 0xD */ PAGE_SCROLL_PRINT, + /* 0xE */ PAGE_FREE_AREA, + /* 0xF */ PAGE_MAX +} AudioDebugPage; + +#define SCROLL_PRINT_BUF_SIZE 25 extern f32 D_8012F6B4[]; // from audio_synthesis // stick float vals -extern u32 D_801305B0; -extern u32 D_801305B4; +extern f32 D_801305B0; +extern s8 D_801305B4; extern s8 D_801305B8; extern s8 D_801305BC; extern s8 D_801305C0; -extern f32 D_801305C4[2]; -extern u8 D_801305CC; -extern u8 sPrevChargeLevel; // 801305E0 -extern f32 D_801305E4[4]; -extern f32 D_801305F4; -extern u8 D_801305F8[8]; -extern u8 D_80130600; -extern s8 D_80130604; -extern s8 D_80130608; -extern s8 D_8013060C; -extern s8 D_80130610; -extern s8 D_80130614; -extern s8 D_80130618; -extern u8 D_8013061C; -extern f32 D_80130620; -extern s8 D_80130624; -extern u16 D_80130628; -extern u8 D_8013062C; -extern u8 D_80130630; -extern u32 D_80130634; -extern u32 D_80130638; -extern u8 D_8013063C; -extern u8 D_80130640; -extern u8 D_80130644; -extern u8 D_80130648; -extern Vec3f* D_8013064C; -extern f32 D_80130650; -extern u8 D_80130654; -extern u8 D_80130658[]; // <= 112 -extern s8 D_801306C8[20]; +extern f32 D_801305C4[2]; // = {-15.0f, -65.0f} +extern u8 sAudioIncreasingTranspose; // = 0 +extern u8 gMorphaTransposeTable[16]; // = {0, 0, 0, 1, 1, 2, 4, 6, 8, 8, 8, 8, 8, 8, 8, 8} +extern u8 sPrevChargeLevel; // = 0 +extern f32 D_801305E4[4]; // = {1.0f, 1.12246f, 1.33484f, 1.33484f} = 2**({0, 2, 5, 5}/12) +extern f32 D_801305F4; // = 1.0f +extern u8 D_801305F8[8]; // = {127, 80, 75, 73, 70, 68, 65, 60} +extern u8 D_80130600; // = 0 +extern s8 D_80130604; // = 2 +extern s8 D_80130608; // = 0 +extern s8 sAudioCutsceneFlag; // = 0 +extern s8 sSpecReverb; // = 0 +extern s8 sAudioEnvReverb; // = 0 +extern s8 sAudioCodeReverb; // = 0 +extern u8 D_8013061C; // = 0 +extern f32 sAudioEnemyDist; // = 0.0f +extern s8 sAudioEnemyVol; // = 127 +extern u16 D_80130628; // = 0xFFFF +extern u8 D_8013062C; // = 0 +extern u8 D_80130630; // = 0 +extern u32 D_80130634; // = 0 +extern u32 D_80130638; // = 0 +extern u8 D_8013063C; // = 0 +extern u8 D_80130640; // = 0 +extern u8 D_80130644; // = 0 +extern u8 D_80130648; // = 0 +extern Vec3f* sSariaBgmPtr; // = 0 +extern f32 D_80130650; // = 2000.0f +extern u8 D_80130654; // = 0 +extern u8 D_80130658[]; // 0x6D <= size <= 0x70 +extern s8 sSpecReverbs[20]; // = {0, 0, 0, 0, 0, 0, 0, 40, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} extern D_801306DC_s D_801306DC[20]; extern u32 sOcarinaAllowedBtnMask; // 80130EFC extern s32 sOcarinaABtnMap; // 80130F00 extern s32 sOcarinaCUPBtnMap; // 80130F04 extern s32 sOcarinaCDownBtnMap; // 80130F08 extern u8 sOcarinaInpEnabled; // 80130F0C -extern s8 D_80130F10; // ocarina active? +extern s8 D_80130F10; // "OCA", ocarina active? extern u8 sCurOcarinaBtnVal; // 80130F14 extern u8 sPrevOcarinaNoteVal; // 80130F18 extern u8 sCurOcarinaBtnIdx; // 80130F1C, note index? extern u8 sLearnSongLastBtn; // 80130F20 extern f32 D_80130F24; -extern u32 D_80130F28; +extern f32 D_80130F28; extern s8 D_80130F2C; // pitch? extern s8 D_80130F30; extern s8 D_80130F34; extern u8 sPlaybackState; // 80130F38 -extern u32 D_80130F3C; +extern u32 D_80130F3C; // "SEQ" extern u32 sNotePlaybackTimer; extern u16 sPlaybackNotePos; extern u16 sStaffPlaybackPos; @@ -107,7 +121,7 @@ extern OcarinaSong sOcarinaSongs[14]; // 80130F80 extern OcarinaSong* sPlaybackSong; // extern u8 D_80131844[]; // extern u8* gFrogsSongPtr = D_80131844; -extern u8 D_80131858; +extern u8 D_80131858; // "REC" extern u8 sRecordSongPos; extern u32 D_80131860; extern u8 D_80131864; @@ -127,49 +141,51 @@ extern u8 sNoteValueIndexMap[16]; // = {0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 5, 3, 3, 4 // D_80131C80 .. 88 are in-function static in func_800EE824 extern f32 D_80131C8C; -extern u8 D_801333F0; - // Debug variables (separate file?): -extern f32 D_80131C90; // func_800EEA50, in-function static? -extern f32 D_80131C94; // func_800EEA50, in-function static? -extern u8 D_80131C98; -extern u8 D_80131C9C; -extern u8 D_80131CA0; -extern u8 D_80131CA4; -extern u8 D_80131CA8; -extern char D_80131CAC[][23]; -extern u16 D_80131E08[11]; -extern u16 D_80131E20[11]; -extern char D_80131E38[7][11]; // func_800EEA50 -extern char D_80131E88[][10]; // func_800EEA50 -extern s8 D_80131EBC; -extern s8 D_80131EC0; -extern s8 D_80131EC4; -extern s8 D_80131EC8[]; -extern u8 D_80131ED0; -extern u8 sAudioScreenPrintInd; -extern u8 sAudioScreenPrintOverflow; -extern s8 D_80131EDC; -extern s8 D_80131EE0; -extern u8 D_80131EE4[11]; -extern u8 D_80131EF0[11]; -extern u8 D_80131EFC; -extern u8 D_80131F00; -extern u8 D_80131F04; -extern u8 D_80131F08; -extern char D_80131F0C[][5]; // func_800EEA50 -extern u8 D_80131F18; -extern u8 D_80131F1C; -extern u16 D_80131F20[]; -extern u8 D_80131F28; -extern u8 D_80131F2C; -extern u8 D_80131F30[]; -extern char D_80131F44[][2]; // func_800EEA50 -extern u8 D_80131F4C[]; -extern u8 D_80131F50; -extern char D_80131F54[][5]; // func_800EEA50 -extern u8 D_80131F64; -extern u8 D_80131F68; +extern f32 sAudioUpdateDuration; // = 0 +extern f32 sAudioUpdateDurationMax; // = 0 +extern u8 sAudioDebugEverOpened; // = 0 +extern u8 sAudioSEMuted; // = 0 +extern u8 sAudioDebugPage; // = 0 +extern u8 sAudioSndContSel; // = 0 +extern u8 sAudioDebugTextColor; // = 0 +extern char sAudioDebugPageNames[15][23]; +/* = {"Non", "Sound Control", "Spec Info", "Heap Info", "Grp Track Info", "Sub Track Info", + * "Channel Info", "Interface Info", "SE Flag Swap", "Block Change BGM", "Natural Sound Control", + * "Ocarina Test", "SE Parameter Change", "Scroll Print", "Free Area"} */ +extern u16 sAudioSndContWork[11]; // = {0} +extern u16 sAudioSndContWorkLims[11]; // = {128, 128, 7, 512, 4, 2, 16, 32, 2, 2, 2} +extern char sSoundBankNames[7][11]; +// = {"PLAYER", "PLAYER", "ITEM", "ENVIROMENT", "ENEMY", "SYSTEM", "OCARINA", "VOICE"} +extern char sSoundModeNames[4][10]; // = {"W-STEREO", "HEADPHONE", "3D SOUND", "MONO"} +extern s8 sAudioIntInfoX; // = 0 +extern s8 sAudioIntInfoY; // = 0 +extern s8 sAudioIntInfoSel; // = 0 +extern s8 sAudioIntInfoBankPage[7]; // = {0, 0, 2, 2, 0, 0, 0} +extern u8 sAudioScrPrtSel; // = 0 +extern u8 sAudioScrPrtInd; // = 0 +extern u8 sAudioScrPrtOverflow; // = 0 +extern s8 sAudioScrPrtX; // = 26 +extern s8 sAudioScrPrtY; // = 1 +extern u8 sAudioScrPrtWork[11]; // = {1, 19, 6, 0, 0, 0, 0, 0, 0, 0, 1} +extern u8 sAudioScrPrtWorkLims[11]; // = {2, SCROLL_PRINT_BUF_SIZE, 8, 2, 2, 2, 2, 2, 2, 2, 2} +extern u8 sAudioSubTrackInfoSpec; // = 0 +extern u8 sAudioSEFlagSwapIsEditing; // = 0 +extern u8 sAudioSEFlagSwapSel; // = 0 +extern u8 sAudioSEFlagSwapNibbleSel; // = 0 +extern char sAudioSEFlagSwapModeNames[2][5]; // = {"SWAP", "ADD"} +extern u8 sAudioSEParamChgSel; // = 0 +extern u8 sAudioSEParamChgBitSel; // = 0 +extern u16 sAudioSEParamChgWork[2]; // = {0} +extern u8 sAudioSubTrackInfoPlayerSel; // = 0 +extern u8 sAudioSubTrackInfoChannelSel; // = 0 +extern u8 sSeqPlayerPeakNumLayers[4]; // = {0} +extern char sAudioSceneNames[3][2]; // = {"A", "S", "X"} +extern u8 sAudioBlkChgBgmWork[2]; // = {0} +extern u8 sAudioBlkChgBgmSel; // = 0 +extern char sBoolStrs[3][5]; // = {"OFF", "ON", "STBY"} +extern u8 sAudioNatureFailed; // = 0 +extern u8 sPeakNumNotes; // = 0 // D_80131F6C is in-function static in func_800F510C /** bit field of songs that can be played @@ -187,17 +203,11 @@ extern u8 D_80131F68; * 0x0001 minuet */ -typedef struct { - u8 unk_00; - char unk_01[0x37]; -} unk_dstruct; - -extern u8 D_801333F4; +extern u8 D_801333F0; +extern u8 gAudioSEFlagSwapOff; extern u8 D_80133408; extern u8 D_8013340C; -extern u8 D_80133414; extern u8 D_80133418; -extern unk_dstruct D_801337CE[]; /** * BSS @@ -205,31 +215,29 @@ extern unk_dstruct D_801337CE[]; u32 sAudioUpdateStartTime; // 8016B7A0 u32 sAudioUpdateEndTime; f32 D_8016B7A8; -f32 D_8016B7AC; // maybe padding? +f32 D_8016B7AC; f32 D_8016B7B0; f32 D_8016B7B4; -unk_s2 D_8016B7B8; -unk_s2 D_8016B7C8; +FreqLerp sRiverFreqScaleLerp; +FreqLerp sWaterfallFreqScaleLerp; f32 D_8016B7D8; s8 D_8016B7DC; f32 D_8016B7E0; u16 D_8016B7E4; -typedef struct { +struct { s8 str[5]; u16 num; -} unk_sAudioScreenPrintBuf; -unk_sAudioScreenPrintBuf sAudioScreenPrintBuf[25]; +} sAudioScrPrtBuf[SCROLL_PRINT_BUF_SIZE]; u8 D_8016B8B0; u8 D_8016B8B1; u8 D_8016B8B2; u8 D_8016B8B3; -u8 D_8016B8B4; +u8 sAudioGanonDistVol; unk_s1 D_8016B8B8[0x10]; -// maybe a struct? -u8 D_8016B9B8[0x20]; -u8 D_8016B9D8[0x8]; // probably array. -u8 D_8016B9E0[0x12]; +char sBinToStrBuf[0x20]; +u8 D_8016B9D8; +u8 sAudioSpecPeakNumNotes[0x12]; u8 D_8016B9F2; u8 D_8016B9F3; u8 D_8016B9F4; @@ -252,7 +260,7 @@ s32 D_8016BA1C; u8 sCurOcarinaSong[8]; u8 sOcarinaSongAppendPos; u8 sOcarinaHasStartedSong; -u8 gOcarinaSongNotestartIdx; +u8 sOcarinaSongNoteStartIdx; u8 sOcarinaSongCnt; u16 sOcarinaAvailSongs; u8 D_8016BA2E; @@ -261,17 +269,26 @@ u16 D_8016BA50[0x10]; u16 D_8016BA70[0x10]; u8 sLearnSongExpectedNote[0x10]; OcarinaNote D_8016BAA0; -u8 D_8016BAA8; -f32 D_8016BAAC; -u32 D_8016BAB0; -u32 sDebugPadPressRaw; +u8 sAudioHasMalonBgm; +f32 sAudioMalonBgmDist; + +// Start debug bss +u32 sDebugPadHold; +u32 sDebugPadBtnLast; u32 sDebugPadPress; s32 sAudioUpdateTaskStart; s32 sAudioUpdateTaskEnd; -extern u16 D_8016E2E0[]; -extern u16 D_8016E2F8[]; -extern u8 D_8016E310[]; +extern u16 gAudioSEFlagSwapSource[]; +extern u16 gAudioSEFlagSwapTarget[]; +extern u8 gAudioSEFlagSwapMode[]; + +void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode); + +void Audio_StepFreqLerp(FreqLerp* lerp); +void func_800F56A8(void); +void func_800F6FB4(u8); +s32 Audio_SetGanonDistVol(u8 targetVol); void func_800EC960(u8 custom) { if (!custom) { @@ -289,19 +306,17 @@ void func_800EC960(u8 custom) { } } -void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode); void Audio_GetOcaInput(void) { - Input input[4]; - Input* inputP = &input[0]; + Input inputs[4]; + Input* controller1 = &inputs[0]; u32 sp18; sp18 = sCurOcarinaBtnPress; - inputP = input; - PadMgr_RequestPadData(&gPadMgr, input, 0); - sCurOcarinaBtnPress = inputP->cur.button; + PadMgr_RequestPadData(&gPadMgr, inputs, 0); + sCurOcarinaBtnPress = controller1->cur.button; sPrevOcarinaBtnPress = sp18; - sCurOcaStick.x = inputP->rel.stick_x; - sCurOcaStick.y = inputP->rel.stick_y; + sCurOcaStick.x = controller1->rel.stick_x; + sCurOcaStick.y = controller1->rel.stick_y; } f32 Audio_OcaAdjStick(s8 inp) { @@ -382,7 +397,7 @@ void func_800ECC04(u16 flg) { if (flg != 0xFFFF) { D_80130F3C = 0x80000000 + (u32)flg; - gOcarinaSongNotestartIdx = 0; + sOcarinaSongNoteStartIdx = 0; sOcarinaSongCnt = 0xE; if (flg != 0xA000) { sOcarinaSongCnt--; @@ -449,7 +464,7 @@ void func_800ECDF8(void) { if (sPrevOcarinaNoteVal == sCurOcarinaBtnVal || sCurOcarinaBtnVal == 0xFF) { inputChanged = 1; } // clang-format on - for (i = gOcarinaSongNotestartIdx; i < sOcarinaSongCnt; i++) { + for (i = sOcarinaSongNoteStartIdx; i < sOcarinaSongCnt; i++) { sh = 1 << i; if (sOcarinaAvailSongs & sh) { D_8016BA50[i] = D_8016BA70[i] + 0x12; @@ -547,7 +562,7 @@ void func_800ED200(void) { sCurOcarinaSong[sOcarinaSongAppendPos - 1] = sCurOcarinaBtnVal; } - for (i = gOcarinaSongNotestartIdx; i < sOcarinaSongCnt; i++) { + for (i = sOcarinaSongNoteStartIdx; i < sOcarinaSongCnt; i++) { if (sOcarinaAvailSongs & (u16)(1 << i)) { for (j = 0, k = 0; j < gOcarinaSongNotes[i].len && k == 0 && sOcarinaSongAppendPos >= gOcarinaSongNotes[i].len;) { @@ -662,7 +677,7 @@ void func_800ED858(u8 arg0) { D_8016BA10 = 0xFFFF; func_800ED458(0); Audio_StopSfx(NA_SE_OC_OCARINA); - func_800F7260(0); + Audio_SetSoundBanksMute(0); sPlaybackState = 0; sStaffPlaybackPos = 0; sOcarinaInpEnabled = 0; @@ -677,13 +692,6 @@ void func_800ED858(u8 arg0) { } void func_800ED93C(s8 songIdx, s8 arg1) { - s32 temp_a0; - s32 temp_a0_2; - u16 temp_t5; - u16 temp_v0; - u16 temp_v0_2; - u16 phi_v0; - if (songIdx == 0) { sPlaybackState = 0; Audio_StopSfx(NA_SE_OC_OCARINA); @@ -707,8 +715,8 @@ void func_800ED93C(s8 songIdx, s8 arg1) { } void Audio_OcaPlayback(void) { - s32 noteTimerStep; - s32 nextNoteTimerStep; + u32 noteTimerStep; + u32 nextNoteTimerStep; if (sPlaybackState != 0) { if (sStaffPlaybackPos == 0) { @@ -1015,8 +1023,6 @@ void func_800EE404(void) { } } -s32 func_800EE5EC(void); - void func_800EE57C(u8 minigameIdx) { u8 i; @@ -1106,7 +1112,7 @@ void func_800EE6F4(void) { void func_800EE824(void) { static u8 D_80131C80 = 0; static u8 D_80131C84 = 1; - static u16 D_80131C88 = 0x4B0; + static u16 D_80131C88 = 1200; switch (D_80131C80) { case 0: @@ -1117,11 +1123,11 @@ void func_800EE824(void) { D_80131C80 = 3; func_800ED858(0); } - D_80131C88 = 0x4B0; + D_80131C88 = 1200; } break; case 1: - func_800F7260(0); + Audio_SetSoundBanksMute(0); func_800ED858(D_80131C84); func_800ED93C(0xF, 1); D_80131C84++; @@ -1151,240 +1157,222 @@ void func_800EE930(void) { D_80131880 = 0; } -// DebugAudio_GetOcaInput -void func_800EE97C(void) { +void AudioDebug_SetInput(void) { // (not 16-byte-aligned, so this cannot start a new file...) Input inputs[4]; u32 btn; - PadMgr_RequestPadData(&gPadMgr, &inputs, 0); + PadMgr_RequestPadData(&gPadMgr, inputs, 0); btn = inputs[3].cur.button; - D_8016BAB0 = btn & 0xFFFF; - sDebugPadPress = (btn ^ sDebugPadPressRaw) & btn; - sDebugPadPressRaw = btn; + sDebugPadHold = btn & 0xFFFF; + sDebugPadPress = (btn ^ sDebugPadBtnLast) & btn; + sDebugPadBtnLast = btn; } -u8* func_800EE9D0(s32 arg0, u8 arg1) { - s32 temp_a1; - s32 temp_v1; - u8* temp_a3; - s32 phi_v0; - s32 phi_t0; - s32 phi_v1; +char* AudioDebug_ToStringBinary(u32 num, u8 bits) { u8 i; u32 flg = 1; - for (i = 0; i < arg1; flg *= 2, i++) { - if (arg0 & flg) { - D_8016B9B8[arg1 - i - 1] = 0x31; + for (i = 0; i < bits; flg *= 2, i++) { + if (num & flg) { + sBinToStrBuf[bits - i - 1] = '1'; } else { - D_8016B9B8[arg1 - i - 1] = 0x30; + sBinToStrBuf[bits - i - 1] = '0'; } } - D_8016B9B8[arg1] = 0; - return D_8016B9B8; + sBinToStrBuf[bits] = '\0'; + return sBinToStrBuf; } -// Debug Print -#ifdef NON_EQUIVALENT -void func_800EEA50(GfxPrint* printer) { - char digitStr[2] = "1"; // sp98 - s32 s0; - s32 k; +void AudioDebug_Draw(GfxPrint* printer) { + s32 pad[3]; u8 i; u8 j; - u8 songInd; - u8 totalNumLayers; - u8 instOrWave; - u8 inst; - u8 phi_s2_3; + u8 ctr; + u8 ctr2; + s8 k; + s8 k2; s8 ind; - u8 idx; // v1 - u8 bank; // fp - u8 numEnabledNotes; // sp78 + u8 numEnabledNotes = 0; + char digitStr[2] = "1"; #define SETCOL_COMMON(v, r, g, b) \ GfxPrint_SetColor(printer, ((v & 4) >> 2) * (r), ((v & 2) >> 1) * (g), (v & 1) * (b), 255) -#define SETCOL(r, g, b) SETCOL_COMMON(D_80131CA8, r, g, b) -#define SETCOL2(r, g, b) SETCOL_COMMON(D_80131EE4[2], r, g, b) +#define SETCOL(r, g, b) SETCOL_COMMON(sAudioDebugTextColor, r, g, b) +#define SETCOL_SCROLLPRINT(r, g, b) SETCOL_COMMON(sAudioScrPrtWork[2], r, g, b) - D_80131C98 = 1; + sAudioDebugEverOpened = true; GfxPrint_SetPos(printer, 3, 2); SETCOL(255, 255, 255); GfxPrint_Printf(printer, "Audio Debug Mode"); GfxPrint_SetPos(printer, 3, 3); - GfxPrint_Printf(printer, "- %s -", D_80131CAC[D_80131CA0]); + GfxPrint_Printf(printer, "- %s -", sAudioDebugPageNames[sAudioDebugPage]); - numEnabledNotes = 0; // s0 - for (i = 0; i < gAudioSessionPresets[D_80133414].maxSimultaneousNotes; i++) { // s6 + for (i = 0; i < gAudioSpecs[gAudioSpecId].maxSimultaneousNotes; i++) { if (gAudioContext.notes[i].noteSubEu.bitField0.s.enabled == 1) { numEnabledNotes++; } } - if (D_80131F68 < numEnabledNotes) { - D_80131F68 = numEnabledNotes; + if (sPeakNumNotes < numEnabledNotes) { + sPeakNumNotes = numEnabledNotes; } - if (D_8016B9E0[D_80133414] < numEnabledNotes) { - D_8016B9E0[D_80133414] = numEnabledNotes; + if (sAudioSpecPeakNumNotes[gAudioSpecId] < numEnabledNotes) { + sAudioSpecPeakNumNotes[gAudioSpecId] = numEnabledNotes; } - if (D_80131EE4[0] != 0) { - GfxPrint_SetPos(printer, D_80131EDC, D_80131EE0); - SETCOL2(0xC8, 0xC8, 0xC8); + if (sAudioScrPrtWork[0] != 0) { + GfxPrint_SetPos(printer, sAudioScrPrtX, sAudioScrPrtY); + SETCOL_SCROLLPRINT(200, 200, 200); GfxPrint_Printf(printer, "Audio ScrPrt"); - ind = sAudioScreenPrintInd; // fp - for (k = 0; k < D_80131EE4[1] + 1; k++) { // s2 (s32 loop) + ind = sAudioScrPrtInd; + for (k = 0; k < sAudioScrPrtWork[1] + 1; k++) { if (ind == 0) { - if (sAudioScreenPrintOverflow == 1) { - ind = 25 - 1; + if (sAudioScrPrtOverflow == 1) { + ind = SCROLL_PRINT_BUF_SIZE - 1; } else { - k = D_80131EE4[1] + 1; // "break;" + k = sAudioScrPrtWork[1] + 1; // "break;" } } else { ind--; } - if (k != D_80131EE4[1] + 1) { + if (k != sAudioScrPrtWork[1] + 1) { if ((ind % 5) != 0) { - SETCOL2(0xB4, 0xB4, 0xB4); + SETCOL_SCROLLPRINT(180, 180, 180); } else { - SETCOL2(0x78, 0x78, 0x78); + SETCOL_SCROLLPRINT(120, 120, 120); } - GfxPrint_SetPos(printer, D_80131EDC + 2, D_80131EE0 + D_80131EE4[1] + 1 - k); - GfxPrint_Printf(printer, "%s", sAudioScreenPrintBuf[ind].str); + GfxPrint_SetPos(printer, 2 + sAudioScrPrtX, sAudioScrPrtY + sAudioScrPrtWork[1] + 1 - k); + GfxPrint_Printf(printer, "%s", sAudioScrPrtBuf[ind].str); - GfxPrint_SetPos(printer, D_80131EDC + 7, D_80131EE0 + D_80131EE4[1] + 1 - k); - GfxPrint_Printf(printer, "%04X", sAudioScreenPrintBuf[ind].num); + GfxPrint_SetPos(printer, 7 + sAudioScrPrtX, sAudioScrPrtY + sAudioScrPrtWork[1] + 1 - k); + GfxPrint_Printf(printer, "%04X", sAudioScrPrtBuf[ind].num); } } } - switch (D_80131CA0) { - case 0: + switch (sAudioDebugPage) { + case PAGE_NON: GfxPrint_SetPos(printer, 3, 4); - SETCOL(255, 6, 6); - GfxPrint_Printf(printer, "BGM CANCEL:%s", D_80131F54[D_80131E08[5]]); + SETCOL(255, 64, 64); + GfxPrint_Printf(printer, "BGM CANCEL:%s", sBoolStrs[sAudioSndContWork[5]]); GfxPrint_SetPos(printer, 3, 5); - GfxPrint_Printf(printer, "SE MUTE:%s", D_80131F54[D_80131C9C]); + GfxPrint_Printf(printer, "SE MUTE:%s", sBoolStrs[sAudioSEMuted]); GfxPrint_SetPos(printer, 18, 4); SETCOL(255, 255, 255); GfxPrint_Printf(printer, "PUSH CONT-4 A-BTN"); - bank = (u8)D_80131E08[2]; - i = gSoundBanks[bank][0].next; // s6, s3 + ind = (s8)sAudioSndContWork[2]; + i = gSoundBanks[ind][0].next; + j = 0; SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 6); - GfxPrint_Printf(printer, "SE HANDLE:%s", D_80131E38[bank]); + GfxPrint_Printf(printer, "SE HANDLE:%s", sSoundBankNames[ind]); while (i != 0xFF) { - GfxPrint_SetPos(printer, 3, j + 7); - GfxPrint_Printf(printer, "%02x %04x %02x %08x", i, gSoundBanks[bank][i].unk_28, - gSoundBanks[bank][i].unk_2A, gSoundBanks[bank][i].unk_20); - i = gSoundBanks[bank][i].next; - j++; + GfxPrint_SetPos(printer, 3, 7 + j++); + GfxPrint_Printf(printer, "%02x %04x %02x %08x", i, gSoundBanks[ind][i].unk_28, + gSoundBanks[ind][i].unk_2A, gSoundBanks[ind][i].unk_20); + i = gSoundBanks[ind][i].next; } break; - case 1: - GfxPrint_SetPos(printer, 2, D_80131CA4 + 4); + case PAGE_SOUND_CONTROL: + GfxPrint_SetPos(printer, 2, 4 + sAudioSndContSel); SETCOL(127, 255, 127); GfxPrint_Printf(printer, "*"); SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 4); - GfxPrint_Printf(printer, "Seq 0 : %2x", D_80131E08[0]); + GfxPrint_Printf(printer, "Seq 0 : %2x", sAudioSndContWork[0]); GfxPrint_SetPos(printer, 3, 5); - GfxPrint_Printf(printer, "Seq 1 : %2x", D_80131E08[1]); + GfxPrint_Printf(printer, "Seq 1 : %2x", sAudioSndContWork[1]); GfxPrint_SetPos(printer, 3, 6); - GfxPrint_Printf(printer, "SE HD : %2x %s", D_80131E08[2], D_80131E38[D_80131E08[2]]); + GfxPrint_Printf(printer, "SE HD : %2x %s", sAudioSndContWork[2], sSoundBankNames[sAudioSndContWork[2]]); GfxPrint_SetPos(printer, 3, 7); - GfxPrint_Printf(printer, "SE No. :%3x", D_80131E08[3]); + GfxPrint_Printf(printer, "SE No. :%3x", sAudioSndContWork[3]); GfxPrint_SetPos(printer, 3, 8); - GfxPrint_Printf(printer, "S-Out : %2x %s", D_80131E08[4], D_80131E88[D_80131E08[4]]); + GfxPrint_Printf(printer, "S-Out : %2x %s", sAudioSndContWork[4], sSoundModeNames[sAudioSndContWork[4]]); GfxPrint_SetPos(printer, 3, 9); - GfxPrint_Printf(printer, "BGM Ent: %2x", D_80131E08[5]); + GfxPrint_Printf(printer, "BGM Ent: %2x", sAudioSndContWork[5]); GfxPrint_SetPos(printer, 3, 10); - GfxPrint_Printf(printer, "Spec : %2x", D_80131E08[6]); + GfxPrint_Printf(printer, "Spec : %2x", sAudioSndContWork[6]); GfxPrint_SetPos(printer, 3, 11); - GfxPrint_Printf(printer, "Na Snd : %2x", D_80131E08[7]); + GfxPrint_Printf(printer, "Na Snd : %2x", sAudioSndContWork[7]); GfxPrint_SetPos(printer, 3, 12); - GfxPrint_Printf(printer, "Cam Wt : %s", D_80131F54[D_80131E08[8]]); + GfxPrint_Printf(printer, "Cam Wt : %s", sBoolStrs[sAudioSndContWork[8]]); GfxPrint_SetPos(printer, 3, 13); - GfxPrint_Printf(printer, "Lnk Wt : %s", D_80131F54[D_80131E08[9]]); + GfxPrint_Printf(printer, "Lnk Wt : %s", sBoolStrs[sAudioSndContWork[9]]); GfxPrint_SetPos(printer, 3, 14); - GfxPrint_Printf(printer, "SE Ent : %2x", D_80131E08[10]); + GfxPrint_Printf(printer, "SE Ent : %2x", sAudioSndContWork[10]); break; - case 7: - ind = 0; // fp - for (k = 0; k < 7; k++) { // s2 (s32 loop) - if (k == D_80131EC4) { + case PAGE_INTERFACE_INFO: + ind = 0; + for (k = 0; k < 7; k++) { + if (k == sAudioIntInfoSel) { SETCOL(255, 127, 127); } else { SETCOL(255, 255, 255); } - GfxPrint_SetPos(printer, D_80131EBC + 2, D_80131EC0 + ind + 4); - GfxPrint_Printf(printer, "%s <%d>", D_80131E38[k], D_80131EC8[k]); - - for (s0 = 0; s0 < D_80130578[D_801333CC][k]; s0++) { - GfxPrint_SetPos(printer, D_80131EBC + 2, D_80131EC0 + ind + 5); - if (D_80131EC8[k] == 1) { - idx = D_8016E1B8[k][s0].unk_4; - if ((idx != 0xFF) && ((gSoundBanks[k][idx].unk_2A == 4) || (gSoundBanks[k][idx].unk_2A == 5))) { - SoundBankEntry* entry = &gSoundBanks[k][idx]; - GfxPrint_Printf(printer, "%2X %5d %5d %5d %02X %04X %04X", idx, (s32)*entry->posX, + GfxPrint_SetPos(printer, 2 + sAudioIntInfoX, 4 + ind + sAudioIntInfoY); + GfxPrint_Printf(printer, "%s <%d>", sSoundBankNames[k], sAudioIntInfoBankPage[k]); + + for (k2 = 0; k2 < D_80130578[D_801333CC][k]; k2++) { +#define entryIndex (D_8016E1B8[k][k2].unk_4) +#define entry (&gSoundBanks[k][entryIndex]) +#define chan (gAudioContext.seqPlayers[2].channels[entry->unk_2E]) + GfxPrint_SetPos(printer, 2 + sAudioIntInfoX, 5 + ind + sAudioIntInfoY); + if (sAudioIntInfoBankPage[k] == 1) { + if ((entryIndex != 0xFF) && ((entry->unk_2A == 4) || (entry->unk_2A == 5))) { + GfxPrint_Printf(printer, "%2X %5d %5d %5d %02X %04X %04X", entryIndex, (s32)*entry->posX, (s32)*entry->posY, (s32)*entry->posZ, entry->unk_24, entry->unk_26, entry->unk_28); } else { - GfxPrint_Printf(printer, "FF ----- ----- ----- -- ---- ----", idx); + GfxPrint_Printf(printer, "FF ----- ----- ----- -- ---- ----"); } - } else if (D_80131EC8[k] == 2) { - idx = D_8016E1B8[k][s0].unk_4; - if ((idx != 0xFF) && ((gSoundBanks[k][idx].unk_2A == 4) || (gSoundBanks[k][idx].unk_2A == 5))) { - SoundBankEntry* entry = &gSoundBanks[k][idx]; - SequenceChannel* chan = gAudioContext.seqPlayers[2].channels[entry->unk_2E]; - GfxPrint_Printf(printer, "%2X %5d %5d %5d %3d %3d %04X", idx, (s32)*entry->posX, + } else if (sAudioIntInfoBankPage[k] == 2) { + if ((entryIndex != 0xFF) && ((entry->unk_2A == 4) || (entry->unk_2A == 5))) { + GfxPrint_Printf(printer, "%2X %5d %5d %5d %3d %3d %04X", entryIndex, (s32)*entry->posX, (s32)*entry->posY, (s32)*entry->posZ, (s32)(chan->volume * 127.1f), chan->newPan, entry->unk_28); } else { - GfxPrint_Printf(printer, "FF ----- ----- ----- --- --- ----", idx); + GfxPrint_Printf(printer, "FF ----- ----- ----- --- --- ----"); } - } else if (D_80131EC8[k] == 3) { - idx = D_8016E1B8[k][s0].unk_4; - if ((idx != 0xFF) && ((gSoundBanks[k][idx].unk_2A == 4) || (gSoundBanks[k][idx].unk_2A == 5))) { - SoundBankEntry* entry = &gSoundBanks[k][idx]; - SequenceChannel* chan = gAudioContext.seqPlayers[2].channels[entry->unk_2E]; - GfxPrint_Printf(printer, "%2X %5d %5d %5d %3d %3d %04X", idx, (s32)*entry->posX, + } else if (sAudioIntInfoBankPage[k] == 3) { + if ((entryIndex != 0xFF) && ((entry->unk_2A == 4) || (entry->unk_2A == 5))) { + GfxPrint_Printf(printer, "%2X %5d %5d %5d %3d %3d %04X", entryIndex, (s32)*entry->posX, (s32)*entry->posY, (s32)*entry->posZ, (s32)(chan->freqScale * 100.0f), chan->reverb, entry->unk_28); } else { - GfxPrint_Printf(printer, "FF ----- ----- ----- --- --- ----", idx); + GfxPrint_Printf(printer, "FF ----- ----- ----- --- --- ----"); } - } else if (D_80131EC8[k] == 4) { - idx = D_8016E1B8[k][s0].unk_4; - if ((idx != 0xFF) && ((gSoundBanks[k][idx].unk_2A == 4) || (gSoundBanks[k][idx].unk_2A == 5))) { - SoundBankEntry* entry = &gSoundBanks[k][idx]; - GfxPrint_Printf(printer, "%2X %04X", idx, entry->unk_28); + } else if (sAudioIntInfoBankPage[k] == 4) { + if ((entryIndex != 0xFF) && ((entry->unk_2A == 4) || (entry->unk_2A == 5))) { + GfxPrint_Printf(printer, "%2X %04X", entryIndex, entry->unk_28); } else { - GfxPrint_Printf(printer, "FF ----", idx); + GfxPrint_Printf(printer, "FF ----"); } } +#undef entryIndex +#undef entry +#undef chan - if (D_80131EC8[k] != 0) { + if (sAudioIntInfoBankPage[k] != 0) { ind++; } } @@ -1392,95 +1380,96 @@ void func_800EEA50(GfxPrint* printer) { } break; - case 13: - GfxPrint_SetPos(printer, 2, D_80131ED0 + 4); + case PAGE_SCROLL_PRINT: + GfxPrint_SetPos(printer, 2, 4 + sAudioScrPrtSel); SETCOL(255, 255, 255); GfxPrint_Printf(printer, "*"); SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 4); - GfxPrint_Printf(printer, "Swicth : %d", D_80131EE4[0]); + GfxPrint_Printf(printer, "Swicth : %d", sAudioScrPrtWork[0]); GfxPrint_SetPos(printer, 3, 5); - GfxPrint_Printf(printer, "Lines : %d", D_80131EE4[1] + 1); + GfxPrint_Printf(printer, "Lines : %d", sAudioScrPrtWork[1] + 1); GfxPrint_SetPos(printer, 3, 6); - GfxPrint_Printf(printer, "Color : %d", D_80131EE4[2]); + GfxPrint_Printf(printer, "Color : %d", sAudioScrPrtWork[2]); GfxPrint_SetPos(printer, 3, 7); - GfxPrint_Printf(printer, "%s : %d", D_80131E38[0], D_80131EE4[3]); + GfxPrint_Printf(printer, "%s : %d", sSoundBankNames[0], sAudioScrPrtWork[3]); GfxPrint_SetPos(printer, 3, 8); - GfxPrint_Printf(printer, "%s : %d", D_80131E38[1], D_80131EE4[4]); + GfxPrint_Printf(printer, "%s : %d", sSoundBankNames[1], sAudioScrPrtWork[4]); GfxPrint_SetPos(printer, 3, 9); - GfxPrint_Printf(printer, "ENVRONM : %d", D_80131EE4[5]); + GfxPrint_Printf(printer, "ENVRONM : %d", sAudioScrPrtWork[5]); GfxPrint_SetPos(printer, 3, 10); - GfxPrint_Printf(printer, "%s : %d", D_80131E38[3], D_80131EE4[6]); + GfxPrint_Printf(printer, "%s : %d", sSoundBankNames[3], sAudioScrPrtWork[6]); GfxPrint_SetPos(printer, 3, 11); - GfxPrint_Printf(printer, "%s : %d", D_80131E38[4], D_80131EE4[7]); + GfxPrint_Printf(printer, "%s : %d", sSoundBankNames[4], sAudioScrPrtWork[7]); GfxPrint_SetPos(printer, 3, 12); - GfxPrint_Printf(printer, "%s : %d", D_80131E38[5], D_80131EE4[8]); + GfxPrint_Printf(printer, "%s : %d", sSoundBankNames[5], sAudioScrPrtWork[8]); GfxPrint_SetPos(printer, 3, 13); - GfxPrint_Printf(printer, "%s : %d", D_80131E38[6], D_80131EE4[9]); + GfxPrint_Printf(printer, "%s : %d", sSoundBankNames[6], sAudioScrPrtWork[9]); GfxPrint_SetPos(printer, 3, 14); - GfxPrint_Printf(printer, "SEQ ENT : %d", D_80131EE4[10]); + GfxPrint_Printf(printer, "SEQ ENT : %d", sAudioScrPrtWork[10]); break; - case 8: + case PAGE_SE_FLAG_SWAP: GfxPrint_SetPos(printer, 3, 4); SETCOL(255, 255, 255); - if (D_801333F4 != 0) { + if (gAudioSEFlagSwapOff) { GfxPrint_Printf(printer, "SWAP OFF"); } - if (D_80131F00 == 0) { + if (sAudioSEFlagSwapIsEditing == 0) { SETCOL(255, 255, 255); } else { SETCOL(127, 127, 127); } - GfxPrint_SetPos(printer, 2, D_80131F04 + 6); + GfxPrint_SetPos(printer, 2, 6 + sAudioSEFlagSwapSel); GfxPrint_Printf(printer, "*"); - phi_s2_3 = D_80131F08; - if (D_80131F08 >= 4) { - phi_s2_3++; + ctr = sAudioSEFlagSwapNibbleSel; + if (sAudioSEFlagSwapNibbleSel >= 4) { + ctr++; } - if (D_80131F00 == 1) { + if (sAudioSEFlagSwapIsEditing == 1) { SETCOL(255, 255, 255); - GfxPrint_SetPos(printer, phi_s2_3 + 3, 5); + GfxPrint_SetPos(printer, 3 + ctr, 5); GfxPrint_Printf(printer, "V"); } - for (i = 0; i < 10; i++) { // s3, s6 - if (i == D_80131F04) { - if (D_80131F00 == 0) { + for (i = 0; i < 10; i++) { + if (i == sAudioSEFlagSwapSel) { + if (sAudioSEFlagSwapIsEditing == 0) { SETCOL(192, 192, 192); } else { SETCOL(255, 255, 255); } - } else if (D_80131F00 == 0) { + } else if (sAudioSEFlagSwapIsEditing == 0) { SETCOL(144, 144, 144); } else { SETCOL(96, 96, 96); } - GfxPrint_SetPos(printer, 3, i + 6); - GfxPrint_Printf(printer, "%04x %04x %s", D_8016E2E0[i], D_8016E2F8[i], D_80131F0C[D_8016E310[i]]); + GfxPrint_SetPos(printer, 3, 6 + i); + GfxPrint_Printf(printer, "%04x %04x %s", gAudioSEFlagSwapSource[i], gAudioSEFlagSwapTarget[i], + sAudioSEFlagSwapModeNames[gAudioSEFlagSwapMode[i]]); } break; - case 5: + case PAGE_SUB_TRACK_INFO: GfxPrint_SetPos(printer, 3, 4); SETCOL(255, 255, 255); - GfxPrint_Printf(printer, "Group Track:%d", D_80131F28); + GfxPrint_Printf(printer, "Group Track:%d", sAudioSubTrackInfoPlayerSel); GfxPrint_SetPos(printer, 3, 5); - GfxPrint_Printf(printer, "Sub Track :%d", D_80131F2C); + GfxPrint_Printf(printer, "Sub Track :%d", sAudioSubTrackInfoChannelSel); GfxPrint_SetPos(printer, 3, 6); GfxPrint_Printf(printer, "TRK NO. "); @@ -1494,48 +1483,48 @@ void func_800EEA50(GfxPrint* printer) { GfxPrint_SetPos(printer, 3, 9); GfxPrint_Printf(printer, "OPENNOTE"); - totalNumLayers = 0; // s4 - for (i = 0; i < 16; i++) { // s3, s6 - u8 numLayers = 0; // s2 - if (i == D_80131F2C) { + ctr2 = 0; + for (i = 0; i < 16; i++) { + if (i == sAudioSubTrackInfoChannelSel) { SETCOL(255, 255, 255); } else { SETCOL(200, 200, 200); } - GfxPrint_SetPos(printer, i + 15, 6); + GfxPrint_SetPos(printer, 15 + i, 6); GfxPrint_Printf(printer, "%1X", i); - GfxPrint_SetPos(printer, i + 15, 7); - if (gAudioContext.seqPlayers[D_80131F28].channels[i]->enabled) { + GfxPrint_SetPos(printer, 15 + i, 7); + if (gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel].channels[i]->enabled) { GfxPrint_Printf(printer, "O"); } else { GfxPrint_Printf(printer, "X"); } - GfxPrint_SetPos(printer, i + 15, 8); - if (gAudioContext.seqPlayers[D_80131F28].channels[i]->stopSomething2) { + GfxPrint_SetPos(printer, 15 + i, 8); + if (gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel].channels[i]->stopSomething2) { GfxPrint_Printf(printer, "O"); } else { GfxPrint_Printf(printer, "X"); } - GfxPrint_SetPos(printer, i + 15, 9); - for (j = 0; j < 4; j++) { // s0 - if (gAudioContext.seqPlayers[D_80131F28].channels[i]->layers[j] != NULL) { - numLayers++; + GfxPrint_SetPos(printer, 15 + i, 9); + ctr = 0; + for (j = 0; j < 4; j++) { + if (gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel].channels[i]->layers[j] != NULL) { + ctr++; } } - GfxPrint_Printf(printer, "%1X", numLayers); - totalNumLayers += numLayers; + GfxPrint_Printf(printer, "%1X", ctr); + ctr2 += ctr; } SETCOL(255, 255, 255); - if (D_80131F30[D_80131F28] < totalNumLayers) { - D_80131F30[D_80131F28] = totalNumLayers; + if (sSeqPlayerPeakNumLayers[sAudioSubTrackInfoPlayerSel] < ctr2) { + sSeqPlayerPeakNumLayers[sAudioSubTrackInfoPlayerSel] = ctr2; } - GfxPrint_SetPos(printer, i + 16, 9); - GfxPrint_Printf(printer, "%2d,%2d", totalNumLayers, D_80131F30[D_80131F28]); + GfxPrint_SetPos(printer, 16 + i, 9); + GfxPrint_Printf(printer, "%2d,%2d", ctr2, sSeqPlayerPeakNumLayers[sAudioSubTrackInfoPlayerSel]); GfxPrint_SetPos(printer, 3, 11); GfxPrint_Printf(printer, "VOL "); @@ -1573,70 +1562,98 @@ void func_800EEA50(GfxPrint* printer) { GfxPrint_SetPos(printer, 3, 22); GfxPrint_Printf(printer, "TUNE "); - for (i = 0; i < 8; i++) { // s3, s6 - GfxPrint_SetPos(printer, (i + 5) * 3, 22); + for (i = 0; i < 8; i++) { + GfxPrint_SetPos(printer, 15 + 3 * i, 22); GfxPrint_Printf(printer, "%02X ", - gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->soundScriptIO[i]); + (u8)gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->soundScriptIO[i]); } - if (gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->enabled) { + if (gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel].channels[sAudioSubTrackInfoChannelSel]->enabled) { GfxPrint_SetPos(printer, 15, 11); GfxPrint_Printf(printer, "%d", - (u32)(gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->volume * 127.1) & - 0xFF); + (u8)(gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->volume * + 127.1)); GfxPrint_SetPos(printer, 15, 12); GfxPrint_Printf(printer, "%d", - (u32)(gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->volumeScale * 127.1) & - 0xFF); + (u8)(gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->volumeScale * + 127.1)); GfxPrint_SetPos(printer, 15, 13); - GfxPrint_Printf(printer, "%X", gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->bankId); - - instOrWave = (u8)gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->instOrWave; - if (instOrWave == 0) { - inst = 0x7F; + GfxPrint_Printf(printer, "%X", + gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->bankId); + + ctr = (u8)(gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->instOrWave); + + if (ctr == 0) { + ctr2 = 0x7F; + } else if (ctr < 0x80) { + ctr2 = ctr - 1; } else { - inst = instOrWave; - if (instOrWave < 0x80) { - inst--; - } + ctr2 = ctr; } GfxPrint_SetPos(printer, 15, 14); - GfxPrint_Printf(printer, "%d", inst); + GfxPrint_Printf(printer, "%d", ctr2); GfxPrint_SetPos(printer, 15, 15); - GfxPrint_Printf(printer, "%d", gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->newPan); + GfxPrint_Printf(printer, "%d", + gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->newPan); GfxPrint_SetPos(printer, 15, 16); GfxPrint_Printf(printer, "%d", - gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->panChannelWeight); + gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->panChannelWeight); GfxPrint_SetPos(printer, 15, 17); - GfxPrint_Printf(printer, "%d", gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->reverb); + GfxPrint_Printf(printer, "%d", + gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->reverb); GfxPrint_SetPos(printer, 15, 18); - GfxPrint_Printf(printer, "%d", gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->notePriority); + GfxPrint_Printf(printer, "%d", + gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->notePriority); GfxPrint_SetPos(printer, 15, 19); GfxPrint_Printf(printer, "%d", - (gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->vibratoRateTarget / 32) & - 0xFF); + (u8)(gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->vibratoRateTarget / + 32)); GfxPrint_SetPos(printer, 15, 20); GfxPrint_Printf(printer, "%d", - (gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->vibratoExtentTarget / 8) & - 0xFF); + (u8)(gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->vibratoExtentTarget / + 8)); GfxPrint_SetPos(printer, 15, 21); GfxPrint_Printf(printer, "%d", - (u32)(gAudioContext.seqPlayers[D_80131F28].channels[D_80131F2C]->freqScale * 100.0f) & - 0xFFFF); + (u16)(gAudioContext.seqPlayers[sAudioSubTrackInfoPlayerSel] + .channels[sAudioSubTrackInfoChannelSel] + ->freqScale * + 100)); } break; - case 3: + case PAGE_HEAP_INFO: SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 4); GfxPrint_Printf(printer, "TOTAL %d", D_8014A6C4.heap); @@ -1667,8 +1684,8 @@ void func_800EEA50(GfxPrint* printer) { gAudioContext.seqLoadedPool.persistent.pool.cur - gAudioContext.seqLoadedPool.persistent.pool.start, gAudioContext.seqLoadedPool.persistent.pool.size); - for (k = 0; k < gAudioContext.seqLoadedPool.persistent.numEntries; k++) { // s2 (s32 loop) - GfxPrint_SetPos(printer, (k + 1) * 3, 9); + for (k = 0; (u32)k < gAudioContext.seqLoadedPool.persistent.numEntries; k++) { + GfxPrint_SetPos(printer, 3 + 3 * k, 9); GfxPrint_Printf(printer, "%02x", gAudioContext.seqLoadedPool.persistent.entries[k].id); } @@ -1678,8 +1695,8 @@ void func_800EEA50(GfxPrint* printer) { gAudioContext.bankLoadedPool.persistent.pool.cur - gAudioContext.bankLoadedPool.persistent.pool.start, gAudioContext.bankLoadedPool.persistent.pool.size); - for (k = 0; k < gAudioContext.bankLoadedPool.persistent.numEntries; k++) { // s2 (s32 loop) - GfxPrint_SetPos(printer, (k + 1) * 3, 11); + for (k = 0; (u32)k < gAudioContext.bankLoadedPool.persistent.numEntries; k++) { + GfxPrint_SetPos(printer, 3 + 3 * k, 11); GfxPrint_Printf(printer, "%02x", gAudioContext.bankLoadedPool.persistent.entries[k].id); } @@ -1688,26 +1705,27 @@ void func_800EEA50(GfxPrint* printer) { gAudioContext.unk_2D50.size); break; - case 9: + case PAGE_BLOCK_CHANGE_BGM: SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 4); - GfxPrint_Printf(printer, "BGM No. %02X", D_80131F4C[0]); + GfxPrint_Printf(printer, "BGM No. %02X", sAudioBlkChgBgmWork[0]); GfxPrint_SetPos(printer, 3, 5); - GfxPrint_Printf(printer, "SCENE SET %02X %s", D_80131F4C[1], D_80131F44[D_80131F4C[1]]); + GfxPrint_Printf(printer, "SCENE SET %02X %s", sAudioBlkChgBgmWork[1], + sAudioSceneNames[sAudioBlkChgBgmWork[1]]); SETCOL(0x64, 255, 0x64); - GfxPrint_SetPos(printer, 2, D_80131F50 + 4); + GfxPrint_SetPos(printer, 2, 4 + sAudioBlkChgBgmSel); GfxPrint_Printf(printer, "*"); SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 7); GfxPrint_Printf(printer, "NEXT SCENE %02X %s", (u8)gAudioContext.seqPlayers[0].unk_158[2], - D_80131F44[(u8)gAudioContext.seqPlayers[0].unk_158[2]]); + sAudioSceneNames[(u8)gAudioContext.seqPlayers[0].unk_158[2]]); GfxPrint_SetPos(printer, 3, 8); GfxPrint_Printf(printer, "NOW SCENE %02X %s", (u8)gAudioContext.seqPlayers[0].unk_158[4], - D_80131F44[(u8)gAudioContext.seqPlayers[0].unk_158[4]]); + sAudioSceneNames[(u8)gAudioContext.seqPlayers[0].unk_158[4]]); GfxPrint_SetPos(printer, 3, 9); GfxPrint_Printf(printer, "NOW BLOCK %02X", (gAudioContext.seqPlayers[0].unk_158[5] + 1) & 0xFF); @@ -1726,7 +1744,7 @@ void func_800EEA50(GfxPrint* printer) { (u8)gAudioContext.seqPlayers[0].unk_158[7]); break; - case 11: + case PAGE_OCARINA_TEST: SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 4); GfxPrint_Printf(printer, "SEQ INFO : %2d %02x %d", sDisplayedStaff.noteIdx, sDisplayedStaff.state, @@ -1738,11 +1756,11 @@ void func_800EEA50(GfxPrint* printer) { GfxPrint_SetPos(printer, 3, 6); GfxPrint_Printf(printer, "8note REC POINTER : %08x", gScarecrowSpawnSongPtr); - songInd = 0; // s2 - for (j = 0; j < 4; j++) { // s0, a0 - for (i = 0; i < 8; i++) { // s3, s6 - GfxPrint_SetPos(printer, (i + 1) * 3, j + 7); - GfxPrint_Printf(printer, "%02x", gScarecrowSpawnSongPtr[songInd++]); + ctr = 0; + for (j = 0; j < 4; j++) { + for (i = 0; i < 8; i++) { + GfxPrint_SetPos(printer, 3 + 3 * i, 7 + j); + GfxPrint_Printf(printer, "%02x", gScarecrowSpawnSongPtr[ctr++]); } } @@ -1751,159 +1769,161 @@ void func_800EEA50(GfxPrint* printer) { D_80131858); break; - case 12: - GfxPrint_SetPos(printer, 2, D_80131F18 + 4); + case PAGE_SE_PARAMETER_CHANGE: + GfxPrint_SetPos(printer, 2, 4 + sAudioSEParamChgSel); SETCOL(127, 255, 127); GfxPrint_Printf(printer, "*"); SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 4); - GfxPrint_Printf(printer, "SE HD : %02x %s", D_80131F20[0], D_80131E38[D_80131F20[0]]); + GfxPrint_Printf(printer, "SE HD : %02x %s", sAudioSEParamChgWork[0], + sSoundBankNames[sAudioSEParamChgWork[0]]); GfxPrint_SetPos(printer, 3, 5); - GfxPrint_Printf(printer, "SE No. : %02x", D_80131F20[1]); + GfxPrint_Printf(printer, "SE No. : %02x", sAudioSEParamChgWork[1]); GfxPrint_SetPos(printer, 20, 6); - GfxPrint_Printf(printer, " : %04x", D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_2); + GfxPrint_Printf(printer, " : %04x", + D_8013331C[sAudioSEParamChgWork[0]][sAudioSEParamChgWork[1]].unk_2); GfxPrint_SetPos(printer, 3, 6); - GfxPrint_Printf(printer, "SE SW %s", func_800EE9D0(D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_2, 16)); + GfxPrint_Printf( + printer, "SE SW %s", + AudioDebug_ToStringBinary(D_8013331C[sAudioSEParamChgWork[0]][sAudioSEParamChgWork[1]].unk_2, 16)); SETCOL(127, 255, 127); - digitStr[0] = (char)('0' + ((D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_2 >> (15 - D_80131F1C)) & 1)); - GfxPrint_SetPos(printer, D_80131F1C + 12, 6); - GfxPrint_Printf(printer, "%s", &digitStr); + digitStr[0] = (char)('0' + ((D_8013331C[sAudioSEParamChgWork[0]][sAudioSEParamChgWork[1]].unk_2 >> + (15 - sAudioSEParamChgBitSel)) & + 1)); + GfxPrint_SetPos(printer, 12 + sAudioSEParamChgBitSel, 6); + GfxPrint_Printf(printer, "%s", digitStr); SETCOL(255, 255, 255); GfxPrint_SetPos(printer, 3, 7); - GfxPrint_Printf(printer, "SE PR : %02x", D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_0); + GfxPrint_Printf(printer, "SE PR : %02x", + D_8013331C[sAudioSEParamChgWork[0]][sAudioSEParamChgWork[1]].unk_0); break; - case 14: + case PAGE_FREE_AREA: GfxPrint_SetPos(printer, 3, 4); SETCOL(255, 255, 255); - GfxPrint_Printf(printer, "env_fx %d code_fx %d SPEC %d", D_80130614, D_80130618, D_80133414); + GfxPrint_Printf(printer, "env_fx %d code_fx %d SPEC %d", sAudioEnvReverb, sAudioCodeReverb, gAudioSpecId); - if (sAudioUpdateTaskEnd == sAudioUpdateTaskStart) { - D_80131C90 = (f32)((sAudioUpdateEndTime - sAudioUpdateStartTime) * 64ULL / 3) / 50000000.0f; - if (D_80131C94 < D_80131C90) { - D_80131C94 = D_80131C90; + if (sAudioUpdateTaskStart == sAudioUpdateTaskEnd) { + sAudioUpdateDuration = OS_CYCLES_TO_NSEC(sAudioUpdateEndTime - sAudioUpdateStartTime) / (1e9f / 20); + if (sAudioUpdateDurationMax < sAudioUpdateDuration) { + sAudioUpdateDurationMax = sAudioUpdateDuration; } } GfxPrint_SetPos(printer, 3, 6); - GfxPrint_Printf(printer, "SOUND GAME FRAME NOW %f", D_80131C90); + GfxPrint_Printf(printer, "SOUND GAME FRAME NOW %f", sAudioUpdateDuration); GfxPrint_SetPos(printer, 3, 7); - GfxPrint_Printf(printer, "SOUND GAME FRAME MAX %f", D_80131C94); + GfxPrint_Printf(printer, "SOUND GAME FRAME MAX %f", sAudioUpdateDurationMax); GfxPrint_SetPos(printer, 3, 9); GfxPrint_Printf(printer, "SWITCH BGM MODE %d %d %d (FLAG %d)", D_8013061C, D_80130634, D_80130638, D_80130654); GfxPrint_SetPos(printer, 3, 10); - GfxPrint_Printf(printer, "ENEMY DIST %f VOL %3d", D_80130620, D_80130624); + GfxPrint_Printf(printer, "ENEMY DIST %f VOL %3d", sAudioEnemyDist, sAudioEnemyVol); GfxPrint_SetPos(printer, 3, 11); - GfxPrint_Printf(printer, "GANON DIST VOL %3d", D_8016B8B4); + GfxPrint_Printf(printer, "GANON DIST VOL %3d", sAudioGanonDistVol); GfxPrint_SetPos(printer, 3, 12); - GfxPrint_Printf(printer, "DEMO FLAG %d", D_8013060C); + GfxPrint_Printf(printer, "DEMO FLAG %d", sAudioCutsceneFlag); GfxPrint_SetPos(printer, 3, 12); - if (D_8016BAA8 == 1) { - GfxPrint_Printf(printer, "MARON BGM DIST %f", D_8016BAAC); - D_8016BAA8 = 0; + if (sAudioHasMalonBgm == true) { + GfxPrint_Printf(printer, "MARON BGM DIST %f", sAudioMalonBgmDist); + sAudioHasMalonBgm = false; } GfxPrint_SetPos(printer, 3, 23); - if (D_80131F64 != 0) { - GfxPrint_Printf(printer, "NATURE FAILED %01x", D_80131F64); + if (sAudioNatureFailed != 0) { + GfxPrint_Printf(printer, "NATURE FAILED %01x", sAudioNatureFailed); } GfxPrint_SetPos(printer, 3, 24); - if (D_8013064C != 0) { - GfxPrint_Printf(printer, "SARIA BGM PTR %08x", D_8013064C); + if (sSariaBgmPtr != 0) { + GfxPrint_Printf(printer, "SARIA BGM PTR %08x", sSariaBgmPtr); } GfxPrint_SetPos(printer, 3, 25); - GfxPrint_Printf(printer, "POLI %d(%d)", D_80131F68, numEnabledNotes); + GfxPrint_Printf(printer, "POLI %d(%d)", sPeakNumNotes, numEnabledNotes); - for (i = 0; i < 11; i++) { // s3, s6 - GfxPrint_SetPos(printer, (i + 1) * 3, 26); - GfxPrint_Printf(printer, "%d", D_8016B9E0[i]); + for (i = 0; i < 11; i++) { + GfxPrint_SetPos(printer, 3 + 3 * i, 26); + GfxPrint_Printf(printer, "%d", sAudioSpecPeakNumNotes[i]); } break; } #undef SETCOL_COMMON #undef SETCOL -#undef SETCOL2 +#undef SETCOL_SCROLLPRINT } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800EEA50.s") -#endif -void func_800F1BDC(void) { - u16 phi_t1 = 1; +void AudioDebug_ProcessInput_SndCont(void) { + u16 step = 1; - if (D_8016BAB0 & 4) { - if (D_80131E20[D_80131CA4] >= 0x10) { - phi_t1 = 0x10; + if (CHECK_BTN_ANY(sDebugPadHold, BTN_CDOWN)) { + if (sAudioSndContWorkLims[sAudioSndContSel] >= 16) { + step = 16; } - } else if (D_8016BAB0 & 2) { - if (D_80131E20[D_80131CA4] >= 0x10) { - phi_t1 = 8; - } - } else { - if (D_8016BAB0 & 8) { - D_80131E08[D_80131CA4] = 0; + } else if (CHECK_BTN_ANY(sDebugPadHold, BTN_CLEFT)) { + if (sAudioSndContWorkLims[sAudioSndContSel] >= 16) { + step = 8; } + } else if (CHECK_BTN_ANY(sDebugPadHold, BTN_CUP)) { + sAudioSndContWork[sAudioSndContSel] = 0; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { - if (D_80131CA4 > 0) { - D_80131CA4--; + if (sAudioSndContSel > 0) { + sAudioSndContSel--; } else { - D_80131CA4 = 10; + sAudioSndContSel = 10; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { - if (D_80131CA4 < 10) { - D_80131CA4++; + if (sAudioSndContSel < 10) { + sAudioSndContSel++; } else { - D_80131CA4 = 0; + sAudioSndContSel = 0; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { - if (D_80131E08[D_80131CA4] >= phi_t1) { + if (sAudioSndContWork[sAudioSndContSel] >= step) { if (1) { - D_80131E08[D_80131CA4] -= phi_t1; + sAudioSndContWork[sAudioSndContSel] -= step; } } else { - D_80131E08[D_80131CA4] += D_80131E20[D_80131CA4] - phi_t1; + sAudioSndContWork[sAudioSndContSel] += sAudioSndContWorkLims[sAudioSndContSel] - step; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { - if (D_80131E08[D_80131CA4] + phi_t1 < D_80131E20[D_80131CA4]) { - D_80131E08[D_80131CA4] += phi_t1; + if (sAudioSndContWork[sAudioSndContSel] + step < sAudioSndContWorkLims[sAudioSndContSel]) { + sAudioSndContWork[sAudioSndContSel] += step; } else { - D_80131E08[D_80131CA4] += phi_t1 - D_80131E20[D_80131CA4]; + sAudioSndContWork[sAudioSndContSel] += step - sAudioSndContWorkLims[sAudioSndContSel]; } } - if (D_80131CA4 == 8) { - if (D_80131E08[D_80131CA4] != 0) { + if (sAudioSndContSel == 8) { + if (sAudioSndContWork[sAudioSndContSel] != 0) { func_800F6828(0x20); } else { func_800F6828(0); } } - if (D_80131CA4 == 9) { - if (D_80131E08[D_80131CA4] != 0) { + if (sAudioSndContSel == 9) { + if (sAudioSndContWork[sAudioSndContSel] != 0) { func_800F67A0(0x20); } else { func_800F67A0(0); @@ -1911,341 +1931,350 @@ void func_800F1BDC(void) { } if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { - switch (D_80131CA4) { + switch (sAudioSndContSel) { case 0: case 1: - Audio_StartSeq(D_80131CA4, 0, D_80131E08[D_80131CA4]); + Audio_StartSeq(sAudioSndContSel, 0, sAudioSndContWork[sAudioSndContSel]); break; case 2: case 3: - Audio_PlaySoundGeneral(((D_80131E08[2] << 0xC) & 0xFFFF) + D_80131E08[3] + SFX_FLAG, &D_801333D4, 4, - &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(((sAudioSndContWork[2] << 0xC) & 0xFFFF) + sAudioSndContWork[3] + SFX_FLAG, + &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); break; case 4: - func_800F6700(D_80131E08[D_80131CA4]); + func_800F6700(sAudioSndContWork[sAudioSndContSel]); break; case 5: - Audio_SeqCmdE01(0, D_80131E08[D_80131CA4]); + Audio_SeqCmdE01(0, sAudioSndContWork[sAudioSndContSel]); break; case 6: - Audio_SeqCmdF(0, D_80131E08[D_80131CA4]); - D_80131EFC = D_80131E08[6]; - if (gAudioSessionPresets[D_80131EFC].numSequencePlayers - 1 < D_80131F28) { - D_80131F28 = gAudioSessionPresets[D_80131EFC].numSequencePlayers - 1; + Audio_SeqCmdF(0, sAudioSndContWork[sAudioSndContSel]); + sAudioSubTrackInfoSpec = sAudioSndContWork[6]; + if (sAudioSubTrackInfoPlayerSel > gAudioSpecs[sAudioSubTrackInfoSpec].numSequencePlayers - 1) { + sAudioSubTrackInfoPlayerSel = gAudioSpecs[sAudioSubTrackInfoSpec].numSequencePlayers - 1; } break; case 7: - func_800F6FB4(D_80131E08[D_80131CA4]); + func_800F6FB4(sAudioSndContWork[sAudioSndContSel]); break; case 8: case 9: break; case 10: - func_800F7260(D_80131E08[D_80131CA4] * 127); + Audio_SetSoundBanksMute(sAudioSndContWork[sAudioSndContSel] * 0x7F); break; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { - switch (D_80131CA4) { + switch (sAudioSndContSel) { case 0: case 1: - Audio_SeqCmd1(D_80131CA4, 0); + Audio_SeqCmd1(sAudioSndContSel, 0); break; case 7: Audio_SeqCmd1(0, 0); break; case 2: case 3: - func_800F87A0(D_80131E08[2]); + func_800F87A0(sAudioSndContWork[2]); break; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { - if (D_80131CA4 == 0) { + if (sAudioSndContSel == 0) { if (1) {} - func_800F595C(D_80131E08[D_80131CA4]); + func_800F595C(sAudioSndContWork[sAudioSndContSel]); } } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { - if (D_80131CA4 == 0) { + if (sAudioSndContSel == 0) { if (1) {} - func_800F5ACC(D_80131E08[D_80131CA4]); + func_800F5ACC(sAudioSndContWork[sAudioSndContSel]); } } } -void func_800F2150(void) { +void AudioDebug_ProcessInput_IntInfo(void) { if (CHECK_BTN_ANY(sDebugPadPress, BTN_CUP)) { - D_80131EC0--; + sAudioIntInfoY--; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { - D_80131EC0++; + sAudioIntInfoY++; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CLEFT)) { - D_80131EBC--; + sAudioIntInfoX--; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { - D_80131EBC++; + sAudioIntInfoX++; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { - D_80131EBC = 0; - D_80131EC0 = 0; + sAudioIntInfoX = 0; + sAudioIntInfoY = 0; } - if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP) && D_80131EC4 > 0) { - D_80131EC4--; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP) && sAudioIntInfoSel > 0) { + sAudioIntInfoSel--; } - if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN) && D_80131EC4 < 6) { - D_80131EC4++; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN) && sAudioIntInfoSel < 6) { + sAudioIntInfoSel++; } - if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT) && D_80131EC8[D_80131EC4] > 0) { - D_80131EC8[D_80131EC4]--; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT) && sAudioIntInfoBankPage[sAudioIntInfoSel] > 0) { + sAudioIntInfoBankPage[sAudioIntInfoSel]--; } - if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT) && D_80131EC8[D_80131EC4] < 4) { - D_80131EC8[D_80131EC4]++; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT) && sAudioIntInfoBankPage[sAudioIntInfoSel] < 4) { + sAudioIntInfoBankPage[sAudioIntInfoSel]++; } } -void func_800F227C(void) { - - if (D_80131EE4[0] != 0) { +void AudioDebug_ProcessInput_ScrPrt(void) { + if (sAudioScrPrtWork[0] != 0) { if (CHECK_BTN_ANY(sDebugPadPress, BTN_CUP)) { - D_80131EE0--; + sAudioScrPrtY--; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { - D_80131EE0++; + sAudioScrPrtY++; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CLEFT)) { - D_80131EDC--; + sAudioScrPrtX--; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { - D_80131EDC++; + sAudioScrPrtX++; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { - D_80131EDC = 0x1A; - D_80131EE0 = 1; - D_80131EE4[2] = 6; + sAudioScrPrtX = 26; + sAudioScrPrtY = 1; + sAudioScrPrtWork[2] = 6; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { - sAudioScreenPrintInd = 0; - sAudioScreenPrintOverflow = 0; + sAudioScrPrtInd = 0; + sAudioScrPrtOverflow = 0; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { - if (D_80131ED0 > 0) { - D_80131ED0--; + if (sAudioScrPrtSel > 0) { + sAudioScrPrtSel--; } else { - D_80131ED0 = 10; + sAudioScrPrtSel = 10; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { - if (D_80131ED0 < 10) { - D_80131ED0++; + if (sAudioScrPrtSel < 10) { + sAudioScrPrtSel++; } else { - D_80131ED0 = 0; + sAudioScrPrtSel = 0; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { - if (D_80131EE4[D_80131ED0] > 0) { - D_80131EE4[D_80131ED0]--; + if (sAudioScrPrtWork[sAudioScrPrtSel] > 0) { + sAudioScrPrtWork[sAudioScrPrtSel]--; } else { - D_80131EE4[D_80131ED0] = D_80131EF0[D_80131ED0] - 1; + sAudioScrPrtWork[sAudioScrPrtSel] = sAudioScrPrtWorkLims[sAudioScrPrtSel] - 1; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { - if (D_80131EE4[D_80131ED0] < D_80131EF0[D_80131ED0] - 1) { - D_80131EE4[D_80131ED0]++; + if (sAudioScrPrtWork[sAudioScrPrtSel] < sAudioScrPrtWorkLims[sAudioScrPrtSel] - 1) { + sAudioScrPrtWork[sAudioScrPrtSel]++; } else { - D_80131EE4[D_80131ED0] = 0; + sAudioScrPrtWork[sAudioScrPrtSel] = 0; } } - D_801333F0 = D_80131EE4[3] + (D_80131EE4[4] * 2) + (D_80131EE4[5] * 4) + (D_80131EE4[6] * 8) + - (D_80131EE4[7] * 0x10) + (D_80131EE4[8] * 0x20); + D_801333F0 = sAudioScrPrtWork[3] + (sAudioScrPrtWork[4] * 2) + (sAudioScrPrtWork[5] * 4) + + (sAudioScrPrtWork[6] * 8) + (sAudioScrPrtWork[7] * 0x10) + (sAudioScrPrtWork[8] * 0x20); } #ifdef NON_MATCHING -// regalloc near phi_v1 -void func_800F2464(void) { - s16 delta; +// regalloc near 'prev' +void AudioDebug_ProcessInput_SEFlagSwap(void) { + s16 step; u16 val; - u8 phi_v1; + u8 prev; // v1 - if (D_80131F00 == 0) { - if ((sDebugPadPress & 0x800) != 0) { - if (D_80131F04 > 0) { - D_80131F04--; + if (!sAudioSEFlagSwapIsEditing) { + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { + if (sAudioSEFlagSwapSel > 0) { + sAudioSEFlagSwapSel--; } else { - D_80131F04 = 9; + sAudioSEFlagSwapSel = 9; } } - if ((sDebugPadPress & 0x400) != 0) { - if (D_80131F04 < 9) { - D_80131F04++; + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { + if (sAudioSEFlagSwapSel < 9) { + sAudioSEFlagSwapSel++; } else { - D_80131F04 = 0; + sAudioSEFlagSwapSel = 0; } } - phi_v1 = 9; - if ((sDebugPadPress & 0x8000) != 0) { - D_80131F00 = 1; + prev = 9; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { + sAudioSEFlagSwapIsEditing = true; } - if ((sDebugPadPress & 0x4000) != 0) { - D_8016E2E0[D_80131F04] = 0; - D_8016E2F8[D_80131F04] = 0; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + gAudioSEFlagSwapSource[sAudioSEFlagSwapSel] = 0; + gAudioSEFlagSwapTarget[sAudioSEFlagSwapSel] = 0; } - if ((sDebugPadPress & 0x1000) != 0) { - phi_v1 = D_80131F04; - if (phi_v1 != 0) { - phi_v1--; + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_START)) { + prev = sAudioSEFlagSwapSel; + if (prev != 0) { + prev--; } else { - phi_v1 = 9; + prev = 9; } - D_8016E2E0[D_80131F04] = D_8016E2E0[phi_v1]; - if (D_80131F08) {} - D_8016E2F8[D_80131F04] = D_8016E2F8[phi_v1]; + gAudioSEFlagSwapSource[sAudioSEFlagSwapSel] = gAudioSEFlagSwapSource[prev]; + if (sAudioSEFlagSwapNibbleSel) {} + gAudioSEFlagSwapTarget[sAudioSEFlagSwapSel] = gAudioSEFlagSwapTarget[prev]; } } else { - if ((sDebugPadPress & 0x200) != 0) { - if (D_80131F08 > 0) { - D_80131F08--; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { + if (sAudioSEFlagSwapNibbleSel > 0) { + sAudioSEFlagSwapNibbleSel--; } else { - D_80131F08 = 7; + sAudioSEFlagSwapNibbleSel = 7; } } - if ((sDebugPadPress & 0x100) != 0) { - if (D_80131F08 < 7) { - D_80131F08++; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { + if (sAudioSEFlagSwapNibbleSel < 7) { + sAudioSEFlagSwapNibbleSel++; } else { - D_80131F08 = 0; + sAudioSEFlagSwapNibbleSel = 0; } } - if (((sDebugPadPress & 0x800) != 0) || ((sDebugPadPress & 0x400) != 0)) { - if ((sDebugPadPress & 0x800) != 0) { - delta = (D_8016BAB0 & 8) != 0 ? 8 : 1; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP) || CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { + step = CHECK_BTN_ANY(sDebugPadHold, BTN_CUP) ? 8 : 1; } - if ((sDebugPadPress & 0x400) != 0) { - delta = (D_8016BAB0 & 8) != 0 ? -8 : -1; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { + step = CHECK_BTN_ANY(sDebugPadHold, BTN_CUP) ? -8 : -1; } - if (D_80131F08 < 4) { - val = D_8016E2E0[D_80131F04] >> (((-D_80131F08) * 4) + 0xC); - val = (val + delta) & 0xF; - D_8016E2E0[D_80131F04] = (D_8016E2E0[D_80131F04] & ((0xF << (((-D_80131F08) * 4) + 0xC)) ^ 0xFFFF)) + - (val << (((-D_80131F08) * 4) + 0xC)); + if (sAudioSEFlagSwapNibbleSel < 4) { + val = gAudioSEFlagSwapSource[sAudioSEFlagSwapSel] >> (((-sAudioSEFlagSwapNibbleSel) * 4) + 0xC); + val = (val + step) & 0xF; + gAudioSEFlagSwapSource[sAudioSEFlagSwapSel] = + (gAudioSEFlagSwapSource[sAudioSEFlagSwapSel] & + ((0xF << (((-sAudioSEFlagSwapNibbleSel) * 4) + 0xC)) ^ 0xFFFF)) + + (val << (((-sAudioSEFlagSwapNibbleSel) * 4) + 0xC)); } else { - val = D_8016E2F8[D_80131F04] >> (((-D_80131F08) * 4) + 0x1C); - val = (val + delta) & 0xF; - D_8016E2F8[D_80131F04] = (D_8016E2F8[D_80131F04] & ((0xF << (((-D_80131F08) * 4) + 0x1C)) ^ 0xFFFF)) + - (val << (((-D_80131F08) * 4) + 0x1C)); + val = gAudioSEFlagSwapTarget[sAudioSEFlagSwapSel] >> (((-sAudioSEFlagSwapNibbleSel) * 4) + 0x1C); + val = (val + step) & 0xF; + gAudioSEFlagSwapTarget[sAudioSEFlagSwapSel] = + (gAudioSEFlagSwapTarget[sAudioSEFlagSwapSel] & + ((0xF << (((-sAudioSEFlagSwapNibbleSel) * 4) + 0x1C)) ^ 0xFFFF)) + + (val << (((-sAudioSEFlagSwapNibbleSel) * 4) + 0x1C)); } } - if ((sDebugPadPress & 0x8000) != 0) { - D_80131F00 = 0; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { + sAudioSEFlagSwapIsEditing = false; } - if ((sDebugPadPress & 0x4000) != 0) { - if (D_80131F08 < 4) { - D_8016E2E0[D_80131F04] = 0; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + if (sAudioSEFlagSwapNibbleSel < 4) { + gAudioSEFlagSwapSource[sAudioSEFlagSwapSel] = 0; } else { - D_8016E2F8[D_80131F04] = 0; + gAudioSEFlagSwapTarget[sAudioSEFlagSwapSel] = 0; } } } - if ((sDebugPadPress & 2) != 0) { - D_801333F4 ^= 1; + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CLEFT)) { + gAudioSEFlagSwapOff ^= 1; } - if ((sDebugPadPress & 4) != 0) { - D_8016E310[D_80131F04] ^= 1; + + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { + gAudioSEFlagSwapMode[sAudioSEFlagSwapSel] ^= 1; } } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F2464.s") +void AudioDebug_ProcessInput_SEFlagSwap(void); +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/AudioDebug_ProcessInput_SEFlagSwap.s") #endif -void func_800F27A0(void) { +void AudioDebug_ProcessInput_SubTrackInfo(void) { if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { - if (D_80131F28 != 0) { - D_80131F28--; + if (sAudioSubTrackInfoPlayerSel != 0) { + sAudioSubTrackInfoPlayerSel--; } else { - D_80131F28 = gAudioSessionPresets[D_80131EFC].numSequencePlayers - 1; + sAudioSubTrackInfoPlayerSel = gAudioSpecs[sAudioSubTrackInfoSpec].numSequencePlayers - 1; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { - if (D_80131F28 < gAudioSessionPresets[D_80131EFC].numSequencePlayers - 1) { - D_80131F28++; + if (sAudioSubTrackInfoPlayerSel < gAudioSpecs[sAudioSubTrackInfoSpec].numSequencePlayers - 1) { + sAudioSubTrackInfoPlayerSel++; } else { - D_80131F28 = 0; + sAudioSubTrackInfoPlayerSel = 0; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { - D_80131F2C = (D_80131F2C - 1) & 0xF; + sAudioSubTrackInfoChannelSel = (sAudioSubTrackInfoChannelSel - 1) & 0xF; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { - D_80131F2C = (D_80131F2C + 1) & 0xF; + sAudioSubTrackInfoChannelSel = (sAudioSubTrackInfoChannelSel + 1) & 0xF; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_START)) { - D_80131F30[D_80131F28] = 0; + sSeqPlayerPeakNumLayers[sAudioSubTrackInfoPlayerSel] = 0; } } -void func_800F28AC(void) { +void AudioDebug_ProcessInput_HeapInfo(void) { } -void func_800F28B4(void) { +void AudioDebug_ProcessInput_BlkChgBgm(void) { if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { - if (D_80131F50 > 0) { - D_80131F50--; + if (sAudioBlkChgBgmSel > 0) { + sAudioBlkChgBgmSel--; } else { - D_80131F50 = 1; + sAudioBlkChgBgmSel = 1; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { - if (D_80131F50 <= 0) { - D_80131F50++; + if (sAudioBlkChgBgmSel <= 0) { + sAudioBlkChgBgmSel++; } else { - D_80131F50 = 0; + sAudioBlkChgBgmSel = 0; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { - D_80131F4C[D_80131F50]--; - if (D_80131F50 == 1) { - func_800F5E90(D_80131F4C[1]); + sAudioBlkChgBgmWork[sAudioBlkChgBgmSel]--; + if (sAudioBlkChgBgmSel == 1) { + func_800F5E90(sAudioBlkChgBgmWork[1]); ; // might be a fake match? } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { - D_80131F4C[D_80131F50]++; - if (D_80131F50 == 1) { - func_800F5E90(D_80131F4C[1]); + sAudioBlkChgBgmWork[sAudioBlkChgBgmSel]++; + if (sAudioBlkChgBgmSel == 1) { + func_800F5E90(sAudioBlkChgBgmWork[1]); } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { - Audio_QueueCmdS8(MK_CMD(0x46, 0x00, 0x00, 0x00), D_80131F4C[1]); - Audio_QueueSeqCmd(D_80131F4C[0] | 0x10000); + Audio_QueueCmdS8(MK_CMD(0x46, 0x00, 0x00, 0x00), sAudioBlkChgBgmWork[1]); + Audio_QueueSeqCmd(sAudioBlkChgBgmWork[0] | 0x10000); } if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { @@ -2253,208 +2282,202 @@ void func_800F28B4(void) { } } -void func_800F29FC(void) { +void AudioDebug_ProcessInput_OcaTest(void) { } -void func_800F2A04(void) { - s32 phi_a2; +void AudioDebug_ProcessInput_SEParamChg(void) { + s32 step; u16 sfx; - if (D_8016BAB0 & 2) { - phi_a2 = 8; + if (CHECK_BTN_ANY(sDebugPadHold, BTN_CLEFT)) { + step = 8; } else { - phi_a2 = 1; + step = 1; } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DUP)) { - if (D_80131F18 > 0) { - D_80131F18--; + if (sAudioSEParamChgSel > 0) { + sAudioSEParamChgSel--; } else { - D_80131F18 = 3; + sAudioSEParamChgSel = 3; } } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_DDOWN)) { - if (D_80131F18 < 3) { - D_80131F18++; + if (sAudioSEParamChgSel < 3) { + sAudioSEParamChgSel++; } else { - D_80131F18 = 0; + sAudioSEParamChgSel = 0; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DLEFT)) { - if (D_80131F18 < 2) { - if (D_80131F18 == 0) { - if (D_80131F20[D_80131F18] > 0) { - D_80131F20[D_80131F18]--; + if (sAudioSEParamChgSel < 2) { + if (sAudioSEParamChgSel == 0) { + if (sAudioSEParamChgWork[sAudioSEParamChgSel] > 0) { + sAudioSEParamChgWork[sAudioSEParamChgSel]--; } else { - D_80131F20[D_80131F18] = D_80131E20[2] - 1; + sAudioSEParamChgWork[sAudioSEParamChgSel] = sAudioSndContWorkLims[2] - 1; } } else { - D_80131F20[D_80131F18] -= phi_a2; - D_80131F20[D_80131F18] &= 0x1FF; + sAudioSEParamChgWork[sAudioSEParamChgSel] -= step; + sAudioSEParamChgWork[sAudioSEParamChgSel] &= 0x1FF; } - } else if (D_80131F18 == 3) { - D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_0 -= phi_a2; + } else if (sAudioSEParamChgSel == 3) { + D_8013331C[sAudioSEParamChgWork[0]][sAudioSEParamChgWork[1]].unk_0 -= step; } else { - D_80131F1C = (D_80131F1C - 1) & 0xF; + sAudioSEParamChgBitSel = (sAudioSEParamChgBitSel - 1) & 0xF; } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_DRIGHT)) { - if (D_80131F18 < 2) { - if (D_80131F18 == 0) { - if (D_80131F20[D_80131F18] < (D_80131E20[2] - 1)) { - D_80131F20[D_80131F18]++; + if (sAudioSEParamChgSel < 2) { + if (sAudioSEParamChgSel == 0) { + if (sAudioSEParamChgWork[sAudioSEParamChgSel] < (sAudioSndContWorkLims[2] - 1)) { + sAudioSEParamChgWork[sAudioSEParamChgSel]++; } else { - D_80131F20[D_80131F18] = 0; + sAudioSEParamChgWork[sAudioSEParamChgSel] = 0; } } else { - D_80131F20[D_80131F18] += phi_a2; - D_80131F20[D_80131F18] &= 0x1FF; + sAudioSEParamChgWork[sAudioSEParamChgSel] += step; + sAudioSEParamChgWork[sAudioSEParamChgSel] &= 0x1FF; } - } else if (D_80131F18 == 3) { - D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_0 += phi_a2; + } else if (sAudioSEParamChgSel == 3) { + D_8013331C[sAudioSEParamChgWork[0]][sAudioSEParamChgWork[1]].unk_0 += step; } else { - D_80131F1C = (D_80131F1C + 1) & 0xF; + sAudioSEParamChgBitSel = (sAudioSEParamChgBitSel + 1) & 0xF; } } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { - sfx = (u16)(D_80131F20[0] << 0xC) + D_80131F20[1] + SFX_FLAG; + sfx = (u16)(sAudioSEParamChgWork[0] << 0xC) + sAudioSEParamChgWork[1] + SFX_FLAG; Audio_PlaySoundGeneral(sfx, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { - func_800F87A0(D_80131F20[0]); + func_800F87A0(sAudioSEParamChgWork[0]); } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { - if (D_80131F18 == 2) { - D_8013331C[D_80131F20[0]][D_80131F20[1]].unk_2 ^= (1 << (0xF - D_80131F1C)); + if (sAudioSEParamChgSel == 2) { + D_8013331C[sAudioSEParamChgWork[0]][sAudioSEParamChgWork[1]].unk_2 ^= (1 << (0xF - sAudioSEParamChgBitSel)); } } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_CUP)) { - if (D_80131F18 < 2) { - D_80131F20[D_80131F18] = 0; + if (sAudioSEParamChgSel < 2) { + sAudioSEParamChgWork[sAudioSEParamChgSel] = 0; } } } -void func_800F2D6C(const s8* str, u16 num) { +void AudioDebug_ScrPrt(const s8* str, u16 num) { u8 i = 0; - sAudioScreenPrintBuf[sAudioScreenPrintInd].num = num; + sAudioScrPrtBuf[sAudioScrPrtInd].num = num; while (str[i] != 0) { - sAudioScreenPrintBuf[sAudioScreenPrintInd].str[i] = str[i]; + sAudioScrPrtBuf[sAudioScrPrtInd].str[i] = str[i]; i++; } while (i < 5) { - sAudioScreenPrintBuf[sAudioScreenPrintInd].str[i] = 0; + sAudioScrPrtBuf[sAudioScrPrtInd].str[i] = 0; i++; } - if (sAudioScreenPrintInd < 25 - 1) { - sAudioScreenPrintInd++; + if (sAudioScrPrtInd < 25 - 1) { + sAudioScrPrtInd++; } else { - sAudioScreenPrintInd = 0; - sAudioScreenPrintOverflow = 1; + sAudioScrPrtInd = 0; + sAudioScrPrtOverflow = 1; } } -void func_800F1BDC(void); -void func_800F2150(void); -void func_800F227C(void); -void func_800F2464(void); -void func_800F27A0(void); -void func_800F28AC(void); -void func_800F2A04(void); +void AudioDebug_ProcessInput(void) { + if (!sAudioDebugEverOpened) { + return; + } -void func_800F2E28(void) { - if (D_80131C98 != 0) { - if (D_80131C9C != 0) { - func_800F7260(0x6F); - } + if (sAudioSEMuted) { + Audio_SetSoundBanksMute(0x6F); + } - if (CHECK_BTN_ANY(sDebugPadPress, BTN_L)) { - // goto next page. - if (D_80131CA0 < 0xE) { - D_80131CA0++; - } else { - D_80131CA0 = 0; - } - } - if (CHECK_BTN_ANY(sDebugPadPress, BTN_R)) { - // goto previous page - if (D_80131CA0 > 0) { - D_80131CA0--; - } else { - D_80131CA0 = 0xE; - } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_L)) { + if (sAudioDebugPage < PAGE_MAX - 1) { + sAudioDebugPage++; + } else { + sAudioDebugPage = 0; } + } - if (CHECK_BTN_ANY(sDebugPadPress, BTN_Z)) { - // change text color - D_80131CA8++; - D_80131CA8 &= 7; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_R)) { + if (sAudioDebugPage > 0) { + sAudioDebugPage--; + } else { + sAudioDebugPage = PAGE_MAX - 1; } + } - switch (D_80131CA0) { - case 0: - if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { - D_80131E08[5] ^= 0x1; - Audio_SeqCmdE01(0, D_80131E08[5]); - if (func_800FA0B4(0) != 1) { - Audio_SeqCmd1(0, 0); - } - Audio_SeqCmd1(1, 0); - Audio_SeqCmd1(3, 0); - } + if (CHECK_BTN_ANY(sDebugPadPress, BTN_Z)) { + sAudioDebugTextColor++; + sAudioDebugTextColor &= 7; + } - if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { - D_80131C9C ^= 0x1; - if (D_80131C9C == 0) { - func_800F7260(0); - } + switch (sAudioDebugPage) { + case PAGE_NON: + if (CHECK_BTN_ANY(sDebugPadPress, BTN_A)) { + sAudioSndContWork[5] ^= 1; + Audio_SeqCmdE01(0, sAudioSndContWork[5]); + if (func_800FA0B4(0) != 1) { + Audio_SeqCmd1(0, 0); } - break; - case 1: - func_800F1BDC(); - break; - case 7: - func_800F2150(); - break; - case 13: - func_800F227C(); - break; - case 8: - func_800F2464(); - break; - case 5: - func_800F27A0(); - break; - case 3: - func_800F28AC(); - break; - case 9: - func_800F28B4(); - break; - case 11: - func_800F29FC(); - break; - case 12: - func_800F2A04(); - break; - case 14: - default: - break; - } + Audio_SeqCmd1(1, 0); + Audio_SeqCmd1(3, 0); + } - D_8013340C = D_80131EE4[10]; + if (CHECK_BTN_ANY(sDebugPadPress, BTN_B)) { + sAudioSEMuted ^= 1; + if (!sAudioSEMuted) { + Audio_SetSoundBanksMute(0); + } + } + break; + case PAGE_SOUND_CONTROL: + AudioDebug_ProcessInput_SndCont(); + break; + case PAGE_INTERFACE_INFO: + AudioDebug_ProcessInput_IntInfo(); + break; + case PAGE_SCROLL_PRINT: + AudioDebug_ProcessInput_ScrPrt(); + break; + case PAGE_SE_FLAG_SWAP: + AudioDebug_ProcessInput_SEFlagSwap(); + break; + case PAGE_SUB_TRACK_INFO: + AudioDebug_ProcessInput_SubTrackInfo(); + break; + case PAGE_HEAP_INFO: + AudioDebug_ProcessInput_HeapInfo(); + break; + case PAGE_BLOCK_CHANGE_BGM: + AudioDebug_ProcessInput_BlkChgBgm(); + break; + case PAGE_OCARINA_TEST: + AudioDebug_ProcessInput_OcaTest(); + break; + case PAGE_SE_PARAMETER_CHANGE: + AudioDebug_ProcessInput_SEParamChg(); + break; + case PAGE_FREE_AREA: + default: + break; } + + D_8013340C = sAudioScrPrtWork[10]; } -void func_800F50CC(void); void func_800F4A70(void); void func_800F5CF8(void); @@ -2463,20 +2486,20 @@ void func_800F3054(void) { sAudioUpdateTaskStart = gAudioContext.totalTaskCnt; sAudioUpdateStartTime = osGetTime(); func_800EE6F4(); - func_800F4784(&D_8016B7B8); - func_800F4784(&D_8016B7C8); + Audio_StepFreqLerp(&sRiverFreqScaleLerp); + Audio_StepFreqLerp(&sWaterfallFreqScaleLerp); func_800F4A70(); func_800F56A8(); func_800F5CF8(); - if (D_80133414 == 7) { - func_800F50CC(); + if (gAudioSpecId == 7) { + Audio_ClearSariaBgm(); } - func_800F8E3C(); + Audio_ProcessSoundRequests(); Audio_ProcessSeqCmds(); func_800F8F88(); func_800FA3DC(); - func_800EE97C(); - func_800F2E28(); + AudioDebug_SetInput(); + AudioDebug_ProcessInput(); Audio_ScheduleProcessCmds(); sAudioUpdateTaskEnd = gAudioContext.totalTaskCnt; sAudioUpdateEndTime = osGetTime(); @@ -2494,18 +2517,16 @@ void func_800F314C(s8 arg0) { } f32 func_800F3188(u8 bankIdx, u8 entryIdx) { - SoundBankEntry* bankEntry; + SoundBankEntry* bankEntry = &gSoundBanks[bankIdx][entryIdx]; f32 temp_f14; - f32 temp_f2; f32 phi_f0; f32 ret; - bankEntry = &gSoundBanks[bankIdx][entryIdx]; if (bankEntry->unk_26 & 0x2000) { return 1.0f; } - if (bankEntry->unk_1C > 10000.0f) { + if (bankEntry->dist > 10000.0f) { ret = 0.0f; } else { switch (bankEntry->unk_26 & 3) { @@ -2525,12 +2546,12 @@ f32 func_800F3188(u8 bankIdx, u8 entryIdx) { temp_f14 = phi_f0 / 5.0f; - if (bankEntry->unk_1C < temp_f14) { + if (bankEntry->dist < temp_f14) { ret = 1.0f; - } else if (bankEntry->unk_1C < phi_f0) { - ret = ((((phi_f0 - temp_f14) - (bankEntry->unk_1C - temp_f14)) / (phi_f0 - temp_f14)) * 0.19f) + 0.81f; + } else if (bankEntry->dist < phi_f0) { + ret = ((((phi_f0 - temp_f14) - (bankEntry->dist - temp_f14)) / (phi_f0 - temp_f14)) * 0.19f) + 0.81f; } else { - ret = (1.0f - ((bankEntry->unk_1C - phi_f0) / (10000.0f - phi_f0))) * 0.81f; + ret = (1.0f - ((bankEntry->dist - phi_f0) / (10000.0f - phi_f0))) * 0.81f; } ret = SQ(ret); } @@ -2538,92 +2559,83 @@ f32 func_800F3188(u8 bankIdx, u8 entryIdx) { return ret; } -s8 func_800F32F0(u8 arg0, u8 arg1, u8 arg2) { - SoundBankEntry* temp_a3; - SequenceChannel* temp_a1; - s32 phi_a1; - s8 phi_v0 = 0; - s32 phi_v1 = 0; - SequenceChannel* none = &gAudioContext.sequenceChannelNone; +s8 Audio_ComputeSoundReverb(u8 bankIdx, u8 entryIdx, u8 channelIdx) { + s8 distAdd = 0; + s32 scriptAdd = 0; + SoundBankEntry* entry = &gSoundBanks[bankIdx][entryIdx]; + s32 reverb; - temp_a3 = &gSoundBanks[arg0][arg1]; - if (!(temp_a3->unk_26 & 0x1000)) { - if (temp_a3->unk_1C < 2500.0f) { - phi_v0 = *temp_a3->posZ > 0.0f ? (temp_a3->unk_1C / 2500.0f) * 70.0f : (temp_a3->unk_1C / 2500.0f) * 91.0f; + if (!(entry->unk_26 & 0x1000)) { + if (entry->dist < 2500.0f) { + distAdd = *entry->posZ > 0.0f ? (entry->dist / 2500.0f) * 70.0f : (entry->dist / 2500.0f) * 91.0f; } else { - phi_v0 = 70; + distAdd = 70; } } - temp_a1 = gAudioContext.seqPlayers[2].channels[arg2]; - if (none != temp_a1) { - phi_v1 = temp_a1->soundScriptIO[1]; - if (temp_a1->soundScriptIO[1] < 0) { - phi_v1 = 0; + if (IS_SEQUENCE_CHANNEL_VALID(gAudioContext.seqPlayers[2].channels[channelIdx])) { + scriptAdd = gAudioContext.seqPlayers[2].channels[channelIdx]->soundScriptIO[1]; + if (gAudioContext.seqPlayers[2].channels[channelIdx]->soundScriptIO[1] < 0) { + scriptAdd = 0; } } - phi_a1 = *temp_a3->unk_18 + phi_v0 + phi_v1; - if ((arg0 != 5) || !((temp_a3->unk_28 & 0x1FF) < 2)) { - phi_a1 += D_80130614 + D_80130618 + D_80130610; + reverb = *entry->reverbAdd + distAdd + scriptAdd; + if ((bankIdx != BANK_OCARINA) || !((entry->unk_28 & 0x1FF) < 2)) { + reverb += sAudioEnvReverb + sAudioCodeReverb + sSpecReverb; } - if (phi_a1 >= 0x80) { - phi_a1 = 0x7F; + if (reverb > 0x7F) { + reverb = 0x7F; } - return phi_a1; + return reverb; } -s8 func_800F3468(f32 arg0, f32 arg1, u8 arg2) { - f32 temp_f14; - f32 temp_f2; - f32 phi_f12; - f32 phi_f2; - f32 phi_f2_2; - f32 phi_f12_2; - f32 phi_f0; - f32 phi_f0_2; +s8 Audio_ComputeSoundPanSigned(f32 x, f32 z, u8 arg2) { + f32 absX; + f32 absZ; + f32 pan; - if (arg0 < 0) { - phi_f12 = -arg0; + if (x < 0) { + absX = -x; } else { - phi_f12 = arg0; + absX = x; } - if (arg1 < 0) { - phi_f2 = -arg1; + if (z < 0) { + absZ = -z; } else { - phi_f2 = arg1; + absZ = z; } - if (phi_f12 > 8000.0f) { - phi_f12 = 8000.0f; + if (absX > 8000.0f) { + absX = 8000.0f; } - if (phi_f2 > 8000.0f) { - phi_f2 = 8000.0f; + if (absZ > 8000.0f) { + absZ = 8000.0f; } - if ((arg0 == 0.0f) && (arg1 == 0.0f)) { - phi_f0 = 0.5f; - } else if (phi_f2 <= phi_f12) { - phi_f0 = (16000.0f - phi_f12) / (3.3f * (16000.0f - phi_f2)); - if (arg0 >= 0.0f) { - phi_f0 = 1.0f - phi_f0; + if ((x == 0.0f) && (z == 0.0f)) { + pan = 0.5f; + } else if (absZ <= absX) { + pan = (16000.0f - absX) / (3.3f * (16000.0f - absZ)); + if (x >= 0.0f) { + pan = 1.0f - pan; } } else { - phi_f0 = (arg0 / (5.0769234f * phi_f2)) + 0.5f; + pan = (x / (5.0769234f * absZ)) + 0.5f; } - if (phi_f2 < 50.0f) { - if (phi_f12 < 50.0f) { - phi_f0 = ((phi_f0 - 0.5f) * SQ(phi_f12 / 50.0f)) + 0.5f; + if (absZ < 50.0f) { + if (absX < 50.0f) { + pan = ((pan - 0.5f) * SQ(absX / 50.0f)) + 0.5f; } } - return (phi_f0 * 127.0f) + 0.5f; + return (s8)((pan * 127.0f) + 0.5f); } -f32 func_800F35EC(u8 bankIdx, u8 entryIdx) { +f32 Audio_ComputeSoundFreqScale(u8 bankIdx, u8 entryIdx) { s32 phi_v0 = 0; SoundBankEntry* entry = &gSoundBanks[bankIdx][entryIdx]; f32 unk1C; @@ -2658,7 +2670,7 @@ f32 func_800F35EC(u8 bankIdx, u8 entryIdx) { } } - unk1C = entry->unk_1C; + unk1C = entry->dist; if (!(entry->unk_26 & 0x2000)) { if (!(entry->unk_26 & 0x8000)) { if (unk1C >= 10000.0f) { @@ -2718,11 +2730,7 @@ u8 func_800F37B8(f32 arg0, SoundBankEntry* arg1, s8 arg2) { break; } - if (arg1->unk_1C > 1923.077f) { - phi_f12 = 1923.077f; - } else { - phi_f12 = arg1->unk_1C; - } + phi_f12 = CLAMP_MAX(arg1->dist, 1923.077f); return (phi_v1 * 0x10) + (u8)((phi_f0 * phi_f12) / 1923.077f); } @@ -2740,28 +2748,19 @@ s8 func_800F3990(f32 arg0, u16 arg1) { return ret | 1; } -void func_800F3A08(u8 bankIdx, u8 entryIdx, u8 channelIdx) { - f32 sp44; +void Audio_SetSoundProperties(u8 bankIdx, u8 entryIdx, u8 channelIdx) { + f32 sp44 = 1.0f; s8 phi_a1; - s8 reverb; - f32 freqScale; - s8 sp3B; - u8 sp3A; - u8 sp39; - s8 sp38; + s8 reverb = 0; + f32 freqScale = 1.0f; + s8 panSigned = 0x40; + u8 reverbFlg = 0; + u8 sp39 = 0; + s8 sp38 = 0; f32 sp34; - u8 sp33; - SoundBankEntry* temp_a3; - - reverb = 0; - sp3B = 0x40; - sp3A = 0; - sp39 = 0; - sp38 = 0; - sp33 = 0; - freqScale = 1.0f; - sp44 = 1.0f; - temp_a3 = &gSoundBanks[bankIdx][entryIdx]; + u8 sp33 = 0; + SoundBankEntry* entry = &gSoundBanks[bankIdx][entryIdx]; + switch (bankIdx) { case BANK_PLAYER: case BANK_ITEM: @@ -2769,29 +2768,30 @@ void func_800F3A08(u8 bankIdx, u8 entryIdx, u8 channelIdx) { case BANK_ENEMY: case BANK_VOICE: if (D_80130604 == 2) { - sp38 = func_800F3990(*temp_a3->posY, temp_a3->unk_26); + sp38 = func_800F3990(*entry->posY, entry->unk_26); } + // fallthrough case BANK_OCARINA: - temp_a3->unk_1C = sqrtf(temp_a3->unk_1C); - sp44 = func_800F3188(bankIdx, entryIdx) * *temp_a3->unk_14; - reverb = func_800F32F0(bankIdx, entryIdx, channelIdx); - sp3B = func_800F3468(*temp_a3->posX, *temp_a3->posZ, temp_a3->unk_C); - freqScale = func_800F35EC(bankIdx, entryIdx) * *temp_a3->unk_10; + entry->dist = sqrtf(entry->dist); + sp44 = func_800F3188(bankIdx, entryIdx) * *entry->unk_14; + reverb = Audio_ComputeSoundReverb(bankIdx, entryIdx, channelIdx); + panSigned = Audio_ComputeSoundPanSigned(*entry->posX, *entry->posZ, entry->unk_C); + freqScale = Audio_ComputeSoundFreqScale(bankIdx, entryIdx) * *entry->freqScale; if (D_80130604 == 2) { - sp34 = D_801305C4[(temp_a3->unk_26 & 0x400) >> 10]; - if (!(temp_a3->unk_26 & 0x800)) { - if (*temp_a3->posZ < sp34) { - sp3A = 0x10; + sp34 = D_801305C4[(entry->unk_26 & 0x400) >> 10]; + if (!(entry->unk_26 & 0x800)) { + if (*entry->posZ < sp34) { + reverbFlg = 0x10; } - if ((D_8016B8B8[channelIdx].unk_0A ^ sp3A) & 0x10) { - if (sp3B < 0x40) { - sp3A = D_8016B8B8[channelIdx].unk_0A ^ 0x14; + if ((D_8016B8B8[channelIdx].reverbFlg ^ reverbFlg) & 0x10) { + if (panSigned < 0x40) { + reverbFlg = D_8016B8B8[channelIdx].reverbFlg ^ 0x14; } else { - sp3A = D_8016B8B8[channelIdx].unk_0A ^ 0x18; + reverbFlg = D_8016B8B8[channelIdx].reverbFlg ^ 0x18; } } else { - sp3A = D_8016B8B8[channelIdx].unk_0A; + reverbFlg = D_8016B8B8[channelIdx].reverbFlg; } } } @@ -2803,10 +2803,8 @@ void func_800F3A08(u8 bankIdx, u8 entryIdx, u8 channelIdx) { if ((sp33 | D_80130640) != 0) { sp39 = (sp33 | D_80130640); - } else if (D_80130604 != 2) { - } else if (temp_a3->unk_26 & 0x2000) { - } else { - sp39 = func_800F37B8(sp34, temp_a3, sp3B); + } else if (D_80130604 == 2 && (entry->unk_26 & 0x2000) == 0) { + sp39 = func_800F37B8(sp34, entry, panSigned); } break; case BANK_SYSTEM: @@ -2820,31 +2818,35 @@ void func_800F3A08(u8 bankIdx, u8 entryIdx, u8 channelIdx) { phi_a1 = -1; } + // CHAN_UPD_SCRIPT_IO (slot 2) Audio_QueueCmdS8(0x6020000 | (channelIdx << 8) | 2, phi_a1); - if (reverb != D_8016B8B8[channelIdx].unk_08) { + if (reverb != D_8016B8B8[channelIdx].reverb) { Audio_QueueCmdS8(0x5020000 | (channelIdx << 8), reverb); - D_8016B8B8[channelIdx].unk_08 = reverb; + D_8016B8B8[channelIdx].reverb = reverb; } - if (freqScale != D_8016B8B8[channelIdx].unk_04) { + if (freqScale != D_8016B8B8[channelIdx].freqScale) { Audio_QueueCmdF32(0x4020000 | (channelIdx << 8), freqScale); - D_8016B8B8[channelIdx].unk_04 = freqScale; + D_8016B8B8[channelIdx].freqScale = freqScale; } - if (sp3A != D_8016B8B8[channelIdx].unk_0A) { - Audio_QueueCmdS8(0xE020000 | (channelIdx << 8), sp3A | 0x10); - D_8016B8B8[channelIdx].unk_0A = sp3A; + if (reverbFlg != D_8016B8B8[channelIdx].reverbFlg) { + Audio_QueueCmdS8(0xE020000 | (channelIdx << 8), reverbFlg | 0x10); + D_8016B8B8[channelIdx].reverbFlg = reverbFlg; } if (sp39 != D_8016B8B8[channelIdx].unk_0B) { + // CHAN_UPD_SCRIPT_IO (slot 3) Audio_QueueCmdS8(0x6020000 | (channelIdx << 8) | 3, sp39); D_8016B8B8[channelIdx].unk_0B = sp39; } if (sp38 != D_8016B8B8[channelIdx].unk_0C) { + // CHAN_UPD_UNK_0F Audio_QueueCmdS8(0xC020000 | (channelIdx << 8), 0x10); + // CHAN_UPD_UNK_20 Audio_QueueCmdU16(0xD020000 | (channelIdx << 8), ((u16)(sp38) << 8) + 0xFF); D_8016B8B8[channelIdx].unk_0C = sp38; } - if (sp3B != D_8016B8B8[channelIdx].unk_09) { - Audio_QueueCmdS8(0x3020000 | (channelIdx << 8), sp3B); - D_8016B8B8[channelIdx].unk_09 = sp3B; + if (panSigned != D_8016B8B8[channelIdx].panSigned) { + Audio_QueueCmdS8(0x3020000 | (channelIdx << 8), panSigned); + D_8016B8B8[channelIdx].panSigned = panSigned; } } @@ -2855,21 +2857,21 @@ void func_800F3ED4(void) { for (i = 0; i < 16; i++) { t = &D_8016B8B8[i]; t->unk_00 = 1.0f; - t->unk_04 = 1.0f; - t->unk_08 = 0; - t->unk_09 = 0x40; - t->unk_0A = 0; + t->freqScale = 1.0f; + t->reverb = 0; + t->panSigned = 0x40; + t->reverbFlg = 0; t->unk_0B = 0xFF; t->unk_0C = 0xFF; } - D_8016B8B8[0xD].unk_0C = 0; + D_8016B8B8[13].unk_0C = 0; D_8013061C = 0; - D_80130618 = 0; + sAudioCodeReverb = 0; } void func_800F3F3C(u8 arg0) { - if (D_8016E264[0] != 1) { + if (gSoundBankMuted[0] != 1) { Audio_StartSeq(3, 0, 0x6D); Audio_SeqCmd8(3, 0, 0, arg0); } @@ -2889,17 +2891,17 @@ f32 func_800F3F84(f32 arg0) { return ret; } -void func_800F4010(Vec3f* arg0, u16 arg1, f32 arg2) { +void func_800F4010(Vec3f* pos, u16 sfxId, f32 arg2) { f32 sp24; f32 phi_f0; u8 phi_v0; - u16 phi_a0; + u16 sfxId2; D_80131C8C = arg2; sp24 = func_800F3F84(arg2); - Audio_PlaySoundGeneral(arg1, arg0, 4, &D_8016B7B0, &D_8016B7A8, &D_801333E8); + Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7B0, &D_8016B7A8, &D_801333E8); - if ((arg1 & 0xF0) == 0xB0) { + if ((sfxId & 0xF0) == 0xB0) { phi_f0 = 0.3f; phi_v0 = 1; sp24 = 1.0f; @@ -2909,27 +2911,28 @@ void func_800F4010(Vec3f* arg0, u16 arg1, f32 arg2) { } if ((phi_f0 < arg2) && (phi_v0 != 0)) { - if ((arg1 & 0x80) != 0) { - phi_a0 = 0x867; + if ((sfxId & 0x80) != 0) { + sfxId2 = NA_SE_PL_METALEFFECT_ADULT; } else { - phi_a0 = 0x866; + sfxId2 = NA_SE_PL_METALEFFECT_KID; } D_8016B7AC = (sp24 * 0.7) + 0.3; - Audio_PlaySoundGeneral(phi_a0, arg0, 4U, &D_8016B7B0, &D_8016B7AC, &D_801333E8); + Audio_PlaySoundGeneral(sfxId2, pos, 4, &D_8016B7B0, &D_8016B7AC, &D_801333E8); } } void func_800F4138(Vec3f* pos, u16 sfxId, f32 arg2) { func_800F3F84(arg2); - Audio_PlaySoundGeneral(sfxId, pos, 4U, &D_8016B7B0, &D_8016B7A8, &D_801333E8); + Audio_PlaySoundGeneral(sfxId, pos, 4, &D_8016B7B0, &D_8016B7A8, &D_801333E8); } void func_800F4190(Vec3f* pos, u16 sfxId) { Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801305B0, &D_801333E0, &D_801305B4); } -void func_800F41E0(Vec3f* pos, u16 baseSfx, u8 arg2) { - u8 offset = Audio_NextRandom() % arg2; - Audio_PlaySoundGeneral(baseSfx + offset, pos, 4, &D_801333E0, &D_801333E0, &D_801333E8); +void Audio_PlaySoundRandom(Vec3f* pos, u16 baseSfxId, u8 randLim) { + u8 offset = Audio_NextRandom() % randLim; + + Audio_PlaySoundGeneral(baseSfxId + offset, pos, 4, &D_801333E0, &D_801333E0, &D_801333E8); } void func_800F4254(Vec3f* pos, u8 level) { @@ -2983,14 +2986,14 @@ void func_800F44EC(s8 arg0, s8 arg1) { D_801305C0 = arg0; } -void func_800F4524(Vec3f* arg0, u16 arg1, s8 arg2) { +void func_800F4524(Vec3f* pos, u16 sfxId, s8 arg2) { D_8016B7DC = arg2; - Audio_PlaySoundGeneral(arg1, arg0, 4, &D_801333E0, &D_801333E0, &D_8016B7DC); + Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801333E0, &D_801333E0, &D_8016B7DC); } -void func_800F4578(Vec3f* arg0, u16 arg1, f32 arg2) { +void func_800F4578(Vec3f* pos, u16 sfxId, f32 arg2) { D_8016B7E0 = arg2; - Audio_PlaySoundGeneral(arg1, arg0, 4, &D_801333E0, &D_8016B7E0, &D_801333E8); + Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801333E0, &D_8016B7E0, &D_801333E8); } void func_800F45D0(f32 arg0) { @@ -2998,42 +3001,44 @@ void func_800F45D0(f32 arg0) { func_800F436C(&D_801333D4, 0, (0.15f * arg0) + 1.4f); } -void func_800F4634(Vec3f* pos, f32 arg1) { - if (func_800F8FF4(0x2006) == 0) { - D_8016B7B8.unk_00 = arg1; - } else if (arg1 != D_8016B7B8.unk_00) { - D_8016B7B8.unk_04 = arg1; - D_8016B7B8.unk_0C = 0x28; - D_8016B7B8.unk_08 = (D_8016B7B8.unk_04 - D_8016B7B8.unk_00) / 40.0f; +void Audio_PlaySoundRiver(Vec3f* pos, f32 freqScale) { + if (!Audio_IsSfxPlaying(NA_SE_EV_RIVER_STREAM - SFX_FLAG)) { + sRiverFreqScaleLerp.value = freqScale; + } else if (freqScale != sRiverFreqScaleLerp.value) { + sRiverFreqScaleLerp.target = freqScale; + sRiverFreqScaleLerp.remainingFrames = 40; + sRiverFreqScaleLerp.step = (sRiverFreqScaleLerp.target - sRiverFreqScaleLerp.value) / 40; } - Audio_PlaySoundGeneral(0x2006, pos, 4, &D_8016B7B8, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_RIVER_STREAM - SFX_FLAG, pos, 4, &sRiverFreqScaleLerp.value, &D_801333E0, + &D_801333E8); } -void func_800F46E0(Vec3f* pos, f32 arg0) { - if (func_800F8FF4(0x2007) == 0) { - D_8016B7C8.unk_00 = arg0; - } else if (arg0 != D_8016B7C8.unk_00) { - D_8016B7C8.unk_04 = arg0; - D_8016B7C8.unk_0C = 0x28; - D_8016B7C8.unk_08 = (D_8016B7C8.unk_04 - D_8016B7C8.unk_00) / 40.0f; +void Audio_PlaySoundWaterfall(Vec3f* pos, f32 freqScale) { + if (!Audio_IsSfxPlaying(NA_SE_EV_WATER_WALL_BIG - SFX_FLAG)) { + sWaterfallFreqScaleLerp.value = freqScale; + } else if (freqScale != sWaterfallFreqScaleLerp.value) { + sWaterfallFreqScaleLerp.target = freqScale; + sWaterfallFreqScaleLerp.remainingFrames = 40; + sWaterfallFreqScaleLerp.step = (sWaterfallFreqScaleLerp.target - sWaterfallFreqScaleLerp.value) / 40; } - Audio_PlaySoundGeneral(0x2007, pos, 4, &D_8016B7C8, &D_8016B7C8, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_EV_WATER_WALL_BIG - SFX_FLAG, pos, 4, &sWaterfallFreqScaleLerp.value, + &sWaterfallFreqScaleLerp.value, &D_801333E8); } -void func_800F4784(unk_s2* arg0) { - if (arg0->unk_0C != 0) { - arg0->unk_0C--; - if (arg0->unk_0C != 0) { - arg0->unk_00 = arg0->unk_00 + arg0->unk_08; +void Audio_StepFreqLerp(FreqLerp* lerp) { + if (lerp->remainingFrames != 0) { + lerp->remainingFrames--; + if (lerp->remainingFrames != 0) { + lerp->value += lerp->step; } else { - arg0->unk_00 = arg0->unk_04; + lerp->value = lerp->target; } } } void func_800F47BC(void) { - Audio_SetVolScale(0, 1, 0, 0xA); - Audio_SetVolScale(3, 1, 0, 0xA); + Audio_SetVolScale(0, 1, 0, 10); + Audio_SetVolScale(3, 1, 0, 10); } void func_800F47FC(void) { @@ -3041,60 +3046,61 @@ void func_800F47FC(void) { Audio_SetVolScale(3, 1, 0x7F, 3); } -void func_800F483C(u8 arg0, u8 arg1) { - Audio_SetVolScale(0, 0, arg0, arg1); +void func_800F483C(u8 targetVol, u8 volFadeTimer) { + Audio_SetVolScale(0, 0, targetVol, volFadeTimer); } void func_800F4870(u8 arg0) { - s8 phi_s1; + s8 pan; u8 i; - phi_s1 = 0; + pan = 0; if (arg0 == 0) { - phi_s1 = 0x7F; + pan = 0x7F; } for (i = 0; i < 16; i++) { - Audio_QueueCmdS8(_SHIFTL(0x07, 24, 8) | _SHIFTL(0x00, 16, 8) | _SHIFTL(i, 8, 8) | _SHIFTL(0, 0, 8), phi_s1); + // CHAN_UPD_PAN_UNSIGNED + Audio_QueueCmdS8(_SHIFTL(0x07, 24, 8) | _SHIFTL(0x00, 16, 8) | _SHIFTL(i, 8, 8) | _SHIFTL(0, 0, 8), pan); } if (arg0 == 7) { D_80130600 = 2; } else { - func_800F491C(D_801305F8[arg0 & 7]); + Audio_SetGanonDistVol(D_801305F8[arg0 & 7]); } } -s32 func_800F491C(u8 arg0) { +// (name derived from debug strings, should probably update. used in ganon/ganon_boss scenes) +s32 Audio_SetGanonDistVol(u8 targetVol) { u8 phi_v0; u16 phi_v0_2; - - SequenceChannel* none = &gAudioContext.sequenceChannelNone; u8 i; - if (D_8016B8B4 != arg0) { - Audio_SetVolScale(0, 0, arg0, 2); - if (arg0 < 0x40) { + if (sAudioGanonDistVol != targetVol) { + Audio_SetVolScale(0, 0, targetVol, 2); + if (targetVol < 0x40) { phi_v0 = 0x10; } else { - phi_v0 = ((((arg0 - 0x40) >> 2) + 1) << 4); + phi_v0 = (((targetVol - 0x40) >> 2) + 1) << 4; } Audio_SeqCmd8(0, 4, 15, phi_v0); for (i = 0; i < 0x10; i++) { - if (none != gAudioContext.seqPlayers[0].channels[i]) { + if (gAudioContext.seqPlayers[0].channels[i] != &gAudioContext.sequenceChannelNone) { if ((u8)gAudioContext.seqPlayers[0].channels[i]->soundScriptIO[5] != 0xFF) { // this looks like some kind of macro? - phi_v0_2 = ((u16)gAudioContext.seqPlayers[0].channels[i]->soundScriptIO[5] - arg0) + 0x7F; + phi_v0_2 = ((u16)gAudioContext.seqPlayers[0].channels[i]->soundScriptIO[5] - targetVol) + 0x7F; if (phi_v0_2 >= 0x80) { phi_v0_2 = 0x7F; } + // CHAN_UPD_REVERB Audio_QueueCmdS8(_SHIFTL(5, 24, 8) | _SHIFTL(0, 16, 8) | _SHIFTL(i, 8, 8) | _SHIFTL(0, 0, 8), (u8)phi_v0_2); } } } - D_8016B8B4 = arg0; + sAudioGanonDistVol = targetVol; } return -1; } @@ -3121,28 +3127,29 @@ void func_800F4A70(void) { if (D_80130600 != 0) { D_80130600--; if (D_80130600 == 0) { - func_800F491C(D_801305F8[7]); + Audio_SetGanonDistVol(D_801305F8[7]); } } } -void func_800F4B58(Vec3f* arg0, s16 arg1, u8* arg2) { - Audio_PlaySoundGeneral(arg1, arg0, 4, &gNoteFrequencies[arg2[D_801305CC] + 39], &D_801333E0, &D_801333E8); +void Audio_PlaySoundIncreasinglyTransposed(Vec3f* pos, s16 sfxId, u8* semitones) { + Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitones[sAudioIncreasingTranspose] + 39], &D_801333E0, + &D_801333E8); - if (D_801305CC < 15) { - D_801305CC++; + if (sAudioIncreasingTranspose < 15) { + sAudioIncreasingTranspose++; } } -void func_800F4BE8(void) { - D_801305CC = 0; +void Audio_ResetIncreasingTranspose(void) { + sAudioIncreasingTranspose = 0; } -void func_800F4BF4(Vec3f* arg0, u16 arg1, s8 arg2) { - Audio_PlaySoundGeneral(arg1, arg0, 4, &gNoteFrequencies[arg2 + 39], &D_801333E0, &D_801333E8); +void Audio_PlaySoundTransposed(Vec3f* pos, u16 sfxId, s8 semitone) { + Audio_PlaySoundGeneral(sfxId, pos, 4, &gNoteFrequencies[semitone + 39], &D_801333E0, &D_801333E8); } -void func_800F4C58(Vec3f* arg0, u16 sfxId, u8 arg2) { +void func_800F4C58(Vec3f* pos, u16 sfxId, u8 arg2) { u8 phi_s1 = 0; u8 i; u8 bank; @@ -3158,40 +3165,32 @@ void func_800F4C58(Vec3f* arg0, u16 sfxId, u8 arg2) { } phi_s1++; } - Audio_PlaySoundGeneral(sfxId, arg0, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(sfxId, pos, 4, &D_801333E0, &D_801333E0, &D_801333E8); } -void func_800F4E30(Vec3f* arg0, f32 arg1) { - Vec3f* temp_v0; - f32 temp_f0; - f32 temp_f2; - s32 temp_s0; - Vec3f* phi_v0; - f32 phi_f0; - s32 phi_v0_2; +void func_800F4E30(Vec3f* pos, f32 arg1) { f32 phi_f22; - s32 phi_s0; s8 phi_s4; u8 i; - if (D_8013064C == NULL) { - D_8013064C = arg0; + if (sSariaBgmPtr == NULL) { + sSariaBgmPtr = pos; D_80130650 = arg1; - } else if (arg0 != D_8013064C) { + } else if (pos != sSariaBgmPtr) { if (arg1 < D_80130650) { - D_8013064C = arg0; + sSariaBgmPtr = pos; D_80130650 = arg1; } } else { D_80130650 = arg1; } - if (D_8013064C->x > 100.0f) { + if (sSariaBgmPtr->x > 100.0f) { phi_s4 = 0x7F; - } else if (D_8013064C->x < -100.0f) { + } else if (sSariaBgmPtr->x < -100.0f) { phi_s4 = 0; } else { - phi_s4 = ((D_8013064C->x / 100.0f) * 64.0f) + 64.0f; + phi_s4 = ((sSariaBgmPtr->x / 100.0f) * 64.0f) + 64.0f; } if (D_80130650 > 400.0f) { @@ -3210,116 +3209,116 @@ void func_800F4E30(Vec3f* arg0, f32 arg1) { } } -void func_800F50CC(void) { - if (D_8013064C != NULL) { - D_8013064C = NULL; +void Audio_ClearSariaBgm(void) { + if (sSariaBgmPtr != NULL) { + sSariaBgmPtr = NULL; } } -void* func_800F50EC(Vec3f* arg0) { - if (D_8013064C == arg0) { - D_8013064C = NULL; +void Audio_ClearSariaBgmAtPos(Vec3f* pos) { + if (sSariaBgmPtr == pos) { + sSariaBgmPtr = NULL; } } #ifdef NON_MATCHING // matches, but need to migrate data. -void func_800F510C(s8 arg0) { - u8 phi_v1; - u8 phi_a2; - u16 phi_a1; - u8 sp40[2] = { 0, 3 }; +void func_800F510C(s8 volSplit) { + u8 vol; + u8 prio; + u16 channelBits; + u8 players[2] = { 0, 3 }; u8 i; u8 j; if ((func_800FA0B4(1) == 0xFFFF) && (func_800FA0B4(3) != 0x2F)) { for (i = 0; i < 2; i++) { if (i == 0) { - phi_v1 = arg0; + vol = volSplit; } else { - phi_v1 = 0x7F - arg0; + vol = 0x7F - volSplit; } - if (phi_v1 > 100) { - phi_a2 = 11; - } else if (phi_v1 < 20) { - phi_a2 = 2; + if (vol > 100) { + prio = 11; + } else if (vol < 20) { + prio = 2; } else { - phi_a2 = ((phi_v1 - 20) / 10) + 2; + prio = ((vol - 20) / 10) + 2; } - phi_a1 = 0; + channelBits = 0; for (j = 0; j < 0x10; j++) { - if (gAudioContext.seqPlayers[sp40[i]].channels[j]->notePriority < phi_a2) { - phi_a1 += (1 << j); + if (gAudioContext.seqPlayers[players[i]].channels[j]->notePriority < prio) { + channelBits += (1 << j); } } - Audio_SeqCmdA(sp40[i], phi_a1); + Audio_SeqCmdA(players[i], channelBits); } } } #else -void func_800F510C(s8); +void func_800F510C(s8 volSplit); #pragma GLOBAL_ASM("asm/non_matchings/code/code_800EC960/func_800F510C.s") #endif -void func_800F52A0(Vec3f* arg0, u16 arg1, u16 arg2) { - f32 phi_f2; - f32 phi_f14; - u8 phi_a2; - f32 temp_f0; +void Audio_PlaySariaBgm(Vec3f* pos, u16 seqId, u16 distMax) { + f32 absY; + f32 dist; + u8 vol; + f32 prevDist; if (D_8016B9F3 != 0) { D_8016B9F3--; return; } - phi_f14 = sqrtf(SQ(arg0->z) + SQ(arg0->x)); - if (D_8013064C == NULL) { - D_8013064C = arg0; - func_800F5E18(3, arg1, 0, 7, 2); + dist = sqrtf(SQ(pos->z) + SQ(pos->x)); + if (sSariaBgmPtr == NULL) { + sSariaBgmPtr = pos; + func_800F5E18(3, seqId, 0, 7, 2); } else { - temp_f0 = sqrtf(SQ(D_8013064C->z) + SQ(D_8013064C->x)); - if (phi_f14 < temp_f0) { - D_8013064C = arg0; + prevDist = sqrtf(SQ(sSariaBgmPtr->z) + SQ(sSariaBgmPtr->x)); + if (dist < prevDist) { + sSariaBgmPtr = pos; } else { - phi_f14 = temp_f0; + dist = prevDist; } } - if (arg0->y < 0.0f) { - phi_f2 = -arg0->y; + if (pos->y < 0.0f) { + absY = -pos->y; } else { - phi_f2 = arg0->y; + absY = pos->y; } - if ((arg2 / 15.0f) < phi_f2) { - phi_a2 = 0; - } else if (phi_f14 < arg2) { - phi_a2 = (1.0f - (phi_f14 / arg2)) * 127.0f; + if ((distMax / 15.0f) < absY) { + vol = 0; + } else if (dist < distMax) { + vol = (1.0f - (dist / distMax)) * 127.0f; } else { - phi_a2 = 0; + vol = 0; } - if (arg1 != 0x28) { - func_800F510C(phi_a2); + if (seqId != 40) { + func_800F510C(vol); } - Audio_SetVolScale(3, 3, phi_a2, 0); - Audio_SetVolScale(0, 3, (0x7F - phi_a2), 0); + Audio_SetVolScale(3, 3, vol, 0); + Audio_SetVolScale(0, 3, 0x7F - vol, 0); } -void func_800F5504(void) { - D_8013064C = NULL; +void Audio_ClearSariaBgm2(void) { + sSariaBgmPtr = NULL; } -void func_800F5510(u16 arg0) { - func_800F5550(arg0); - func_800F5E18(0, arg0, 0, 0, 1); +void func_800F5510(u16 seqId) { + func_800F5550(seqId); + func_800F5E18(0, seqId, 0, 0, 1); } -void func_800F5550(u16 arg0) { +void func_800F5550(u16 seqId) { u8 sp27 = 0; u16 nv; @@ -3329,23 +3328,23 @@ void func_800F5550(u16 arg0) { Audio_QueueCmdS32(0xF8000000, 0); } - if ((D_80130658[D_80130630] & 0x20) && D_80130658[(arg0 & 0xFF) & 0xFF] & 0x10) { + if ((D_80130658[D_80130630] & 0x20) && D_80130658[(seqId & 0xFF) & 0xFF] & 0x10) { if ((D_8013062C & 0x3F) != 0) { sp27 = 0x1E; } - func_800F5E18(0, arg0, sp27, 7, D_8013062C); + func_800F5E18(0, seqId, sp27, 7, D_8013062C); D_8013062C = 0; } else { - nv = (D_80130658[(arg0 & 0xFF) & 0xFF] & 0x40) ? 1 : 0xFF; - func_800F5E18(0, arg0, 0, 7, nv); - if (!(D_80130658[arg0] & 0x20)) { + nv = (D_80130658[(seqId & 0xFF) & 0xFF] & 0x40) ? 1 : 0xFF; + func_800F5E18(0, seqId, 0, 7, nv); + if (!(D_80130658[seqId] & 0x20)) { D_8013062C = 0xC0; } } - D_80130630 = arg0 & 0xFF; + D_80130630 = seqId & 0xFF; } } @@ -3490,7 +3489,7 @@ void func_800F5C64(u16 arg0) { void func_800F5CF8(void) { u16 sp26; - u16 sp24; + u16 pad; u16 sp22; if (D_8016B9F4 != 0) { @@ -3532,7 +3531,7 @@ void func_800F5E90(u8 arg0) { D_80130654 = arg0; if (D_80130628 == 0xFFFF) { - if (D_8013060C != 0) { + if (sAudioCutsceneFlag) { arg0 = 3; } phi_t1 = D_8016E750[0].unk_254; @@ -3544,16 +3543,16 @@ void func_800F5E90(u8 arg0) { if ((phi_t1 == 0xFFFF) || ((D_80130658[phi_a3] & 1) != 0) || ((D_8013061C & 0x7F) == 1)) { if (arg0 != (D_8013061C & 0x7F)) { if (arg0 == 1) { - if (D_8016E750[3].volScales[1] - D_80130624 < 0) { - phi_t0 = -(D_8016E750[3].volScales[1] - D_80130624); + if (D_8016E750[3].volScales[1] - sAudioEnemyVol < 0) { + phi_t0 = -(D_8016E750[3].volScales[1] - sAudioEnemyVol); } else { - phi_t0 = D_8016E750[3].volScales[1] - D_80130624; + phi_t0 = D_8016E750[3].volScales[1] - sAudioEnemyVol; } - Audio_SetVolScale(3, 3, D_80130624, phi_t0); + Audio_SetVolScale(3, 3, sAudioEnemyVol, phi_t0); Audio_StartSeq(3, 10, 0x81A); if (phi_t1 != 1) { - Audio_SetVolScale(0, 3, (0x7F - D_80130624) & 0xFF, 0xA); - func_800F510C(D_80130624); + Audio_SetVolScale(0, 3, (0x7F - sAudioEnemyVol) & 0xFF, 0xA); + func_800F510C(sAudioEnemyVol); } } else { if ((D_8013061C & 0x7F) == 1) { @@ -3592,79 +3591,79 @@ void func_800F5E90(u8 arg0) { } } -void func_800F6114(f32 arg0) { - f32 phi_f0; +void func_800F6114(f32 dist) { + f32 adjDist; if (D_8013061C == 0x81) { - if (arg0 != D_80130620) { - if (arg0 < 150.0f) { - phi_f0 = 0.0f; - } else if (arg0 > 500.0f) { - phi_f0 = 350.0f; + if (dist != sAudioEnemyDist) { + if (dist < 150.0f) { + adjDist = 0.0f; + } else if (dist > 500.0f) { + adjDist = 350.0f; } else { - phi_f0 = arg0 - 150.0f; + adjDist = dist - 150.0f; } - D_80130624 = ((350.0f - phi_f0) * 127.0f) / 350.0f; - Audio_SetVolScale(3, 3, D_80130624, 0xA); + sAudioEnemyVol = ((350.0f - adjDist) * 127.0f) / 350.0f; + Audio_SetVolScale(3, 3, sAudioEnemyVol, 0xA); if (D_8016E750[0].unk_254 != 1) { - Audio_SetVolScale(0, 3, (0x7F - D_80130624), 0xA); + Audio_SetVolScale(0, 3, (0x7F - sAudioEnemyVol), 0xA); } } if (D_8016E750[0].unk_254 != 1) { - func_800F510C(D_80130624); + func_800F510C(sAudioEnemyVol); } } - D_80130620 = arg0; + sAudioEnemyDist = dist; } -void func_800F6268(f32 arg0, u16 arg1) { +void func_800F6268(f32 dist, u16 arg1) { s8 pad; s8 phi_v1; s16 temp_a0; - D_8016BAA8 = 1; - D_8016BAAC = arg0; + sAudioHasMalonBgm = true; + sAudioMalonBgmDist = dist; if (D_8016B9F2 == 0) { temp_a0 = (s8)(func_800FA0B4(0) & 0xFF); if (temp_a0 == (arg1 & 0xFF)) { if ((arg1 & 0xFF) == 0x2F) { - if (arg0 > 2000.0f) { + if (dist > 2000.0f) { phi_v1 = 127; - } else if (arg0 < 200.0f) { + } else if (dist < 200.0f) { phi_v1 = 0; } else { - phi_v1 = (s8)(((arg0 - 200.0f) * 127.0f) / 1800.0f); + phi_v1 = (s8)(((dist - 200.0f) * 127.0f) / 1800.0f); } Audio_SeqCmd6(0, 3, 0, 127 - phi_v1); Audio_SeqCmd6(0, 3, 1, 127 - phi_v1); Audio_SeqCmd6(0, 3, 13, phi_v1); - if (D_8016B9D8[0] == 0) { - D_8016B9D8[0]++; + if (D_8016B9D8 == 0) { + D_8016B9D8++; } } } else if ((temp_a0 == 1) && ((arg1 & 0xFF) == 0x2F)) { temp_a0 = (s8)(func_800FA0B4(3) & 0xFF); - if ((temp_a0 != (arg1 & 0xFF)) && (D_8016B9D8[0] < 10)) { + if ((temp_a0 != (arg1 & 0xFF)) && (D_8016B9D8 < 10)) { func_800F5E18(3, 0x2F, 0, 0, 0); Audio_SeqCmdA(3, 0xFFFC); - D_8016B9D8[0] = 10; + D_8016B9D8 = 10; } - if (arg0 > 2000.0f) { + if (dist > 2000.0f) { phi_v1 = 127; - } else if (arg0 < 200.0f) { + } else if (dist < 200.0f) { phi_v1 = 0; } else { - phi_v1 = (s8)(((arg0 - 200.0f) * 127.0f) / 1800.0f); + phi_v1 = (s8)(((dist - 200.0f) * 127.0f) / 1800.0f); } Audio_SeqCmd6(3, 3, 0, 127 - phi_v1); Audio_SeqCmd6(3, 3, 1, 127 - phi_v1); } - if (D_8016B9D8[0] < 10) { - D_8016B9D8[0]++; + if (D_8016B9D8 < 10) { + D_8016B9D8++; } } } @@ -3672,10 +3671,10 @@ void func_800F6268(f32 arg0, u16 arg1) { void func_800F64E0(u8 arg0) { D_80130608 = arg0; if (arg0 != 0) { - Audio_PlaySoundGeneral(0x4800, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_SY_WIN_OPEN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); Audio_QueueCmdS32(0xF1000000, 0); } else { - Audio_PlaySoundGeneral(0x4801, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_SY_WIN_CLOSE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); Audio_QueueCmdS32(0xF2000000, 0); } } @@ -3713,13 +3712,13 @@ void func_800F6584(u8 arg0) { } } -void func_800F66C0(s8 arg0) { - D_80130614 = arg0 & 0x7F; +void Audio_SetEnvReverb(s8 reverb) { + sAudioEnvReverb = reverb & 0x7F; } -void func_800F66DC(s8 arg0) { - if (arg0 != 0) { - D_80130618 = arg0 & 0x7F; +void Audio_SetCodeReverb(s8 reverb) { + if (reverb != 0) { + sAudioCodeReverb = reverb & 0x7F; } } @@ -3751,9 +3750,9 @@ void func_800F6700(s8 arg0) { void func_800F67A0(u8 arg0) { if (D_8013063C != arg0) { if (arg0 == 0) { - Audio_StopSfx(0x86B); + Audio_StopSfx(NA_SE_PL_IN_BUBBLE); } else if (D_8013063C == 0) { - Audio_PlaySoundGeneral(0x86B, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_PL_IN_BUBBLE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } } D_8013063C = arg0; @@ -3774,41 +3773,41 @@ void func_800F6828(u8 arg0) { } } -void func_800F68BC(s8 arg0) { - D_8013060C = arg0; +void Audio_SetCutsceneFlag(s8 flag) { + sAudioCutsceneFlag = flag; } -void func_800F68D4(u16 arg0, Vec3f* arg1, u8 arg2, u32* arg3, u32* arg4, u32* arg5) { - if (D_8013060C == 0) { - Audio_PlaySoundGeneral(arg0, arg1, arg2, arg3, arg4, arg5); +void Audio_PlaySoundGeneralIfNotInCutscene(u16 sfxId, Vec3f* pos, u8 arg2, f32* freqScale, f32* arg4, s8* reverbAdd) { + if (!sAudioCutsceneFlag) { + Audio_PlaySoundGeneral(sfxId, pos, arg2, freqScale, arg4, reverbAdd); } } -void func_800F691C(u16 arg0) { - func_800F68D4(arg0, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); +void Audio_PlaySoundIfNotInCutscene(u16 sfxId) { + Audio_PlaySoundGeneralIfNotInCutscene(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } void func_800F6964(u16 arg0) { - s32 phi_v1; + s32 skip; u8 i; Audio_SeqCmd1(0, (arg0 * 3) / 2); Audio_SeqCmd1(1, (arg0 * 3) / 2); for (i = 0; i < 0x10; i++) { - phi_v1 = 0; + skip = false; switch (i) { case 0xB: case 0xC: - if (D_80133414 == 10) { - phi_v1 = 1; + if (gAudioSpecId == 10) { + skip = true; } break; case 0xD: - phi_v1 = 1; + skip = true; break; } - if (!phi_v1) { + if (!skip) { Audio_SeqCmd6(2, arg0 >> 1, i, 0); } } @@ -3863,22 +3862,22 @@ void func_800F6C34(void) { D_80130644 = 0; D_80130648 = 0; func_800ED858(0); - D_8016B7B8.unk_0C = 0; - D_8016B7C8.unk_0C = 0; - D_8016B7B8.unk_00 = 1.0f; - D_8016B7C8.unk_00 = 1.0f; + sRiverFreqScaleLerp.remainingFrames = 0; + sWaterfallFreqScaleLerp.remainingFrames = 0; + sRiverFreqScaleLerp.value = 1.0f; + sWaterfallFreqScaleLerp.value = 1.0f; D_8016B7D8 = 1.0f; D_8016B8B0 = 0x7F; D_8016B8B1 = 0x7F; D_8016B8B2 = 0; D_8016B8B3 = 0; - D_8016B8B4 = 0xFF; - D_8016B9D8[0] = 0; - D_80130610 = D_801306C8[D_80133414]; + sAudioGanonDistVol = 0xFF; + D_8016B9D8 = 0; + sSpecReverb = sSpecReverbs[gAudioSpecId]; D_80130608 = 0; D_80130628 = 0xFFFF; Audio_QueueCmdS8(0x46000000, -1); - D_8013064C = NULL; + sSariaBgmPtr = NULL; D_8016B9F4 = 0; D_8016B9F3 = 1; D_8016B9F2 = 0; @@ -3890,13 +3889,13 @@ void func_800F6D58(u8 arg0, u8 arg1, u8 arg2) { u8 i; if ((D_8016E750[0].unk_254 != 1) && func_800FA11C(1, 0xF00000FF)) { - D_80131F64 = 1; + sAudioNatureFailed = 1; return; } if (((arg0 << 8) + arg1) == 0x101) { if (func_800FA0B4(3) != 0x2F) { - *D_8016B9D8 = 0; + D_8016B9D8 = 0; } } @@ -3949,7 +3948,7 @@ void func_800F6FB4(u8 arg0) { u8 b1; u8 b2; - if ((D_8016E750[0].unk_254 == 0xFFFF) || ((D_80130658[((u8)D_8016E750[0].unk_254) & 0xFFFF] & 0x80) == 0)) { + if ((D_8016E750[0].unk_254 == 0xFFFF) || ((D_80130658[((u8)D_8016E750[0].unk_254) & 0xFF] & 0x80) == 0)) { func_800F6E7C(D_801306DC[arg0].unk_00, D_801306DC[arg0].unk_02); while ((D_801306DC[arg0].unk_04[i] != 0xFF) && (i < 100)) { // Probably a fake match, using Audio_SeqCmd8 doesn't work. @@ -3973,7 +3972,7 @@ void func_800F711C(void) { func_800F3ED4(); func_800FAEB4(); func_800F905C(); - func_800F9280(2, 0, 0x70, 0xA); + func_800F9280(2, 0, 0x70, 10); } void func_800F7170(void) { |