diff --git a/src/Library/Items/BattleItemCategory.hpp b/src/Library/Items/BattleItemCategory.hpp
index 77b60bc..e26f555 100644
--- a/src/Library/Items/BattleItemCategory.hpp
+++ b/src/Library/Items/BattleItemCategory.hpp
@@ -2,9 +2,10 @@
 #define CREATURELIB_BATTLEITEMCATEGORY_HPP
 
 #include <cstdint>
+#include "../../Core/Enum.hpp"
 
 namespace CreatureLib::Library {
-    enum class BattleItemCategory : uint8_t { None, Healing, StatusHealing, CaptureDevice, MiscBattleItem };
+    ENUM(BattleItemCategory, uint8_t, None, Healing, StatusHealing, CaptureDevice, MiscBattleItem)
 }
 
 #endif // CREATURELIB_BATTLEITEMCATEGORY_HPP
diff --git a/src/Library/Items/ItemCategory.hpp b/src/Library/Items/ItemCategory.hpp
index fddc812..473b3f4 100644
--- a/src/Library/Items/ItemCategory.hpp
+++ b/src/Library/Items/ItemCategory.hpp
@@ -2,18 +2,10 @@
 #define CREATURELIB_ITEMCATEGORY_HPP
 
 #include <cstdint>
+#include "../../Core/Enum.hpp"
 
 namespace CreatureLib::Library {
-    enum class ItemCategory : uint8_t {
-        MiscItem,
-        CaptureDevice,
-        Medicine,
-        Berry,
-        TM,
-        VariantChanger,
-        KeyItem,
-        Mail,
-    };
+    ENUM(ItemCategory, uint8_t, MiscItem, CaptureDevice, Medicine, Berry, MoveLearner, VariantChanger, KeyItem, Mail)
 }
 
 #endif // CREATURELIB_ITEMCATEGORY_HPP