Partial fixes for MH stories 3

Author: praydog

CMakeLists.txt

@@ -49,6 +49,7 @@ REF_BUILD_MHRISE_SDK = false
 REF_BUILD_SF6_SDK = false
 REF_BUILD_DD2_SDK = false
 REF_BUILD_MHWILDS_SDK = false
+REF_BUILD_MHSTORIES3_SDK = false
 REF_BUILD_PRAGMATA_SDK = false
 REF_BUILD_FRAMEWORK = { value = true }
 REF_BUILD_DEPENDENCIES = { value = true }
@@ -69,6 +70,7 @@ build-mhrise-sdk = "REF_BUILD_MHRISE_SDK OR REF_BUILD_FRAMEWORK"
 build-sf6-sdk = "REF_BUILD_SF6_SDK OR REF_BUILD_FRAMEWORK"
 build-dd2-sdk = "REF_BUILD_DD2_SDK OR REF_BUILD_FRAMEWORK"
 build-mhwilds-sdk = "REF_BUILD_MHWILDS_SDK OR REF_BUILD_FRAMEWORK"
+build-mhstories3-sdk = "REF_BUILD_MHSTORIES3_SDK OR REF_BUILD_FRAMEWORK"
 build-pragmata-sdk = "REF_BUILD_PRAGMATA_SDK OR REF_BUILD_FRAMEWORK"
 build-framework-dependencies = "REF_BUILD_DEPENDENCIES AND CMAKE_SIZEOF_VOID_P EQUAL 8"
 
@@ -380,6 +382,14 @@ condition = "build-mhwilds-sdk"
 [target.MHWILDS]
 type = "game"
 
+[target.MHSTORIES3SDK]
+type = "sdk"
+compile-definitions = ["MHSTORIES3", "REENGINE_PACKED", "REENGINE_AT"]
+condition = "build-mhstories3-sdk"
+
+[target.MHSTORIES3]
+type = "game"
+
 [target.PRAGMATASDK]
 type = "sdk"
 compile-definitions = ["PRAGMATA", "REENGINE_PACKED", "REENGINE_AT"]

cmake.toml

@@ -125,7 +125,7 @@ struct TDB {
     int32_t devEntry;                           
     int32_t appEntry;     
 
-    uint32_t unkNum; // added in Pragmata (TDB 84)
+    uint32_t unkNum; // added in TDB 82 (mhstories 3)
 
     uint32_t numStringPool;                     
     uint32_t numBytePool;                       
@@ -266,6 +266,184 @@ struct GenericListData {
 };
 }
 
