dolphin plugin fixes

ThirteenAG · ThirteenAG · commit 8b34678aa0f1 · 2024-10-14T22:45:47.000+08:00
diff --git a/includes/dolphin/dolphin.h b/includes/dolphin/dolphin.h
@@ -35,12 +35,12 @@ class Dolphin
                         auto candidate_stringref = utility::scan_displacement_reference(current_module, *candidate_string);
                         if (candidate_stringref)
                         {
-                            for (size_t i = 0; i < 4000; ++i)
+                            for (size_t i = 0; i < 8000; ++i)
                             {
                                 const auto mov = utility::scan_mnemonic(*candidate_stringref + i, 5, "MOV");
                                 if (mov)
                                 {
-                                    if (injector::ReadMemory<uint32_t>(*mov + 1, true) == 19)
+                                    if (injector::ReadMemory<uint32_t>(*mov + 1, true) == 19 || injector::ReadMemory<uint32_t>(*mov + 1, true) == 20)
                                     {
                                         const auto next_fn_call1 = utility::scan_mnemonic(*mov, 100, "CALL");
                                         if (next_fn_call1)
@@ -51,7 +51,7 @@ class Dolphin
                                                 const auto next_mov = utility::scan_mnemonic(*next_fn_call2, 100, "MOV");
                                                 if (next_mov)
                                                 {
-                                                    if (injector::ReadMemory<uint32_t>(*next_mov + 1, true) == 17)
+                                                    if (injector::ReadMemory<uint32_t>(*next_mov + 1, true) == 17 || injector::ReadMemory<uint32_t>(*next_mov + 1, true) == 18)
                                                     {
                                                         _SetIsThrottlerTempDisabled = (void(__fastcall*)(bool disable))(injector::GetBranchDestination(*next_fn_call2).as_int());
                                                         return _SetIsThrottlerTempDisabled(disable);
diff --git a/source/ResidentEvil2.RE3.Dolphin.FusionMod/dllmain.cpp b/source/ResidentEvil2.RE3.Dolphin.FusionMod/dllmain.cpp
@@ -56,9 +56,9 @@ void PluginThread(std::future<void> futureObj)
                         {
                             [&]()
                             {
-                                auto pattern = hook::pattern(Dolphin::GameMemoryStart, Dolphin::GameMemoryEnd, "38 a0 00 01 3c 60 ? ? 38 83 ? ? 90 a4");
+                                auto pattern = hook::pattern(Dolphin::GameMemoryStart, Dolphin::GameMemoryEnd, "38 ? 00 01 3c 60 ? ? 38 ? ? ? 90 ? ? ? 3c ? ? ? 38 63 ? ? 80 63 00 00 88 ? 00 09 28 ? 00 0b ? ? ? ? 3c 60 ? ? 38 ? ? ? 54 ? ? ? 7c ? ? ? 7c");
                                 if (gameVersion == RE3)
-                                    pattern = hook::pattern(Dolphin::GameMemoryStart, Dolphin::GameMemoryEnd, "38 00 00 01 3c 60 ? ? 38 63 ? ? ? ? 00 00 3c 60");
+                                    pattern = hook::pattern(Dolphin::GameMemoryStart, Dolphin::GameMemoryEnd, "38 00 00 01 3c 60 ? ? 38 63 ? ? 98 03 00 00 3c 60 ? ? 38 63 ? ? 93 83 21 58 3c 60");
                                 if (pattern.size() >= 1)
                                 {
                                     memcheck = pattern.get(0).get<uint32_t>(4);
@@ -165,7 +165,7 @@ void PluginThread(std::future<void> futureObj)
                             }
                             else if (gameVersion == RECV)
                             {
-                    
+
                             }
                         }
                     }
@@ -214,7 +214,7 @@ void InitLED()
                      std::this_thread::sleep_for(std::chrono::milliseconds(100));
                      
                      auto gameVersion = GameVersion::UNDEFINED;
-                     if (Dolphin::GameID() == "GHAE08" || Dolphin::GameID() == "GHAP08" || Dolphin::GameID() == "GHAJ08")
+                     if (Dolphin::GameID() == "GHAE08" || Dolphin::GameID() == "GHAP08" /* || Dolphin::GameID() == "GHAJ08"*/)
                          gameVersion = GameVersion::RE2;
                      else if (Dolphin::GameID() == "GLEE08" || Dolphin::GameID() == "GLEJ08" || Dolphin::GameID() == "GLEP08")
                          gameVersion = GameVersion::RE3;

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ class Dolphin`
`35`	`35`	`auto candidate_stringref = utility::scan_displacement_reference(current_module, *candidate_string);`
`36`	`36`	`if (candidate_stringref)`
`37`	`37`	`{`
`38`		`- for (size_t i = 0; i < 4000; ++i)`
	`38`	`+ for (size_t i = 0; i < 8000; ++i)`
`39`	`39`	`{`
`40`	`40`	`const auto mov = utility::scan_mnemonic(*candidate_stringref + i, 5, "MOV");`
`41`	`41`	`if (mov)`
`42`	`42`	`{`
`43`		`- if (injector::ReadMemory<uint32_t>(*mov + 1, true) == 19)`
	`43`	`+ if (injector::ReadMemory<uint32_t>(mov + 1, true) == 19 \|\| injector::ReadMemory<uint32_t>(mov + 1, true) == 20)`
`44`	`44`	`{`
`45`	`45`	`const auto next_fn_call1 = utility::scan_mnemonic(*mov, 100, "CALL");`
`46`	`46`	`if (next_fn_call1)`
`@@ -51,7 +51,7 @@ class Dolphin`
`51`	`51`	`const auto next_mov = utility::scan_mnemonic(*next_fn_call2, 100, "MOV");`
`52`	`52`	`if (next_mov)`
`53`	`53`	`{`
`54`		`- if (injector::ReadMemory<uint32_t>(*next_mov + 1, true) == 17)`
	`54`	`+ if (injector::ReadMemory<uint32_t>(next_mov + 1, true) == 17 \|\| injector::ReadMemory<uint32_t>(next_mov + 1, true) == 18)`
`55`	`55`	`{`
`56`	`56`	`_SetIsThrottlerTempDisabled = (void(__fastcall)(bool disable))(injector::GetBranchDestination(next_fn_call2).as_int());`
`57`	`57`	`return _SetIsThrottlerTempDisabled(disable);`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ void PluginThread(std::future<void> futureObj)`
`56`	`56`	`{`
`57`	`57`	`[&]()`
`58`	`58`	`{`
`59`		`- auto pattern = hook::pattern(Dolphin::GameMemoryStart, Dolphin::GameMemoryEnd, "38 a0 00 01 3c 60 ? ? 38 83 ? ? 90 a4");`
	`59`	`+ auto pattern = hook::pattern(Dolphin::GameMemoryStart, Dolphin::GameMemoryEnd, "38 ? 00 01 3c 60 ? ? 38 ? ? ? 90 ? ? ? 3c ? ? ? 38 63 ? ? 80 63 00 00 88 ? 00 09 28 ? 00 0b ? ? ? ? 3c 60 ? ? 38 ? ? ? 54 ? ? ? 7c ? ? ? 7c");`
`60`	`60`	`if (gameVersion == RE3)`
`61`		`- pattern = hook::pattern(Dolphin::GameMemoryStart, Dolphin::GameMemoryEnd, "38 00 00 01 3c 60 ? ? 38 63 ? ? ? ? 00 00 3c 60");`
	`61`	`+ pattern = hook::pattern(Dolphin::GameMemoryStart, Dolphin::GameMemoryEnd, "38 00 00 01 3c 60 ? ? 38 63 ? ? 98 03 00 00 3c 60 ? ? 38 63 ? ? 93 83 21 58 3c 60");`
`62`	`62`	`if (pattern.size() >= 1)`
`63`	`63`	`{`
`64`	`64`	`memcheck = pattern.get(0).get<uint32_t>(4);`
`@@ -165,7 +165,7 @@ void PluginThread(std::future<void> futureObj)`
`165`	`165`	`}`
`166`	`166`	`else if (gameVersion == RECV)`
`167`	`167`	`{`
`168`		`-`
	`168`	`+`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`}`
`@@ -214,7 +214,7 @@ void InitLED()`
`214`	`214`	`std::this_thread::sleep_for(std::chrono::milliseconds(100));`
`215`	`215`
`216`	`216`	`auto gameVersion = GameVersion::UNDEFINED;`
`217`		`- if (Dolphin::GameID() == "GHAE08" \|\| Dolphin::GameID() == "GHAP08" \|\| Dolphin::GameID() == "GHAJ08")`
	`217`	`+ if (Dolphin::GameID() == "GHAE08" \|\| Dolphin::GameID() == "GHAP08" /* \|\| Dolphin::GameID() == "GHAJ08"*/)`
`218`	`218`	`gameVersion = GameVersion::RE2;`
`219`	`219`	`else if (Dolphin::GameID() == "GLEE08" \|\| Dolphin::GameID() == "GLEJ08" \|\| Dolphin::GameID() == "GLEP08")`
`220`	`220`	`gameVersion = GameVersion::RE3;`