diff --git a/src/MetroidPrime/Enemies/CMetaree.cpp b/src/MetroidPrime/Enemies/CMetaree.cpp
index dd5482da..36bfa34a 100644
--- a/src/MetroidPrime/Enemies/CMetaree.cpp
+++ b/src/MetroidPrime/Enemies/CMetaree.cpp
@@ -56,7 +56,7 @@ void CMetaree::CollidedWith(const TUniqueId& id, const CCollisionInfoList& colLi
                             CStateManager& mgr) {
   if (IsAlive() && colList.GetCount() > 0) {
     mgr.ApplyDamageToWorld(GetUniqueId(), *this, GetTranslation(), x5ac_damageInfo,
-                           CMaterialFilter::MakeInclude(kMT_Player));
+                           CMaterialFilter::MakeInclude(CMaterialList(kMT_Player)));
     SendScriptMsgs(kSS_Arrived, mgr, kSM_None);
     MassiveDeath(mgr);
   }
diff --git a/src/MetroidPrime/Enemies/CNewIntroBoss.cpp b/src/MetroidPrime/Enemies/CNewIntroBoss.cpp
index c05d6b25..44d543be 100644
--- a/src/MetroidPrime/Enemies/CNewIntroBoss.cpp
+++ b/src/MetroidPrime/Enemies/CNewIntroBoss.cpp
@@ -122,7 +122,7 @@ CVector3f CNewIntroBoss::PlayerPos(const CStateManager& mgr) const {
   float z0 = mgr.GetPlayer()->GetEyeHeight() / 2.f;
   CVector3f pos = mgr.GetPlayer()->GetTranslation() + CVector3f(0.f, 0.f, z0);
   CRayCastResult result = CGameCollision::RayStaticIntersection(
-      mgr, pos, CVector3f::Down(), 30.f, CMaterialFilter::MakeInclude(kMT_Solid));
+      mgr, pos, CVector3f::Down(), 30.f, CMaterialFilter::MakeInclude(CMaterialList(kMT_Solid)));
   if (result.IsInvalid()) {
     float z = mgr.GetPlayer()->GetEyeHeight() / 2.f + 0.2f;
     return mgr.GetPlayer()->GetTranslation() + CVector3f(0.f, 0.f, z);
diff --git a/src/MetroidPrime/Enemies/CPuffer.cpp b/src/MetroidPrime/Enemies/CPuffer.cpp
index b3c6d33a..f2029ddd 100644
--- a/src/MetroidPrime/Enemies/CPuffer.cpp
+++ b/src/MetroidPrime/Enemies/CPuffer.cpp
@@ -54,7 +54,8 @@ void CPuffer::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateMan
   switch (msg) {
   case kSM_Registered:
     GetBodyCtrl()->Activate(mgr);
-    SetMaterialFilter(CMaterialFilter::MakeIncludeExclude(kMT_Player, kMT_NoStaticCollision));
+    SetMaterialFilter(CMaterialFilter::MakeIncludeExclude(CMaterialList(kMT_Player),
+                                                          CMaterialList(kMT_NoStaticCollision)));
     break;
   case kSM_Action:
     if (GetActive()) {
diff --git a/src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp b/src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
index dc0b341a..20a5bbff 100644
--- a/src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
+++ b/src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
@@ -626,8 +626,7 @@ void CScriptSpecialFunction::RingScramble(CStateManager& mgr) {
   x1b8_ringReverse = !x1b8_ringReverse;
   float dir = x1b8_ringReverse ? 1.f : -1.f;
   for (int i = 0; i < x198_ringControllers.size(); ++i) {
-    x198_ringControllers[i].x4_rotateSpeed =
-        dir * mgr.Random()->Range(x100_float2, x104_float3);
+    x198_ringControllers[i].x4_rotateSpeed = dir * mgr.Random()->Range(x100_float2, x104_float3);
     dir = -dir;
     x198_ringControllers[i].x8_reachedTarget = false;
   }
@@ -988,7 +987,8 @@ void CScriptSpecialFunction::ThinkChaffTarget(float dt, CStateManager& mgr) {
   TEntityList nearList;
   const CVector3f offset(5.f, 5.f, 5.f);
   const CAABox box(GetTranslation() - offset, GetTranslation() + offset);
-  mgr.BuildNearList(nearList, box, CMaterialFilter::MakeInclude(kMT_Projectile), nullptr);
+  mgr.BuildNearList(nearList, box, CMaterialFilter::MakeInclude(CMaterialList(kMT_Projectile)),
+                    nullptr);
 
   for (int i = 0; i < nearList.size(); ++i) {
     if (CEnergyProjectile* proj = TCastToPtr< CEnergyProjectile >(mgr.ObjectById(nearList[i]))) {
diff --git a/src/MetroidPrime/ScriptObjects/CScriptTrigger.cpp b/src/MetroidPrime/ScriptObjects/CScriptTrigger.cpp
index 79ae8b3d..aa611b37 100644
--- a/src/MetroidPrime/ScriptObjects/CScriptTrigger.cpp
+++ b/src/MetroidPrime/ScriptObjects/CScriptTrigger.cpp
@@ -107,9 +107,10 @@ void CScriptTrigger::Touch(CActor& act, CStateManager& mgr) {
           mgr.SendScriptMsg(GetUniqueId(), mgr.GetEditorIdForUniqueId(GetUniqueId()),
                             kSM_Deactivate, kSS_Entered);
           if (act.HealthInfo(mgr) && x100_damageInfo.GetDamage() > 0.f) {
-            mgr.ApplyDamage(GetUniqueId(), act.GetUniqueId(), GetUniqueId(), x100_damageInfo,
-                            CMaterialFilter::MakeIncludeExclude(SolidMaterial, CMaterialList(0)),
-                            CVector3f::Zero());
+            mgr.ApplyDamage(
+                GetUniqueId(), act.GetUniqueId(), GetUniqueId(), x100_damageInfo,
+                CMaterialFilter::MakeIncludeExclude(CMaterialList(SolidMaterial), CMaterialList(0)),
+                CVector3f::Zero());
           }
         }
 
@@ -119,9 +120,10 @@ void CScriptTrigger::Touch(CActor& act, CStateManager& mgr) {
             static CWeaponMode sktonOHurtWeaponMode(kWT_Power, false, false, true);
             CDamageInfo dmg(sktonOHurtWeaponMode, 10.f * hInfo->GetHP(), 0.f, 0.f);
 
-            mgr.ApplyDamage(GetUniqueId(), act.GetUniqueId(), GetUniqueId(), dmg,
-                            CMaterialFilter::MakeIncludeExclude(SolidMaterial, CMaterialList(0)),
-                            CVector3f::Zero());
+            mgr.ApplyDamage(
+                GetUniqueId(), act.GetUniqueId(), GetUniqueId(), dmg,
+                CMaterialFilter::MakeIncludeExclude(CMaterialList(SolidMaterial), CMaterialList(0)),
+                CVector3f::Zero());
           }
         }
       } else {
@@ -143,8 +145,7 @@ rstl::optional_object< CAABox > CScriptTrigger::GetTouchBounds() const {
   return rstl::optional_object_null();
 }
 
-void CScriptTrigger::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
-                                     CStateManager& mgr) {
+void CScriptTrigger::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
   if (GetActive()) {
     if (msg == kSM_Deactivate) {
       xe8_inhabitants.clear();