MHWilds: Fix reflection structures

Author: praydog

reversing/mhwilds.rcnet

@@ -133,18 +133,18 @@ class REType
 	uint32_t typeIndexProbably; //0x0018
 	char pad_001C[4]; //0x001C
 	char *name; //0x0020
-	char pad_0028[4]; //0x0028
-	uint32_t typeCRC; //0x002C
-	uint32_t size : 24; //0x0030
-	uint32_t unkFlags : 8;
-	uint32_t miscFlags; //0x0034
-	class REType *super; //0x0038
-	class REType *childType; //0x0040
-	class REType *chainType; //0x0048
-	class REFieldList *fields; //0x0050
-	class REClassInfo *classInfo; //0x0058 is a managed type if this is not null
-}; //Size: 0x0060
-static_assert(sizeof(REType) == 0x60);
+	char pad_0028[8]; //0x0028
+	uint32_t size; //0x0030
+	uint32_t typeCRC; //0x0034
+	uint32_t miscFlags; //0x0038
+	char pad_003C[4]; //0x003C
+	class REType *super; //0x0040
+	class REType *childType; //0x0048
+	class REType *chainType; //0x0050
+	class REFieldList *fields; //0x0058
+	class REClassInfo *classInfo; //0x0060 is a managed type if this is not null
+}; //Size: 0x0068
+static_assert(sizeof(REType) == 0x68);
 
 class N000003DE
 {
@@ -408,24 +408,22 @@ class REClassInfo
 	uint16_t typeIndex; //0x0000 index into global type array
 	char pad_0002[5]; //0x0002
 	uint8_t objectFlags; //0x0007 flags >> 5 ==  1 == normal type ? ??
-	uint32_t _; //0x0008
-	uint32_t elementBitField; //0x000C >> 4 is the value type index (RETypeImpl)
-	uint32_t typeFlags; //0x0010 System::Reflection::TypeAttributes or via::clr::TypeFlag
-	uint32_t size; //0x0014
-	uint32_t fqnHash; //0x0018
-	uint32_t typeCRC; //0x001C
-	uint32_t defaultCtor; //0x0020
-	uint32_t vt; //0x0024 vtable byte pool
-	uint32_t memberMethod; //0x0028
-	uint32_t memberField; //0x002C
-	uint32_t memberProp; //0x0030
-	uint32_t memberEvent; //0x0034
-	int32_t interfaces; //0x0038
-	int32_t generics; //0x003C byte pool
-	class RETypeCLR *type; //0x0040
-	class REObjectInfo *parentInfo; //0x0048
-}; //Size: 0x0050
-static_assert(sizeof(REClassInfo) == 0x50);
+	uint32_t elementBitField; //0x0008 >> 4 is the value type index (RETypeImpl)
+	uint32_t typeFlags; //0x000C System::Reflection::TypeAttributes or via::clr::TypeFlag
+	uint32_t size; //0x0010
+	uint32_t fqnHash; //0x0014
+	uint32_t typeCRC; //0x0018
+	uint32_t defaultCtor; //0x001C
+	uint32_t vt; //0x0020 vtable byte pool
+	uint32_t memberMethod; //0x0024
+	uint32_t memberField; //0x0028
+	uint32_t memberProp; //0x002C
+	uint32_t memberEvent; //0x0030
+	int32_t interfaces; //0x0034
+	class RETypeCLR *type; //0x0038
+	class REObjectInfo *parentInfo; //0x0040
+}; //Size: 0x0048
+static_assert(sizeof(REClassInfo) == 0x48);
 
 class N00000CF1
 {
@@ -1307,8 +1305,8 @@ class TypeListArray
 {
 public:
 	class REClassInfo N00000A51[100000]; //0x0000
-}; //Size: 0x7A1200
-static_assert(sizeof(TypeListArray) == 0x7A1200);
+}; //Size: 0x6DDD00
+static_assert(sizeof(TypeListArray) == 0x6DDD00);
 
 class GlobalArrayData2
 {
@@ -4019,11 +4017,11 @@ static_assert(sizeof(ArrayDeserializeSequence) == 0x10);
 class RETypeCLR : public REType
 {
 public:
-	class ArrayDeserializeSequence deserializeThing; //0x0060
-	class REType *nativeType; //0x0070
-	char *name2; //0x0078
-}; //Size: 0x0080
-static_assert(sizeof(RETypeCLR) == 0x80);
+	class ArrayDeserializeSequence deserializeThing; //0x0068
+	class REType *nativeType; //0x0078
+	char *name2; //0x0080
+}; //Size: 0x0088
+static_assert(sizeof(RETypeCLR) == 0x88);
 
 class DeserializeSequence
 {

shared/sdk/ReClass_Internal_MHWILDS.hpp

@@ -222,8 +222,12 @@ void FreeCam::on_update_transform(RETransform* transform) {
 
             // Move direction
             // It's not a Vector2f because via.vec2 is not actually 8 bytes, we don't want stack corruption to occur.
-            const auto axis_l = *re_managed_object::get_field<Vector3f*>(pad, "AxisL");
-            const auto axis_r = *re_managed_object::get_field<Vector3f*>(pad, "AxisR");
+            auto axis_l_field = re_managed_object::get_field<Vector3f*>(pad, "AxisL");
+            auto axis_r_field = re_managed_object::get_field<Vector3f*>(pad, "AxisR");
+
+            // TODO: Fix for Wilds
+            const auto axis_l = axis_l_field != nullptr ? *axis_l_field : Vector3f{};
+            const auto axis_r = axis_r_field != nullptr ? *axis_r_field : Vector3f{};
 
             bool is_using_up_down_modifier = false;
             bool is_using_twist_modifier = false;