X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=mappers%2F95.c;h=11b6a8e5a44555ee8b64f7d4a3bc927cf2561b21;hp=4b208bec3dfb282413d5c5680838db70f078e28f;hb=d97315ac0bca825d2d50a44453bc5652946e2c67;hpb=890e37ba2b8ea1c7593dc05926d7431e3bd00bfb

diff --git a/mappers/95.c b/mappers/95.c
index 4b208be..11b6a8e 100644
--- a/mappers/95.c
+++ b/mappers/95.c
@@ -1,7 +1,7 @@
 /* FCE Ultra - NES/Famicom Emulator
  *
  * Copyright notice for this file:
- *  Copyright (C) 2002 Ben Parnell
+ *  Copyright (C) 2002 Xodnizel
  *
  * 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
@@ -20,8 +20,18 @@
 
 #include "mapinc.h"
 
+static uint8 lastA;
+static uint8 DRegs[8];
+static uint8 cmd;
+static uint8 MirCache[8];
+
+static SFORMAT DB_StateRegs[]={
+        {DRegs, 8, "DREG"},
+        {&cmd, 1, "CMD"},
+        {&lastA, 1, "LAST"},
+        {0}
+};
 
-#define dbarray mapbyte1
 static void FP_FASTAPASS(1) dragonbust_ppu(uint32 A)
 {
  static int last=-1;
@@ -29,10 +39,11 @@ static void FP_FASTAPASS(1) dragonbust_ppu(uint32 A)
 
  if(A>=0x2000) return;
 
- A>>=13;
+ A>>=10;
 
- z=dbarray[A];
+ lastA=A;
 
+ z=MirCache[A];
  if(z!=last)
  {
   onemir(z);
@@ -40,39 +51,86 @@ static void FP_FASTAPASS(1) dragonbust_ppu(uint32 A)
  }
 }
 
+static void toot(void)
+{
+ int x;
+
+ MirCache[0]=MirCache[1]=(DRegs[0]>>4)&1;
+ MirCache[2]=MirCache[3]=(DRegs[1]>>4)&1;
 
-DECLFW(Mapper95_write)
+ for(x=0;x<4;x++)
+  MirCache[4+x]=(DRegs[2+x]>>5)&1;
+ onemir(MirCache[lastA]);
+}
+
+static DECLFW(Mapper95_write)
 {
-        switch(A&0xF001){
-
-        case 0x8000:
-        MMC3_cmd = V;
-        break;
-
-        case 0x8001:
-                switch(MMC3_cmd&7){
-                case 0: dbarray[0]=dbarray[1]=(V&0x20)>>4;onemir((V&0x20)>>4);V>>=1;VROM_BANK2(0x0000,V);break;
-                case 1: dbarray[2]=dbarray[3]=(V&0x20)>>4;onemir((V&0x20)>>4);V>>=1;VROM_BANK2(0x0800,V);break;
-                case 2: dbarray[4]=(V&0x20)>>4;onemir((V&0x20)>>4);VROM_BANK1(0x1000,V); break;
-                case 3: dbarray[5]=(V&0x20)>>4;onemir((V&0x20)>>4);VROM_BANK1(0x1400,V); break;
-                case 4: dbarray[6]=(V&0x20)>>4;onemir((V&0x20)>>4);VROM_BANK1(0x1800,V); break;
-                case 5: dbarray[7]=(V&0x20)>>4;onemir((V&0x20)>>4);VROM_BANK1(0x1C00,V); break;
-                case 6:
-                        ROM_BANK8(0x8000,V);
-                        X6502_Rebase();
-                        break;
-                case 7:
-                        ROM_BANK8(0xA000,V);
-                        X6502_Rebase();
-                        break;
+        switch(A&0xF001)
+        {
+
+         case 0x8000:
+         cmd = V;
+         break;
+
+         case 0x8001:
+                switch(cmd&0x07)
+                {
+                 case 0: DRegs[0]=(V&0x3F)>>1;toot();V>>=1;setchr2(0x0000,V&0x1F);break;
+                 case 1: DRegs[1]=(V&0x3F)>>1;toot();V>>=1;setchr2(0x0800,V&0x1F);break;
+                 case 2: DRegs[2]=V&0x3F;toot();setchr1(0x1000,V&0x1F); break;
+                 case 3: DRegs[3]=V&0x3F;toot();setchr1(0x1400,V&0x1F); break;
+                 case 4: DRegs[4]=V&0x3F;toot();setchr1(0x1800,V&0x1F); break;
+                 case 5: DRegs[5]=V&0x3F;toot();setchr1(0x1C00,V&0x1F); break;
+                 case 6: DRegs[6]=V&0x3F;
+                         setprg8(0x8000,V);
+                         break;
+                 case 7: DRegs[7]=V&0x3F;
+                         setprg8(0xA000,V);
+                         break;
                 }
                 break;
+        }
 }
+
+static void DBSync()
+{
+ int x;
+
+ setchr2(0x0000,DRegs[0]);
+ setchr2(0x0800,DRegs[1]);
+
+ for(x=0;x<4;x++)
+  setchr1(0x1000+x*0x400,DRegs[2+x]);
+
+ setprg8(0x8000,DRegs[6]);
+ setprg8(0xa000,DRegs[7]);
+ toot();
+}
+
+static void DBPower(void)
+{
+ memset(DRegs,0x3F,8);
+ DRegs[0]=DRegs[1]=0x1F;
+
+ DBSync();
+
+ setprg8(0xc000,0x3E);
+ setprg8(0xe000,0x3F);
+
+ SetReadHandler(0x8000,0xffff,CartBR);
+ SetWriteHandler(0x8000,0xffff,Mapper95_write);
+}
+
+static void StateRestore(int version)
+{
+ DBSync();
 }
 
-void Mapper95_init(void)
+void Mapper95_Init(CartInfo *info)
 {
-  SetWriteHandler(0x8000,0xffff,Mapper95_write);
+  info->Power=DBPower;
+  AddExState(DB_StateRegs, ~0, 0, 0);
   PPU_hook=dragonbust_ppu;
+  GameStateRestore=StateRestore;
 }