Emulation/Mesen
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen.git synced 2024-05-20 05:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

HD Packs: Tile indexes for conditions are now written in hex format

Browse source
This commit is contained in:
Sour 2018-12-12 20:46:23 -05:00
parent ac18a318d3
commit 0dee6ac845
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/HdNesPack.h
View file

@ -38,7 +38,7 @@ private:
__forceinline void ProcessGrayscaleAndEmphasis(HdPpuPixelInfo &pixelInfo, uint32_t* outputBuffer, uint32_t hdScreenWidth);
public:
static constexpr uint32_t CurrentVersion = 103;
static constexpr uint32_t CurrentVersion = 104;
HdNesPack(shared_ptr<HdPackData> hdData, EmulationSettings* settings);
~HdNesPack();

2
Core/HdPackConditions.h
View file

@ -34,7 +34,7 @@ struct HdPackBaseTileCondition : public HdPackCondition
out << TileX << ",";
out << TileY << ",";
if(TileIndex >= 0) {
out << TileIndex << ",";
out << HexUtilities::ToHex(TileIndex) << ",";
} else {
for(int i = 0; i < 16; i++) {
out << HexUtilities::ToHex(TileData[i]);

7
Core/HdPackLoader.cpp
View file

@ -433,7 +433,12 @@ void HdPackLoader::ProcessConditionTag(vector<string> &tokens, bool createInvert
if(token.size() == 32) {
tileData = token;
} else {
tileIndex = std::stoi(token);
if(_data->Version < 104) {
tileIndex = std::stoi(token);
} else {
//Tile indexes are stored as hex starting from version 104+
tileIndex = HexUtilities::FromHex(token);
}
}
uint32_t palette = HexUtilities::FromHex(tokens[index++]);

14
Docs/content/hdpacks/_index.md
View file

@ -55,14 +55,14 @@ Before you start recording, select the options you want to use and the location
## File Format (hires.txt) ##
The following are the specifications for the hires.txt file, as of version "103".
The following are the specifications for the hires.txt file, as of version "104".
### &lt;ver&gt; tag ###
**Syntax**: `<ver>[integer]`
**Example**: `<ver>103`
**Example**: `<ver>104`
The format's version number (currently 103).
The format's version number (currently 104).
### &lt;scale&gt; tag ###
@ -123,7 +123,7 @@ The tileNearby and spriteNearby conditions are used to check whether a specific
`<condition>myCondition2,tileNearby,-8,0,[tile data],[palette data]`
In this case, `myCondition2` will be true if the tile 8 pixels to the left of the current tile matches the tile+palette data specified.
For CHR ROM games, `tile data` is an integer representing the position of the original tile in CHR ROM.
For CHR ROM games, `tile data` is an integer (in hexadecimal) representing the position of the original tile in CHR ROM.
For CHR RAM games, `tile data` is a 32-character hexadecimal string representing all 16 bytes of the tile.
`palette data` is always an 8-character hexadecimal string representing all 4 bytes of the palette used for the tile. For sprites, the first byte is always "FF".
@ -140,7 +140,7 @@ The tileAtPosition and spriteAtPosition conditions are used to check whether a s
`<condition>myCondition,tileAtPosition,10,10,[tile data],[palette data]`
In this case, `myCondition` will be true if the tile at position 10,10 on the NES' screen (256x240 resolution) matches the tile+palette data given.
For CHR ROM games, `tile data` is an integer representing the position of the original tile in CHR ROM.
For CHR ROM games, `tile data` is an integer (in hexadecimal) representing the position of the original tile in CHR ROM.
For CHR RAM games, `tile data` is a 32-character hexadecimal string representing all 16 bytes of the tile.
`palette data` is always an 8-character hexadecimal string representing all 4 bytes of the palette used for the tile. For sprites, the first byte is always "FF".
@ -304,6 +304,10 @@ These registers return the ASCII string `NEA` (NES Enhanced Audio) - this can be
## File Format Changelog ##
### Version 104 ###
* Tile indexes for the `<condition>` tag (tileNearby/spriteNearby/tileAtPosition/spriteAtPosition) are now in hex instead of decimal (affects CHR ROM games only)
### Version 103 ###
* Added a `Mask` parameter to the memoryCheck and memoryCheckConstant conditions