ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmc5: use PPUON instead of spriteon and screenon

This commit is contained in:
zeromus 2017-04-29 05:38:32 +00:00
parent 7a54c133ce
commit 4a1e4b6423
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trunk/src/boards/mmc5.cpp
View File

@ -26,6 +26,7 @@
#define BBANKS MMC5BGVPage #define BBANKS MMC5BGVPage
#define SpriteON (PPU[1] & 0x10) //Show Sprite #define SpriteON (PPU[1] & 0x10) //Show Sprite
#define ScreenON (PPU[1] & 0x08) //Show screen #define ScreenON (PPU[1] & 0x08) //Show screen
#define PPUON (PPU[1] & 0x18) //PPU should operate
static void (*sfun)(int P); static void (*sfun)(int P);
static void (*psfun)(void); static void (*psfun)(void);
@ -117,9 +118,10 @@ typedef struct __cartdata {
static inline uint8 * MMC5BGVRAMADR(uint32 A) { static inline uint8 * MMC5BGVRAMADR(uint32 A) {
if(Sprite16) if(Sprite16)
{ {
if (ppuphase == PPUPHASE_OBJ && SpriteON) bool isPattern = PPUON;
if (ppuphase == PPUPHASE_OBJ && isPattern)
return &ABANKS[(A) >> 10][(A)]; return &ABANKS[(A) >> 10][(A)];
if (ppuphase == PPUPHASE_BG && ScreenON) if (ppuphase == PPUPHASE_BG && isPattern)
return &BBANKS[(A) >> 10][(A)]; return &BBANKS[(A) >> 10][(A)];
else if(mmc5ABMode == 0) else if(mmc5ABMode == 0)
return &ABANKS[(A) >> 10][(A)]; return &ABANKS[(A) >> 10][(A)];
@ -174,9 +176,10 @@ uint8 FASTCALL mmc5_PPURead(uint32 A)
{ {
if(Sprite16) if(Sprite16)
{ {
if (ppuphase == PPUPHASE_OBJ && SpriteON) bool isPattern = PPUON;
if (ppuphase == PPUPHASE_OBJ && isPattern)
return ABANKS[(A) >> 10][(A)]; return ABANKS[(A) >> 10][(A)];
if (ppuphase == PPUPHASE_BG && ScreenON) if (ppuphase == PPUPHASE_BG && isPattern)
{ {
if(split) if(split)
return MMC5HackVROMPTR[MMC5HackSPPage*0x1000 + (A&0xFFF)]; return MMC5HackVROMPTR[MMC5HackSPPage*0x1000 + (A&0xFFF)];