diff --git a/includes/defines.php b/includes/defines.php
index ea2cf913..fb03af09 100644
--- a/includes/defines.php
+++ b/includes/defines.php
@@ -718,7 +718,7 @@ define('UNIT_FLAG_IMMUNE_TO_PC',            0x00000100);    // disables combat/a
 define('UNIT_FLAG_IMMUNE_TO_NPC',           0x00000200);    // disables combat/assistance with NonPlayerCharacters (NPC)
 define('UNIT_FLAG_LOOTING',                 0x00000400);    // Loot animation
 define('UNIT_FLAG_PET_IN_COMBAT',           0x00000800);    // In combat? 2.0.8
-define('UNIT_FLAG_PVP',                     0x00001000);    // Changed in 3.0.3
+define('UNIT_FLAG_PVP_ENABLING',            0x00001000);    // Changed in 3.0.3
 define('UNIT_FLAG_SILENCED',                0x00002000);    // Can't cast spells
 define('UNIT_FLAG_CANNOT_SWIM',             0x00004000);    // 2.0.8
 define('UNIT_FLAG_UNK_15',                  0x00008000);    // Only Swim ('OnlySwim' from UnitFlags.cs in WPP)
@@ -780,11 +780,16 @@ define('UNIT_VIS_FLAGS_UNK4',             0x08);
 define('UNIT_VIS_FLAGS_UNK5',             0x10);
 
 // UNIT_FIELD_BYTES_1 - idx 3 (UnitAnimTier)
-define('UNIT_BYTE1_ANIM_TIER_GROUND',    0);
-define('UNIT_BYTE1_ANIM_TIER_SWIM',      1);
-define('UNIT_BYTE1_ANIM_TIER_HOVER',     2);
-define('UNIT_BYTE1_ANIM_TIER_FLY',       3);
-define('UNIT_BYTE1_ANIM_TIER_SUMBERGED', 4);
+define('UNIT_ANIM_TIER_GROUND',    0);
+define('UNIT_ANIM_TIER_SWIM',      1);
+define('UNIT_ANIM_TIER_HOVER',     2);
+define('UNIT_ANIM_TIER_FLY',       3);
+define('UNIT_ANIM_TIER_SUMBERGED', 4);
+
+// UNIT_FIELD_BYTES_2 - idx 1 (UnitPvPStateFlags)
+define('UNIT_PVPSTATE_FLAG_PVP',       0x01);
+define('UNIT_PVPSTATE_FLAG_FFA_PVP',   0x04);               // not expected to be on NPCs, buuuut...
+define('UNIT_PVPSTATE_FLAG_SANCTUARY', 0x08);
 
 define('UNIT_DYNFLAG_LOOTABLE',                  0x01);     //
 define('UNIT_DYNFLAG_TRACK_UNIT',                0x02);     // Creature's location will be seen as a small dot in the minimap
