diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp index db32702c3..fb9c5b7a8 100644 --- a/src/core/cheats.cpp +++ b/src/core/cheats.cpp @@ -2803,6 +2803,7 @@ void Cheats::GamesharkCheatCode::Apply() const const u8 cht_reg_no2 = Truncate8((inst.address & 0xFF00u) >> 8); const u8 cht_reg_no3 = Truncate8(inst.value32 & 0xFFu); const u8 sub_type = Truncate8((inst.address & 0xFF0000u) >> 16); + const u16 cht_offset = Truncate16((inst.value32 & 0xFFFF0000u) >> 16); switch (sub_type) { @@ -2831,6 +2832,20 @@ void Cheats::GamesharkCheatCode::Apply() const // cht_register[cht_reg_no1] cht_register[cht_reg_no1] = DoMemoryRead(cht_register[cht_reg_no2] + poke_value); break; + case 0x07: // Write the u8 poke_value to a specific index of a single array in a series of consecutive arrays + //This cheat type requires a separate cheat to set up 4 consecutive cht_arrays before this will work + //cht_register[cht_reg_no1] = the base address of the first element of the first array + //cht_register[cht_reg_no1+1] = the array size (basically the address diff between the start of each array) + //cht_register[cht_reg_no1+2] = the index of which array in the series to poke (this must be greater than 0) + //cht_register[cht_reg_no1+3] must == 0xD0D0 to ensure it only pokes when the above cht_regs have been set + // (safety valve) + //cht_offset = the index of the individual array to change (so must be 0 to cht_register[cht_reg_no1+1]) + if (cht_register[cht_reg_no1 + 3] == 0xD0D0 && cht_register[cht_reg_no1 + 2] > 0 + && cht_register[cht_reg_no1 + 1] >= cht_offset) + DoMemoryWrite((cht_register[cht_reg_no1] - cht_register[cht_reg_no1 + 1]) + + (cht_register[cht_reg_no1 + 1] * cht_register[cht_reg_no1 + 2]) + cht_offset, + Truncate8(poke_value & 0xFFu)); + break; case 0x40: // Write the u16 from cht_register[cht_reg_no1] to address DoMemoryWrite(inst.value32, Truncate16(cht_register[cht_reg_no1] & 0xFFFFu)); @@ -2858,6 +2873,20 @@ void Cheats::GamesharkCheatCode::Apply() const // cht_register[cht_reg_no1] cht_register[cht_reg_no1] = DoMemoryRead(cht_register[cht_reg_no2] + poke_value); break; + case 0x47: // Write the u16 poke_value to a specific index of a single array in a series of consecutive arrays + //This cheat type requires a separate cheat to set up 4 consecutive cht_arrays before this will work + //cht_register[cht_reg_no1] = the base address of the first element of the first array + //cht_register[cht_reg_no1+1] = the array size (basically the address diff between the start of each array) + //cht_register[cht_reg_no1+2] = the index of which array in the series to poke (this must be greater than 0) + //cht_register[cht_reg_no1+3] must == 0xD0D0 to ensure it only pokes when the above cht_regs have been set + // (safety valve) + //cht_offset = the index of the individual array to change (so must be 0 to cht_register[cht_reg_no1+1]) + if (cht_register[cht_reg_no1 + 3] == 0xD0D0 && cht_register[cht_reg_no1 + 2] > 0 + && cht_register[cht_reg_no1 + 1] >= cht_offset) + DoMemoryWrite((cht_register[cht_reg_no1] - cht_register[cht_reg_no1 + 1]) + + (cht_register[cht_reg_no1 + 1] * cht_register[cht_reg_no1 + 2]) + cht_offset, + Truncate16(poke_value & 0xFFFFu)); + break; case 0x80: // Write the u32 from cht_register[cht_reg_no1] to address DoMemoryWrite(inst.value32, cht_register[cht_reg_no1]); @@ -2883,6 +2912,7 @@ void Cheats::GamesharkCheatCode::Apply() const // cht_register[cht_reg_no1] cht_register[cht_reg_no1] = DoMemoryRead(cht_register[cht_reg_no2] + poke_value); break; + //Do not use 0x87 as it's not possible to duplicate 0x07, 0x47 for a 32 bit write as not enough characters case 0xC0: // Reg3 = Reg2 + Reg1 cht_register[cht_reg_no3] = cht_register[cht_reg_no2] + cht_register[cht_reg_no1];