mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 07:24:34 +00:00
Code Issues Projects Releases Wiki Activity

stickRel -> stickAdj (#1367)

Browse source 
* kaleido and filselect

* ocarina and KaleidoScope_UpdatePrompt
This commit is contained in:
Dragorn421 2022-08-30 20:55:37 +02:00 • committed by GitHub
parent 327a813b37
commit 1ab4e6ee5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 93 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/code/code_800EC960.c
View file

@ -1246,7 +1246,7 @@ OcarinaStaff sPlayingStaff;
OcarinaStaff sPlaybackStaff;
OcarinaStaff sRecordingStaff;
u32 sOcarinaUpdateTaskStart;
OcarinaStick sOcarinaInputStickRel;
OcarinaStick sOcarinaInputStickAdj;
u32 sOcarinaInputButtonCur;
u32 sOcarinaInputButtonStart;
u32 sOcarinaInputButtonPrev;
@ -1299,8 +1299,8 @@ void AudioOcarina_ReadControllerInput(void) {
PadMgr_RequestPadData(&gPadMgr, inputs, 0);
sOcarinaInputButtonCur = input->cur.button;
sOcarinaInputButtonPrev = ocarinaInputButtonPrev;
sOcarinaInputStickRel.x = input->rel.stick_x;
sOcarinaInputStickRel.y = input->rel.stick_y;
sOcarinaInputStickAdj.x = input->rel.stick_x;
sOcarinaInputStickAdj.y = input->rel.stick_y;
}
/**
@ -1719,11 +1719,11 @@ void AudioOcarina_PlayControllerInput(u8 unused) {
if (sRecordingState != OCARINA_RECORD_SCARECROW_SPAWN) {
// Bend the pitch of the note based on y control stick
sCurOcarinaBendIndex = sOcarinaInputStickRel.y;
sCurOcarinaBendIndex = sOcarinaInputStickAdj.y;
sCurOcarinaBendFreq = AudioOcarina_BendPitchTwoSemitones(sCurOcarinaBendIndex);
// Add vibrato of the ocarina note based on the x control stick
sCurOcarinaVibrato = ABS_ALT(sOcarinaInputStickRel.x) >> 2;
sCurOcarinaVibrato = ABS_ALT(sOcarinaInputStickAdj.x) >> 2;
// Sets vibrato to io port 6
Audio_QueueCmdS8(0x6 << 24 | SEQ_PLAYER_SFX << 16 | SFX_CHANNEL_OCARINA << 8 | 6, sCurOcarinaVibrato);
} else {