From b2fdb22cd73b307d55eed86ecb3074c728f075d1 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 12 Mar 2021 20:19:16 -0800 Subject: [PATCH] GBA SIO: Fix TRANS bit clearing order --- src/gba/sio/joybus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gba/sio/joybus.c b/src/gba/sio/joybus.c index 7b4f9e207..6cfca878f 100644 --- a/src/gba/sio/joybus.c +++ b/src/gba/sio/joybus.c @@ -72,15 +72,15 @@ int GBASIOJOYSendCommand(struct GBASIODriver* sio, enum GBASIOJOYCommand command } return 1; case JOY_TRANS: - sio->p->p->memory.io[REG_JOYCNT >> 1] |= JOYCNT_TRANS; - sio->p->p->memory.io[REG_JOYSTAT >> 1] &= ~JOYSTAT_TRANS; - data[0] = sio->p->p->memory.io[REG_JOY_TRANS_LO >> 1]; data[1] = sio->p->p->memory.io[REG_JOY_TRANS_LO >> 1] >> 8; data[2] = sio->p->p->memory.io[REG_JOY_TRANS_HI >> 1]; data[3] = sio->p->p->memory.io[REG_JOY_TRANS_HI >> 1] >> 8; data[4] = sio->p->p->memory.io[REG_JOYSTAT >> 1]; + sio->p->p->memory.io[REG_JOYCNT >> 1] |= JOYCNT_TRANS; + sio->p->p->memory.io[REG_JOYSTAT >> 1] &= ~JOYSTAT_TRANS; + mLOG(GBA_SIO, DEBUG, "JOY trans: %02X%02X%02X%02X:%02X (%02X)", data[0], data[1], data[2], data[3], data[4], sio->p->p->memory.io[REG_JOYCNT >> 1]); if (sio->p->p->memory.io[REG_JOYCNT >> 1] & 0x40) {