From 1352e2fc4fd14367312e7993094e30dd7e3f1bbc Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 24 Feb 2020 19:54:05 -0800 Subject: [PATCH] GBA SIO: Fix Multiplayer busy bit --- CHANGES | 1 + include/mgba/internal/gba/sio.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 625d76311..83a8c25cb 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,7 @@ Emulation fixes: - GBA BIOS: Improve HLE BIOS timing - GBA DMA: Linger last DMA on bus (fixes mgba.io/i/301 and mgba.io/i/1320) - GBA Memory: Improve gamepak prefetch timing + - GBA SIO: Fix Multiplayer busy bit - GBA Video: Latch scanline at end of Hblank (fixes mgba.io/i/1319) - GBA Video: Fix Hblank timing Other fixes: diff --git a/include/mgba/internal/gba/sio.h b/include/mgba/internal/gba/sio.h index df4cd2f7a..7a4e3ecfb 100644 --- a/include/mgba/internal/gba/sio.h +++ b/include/mgba/internal/gba/sio.h @@ -47,7 +47,7 @@ DECL_BIT(GBASIOMultiplayer, Slave, 2); DECL_BIT(GBASIOMultiplayer, Ready, 3); DECL_BITS(GBASIOMultiplayer, Id, 4, 2); DECL_BIT(GBASIOMultiplayer, Error, 6); -DECL_BIT(GBASIOMultiplayer, Busy, 8); +DECL_BIT(GBASIOMultiplayer, Busy, 7); DECL_BIT(GBASIOMultiplayer, Irq, 14); struct GBASIODriverSet {