diff options
| author | aiju <aiju@phicode.de> | 2014-03-16 09:53:14 +0100 |
|---|---|---|
| committer | aiju <aiju@phicode.de> | 2014-03-16 09:53:14 +0100 |
| commit | 105625e10b469d4012c148154563007cfa3acc4d (patch) | |
| tree | de0036f2787768d800647c65f9cbd91d3026ada1 /sys/src | |
| parent | 38c0dfacabb9b4e4ba4f8d6cd96166d355708f7e (diff) | |
| parent | 2fb68b633845ad67fbf03d6f0cf8faa6d7005a45 (diff) | |
merge
Diffstat (limited to 'sys/src')
| -rw-r--r-- | sys/src/games/snes/mem.c | 2 | ||||
| -rw-r--r-- | sys/src/games/snes/ppu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/src/games/snes/mem.c b/sys/src/games/snes/mem.c index 330615d27..518fbb02e 100644 --- a/sys/src/games/snes/mem.c +++ b/sys/src/games/snes/mem.c @@ -342,7 +342,7 @@ regwrite(u16int p, u8int v) vtime = vtime & 0xff | (v & 1) << 8; break; case 0x420b: - dma |= v & ~reg[0x420c]; + dma |= v & ~(reg[0x420c] & ~hdma >> 24); break; case 0x4210: return; diff --git a/sys/src/games/snes/ppu.c b/sys/src/games/snes/ppu.c index 40ecd75a2..5edc52f5e 100644 --- a/sys/src/games/snes/ppu.c +++ b/sys/src/games/snes/ppu.c @@ -280,8 +280,8 @@ redo: p->t = tile(n, p->tx, p->ty); chr(n, nb, p->sz, p->t, p->tnx, p->tny, p->c); p->pal = palette(n, p->t >> 10 & 7); - if(p->tnx != 0) - shift(p->c, nb, p->tnx, p->t & 0x4000); + if((p->tnx & 7) != 0) + shift(p->c, nb, p->tnx & 7, p->t & 0x4000); if(p->msz != 1 && p->mx != 0 && sx % p->msz == 0){ p->mv = bgpixel(p->c, nb, p->t & 0x4000); if(p->tnx + p->mx >= 8){ |