diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
| commit | d004ce065c9cc6425df6f567dff39eb831f84875 (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /src/ghost.c | |
| parent | ec780bb2098be75e591b212e85947f88c91d4e37 (diff) | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'src/ghost.c')
| -rw-r--r-- | src/ghost.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ghost.c b/src/ghost.c index a755783b7..d26a4d1cb 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -800,7 +800,7 @@ void sub_81123C4(u8 taskId) task->data[10] = gBattleAnimArgs[0]; baseX = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); - baseY = sub_80A861C(gBattleAnimAttacker, 3); + baseY = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_BOTTOM); if (!IsContest()) { for (battler = 0; battler < 4; battler++) @@ -813,7 +813,7 @@ void sub_81123C4(u8 taskId) if (spriteId != MAX_SPRITES) { x = GetBattlerSpriteCoord(battler, 2); - y = sub_80A861C(battler, 3); + y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_BOTTOM); gSprites[spriteId].data[0] = baseX << 4; gSprites[spriteId].data[1] = baseY << 4; gSprites[spriteId].data[2] = ((x - baseX) << 4) / gBattleAnimArgs[1]; @@ -1168,7 +1168,7 @@ void sub_8112C6C(u8 taskId) task->data[1] = 16; task->data[9] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); task->data[10] = GetBattlerYCoordWithElevation(gBattleAnimAttacker); - task->data[11] = (sub_80A861C(gBattleAnimAttacker, 1) / 2) + 8; + task->data[11] = (GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_WIDTH) / 2) + 8; task->data[7] = 0; task->data[5] = GetBattlerSpriteBGPriority(gBattleAnimAttacker); task->data[6] = GetBattlerSpriteSubpriority(gBattleAnimAttacker) - 2; |