LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fixes for masked 16-bit cheat opcodes, based on existing cheats.

Browse Source
This commit is contained in:
Duckbill 2018-01-12 10:46:50 +03:00
parent 7e8da0d236
commit ec7ae35da1
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sysmodules/rosalina/source/menus/cheats.c
View File

@ -327,12 +327,9 @@ u32 Cheat_applyCheat(const CheatDescription* const cheat) {
{ {
u32 newSkip; u32 newSkip;
u16 mask = (u16) ((arg1 >> 16) & 0xFFFF); u16 mask = (u16) ((arg1 >> 16) & 0xFFFF);
if (mask == 0) {
mask = 0xFFFF;
}
u16 value = 0; u16 value = 0;
if (!Cheat_read16(arg0 & 0x0FFFFFFF, &value)) return 0; if (!Cheat_read16(arg0 & 0x0FFFFFFF, &value)) return 0;
if ((value & mask) < (arg1 & 0xFFFF)) { if ((value & (~mask)) < (arg1 & 0xFFFF)) {
newSkip = 0; newSkip = 0;
} else { } else {
newSkip = 1; newSkip = 1;
@ -352,12 +349,9 @@ u32 Cheat_applyCheat(const CheatDescription* const cheat) {
{ {
u32 newSkip; u32 newSkip;
u16 mask = (u16) ((arg1 >> 16) & 0xFFFF); u16 mask = (u16) ((arg1 >> 16) & 0xFFFF);
if (mask == 0) {
mask = 0xFFFF;
}
u16 value = 0; u16 value = 0;
if (!Cheat_read16(arg0 & 0x0FFFFFFF, &value)) return 0; if (!Cheat_read16(arg0 & 0x0FFFFFFF, &value)) return 0;
if ((value & mask) > (arg1 & 0xFFFF)) { if ((value & (~mask)) > (arg1 & 0xFFFF)) {
newSkip = 0; newSkip = 0;
} else { } else {
newSkip = 1; newSkip = 1;
@ -377,12 +371,9 @@ u32 Cheat_applyCheat(const CheatDescription* const cheat) {
{ {
u32 newSkip; u32 newSkip;
u16 mask = (u16) ((arg1 >> 16) & 0xFFFF); u16 mask = (u16) ((arg1 >> 16) & 0xFFFF);
if (mask == 0) {
mask = 0xFFFF;
}
u16 value = 0; u16 value = 0;
if (!Cheat_read16(arg0 & 0x0FFFFFFF, &value)) return 0; if (!Cheat_read16(arg0 & 0x0FFFFFFF, &value)) return 0;
if ((value & mask) == (arg1 & 0xFFFF)) { if ((value & (~mask)) == (arg1 & 0xFFFF)) {
newSkip = 0; newSkip = 0;
} else { } else {
newSkip = 1; newSkip = 1;
@ -402,12 +393,9 @@ u32 Cheat_applyCheat(const CheatDescription* const cheat) {
{ {
u32 newSkip; u32 newSkip;
u16 mask = (u16) ((arg1 >> 16) & 0xFFFF); u16 mask = (u16) ((arg1 >> 16) & 0xFFFF);
if (mask == 0) {
mask = 0xFFFF;
}
u16 value = 0; u16 value = 0;
if (!Cheat_read16(arg0 & 0x0FFFFFFF, &value)) return 0; if (!Cheat_read16(arg0 & 0x0FFFFFFF, &value)) return 0;
if ((value & mask) != (arg1 & 0xFFFF)) { if ((value & (~mask)) != (arg1 & 0xFFFF)) {
newSkip = 0; newSkip = 0;
} else { } else {
newSkip = 1; newSkip = 1;