diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-19 10:58:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 10:58:44 -0500 |
| commit | 89dc26755ad2818c10b37a34ed46f5c79dc571c8 (patch) | |
| tree | abd075a205c401b3a5406efb37378544e94c9190 /src/battle_anim_utility_funcs.c | |
| parent | 83cba310335678aa8ecac24b58708b3c924b581a (diff) | |
| parent | 63f8834b6bc2d6413da606d7df88a304edc3c625 (diff) | |
Merge pull request #138 from jiangzhengwenjz/battle
battle (4th take)
Diffstat (limited to 'src/battle_anim_utility_funcs.c')
| -rw-r--r-- | src/battle_anim_utility_funcs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 14c5ef6c8..d9a6754c7 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -309,7 +309,7 @@ void sub_80BACEC(u8 taskId) species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); else species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); - spriteId = GetAnimBattlerSpriteId(0); + spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); newSpriteId = sub_8076E34(gBattleAnimAttacker, spriteId, species); sub_80752A0(&animBgData); AnimLoadCompressedBgTilemap(animBgData.bgId, gFile_graphics_battle_anims_masks_curse_tilemap); @@ -354,7 +354,7 @@ static void sub_80BAF38(u8 taskId) SetGpuReg(REG_OFFSET_DISPCNT, GetGpuReg(REG_OFFSET_DISPCNT) ^ DISPCNT_OBJWIN_ON); SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); - sprite = &gSprites[GetAnimBattlerSpriteId(0)]; // unused + sprite = &gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)]; // unused sprite = &gSprites[gTasks[taskId].data[0]]; DestroySprite(sprite); sub_80752A0(&animBgData); |