HD Packs: Minor bug fixes

This commit is contained in:
Souryo 2017-08-07 22:52:27 -04:00
parent 493fc6ce81
commit d566d2102a
5 changed files with 5 additions and 8 deletions

View file

@ -198,7 +198,7 @@ void HdPackBuilder::SaveHdPack()
int pngIndex = 0; int pngIndex = 0;
ss << "<ver>100" << std::endl; ss << "<ver>100" << std::endl;
ss << "<scale>" << _hdData.Scale << std::endl; ss << "<scale>" << _hdData.Scale << std::endl;
ss << "<supportedRom>" << Console::GetRomName() << std::endl; ss << "<supportedRom>" << Console::GetHashInfo().Sha1Hash << std::endl;
int tileDimension = 8 * _hdData.Scale; int tileDimension = 8 * _hdData.Scale;
int pngDimension = 16 * tileDimension; int pngDimension = 16 * tileDimension;

View file

@ -423,7 +423,7 @@ void HdPackLoader::InitializeHdPack()
if(tileInfo->DefaultTile) { if(tileInfo->DefaultTile) {
auto tiles = _data->TileByKey.find(tileInfo->GetKey(true)); auto tiles = _data->TileByKey.find(tileInfo->GetKey(true));
if(tiles == _data->TileByKey.end()) { if(tiles == _data->TileByKey.end()) {
_data->TileByKey[tileInfo->GetKey(false)] = vector<HdPackTileInfo*>(); _data->TileByKey[tileInfo->GetKey(true)] = vector<HdPackTileInfo*>();
} }
_data->TileByKey[tileInfo->GetKey(true)].push_back(tileInfo.get()); _data->TileByKey[tileInfo->GetKey(true)].push_back(tileInfo.get());
} }

View file

@ -437,12 +437,11 @@ namespace Mesen.GUI.Debugger.Controls
sb.Append(InteropEmu.DebugGetMemoryValue(ppuMemory ? DebugMemoryType.PpuMemory : DebugMemoryType.ChrRom, (UInt32)(baseAddress + tileIndex * 16 + i)).ToString("X2")); sb.Append(InteropEmu.DebugGetMemoryValue(ppuMemory ? DebugMemoryType.PpuMemory : DebugMemoryType.ChrRom, (UInt32)(baseAddress + tileIndex * 16 + i)).ToString("X2"));
} }
sb.Append(","); sb.Append(",");
for(int i = 1; i < 4; i++) { for(int i = 0; i < 4; i++) {
sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PaletteMemory, (uint)(this._selectedPalette * 4 + i)).ToString("X2")); sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PaletteMemory, (uint)(this._selectedPalette * 4 + i)).ToString("X2"));
} }
_copyData = sb.ToString(); _copyData = sb.ToString();
_copyData = _copyData.Substring(0, _copyData.Length - 1);
} }
} }
} }

View file

@ -248,12 +248,11 @@ namespace Mesen.GUI.Debugger.Controls
sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PpuMemory, (uint)(tileAddr + i)).ToString("X2")); sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PpuMemory, (uint)(tileAddr + i)).ToString("X2"));
} }
sb.Append(","); sb.Append(",");
for(int i = 1; i < 4; i++) { for(int i = 0; i < 4; i++) {
sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PaletteMemory, (uint)(paletteBaseAddr + i)).ToString("X2")); sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PaletteMemory, (uint)(paletteBaseAddr + i)).ToString("X2"));
} }
_copyData = sb.ToString(); _copyData = sb.ToString();
_copyData = _copyData.Substring(0, _copyData.Length - 1);
} }
} }
} }

View file

@ -199,13 +199,12 @@ namespace Mesen.GUI.Debugger.Controls
for(int i = 0; i < 16; i++) { for(int i = 0; i < 16; i++) {
sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PpuMemory, (UInt32)(tileAddr + i)).ToString("X2")); sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PpuMemory, (UInt32)(tileAddr + i)).ToString("X2"));
} }
sb.Append(","); sb.Append(",FF");
for(int i = 1; i < 4; i++) { for(int i = 1; i < 4; i++) {
sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PaletteMemory, (uint)(palette * 4 + i)).ToString("X2")); sb.Append(InteropEmu.DebugGetMemoryValue(DebugMemoryType.PaletteMemory, (uint)(palette * 4 + i)).ToString("X2"));
} }
_copyData = sb.ToString(); _copyData = sb.ToString();
_copyData = _copyData.Substring(0, _copyData.Length - 1);
} }
} }
} }