diff --git a/CHANGES b/CHANGES
index f157b549c..5816f6ffa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,7 @@
 Bugfixes:
  - Qt: More app metadata fixes
  - Qt: Fix load recent from archive (fixes mgba.io/i/1325)
- - GB Video: Delay LYC STAT check (fixes mgba.io/i/1331)
- - GB Video: Fix window being enabled mid-scanline (fixes mgba.io/i/1328)
+ - LR35902: Fix disassembly of several CB-prefix instructions
 Misc:
  - Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323)
 
diff --git a/src/lr35902/decoder.c b/src/lr35902/decoder.c
index 3d3098441..76c6b9f02 100644
--- a/src/lr35902/decoder.c
+++ b/src/lr35902/decoder.c
@@ -314,15 +314,21 @@ DEFINE_POPPUSH_DECODER_LR35902(DE);
 DEFINE_POPPUSH_DECODER_LR35902(HL);
 DEFINE_POPPUSH_DECODER_LR35902(AF);
 
+#define DEFINE_CB_OP_DECODER_LR35902(NAME, BODY, OP) \
+	DEFINE_DECODER_LR35902(NAME ## B, info->OP.reg = LR35902_REG_B; BODY) \
+	DEFINE_DECODER_LR35902(NAME ## C, info->OP.reg = LR35902_REG_C; BODY) \
+	DEFINE_DECODER_LR35902(NAME ## D, info->OP.reg = LR35902_REG_D; BODY) \
+	DEFINE_DECODER_LR35902(NAME ## E, info->OP.reg = LR35902_REG_E; BODY) \
+	DEFINE_DECODER_LR35902(NAME ## H, info->OP.reg = LR35902_REG_H; BODY) \
+	DEFINE_DECODER_LR35902(NAME ## L, info->OP.reg = LR35902_REG_L; BODY) \
+	DEFINE_DECODER_LR35902(NAME ## HL, info->OP.reg = LR35902_REG_HL; info->OP.flags = LR35902_OP_FLAG_MEMORY; BODY) \
+	DEFINE_DECODER_LR35902(NAME ## A, info->OP.reg = LR35902_REG_A; BODY)
+
 #define DEFINE_CB_2_DECODER_LR35902(NAME, BODY) \
-	DEFINE_DECODER_LR35902(NAME ## B, info->op2.reg = LR35902_REG_B; BODY) \
-	DEFINE_DECODER_LR35902(NAME ## C, info->op2.reg = LR35902_REG_C; BODY) \
-	DEFINE_DECODER_LR35902(NAME ## D, info->op2.reg = LR35902_REG_D; BODY) \
-	DEFINE_DECODER_LR35902(NAME ## E, info->op2.reg = LR35902_REG_E; BODY) \
-	DEFINE_DECODER_LR35902(NAME ## H, info->op2.reg = LR35902_REG_H; BODY) \
-	DEFINE_DECODER_LR35902(NAME ## L, info->op2.reg = LR35902_REG_L; BODY) \
-	DEFINE_DECODER_LR35902(NAME ## HL, info->op2.reg = LR35902_REG_HL; info->op2.flags = LR35902_OP_FLAG_MEMORY; BODY) \
-	DEFINE_DECODER_LR35902(NAME ## A, info->op2.reg = LR35902_REG_A; BODY)
+	DEFINE_CB_OP_DECODER_LR35902(NAME, BODY, op2)
+
+#define DEFINE_CB_1_DECODER_LR35902(NAME, BODY) \
+	DEFINE_CB_OP_DECODER_LR35902(NAME, BODY, op1)
 
 #define DEFINE_CB_DECODER_LR35902(NAME, BODY) \
 	DEFINE_CB_2_DECODER_LR35902(NAME ## 0, info->op1.immediate = 0; BODY) \
@@ -339,17 +345,19 @@ DEFINE_CB_DECODER_LR35902(RES, info->mnemonic = LR35902_MN_RES)
 DEFINE_CB_DECODER_LR35902(SET, info->mnemonic = LR35902_MN_SET)
 
 #define DEFINE_CB_X_DECODER_LR35902(NAME) \
-	DEFINE_CB_2_DECODER_LR35902(NAME, info->mnemonic = LR35902_MN_ ## NAME) \
-	DEFINE_DECODER_LR35902(NAME ## A_, info->mnemonic = LR35902_MN_ ## NAME; info->op1.reg = LR35902_REG_A)
+	DEFINE_CB_1_DECODER_LR35902(NAME, info->mnemonic = LR35902_MN_ ## NAME) \
+	DEFINE_DECODER_LR35902(NAME ## A_, info->mnemonic = LR35902_MN_ ## NAME; \
+		info->op1.flags = LR35902_OP_FLAG_IMPLICIT; \
+		info->op1.reg = LR35902_REG_A;)
 
 DEFINE_CB_X_DECODER_LR35902(RL)
 DEFINE_CB_X_DECODER_LR35902(RLC)
 DEFINE_CB_X_DECODER_LR35902(RR)
 DEFINE_CB_X_DECODER_LR35902(RRC)
-DEFINE_CB_2_DECODER_LR35902(SLA, info->mnemonic = LR35902_MN_SLA)
-DEFINE_CB_2_DECODER_LR35902(SRA, info->mnemonic = LR35902_MN_SRA)
-DEFINE_CB_2_DECODER_LR35902(SRL, info->mnemonic = LR35902_MN_SRL)
-DEFINE_CB_2_DECODER_LR35902(SWAP, info->mnemonic = LR35902_MN_SWAP)
+DEFINE_CB_1_DECODER_LR35902(SLA, info->mnemonic = LR35902_MN_SLA)
+DEFINE_CB_1_DECODER_LR35902(SRA, info->mnemonic = LR35902_MN_SRA)
+DEFINE_CB_1_DECODER_LR35902(SRL, info->mnemonic = LR35902_MN_SRL)
+DEFINE_CB_1_DECODER_LR35902(SWAP, info->mnemonic = LR35902_MN_SWAP)
 
 DEFINE_DECODER_LR35902(DI, info->mnemonic = LR35902_MN_DI)
 DEFINE_DECODER_LR35902(EI, info->mnemonic = LR35902_MN_EI)