diff --git a/ENTITY/N_0x1a092bb0c3808b96.md b/ENTITY/N_0x1a092bb0c3808b96.md
deleted file mode 100644
index fcda48d44..000000000
--- a/ENTITY/N_0x1a092bb0c3808b96.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-ns: ENTITY
----
-## _0x1A092BB0C3808B96
-
-```c
-// 0x1A092BB0C3808B96
-void _0x1A092BB0C3808B96(Entity entity, BOOL p1);
-```
-
-```
-SET_ENTITY_*  
-```
-
-## Parameters
-* **entity**: 
-* **p1**: 
-
diff --git a/ENTITY/N_0x352e2b5cf420bf3b.md b/ENTITY/N_0x352e2b5cf420bf3b.md
deleted file mode 100644
index 33063210c..000000000
--- a/ENTITY/N_0x352e2b5cf420bf3b.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-ns: ENTITY
----
-## _0x352E2B5CF420BF3B
-
-```c
-// 0x352E2B5CF420BF3B
-void _0x352E2B5CF420BF3B(Any p0, Any p1);
-```
-
-
-## Parameters
-* **p0**: 
-* **p1**: 
-
diff --git a/ENTITY/N_0x36f32de87082343e.md b/ENTITY/N_0x36f32de87082343e.md
deleted file mode 100644
index c2a3f7d0c..000000000
--- a/ENTITY/N_0x36f32de87082343e.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-ns: ENTITY
----
-## _0x36F32DE87082343E
-
-```c
-// 0x36F32DE87082343E
-void _0x36F32DE87082343E(Any p0, Any p1);
-```
-
-
-## Parameters
-* **p0**: 
-* **p1**: 
-
diff --git a/ENTITY/N_0x68b562e124cc0aef.md b/ENTITY/N_0x68b562e124cc0aef.md
deleted file mode 100644
index d9fed51bb..000000000
--- a/ENTITY/N_0x68b562e124cc0aef.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-ns: ENTITY
----
-## _0x68B562E124CC0AEF
-
-```c
-// 0x68B562E124CC0AEF
-void _0x68B562E124CC0AEF(Any p0, Any p1);
-```
-
-```
-NativeDB Introduced: v1180
-```
-
-## Parameters
-* **p0**:
-* **p1**:
diff --git a/ENTITY/N_0xb17bc6453f6cf5ac.md b/ENTITY/N_0xb17bc6453f6cf5ac.md
deleted file mode 100644
index a989e80c4..000000000
--- a/ENTITY/N_0xb17bc6453f6cf5ac.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-ns: ENTITY
----
-## _0xB17BC6453F6CF5AC
-
-```c
-// 0xB17BC6453F6CF5AC
-void _0xB17BC6453F6CF5AC(Any p0, Any p1);
-```
-
-
-## Parameters
-* **p0**: 
-* **p1**: 
-
diff --git a/ENTITY/N_0xcea7c8e1b48ff68c.md b/ENTITY/N_0xcea7c8e1b48ff68c.md
deleted file mode 100644
index 104cf7d69..000000000
--- a/ENTITY/N_0xcea7c8e1b48ff68c.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-ns: ENTITY
----
-## _0xCEA7C8E1B48FF68C
-
-```c
-// 0xCEA7C8E1B48FF68C
-void _0xCEA7C8E1B48FF68C(Any p0, Any p1);
-```
-
-
-## Parameters
-* **p0**: 
-* **p1**: 
-
diff --git a/ENTITY/N_0xe66377cddada4810.md b/ENTITY/N_0xe66377cddada4810.md
deleted file mode 100644
index e26d5fab3..000000000
--- a/ENTITY/N_0xe66377cddada4810.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-ns: ENTITY
----
-## _0xE66377CDDADA4810
-
-```c
-// 0xE66377CDDADA4810
-void _0xE66377CDDADA4810(Entity entity, BOOL p1);
-```
-
-SET_ENTITY_M*
-
-```
-NativeDB Introduced: v1734
-```
-
-## Parameters
-* **entity**:
-* **p1**:
diff --git a/ENTITY/N_0x490861b88f4fd846.md b/ENTITY/ResetPickupEntityGlow.md
similarity index 56%
rename from ENTITY/N_0x490861b88f4fd846.md
rename to ENTITY/ResetPickupEntityGlow.md
index b8838aea5..772c9dc49 100644
--- a/ENTITY/N_0x490861b88f4fd846.md
+++ b/ENTITY/ResetPickupEntityGlow.md
@@ -1,11 +1,11 @@
 ---
 ns: ENTITY
 ---
