empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16 from mkwong98/master

Browse source 
Sprite viewer bug fix for large sprites
This commit is contained in:
NovaSquirrel 2021-01-14 17:24:58 -05:00 • committed by GitHub
commit 70f1a1b600
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
GUI.NET/Debugger/Controls/ctrlSpriteViewer.cs
View file

@ -390,10 +390,21 @@ namespace Mesen.GUI.Debugger.Controls
}
_contextMenuSpriteIndex = _selectedSprite;
_copyData = ToHdPackFormat(_selectedSprite);
if (_largeSprites)
{
StringBuilder sb = new StringBuilder();
sb.AppendLine(ToHdPackFormat(_selectedSprite, false));
sb.AppendLine(ToHdPackFormat(_selectedSprite, true));
_copyData = sb.ToString();
}
else {
_copyData = ToHdPackFormat(_selectedSprite, false);
}
}
private string ToHdPackFormat(int spriteIndex)
private string ToHdPackFormat(int spriteIndex, bool isLargeSpriteSecondHalf)
{
int ramAddr = spriteIndex * 4;
int tileIndex = _spriteRam[ramAddr + 1];
@ -401,7 +412,7 @@ namespace Mesen.GUI.Debugger.Controls
int tileAddr;
if(_largeSprites) {
tileAddr = ((tileIndex & 0x01) == 0x01 ? 0x1000 : 0x0000) + ((tileIndex & 0xFE) << 4);
tileAddr = ((tileIndex & 0x01) == 0x01 ? 0x1000 : 0x0000) + (((tileIndex & 0xFE) + (isLargeSpriteSecondHalf ? 1 : 0)) << 4);
} else {
tileAddr = _spritePatternAddr + (tileIndex << 4);
}
@ -544,13 +555,31 @@ namespace Mesen.GUI.Debugger.Controls
bool verticalMirror = (attributes & 0x80) == 0x80;
if(spriteY >= 0 && spriteY < 240) {
sb.AppendLine(
ToHdPackFormat(i) + "," +
spriteX.ToString() + "," +
spriteY.ToString() + "," +
(horizontalMirror ? "Y" : "N") + "," +
(verticalMirror ? "Y" : "N")
);
if (_largeSprites){
sb.AppendLine(
ToHdPackFormat(i, verticalMirror) + "," +
spriteX.ToString() + "," +
spriteY.ToString() + "," +
(horizontalMirror ? "Y" : "N") + "," +
(verticalMirror ? "Y" : "N")
);
sb.AppendLine(
ToHdPackFormat(i, !verticalMirror) + "," +
spriteX.ToString() + "," +
(spriteY + 8).ToString() + "," +
(horizontalMirror ? "Y" : "N") + "," +
(verticalMirror ? "Y" : "N")
);
}
else{
sb.AppendLine(
ToHdPackFormat(i, false) + "," +
spriteX.ToString() + "," +
spriteY.ToString() + "," +
(horizontalMirror ? "Y" : "N") + "," +
(verticalMirror ? "Y" : "N")
);
}
}
}
if(sb.Length > 0) {