merge mappers from FCEU-mm

[fceu.git] / mappers / 27.c

diff --git a/mappers/27.c b/mappers/27.c
index 9dbe5cf..c3b6b36 100644 (file)
--- a/mappers/27.c
+++ b/mappers/27.c
@@ -9,21 +9,16 @@ static DECLFW(Mapper27_write)
  if((A>=0xB000) && (A<=0xE003)) {\r
     regnum=((((A>>12)+1)&0x03)<<1)|((A&0x02)>>1);\r
     if(A&1)\r
-       regchr[regnum]=(regchr[regnum]&0x0F)|(V<<4);\r
+       regchr[regnum]=(regchr[regnum]&0x00F)|(V<<4);\r
     else\r
-       regchr[regnum]=(regchr[regnum]&0xFF0)|(V&0xF);\r
+       regchr[regnum]=(regchr[regnum]&0x1F0)|(V&0xF);\r
     VROM_BANK1(regnum<<10,regchr[regnum]);\r
  }\r
  switch(A)\r
  {\r
-  case 0x8000: if(regchr[8]&2)\r
-                  ROM_BANK8(0xc000,V);\r
-               else\r
-                  ROM_BANK8(0x8000,V);\r
-               break;\r
+  case 0x8000: ROM_BANK8(0x8000|((regchr[8]&2)<<13),V); break;\r
   case 0xA000: ROM_BANK8(0xa000,V); break;\r
-  case 0x9000:\r
-               switch(V&3){\r
+  case 0x9000: switch(V&3){\r
                   case 0:setmirror(MI_V);break;\r
                   case 1:setmirror(MI_H);break;\r
                   case 2:setmirror(MI_0);break;\r
@@ -40,8 +35,8 @@ static DECLFW(Mapper27_write)
                            X6502_IRQEnd(FCEU_IQEXT);\r
                break;\r
   case 0xF002: IRQa=V&3;\r
-                           if(IRQa&0x02) IRQCount=IRQLatch;\r
-                           X6502_IRQEnd(FCEU_IQEXT);\r
+                           if(IRQa&0x02) IRQCount=IRQLatch-1;\r
+//                           X6502_IRQEnd(FCEU_IQEXT);\r
                            break;\r
  }\r
 // if((A&0xF000)==0xF000) FCEU_printf("$%04x:$%02x, %d\n",A,V, scanline);\r