Add CS1 patch to fix expected texture size for Thor Master Quartz so …

…it can be HD-texture'd.
AdmiralCurtiss · Jun 1, 2020 · a66b48a · a66b48a
1 parent 028e474
commit a66b48a
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 6 deletions.
diff --git a/SenLib/Sen1/Sen1ExecutablePatchEnglish.cs b/SenLib/Sen1/Sen1ExecutablePatchEnglish.cs
@@ -33,5 +33,9 @@ public long GetAddressJumpR2NotebookOpen() {
 		public long GetAddressJumpR2NotebookSettings() {
 			return 0x6dfaf0;
 		}
+
+		public long GetRomAddressThorMasterQuartzTextureIdTypo() {
+			return 0x73adba;
+		}
 	}
 }
diff --git a/SenLib/Sen1/Sen1ExecutablePatchInterface.cs b/SenLib/Sen1/Sen1ExecutablePatchInterface.cs
@@ -26,5 +26,8 @@ public interface Sen1ExecutablePatchInterface {
 
 		// address of conditional jump statement for not displaying the R2 option in the settings when turbo is enabled
 		long GetAddressJumpR2NotebookSettings();
+
+		// address of extra character in the middle of texture ID string of Thor MQ, for the HQ texture pack
+		long GetRomAddressThorMasterQuartzTextureIdTypo();
 	}
 }
diff --git a/SenLib/Sen1/Sen1ExecutablePatchJapanese.cs b/SenLib/Sen1/Sen1ExecutablePatchJapanese.cs
@@ -33,5 +33,9 @@ public long GetAddressJumpR2NotebookOpen() {
 		public long GetAddressJumpR2NotebookSettings() {
 			return 0x6de1a0;
 		}
+
+		public long GetRomAddressThorMasterQuartzTextureIdTypo() {
+			return 0x738f6a;
+		}
 	}
 }
diff --git a/SenLib/Sen1/Sen1ExecutablePatches.cs b/SenLib/Sen1/Sen1ExecutablePatches.cs
@@ -84,5 +84,12 @@ public static void PatchJumpR2NotebookSettings(Stream binary, Sen1ExecutablePatc
 			}
 		}
 
+		public static void PatchThorMasterQuartzString(Stream binary, Sen1ExecutablePatchInterface patchInfo) {
+			binary.Position = patchInfo.GetRomAddressThorMasterQuartzTextureIdTypo();
+			long p = binary.Position;
+			byte[] tmp = binary.ReadUInt8Array(4);
+			binary.Position = p;
+			binary.Write(tmp, 1, 3);
+		}
 	}
 }
diff --git a/SenPatcherGui/Sen1Form.Designer.cs b/SenPatcherGui/Sen1Form.Designer.cs
diff --git a/SenPatcherGui/Sen1Form.cs b/SenPatcherGui/Sen1Form.cs
@@ -70,6 +70,7 @@ private void buttonPatch_Click(object sender, EventArgs e) {
 				bool removeTurboSkip = checkBoxBattleAutoSkip.Checked;
 				bool allowR2NotebookShortcut = checkBoxAllowR2InTurboMode.Checked;
 				int turboKey = comboBoxTurboModeKey.SelectedIndex;
+				bool fixTextureIds = checkBoxFixHdTextureId.Checked;
 
 				if (removeTurboSkip) {
 					Sen1ExecutablePatches.PatchJumpBattleAnimationAutoSkip(ms, PatchInfo, true);
@@ -84,6 +85,9 @@ private void buttonPatch_Click(object sender, EventArgs e) {
 					Sen1ExecutablePatches.PatchButtonBattleResultsAutoSkip(ms, PatchInfo, (byte)turboKey);
 					Sen1ExecutablePatches.PatchButtonTurboMode(ms, PatchInfo, (byte)turboKey);
 				}
+				if (fixTextureIds) {
+					Sen1ExecutablePatches.PatchThorMasterQuartzString(ms, PatchInfo);
+				}
 
 				// write patched file
 				using (var fs = new FileStream(Path, FileMode.Create, FileAccess.Write)) {