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:
parent
439e05bbf2
commit
5caadec34d
|
@ -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,
|
||||||
|
@ -2360,6 +2361,18 @@ void Cheats::GamesharkCheatCode::Apply() 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 == 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);
|
||||||
|
@ -3924,6 +3937,18 @@ void Cheats::GamesharkCheatCode::ApplyOnDisable() const
|
||||||
|
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
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;
|
break;
|
||||||
|
|
||||||
[[unlikely]] default:
|
[[unlikely]] default:
|
||||||
|
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue