diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-17 17:01:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 17:01:38 -0500 |
| commit | 6467ff26999d89252092d727f507f8b4b562c25c (patch) | |
| tree | 8c952a7748119de80a36aee062bd953bd02fbb66 /src/battle/anim/devil.c | |
| parent | 09b8f4c09e69a2359cdf5e4497b97aca3746b8b1 (diff) | |
| parent | 2ac92e38ffa627b49ce2c634b35d1a0e1835f0af (diff) | |
Merge pull request #697 from garakmon/battle-scrcmd-labels
Battle scrcmd labels
Diffstat (limited to 'src/battle/anim/devil.c')
| -rw-r--r-- | src/battle/anim/devil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index 8183be2ba..8e1010d2b 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -29,8 +29,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7BF8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C00 = { - .tileTag = 10221, - .paletteTag = 10221, + .tileTag = ANIM_TAG_DEVIL, + .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7BF8, .images = NULL, @@ -45,7 +45,7 @@ void sub_80D2ABC(struct Sprite *sprite) sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); - sprite->subpriority = sub_8079E90(gAnimBankTarget) - 1; + sprite->subpriority = GetBattlerSubpriority(gAnimBankTarget) - 1; sprite->data[2] = 1; } sprite->data[0] += sprite->data[2]; |