diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-17 15:59:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 15:59:08 -0600 |
| commit | 26bfd93b3599b76b0d0edad441fe79f261e4d04e (patch) | |
| tree | df73355f94e2f7fb78cc2c4b02c33291df187944 /src/battle_anim_effects_1.c | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
| parent | 60484153a5630bfe88c1623b7ec1cf7052d67752 (diff) | |
Merge pull request #451 from shinny456/master
decompile electric.s
Diffstat (limited to 'src/battle_anim_effects_1.c')
| -rw-r--r-- | src/battle_anim_effects_1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 0f56c05d8..78e0608e1 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -2257,9 +2257,9 @@ static void sub_80FE9E4(struct Sprite* sprite) else { if (sprite->data[5] > 0x7F) - sprite->subpriority = sub_80A82E4(gBattleAnimTarget) + 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 1; else - sprite->subpriority = sub_80A82E4(gBattleAnimTarget) + 6; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimTarget) + 6; sprite->pos2.x += Sin(sprite->data[5], 5); sprite->pos2.y += Cos(sprite->data[5], 14); @@ -2278,7 +2278,7 @@ void sub_80FEA58(u8 taskId) gBattleAnimArgs[1] = 0; gBattleAnimArgs[2] = 80; gBattleAnimArgs[3] = 0; - CreateSpriteAndAnimate(&gUnknown_08592210, 0, 0, sub_80A82E4(gBattleAnimTarget) + 1); + CreateSpriteAndAnimate(&gUnknown_08592210, 0, 0, GetBattlerSubpriority(gBattleAnimTarget) + 1); } if (gTasks[taskId].data[1] == 15) @@ -2465,9 +2465,9 @@ static void sub_80FEECC(struct Sprite* sprite) sprite->pos2.x += Sin(sprite->data[5], 32); sprite->pos2.y += Cos(sprite->data[5], -5); if ((u16)(sprite->data[5] - 0x40) < 0x80) - sprite->subpriority = sub_80A82E4(gBattleAnimAttacker) - 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) - 1; else - sprite->subpriority = sub_80A82E4(gBattleAnimAttacker) + 1; + sprite->subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + 1; sprite->data[5] = (sprite->data[5] + 5) & 0xFF; } @@ -3205,7 +3205,7 @@ void sub_80FFFC0(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[4] = sub_80A82E4(gBattleAnimTarget) - 1; + task->data[4] = GetBattlerSubpriority(gBattleAnimTarget) - 1; task->data[6] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); task->data[10] = sub_80A861C(gBattleAnimTarget, 1); |