-## _0x490861B88F4FD846
+## RESET_PICKUP_ENTITY_GLOW
 
 ```c
 // 0x490861B88F4FD846
-void _0x490861B88F4FD846(Any p0);
+void RESET_PICKUP_ENTITY_GLOW(Entity entity);
 ```
 
 ```
@@ -13,5 +13,5 @@ Does nothing (essentially a nullsub).
 ```
 
 ## Parameters
-* **p0**: 
+* **entity**: 
 
diff --git a/ENTITY/SetAllowMigrateToSpectator.md b/ENTITY/SetAllowMigrateToSpectator.md
new file mode 100644
index 000000000..fd38be21b
--- /dev/null
+++ b/ENTITY/SetAllowMigrateToSpectator.md
@@ -0,0 +1,15 @@
+---
+ns: ENTITY
+---
+## SET_ALLOW_MIGRATE_TO_SPECTATOR
+
+```c
+// 0x36F32DE87082343E
+void SET_ALLOW_MIGRATE_TO_SPECTATOR(Entity entity, Any p1);
+```
+
+
+## Parameters
+* **entity**: 
+* **p1**: always set to 1
+
diff --git a/ENTITY/SetEntityCanOnlyBeDamagedByEntity.md b/ENTITY/SetEntityCanOnlyBeDamagedByEntity.md
new file mode 100644
index 000000000..23fdb2112
--- /dev/null
+++ b/ENTITY/SetEntityCanOnlyBeDamagedByEntity.md
@@ -0,0 +1,15 @@
+---
+ns: ENTITY
+---
+## SET_ENTITY_CAN_ONLY_BE_DAMAGED_BY_ENTITY
+
+```c
+// 0xB17BC6453F6CF5AC
+void SET_ENTITY_CAN_ONLY_BE_DAMAGED_BY_ENTITY(Entity entity1, Entity entity2);
+```
+
+
+## Parameters
+* **entity1**: 
+* **entity2**: 
+
diff --git a/ENTITY/SetEntityCanOnlyBeDamagedByScriptParticipants.md b/ENTITY/SetEntityCanOnlyBeDamagedByScriptParticipants.md
new file mode 100644
index 000000000..02af6080d
--- /dev/null
+++ b/ENTITY/SetEntityCanOnlyBeDamagedByScriptParticipants.md
@@ -0,0 +1,15 @@
+---
+ns: ENTITY
+---
+## SET_ENTITY_CAN_ONLY_BE_DAMAGED_BY_SCRIPT_PARTICIPANTS
+
+```c
+// 0x352E2B5CF420BF3B
+void SET_ENTITY_CAN_ONLY_BE_DAMAGED_BY_SCRIPT_PARTICIPANTS(Entity entity, Bool toggle);
+```
+
+
+## Parameters
+* **entity**: 
+* **toggle**: 
+
diff --git a/ENTITY/SetEntityCantCauseCollisionDamagedEntity.md b/ENTITY/SetEntityCantCauseCollisionDamagedEntity.md
new file mode 100644
index 000000000..711655c70
--- /dev/null
+++ b/ENTITY/SetEntityCantCauseCollisionDamagedEntity.md
@@ -0,0 +1,17 @@
+---
+ns: ENTITY
+---
+## SET_ENTITY_CANT_CAUSE_COLLISION_DAMAGED_ENTITY
+
+```c
+// 0x68B562E124CC0AEF
+void SET_ENTITY_CANT_CAUSE_COLLISION_DAMAGED_ENTITY(Entity entity1, Entity entity2);
+```
+
+```
+NativeDB Introduced: v1180
+```
+
+## Parameters
+* **entity1**:
+* **entity2**:
diff --git a/ENTITY/N_0x78e8e3a640178255.md b/ENTITY/SetEntityIsInVehicle.md
similarity index 65%
rename from ENTITY/N_0x78e8e3a640178255.md
rename to ENTITY/SetEntityIsInVehicle.md
index 0522c43f0..4703ea4fa 100644
--- a/ENTITY/N_0x78e8e3a640178255.md
+++ b/ENTITY/SetEntityIsInVehicle.md
@@ -1,16 +1,15 @@
 ---
 ns: ENTITY
 ---
