ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cheat bugfix and new A8 cheat type (#3328) 

* Bugfix for import and entering new cheats

Added needed g_emu_thread->reloadCheats calls after the reloadList() calls on entering a new code or importing new codes.

Without it I had to import new codes and then manually edit one of them for it to show up in the cheat counts and possibly even work

* Added Cheat Type A8

Added cheat type A8 which is the byte equivalent of the A7 cheat type as there will be a need of this type.

* Changed boolean parameters in last PR

Changed boolean parameters in last PR as per discord
This commit is contained in:
PugsyMAME 2024-11-11 04:01:50 +00:00 committed by GitHub
parent 439e05bbf2
commit 5caadec34d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/cheats.cpp
View File

@ -1817,6 +1817,7 @@ private:
ExtDecrement32 = 0x61, ExtDecrement32 = 0x61,
ExtConstantWriteIfMatch16 = 0xA6, ExtConstantWriteIfMatch16 = 0xA6,
ExtConstantWriteIfMatchWithRestore16 = 0xA7, ExtConstantWriteIfMatchWithRestore16 = 0xA7,
ExtConstantWriteIfMatchWithRestore8 = 0xA8,
ExtConstantForceRange8 = 0xF0, ExtConstantForceRange8 = 0xF0,
ExtConstantForceRangeLimits16 = 0xF1, ExtConstantForceRangeLimits16 = 0xF1,
ExtConstantForceRangeRollRound16 = 0xF2, ExtConstantForceRangeRollRound16 = 0xF2,
@ -2359,7 +2360,19 @@ void Cheats::GamesharkCheatCode::Apply() const
index++; index++;
} }
break; break;
case InstructionCode::ExtConstantWriteIfMatchWithRestore8:
{
const u8 value = DoMemoryRead<u8>(inst.address);
const u8 comparevalue = Truncate8(inst.value16 >> 8);
const u8 newvalue = Truncate8(inst.value16 & 0xFFu);
if (value == comparevalue)
DoMemoryWrite<u8>(inst.address, newvalue);
index++;
}
break;
case InstructionCode::ExtConstantForceRange8: case InstructionCode::ExtConstantForceRange8:
{ {
const u8 value = DoMemoryRead<u8>(inst.address); const u8 value = DoMemoryRead<u8>(inst.address);
@ -3926,6 +3939,18 @@ void Cheats::GamesharkCheatCode::ApplyOnDisable() const
} }
break; break;
case InstructionCode::ExtConstantWriteIfMatchWithRestore8:
{
const u8 value = DoMemoryRead<u8>(inst.address);
const u8 comparevalue = Truncate8(inst.value16 >> 8);
const u8 newvalue = Truncate8(inst.value16 & 0xFFu);
if (value == newvalue)
DoMemoryWrite<u8>(inst.address, comparevalue);
index++;
}
break;
[[unlikely]] default: [[unlikely]] default:
{ {
ERROR_LOG("Unhandled instruction code 0x{:02X} ({:08X} {:08X})", static_cast<u8>(inst.code.GetValue()), ERROR_LOG("Unhandled instruction code 0x{:02X} ({:08X} {:08X})", static_cast<u8>(inst.code.GetValue()),

2
src/duckstation-qt/gamecheatsettingswidget.cpp
View File

@ -529,6 +529,7 @@ void GameCheatSettingsWidget::importCodes(const std::string& file_contents)
} }
reloadList(); reloadList();
g_emu_thread->reloadCheats(true, false, false, true);
} }
void GameCheatSettingsWidget::newCode() void GameCheatSettingsWidget::newCode()
@ -543,6 +544,7 @@ void GameCheatSettingsWidget::newCode()
// no need to reload cheats yet, it's not active. just refresh the list // no need to reload cheats yet, it's not active. just refresh the list
reloadList(); reloadList();
g_emu_thread->reloadCheats(true, false, false, true);
} }
void GameCheatSettingsWidget::editCode(const std::string_view code_name) void GameCheatSettingsWidget::editCode(const std::string_view code_name)