Merge pull request #43 from Dasaav-dsv/param-fix

Account for Smithbox paramdef RemovedVersion field

Author: Dasaav-dsv

include/param/paramdef/ASSET_GEOMETORY_PARAM_ST.hpp

@@ -217,8 +217,6 @@ struct ASSET_GEOMETORY_PARAM_ST {
      */
     bool isAttackBacklash : 1 { true };
 
-    unsigned char Reserve_2 : 1;
-
     /**
      * @brief Is it a ladder?
      *
@@ -899,8 +897,6 @@ struct ASSET_GEOMETORY_PARAM_ST {
      */
     unsigned char excludeActivateRatio_PS4_Legacy{ 0 };
 
-    unsigned char Reserve_0_Old[32];
-
     unsigned char unknown_0x120{ 0 };
 
     unsigned char unknown_0x121{ 0 };
@@ -919,5 +915,5 @@ struct ASSET_GEOMETORY_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::ASSET_GEOMETORY_PARAM_ST) == 352,
+static_assert(sizeof(from::paramdef::ASSET_GEOMETORY_PARAM_ST) == 320,
     "ASSET_GEOMETORY_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/ATK_PARAM_ST.hpp

@@ -1467,8 +1467,6 @@ struct ATK_PARAM_ST {
      */
     int finalDamageRateId{ 0 };
 
-    unsigned char pad7_old[12];
-
     /**
      * @brief subCategory3
      */
@@ -1485,5 +1483,5 @@ struct ATK_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::ATK_PARAM_ST) == 468,
+static_assert(sizeof(from::paramdef::ATK_PARAM_ST) == 456,
     "ATK_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/BONFIRE_WARP_PARAM_ST.hpp

@@ -108,8 +108,6 @@ struct BONFIRE_WARP_PARAM_ST {
      */
     bool dispMask01 : 1 { false };
 
-    unsigned char pad1_old : 6;
-
     /**
      * @brief dispMask02
      */
@@ -539,5 +537,5 @@ struct BONFIRE_WARP_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::BONFIRE_WARP_PARAM_ST) == 240,
+static_assert(sizeof(from::paramdef::BONFIRE_WARP_PARAM_ST) == 236,
     "BONFIRE_WARP_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/BUDDY_PARAM_ST.hpp

@@ -187,8 +187,6 @@ struct BUDDY_PARAM_ST {
      */
     int generateAnimId{ -1 };
 
-    unsigned char Reserve2[4];
-
     unsigned int unknown_0x5c{ 0 };
 
     unsigned int unknown_0x60{ 0 };
@@ -227,5 +225,5 @@ struct BUDDY_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::BUDDY_PARAM_ST) == 164,
+static_assert(sizeof(from::paramdef::BUDDY_PARAM_ST) == 160,
     "BUDDY_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/BULLET_PARAM_ST.hpp

@@ -389,8 +389,6 @@ struct BULLET_PARAM_ST {
      */
     bool isPenetrateObj : 1 { false };
 
-    unsigned char pad_old : 6;
-
     unsigned char unknown_0x98_3 : 1 { 0 };
 
     unsigned char pad : 5;
@@ -673,8 +671,6 @@ struct BULLET_PARAM_ST {
      */
     bool isUseBulletWallFilter : 1 { false };
 
-    unsigned char pad1 : 1;
-
     unsigned char unknown_0xc3_5 : 1 { 0 };
 
     /**
@@ -845,5 +841,5 @@ struct BULLET_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::BULLET_PARAM_ST) == 280,
+static_assert(sizeof(from::paramdef::BULLET_PARAM_ST) == 272,
     "BULLET_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/CHARACTER_INIT_PARAM.hpp

@@ -149,8 +149,6 @@ struct CHARACTER_INIT_PARAM {
      */
     int equip_Accessory04{ -1 };
 
-	unsigned char pad8_old[4];
-
 	unsigned char unknown_0x50 { 0 };
 
 	unsigned char unknown_0x51 { 0 };
@@ -761,5 +759,5 @@ struct CHARACTER_INIT_PARAM {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::CHARACTER_INIT_PARAM) == 324,
+static_assert(sizeof(from::paramdef::CHARACTER_INIT_PARAM) == 320,
     "CHARACTER_INIT_PARAM paramdef size does not match detected size");

include/param/paramdef/CS_GRAPHICS_CONFIG_PARAM_ST.hpp

@@ -99,11 +99,6 @@ struct CS_GRAPHICS_CONFIG_PARAM_ST {
      */
     unsigned char m_volumetricEffectQuality{ 3 };
 
-    /**
-     * @brief m_dummy
-     */
-    unsigned char m_dummy_0[3];
-
     /**
      * @brief m_RayTracingQuality
      */
@@ -118,5 +113,5 @@ struct CS_GRAPHICS_CONFIG_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::CS_GRAPHICS_CONFIG_PARAM_ST) == 19,
+static_assert(sizeof(from::paramdef::CS_GRAPHICS_CONFIG_PARAM_ST) == 16,
     "CS_GRAPHICS_CONFIG_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/CUTSCENE_MAP_ID_PARAM_ST.hpp

@@ -77,8 +77,6 @@ struct CUTSCENE_MAP_ID_PARAM_ST {
      */
     int RefCamPosHitPartsID{ -1 };
 
-    unsigned char reserved_2_old[12];
-
     int unknown_0x18{ 0 };
 
     unsigned char reserved_2[8];
@@ -110,5 +108,5 @@ struct CUTSCENE_MAP_ID_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::CUTSCENE_MAP_ID_PARAM_ST) == 60,
+static_assert(sizeof(from::paramdef::CUTSCENE_MAP_ID_PARAM_ST) == 48,
     "CUTSCENE_MAP_ID_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/EQUIP_PARAM_GEM_ST.hpp

@@ -342,8 +342,6 @@ struct EQUIP_PARAM_GEM_ST {
      */
     unsigned char defaultWepAttr{ 0 };
 
-    unsigned char pad2_old[2];
-
     /**
      * @brief isSpecialSwordArt
      */
@@ -604,8 +602,6 @@ struct EQUIP_PARAM_GEM_ST {
      */
     bool canMountWep_Torch : 1 { false };
 
-    unsigned char reserved_canMountWep : 4;
-
     /**
      * @brief canMountWep_HandToHand
      */
@@ -626,8 +622,6 @@ struct EQUIP_PARAM_GEM_ST {
      */
     unsigned char canMountWep_ThrowingWeapon : 1 { 0 };
 
-    unsigned char reserved2_canMountWep_old[3];
-
     /**
      * @brief canMountWep_ReverseHandSword
      */
@@ -703,5 +697,5 @@ struct EQUIP_PARAM_GEM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::EQUIP_PARAM_GEM_ST) == 104,
+static_assert(sizeof(from::paramdef::EQUIP_PARAM_GEM_ST) == 96,
     "EQUIP_PARAM_GEM_ST paramdef size does not match detected size");

include/param/paramdef/EQUIP_PARAM_GOODS_ST.hpp

@@ -183,8 +183,6 @@ struct EQUIP_PARAM_GOODS_ST {
     */
     unsigned char spEffectCategory{ 0 };
 
-    unsigned char pad3[1];
-
     unsigned char unknown_0x40{ 0 };
 
     /**
@@ -573,8 +571,6 @@ struct EQUIP_PARAM_GOODS_ST {
      */
     bool isUseNoAttackRegion : 1 { true };
 
-    unsigned char pad1_old : 7;
-
     unsigned char unknown_0x73_1 : 1 { 0 };
 
     unsigned char unknown_0x73_2 : 1 { 0 };
@@ -739,5 +735,5 @@ struct EQUIP_PARAM_GOODS_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::EQUIP_PARAM_GOODS_ST) == 184,
+static_assert(sizeof(from::paramdef::EQUIP_PARAM_GOODS_ST) == 176,
     "EQUIP_PARAM_GOODS_ST paramdef size does not match detected size");

include/param/paramdef/EQUIP_PARAM_WEAPON_ST.hpp

@@ -1186,8 +1186,6 @@ struct EQUIP_PARAM_WEAPON_ST {
      */
     bool invisibleOnRemo : 1 { false };
 
-	unsigned char unk1: 3;
-
 	unsigned char unknown_0x17c_5: 1 { 0 };
 
 	unsigned char unknown_0x17c_6: 1 { 0 };
@@ -1879,8 +1877,6 @@ struct EQUIP_PARAM_WEAPON_ST {
      */
     float vsPlayerDmgCorrectRate_Curse{ 1.f };
 
-    unsigned char pad_old[8];
-
     /**
      * @brief restrictSpecialSwordArt
      */
@@ -1892,5 +1888,5 @@ struct EQUIP_PARAM_WEAPON_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::EQUIP_PARAM_WEAPON_ST) == 676,
+static_assert(sizeof(from::paramdef::EQUIP_PARAM_WEAPON_ST) == 664,
     "EQUIP_PARAM_WEAPON_ST paramdef size does not match detected size");

include/param/paramdef/GAME_SYSTEM_COMMON_PARAM_ST.hpp

@@ -1310,8 +1310,6 @@ struct GAME_SYSTEM_COMMON_PARAM_ST {
      */
     float aiSightRate_midnightA{ 1.f };
 
-	unsigned char reserve4_2[4];
-
 	int unknown_0x230 { 0 };
 
     /**
@@ -1994,10 +1992,6 @@ struct GAME_SYSTEM_COMMON_PARAM_ST {
      */
     float bonfireCheckEnemyRange{ -1.f };
 
-    unsigned char reserved_124_0[48];
-
-    unsigned char reserved_124_1[32];
-
     int unknown_0x2f0{ 0 };
 
     int unknown_0x2f4{ 0 };
@@ -2042,8 +2036,6 @@ struct GAME_SYSTEM_COMMON_PARAM_ST {
 
     float unknown_0x344{ 0.0f };
 
-    unsigned char pad_0x348[40];
-
     int unknown_0x34c{ 0 };
 
     int unknown_0x350{ 0 };
@@ -2091,5 +2083,5 @@ struct GAME_SYSTEM_COMMON_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::GAME_SYSTEM_COMMON_PARAM_ST) == 1148,
+static_assert(sizeof(from::paramdef::GAME_SYSTEM_COMMON_PARAM_ST) == 1024,
     "GAME_SYSTEM_COMMON_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/NETWORK_MSG_PARAM_ST.hpp

@@ -220,8 +220,6 @@ struct NETWORK_MSG_PARAM_ST {
      */
     int forceJoinBlack_C_Npc{ -1 };
 
-    unsigned char pad2[28];
-
     int unknown_0xa4{ 0 };
 
     int unknown_0xa8{ 0 };
@@ -238,5 +236,5 @@ struct NETWORK_MSG_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::NETWORK_MSG_PARAM_ST) == 220,
+static_assert(sizeof(from::paramdef::NETWORK_MSG_PARAM_ST) == 192,
     "NETWORK_MSG_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/NETWORK_PARAM_ST.hpp

@@ -174,8 +174,6 @@ struct NETWORK_PARAM_ST {
      */
     float breakInRequestTimeOutSec{ 20.f };
 
-    unsigned char pad_1_old[4];
-
     unsigned char unknown_0x7c{ 0 };
 
     unsigned char pad_1[3];
@@ -880,5 +878,5 @@ struct NETWORK_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::NETWORK_PARAM_ST) == 636,
+static_assert(sizeof(from::paramdef::NETWORK_PARAM_ST) == 632,
     "NETWORK_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/NPC_PARAM_ST.hpp

@@ -1654,8 +1654,6 @@ struct NPC_PARAM_ST {
      */
     signed char freezeGuardResist{ 0 };
 
-    unsigned char pad1[1];
-
     unsigned char unknown_0x1e3{ 0 };
 
     /**
@@ -1998,8 +1996,6 @@ struct NPC_PARAM_ST {
      */
     unsigned char chrNavimeshFlag_Dead{ 0 };
 
-    unsigned char pad7[1];
-
     /**
      * @brief isConsideredUndead
      */
@@ -2212,8 +2208,6 @@ struct NPC_PARAM_ST {
      */
     float lockScoreOffset{ 0.f };
 
-    unsigned char pad12_old[8];
-
     /**
      * @brief dlcGameClearSpEffectID
      */
@@ -2225,5 +2219,5 @@ struct NPC_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::NPC_PARAM_ST) == 752,
+static_assert(sizeof(from::paramdef::NPC_PARAM_ST) == 736,
     "NPC_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/OBJ_ACT_PARAM_ST.hpp

@@ -161,8 +161,6 @@ struct OBJ_ACT_PARAM_ST {
      */
     int preActionSfxId{ -1 };
 
-    unsigned char pad2_old[40];
-
     unsigned char unknown_0x38{ 0 };
 
     unsigned char unknown_0x3c{ 0 };
@@ -181,5 +179,5 @@ struct OBJ_ACT_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::OBJ_ACT_PARAM_ST) == 136,
+static_assert(sizeof(from::paramdef::OBJ_ACT_PARAM_ST) == 96,
     "OBJ_ACT_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/PLAYER_COMMON_PARAM_ST.hpp

@@ -374,8 +374,6 @@ struct PLAYER_COMMON_PARAM_ST {
      */
     int resistCurseItemLotParamId_map{ -1 };
 
-    unsigned char reserved41_old[52];
-
     int unknown_0xcc{ 0 };
 
     int unknown_0xd0{ 0 };
@@ -394,5 +392,5 @@ struct PLAYER_COMMON_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::PLAYER_COMMON_PARAM_ST) == 308,
+static_assert(sizeof(from::paramdef::PLAYER_COMMON_PARAM_ST) == 256,
     "PLAYER_COMMON_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/PLAY_REGION_PARAM_ST.hpp

@@ -265,8 +265,6 @@ struct PLAY_REGION_PARAM_ST {
      */
     bool isAutoIntrudePoint : 1 { false };
 
-	unsigned char pad1_old: 7;
-
 	unsigned char unknown_0x45_1: 1 { 0 };
 
 	unsigned char pad1: 6;
@@ -603,5 +601,5 @@ struct PLAY_REGION_PARAM_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::PLAY_REGION_PARAM_ST) == 276,
+static_assert(sizeof(from::paramdef::PLAY_REGION_PARAM_ST) == 272,
     "PLAY_REGION_PARAM_ST paramdef size does not match detected size");

include/param/paramdef/POSTURE_CONTROL_PARAM_WEP_RIGHT_ST.hpp

@@ -278,8 +278,6 @@ struct POSTURE_CONTROL_PARAM_WEP_RIGHT_ST {
      */
     short a016_leftWristIO{ 0 };
 
-    unsigned char pad[4];
-
     int unknown_0x6c{ 0 };
 
     int unknown_0x70{ 0 };
@@ -305,6 +303,6 @@ struct POSTURE_CONTROL_PARAM_WEP_RIGHT_ST {
 }; // namespace paramdef
 }; // namespace from
 
-static_assert(sizeof(from::paramdef::POSTURE_CONTROL_PARAM_WEP_RIGHT_ST) == 148,
+static_assert(sizeof(from::paramdef::POSTURE_CONTROL_PARAM_WEP_RIGHT_ST) == 144,
     "POSTURE_CONTROL_PARAM_WEP_RIGHT_ST paramdef size does not match detected "
     "size");