From 294273abfcc87609d5eae7a9824a7ce596c622c4 Mon Sep 17 00:00:00 2001
From: guiyomu-dev <22749537+guiyomu-dev@users.noreply.github.com>
Date: Wed, 15 Oct 2025 02:13:53 +0200
Subject: [PATCH 1/2] fix offsets

---
 pkg/memory/game_reader.go | 8 ++++----
 pkg/memory/keybindings.go | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/memory/game_reader.go b/pkg/memory/game_reader.go
index 3238f4c..19df346 100644
--- a/pkg/memory/game_reader.go
+++ b/pkg/memory/game_reader.go
@@ -310,11 +310,11 @@ func (gd *GameReader) InCharacterSelectionScreen() bool {
 }
 
 func (gd *GameReader) GetSelectedCharacterName() string {
-	return gd.Process.ReadStringFromMemory(gd.Process.moduleBaseAddressPtr+0x222D0A8, 0)
+	return gd.Process.ReadStringFromMemory(gd.Process.moduleBaseAddressPtr+0x21D31A8, 0)
 }
 
 func (gd *GameReader) LegacyGraphics() bool {
-	return gd.ReadUInt(gd.moduleBaseAddressPtr+0x2227998, Uint64) == 1
+	return gd.ReadUInt(gd.Process.moduleBaseAddressPtr+0x1DE6295, Uint8) == 1
 }
 
 func (gd *GameReader) IsOnline() bool {
@@ -323,7 +323,7 @@ func (gd *GameReader) IsOnline() bool {
 }
 
 func (gd *GameReader) IsIngame() bool {
-	return gd.ReadUInt(gd.moduleBaseAddressPtr+0x22E51D0, 1) == 1
+	return gd.ReadUInt(gd.Process.moduleBaseAddressPtr+gd.offset.UI-0xA, 1) == 1
 }
 
 func (gd *GameReader) IsInLobby() bool {
@@ -442,7 +442,7 @@ func (gd *GameReader) FPS() int {
 }
 
 func (gd *GameReader) HasMerc() bool {
-	return gd.ReadUInt(gd.moduleBaseAddressPtr+0x22e51d0+0x12, Uint8) != 0
+	return gd.ReadUInt(gd.Process.moduleBaseAddressPtr+gd.offset.UI+0x8, Uint8) != 0
 }
 
 // GetWidgetState reference : https://github.com/ResurrectedTrader/ResurrectedTrade/blob/f121ec02dd3fbe1c574f713e5a0c2db92ccca821/ResurrectedTrade.AgentBase/Capture.cs#L618
diff --git a/pkg/memory/keybindings.go b/pkg/memory/keybindings.go
index bf09268..3ae5124 100644
--- a/pkg/memory/keybindings.go
+++ b/pkg/memory/keybindings.go
@@ -8,7 +8,7 @@ import (
 )
 
 func (gd *GameReader) GetKeyBindings() data.KeyBindings {
-	blob := gd.ReadBytesFromMemory(gd.offset.KeyBindingsOffset, 0x500)
+	blob := gd.ReadBytesFromMemory(gd.moduleBaseAddressPtr+0x1DE5C24, 0x500)
 	blobSkills := gd.ReadBytesFromMemory(gd.offset.KeyBindingsSkillsOffset, 0x500)
 
 	skillsKB := [16]data.SkillBinding{}

From 8844908462924f66904d9d07cf00e7e2fd41373f Mon Sep 17 00:00:00 2001
From: guiyomu-dev <22749537+guiyomu-dev@users.noreply.github.com>
Date: Wed, 15 Oct 2025 02:38:59 +0200
Subject: [PATCH 2/2] fix comparison

---
 pkg/memory/game_reader.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/memory/game_reader.go b/pkg/memory/game_reader.go
index 19df346..9d767b0 100644
--- a/pkg/memory/game_reader.go
+++ b/pkg/memory/game_reader.go
@@ -314,7 +314,7 @@ func (gd *GameReader) GetSelectedCharacterName() string {
 }
 
 func (gd *GameReader) LegacyGraphics() bool {
-	return gd.ReadUInt(gd.Process.moduleBaseAddressPtr+0x1DE6295, Uint8) == 1
+	return gd.ReadUInt(gd.Process.moduleBaseAddressPtr+0x1DE6295, Uint8) != 0
 }
 
 func (gd *GameReader) IsOnline() bool {