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

Debugger: Tile Viewer - Fixed presets not scrolling to the correct VRAM address

Browse source
This commit is contained in:
Sour 2020-02-27 20:23:43 -05:00
parent 28443f84d6
commit 379e4069d1
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
UI/Debugger/PpuViewer/frmTileViewer.cs
View file

@ -410,6 +410,8 @@ namespace Mesen.GUI.Debugger
cboMemoryType.SetEnumValue(SnesMemoryType.VideoRam); cboMemoryType.SetEnumValue(SnesMemoryType.VideoRam);
cboFormat.SetEnumValue(format); cboFormat.SetEnumValue(format);
nudAddress.Value = 0;
nudSize.Value = 0x10000;
if(_state.Ppu.BgMode == 7) { if(_state.Ppu.BgMode == 7) {
nudAddress.Value = 0; nudAddress.Value = 0;
@ -417,17 +419,14 @@ namespace Mesen.GUI.Debugger
RefreshViewer(); RefreshViewer();
ctrlImagePanel.ScrollTo(0); ctrlImagePanel.ScrollTo(0);
} else { } else {
if(nudAddress.Maximum < _state.Ppu.Layers[layer].ChrAddress) { int gap = _state.Ppu.Layers[layer].ChrAddress - (int)nudAddress.Value;
int gap = _state.Ppu.Layers[layer].ChrAddress - (int)nudAddress.Value; int bytesPerRow = GetBytesPerTile() / 8 * _options.Width;
int bytesPerRow = GetBytesPerTile() / 8 * _options.Width; int scrollRow = (gap / bytesPerRow) & ~0x7;
int scrollRow = (gap / bytesPerRow) & ~0x7; _selectedTile = scrollRow * bytesPerRow / GetBytesPerTile();
_selectedTile = scrollRow * bytesPerRow / GetBytesPerTile();
} else {
_selectedTile = 0;
}
nudAddress.Value = _state.Ppu.Layers[layer].ChrAddress; nudAddress.Value = _state.Ppu.Layers[layer].ChrAddress;
RefreshViewer(); RefreshViewer();
ctrlImagePanel.ScrollTo(0); ctrlImagePanel.ScrollTo(scrollRow * ctrlImagePanel.ImageScale);
} }
} }
@ -438,20 +437,19 @@ namespace Mesen.GUI.Debugger
cboMemoryType.SetEnumValue(SnesMemoryType.VideoRam); cboMemoryType.SetEnumValue(SnesMemoryType.VideoRam);
cboFormat.SetEnumValue(TileFormat.Bpp4); cboFormat.SetEnumValue(TileFormat.Bpp4);
nudAddress.Value = 0;
nudSize.Value = 0x10000;
int gap = address - (int)nudAddress.Value;
int bytesPerRow = GetBytesPerTile() / 8 * _options.Width;
int scrollRow = (gap / bytesPerRow) & ~0x7;
_selectedTile = scrollRow * bytesPerRow / GetBytesPerTile();
if(nudAddress.Maximum < address) {
int gap = address - (int)nudAddress.Value;
int bytesPerRow = GetBytesPerTile() / 8 * _options.Width;
int scrollRow = (gap / bytesPerRow) & ~0x7;
_selectedTile = scrollRow * bytesPerRow / GetBytesPerTile();
} else {
_selectedTile = 0;
}
if(ctrlPaletteViewer.SelectedPalette < 8) { if(ctrlPaletteViewer.SelectedPalette < 8) {
ctrlPaletteViewer.SelectedPalette = 8; ctrlPaletteViewer.SelectedPalette = 8;
} }
nudAddress.Value = address * 2; nudAddress.Value = address * 2;
ctrlImagePanel.ScrollTo(0); ctrlImagePanel.ScrollTo(scrollRow * ctrlImagePanel.ImageScale);
} }
private void ctrlImagePanel_MouseClick(object sender, MouseEventArgs e) private void ctrlImagePanel_MouseClick(object sender, MouseEventArgs e)