diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
| commit | 605f8ac1141daf66d3428923e004f82f5a5e1594 (patch) | |
| tree | a3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /src/battle/anim/evasion.c | |
| parent | e88e39d5fda1644f77e41fd652d4310612da7532 (diff) | |
| parent | 659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/battle/anim/evasion.c')
| -rw-r--r-- | src/battle/anim/evasion.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c index ded8428d4..c60618a49 100644 --- a/src/battle/anim/evasion.c +++ b/src/battle/anim/evasion.c @@ -23,7 +23,7 @@ void sub_80CE7E0(u8 taskId) u16 r3; u16 r4; struct Task* task = &gTasks[taskId]; - task->data[0] = GetAnimBankSpriteId(0); + task->data[0] = GetAnimBattlerSpriteId(0); task->data[1] = AllocSpritePalette(0x2771); r3 = (task->data[1] * 16) + 0x100; r4 = (gSprites[task->data[0]].oam.paletteNum + 16) << 4; @@ -32,7 +32,7 @@ void sub_80CE7E0(u8 taskId) gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i]; } - BlendPalette(r3, 16, 11, 0); + BlendPalette(r3, 16, 11, RGB(0, 0, 0)); task->data[3] = 0; i = 0; while (i <= 1 && (obj = duplicate_obj_of_side_rel2move_in_transparent_mode(0)) >= 0) @@ -47,7 +47,7 @@ void sub_80CE7E0(u8 taskId) } task->func = sub_80CE910; - if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) { REG_DISPCNT &= 0xFDFF; } @@ -62,7 +62,7 @@ void sub_80CE910(u8 taskId) struct Task* task = &gTasks[taskId]; if (!task->data[3]) { - if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) + if (GetBattlerPosition_permutated(gAnimBankAttacker) == 1) REG_DISPCNT |= 0x200; else REG_DISPCNT |= 0x400; |