diff --git a/src/boards/BS110.c b/src/boards/BS110.c index caf02bf..b070481 100644 --- a/src/boards/BS110.c +++ b/src/boards/BS110.c @@ -49,10 +49,10 @@ static SFORMAT BS110_StateRegs[] = { mmc3_reg, 8, "MMC3R" }, { &pointer, 1, "POINT" }, { &readDIP, 1, "RDIP" }, - { &prgAND, 1, "PRGAND" }, - { &chrAND, 1, "CHRAND" }, - { &prgOR, 1, "PRGOR" }, - { &chrOR, 1, "CHROR" }, + { &prgAND, 2 | FCEUSTATE_RLSB, "PRGAND" }, + { &chrAND, 2 | FCEUSTATE_RLSB, "CHRAND" }, + { &prgOR, 2 | FCEUSTATE_RLSB, "PRGOR" }, + { &chrOR, 2 | FCEUSTATE_RLSB, "CHROR" }, { &nrom, 1, "NROM" }, { &nrom128, 1, "N128" }, { &dipswitch, 1, "DIP" }, diff --git a/src/boards/Bs5652.c b/src/boards/Bs5652.c index 4f86c83..cba0004 100644 --- a/src/boards/Bs5652.c +++ b/src/boards/Bs5652.c @@ -50,10 +50,10 @@ static SFORMAT BS5652_StateRegs[] = { mmc3_reg, 8, "MMC3R" }, { &pointer, 1, "POINT" }, { &readDIP, 1, "RDIP" }, - { &prgAND, 1, "PRGAND" }, - { &chrAND, 1, "CHRAND" }, - { &prgOR, 1, "PRGOR" }, - { &chrOR, 1, "CHROR" }, + { &prgAND, 2 | FCEUSTATE_RLSB, "PRGAND" }, + { &chrAND, 2 | FCEUSTATE_RLSB, "CHRAND" }, + { &prgOR, 2 | FCEUSTATE_RLSB, "PRGOR" }, + { &chrOR, 2 | FCEUSTATE_RLSB, "CHROR" }, { &nrom, 1, "NROM" }, { &nrom128, 1, "N128" }, { &dipswitch, 1, "DIP" }, diff --git a/src/boards/NC7000M.c b/src/boards/NC7000M.c index 736b5a1..af8632d 100644 --- a/src/boards/NC7000M.c +++ b/src/boards/NC7000M.c @@ -52,13 +52,13 @@ static SFORMAT NC7000M_StateRegs[] = { mmc3_reg, 8, "MMC3R" }, { &pointer, 1, "POINT" }, { &readDIP, 1, "RDIP" }, - { &prgAND, 1, "PRGAND" }, - { &chrAND, 1, "CHRAND" }, - { &prgOR, 1, "PRGOR" }, - { &chrOR, 1, "CHROR" }, + { &prgAND, 2 | FCEUSTATE_RLSB, "PRGAND" }, + { &chrAND, 2 | FCEUSTATE_RLSB, "CHRAND" }, + { &prgOR, 2 | FCEUSTATE_RLSB, "PRGOR" }, + { &chrOR, 2 | FCEUSTATE_RLSB, "CHROR" }, { &nrom, 1, "NROM" }, { &nrom256, 1, "N256" }, - { ®, 1, "REG" }, + { ®, 2 | FCEUSTATE_RLSB, "REG" }, { 0 } }; diff --git a/src/boards/vrc2and4.c b/src/boards/vrc2and4.c index e4bf412..b945b50 100644 --- a/src/boards/vrc2and4.c +++ b/src/boards/vrc2and4.c @@ -42,15 +42,22 @@ static uint8 prgMask = 0x1F; static SFORMAT StateRegs[] = { - { prgreg, 2, "PREG" }, + { prgreg, 4, "PREG" }, { chrreg, 8, "CREG" }, - { chrhi, 16, "CRGH" }, + { &chrhi[0], 2 | FCEUSTATE_RLSB, "CRH0" }, + { &chrhi[1], 2 | FCEUSTATE_RLSB, "CRH1" }, + { &chrhi[2], 2 | FCEUSTATE_RLSB, "CRH2" }, + { &chrhi[3], 2 | FCEUSTATE_RLSB, "CRH3" }, + { &chrhi[4], 2 | FCEUSTATE_RLSB, "CRH4" }, + { &chrhi[5], 2 | FCEUSTATE_RLSB, "CRH5" }, + { &chrhi[6], 2 | FCEUSTATE_RLSB, "CRH6" }, + { &chrhi[7], 2 | FCEUSTATE_RLSB, "CRH7" }, { ®cmd, 1, "CMDR" }, { &irqcmd, 1, "CMDI" }, { &mirr, 1, "MIRR" }, { &prgMask, 1, "MAK" }, { &big_bank, 1, "BIGB" }, - { &IRQCount, 2, "IRQC" }, + { &IRQCount, 2 | FCEUSTATE_RLSB, "IRQC" }, { &IRQLatch, 1, "IRQL" }, { &IRQa, 1, "IRQA" }, { 0 } diff --git a/src/ppu.c b/src/ppu.c index f01162b..ee96d1f 100644 --- a/src/ppu.c +++ b/src/ppu.c @@ -90,8 +90,8 @@ static void makeppulut(void) { } } -static int ppudead = 1; -static int kook = 0; +static uint8 ppudead = 1; +static uint8 kook = 0; int fceuindbg = 0; int MMC5Hack = 0, PEC586Hack = 0;