From 3c7fd55f70a5bfe69ecee9d043f7082aaa0c39b5 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Thu, 16 Mar 2023 20:16:27 -0700
Subject: [PATCH] Mode2/2336 support (fixes #3387)

---
 .../DiscFormats/CDI_format.cs                 |  2 +-
 .../DiscFormats/CUE/CUE_Load.cs               |  7 ++++++-
 .../DiscFormats/CUE/CUE_Synths.cs             | 21 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CDI_format.cs b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CDI_format.cs
index 28b4e3a1c8..dbe4aadb52 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CDI_format.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CDI_format.cs
@@ -557,7 +557,7 @@ namespace BizHawk.Emulation.DiscSystem
 						SS_Base synth = track.ReadMode switch
 						{
 							0 => new SS_Mode1_2048(),
-							1 => throw new NotSupportedException("Mode2/2336"), // TODO
+							1 => new SS_Mode2_2336(),
 							2 => new SS_2352(),
 							3 => new SS_CDI_RawQ(),
 							4 => new SS_CDI_RawPQRSTUVW(),
diff --git a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
index 5f6b7609b7..b3c489a870 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Load.cs
@@ -337,8 +337,13 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 								sectorSize = 2048;
 								break;
 
-							default:
+							case CueTrackType.CDI_2336:
 							case CueTrackType.Mode2_2336:
+								ss = new SS_Mode2_2336();
+								sectorSize = 2336;
+								break;
+
+							default:
 								throw new InvalidOperationException($"Not supported: {cct.TrackType}");
 						}
 
diff --git a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Synths.cs b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Synths.cs
index 8719480cc8..a5b278587a 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Synths.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscFormats/CUE/CUE_Synths.cs
@@ -68,6 +68,24 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 		}
 	}
 
+	/// <summary>
+	/// Represents a Mode2 2336-byte sector
+	/// </summary>
+	internal class SS_Mode2_2336 : SS_Base
+	{
+		public override void Synth(SectorSynthJob job)
+		{
+			//read the sector user data
+			Blob.Read(BlobOffset, job.DestBuffer2448, job.DestOffset + 16, 2336);
+
+			if ((job.Parts & ESectorSynthPart.Header16) != 0)
+				SynthUtils.SectorHeader(job.DestBuffer2448, job.DestOffset + 0, job.LBA, 2);
+
+			//if subcode is needed, synthesize it
+			SynthSubchannelAsNeed(job);
+		}
+	}
+
 	/// <summary>
 	/// Represents a 2352-byte sector of any sort
 	/// </summary>
@@ -108,6 +126,8 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 					mode = 1;
 					break;
 
+				case CueTrackType.CDI_2336:
+				case CueTrackType.Mode2_2336:
 				case CueTrackType.Mode2_2352:
 					mode = 2;
 					if (Policy.CUE_PregapMode2_As_XA_Form2)
@@ -123,7 +143,6 @@ namespace BizHawk.Emulation.DiscSystem.CUE
 					Pause = true;
 					break;
 
-				case CueTrackType.Mode2_2336:
 				default:
 					throw new InvalidOperationException($"Not supported: {TrackType}");
 			}