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

merge

Browse source
This commit is contained in:
aiju 2014-03-16 09:53:14 +01:00
commit 105625e10b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -342,7 +342,7 @@ regwrite(u16int p, u8int v)
vtime = vtime & 0xff | (v & 1) << 8; vtime = vtime & 0xff | (v & 1) << 8;
break; break;
case 0x420b: case 0x420b:
dma |= v & ~reg[0x420c]; dma |= v & ~(reg[0x420c] & ~hdma >> 24);
break; break;
case 0x4210: case 0x4210:
return; return;

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

@ -280,8 +280,8 @@ redo:
p->t = tile(n, p->tx, p->ty); p->t = tile(n, p->tx, p->ty);
chr(n, nb, p->sz, p->t, p->tnx, p->tny, p->c); chr(n, nb, p->sz, p->t, p->tnx, p->tny, p->c);
p->pal = palette(n, p->t >> 10 & 7); p->pal = palette(n, p->t >> 10 & 7);
if(p->tnx != 0) if((p->tnx & 7) != 0)
shift(p->c, nb, p->tnx, p->t & 0x4000); shift(p->c, nb, p->tnx & 7, p->t & 0x4000);
if(p->msz != 1 && p->mx != 0 && sx % p->msz == 0){ if(p->msz != 1 && p->mx != 0 && sx % p->msz == 0){
p->mv = bgpixel(p->c, nb, p->t & 0x4000); p->mv = bgpixel(p->c, nb, p->t & 0x4000);
if(p->tnx + p->mx >= 8){ if(p->tnx + p->mx >= 8){