diff options
| author | garak <garakmon@gmail.com> | 2018-11-13 16:19:52 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-13 16:19:52 -0500 |
| commit | c6833c903ca3fafbf3b8d5afd19a53785b1633e3 (patch) | |
| tree | 4bf59dabe0c1ec84d0e4ce72e54656bf457bc950 /src/battle_anim_sound_tasks.c | |
| parent | 269aebaca762b91f7b455dba2534d26b54187ec5 (diff) | |
remove extra macro and shorten names
Diffstat (limited to 'src/battle_anim_sound_tasks.c')
| -rw-r--r-- | src/battle_anim_sound_tasks.c | 20 |
1 files changed, 10 insertions, 10 deletions
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; |