-## _0x78E8E3A640178255
+## SET_ENTITY_IS_IN_VEHICLE
 
 ```c
 // 0x78E8E3A640178255
-void _0x78E8E3A640178255(Entity entity);
+void SET_ENTITY_IS_IN_VEHICLE(Entity entity);
 ```
 
 ```
 Related to cutscene entities. Unsure about the use.
-SET_ENTITY_*
 ```
 
 ## Parameters
diff --git a/ENTITY/SetEntityMirrorReflectionFlag.md b/ENTITY/SetEntityMirrorReflectionFlag.md
new file mode 100644
index 000000000..ab01966b1
--- /dev/null
+++ b/ENTITY/SetEntityMirrorReflectionFlag.md
@@ -0,0 +1,18 @@
+---
+ns: ENTITY
+---
+## SET_ENTITY_MIRROR_REFLECTION_FLAG
+
+```c
+// 0xE66377CDDADA4810
+void SET_ENTITY_MIRROR_REFLECTION_FLAG(Entity entity, BOOL toggle);
+```
+
+
+```
+NativeDB Introduced: v1734
+```
+
+## Parameters
+* **entity**:
+* **toggle**:
diff --git a/ENTITY/N_0x5c3b791d580e0bc2.md b/ENTITY/SetEntitySortBias.md
similarity index 68%
rename from ENTITY/N_0x5c3b791d580e0bc2.md
rename to ENTITY/SetEntitySortBias.md
index b3b73af78..d94236196 100644
--- a/ENTITY/N_0x5c3b791d580e0bc2.md
+++ b/ENTITY/SetEntitySortBias.md
@@ -1,11 +1,11 @@
 ---
 ns: ENTITY
 ---
-## _0x5C3B791D580E0BC2
+## SET_ENTITY_SORT_BIAS
 
 ```c
 // 0x5C3B791D580E0BC2
-void _0x5C3B791D580E0BC2(Entity entity, float p1);
+void SET_ENTITY_SORT_BIAS(Entity entity, float p1);
 ```
 
 ```
diff --git a/ENTITY/SetEntityUseMaxDistanceForWaterReflection.md b/ENTITY/SetEntityUseMaxDistanceForWaterReflection.md
new file mode 100644
index 000000000..f9508ceee
--- /dev/null
+++ b/ENTITY/SetEntityUseMaxDistanceForWaterReflection.md
@@ -0,0 +1,18 @@
+---
+ns: ENTITY
+---
+## SET_ENTITY_USE_MAX_DISTANCE_FOR_WATER_REFLECTION
+
+```c
+// 0x1A092BB0C3808B96
+void SET_ENTITY_USE_MAX_DISTANCE_FOR_WATER_REFLECTION(Entity entity, BOOL toggle);
+```
+
+```
+
+```
+
+## Parameters
+* **entity**: 
+* **toggle**: 
+
diff --git a/ENTITY/N_0xc34bc448da29f5e9.md b/ENTITY/SetEntityWaterReflectionFlag.md
similarity index 50%
rename from ENTITY/N_0xc34bc448da29f5e9.md
rename to ENTITY/SetEntityWaterReflectionFlag.md
index 4053a8cdc..7ff637116 100644
--- a/ENTITY/N_0xc34bc448da29f5e9.md
+++ b/ENTITY/SetEntityWaterReflectionFlag.md
@@ -1,15 +1,15 @@
 ---
 ns: ENTITY
 ---
-## _0xC34BC448DA29F5E9
+## SET_ENTITY_WATER_REFLECTION_FLAG
 
 ```c
 // 0xC34BC448DA29F5E9
-void _0xC34BC448DA29F5E9(Entity entity, BOOL toggle);
+void SET_ENTITY_WATER_REFLECTION_FLAG(Entity entity, BOOL toggle);
 ```
 
 ```
-SET_ENTITY_*
+
 ```
 
 ## Parameters
diff --git a/ENTITY/SetPickupCollidesWithProjectiles.md b/ENTITY/SetPickupCollidesWithProjectiles.md
new file mode 100644
index 000000000..6d6706ed6
--- /dev/null
+++ b/ENTITY/SetPickupCollidesWithProjectiles.md
@@ -0,0 +1,15 @@
+---
+ns: ENTITY
+---
+## SET_PICKUP_COLLIDES_WITH_PROJECTILES
+
+```c
+// 0xCEA7C8E1B48FF68C
+void SET_PICKUP_COLLIDES_WITH_PROJECTILES(Entity entity, BOOL toggle);
+```
+
+
+## Parameters
+* **entity**: 
+* **toggle**: 
+