diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-08-30 20:55:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 14:55:37 -0400 |
| commit | 1ab4e6ee5f450aa13bd591dc186780681870c03f (patch) | |
| tree | ea29c003e9eaad9a880592af5c2da2f65a7bca93 /src/code/code_800EC960.c | |
| parent | 327a813b37ebc98d75e92ed03b0d14fa69915204 (diff) | |
`stickRel` -> `stickAdj` (#1367)
* kaleido and filselect
* ocarina and KaleidoScope_UpdatePrompt
Diffstat (limited to 'src/code/code_800EC960.c')
| -rw-r--r-- | src/code/code_800EC960.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index 876d4f7cb..074fececa 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -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 { |