diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-19 13:13:28 -0500 |
---|---|---|
committer | huderlem <huderlem@gmail.com> | 2020-02-25 12:54:08 -0600 |
commit | 0d651c7c9e2834229e14d60c00c203d7798d3890 (patch) | |
tree | 04ee7fc9e538d3b89a94c6b69299e5c117c845ef /src/battle_anim_utility_funcs.c | |
parent | 1ba12dc050aaeb36e0ba11160bb159280f95f28a (diff) |
Some battle anim review changes
Diffstat (limited to 'src/battle_anim_utility_funcs.c')
-rw-r--r-- | src/battle_anim_utility_funcs.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 1098c7953..cf788b3e3 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -683,7 +683,7 @@ static void sub_81175C4(u32 selectedPalettes, u16 color) } } -void AnimTask_BlendAllBattlerPalettesButAttacker(u8 taskId) +void AnimTask_BlendNonAttackerPalettes(u8 taskId) { u32 battler; int j; @@ -729,7 +729,7 @@ static void sub_81176D8(u8 taskId) gTasks[taskId].data[10] &= 0xFF; gTasks[taskId].data[11] &= 0xFF; - if (gBattleAnimArgs[7] == gTasks[taskId].data[3]) + if (gBattleAnimArgs[ARG_RET_ID] == gTasks[taskId].data[3]) { gBattle_BG3_X = 0; gBattle_BG3_Y = 0; @@ -740,19 +740,19 @@ static void sub_81176D8(u8 taskId) void AnimTask_GetAttackerSide(u8 taskId) { - gBattleAnimArgs[7] = GetBattlerSide(gBattleAnimAttacker); + gBattleAnimArgs[ARG_RET_ID] = GetBattlerSide(gBattleAnimAttacker); DestroyAnimVisualTask(taskId); } void AnimTask_GetTargetSide(u8 taskId) { - gBattleAnimArgs[7] = GetBattlerSide(gBattleAnimTarget); + gBattleAnimArgs[ARG_RET_ID] = GetBattlerSide(gBattleAnimTarget); DestroyAnimVisualTask(taskId); } void AnimTask_GetTargetIsAttackerPartner(u8 taskId) { - gBattleAnimArgs[7] = BATTLE_PARTNER(gBattleAnimAttacker) == gBattleAnimTarget; + gBattleAnimArgs[ARG_RET_ID] = BATTLE_PARTNER(gBattleAnimAttacker) == gBattleAnimTarget; DestroyAnimVisualTask(taskId); } @@ -1005,9 +1005,9 @@ void sub_8117DD8(u8 taskId) void AnimTask_IsContest(u8 taskId) { if (IsContest()) - gBattleAnimArgs[7] = TRUE; + gBattleAnimArgs[ARG_RET_ID] = TRUE; else - gBattleAnimArgs[7] = FALSE; + gBattleAnimArgs[ARG_RET_ID] = FALSE; DestroyAnimVisualTask(taskId); } @@ -1022,9 +1022,9 @@ void sub_8117E94(u8 taskId) void AnimTask_IsTargetSameSide(u8 taskId) { if (GetBattlerSide(gBattleAnimAttacker) == GetBattlerSide(gBattleAnimTarget)) - gBattleAnimArgs[7] = TRUE; + gBattleAnimArgs[ARG_RET_ID] = TRUE; else - gBattleAnimArgs[7] = FALSE; + gBattleAnimArgs[ARG_RET_ID] = FALSE; DestroyAnimVisualTask(taskId); } @@ -1060,7 +1060,7 @@ void AnimTask_ExtremeSpeedMoveTarget(u8 taskId) static void ExtremSpeedMoveTarget_Step(u8 taskId) { - if (gBattleAnimArgs[7] == 0x1000) + if (gBattleAnimArgs[ARG_RET_ID] == 0x1000) { gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].invisible = (u8)gTasks[taskId].data[0] & 1; DestroyTask(taskId); |