admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Backport r167 and r168 - mapper 35 fixes

Browse Source
This commit is contained in:
Oggom
2015-06-18 16:41:53 +02:00
parent 4ec659eb06
commit 86d3ef5171
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/boards/sc-127.c
View File

@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* Wario Land II (Kirby hack) VRC4 * Wario Land II (Kirby hack)
*/ */
#include "mapinc.h" #include "mapinc.h"
@@ -31,16 +31,18 @@ static SFORMAT StateRegs[] =
{ {
{ reg, 8, "REGS" }, { reg, 8, "REGS" },
{ chr, 8, "CHRS" }, { chr, 8, "CHRS" },
{ &IRQCount, 16, "IRQc" }, { &IRQCount, 2, "IRQc" },
{ &IRQa, 16, "IRQa" }, { &IRQa, 2, "IRQa" },
{ 0 } { 0 }
}; };
static void Sync(void) { static void Sync(void) {
int i; int i;
setprg8r(0x10, 0x6000, 0);
setprg8(0x8000, reg[0]); setprg8(0x8000, reg[0]);
setprg8(0xA000, reg[1]); setprg8(0xA000, reg[1]);
setprg8(0xC000, reg[2]); setprg8(0xC000, reg[2]);
setprg8(0xE000, ~0);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
setchr1(i << 10, chr[i]); setchr1(i << 10, chr[i]);
setmirror(reg[3] ^ 1); setmirror(reg[3] ^ 1);
@@ -67,20 +69,26 @@ static DECLFW(UNLSC127Write) {
Sync(); Sync();
} }
static DECLFR(UNLSC127ProtRead) {
return 0x20;
}
static void UNLSC127Power(void) { static void UNLSC127Power(void) {
IRQCount = IRQa = 0;
Sync(); Sync();
setprg8r(0x10, 0x6000, 0); SetReadHandler(0x5800, 0x5800, UNLSC127ProtRead);
setprg8(0xE000, ~0);
SetReadHandler(0x6000, 0x7fff, CartBR); SetReadHandler(0x6000, 0x7fff, CartBR);
SetWriteHandler(0x6000, 0x7fff, CartBW); SetWriteHandler(0x6000, 0x7fff, CartBW);
SetReadHandler(0x8000, 0xFFFF, CartBR); SetReadHandler(0x8000, 0xFFFF, CartBR);
SetWriteHandler(0x8000, 0xFFFF, UNLSC127Write); SetWriteHandler(0x8000, 0xFFFF, UNLSC127Write);
FCEU_CheatAddRAM(WRAMSIZE >> 10, 0x6000, WRAM);
} }
static void UNLSC127IRQ(void) { static void UNLSC127IRQ(void) {
if (IRQa) { if (IRQa) {
IRQCount--; if(IRQCount > 0)
if (IRQCount == 0) { IRQCount--;
if (!IRQCount) {
X6502_IRQBegin(FCEU_IQEXT); X6502_IRQBegin(FCEU_IQEXT);
IRQa = 0; IRQa = 0;
} }
@@ -88,6 +96,7 @@ static void UNLSC127IRQ(void) {
} }
static void UNLSC127Reset(void) { static void UNLSC127Reset(void) {
IRQCount = IRQa = 0;
} }
static void UNLSC127Close(void) { static void UNLSC127Close(void) {