Reapply "Set Sample Rate to 32000 hz (#4780)" (#5234)#5508
Merged
Malkierian merged 2 commits intoHarbourMasters:developfrom Jun 19, 2025
Merged
Reapply "Set Sample Rate to 32000 hz (#4780)" (#5234)#5508Malkierian merged 2 commits intoHarbourMasters:developfrom
Malkierian merged 2 commits intoHarbourMasters:developfrom
Conversation
…asters#5234) This reverts commit feea299. Also applies rupee screech fix LL provided to 2ship.
serprex
reviewed
Jun 19, 2025
| @@ -561,15 +561,8 @@ void OTRAudio_Thread() { | |||
| // AudioMgr_ThreadEntry(&gAudioMgr); | |||
| // 528 and 544 relate to 60 fps at 32 kHz 32000/60 = 533.333.. | |||
Contributor
There was a problem hiding this comment.
Suggested change
| // 528 and 544 relate to 60 fps at 32 kHz 32000/60 = 533.333.. | |
| // 528 and 560 relate to 60 fps at 32 kHz 32000/60 = 533.333.. |
stale comment?
Contributor
Author
There was a problem hiding this comment.
No, 544 is the accurate number for the math, but the define was 560 from the beginning as far as I can tell. Doesn't seem to negatively impact it to leave it at 560, as that's what it is in 2ship as well.
Contributor
Author
There was a problem hiding this comment.
I think the point is that ideally it would be 544, but SoH/2ship aren't in an ideal state, which is why 560 is what's actually used.
krazyjakee
pushed a commit
to krazyjakee/OOT
that referenced
this pull request
Sep 6, 2025
…asters#5234) (HarbourMasters#5508) This reverts commit feea299. Also applies rupee screech fix LL provided to 2ship.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This reverts commit feea299.
Also applies rupee screech fix LL provided to 2ship (HarbourMasters/2ship2harkinian#1154). LL mentioned having found this fix originally on SoH because of having the octave shift option enabled, and as pointed out in the 2ship PR, it completely fixed the screech even on 32khz.
Build Artifacts