xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

games/snes: minor oam bugs

Browse source
This commit is contained in:
aiju 2014-03-21 14:25:08 +01:00
parent 52cb2d472b
commit 26777f4cef
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/games/snes/mem.c
View file

@ -231,7 +231,7 @@ regwrite(u16int p, u8int v)
oamaddr = (reg[0x2103] & 1) << 9 | v << 1; oamaddr = (reg[0x2103] & 1) << 9 | v << 1;
break; break;
case 0x2103: case 0x2103:
oamaddr = (v & 1) << 9 | reg[0x2102]; oamaddr = (v & 1) << 9 | reg[0x2102] << 1;
break; break;
case 0x2104: case 0x2104:
if((oamaddr & 1) == 0) if((oamaddr & 1) == 0)

3
sys/src/games/snes/ppu.c
View file

@ -877,7 +877,8 @@ ppustep(void)
reg[RDNMI] |= VBLANK; reg[RDNMI] |= VBLANK;
if((reg[NMITIMEN] & VBLANK) != 0) if((reg[NMITIMEN] & VBLANK) != 0)
nmi = 2; nmi = 2;
oamaddr = reg[0x2102] << 1 | (reg[0x2103] & 1) << 9; if((reg[INIDISP] & 0x80) == 0)
oamaddr = reg[0x2102] << 1 | (reg[0x2103] & 1) << 9;
if((reg[NMITIMEN] & AUTOJOY) != 0){ if((reg[NMITIMEN] & AUTOJOY) != 0){
memwrite(0x4016, 1); memwrite(0x4016, 1);
memwrite(0x4016, 0); memwrite(0x4016, 0);