diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-28 01:54:11 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-27 11:54:11 -0300 |
| commit | 55badb7162411a852b1747332eb62f3263559a1a (patch) | |
| tree | c224ce4c3599e72c5e6743b3e5a7735e4268d9a1 /src/audio | |
| parent | 5284302c8fcd7a708e427968b4737d7659d1fb44 (diff) | |
Misc Cleanup (#1509)
* begin anim R
* sTexturesDesegmented
* more misc docs
* more misc cleanup
* small adjustments
* oh sneaky
* PR Review
* adj comment, reads better
* missed an enum
* this one actor reverses true/false
* bool
* CARNIVOROUS_LILY
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/lib/heap.c | 4 | ||||
| -rw-r--r-- | src/audio/lib/load.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/audio/lib/heap.c b/src/audio/lib/heap.c index e4412bc94..4101ab7b7 100644 --- a/src/audio/lib/heap.c +++ b/src/audio/lib/heap.c @@ -1401,8 +1401,8 @@ void AudioHeap_ChangeStorage(StorageChange* change, Sample* sample) { uintptr_t startAddr = change->oldAddr; uintptr_t endAddr = change->oldAddr + change->size; - if (startAddr <= (uintptr_t)sample->sampleAddr && (uintptr_t)sample->sampleAddr < endAddr) { - sample->sampleAddr = sample->sampleAddr - startAddr + change->newAddr; + if (((uintptr_t)sample->sampleAddr >= startAddr) && ((uintptr_t)sample->sampleAddr < endAddr)) { + sample->sampleAddr += -startAddr + change->newAddr; if (D_801FD120 == 0) { sample->medium = change->newMedium; } else { diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c index d4e23a86a..37a68ff4c 100644 --- a/src/audio/lib/load.c +++ b/src/audio/lib/load.c @@ -1726,7 +1726,7 @@ void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus) { asyncLoad->bytesRemaining -= asyncLoad->chunkSize; asyncLoad->curDevAddr += asyncLoad->chunkSize; - asyncLoad->curRamAddr = asyncLoad->curRamAddr + asyncLoad->chunkSize; + asyncLoad->curRamAddr += asyncLoad->chunkSize; } void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, size_t size) { |