- Fix Star Wars Rogue Squadron II: Rogue Leader.

emukidid · Jan 1, 2019 · abb7ff0 · abb7ff0
1 parent 3a7a7bb
commit abb7ff0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/cube/swiss/source/patcher.c b/cube/swiss/source/patcher.c
@@ -1723,7 +1723,7 @@ void Patch_VideoMode(u32 *data, u32 length, int dataType)
 					data[i +  19] = 0x548307BE;	// clrlwi	r3, r4, 30
 					data[i +  29] = 0xA01F0012;	// lhz		r0, 18 (r31)
 					data[i +  41] = 0xA01F0014;	// lhz		r0, 20 (r31)
-					data[i +  55] = 0xA07F0016;	// lhz		r3, 22 (r31)
+					data[i +  54] = 0xA07F0016;	// lhz		r3, 22 (r31)
 					data[i + 102] = 0x38A00000 | (swissSettings.forceVOffset & 0xFFFF);
 					data[i + 104] = 0x7CA42B78;	// mr		r4, r5
 					data[i + 222] = 0x801B0000;	// lwz		r0, 0 (r27)
@@ -1864,7 +1864,7 @@ void Patch_VideoMode(u32 *data, u32 length, int dataType)
 					case 2:
 						data[i +   8] = 0xA09F0000;	// lhz		r4, 0 (r31)
 						data[i +  35] = 0x5400003C;	// clrrwi	r0, r0, 1
-						data[i +  55] = 0x887F0016;	// lbz		r3, 22 (r31)
+						data[i +  54] = 0x887F0016;	// lbz		r3, 22 (r31)
 						data[i +  65] = 0xA01F0010;	// lhz		r0, 16 (r31)
 						data[i +  67] = 0x801B0000;	// lwz		r0, 0 (r27)
 						data[i +  68] = 0x28000001;	// cmplwi	r0, 1

diff --git a/cube/swiss/source/patches/vi/VIConfigure1080i60.s b/cube/swiss/source/patches/vi/VIConfigure1080i60.s
@@ -26,6 +26,8 @@ VIConfigure1080i60:
 	oris		%r0, %r0, 2
 	lhz			%r6, 8 (%r3)
 	lhz			%r5, 6 (%r3)
+	cmpw		%r5, %r6
+	bgt			3f
 	cmpwi		%r5, 264
 	ble			3f
 	clrrwi		%r5, %r5, 1

diff --git a/cube/swiss/source/patches/vi/VIConfigure240p.s b/cube/swiss/source/patches/vi/VIConfigure240p.s
@@ -27,6 +27,8 @@ VIConfigure240p:
 	li			%r7, 1
 	lhz			%r6, 8 (%r3)
 	lhz			%r5, 6 (%r3)
+	cmpw		%r5, %r6
+	bgt			6f
 	cmpwi		%r5, 264
 	ble			6f
 	clrrwi		%r5, %r5, 1

diff --git a/cube/swiss/source/patches/vi/VIConfigure480i.s b/cube/swiss/source/patches/vi/VIConfigure480i.s
@@ -25,6 +25,8 @@ VIConfigure480i:
 	li			%r7, 1
 	lhz			%r6, 8 (%r3)
 	lhz			%r5, 6 (%r3)
+	cmpw		%r5, %r6
+	bgt			6f
 	cmpwi		%r5, 264
 	ble			6f
 	clrrwi		%r5, %r5, 1

diff --git a/cube/swiss/source/patches/vi/VIConfigure480p.s b/cube/swiss/source/patches/vi/VIConfigure480p.s
@@ -27,6 +27,8 @@ VIConfigure480p:
 	li			%r8, 1
 	lhz			%r6, 8 (%r3)
 	lhz			%r5, 6 (%r3)
+	cmpw		%r5, %r6
+	bgt			6f
 	cmpwi		%r5, 264
 	ble			6f
 	clrrwi		%r5, %r5, 1