diff --git a/src/game/pointers/Pointers.cpp b/src/game/pointers/Pointers.cpp index 7fd5a32..7f135ae 100644 --- a/src/game/pointers/Pointers.cpp +++ b/src/game/pointers/Pointers.cpp @@ -360,7 +360,7 @@ namespace YimMenu SetJoinRequestPoolTypePatch = BytePatches::Add(ptr.Sub(5).As(), std::to_array({0xB8, 0x00, 0x00, 0x00, 0x00})); }); - constexpr auto handleJoinRequestIgnorePoolPatchPtrn = Pattern<"41 83 FF 05 ? 30 43">("HandleJoinRequestIgnorePoolPatch"); + constexpr auto handleJoinRequestIgnorePoolPatchPtrn = Pattern<"83 FD 05 ? ? ? 00 00 00 48 8B">("HandleJoinRequestIgnorePoolPatch"); scanner.Add(handleJoinRequestIgnorePoolPatchPtrn, [this](PointerCalculator ptr) { HandleJoinRequestIgnorePoolPatch = BytePatches::Add(ptr.Add(4).As(), 0xEB); }); @@ -395,7 +395,7 @@ namespace YimMenu GameSkeleton = ptr.Add(0x9).Add(3).Rip().As(); }); - constexpr auto SetExplosiveAmmoOnlinePatchPtrn = Pattern<"48 83 EC 28 80 3D ? ? ? ? 00 0F 85 ? ? ? ? E9 ? ? ? ? 48 8B 45 28">("SetExplosiveAmmoOnlinePatch"); + constexpr auto SetExplosiveAmmoOnlinePatchPtrn = Pattern<"48 83 EC 28 80 3D ? ? ? ? 00 0F 85 ? ? ? ? E9 ? ? ? ? 56 57 53 48 81 EC B0 00 00 00">("SetExplosiveAmmoOnlinePatch"); scanner.Add(SetExplosiveAmmoOnlinePatchPtrn, [this](PointerCalculator ptr) { BytePatches::Add(ptr.Add(0xB).As(), 0x04EB)->Apply(); }); diff --git a/src/types/script/globals/Globals.cpp b/src/types/script/globals/Globals.cpp index 3d0b070..54d5ed5 100644 --- a/src/types/script/globals/Globals.cpp +++ b/src/types/script/globals/Globals.cpp @@ -30,24 +30,24 @@ return glb.As(); \ } -DEFINE_GLOBAL_ACCESSOR(GlobalPlayerBD, 2657994); -DEFINE_GLOBAL_ACCESSOR(GPBD_FM, 1845270); -DEFINE_GLOBAL_ACCESSOR(GPBD_FM_2, 1882925); -DEFINE_GLOBAL_ACCESSOR(GPBD_FM_3, 1887694); -DEFINE_GLOBAL_ACCESSOR(GPBD_Flow, 1977875); -DEFINE_GLOBAL_ACCESSOR(GPBD_Kicking, 1874328); -DEFINE_GLOBAL_ACCESSOR(GPBD_MissionName, 1873815); -DEFINE_GLOBAL_ACCESSOR(GSBD, 2648917); -DEFINE_GLOBAL_ACCESSOR(GSBD_BlockB, 2650415); -DEFINE_GLOBAL_ACCESSOR(GSBD_FM, 1835557); -DEFINE_GLOBAL_ACCESSOR(GSBD_FM_Events, 1917230); -DEFINE_GLOBAL_ACCESSOR(GSBD_Kicking, 1877529); -DEFINE_GLOBAL_ACCESSOR(GSBD_PropertyInstances, 1937699); -DEFINE_GLOBAL_ACCESSOR(g_AMC_playerBD, 2699624); -DEFINE_GLOBAL_ACCESSOR(GSBD_RandomEvents, 1882524); -DEFINE_GLOBAL_ACCESSOR(MPSV, 1586543); +DEFINE_GLOBAL_ACCESSOR(GlobalPlayerBD, 2658019); +DEFINE_GLOBAL_ACCESSOR(GPBD_FM, 1845274); +DEFINE_GLOBAL_ACCESSOR(GPBD_FM_2, 1845274); +DEFINE_GLOBAL_ACCESSOR(GPBD_FM_3, 1888882); +DEFINE_GLOBAL_ACCESSOR(GPBD_Flow, 1980192); +DEFINE_GLOBAL_ACCESSOR(GPBD_Kicking, 1873852); +DEFINE_GLOBAL_ACCESSOR(GPBD_MissionName, 1873339); +DEFINE_GLOBAL_ACCESSOR(GSBD, 2648932); +DEFINE_GLOBAL_ACCESSOR(GSBD_BlockB, 2650431); +DEFINE_GLOBAL_ACCESSOR(GSBD_FM, 1845274); +DEFINE_GLOBAL_ACCESSOR(GSBD_FM_Events, 1918514); +DEFINE_GLOBAL_ACCESSOR(GSBD_Kicking, 1877053); +DEFINE_GLOBAL_ACCESSOR(GSBD_PropertyInstances, 1939705); +DEFINE_GLOBAL_ACCESSOR(g_AMC_playerBD, 2699749); +DEFINE_GLOBAL_ACCESSOR(GSBD_RandomEvents, 1882048); +DEFINE_GLOBAL_ACCESSOR(MPSV, 1586547); DEFINE_GLOBAL_ACCESSOR(g_SavedMPGlobals, 2359296); -DEFINE_GLOBAL_ACCESSOR(FreemodeGeneral, 2739945); -DEFINE_GLOBAL_ACCESSOR(DailyObjectivesState, 1574744); -DEFINE_GLOBAL_ACCESSOR(WeeklyChallenge, 2738999); -DEFINE_GLOBAL_ACCESSOR(FreemodeDelivery, 1950961); \ No newline at end of file +DEFINE_GLOBAL_ACCESSOR(FreemodeGeneral, 2740191); +DEFINE_GLOBAL_ACCESSOR(DailyObjectivesState, 1574745); +DEFINE_GLOBAL_ACCESSOR(WeeklyChallenge, 2739243); +DEFINE_GLOBAL_ACCESSOR(FreemodeDelivery, 1953035); \ No newline at end of file