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/ghost.c | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
| parent | 60484153a5630bfe88c1623b7ec1cf7052d67752 (diff) | |
Merge pull request #451 from shinny456/master
decompile electric.s
Diffstat (limited to 'src/ghost.c')
| -rw-r--r-- | src/ghost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ghost.c b/src/ghost.c index 0464d1491..3135004da 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -1171,7 +1171,7 @@ void sub_8112C6C(u8 taskId) task->data[11] = (sub_80A861C(gBattleAnimAttacker, 1) / 2) + 8; task->data[7] = 0; task->data[5] = sub_80A8328(gBattleAnimAttacker); - task->data[6] = sub_80A82E4(gBattleAnimAttacker) - 2; + task->data[6] = GetBattlerSubpriority(gBattleAnimAttacker) - 2; task->data[3] = 0; task->data[4] = 16; SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); |