From 5d485206052a9dad5f6cbe2279d81cc17fa1bf1e Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 4 Feb 2017 18:30:50 -0800 Subject: [PATCH] GBA I/O: Handle audio registers specially when deserializing --- CHANGES | 1 + src/gba/io.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 37c771171..af099506a 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,7 @@ Bugfixes: - Util: Fix overflow when loading invalid UPS patches - GB: Fix crash when patching ROMs - Tools: Fix recurring multiple times over the same library + - GBA I/O: Handle audio registers specially when deserializing Misc: - Qt: Improved HiDPI support - Feature: Support ImageMagick 7 diff --git a/src/gba/io.c b/src/gba/io.c index 2a7fdc5b1..5f452b525 100644 --- a/src/gba/io.c +++ b/src/gba/io.c @@ -250,8 +250,8 @@ static const int _isRSpecialRegister[REG_MAX >> 1] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // Audio - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 1, 0, + 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, @@ -291,9 +291,9 @@ static const int _isWSpecialRegister[REG_MAX >> 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // Audio - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 0, + 1, 1, 1, 0, 1, 0, 1, 0, + 1, 1, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, // DMA