initial address update for 1.14.74

ianpatt · Nov 19, 2024 · 82b61f5 · 82b61f5
1 parent b8131d9
commit 82b61f5
Show file tree

Hide file tree

Showing 36 changed files with 7,539 additions and 7,538 deletions.
diff --git a/cmake/versioning.cmake b/cmake/versioning.cmake
@@ -1,10 +1,10 @@
 set(SFSE_VERSION_MAJOR 0)
 set(SFSE_VERSION_MINOR 2)
-set(SFSE_VERSION_PATCH 15)
+set(SFSE_VERSION_PATCH 16)
 
 set(RUNTIME_VERSION_MAJOR 1)
 set(RUNTIME_VERSION_MINOR 14)
-set(RUNTIME_VERSION_PATCH 70)
+set(RUNTIME_VERSION_PATCH 74)
 set(RUNTIME_VERSION_TYPE 0)
 
 math(

diff --git a/sfse/GameChargen.cpp b/sfse/GameChargen.cpp
@@ -1,3 +1,3 @@
 #include "sfse/GameChargen.h"
 
-RelocPtr<MenuActor*> TESNPCData::g_actorCheckpoint(0x06A415B0);
+RelocPtr<MenuActor*> TESNPCData::g_actorCheckpoint(0x06A417F0);
diff --git a/sfse/GameChargen.h b/sfse/GameChargen.h
@@ -17,13 +17,13 @@ class ChargenDataModel : public IDataModel, public BSTSingletonSDM<ChargenDataMo
 
 	static ChargenDataModel* GetSingleton()
 	{
-		RelocPtr<ChargenDataModel*> singleton(0x06A33A00);
+		RelocPtr<ChargenDataModel*> singleton(0x06A33C80);
 		return *singleton;
 	}
 
 	// Contains main UI data model wrappers, decode these later
 	// This function will pull data from the TESNPC into this wrapper
-	DEFINE_MEMBER_FN_1(Update, void, 0x0190D110, MenuActor*); // unk2 removed in 1.9.51
+	DEFINE_MEMBER_FN_1(Update, void, 0x0190D170, MenuActor*); // unk2 removed in 1.9.51
 };
 
 extern RelocPtr<MenuActor*> g_actorCheckpoint;

diff --git a/sfse/GameConsole.cpp b/sfse/GameConsole.cpp
@@ -1,7 +1,7 @@
 #include "sfse/GameConsole.h"
 #include <stdarg.h>
 
