Merge pull request #701 from TartanSpartan/fix-cheats-across-optimizations

Fix issue for some cheats across build optimizations
This commit is contained in:
fgsfds authored and GitHub committed 2026-03-23 10:30:44 +01:00
commit 2626434b69
1 file changed
+5 -4
+5 -4
View File
@@ -309,7 +309,7 @@ MenuItemHandlerResult cheatCheckboxMenuHandler(s32 operation, struct menuitem *i
return false;
}
if (g_CheatsEnabledBank1 & (1 << item->param)) {
if (g_CheatsEnabledBank1 & (1 << (item->param - 32))) {
return true;
}
@@ -334,11 +334,12 @@ MenuItemHandlerResult cheatCheckboxMenuHandler(s32 operation, struct menuitem *i
}
} else {
// Bank 1
if (g_CheatsEnabledBank1 & (1 << item->param)) {
if (g_CheatsEnabledBank1 & (1 << (item->param - 32))) {
// We need to subtract 32 on lines like these to avoid undefined behavior, namely ensuring that all cheats are toggled correctly and regardless of build optimiaztion
if (1);
g_CheatsEnabledBank1 = g_CheatsEnabledBank1 & ~(1 << item->param);
g_CheatsEnabledBank1 = g_CheatsEnabledBank1 & ~(1 << (item->param - 32));
} else {
g_CheatsEnabledBank1 = g_CheatsEnabledBank1 | 1 << item->param;
g_CheatsEnabledBank1 = g_CheatsEnabledBank1 | (1 << (item->param - 32));
}
}
}