diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp
index 42eb789f..5aab1d06 100644
--- a/Source/Client/Mode/GameModePackets.cpp
+++ b/Source/Client/Mode/GameModePackets.cpp
@@ -4629,7 +4629,7 @@ void CGameMode::ReceiveParChange(unsigned char* data) {
     break;
   }
   case 12:
-    *reinterpret_cast<int*>(&g_session.unknown_165C[0]) = packet->value;
+    g_session.m_skillPoint = packet->value;
     g_session.InvalidateWindowFrames();
     g_session.NotifySkillWindows();
     break;
diff --git a/Source/Client/Mode/LoginMode.cpp b/Source/Client/Mode/LoginMode.cpp
index a3b834a1..0450f51c 100644
--- a/Source/Client/Mode/LoginMode.cpp
+++ b/Source/Client/Mode/LoginMode.cpp
@@ -3176,7 +3176,7 @@ int CLoginMode::SendMsg(int event, int argument1, int argument2, int argument3,
         g_session.InvalidateWindowFrames();
         g_session.m_level = this->characters[i].level;
         g_session.InvalidateWindowFrames();
-        *reinterpret_cast<int*>(g_session.unknown_165C) = this->characters[i].skillPoint;
+        g_session.m_skillPoint = this->characters[i].skillPoint;
         g_session.InvalidateWindowFrames();
         *reinterpret_cast<int*>(g_session.unknown_1654) = this->characters[i].jobPoint;
         g_session.InvalidateWindowFrames();
diff --git a/Source/Client/Replay.cpp b/Source/Client/Replay.cpp
index f10f2c5c..b8b4d8e3 100644
--- a/Source/Client/Replay.cpp
+++ b/Source/Client/Replay.cpp
@@ -1523,7 +1523,7 @@ std::vector<unsigned char> CSession::BuildCharacterReplayRecords() {
     records.insert(records.end(), record.begin(), record.end());
   }
   {
-    const auto record = BuildReplayTaggedRecord(1020, this->unknown_165C, 4);
+    const auto record = BuildReplayTaggedRecord(1020, &this->m_skillPoint, 4);
     records.insert(records.end(), record.begin(), record.end());
   }
   {
diff --git a/Source/Client/Session.h b/Source/Client/Session.h
index c332f534..da5df625 100644
--- a/Source/Client/Session.h
+++ b/Source/Client/Session.h
@@ -296,7 +296,7 @@ public:
   /* 1650 */ int m_level;
   /* 1654 */ unsigned char unknown_1654[0x04];
   /* 1658 */ int m_jobLevel;
-  /* 165C */ unsigned char unknown_165C[0x04];
+  /* 165C */ int m_skillPoint;
   /* 1660 */ int m_guildSkillPoint;
   /* 1664 */ unsigned char unknown_1664[8];
   /* 166C */ int unknown_166C;
diff --git a/Source/Contents/ClientState.cpp b/Source/Contents/ClientState.cpp
index b06c60a0..7b65921e 100644
--- a/Source/Contents/ClientState.cpp
+++ b/Source/Contents/ClientState.cpp
@@ -1195,7 +1195,7 @@ std::uint32_t CSession::ReadReplayCharacter(const std::vector<unsigned char>& da
       offset += header.bytes;
       break;
     case 1020:
-      std::memcpy(this->unknown_165C, source, header.bytes);
+      std::memcpy(&this->m_skillPoint, source, header.bytes);
       offset += header.bytes;
       break;
     case 1021:
diff --git a/Source/UI/Window/UINewSkillListWnd.cpp b/Source/UI/Window/UINewSkillListWnd.cpp
index 3e2d0cd6..f56295d3 100644
--- a/Source/UI/Window/UINewSkillListWnd.cpp
+++ b/Source/UI/Window/UINewSkillListWnd.cpp
@@ -133,7 +133,7 @@ void UINewSkillListWnd::Slot35(int delta) {
 // OFFSET: 0x009AE730
 // FUNCTION: fn_13800
 void UINewSkillListWnd::sub_9AE730() {
-  if (*reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4) == 0) {
+  if (g_session.m_simplifiedSkillList == 0) {
     for (const NewSkillListValue& entry : this->m_unknown_02A0) {
       const int id = entry.id;
       const int value = entry.value;
@@ -421,7 +421,7 @@ std::string UINewSkillListWnd::ValueText(int id) {
 CSkillInfo UINewSkillListWnd::SkillAt(int index, bool live) {
   CSkillInfo result(0);
   int sequentialIndex = 0;
-  const int gate = *reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4);
+  const int gate = g_session.m_simplifiedSkillList;
   for (const CSkillInfo& skill : this->SkillList(this->m_tab, live)) {
     int key = skill.unknown_0024;
     if (gate != 0) {
@@ -455,7 +455,7 @@ CSkillInfo UINewSkillListWnd::VisibleSkill(int row) {
 // FUNCTION: fn_13808
 std::pair<CSkillInfo*, bool> UINewSkillListWnd::SkillPtr(int index, bool live) {
   std::list<CSkillInfo>& list = this->SkillList(this->m_tab, live);
-  if (*reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4) != 0) {
+  if (g_session.m_simplifiedSkillList != 0) {
     if (index >= 0 && static_cast<size_t>(index) < list.size()) {
       auto it = list.begin();
       for (int i = 0; i < index; ++i) {
@@ -740,7 +740,7 @@ void UINewSkillListWnd::InitTabs() {
 // FUNCTION: fn_13811
 void UINewSkillListWnd::ResetLists() {
   this->m_locked = 0;
-  this->m_skillPoints = *reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0x165C);
+  this->m_skillPoints = g_session.m_skillPoint;
   for (int i = 0; i < 4; ++i) {
     this->m_lists[i] = g_session.m_skillBundle.Group(i);
   }
@@ -760,7 +760,7 @@ bool UINewSkillListWnd::IsSkillArea(int x, int y) {
   int minX = 76;
   int rowHeight = 56;
   int yOffset = 40;
-  const int gate = *reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4);
+  const int gate = g_session.m_simplifiedSkillList;
   if (gate != 0) {
     rowHeight = 32;
     minX = 40;
@@ -919,7 +919,7 @@ void UINewSkillListWnd::Paint() {
   char text[80];
   std::memset(text, 0, sizeof(text));
   if (g_session.m_simplifiedSkillList == 0) {
-    const int total = *reinterpret_cast<const int*>(g_session.unknown_165C);
+    const int total = g_session.m_skillPoint;
     if (points < total) {
       StringFormat(text, sizeof(text), static_cast<std::size_t>(-1), "%s^0000ff%d^000000(^ff0000%d^000000) / %d", LookupMessage(2343), points, total - points,
                    total);
@@ -1010,7 +1010,7 @@ void UINewSkillListWnd::Slot31(int x, int y) {
     return;
   }
 
-  const int gate = *reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4);
+  const int gate = g_session.m_simplifiedSkillList;
   if (gate == 0 && this->IsSkillArea(x, y)) {
     CSkillInfo skill = this->SkillAt(this->m_selectedSkill, false);
     if (skill.unknown_002C != 0 && skill.available != 0) {
@@ -1157,7 +1157,7 @@ void UINewSkillListWnd::sub_9B2CD0() {
 // OFFSET: 0x009B3040
 // FUNCTION: fn_13823
 void UINewSkillListWnd::UpdateScrollBar() {
-  const int initialGate = *reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4);
+  const int initialGate = g_session.m_simplifiedSkillList;
   if (initialGate == 0) {
     this->m_columns = 7;
     this->m_visibleRows = 6;
@@ -1172,7 +1172,7 @@ void UINewSkillListWnd::UpdateScrollBar() {
 
   this->m_scrollBar->Move(this->geometry.width - 15, 20);
 
-  const int gate = *reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4);
+  const int gate = g_session.m_simplifiedSkillList;
   const std::list<CSkillInfo>& list = this->SkillList(this->m_tab, false);
   int total = 0;
   if (gate == 0) {
@@ -1218,7 +1218,7 @@ void UINewSkillListWnd::UpdateScrollBar() {
 // FUNCTION: fn_13824
 void UINewSkillListWnd::LayoutButtons() {
   int inset = 0;
-  const int gate = *reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4);
+  const int gate = g_session.m_simplifiedSkillList;
   if (gate == 0) {
     this->m_btnDetail->Move(-100, -100);
   } else {
@@ -1249,7 +1249,7 @@ void UINewSkillListWnd::LayoutButtons() {
   }
 
   std::list<CSkillInfo>& list = this->SkillList(this->m_tab, false);
-  if (*reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4) == 0) {
+  if (g_session.m_simplifiedSkillList == 0) {
     if (!this->m_locked) {
       for (const CSkillInfo& skill : list) {
         const unsigned int slot = skill.unknown_0024 - this->m_columns * this->m_firstRow;
@@ -1284,7 +1284,7 @@ void UINewSkillListWnd::LayoutButtons() {
 // OFFSET: 0x009B3580
 // FUNCTION: fn_13825
 int UINewSkillListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, std::intptr_t b, std::intptr_t c, std::intptr_t d) {
-  int& gate = *reinterpret_cast<int*>(reinterpret_cast<char*>(&g_session) + 0xB4);
+  int& gate = g_session.m_simplifiedSkillList;
   CMode* gameMode = g_modeMgr.gameMode;
 
   switch (message) {
@@ -1304,7 +1304,7 @@ int UINewSkillListWnd::SendMsg(UIWindow* sender, int message, std::intptr_t a, s
       }
       return 0;
     case 213: {
-      int& flag = *reinterpret_cast<int*>(reinterpret_cast<char*>(&g_session) + 0xB8);
+      int& flag = g_session.m_showSkillDescription;
       flag = flag == 0;
       return 0;
     }
@@ -1489,7 +1489,7 @@ bool UINewSkillListWnd::sub_9B3EB0(int skillId) {
     return false;
   }
 
-  const int gate = *reinterpret_cast<const int*>(reinterpret_cast<const char*>(&g_session) + 0xB4);
+  const int gate = g_session.m_simplifiedSkillList;
   if (gate != 0) {
     std::list<CSkillInfo>& list = this->SkillList(this->m_tab, false);
     for (CSkillInfo& skill : list) {