GBA Cheats: Fix bad merge
Vicki Pfau vi@endrift.com
Sat, 09 Dec 2017 13:02:34 -0800
1 files changed,
0 insertions(+),
7 deletions(-)
jump to
M
src/gba/cheats/parv3.c
→
src/gba/cheats/parv3.c
@@ -222,13 +222,6 @@ }
if (cheats->incompleteCheat != COMPLETE) { struct mCheat* incompleteCheat = mCheatListGetPointer(&cheats->d.list, cheats->incompleteCheat); incompleteCheat->operand = op1 & (0xFFFFFFFFU >> ((4 - incompleteCheat->width) * 8)); - if (cheats->incompleteCheat > 0) { - struct mCheat* lastCheat = mCheatListGetPointer(&cheats->d.list, cheats->incompleteCheat - 1); - if (lastCheat->type == CHEAT_IF_BUTTON) { - cheats->incompleteCheat = COMPLETE; - return true; - } - } incompleteCheat->operandOffset = op2 >> 24; incompleteCheat->repeat = (op2 >> 16) & 0xFF; incompleteCheat->addressOffset = (op2 & 0xFFFF) * incompleteCheat->width;