How shoud I manage captions and sub captions with float and non float items?

Question

I am currently writing my PhD thesis and I am using this code to put some figures or tables on the left page. So, I have two kinds of figures, some are in a float, some are not. In both cases, I often use sub floats (with subfigure package for floats, and \captionof{subfigure} for left pages figures).

The issue is about sub caption labelling. For example, I have a left page figure with two subfigures, let's say 1.A and 1.B.

If I put a regular floating figure after this and let's say 2 subs, I get 2.C and 2.D like if figure number is correctly increased and subfigure letter is continuous.

My question is the following:

How do you "strongly" delimit figures and subfigures so that referencing is correct ?

I tried to define a new environment, to move labels and captions commands, etc. without success. What is the general way to proceed ?

EDIT : Here is my general syntax

for left page figures I use the command provided in the link above :

\addfig{
*subfigure contents*
\captionof{subfigure}
\label{subfigure}

*subfigure contents*
\captionof{subfigure}
\label{subfigure}
}

and then a floating one

\begin{figure}
\subfloat[title]{
*subfigure contents*
\label{subfigure}
}
\subfloat[title]{
*subfigure contents*
\label{subfigure}
\end{figure}.

Subfigures labels are continued between the two figures.

Answer 1

In the preamble:

\usepackage{float}

In the document:

\begin{figure}[H]
    \addfig{
        *subfigure contents*
        \captionof{subfigure}
        \label{subfigure}

        *subfigure contents*
        \captionof{subfigure}
        \label{subfigure}
    }
\end{figure}