remove extra macro and shorten names

3 files changed, 39 insertions, 39 deletions

diff --git a/src/battle_anim.c b/src/battle_anim.c
index d9eefd510..aa9637889 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1862,7 +1862,7 @@ static void ScriptCmd_monbg(void)
     sBattleAnimScriptPtr++;
 
     animBattler = sBattleAnimScriptPtr[0];
-    if (animBattler & ANIM_BATTLER_TARGET)
+    if (animBattler & ANIM_TARGET)
         battlerId = gBattleAnimTarget;
     else
         battlerId = gBattleAnimAttacker;
@@ -2119,12 +2119,12 @@ static void ScriptCmd_clearmonbg(void)
     sBattleAnimScriptPtr++;
     animBattlerId = sBattleAnimScriptPtr[0];
 
-    if (animBattlerId == ANIM_BATTLER_ATTACKER)
-        animBattlerId = ANIM_BATTLER_ATK_PARTNER;
-    else if (animBattlerId == ANIM_BATTLER_TARGET)
-        animBattlerId = ANIM_BATTLER_DEF_PARTNER;
+    if (animBattlerId == ANIM_ATTACKER)
+        animBattlerId = ANIM_ATK_PARTNER;
+    else if (animBattlerId == ANIM_TARGET)
+        animBattlerId = ANIM_DEF_PARTNER;
 
-    if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER)
+    if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER)
         battlerId = gBattleAnimAttacker;
     else
         battlerId = gBattleAnimTarget;
@@ -2181,12 +2181,12 @@ static void ScriptCmd_monbg_22(void)
 
     animBattlerId = sBattleAnimScriptPtr[0];
 
-    if (animBattlerId == ANIM_BATTLER_ATTACKER)
-        animBattlerId = ANIM_BATTLER_ATK_PARTNER;
-    else if (animBattlerId == ANIM_BATTLER_TARGET)
-        animBattlerId = ANIM_BATTLER_DEF_PARTNER;
+    if (animBattlerId == ANIM_ATTACKER)
+        animBattlerId = ANIM_ATK_PARTNER;
+    else if (animBattlerId == ANIM_TARGET)
+        animBattlerId = ANIM_DEF_PARTNER;
 
-    if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER)
+    if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER)
         battlerId = gBattleAnimAttacker;
     else
         battlerId = gBattleAnimTarget;
@@ -2226,12 +2226,12 @@ static void ScriptCmd_clearmonbg_23(void)
     sBattleAnimScriptPtr++;
     animBattlerId = sBattleAnimScriptPtr[0];
 
-    if (animBattlerId == ANIM_BATTLER_ATTACKER)
-        animBattlerId = ANIM_BATTLER_ATK_PARTNER;
-    else if (animBattlerId == ANIM_BATTLER_TARGET)
-        animBattlerId = ANIM_BATTLER_DEF_PARTNER;
+    if (animBattlerId == ANIM_ATTACKER)
+        animBattlerId = ANIM_ATK_PARTNER;
+    else if (animBattlerId == ANIM_TARGET)
+        animBattlerId = ANIM_DEF_PARTNER;
 
-    if (animBattlerId == ANIM_BATTLER_ATTACKER || animBattlerId == ANIM_BATTLER_ATK_PARTNER)
+    if (animBattlerId == ANIM_ATTACKER || animBattlerId == ANIM_ATK_PARTNER)
         battlerId = gBattleAnimAttacker;
     else
         battlerId = gBattleAnimTarget;
@@ -2956,7 +2956,7 @@ static void ScriptCmd_monbgprio_28(void)
     wantedBattler = sBattleAnimScriptPtr[1];
     sBattleAnimScriptPtr += 2;
 
-    if (wantedBattler != ANIM_BATTLER_ATTACKER)
+    if (wantedBattler != ANIM_ATTACKER)
         battlerId = gBattleAnimTarget;
     else
         battlerId = gBattleAnimAttacker;
