From 4abb23414d2d0221f71c229be5c28e72eadd1b81 Mon Sep 17 00:00:00 2001
From: Arthur <121949966+ShinyWasabi@users.noreply.github.com>
Date: Fri, 20 Jun 2025 20:34:57 +0300
Subject: [PATCH 1/2] Fix GameTimer & Globals (#516)

---
 src/game/features/recovery/ClaimSafeEarnings.cpp | 2 +-
 src/game/features/recovery/DailyActivities.cpp   | 4 ++--
 src/game/pointers/Pointers.cpp                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/features/recovery/ClaimSafeEarnings.cpp b/src/game/features/recovery/ClaimSafeEarnings.cpp
index 6533908..1eab720 100644
--- a/src/game/features/recovery/ClaimSafeEarnings.cpp
+++ b/src/game/features/recovery/ClaimSafeEarnings.cpp
@@ -73,7 +73,7 @@ namespace YimMenu::Features
 			case eAppVinewoodMenuSafe::GARMENT_FACTORY:
 			{
 				if (GPBD_FM::Get()->Entries[Self::GetPlayer().GetId()].PropertyData.HackerDenData.SafeCashValue > 0)
-					*ScriptGlobal(2708246).As<BOOL*>() = TRUE;
+					*ScriptGlobal(2708252).As<BOOL*>() = TRUE;
 				break;
 			}
 			case eAppVinewoodMenuSafe::HANDS_ON_CAR_WASH:
diff --git a/src/game/features/recovery/DailyActivities.cpp b/src/game/features/recovery/DailyActivities.cpp
index 1a16832..cc72c43 100644
--- a/src/game/features/recovery/DailyActivities.cpp
+++ b/src/game/features/recovery/DailyActivities.cpp
@@ -962,8 +962,8 @@ namespace YimMenu::Features
 					return;
 
 				ScriptGlobal(2708777).At(544).As<SCR_BITSET<uint64_t>*>()->Set(6);
-				*ScriptGlobal(2708777).At(547).As<joaat_t*>() = wildlifePhotographyAnimalHashes[index];
-				*ScriptGlobal(2708777).At(548).As<int*>() = *Pointers.GameTimer - 1; // bypass 2 sec delay
+				*ScriptGlobal(2708777).At(548).As<joaat_t*>() = wildlifePhotographyAnimalHashes[index];
+				*ScriptGlobal(2708777).At(549).As<int*>() = *Pointers.GameTimer - 1; // bypass 2 sec delay
 			}
 			else
 			{
diff --git a/src/game/pointers/Pointers.cpp b/src/game/pointers/Pointers.cpp
index bdf871b..9216a49 100644
--- a/src/game/pointers/Pointers.cpp
+++ b/src/game/pointers/Pointers.cpp
@@ -309,7 +309,7 @@ namespace YimMenu
 			NetworkTime = ptr.Add(2).Rip().As<std::uint32_t*>();
 		});
 
-		constexpr auto gameTimerPtrn = Pattern<"3B 2D ? ? ? ? 76">("GameTimer");
+		constexpr auto gameTimerPtrn = Pattern<"3B 2D ? ? ? ? 76 ? 89 D9">("GameTimer");
 		scanner.Add(gameTimerPtrn, [this](PointerCalculator ptr) {
 			GameTimer = ptr.Add(2).Rip().As<std::uint32_t*>();
 		});

From b2d975fe7b69ac8cab4e10e75a76e2b60e21e748 Mon Sep 17 00:00:00 2001
From: PlayDay <18056374+playday3008@users.noreply.github.com>
Date: Fri, 20 Jun 2025 19:35:24 +0200
Subject: [PATCH 2/2] fix: name is unique, but address can be the same. (#518)

---
 src/game/frontend/submenus/Debug/Globals.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/game/frontend/submenus/Debug/Globals.cpp b/src/game/frontend/submenus/Debug/Globals.cpp
index 4b6f730..efd8934 100644
--- a/src/game/frontend/submenus/Debug/Globals.cpp
+++ b/src/game/frontend/submenus/Debug/Globals.cpp
@@ -67,9 +67,8 @@ namespace YimMenu::Submenus
 			{
 				for (auto& var : SavedVariables::GetSavedGlobals())
 				{
-					const auto& value = var.Read();
-					ImGui::PushID(value);
-					DrawSavedVariablePreview(var, value);
+					ImGui::PushID(var.name.c_str());
+					DrawSavedVariablePreview(var, var.Read());
 					ImGui::PopID();
 				}
 				ImGui::EndListBox();