mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Code Issues Projects Releases Wiki Activity

fix incorrect casing in cup button

Browse source
This commit is contained in:
playerskel 2021-12-26 01:17:58 +01:00
parent c74e255929
commit ac313b3965
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/code/code_800EC960.c
View file

@ -826,7 +826,7 @@ NatureAmbienceDataIO sNatureAmbienceDataIO[20] = {
u32 sOcarinaAllowedBtnMask = 0x800F; u32 sOcarinaAllowedBtnMask = 0x800F;
s32 sOcarinaABtnMap = 0x8000; s32 sOcarinaABtnMap = 0x8000;
s32 sOcarinaCUPBtnMap = 8; s32 sOcarinaCUpBtnMap = 8;
s32 sOcarinaCDownBtnMap = 4; s32 sOcarinaCDownBtnMap = 4;
u8 sOcarinaInpEnabled = 0; u8 sOcarinaInpEnabled = 0;
s8 D_80130F10 = 0; // "OCA", ocarina active? s8 D_80130F10 = 0; // "OCA", ocarina active?
@ -1250,13 +1250,13 @@ void func_800EC960(u8 custom) {
osSyncPrintf("AUDIO : Ocarina Control Assign Normal\n"); osSyncPrintf("AUDIO : Ocarina Control Assign Normal\n");
sOcarinaAllowedBtnMask = (BTN_A | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT); sOcarinaAllowedBtnMask = (BTN_A | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT);
sOcarinaABtnMap = BTN_A; sOcarinaABtnMap = BTN_A;
sOcarinaCUPBtnMap = BTN_CUP; sOcarinaCUpBtnMap = BTN_CUP;
sOcarinaCDownBtnMap = BTN_CDOWN; sOcarinaCDownBtnMap = BTN_CDOWN;
} else { } else {
osSyncPrintf("AUDIO : Ocarina Control Assign Custom\n"); osSyncPrintf("AUDIO : Ocarina Control Assign Custom\n");
sOcarinaAllowedBtnMask = (BTN_A | BTN_B | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT); sOcarinaAllowedBtnMask = (BTN_A | BTN_B | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT);
sOcarinaABtnMap = BTN_B; sOcarinaABtnMap = BTN_B;
sOcarinaCUPBtnMap = BTN_CDOWN; sOcarinaCUpBtnMap = BTN_CDOWN;
sOcarinaCDownBtnMap = BTN_A; sOcarinaCDownBtnMap = BTN_A;
} }
} }
@ -1575,11 +1575,11 @@ void func_800ED458(s32 arg0) {
sCurOcarinaBtnIdx = 2; sCurOcarinaBtnIdx = 2;
} else if (D_8016BA18 & 2) { } else if (D_8016BA18 & 2) {
osSyncPrintf("Presss NA_KEY_B4 %08x\n", 2); osSyncPrintf("Presss NA_KEY_B4 %08x\n", 2);
sCurOcarinaBtnVal = 0xB; sCurOcarinaBtnVal = 11;
sCurOcarinaBtnIdx = 3; sCurOcarinaBtnIdx = 3;
} else if (D_8016BA18 & sOcarinaCUPBtnMap) { } else if (D_8016BA18 & sOcarinaCUpBtnMap) {
osSyncPrintf("Presss NA_KEY_D5 %08x\n", sOcarinaCUPBtnMap); osSyncPrintf("Presss NA_KEY_D5 %08x\n", sOcarinaCUpBtnMap);
sCurOcarinaBtnVal = 0xE; sCurOcarinaBtnVal = 14;
sCurOcarinaBtnIdx = 4; sCurOcarinaBtnIdx = 4;
} }