mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-19 01:53:22 +02:00
Fix 16bit comparison operations
This commit is contained in:
parent
d3b1b5f22c
commit
2f3142e192
@ -280,25 +280,25 @@ void GatewayCheat::Execute(Core::System& system) {
|
|||||||
case CheatType::GreaterThan16WithMask:
|
case CheatType::GreaterThan16WithMask:
|
||||||
// 7XXXXXXX ZZZZYYYY - Execute next block IF YYYY > ((not ZZZZ) AND half[XXXXXXX])
|
// 7XXXXXXX ZZZZYYYY - Execute next block IF YYYY > ((not ZZZZ) AND half[XXXXXXX])
|
||||||
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
|
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
|
||||||
return static_cast<u16>(line.value) > ~(static_cast<u16>(~line.value >> 16) & val);
|
return static_cast<u16>(line.value) > (static_cast<u16>(~line.value >> 16) & val);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case CheatType::LessThan16WithMask:
|
case CheatType::LessThan16WithMask:
|
||||||
// 8XXXXXXX ZZZZYYYY - Execute next block IF YYYY < ((not ZZZZ) AND half[XXXXXXX])
|
// 8XXXXXXX ZZZZYYYY - Execute next block IF YYYY < ((not ZZZZ) AND half[XXXXXXX])
|
||||||
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
|
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
|
||||||
return static_cast<u16>(line.value) < ~(static_cast<u16>(~line.value >> 16) & val);
|
return static_cast<u16>(line.value) < (static_cast<u16>(~line.value >> 16) & val);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case CheatType::EqualTo16WithMask:
|
case CheatType::EqualTo16WithMask:
|
||||||
// 9XXXXXXX ZZZZYYYY - Execute next block IF YYYY = ((not ZZZZ) AND half[XXXXXXX])
|
// 9XXXXXXX ZZZZYYYY - Execute next block IF YYYY = ((not ZZZZ) AND half[XXXXXXX])
|
||||||
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
|
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
|
||||||
return static_cast<u16>(line.value) == ~(static_cast<u16>(~line.value >> 16) & val);
|
return static_cast<u16>(line.value) == (static_cast<u16>(~line.value >> 16) & val);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case CheatType::NotEqualTo16WithMask:
|
case CheatType::NotEqualTo16WithMask:
|
||||||
// AXXXXXXX ZZZZYYYY - Execute next block IF YYYY <> ((not ZZZZ) AND half[XXXXXXX])
|
// AXXXXXXX ZZZZYYYY - Execute next block IF YYYY <> ((not ZZZZ) AND half[XXXXXXX])
|
||||||
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
|
CompOp<u16>(line, state, &Memory::Read16, [&line](u16 val) -> bool {
|
||||||
return static_cast<u16>(line.value) != ~(static_cast<u16>(~line.value >> 16) & val);
|
return static_cast<u16>(line.value) != (static_cast<u16>(~line.value >> 16) & val);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case CheatType::LoadOffset:
|
case CheatType::LoadOffset:
|
||||||
|
Loading…
Reference in New Issue
Block a user