diff --git a/src/CRE/item_table.hpp b/src/CRE/item_table.hpp
index 23f9fe36..f4ec8348 100644
--- a/src/CRE/item_table.hpp
+++ b/src/CRE/item_table.hpp
@@ -101,7 +101,7 @@ union item_cos_data {
         int32_t kutsu;
         int32_t head;
     } data;
-    int32_t arr[25];
+    int32_t arr[ITEM_SUB_MAX];
 };
 
 struct item_table_dbgset {
diff --git a/src/CRE/rob/rob.cpp b/src/CRE/rob/rob.cpp
index 3c3d78e4..30d170be 100644
--- a/src/CRE/rob/rob.cpp
+++ b/src/CRE/rob/rob.cpp
@@ -212,7 +212,7 @@ struct struc_568 {
 };
 
 struct struc_656 {
-    std::vector<uint32_t> field_0[25];
+    std::vector<uint32_t> field_0[ITEM_SUB_MAX];
 
     struc_656();
     ~struc_656();
@@ -221,7 +221,7 @@ struct struc_656 {
 struct struc_655 {
     size_t count;
     uint32_t index;
-    struc_656 field_10[10];
+    struc_656 field_10[CHARA_MAX];
 
     struc_655();
     ~struc_655();
diff --git a/src/DivaGL/bone_data.hpp b/src/DivaGL/bone_data.hpp
index 5ff0b9fb..6297a938 100644
--- a/src/DivaGL/bone_data.hpp
+++ b/src/DivaGL/bone_data.hpp
@@ -1098,7 +1098,7 @@ union item_cos_data {
         int32_t kutsu;
         int32_t head;
     } data;
-    int32_t arr[25];
+    int32_t arr[ITEM_SUB_MAX];
 };
 
 struct texture;