Fix h1 fog disable

Burnt-o · Burnt-o · commit 9fcc9b4e3d1c · 2024-08-20T17:58:08.000+09:30
diff --git a/HCMInternal/DisableFog.cpp b/HCMInternal/DisableFog.cpp
@@ -110,19 +110,21 @@ class DisableFogImplNopCall : public DisableFog::DisableFogImpl
 	}
 };
 
-// Halo 1 is a module patch + a module nop call patch
+// Halo 1 is 2 module patches + a module nop call patch
 class DisableFogImplHalo1 : public DisableFog::DisableFogImpl
 {
 private:
 	ScopedCallback<ToggleEvent> disableFogToggleCallback;
 
 	std::shared_ptr<ModulePatch> disableFogPatchHook;
 	std::shared_ptr<ModulePatch> disableFogPatchHook2;
+	std::shared_ptr<ModulePatch> disableFogPatchHook3;
 
 	void onDisableFogToggleChanged(bool newValue)
 	{
 		disableFogPatchHook->setWantsToBeAttached(newValue);
 		disableFogPatchHook2->setWantsToBeAttached(newValue);
+		disableFogPatchHook3->setWantsToBeAttached(newValue);
 	}
 
 
@@ -137,7 +139,11 @@ class DisableFogImplHalo1 : public DisableFog::DisableFogImpl
 		disableFogPatchHook = ModulePatch::make(gameImpl.toModuleName(), disableFogPatchFunction, *disableFogPatchCode.get());
 
 		auto disableFogPatchFunction2 = ptr->getData<std::shared_ptr<MultilevelPointer>>(nameof(disableFogPatchFunction2), gameImpl);
-		disableFogPatchHook2 = ModulePatch::makeNOPCall(gameImpl.toModuleName(), disableFogPatchFunction2);
+		auto disableFogPatchCode2 = ptr->getVectorData<byte>(nameof(disableFogPatchCode2), gameImpl);
+		disableFogPatchHook2 = ModulePatch::make(gameImpl.toModuleName(), disableFogPatchFunction2, *disableFogPatchCode2.get());
+
+		auto disableFogPatchFunction3 = ptr->getData<std::shared_ptr<MultilevelPointer>>(nameof(disableFogPatchFunction3), gameImpl);
+		disableFogPatchHook3 = ModulePatch::makeNOPCall(gameImpl.toModuleName(), disableFogPatchFunction3);
 	}
 };
 
diff --git a/HCMInternal/InternalPointerData.xml b/HCMInternal/InternalPointerData.xml
@@ -10640,7 +10640,7 @@
 		<Version Version="1.3385.0.0" Game="Halo1">
 			<Module>halo1.dll</Module>
 			<Offsets>
-				<Offset>0xAE09DF</Offset>
+				<Offset>0xAE09E1</Offset>
 			</Offsets>
 		</Version>
 
@@ -10682,7 +10682,7 @@
 
 	<VersionedEntry Name="disableFogPatchCode" Type="Vector" Typename="byte">
 		<Version Version="1.3385.0.0" Game="Halo1">
-			<Data>0xE9, 0x10, 0x01, 0x00, 0x00, 0x90, 0x90, 0x90, 0x90, 0x90</Data>
+			<Data>0xEB, 0x08</Data>
 		</Version>
 
 		<Version Version="1.3385.0.0" Game="Halo2">
@@ -10702,7 +10702,7 @@
 		<Version Version="1.3385.0.0" Game="Halo1">
 			<Module>halo1.dll</Module>
 			<Offsets>
-				<Offset>0xBBD39A</Offset>
+				<Offset>0xAE0A83</Offset>
 			</Offsets>
 		</Version>
 
@@ -10722,9 +10722,24 @@
 	</VersionedEntry>
 
 
+
 	<VersionedEntry Name="disableFogPatchCode2" Type="Vector" Typename="byte">
+		<Version Version="1.3385.0.0" Game="Halo1">
+			<Data>0xEB, 0x6F</Data>
+		</Version>
+
 		<Version Version="1.3385.0.0" Game="Halo3ODST">
 			<Data>0xE9, 0xF9, 0x00, 0x00, 0x00</Data>
 		</Version>
 	</VersionedEntry>
+
+	<VersionedEntry Name="disableFogPatchFunction3" Type="MultilevelPointer::ModuleOffset">
+		<Version Version="1.3385.0.0" Game="Halo1">
+			<Module>halo1.dll</Module>
+			<Offsets>
+				<Offset>0xBBD39A</Offset>
+			</Offsets>
+		</Version>
+
+	</VersionedEntry>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -110,19 +110,21 @@ class DisableFogImplNopCall : public DisableFog::DisableFogImpl`
`110`	`110`	`}`
`111`	`111`	`};`
`112`	`112`
`113`		`-// Halo 1 is a module patch + a module nop call patch`
	`113`	`+// Halo 1 is 2 module patches + a module nop call patch`
`114`	`114`	`class DisableFogImplHalo1 : public DisableFog::DisableFogImpl`
`115`	`115`	`{`
`116`	`116`	`private:`
`117`	`117`	`ScopedCallback<ToggleEvent> disableFogToggleCallback;`
`118`	`118`
`119`	`119`	`std::shared_ptr<ModulePatch> disableFogPatchHook;`
`120`	`120`	`std::shared_ptr<ModulePatch> disableFogPatchHook2;`
	`121`	`+ std::shared_ptr<ModulePatch> disableFogPatchHook3;`
`121`	`122`
`122`	`123`	`void onDisableFogToggleChanged(bool newValue)`
`123`	`124`	`{`
`124`	`125`	`disableFogPatchHook->setWantsToBeAttached(newValue);`
`125`	`126`	`disableFogPatchHook2->setWantsToBeAttached(newValue);`
	`127`	`+ disableFogPatchHook3->setWantsToBeAttached(newValue);`
`126`	`128`	`}`
`127`	`129`
`128`	`130`
`@@ -137,7 +139,11 @@ class DisableFogImplHalo1 : public DisableFog::DisableFogImpl`
`137`	`139`	`disableFogPatchHook = ModulePatch::make(gameImpl.toModuleName(), disableFogPatchFunction, *disableFogPatchCode.get());`
`138`	`140`
`139`	`141`	`auto disableFogPatchFunction2 = ptr->getData<std::shared_ptr<MultilevelPointer>>(nameof(disableFogPatchFunction2), gameImpl);`
`140`		`- disableFogPatchHook2 = ModulePatch::makeNOPCall(gameImpl.toModuleName(), disableFogPatchFunction2);`
	`142`	`+ auto disableFogPatchCode2 = ptr->getVectorData<byte>(nameof(disableFogPatchCode2), gameImpl);`
	`143`	`+ disableFogPatchHook2 = ModulePatch::make(gameImpl.toModuleName(), disableFogPatchFunction2, *disableFogPatchCode2.get());`
	`144`	`+`
	`145`	`+ auto disableFogPatchFunction3 = ptr->getData<std::shared_ptr<MultilevelPointer>>(nameof(disableFogPatchFunction3), gameImpl);`
	`146`	`+ disableFogPatchHook3 = ModulePatch::makeNOPCall(gameImpl.toModuleName(), disableFogPatchFunction3);`
`141`	`147`	`}`
`142`	`148`	`};`
`143`	`149`