-RelocPtr <ConsoleLog*> g_console(0x06A33590);
+RelocPtr <ConsoleLog*> g_console(0x06A33810);
 
 void Console_Print(const char* fmt, ...)
 {

diff --git a/sfse/GameConsole.h b/sfse/GameConsole.h
@@ -6,7 +6,7 @@
 class ConsoleLog
 {
 public:
-	DEFINE_MEMBER_FN_2(VPrint, void, 0x02AE7E48, const char* fmt, va_list args);
+	DEFINE_MEMBER_FN_2(VPrint, void, 0x02AE80F8, const char* fmt, va_list args);
 };
 
 extern RelocPtr <ConsoleLog*> g_console;

diff --git a/sfse/GameData.cpp b/sfse/GameData.cpp
@@ -1,3 +1,3 @@
 #include "sfse/GameData.h"
 
-RelocPtr<MaterialDatabase> g_materialDatabase(0x065F8620 - 0x08);
+RelocPtr<MaterialDatabase> g_materialDatabase(0x065F87A0 - 0x08);
diff --git a/sfse/GameData.h b/sfse/GameData.h
@@ -146,7 +146,7 @@ class TESDataHandler :
 
 	static TESDataHandler* GetSingleton()
 	{
-		RelocPtr<TESDataHandler*> singleton(0x065E0250);
+		RelocPtr<TESDataHandler*> singleton(0x065E03D0);
 		return *singleton;
 	}
 

diff --git a/sfse/GameEvents.h b/sfse/GameEvents.h
diff --git a/sfse/GameExtraData.h b/sfse/GameExtraData.h
@@ -286,8 +286,8 @@ static_assert(sizeof(BSExtraData) == 0x18);
 class BaseExtraList
 {
 public:
-	DEFINE_MEMBER_FN_1(AddExtra, void, 0x0146B9CC, BSExtraData* a_extra);
-	DEFINE_MEMBER_FN_1(GetByType, BSExtraData*, 0x01471B80, BSExtraData::Type type);
+	DEFINE_MEMBER_FN_1(AddExtra, void, 0x0146BA3C, BSExtraData* a_extra);
+	DEFINE_MEMBER_FN_1(GetByType, BSExtraData*, 0x01471BF0, BSExtraData::Type type);
 
 private:
 	// members

diff --git a/sfse/GameForms.cpp b/sfse/GameForms.cpp
@@ -1,4 +1,4 @@
 #include "sfse/GameForms.h"
 
-RelocAddr<TESForm::_GetFormByNumericID> TESForm::GetFormByNumericID(0x01534C60);
-RelocAddr<TESForm::_GetFormByEditorID> TESForm::GetFormByEditorID(0x01534DC0);
+RelocAddr<TESForm::_GetFormByNumericID> TESForm::GetFormByNumericID(0x01534CD0);
+RelocAddr<TESForm::_GetFormByEditorID> TESForm::GetFormByEditorID(0x01534E30);
diff --git a/sfse/GameLock.h b/sfse/GameLock.h
@@ -6,9 +6,9 @@
 class BSNonReentrantSpinLock
 {
 public:
-	DEFINE_MEMBER_FN_0(lock, void, 0x0127EB64);
-	DEFINE_MEMBER_FN_0(try_lock, bool, 0x01298FAC);
-	DEFINE_MEMBER_FN_0(unlock, void, 0x0127FCC0);
+	DEFINE_MEMBER_FN_0(lock, void, 0x0127EBC4);
+	DEFINE_MEMBER_FN_0(try_lock, bool, 0x0129900C);
+	DEFINE_MEMBER_FN_0(unlock, void, 0x0127FD20);
 
 private:
 	// members
@@ -19,10 +19,10 @@ static_assert(sizeof(BSNonReentrantSpinLock) == 0x4);
 class BSReadWriteLock
 {
 public:
-	DEFINE_MEMBER_FN_0(lock_read, void, 0x02F4AC30);
-	DEFINE_MEMBER_FN_0(lock_write, void, 0x0059A968);
-	DEFINE_MEMBER_FN_0(unlock_read, void, 0x02F4ADF8);
-	DEFINE_MEMBER_FN_0(unlock_write, void, 0x005AB434);
+	DEFINE_MEMBER_FN_0(lock_read, void, 0x02F4AFC0);
+	DEFINE_MEMBER_FN_0(lock_write, void, 0x0059A9C8);
+	DEFINE_MEMBER_FN_0(unlock_read, void, 0x02F4B188);
+	DEFINE_MEMBER_FN_0(unlock_write, void, 0x005AB494);
 
 private:
 	// members
@@ -34,9 +34,9 @@ static_assert(sizeof(BSReadWriteLock) == 0x8);
 class BSSpinLock
 {
 public:
-	DEFINE_MEMBER_FN_0(lock, void, 0x02F48A40);
-	DEFINE_MEMBER_FN_0(try_lock, bool, 0x02F48B50);
-	DEFINE_MEMBER_FN_0(unlock, void, 0x02F48B10);
+	DEFINE_MEMBER_FN_0(lock, void, 0x02F48DD0);
+	DEFINE_MEMBER_FN_0(try_lock, bool, 0x02F48EE0);
+	DEFINE_MEMBER_FN_0(unlock, void, 0x02F48EA0);
 
 private:
 	// members

diff --git a/sfse/GameMemory.cpp b/sfse/GameMemory.cpp
@@ -1,6 +1,6 @@
 #include "sfse/GameMemory.h"
 
-RelocAddr<_GetMemoryManager> GetMemoryManager(0x0058D8E4);
+RelocAddr<_GetMemoryManager> GetMemoryManager(0x0058D944);
 
 void* Heap_Allocate(size_t size)
 {

diff --git a/sfse/GameMemory.h b/sfse/GameMemory.h
@@ -15,9 +15,9 @@ static_assert(offsetof(ScrapHeap, currentThreadId) == 0x4B8);
 class MemoryManager
 {
 public:
-    DEFINE_MEMBER_FN_3(Allocate, void*, 0x0058D904, size_t size, size_t alignment, bool aligned);
-    DEFINE_MEMBER_FN_2(Free, void, 0x005A3940, void* buf, bool aligned);
-    DEFINE_MEMBER_FN_0(GetThreadScrapHeap, ScrapHeap*, 0x0079D63C);
+    DEFINE_MEMBER_FN_3(Allocate, void*, 0x0058D964, size_t size, size_t alignment, bool aligned);
+    DEFINE_MEMBER_FN_2(Free, void, 0x005A39A0, void* buf, bool aligned);
+    DEFINE_MEMBER_FN_0(GetThreadScrapHeap, ScrapHeap*, 0x0079D69C);
 };
 
 using _GetMemoryManager = MemoryManager * (*)();

diff --git a/sfse/GameMenu.h b/sfse/GameMenu.h
@@ -154,4 +154,4 @@ class ChargenMenu :
     };
 };
 static_assert(offsetof(ChargenMenu, cameraPosition) == 0x5B8);
-static_assert(sizeof(ChargenMenu) == 0x650);
+static_assert(sizeof(ChargenMenu) == 0x650);
diff --git a/sfse/GameObjects.h b/sfse/GameObjects.h
@@ -173,8 +173,8 @@ class TESNPC :
     u8 pronoun;  // 448
     u8 pad449[7]; // 449
 
-    DEFINE_MEMBER_FN_1(DeriveGeneticParentAppearance, void, 0x01BB5548, TESNPC* source);
-    DEFINE_MEMBER_FN_1(CopyAppearance, void, 0x01BB3980, TESNPC* source);
+    DEFINE_MEMBER_FN_1(DeriveGeneticParentAppearance, void, 0x01BB55D8, TESNPC* source);
+    DEFINE_MEMBER_FN_1(CopyAppearance, void, 0x01BB3A10, TESNPC* source);
 };
 static_assert(sizeof(TESNPC) == 0x458); // Un-verified after 1.10.31
 static_assert(sizeof(TESNPC::HeadPartData) == 0x28);

diff --git a/sfse/GameRTTI.cpp b/sfse/GameRTTI.cpp
@@ -4,7 +4,7 @@
 
 typedef void* (*_Runtime_DynamicCast_Internal)(void* srcObj, u32 arg1, const void* fromType, const void* toType, u32 arg4);
 
-RelocAddr <_Runtime_DynamicCast_Internal> Runtime_DynamicCast_Internal(0x038CCBC0);	// __RTDynamicCast
+RelocAddr <_Runtime_DynamicCast_Internal> Runtime_DynamicCast_Internal(0x038CD020);	// __RTDynamicCast
 
 void* Runtime_DynamicCast(void* srcObj, const void* fromType, const void* toType)
 {