diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-02 00:24:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 00:24:16 -0500 |
| commit | 64460e01aede2bbcaa8d1dd18dd3fab590fa4a6e (patch) | |
| tree | 58be3a15322f5c0972b71525f5cd22149bb67696 /src/battle_anim_effects_3.c | |
| parent | 7e26aa3d21f55e1375bfde6ffbc70210170fdc37 (diff) | |
| parent | 3fd5e143a986334985c2c786c324663dbba2db9b (diff) | |
Merge pull request #1314 from GriffinRichards/doc-controllers
Document battle controllers, misc other battle
Diffstat (limited to 'src/battle_anim_effects_3.c')
| -rwxr-xr-x | src/battle_anim_effects_3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index f73a2dee7..7be5fa31c 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -2321,7 +2321,7 @@ void AnimTask_TransformMon(u8 taskId) if (IsSpeciesNotUnown(gContestResources->moveAnim->targetSpecies)) gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gUnknown_082FF6C0; else - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gUnknown_082FF694; + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gAffineAnims_BattleSpriteOpponentSide; StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimAttacker]], 0); } @@ -3248,7 +3248,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId) coord1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); coord2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); - spriteId = sub_80A8394(species, isBackPic, 0, coord1 + xOffset, coord2, 5, personality, otId, gBattleAnimTarget, 1); + spriteId = CreateAdditionalMonSpriteForMoveAnim(species, isBackPic, 0, coord1 + xOffset, coord2, 5, personality, otId, gBattleAnimTarget, TRUE); gSprites[spriteId].oam.priority = priority; gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND; @@ -5066,7 +5066,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) } } - spriteId2 = sub_80A8394(species, isBackPic, 0, x, GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y), subpriority, personality, otId, gBattleAnimAttacker, 0); + spriteId2 = CreateAdditionalMonSpriteForMoveAnim(species, isBackPic, 0, x, GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y), subpriority, personality, otId, gBattleAnimAttacker, FALSE); if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies != SPECIES_NONE) BlendPalette((gSprites[spriteId2].oam.paletteNum * 16) | 0x100, 16, 6, RGB_WHITE); |