Oops again... Fixed switched WUPC and CC defines

This commit is contained in:
aplumafreak500 2018-08-15 13:21:05 -04:00
parent acc356bd03
commit 950d7a522a

View File

@ -873,7 +873,7 @@ static u32 DecodeJoy(unsigned short pad)
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_WUPC][i]) ))
J |= vbapadmap[i]; J |= vbapadmap[i];
} }
} }
@ -881,7 +881,7 @@ static u32 DecodeJoy(unsigned short pad)
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_WUPC][i]) )) || ( (wpad_btns_h & btnmap[CTRLR_CLASSIC][i]) ))
J |= vbapadmap[i]; J |= vbapadmap[i];
} }
} }