+
+namespace tdb82 {
+struct REMethodDefinition;
+struct REMethodImpl;
+struct REField;
+struct REFieldImpl;
+struct REProperty;
+struct RETypeImpl;
+struct REPropertyImpl;
+struct REParameterDef;
+struct REModule;
+
+struct TDB {
+    uint32_t magic;                             
+    uint32_t version;                           
+    uint32_t numTypes;                          
+    uint32_t typesStartOfGenericsProbably;       // I think this is the index of the start of the generics list in the types array (or start of something else)
+    
+    uint32_t unk_int_tdb74;
+    
+    uint32_t numMethods;                        
+    uint32_t numFields;                         
+    uint32_t numTypeImpl;                       
+    uint32_t numFieldImpl;                      
+    uint32_t numMethodImpl;                     
+    uint32_t numPropertyImpl;                   
+    uint32_t numProperties;                     
+    uint32_t numEvents;                         
+
+    uint32_t numParams;                         
+    uint32_t numAttributes;                     
+    int32_t numInitData;                        
+    uint32_t numAttributes2;                    
+    uint32_t numInternStrings;                  
+    uint32_t numModules;                        
+    int32_t devEntry;                           
+    int32_t appEntry;     
+    
+    uint32_t unkNum; // added in TDB 82 (mhstories 3)
+
+    uint32_t numStringPool;                     
+    uint32_t numBytePool;     
+
+    sdk::REModule* modules;                           
+    sdk::RETypeDefinition (*types)[93788];      
+    sdk::RETypeImpl (*typesImpl)[256];          
+    sdk::REMethodDefinition (*methods)[703558]; 
+    sdk::REMethodImpl (*methodsImpl)[56756];    
+    sdk::REField (*fields)[1];                  
+    sdk::REFieldImpl (*fieldsImpl)[1];          
+    sdk::REProperty (*properties)[256];         
+    sdk::REPropertyImpl (*propertiesImpl)[1];   
+    void* events;                               
+    sdk::REParameterDef (*params)[10000];       
+    class ::REAttributeDef (*attributes)[2000]; 
+    int32_t (*initData)[19890];                 
+    void* unk;
+    int32_t (*attributes2)[256];                
+    char (*stringPool)[1];                      
+    uint8_t (*bytePool)[256];                   
+    int32_t (*internStrings)[14154];            
+};
+
+struct REModule {
+    uint32_t guid[4];
+    int32_t unk1;
+    uint32_t unk2;
+    uint16_t major;
+    uint16_t minor;
+    uint16_t build;
+    uint16_t revision;
+    uint32_t flags;
+    int32_t assembly_name_offset; // string
+    int32_t location_offset; // string
+    uint32_t unk3;
+    uint32_t module_name_offset; // string
+    uint32_t unk4;
+    int32_t types_count;
+    int32_t types_start;
+    int32_t methods_count;
+    int32_t methods_start;
+    int32_t method_instantiations_count;
+    int32_t method_instantiations_start;
+    int32_t member_references_count;
+    int32_t member_references_start;
+};
+static_assert(sizeof(REModule) == 0x58);
+
+#pragma pack(push, 4)
+struct REParameterDef {
+    uint16_t attributes_id;
+    uint16_t init_data_index;
+    uint32_t name_offset : 30;
+    uint32_t modifier : 2;
+    uint32_t type_id : TYPE_INDEX_BITS;
+    uint32_t flags : (32 - TYPE_INDEX_BITS);
+};
+
+struct REMethodDefinition {
+    uint32_t declaring_typeid : TYPE_INDEX_BITS;
+    uint32_t params_lo : 13;
+    uint32_t impl_id : 19;
+    uint32_t params_hi : 13;
+    int32_t encoded_offset;
+};
+static_assert(sizeof(REMethodDefinition) == 0xC);
+
+struct REMethodImpl {
+    uint16_t attributes_id;
+    int16_t vtable_index;
+    uint16_t flags;
+    uint16_t impl_flags;
+    uint32_t name_offset;
+};
+
+struct RETypeImpl {
+    int32_t name_offset; // 0x0
+    int32_t namespace_offset; // 0x4
+    int32_t field_size; // 0x8
+    int32_t static_field_size; // 0xc
+    uint64_t unk_pad : 33; // 0x10
+    uint64_t num_member_fields : 24; // 0x10
+    uint64_t unk_pad_2 : 7; // 0x10
+    uint16_t num_member_methods; // 0x18
+    int16_t num_native_vtable; // 0x1a
+    int16_t interface_id; // 0x1c
+    char pad_1e[0x12];
+};
+#if TDB_VER >= 71
+static_assert(sizeof(RETypeImpl) == 0x30);
+static_assert(offsetof(RETypeImpl, num_member_methods) == 0x18);
+#endif
+
+struct REProperty {
+    uint64_t impl_id : 20;
+    uint64_t getter : 22;
+    uint64_t setter : 22;
+};
+
+struct REPropertyImpl {
+    uint16_t flags;
+    uint16_t attributes_id;
+    int32_t name_offset;
+};
+#pragma pack(pop)
+
+struct ParamList {
+    uint16_t numParams; //0x0000
+	uint16_t invokeID; //0x0002
+	uint32_t returnType; //0x0004
+	uint32_t params[1]; //0x0008
+};
+
+struct REField {
+    uint64_t declaring_typeid : TYPE_INDEX_BITS;
+    uint64_t impl_id : TYPE_INDEX_BITS;
+    uint64_t field_typeid : TYPE_INDEX_BITS;
+    uint64_t init_data_hi : 6;
+    uint64_t rest2 : 1;
+};
+
+struct REFieldImpl {
+    uint16_t attributes_id;
+    uint16_t unk : 1;
+    uint16_t flags : 15;
+    uint32_t offset : 26;
+    uint32_t init_data_lo : 6;
+    uint32_t name_offset : 28;
+    uint32_t init_data_mid : 4;
+};
+
+struct GenericListData {
+    uint32_t definition_typeid : TYPE_INDEX_BITS;
+    uint32_t num : (32 - TYPE_INDEX_BITS);
+    uint32_t types[1];
+};
+}
+
 namespace tdb74 {
 struct REMethodDefinition;
 struct REMethodImpl;

shared/sdk/RETypeDB.hpp

@@ -65,6 +65,45 @@ static_assert(sizeof(RETypeDefVersion84) == 0x50, "RETypeDefVersion84 has wrong
 static_assert(offsetof(RETypeDefVersion84, type_crc) == 0x1C);
 #endif
 
+struct RETypeDefVersion82 {
+    uint64_t index : TYPE_INDEX_BITS;
+    uint64_t parent_typeid : TYPE_INDEX_BITS;
+    uint64_t declaring_typeid : TYPE_INDEX_BITS;
+    uint64_t underlying_typeid : 7;
+
+   	uint64_t array_typeid_TBD : TYPE_INDEX_BITS;
+   	uint64_t element_typeid_TBD : TYPE_INDEX_BITS;
+
+    uint64_t impl_index : 18;
+    uint64_t system_typeid : 7;
+
+    uint32_t type_flags;
+    uint32_t size;
+    uint32_t fqn_hash;
+    uint32_t type_crc;
+    uint64_t default_ctor : 22;
+    uint64_t member_method : 22;
+    uint64_t member_field : FIELD_BITS;
+    uint32_t num_member_prop : 12;
+    uint32_t member_prop : TYPE_INDEX_BITS;
+
+    uint32_t unk_data : 26;
+    uint32_t object_type : 3;
+
+    int64_t unk_data_before_generics : 26;
+	int64_t generics : 26;
+  	int64_t interfaces : 12;
+    struct sdk::RETypeCLR* type;
+    class ::REObjectInfo* managed_vt;
+    
+    uint64_t unk_new_tdb74_uint64; // Adds 8 bytes
+};
+
+#if TDB_VER >= 82
+static_assert(sizeof(RETypeDefVersion82) == 0x50, "RETypeDefVersion82 has wrong size");
+static_assert(offsetof(RETypeDefVersion82, type_crc) == 0x1C);
+#endif
+
 struct RETypeDefVersion74 {
     uint64_t index : TYPE_INDEX_BITS;
     uint64_t parent_typeid : TYPE_INDEX_BITS;

shared/sdk/RETypeDefinition.hpp

@@ -12,6 +12,8 @@
 #include "ReClass_Internal_PRAGMATA.hpp"
 #elif defined(MHWILDS)
 #include "ReClass_Internal_MHWILDS.hpp" // Copy of DD2 (for now)
+#elif defined(MHSTORIES3)
+#include "ReClass_Internal_MHSTORIES3.hpp" // Copy of MHWILDS (for now)
 #elif defined(DD2)
 #include "ReClass_Internal_DD2.hpp" // Copy of SF6
 #elif defined(SF6)

shared/sdk/ReClass.hpp

@@ -4,6 +4,8 @@
 #define TDB_VER 67
 #elif defined(PRAGMATA)
 #define TDB_VER 84
+#elif defined(MHSTORIES3)
+#define TDB_VER 82
 #elif defined(MHWILDS)
 #define TDB_VER 74
 #elif defined(DD2)
@@ -42,6 +44,7 @@
 
 namespace sdk {
 struct RETypeDefVersion84;
+struct RETypeDefVersion82;
 struct RETypeDefVersion74;
 struct RETypeDefVersion71;
 struct RETypeDefVersion69;
@@ -58,6 +61,10 @@ struct RETypeDefinition;
 #define TYPE_INDEX_BITS 19
 #define FIELD_BITS 20
 using RETypeDefinition_ = sdk::RETypeDefVersion84;
+#elif defined(MHSTORIES3)
+#define TYPE_INDEX_BITS 19
+#define FIELD_BITS 20
+using RETypeDefinition_ = sdk::RETypeDefVersion82;
 #elif defined(MHWILDS)
 #define TYPE_INDEX_BITS 19
 #define FIELD_BITS 20

shared/sdk/TDBVer.hpp

@@ -129,6 +129,8 @@ class REFramework {
         return "dd2";
     #elif defined(MHWILDS)
         return "mhwilds";
+    #elif defined(MHSTORIES3)
+        return "mhstories3";
     #elif defined(PRAGMATA)
         return "pragmata";
     #else