@@ -2989,7 +2989,7 @@ static void ScriptCmd_monbgprio_2A(void)
     sBattleAnimScriptPtr += 2;
     if (GetBattlerSide(gBattleAnimAttacker) != GetBattlerSide(gBattleAnimTarget))
     {
-        if (wantedBattler != ANIM_BATTLER_ATTACKER)
+        if (wantedBattler != ANIM_ATTACKER)
             battlerId = gBattleAnimTarget;
         else
             battlerId = gBattleAnimAttacker;
@@ -3036,15 +3036,15 @@ static void ScriptCmd_doublebattle_2D(void)
     if (!IsContest() && IsDoubleBattle()
      && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
     {
-        if (wantedBattler == ANIM_BATTLER_ATTACKER)
+        if (wantedBattler == ANIM_ATTACKER)
         {
             r4 = sub_80A8364(gBattleAnimAttacker);
-            spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER);
+            spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         }
         else
         {
             r4 = sub_80A8364(gBattleAnimTarget);
-            spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET);
+            spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
         if (spriteId != 0xFF)
         {
@@ -3071,15 +3071,15 @@ static void ScriptCmd_doublebattle_2E(void)
     if (!IsContest() && IsDoubleBattle()
      && GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget))
     {
-        if (wantedBattler == ANIM_BATTLER_ATTACKER)
+        if (wantedBattler == ANIM_ATTACKER)
         {
             r4 = sub_80A8364(gBattleAnimAttacker);
-            spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER);
+            spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         }
         else
         {
             r4 = sub_80A8364(gBattleAnimTarget);
-            spriteId = GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET);
+            spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
 
         if (spriteId != 0xFF && r4 == 2)
diff --git a/src/battle_anim_80A5C6C.c b/src/battle_anim_80A5C6C.c
index 351a5c20d..ebe1718b7 100644
--- a/src/battle_anim_80A5C6C.c
+++ b/src/battle_anim_80A5C6C.c
@@ -395,7 +395,7 @@ u8 GetAnimBattlerSpriteId(u8 which)
 {
     u8 *sprites;
 
-    if (which == ANIM_BATTLER_ATTACKER)
+    if (which == ANIM_ATTACKER)
     {
         if (IsBattlerSpritePresent(gBattleAnimAttacker))
         {
@@ -407,7 +407,7 @@ u8 GetAnimBattlerSpriteId(u8 which)
             return 0xff;
         }
     }
-    else if (which == ANIM_BATTLER_TARGET)
+    else if (which == ANIM_TARGET)
     {
         if (IsBattlerSpritePresent(gBattleAnimTarget))
         {
@@ -419,7 +419,7 @@ u8 GetAnimBattlerSpriteId(u8 which)
             return 0xff;
         }
     }
-    else if (which == ANIM_BATTLER_ATK_PARTNER)
+    else if (which == ANIM_ATK_PARTNER)
     {
         if (!IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
             return 0xff;
@@ -1236,7 +1236,7 @@ bool8 sub_80A7238(void)
 {
     if (IsContest())
     {
-        if (gSprites[GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER)].data[2] == SPECIES_UNOWN)
+        if (gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].data[2] == SPECIES_UNOWN)
             return FALSE;
         else
             return TRUE;
@@ -2334,7 +2334,7 @@ void sub_80A8BC4(u8 taskId)
     u16 dest;
     struct Task *task = &gTasks[taskId];
 
-    task->data[0] = GetAnimBattlerSpriteId(ANIM_BATTLER_ATTACKER);
+    task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
     task->data[1] = ((GetBattlerSide(gBattleAnimAttacker)) != B_SIDE_PLAYER) ? -8 : 8;
     task->data[2] = 0;
     task->data[3] = 0;
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c
index c178a57dc..7b8eb4ed7 100644
--- a/src/battle_anim_sound_tasks.c
+++ b/src/battle_anim_sound_tasks.c
@@ -130,7 +130,7 @@ void sub_8158D8C(u8 taskId)
     s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
     if (IsContest())
     {
-        if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER)
+        if (gBattleAnimArgs[0] == ANIM_ATTACKER)
             species = gContestResources->field_18->unk0;
         else
             DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task.
@@ -140,17 +140,17 @@ void sub_8158D8C(u8 taskId)
         u8 battlerId;
 
         // Get wanted battler.
-        if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER)
+        if (gBattleAnimArgs[0] == ANIM_ATTACKER)
             battlerId = gBattleAnimAttacker;
-        else if (gBattleAnimArgs[0] == ANIM_BATTLER_TARGET)
+        else if (gBattleAnimArgs[0] == ANIM_TARGET)
             battlerId = gBattleAnimTarget;
-        else if (gBattleAnimArgs[0] == ANIM_BATTLER_ATK_PARTNER)
+        else if (gBattleAnimArgs[0] == ANIM_ATK_PARTNER)
             battlerId = BATTLE_PARTNER(gBattleAnimAttacker);
         else
             battlerId = BATTLE_PARTNER(gBattleAnimTarget);
 
         // Check if battler is visible.
-        if ((gBattleAnimArgs[0] == ANIM_BATTLER_TARGET || gBattleAnimArgs[0] == ANIM_BATTLER_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId))
+        if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId))
         {
             DestroyAnimVisualTask(taskId);
             return;
@@ -176,7 +176,7 @@ void sub_8158E9C(u8 taskId)
     s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
     if (IsContest())
     {
-        if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER)
+        if (gBattleAnimArgs[0] == ANIM_ATTACKER)
             species = gContestResources->field_18->unk0;
         else
             DestroyAnimVisualTask(taskId); // UB: function should return upon destroying task.
@@ -186,17 +186,17 @@ void sub_8158E9C(u8 taskId)
         u8 battlerId;
 
         // Get wanted battler.
-        if (gBattleAnimArgs[0] == ANIM_BATTLER_ATTACKER)
+        if (gBattleAnimArgs[0] == ANIM_ATTACKER)
             battlerId = gBattleAnimAttacker;
-        else if (gBattleAnimArgs[0] == ANIM_BATTLER_TARGET)
+        else if (gBattleAnimArgs[0] == ANIM_TARGET)
             battlerId = gBattleAnimTarget;
-        else if (gBattleAnimArgs[0] == ANIM_BATTLER_ATK_PARTNER)
+        else if (gBattleAnimArgs[0] == ANIM_ATK_PARTNER)
             battlerId = BATTLE_PARTNER(gBattleAnimAttacker);
         else
             battlerId = BATTLE_PARTNER(gBattleAnimTarget);
 
         // Check if battler is visible.
-        if ((gBattleAnimArgs[0] == ANIM_BATTLER_TARGET || gBattleAnimArgs[0] == ANIM_BATTLER_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId))
+        if ((gBattleAnimArgs[0] == ANIM_TARGET || gBattleAnimArgs[0] == ANIM_DEF_PARTNER) && !IsBattlerSpriteVisible(battlerId))
         {
             DestroyAnimVisualTask(taskId);
             return;