diff --git a/src/game/features/recovery/DailyActivities.cpp b/src/game/features/recovery/DailyActivities.cpp index 347ff4c..2155486 100644 --- a/src/game/features/recovery/DailyActivities.cpp +++ b/src/game/features/recovery/DailyActivities.cpp @@ -528,13 +528,13 @@ namespace YimMenu::Features bool partime = Stats::GetPackedInt(34838 + (index * 4)) == location; bool landing = Stats::GetPackedInt(34839 + (index * 4)) == location; - *ScriptGlobal(1979960).As() = 1; - *ScriptGlobal(1979960).At(1).As() = 1; - *ScriptGlobal(1979960).At(3).As() = 5; - *ScriptGlobal(1979960).At(4).As() = location + 1; - *ScriptGlobal(1979960).At(8).At(1).As() = checkpointReward.Get() / (1 + (checkpoints * 9)); - *ScriptGlobal(1979960).At(8).At(2).As() = parTimeReward.Get() / (1 + (partime * 9)); - *ScriptGlobal(1979960).At(8).At(3).As() = landingReward.Get() / (1 + (landing * 9)); + *ScriptGlobal(1979961).As() = 1; + *ScriptGlobal(1979961).At(1).As() = 1; + *ScriptGlobal(1979961).At(3).As() = 5; + *ScriptGlobal(1979961).At(4).As() = location + 1; + *ScriptGlobal(1979961).At(8).At(1).As() = checkpointReward.Get() / (1 + (checkpoints * 9)); + *ScriptGlobal(1979961).At(8).At(2).As() = parTimeReward.Get() / (1 + (partime * 9)); + *ScriptGlobal(1979961).At(8).At(3).As() = landingReward.Get() / (1 + (landing * 9)); SET_SKYDIVE_COMPLETED data; data.SkydiveIndex = index; @@ -544,7 +544,7 @@ namespace YimMenu::Features data.AccurateLanding = TRUE; data.Send(); - ScriptGlobal(1983929).At(4).As*>()->Clear(3); + ScriptGlobal(1983930).At(4).As*>()->Clear(3); } }; diff --git a/src/game/features/recovery/Heist/CayoPericoHeist.cpp b/src/game/features/recovery/Heist/CayoPericoHeist.cpp index c2440d2..2c6606d 100644 --- a/src/game/features/recovery/Heist/CayoPericoHeist.cpp +++ b/src/game/features/recovery/Heist/CayoPericoHeist.cpp @@ -25,7 +25,7 @@ namespace YimMenu::Features virtual void OnCall() override { - auto base = ScriptGlobal(1980034).At(831).At(56); + auto base = ScriptGlobal(1980035).At(831).At(56); *base.At(0, 1).As() = _CayoPericoHeistCut1.GetState(); *base.At(1, 1).As() = _CayoPericoHeistCut2.GetState(); diff --git a/src/game/features/recovery/Heist/DiamondCasinoHeist.cpp b/src/game/features/recovery/Heist/DiamondCasinoHeist.cpp index 74907a6..029c36d 100644 --- a/src/game/features/recovery/Heist/DiamondCasinoHeist.cpp +++ b/src/game/features/recovery/Heist/DiamondCasinoHeist.cpp @@ -23,7 +23,7 @@ namespace YimMenu::Features virtual void OnCall() override { - auto base = ScriptGlobal(1973230).At(1497).At(736).At(92); + auto base = ScriptGlobal(1973231).At(1497).At(736).At(92); *base.At(0, 1).As() = _DiamondCasinoHeistCut1.GetState(); *base.At(1, 1).As() = _DiamondCasinoHeistCut2.GetState(); @@ -38,7 +38,7 @@ namespace YimMenu::Features virtual void OnCall() override { - auto base = ScriptGlobal(1977593); + auto base = ScriptGlobal(1977594); for (int i = 0; i <= 3; i++) { diff --git a/src/game/features/recovery/UnlockGTAPlus.cpp b/src/game/features/recovery/UnlockGTAPlus.cpp index 748faa0..48f907a 100644 --- a/src/game/features/recovery/UnlockGTAPlus.cpp +++ b/src/game/features/recovery/UnlockGTAPlus.cpp @@ -18,8 +18,8 @@ namespace YimMenu::Features virtual void OnTick() override { *Pointers.HasGTAPlus = true; - *ScriptGlobal(1970056).As() = true; - *ScriptGlobal(1970056).At(3).As() = (1 << 3) | (1 << 1); + *ScriptGlobal(1970058).As() = true; + *ScriptGlobal(1970058).At(3).As() = (1 << 3) | (1 << 1); } virtual void OnDisable() override diff --git a/src/game/features/self/OpenGunLocker.cpp b/src/game/features/self/OpenGunLocker.cpp index 00b42df..455fd60 100644 --- a/src/game/features/self/OpenGunLocker.cpp +++ b/src/game/features/self/OpenGunLocker.cpp @@ -45,7 +45,7 @@ namespace YimMenu::Features } static ScriptFunction runGunLockerMenu("AM_MP_AUTO_SHOP"_J, ScriptPointer("RunGunLockerMenu", "2D 06 08 00 00 38 03 5D ? ? ? 57 03 00")); - auto gunLockerData = ScriptLocal(m_Thread, 292).At(583); + auto gunLockerData = ScriptLocal(m_Thread, 294).At(584); int unused; runGunLockerMenu.Call(gunLockerData.As(), &unused, eSimpleInteriorIndex::SIMPLE_INTERIOR_AUTO_SHOP_MISSION_ROW, Self::GetPlayer().GetId(), false, true); diff --git a/src/game/gta/Scripts.cpp b/src/game/gta/Scripts.cpp index eda79e1..3c80506 100644 --- a/src/game/gta/Scripts.cpp +++ b/src/game/gta/Scripts.cpp @@ -325,7 +325,7 @@ namespace YimMenu::Scripts rand_int_2 ^= (random_int ^ -2024791401); // TODO: this is a pretty ghetto way to create random numbers rand_int_2 ^= (random_int ^ 917391583); - auto bypass_global = ScriptGlobal(1990822); // this global will bypass the new checks added this update + auto bypass_global = ScriptGlobal(1990823); // this global will bypass the new checks added this update auto old_val = *bypass_global.As(); *bypass_global.As() = rand_int_2 ^ rand() ^ time(0); diff --git a/src/types/script/globals/Globals.cpp b/src/types/script/globals/Globals.cpp index 7754773..0e39170 100644 --- a/src/types/script/globals/Globals.cpp +++ b/src/types/script/globals/Globals.cpp @@ -35,7 +35,7 @@ DEFINE_GLOBAL_ACCESSOR(GlobalPlayerBD, 2658294); DEFINE_GLOBAL_ACCESSOR(GPBD_FM, 1845299); DEFINE_GLOBAL_ACCESSOR(GPBD_FM_2, 1882717); DEFINE_GLOBAL_ACCESSOR(GPBD_FM_3, 1892798); -DEFINE_GLOBAL_ACCESSOR(GPBD_Flow, 1984460); +DEFINE_GLOBAL_ACCESSOR(GPBD_Flow, 1984461); DEFINE_GLOBAL_ACCESSOR(GPBD_Kicking, 1874069); DEFINE_GLOBAL_ACCESSOR(GPBD_MissionName, 1873556); DEFINE_GLOBAL_ACCESSOR(GSBD, 2649162);