diff --git a/OpenParrot/src/Functions/Games/APM3/APM3.cpp b/OpenParrot/src/Functions/Games/APM3/APM3.cpp
index 3f70eb4..a5d608a 100644
--- a/OpenParrot/src/Functions/Games/APM3/APM3.cpp
+++ b/OpenParrot/src/Functions/Games/APM3/APM3.cpp
@@ -1046,12 +1046,12 @@ static InitFunction initPuyoFunc([]()
 
 }, GameID::PuyoPuyoEsports);
 
-static InitFunction initDoa6FM17Func([]()
+static InitFunction initDoa6Func([]()
 {
 	HookAPM3(L"SDFM");
 	__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
-}, GameID::Doa6FM17);
+}, GameID::Doa6);
 
 static InitFunction initGGSFunc([]()
 {
@@ -1210,10 +1210,10 @@ static InitFunction initFuncCottonRocknRollA([]()
 
 	if (ToBool(config["General"]["Windowed"]))
 	{
-		injector::WriteMemory<BYTE>(mainModuleBase + 0x2A3C1E, 0xEB, true); // Windowed
+		injector::WriteMemory<BYTE>(hook::get_pattern("74 7A 68 DC 00 00 00"), 0xEB, true); // Windowed
 	}
 
-	injector::WriteMemory<BYTE>(mainModuleBase + 0x25036F, 0xEB, true); // Skip some credit check idfk
+	injector::WriteMemory<BYTE>(hook::get_pattern("75 47 53 8B 1D ? ? ? ?"), 0xEB, true); // Skip emoneyUI check
 
 }, GameID::CottonRocknRollA);
 
diff --git a/OpenParrot/src/Utility/GameDetect.cpp b/OpenParrot/src/Utility/GameDetect.cpp
index 011adf2..349f6d1 100644
--- a/OpenParrot/src/Utility/GameDetect.cpp
+++ b/OpenParrot/src/Utility/GameDetect.cpp
@@ -635,7 +635,7 @@ void GameDetect::DetectCurrentGame()
 			SetGameId(GameID::Aleste11, "ALESTE Ver 11");
 			break;
 		case 0xd426de40: // Cotton Rock n Roll A
-		//case 0x1eedb670: // Cotton Rock n Roll A v1.2 (needs new patches)
+		case 0x1eedb670: // Cotton Rock n Roll A v1.2
 			SetGameId(GameID::CottonRocknRollA, "Cotton Rock n Roll A");
 			break;
 		case 0xed8af9f8: // Guilty Gear Xrd REV APM3 Edition
@@ -747,18 +747,18 @@ void GameDetect::DetectCurrentGame()
 		case 0x9c7bb2e1: // Ver 11 TEST
 			SetGameId(GameID::TappingSkillTest, "Tapping Skill Test Generic");
 			break;
-		case 0x2FF02A2E: // FM17
-		case 0x24DCF694: // FM16
-		case 0x0bad58c2: // FM14
-		case 0x65753fe4: // FM13
-		case 0xd7028acd: // FM12
-		case 0xf9df097f: // FM11
 		case 0x03577d43: // FM10
-			SetGameId(GameID::Doa6FM17, "Dead or Alive 6 Generic");
+		case 0xf9df097f: // FM11
+		case 0xd7028acd: // FM12
+		case 0x65753fe4: // FM13
+		case 0x0bad58c2: // FM14
+		case 0x24DCF694: // FM16
+		case 0x2FF02A2E: // FM17
+			SetGameId(GameID::Doa6, "Dead or Alive 6 Generic");
 			break;
-		case 0x94aababc: // FM14 Test
 		case 0x4286c538: // FM12 Test
 		case 0x0e285533: // FM13 Test
+		case 0x94aababc: // FM14 Test
 			SetGameId(GameID::Doa6Test, "Dead or Alive 6 Test Generic");
 			break;
 		case 0xd0a6afbd: // GGS
diff --git a/OpenParrot/src/Utility/GameID.h b/OpenParrot/src/Utility/GameID.h
index a5442d2..917e71f 100644
--- a/OpenParrot/src/Utility/GameID.h
+++ b/OpenParrot/src/Utility/GameID.h
@@ -107,13 +107,7 @@ enum class GameID
 	SFV,
 	TappingSkillTest,
 	VF5EsportsTest,
-	Doa6FM10,
-	Doa6FM11,
-	Doa6FM12,
-	Doa6FM13,
-	Doa6FM14,
-	Doa6FM16,
-	Doa6FM17,
+	Doa6,
 	Doa6Test,
 	WMMT5DXPlus,
 	GGS,