diff --git a/localization/locale_dede.php b/localization/locale_dede.php
index f8cc6776..f95bffd4 100644
--- a/localization/locale_dede.php
+++ b/localization/locale_dede.php
@@ -502,7 +502,7 @@ $lang = array(
             UNIT_FLAG_IMMUNE_TO_NPC         => 'Immun gegen Kreaturen',
             UNIT_FLAG_LOOTING               => 'Lootanimation',
             UNIT_FLAG_PET_IN_COMBAT         => 'Pet im Kampf',
-            UNIT_FLAG_PVP                   => 'PvP',
+            UNIT_FLAG_PVP_ENABLING          => 'PvP',
             UNIT_FLAG_SILENCED              => 'Zum Schweigen gebracht',
             UNIT_FLAG_CANNOT_SWIM           => 'Kann nicht schwimmen',
             UNIT_FLAG_UNK_15                => 'UNK-15 (kann nur schwimmen)',
@@ -575,11 +575,11 @@ $lang = array(
                 UNIT_VIS_FLAGS_UNK5        => 'UNK-5'
             ),
 /*idx:3*/   array(
-                UNIT_BYTE1_ANIM_TIER_GROUND    => 'Bodenanimationen',
-                UNIT_BYTE1_ANIM_TIER_SWIM      => 'Schwimmanimationen',
-                UNIT_BYTE1_ANIM_TIER_HOVER     => 'Schwebeanimationen',
-                UNIT_BYTE1_ANIM_TIER_FLY       => 'Fluganimationen',
-                UNIT_BYTE1_ANIM_TIER_SUMBERGED => 'abgetauchte Animationen'
+                UNIT_ANIM_TIER_GROUND    => 'Bodenanimationen',
+                UNIT_ANIM_TIER_SWIM      => 'Schwimmanimationen',
+                UNIT_ANIM_TIER_HOVER     => 'Schwebeanimationen',
+                UNIT_ANIM_TIER_FLY       => 'Fluganimationen',
+                UNIT_ANIM_TIER_SUMBERGED => 'abgetauchte Animationen'
             ),
             'bytesIdx' => ['StandState', null, 'VisFlags', 'AnimTier'],
             'valueUNK' => '[span class=q10]unbenutzter Wert [b class=q1]%d[/b] übergeben an UnitFieldBytes1 auf Offset [b class=q1]%d[/b][/span]',
diff --git a/localization/locale_enus.php b/localization/locale_enus.php
index 145bf38a..13488289 100644
--- a/localization/locale_enus.php
+++ b/localization/locale_enus.php
@@ -502,7 +502,7 @@ $lang = array(
             UNIT_FLAG_IMMUNE_TO_NPC         => 'Immune to creatures',
             UNIT_FLAG_LOOTING               => 'Loot animation',
             UNIT_FLAG_PET_IN_COMBAT         => 'Pet in combat',
-            UNIT_FLAG_PVP                   => 'PvP',
+            UNIT_FLAG_PVP_ENABLING          => 'PvP',
             UNIT_FLAG_SILENCED              => 'Silenced',
             UNIT_FLAG_CANNOT_SWIM           => 'Cannot swim',
             UNIT_FLAG_UNK_15                => 'UNK-15 (can only swim)',
@@ -575,11 +575,11 @@ $lang = array(
                 UNIT_VIS_FLAGS_UNK5        => 'UNK-5'
             ),
 /*idx:3*/   array(
-                UNIT_BYTE1_ANIM_TIER_GROUND    => 'ground animations',
-                UNIT_BYTE1_ANIM_TIER_SWIM      => 'swimming animations',
-                UNIT_BYTE1_ANIM_TIER_HOVER     => 'hovering animations',
-                UNIT_BYTE1_ANIM_TIER_FLY       => 'flying animations',
-                UNIT_BYTE1_ANIM_TIER_SUMBERGED => 'submerged animations'
+                UNIT_ANIM_TIER_GROUND    => 'ground animations',
+                UNIT_ANIM_TIER_SWIM      => 'swimming animations',
+                UNIT_ANIM_TIER_HOVER     => 'hovering animations',
+                UNIT_ANIM_TIER_FLY       => 'flying animations',
+                UNIT_ANIM_TIER_SUMBERGED => 'submerged animations'
             ),
             'bytesIdx' => ['StandState', null, 'VisFlags', 'AnimTier'],
             'valueUNK' => '[span class=q10]unhandled value [b class=q1]%d[/b] provided for UnitFieldBytes1 on offset [b class=q1]%d[/b][/span]',
diff --git a/localization/locale_eses.php b/localization/locale_eses.php
index 98fd7128..96db72fd 100644
--- a/localization/locale_eses.php
+++ b/localization/locale_eses.php
@@ -502,7 +502,7 @@ $lang = array(
             UNIT_FLAG_IMMUNE_TO_NPC         => 'Inmune a criaturas',
             UNIT_FLAG_LOOTING               => 'Animación de botín',
             UNIT_FLAG_PET_IN_COMBAT         => 'Mascota en combate',
-            UNIT_FLAG_PVP                   => 'JcJ',
+            UNIT_FLAG_PVP_ENABLING          => 'JcJ',
             UNIT_FLAG_SILENCED              => 'Silenciado',
             UNIT_FLAG_CANNOT_SWIM           => 'No puede nadar',
             UNIT_FLAG_UNK_15                => 'UNK-15 (solo puede nadar)',
@@ -575,11 +575,11 @@ $lang = array(
                 UNIT_VIS_FLAGS_UNK5        => 'UNK-5'
             ),
 /*idx:3*/   array(
-                UNIT_BYTE1_ANIM_TIER_GROUND    => 'animaciones en tierra',
-                UNIT_BYTE1_ANIM_TIER_SWIM      => 'animaciones de nado',
-                UNIT_BYTE1_ANIM_TIER_HOVER     => 'animaciones de flotar',
-                UNIT_BYTE1_ANIM_TIER_FLY       => 'animaciones de vuelo',
-                UNIT_BYTE1_ANIM_TIER_SUMBERGED => 'animaciones sumergidas'
+                UNIT_ANIM_TIER_GROUND    => 'animaciones en tierra',
+                UNIT_ANIM_TIER_SWIM      => 'animaciones de nado',
+                UNIT_ANIM_TIER_HOVER     => 'animaciones de flotar',
+                UNIT_ANIM_TIER_FLY       => 'animaciones de vuelo',
+                UNIT_ANIM_TIER_SUMBERGED => 'animaciones sumergidas'
             ),
             'bytesIdx' => ['StandState', null, 'VisFlags', 'AnimTier'],
             'valueUNK' => '[span class=q10]valor no manejado [b class=q1]%d[/b] proporcionado para UnitFieldBytes1 en el desplazamiento [b class=q1]%d[/b][/span]',
diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php
index 10ae87b5..d311dea5 100644
--- a/localization/locale_frfr.php
+++ b/localization/locale_frfr.php
@@ -502,7 +502,7 @@ $lang = array(
             UNIT_FLAG_IMMUNE_TO_NPC         => 'Immune to creatures',
             UNIT_FLAG_LOOTING               => 'Loot animation',
             UNIT_FLAG_PET_IN_COMBAT         => 'Pet in combat',
-            UNIT_FLAG_PVP                   => 'PvP',
+            UNIT_FLAG_PVP_ENABLING          => 'PvP',
             UNIT_FLAG_SILENCED              => 'Silenced',
             UNIT_FLAG_CANNOT_SWIM           => 'Cannot swim',
             UNIT_FLAG_UNK_15                => 'UNK-15 (can only swim)',
@@ -575,11 +575,11 @@ $lang = array(
                 UNIT_VIS_FLAGS_UNK5        => 'UNK-5'
             ),
 /*idx:3*/   array(
-                UNIT_BYTE1_ANIM_TIER_GROUND    => 'ground animations',
-                UNIT_BYTE1_ANIM_TIER_SWIM      => 'swimming animations',
-                UNIT_BYTE1_ANIM_TIER_HOVER     => 'hovering animations',
-                UNIT_BYTE1_ANIM_TIER_FLY       => 'flying animations',
-                UNIT_BYTE1_ANIM_TIER_SUMBERGED => 'submerged animations'
+                UNIT_ANIM_TIER_GROUND    => 'ground animations',
+                UNIT_ANIM_TIER_SWIM      => 'swimming animations',
+                UNIT_ANIM_TIER_HOVER     => 'hovering animations',
+                UNIT_ANIM_TIER_FLY       => 'flying animations',
+                UNIT_ANIM_TIER_SUMBERGED => 'submerged animations'
             ),
             'bytesIdx' => ['StandState', null, 'VisFlags', 'AnimTier'],
             'valueUNK' => '[span class=q10]unhandled value [b class=q1]%d[/b] provided for UnitFieldBytes1 on offset [b class=q1]%d[/b][/span]',
diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php
index 467dd514..71bce292 100644
--- a/localization/locale_ruru.php
+++ b/localization/locale_ruru.php
@@ -502,7 +502,7 @@ $lang = array(
             UNIT_FLAG_IMMUNE_TO_NPC         => 'Immune to creatures',
             UNIT_FLAG_LOOTING               => 'Loot animation',
             UNIT_FLAG_PET_IN_COMBAT         => 'Pet in combat',
-            UNIT_FLAG_PVP                   => 'PvP',
+            UNIT_FLAG_PVP_ENABLING          => 'PvP',
             UNIT_FLAG_SILENCED              => 'Silenced',
             UNIT_FLAG_CANNOT_SWIM           => 'Cannot swim',
             UNIT_FLAG_UNK_15                => 'UNK-15 (can only swim)',
@@ -575,11 +575,11 @@ $lang = array(
                 UNIT_VIS_FLAGS_UNK5        => 'UNK-5'
             ),
 /*idx:3*/   array(
-                UNIT_BYTE1_ANIM_TIER_GROUND    => 'ground animations',
-                UNIT_BYTE1_ANIM_TIER_SWIM      => 'swimming animations',
-                UNIT_BYTE1_ANIM_TIER_HOVER     => 'hovering animations',
-                UNIT_BYTE1_ANIM_TIER_FLY       => 'flying animations',
-                UNIT_BYTE1_ANIM_TIER_SUMBERGED => 'submerged animations'
+                UNIT_ANIM_TIER_GROUND    => 'ground animations',
+                UNIT_ANIM_TIER_SWIM      => 'swimming animations',
+                UNIT_ANIM_TIER_HOVER     => 'hovering animations',
+                UNIT_ANIM_TIER_FLY       => 'flying animations',
+                UNIT_ANIM_TIER_SUMBERGED => 'submerged animations'
             ),
             'bytesIdx' => ['StandState', null, 'VisFlags', 'AnimTier'],
             'valueUNK' => '[span class=q10]unhandled value [b class=q1]%d[/b] provided for UnitFieldBytes1 on offset [b class=q1]%d[/b][/span]',
diff --git a/localization/locale_zhcn.php b/localization/locale_zhcn.php
index 117370c3..445d19d2 100644
--- a/localization/locale_zhcn.php
+++ b/localization/locale_zhcn.php
@@ -502,7 +502,7 @@ $lang = array(
             UNIT_FLAG_IMMUNE_TO_NPC         => 'Immune to creatures',
             UNIT_FLAG_LOOTING               => 'Loot animation',
             UNIT_FLAG_PET_IN_COMBAT         => 'Pet in combat',
-            UNIT_FLAG_PVP                   => 'PvP',
+            UNIT_FLAG_PVP_ENABLING          => 'PvP',
             UNIT_FLAG_SILENCED              => 'Silenced',
             UNIT_FLAG_CANNOT_SWIM           => 'Cannot swim',
             UNIT_FLAG_UNK_15                => 'UNK-15 (can only swim)',
@@ -575,11 +575,11 @@ $lang = array(
                 UNIT_VIS_FLAGS_UNK5        => 'UNK-5'
             ),
 /*idx:3*/   array(
-                UNIT_BYTE1_ANIM_TIER_GROUND    => 'ground animations',
-                UNIT_BYTE1_ANIM_TIER_SWIM      => 'swimming animations',
-                UNIT_BYTE1_ANIM_TIER_HOVER     => 'hovering animations',
-                UNIT_BYTE1_ANIM_TIER_FLY       => 'flying animations',
-                UNIT_BYTE1_ANIM_TIER_SUMBERGED => 'submerged animations'
+                UNIT_ANIM_TIER_GROUND    => 'ground animations',
+                UNIT_ANIM_TIER_SWIM      => 'swimming animations',
+                UNIT_ANIM_TIER_HOVER     => 'hovering animations',
+                UNIT_ANIM_TIER_FLY       => 'flying animations',
+                UNIT_ANIM_TIER_SUMBERGED => 'submerged animations'
             ),
             'bytesIdx' => ['StandState', null, 'VisFlags', 'AnimTier'],
             'valueUNK' => '[span class=q10]unhandled value [b class=q1]%d[/b] provided for UnitFieldBytes1 on offset [b class=q1]%d[/b][/span]',