diff options
| author | mzxrules <mzxrules@gmail.com> | 2021-07-28 17:59:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 23:59:52 +0200 |
| commit | df5e1c63c08d74c7c558f7863e7fc1feac39aa2c (patch) | |
| tree | 981004a77b55e93c2ff24833b9b46b938087ac27 /src/code/code_800E4FE0.c | |
| parent | 6f7312a3480f722425f31fcacbd031c1155bc4d6 (diff) | |
z_en_ko OK (#869)
* .data OK
* Progress
* push some old stuff
* Finish a chain
* Progress
* Progress
* Run mathfixer.py
* Progress
* match one more
* Up to date
* Match func_80A97610
* func_80A96FD0
* most of the way through the mega switch
* small formatting thing. still stuck on the switch
* start a big switch function
* a little closer
* done with matching for now starting objects
* func_80A97738 OK!
* func_80A995CC OK!
* func_80A99864 OK!
* en_ko OK!
* Code clean-up pass
* more EnKo cleanups, object_fa and object_kw1 textures documented
* complete object_km1, more EnKo documentation
* More documentation
* delete asm
* Clean-up rebase issues
* bleh
* Implement Dragorn's suggestions
* fix spec, implement fig's suggestions
* whoops (ill leave it for the docs tho lol)
* whoops again
* i made an ouchie
* smile
* last one for real
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Diffstat (limited to 'src/code/code_800E4FE0.c')
| -rw-r--r-- | src/code/code_800E4FE0.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c index 6be070381..cd5382e6c 100644 --- a/src/code/code_800E4FE0.c +++ b/src/code/code_800E4FE0.c @@ -165,13 +165,11 @@ AudioTask* func_800E5000(void) { gAudioContext.curAbiCmdBuf = gAudioContext.abiCmdBufs[gAudioContext.rspTaskIdx]; gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] = (s16)((((gAudioContext.audioBufferParameters.samplesPerFrameTarget - sp6C) + 0x80) & 0xFFF0) + 0x10); - if (gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] < - gAudioContext.audioBufferParameters.minAiBufferLength) { + if (gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] < gAudioContext.audioBufferParameters.minAiBufferLength) { gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] = gAudioContext.audioBufferParameters.minAiBufferLength; } - if (gAudioContext.audioBufferParameters.maxAiBufferLength < - gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx]) { + if (gAudioContext.audioBufferParameters.maxAiBufferLength < gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx]) { gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx] = gAudioContext.audioBufferParameters.maxAiBufferLength; } @@ -192,7 +190,7 @@ AudioTask* func_800E5000(void) { gAudioContext.aiBufLengths[gAudioContext.curAIBufIdx]); gAudioContext.audioRandom = osGetCount() * (gAudioContext.audioRandom + gAudioContext.totalTaskCnt); gAudioContext.audioRandom = gAudioContext.aiBuffers[gAudioContext.curAIBufIdx][gAudioContext.totalTaskCnt & 0xFF] + - gAudioContext.audioRandom; + gAudioContext.audioRandom; ; gWaveSamples[8] = (s16*)((((u8*)func_800E4FE0)) + (gAudioContext.audioRandom & 0xFFF0)); gAudioContext.currTask->taskQueue = NULL; @@ -536,8 +534,10 @@ s32 func_800E5EDC(void) { } void func_800E5F34(void) { - // probably a macro of some type? - s32 chk = -1;s32 sp28;do { } while (osRecvMesg(gAudioContext.audioResetQueueP, &sp28, 0) != chk); + // macro? + // clang-format off + s32 chk = -1; s32 sp28; do { } while (osRecvMesg(gAudioContext.audioResetQueueP, &sp28, 0) != chk); + // clang-format on } s32 func_800E5F88(u32 resetPreloadID) { |