Move WUPC detection up a little

This commit is contained in:
aplumafreak500 2018-08-14 17:29:07 -04:00
parent 97a776df32
commit acc356bd03

View File

@ -869,25 +869,22 @@ static u32 DecodeJoy(unsigned short pad)
} }
else if(wpad_exp_type == WPAD_EXP_CLASSIC) else if(wpad_exp_type == WPAD_EXP_CLASSIC)
{ // classic controller { // classic controller
if (isWUPC) {
for (u32 i =0; i < MAXJP; ++i) for (u32 i =0; i < MAXJP; ++i)
{ {
if ((pad_btns_h & btnmap[CTRLR_GCPAD][i]) // gamecube controller if ((pad_btns_h & btnmap[CTRLR_GCPAD][i]) // gamecube controller
|| ( (wpad_btns_h & btnmap[CTRLR_CLASSIC][i]) )) || ( (wpad_btns_h & btnmap[CTRLR_CLASSIC][i]) ))
J |= vbapadmap[i]; J |= vbapadmap[i];
}
} }
else {
} for (u32 i =0; i < MAXJP; ++i)
else if(wpad_exp_type == WPAD_EXP_CLASSIC && isWUPC) {
{ // wii u pro if ((pad_btns_h & btnmap[CTRLR_GCPAD][i]) // gamecube controller
|| ( (wpad_btns_h & btnmap[CTRLR_WUPC][i]) ))
for (u32 i =0; i < MAXJP; ++i) J |= vbapadmap[i];
{ }
if ((pad_btns_h & btnmap[CTRLR_GCPAD][i]) // gamecube controller
|| ( (wpad_btns_h & btnmap[CTRLR_WUPC][i]) ))
J |= vbapadmap[i];
} }
} }
else if(wpad_exp_type == WPAD_EXP_NUNCHUK) else if(wpad_exp_type == WPAD_EXP_NUNCHUK)
{ // nunchuk + wiimote { // nunchuk + wiimote