notaz.gp2x.de
/
fceu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge mapper code from FCEUX
[fceu.git]
/
mappers
/
42.c
diff --git
a/mappers/42.c
b/mappers/42.c
index
6bab879
..
10774bd
100644
(file)
--- a/
mappers/42.c
+++ b/
mappers/42.c
@@
-1,7
+1,7
@@
/* FCE Ultra - NES/Famicom Emulator
*
* Copyright notice for this file:
/* FCE Ultra - NES/Famicom Emulator
*
* Copyright notice for this file:
- * Copyright (C) 2002
Ben Parnel
l
+ * Copyright (C) 2002
Xodnize
l
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-15,7
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
#include "mapinc.h"
*/
#include "mapinc.h"
@@
-23,26
+23,26
@@
static DECLFW(Mapper42_write)
{
static DECLFW(Mapper42_write)
{
+// FCEU_printf("%04x:%04x\n",A,V);
switch(A&0xe003)
{
switch(A&0xe003)
{
- case 0x
e000:mapbyte1[0]=V;ROM_BANK8(0x6000,V&0xF)
;
-
X6502_Rebase(
);break;
+ case 0x
8000:VROM_BANK8(V);break
;
+
case 0xe000:mapbyte1[0]=V;ROM_BANK8(0x6000,V&0xF
);break;
case 0xe001:MIRROR_SET((V>>3)&1);break;
case 0xe001:MIRROR_SET((V>>3)&1);break;
- case 0xe002:IRQa=V&2;if(!IRQa) IRQCount=0;break;
+ case 0xe002:IRQa=V&2;if(!IRQa) IRQCount=0;
X6502_IRQEnd(FCEU_IQEXT);
break;
}
}
}
}
-static void
FP_FASTAPASS(1)
Mapper42IRQ(int a)
+static void Mapper42IRQ(int a)
{
if(IRQa)
{
{
if(IRQa)
{
- if(IRQCount<24576)
- IRQCount+=a;
+ IRQCount+=a;
+ if(IRQCount>=32768) IRQCount-=32768;
+ if(IRQCount>=24576)
+ X6502_IRQBegin(FCEU_IQEXT);
else
else
- {
- IRQa=0;
- TriggerIRQ();
- }
+ X6502_IRQEnd(FCEU_IQEXT);
}
}
}
}
@@
-56,7
+56,7
@@
void Mapper42_init(void)
{
ROM_BANK8(0x6000,0);
ROM_BANK32(~0);
{
ROM_BANK8(0x6000,0);
ROM_BANK32(~0);
- SetWriteHandler(0x
e
000,0xffff,Mapper42_write);
+ SetWriteHandler(0x
6
000,0xffff,Mapper42_write);
SetReadHandler(0x6000,0x7fff,CartBR);
MapStateRestore=Mapper42_StateRestore;
MapIRQHook=Mapper42IRQ;
SetReadHandler(0x6000,0x7fff,CartBR);
MapStateRestore=Mapper42_StateRestore;
MapIRQHook=Mapper42IRQ;