falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `CHECK_BTN_ANY` more

This commit is contained in:
Dragorn421 2021-09-21 10:53:45 +02:00
parent fffd300be3
commit f93eee8320
No known key found for this signature in database
GPG Key ID: C182A3A3996E8201
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
View File

@ -574,7 +574,7 @@ void EnTorch2_Update(Actor* thisx, GlobalContext* globalCtx2) {
pad54 = input->prev.button ^ input->cur.button;
input->press.button = input->cur.button & pad54;
if (input->cur.button & BTN_R) {
if (CHECK_BTN_ANY(input->cur.button, BTN_R)) {
input->cur.button = ((sCounterState == 0) && (this->swordState == 0)) ? BTN_R : input->cur.button ^ BTN_R;
}
input->rel.button = input->prev.button & pad54;

8
src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.c
View File

@ -319,21 +319,21 @@ void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) {
heldDBtnTimer = 16;
}
if (dBtnInput & BTN_DDOWN) {
if (CHECK_BTN_ANY(dBtnInput, BTN_DDOWN)) {
if ((u32)++curRow > 10) {
curRow = 0;
}
curSection = sRowFirstSections[curRow];
} else if (dBtnInput & BTN_DUP) {
} else if (CHECK_BTN_ANY(dBtnInput, BTN_DUP)) {
if (--curRow < 0) {
curRow = 22;
}
curSection = sRowFirstSections[curRow];
} else if (dBtnInput & BTN_DLEFT) {
} else if (CHECK_BTN_ANY(dBtnInput, BTN_DLEFT)) {
if (--curSection < 0) {
curSection = 0x5C;
}
} else if (dBtnInput & BTN_DRIGHT) {
} else if (CHECK_BTN_ANY(dBtnInput, BTN_DRIGHT)) {
if (++curSection > 0x5C) {
curSection = 0;
}