M src/gba/cheats/parv3.c → src/gba/cheats/parv3.c

@@ -250,8 +250,15 @@ }
 	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) + 1;
+		incompleteCheat->repeat = (op2 >> 16) & 0xFF;
 		incompleteCheat->addressOffset = (op2 & 0xFFFF) * incompleteCheat->width;
 		cheats->incompleteCheat = COMPLETE;
 		return true;

M src/gba/test/cheats.c → src/gba/test/cheats.c

@@ -1037,9 +1037,12 @@ assert_int_equal(core->rawRead8(core, 0x03000000, -1), 0);
 
 	mCheatPressButton(device, true);
 	mCheatRefresh(device, set);
-	assert_int_equal(core->rawRead8(core, 0x03000000, -1), 0);
+	assert_int_equal(core->rawRead8(core, 0x03000000, -1), 0x1);
 
 	mCheatPressButton(device, false);
+	mCheatRefresh(device, set);
+	assert_int_equal(core->rawRead8(core, 0x03000000, -1), 0x1);
+
 	core->rawWrite8(core, 0x03000000, -1, 0);
 	mCheatRefresh(device, set);
 	assert_int_equal(core->rawRead8(core, 0x03000000, -1), 0);