- Fix 540p and 1080i video timings.

emukidid · Jul 28, 2019 · 0948c79 · 0948c79
1 parent 3e1144f
commit 0948c79
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/cube/swiss/source/patcher.c b/cube/swiss/source/patcher.c
@@ -1425,8 +1425,8 @@ u8 video_timing[] = {
 };
 
 u8 video_timing_540p60[] = {
-	0x07,0x00,0x02,0x1C,
-	0x00,0x19,0x00,0x19,
+	0x0A,0x00,0x02,0x1C,
+	0x00,0x10,0x00,0x10,
 	0x00,0x00,0x00,0x00,
 	0x28,0x28,0x28,0x28,
 	0x04,0x60,0x04,0x60,
@@ -1438,8 +1438,8 @@ u8 video_timing_540p60[] = {
 };
 
 u8 video_timing_1080i60[] = {
-	0x07,0x00,0x02,0x1C,
-	0x00,0x17,0x00,0x18,
+	0x05,0x00,0x02,0x1C,
+	0x00,0x1D,0x00,0x1E,
 	0x00,0x01,0x00,0x00,
 	0x28,0x29,0x28,0x29,
 	0x04,0x60,0x04,0x5F,
@@ -1487,8 +1487,8 @@ u8 video_timing_ntsc50[] = {
 };
 
 u8 video_timing_540p50[] = {
-	0x07,0x00,0x02,0x1C,
-	0x00,0x19,0x00,0x19,
+	0x0A,0x00,0x02,0x1C,
+	0x00,0x10,0x00,0x10,
 	0x00,0x00,0x00,0x00,
 	0x28,0x28,0x28,0x28,
 	0x04,0x60,0x04,0x60,
@@ -1500,8 +1500,8 @@ u8 video_timing_540p50[] = {
 };
 
 u8 video_timing_1080i50[] = {
-	0x07,0x00,0x02,0x1C,
-	0x00,0x17,0x00,0x18,
+	0x05,0x00,0x02,0x1C,
+	0x00,0x1D,0x00,0x1E,
 	0x00,0x01,0x00,0x00,
 	0x28,0x29,0x28,0x29,
 	0x04,0x60,0x04,0x5F,
@@ -2971,8 +2971,9 @@ void Patch_VideoMode(u32 *data, u32 length, int dataType)
 					data[i + 192] = 0x7C090050;	// sub		r0, r0, r9
 					data[i + 313] = 0x801C0000;	// lwz		r0, 0 (r28)
 					data[i + 315] = 0x28000002;	// cmplwi	r0, 2
-					data[i + 317] = 0x28000003;	// cmplwi	r0, 3
-					data[i + 319] = 0x28000002;	// cmplwi	r0, 2
+					data[i + 316] = 0x41800020;	// blt		+8
+					data[i + 317] = 0x28000002;	// cmplwi	r0, 2
+					data[i + 319] = 0x28000003;	// cmplwi	r0, 3
 					data[i + 506] = 0xA8730000;	// lha		r3, 0 (r19)
 					data[i + 516] = branchAndLink(VIConfigureHook2, VIConfigure + 516);
 					break;
@@ -2989,8 +2990,9 @@ void Patch_VideoMode(u32 *data, u32 length, int dataType)
 					data[i + 234] = 0x7D9A6050;	// sub		r12, r12, r26
 					data[i + 332] = 0x815D0024;	// lwz		r10, 36 (r29)
 					data[i + 336] = 0x280A0002;	// cmplwi	r10, 2
-					data[i + 343] = 0x280A0003;	// cmplwi	r10, 3
-					data[i + 345] = 0x280A0002;	// cmplwi	r10, 2
+					data[i + 342] = 0x41800020;	// blt		+8
+					data[i + 343] = 0x280A0002;	// cmplwi	r10, 2
+					data[i + 345] = 0x280A0003;	// cmplwi	r10, 3
 					data[i + 542] = 0xA87E000A;	// lha		r3, 10 (r30)
 					data[i + 552] = branchAndLink(VIConfigureHook2, VIConfigure + 552);
 					break;